Request 2715 (accepted)

Overview

Request 2715 (accepted)

Updated to 0.6.1 and switched to ffmpeg 3.0

Created by Aloysius over 8 years ago
In state accepted

Submit gpac

Submit package home:Aloysius:branches:Essentials / gpac to package Essentials / gpac

gpac.changes Changed

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
 #
 
 
-%define soname		4
+%define soname		6
 Name:           gpac
-Version:        0.5.2
+Version:        0.6.1
 Release:        0
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 License:        LGPL-2.1+
@@ -27,20 +27,20 @@
 Source:         http://github.com/gpac/%{name}/archive/v%{version}.tar.gz
 Source90:       %{name}-rpmlintrc
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:         gpac-0.5.1-enable_V4Studio.patch
+Patch1:         gpac-0.6.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
 Patch2:         gpac-0.5.0-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
-Patch3:         gpac-0.5.0-64bit-portability.patch
+Patch3:         gpac-0.6.1-64bit-portability.patch
 #PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng include dir fix
-Patch4:         gpac-0.5.0-libpng-version-detection.patch
+Patch4:         gpac-0.6.1-libpng-version-detection.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
 Patch5:         gpac-0.5.0-system-amr.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
-Patch6:         gpac-0.5.0-no-pc.patch
+Patch6:         gpac-0.6.1-no-pc.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
 # not available to the public
-Patch9:         gpac-0.5.0-x264-export.patch
+Patch9:         gpac-0.6.1-x264-export.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
 Patch10:        gpac-0.5.1-u32-count-redeclaration.patch
 BuildRequires:  DirectFB-devel
@@ -56,11 +56,11 @@
 BuildRequires:  graphviz
 BuildRequires:  liba52-devel
 BuildRequires:  libfaad-devel
-BuildRequires:  pkgconfig(libavcodec) = 56.60.100
-BuildRequires:  pkgconfig(libavformat) = 56.40.101
-BuildRequires:  pkgconfig(libswscale) = 3.1.101
-BuildRequires:  pkgconfig(libavdevice) = 56.4.100
-BuildRequires:  pkgconfig(libavutil) = 54.31.100
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libavdevice)
+BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libogg-devel
@@ -193,11 +193,11 @@
 touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
 rm -rf doc/ipmpx_syntax.bt.origine
 
-# Generate revision.h
-echo '#define GPAC_SVN_REVISION "5491"' > ./include/gpac/revision.h
-
 sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
 
+### corrects typo
+sed -e 's|nb_droped|nb_dropped|g' -i applications/osmo4_wx/fileprops.cpp
+
 %build
 # configure the beast
 ./configure \
@@ -210,6 +210,7 @@
 
 # make the beast (NO parallel build possible ...)
 # fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
+cp config.h include/gpac/configuration.h
 make %{?_smp_mflags} all CFLAG="%{optflags}"
 make %{?_smp_mflags} sggen
 make %{?_smp_mflags} -C applications/generators/SVG
@@ -274,7 +275,7 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS Changelog COPYING README TODO
+%doc AUTHORS BUGS Changelog COPYING README.md TODO
 %doc doc/configuration.html
 %{_bindir}/DashCast
 %{_bindir}/MP42TS

gpac-0.5.0-64bit-portability.patch Deleted

@@ -1,119 +0,0 @@
----
- applications/generators/MPEG4/main.c | 4 ++--
- applications/generators/SVG/svggen.h | 12 +++++++++++-
- applications/generators/X3D/main.c | 4 ++--
- modules/vtt_in/vtt_dec.c | 2 ++
- src/bifs/field_encode.c | 1 +
- src/scene_manager/encode_isom.c | 1 +
- 6 files changed, 19 insertions(+), 5 deletions(-)
-
-Index: gpac-0.5.2/applications/generators/MPEG4/main.c
-===================================================================
---- gpac-0.5.2.orig/applications/generators/MPEG4/main.c
-+++ gpac-0.5.2/applications/generators/MPEG4/main.c
-@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
-Index: gpac-0.5.2/applications/generators/SVG/svggen.h
-===================================================================
---- gpac-0.5.2.orig/applications/generators/SVG/svggen.h
-+++ gpac-0.5.2/applications/generators/SVG/svggen.h
-@@ -190,6 +190,16 @@ static _atts generic_attributes[] = {
- 
- FILE *BeginFile(u32 type);
- void EndFile(FILE *f, u32 type);
--
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+void generate_laser_tables(GF_List *svg_elements);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void generate_laser_tables_da(GF_List *atts);
- 
- #endif // _SVGGEN_H_
-Index: gpac-0.5.2/applications/generators/X3D/main.c
-===================================================================
---- gpac-0.5.2.orig/applications/generators/X3D/main.c
-+++ gpac-0.5.2/applications/generators/X3D/main.c
-@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
-Index: gpac-0.5.2/modules/vtt_in/vtt_dec.c
-===================================================================
---- gpac-0.5.2.orig/modules/vtt_in/vtt_dec.c
-+++ gpac-0.5.2/modules/vtt_in/vtt_dec.c
-@@ -126,6 +126,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- 		/* TODO: try to parse a cue from the given string */
- 		break;
- 
-+#ifdef GPAC_HAS_SPIDERMONKEY
- 	case GPAC_OTI_SCENE_VTT_MP4:
- 	{
- 		char start[100], end[100];
-@@ -144,6 +145,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- 		gf_list_del(cues);
- 	}
- 	break;
-+#endif
- 
- 	default:
- 		return GF_BAD_PARAM;
-Index: gpac-0.5.2/src/bifs/field_encode.c
-===================================================================
---- gpac-0.5.2.orig/src/bifs/field_encode.c
-+++ gpac-0.5.2/src/bifs/field_encode.c
-@@ -27,6 +27,7 @@
- 
- #include <gpac/internal/bifs_dev.h>
- #include <gpac/internal/bifs_tables.h>
-+#include <gpac/network.h>
- #include "quant.h"
- #include "script.h"
- 
-Index: gpac-0.5.2/src/scene_manager/encode_isom.c
-===================================================================
---- gpac-0.5.2.orig/src/scene_manager/encode_isom.c
-+++ gpac-0.5.2/src/scene_manager/encode_isom.c
-@@ -27,6 +27,7 @@
- #include <gpac/constants.h>
- #include <gpac/media_tools.h>
- #include <gpac/bifs.h>
-+#include <gpac/network.h>
- #ifndef GPAC_DISABLE_LASER
- #include <gpac/laser.h>
- #include <gpac/nodes_svg.h>

gpac-0.5.0-libpng-version-detection.patch Deleted

@@ -1,72 +0,0 @@
-Index: gpac-0.5.0.svn4668/configure
-===================================================================
---- gpac-0.5.0.svn4668.orig/configure
-+++ gpac-0.5.0.svn4668/configure
-@@ -1149,27 +1149,40 @@ int main( void ) { return 0; }
- EOF
- 
- if test "$cross_prefix" = "" ; then
-- png_cflags="-I$prefix/include"
-- png_lflags="-L$prefix/lib -lpng -lz"
-+ png_flavor=""
-+ if [ -d /usr/include/libpng16 ] ; then \
-+	png_flavor="png16"
-+ elif [ -d /usr/include/libpng15 ] ; then \
-+	png_flavor="png15"
-+ elif [ -d /usr/include/libpng14 ] ; then \
-+	png_flavor="png14"
-+ elif [ -d /usr/include/libpng12 ] ; then \
-+ png_flavor="png12"
-+ else
-+	png_flavor="png"
-+ fi
-+
-+ png_cflags="-I$prefix/include/lib$png_flavor"
-+ png_lflags="-L$prefix/$libdir -l$png_flavor -lz"
- #-nostdlib prevents from searching standard compiler libraries
- #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null ; then
- if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null ; then
- has_png="system"
-- elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null ; then
-+ elif $cc -o $TMPO $TMPC $LDFLAGS -l$png_flavor -lz 2> /dev/null ; then
- has_png="system"
- elif test "$alt_macosx_dir" != "" ; then
-- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
-+ if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include/lib$png_flavor -L$alt_macosx_dir/$libdir $LDFLAGS -l$png_flavor 2> /dev/null ; then
- has_png="system"
- fi
- fi
- fi
- if test "$has_png" = "no" ; then
-- if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null ; then
-+ if $cc -o $TMPO $TMPC -I$local_inc/$png_flavor -L$local_lib -l$png_flavor 2> /dev/null ; then
- has_png="local"
- fi
- fi
- 
--
-+sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
- 
- #look for MAD support
- cat > $TMPC << EOF
-@@ -2823,6 +2836,7 @@ if test "$has_jpeg" != "no" ; then
- fi
- 
- echo "CONFIG_PNG=$has_png" >> config.mak
-+echo "png_flavor=$png_flavor" >> config.mak
- if test "$has_png" != "no" ; then
- echo "#define GPAC_HAS_PNG" >> $TMPH
- fi
-Index: gpac-0.5.0.svn4668/src/Makefile
-===================================================================
---- gpac-0.5.0.svn4668.orig/src/Makefile
-+++ gpac-0.5.0.svn4668/src/Makefile
-@@ -495,7 +495,7 @@ endif
- #5 - PNG support
- ifeq ($(CONFIG_PNG), no)
- else
--LINKLIBS+= -lpng
-+LINKLIBS+= -l$(png_flavor)
- ifeq ($(CONFIG_PNG), local)
- NEED_LOCAL_LIB="yes"
- MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.5.0-no-pc.patch Deleted

gpac-0.5.0-x264-export.patch Deleted

gpac-0.5.1-enable_V4Studio.patch Deleted

@@ -1,55 +0,0 @@
-Index: gpac-0.5.1.svn5491/applications/Makefile
-===================================================================
---- gpac-0.5.1.svn5491.orig/applications/Makefile
-+++ gpac-0.5.1.svn5491/applications/Makefile
-@@ -27,15 +27,15 @@ V4STUDIODIR=
- INSTDIRS=mp4client
- ifeq ($(CONFIG_XUL),no)
- else
--#INSTDIRS+=osmozilla
--#APPDIRS+=osmozilla
-+INSTDIRS+=osmozilla
-+APPDIRS+=osmozilla
- endif
- 
- #disable due to version incompatibilities
- ifeq ($(USE_WXWIDGETS), yes)
--#APPDIRS+=osmo4_wx
--#V4STUDIODIR=V4Studio
--#INSTDIRS+=osmo4_wx
-+APPDIRS+=osmo4_wx
-+V4STUDIODIR=V4Studio
-+INSTDIRS+=osmo4_wx
- endif
- 
- ALLDIRS=$(APPDIRS)
-Index: gpac-0.5.1.svn5491/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.5.1.svn5491.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.5.1.svn5491/applications/osmo4_wx/Makefile
-@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
- all: $(PROG)
- 
- Osmo4$(EXE): $(OBJS)
--	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
-+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-Index: gpac-0.5.1.svn5491/applications/osmozilla/osmo_npapi.cpp
-===================================================================
---- gpac-0.5.1.svn5491.orig/applications/osmozilla/osmo_npapi.cpp
-+++ gpac-0.5.1.svn5491/applications/osmozilla/osmo_npapi.cpp
-@@ -372,10 +372,11 @@ NPError NS_PluginGetValue(NPPVariable aV
- 	/* explicit plugin call */ \
- 	"application/x-gpac::GPAC plugin;" \
-  
--char * NP_GetMIMEDescription(void)
-+/*char * NP_GetMIMEDescription(void)
- {
- 	return (char *) GPAC_PLUGIN_MIMETYPES;
- }
-+*/
- 
- 
- NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)

gpac-0.6.1-64bit-portability.patch Added

@@ -0,0 +1,86 @@
+Index: gpac-0.6.1/applications/generators/MPEG4/main.c
+===================================================================
+--- gpac-0.6.1.orig/applications/generators/MPEG4/main.c
++++ gpac-0.6.1/applications/generators/MPEG4/main.c
+@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
+ 			}
+ 			//SFString
+ 			else if (!strcmp(bf->familly, "SFString")) {
+-				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
++				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
+ 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
+ 			}
+ 
+@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
+ 					store = CurrentLine;
+ 					CurrentLine = token;
+ 					GetNextToken(tok, " \"");
+-					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
++					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
+ 					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
+ 					j+=1;
+ 					CurrentLine = store;
+Index: gpac-0.6.1/applications/generators/SVG/svggen.h
+===================================================================
+--- gpac-0.6.1.orig/applications/generators/SVG/svggen.h
++++ gpac-0.6.1/applications/generators/SVG/svggen.h
+@@ -190,6 +190,16 @@ static _atts generic_attributes[] = {
+ 
+ FILE *BeginFile(u32 type);
+ void EndFile(FILE *f, u32 type);
+-
++SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
++void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
++u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
++void generate_laser_tables(GF_List *svg_elements);
++void generate_table(GF_List *elements);
++void generateSVGCode_V1(GF_List *svg_elements);
++void generateSVGCode_V2(GF_List *svg_elements);
++void generateSVGCode_V3(GF_List *svg_elements);
++void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
++void generate_laser_tables_da(GF_List *atts);
+ 
+ #endif // _SVGGEN_H_
+Index: gpac-0.6.1/applications/generators/X3D/main.c
+===================================================================
+--- gpac-0.6.1.orig/applications/generators/X3D/main.c
++++ gpac-0.6.1/applications/generators/X3D/main.c
+@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
+ 			}
+ 			//SFString
+ 			else if (!strcmp(bf->familly, "SFString")) {
+-				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
++				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
+ 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
+ 			}
+ 
+@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
+ 					store = CurrentLine;
+ 					CurrentLine = token;
+ 					GetNextToken(tok, " \"");
+-					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
++					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
+ 					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
+ 					j+=1;
+ 					CurrentLine = store;
+Index: gpac-0.6.1/modules/vtt_in/vtt_dec.c
+===================================================================
+--- gpac-0.6.1.orig/modules/vtt_in/vtt_dec.c
++++ gpac-0.6.1/modules/vtt_in/vtt_dec.c
+@@ -127,6 +127,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
+ 		/* TODO: try to parse a cue from the given string */
+ 		break;
+ 
++#ifdef GPAC_HAS_SPIDERMONKEY
+ 	case GPAC_OTI_SCENE_VTT_MP4:
+ 	{
+ #ifndef GPAC_DISABLE_MEDIA_IMPORT
+@@ -147,6 +148,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
+ #endif
+ 	}
+ 	break;
++#endif
+ 
+ 	default:
+ 		return GF_BAD_PARAM;

gpac-0.6.1-enable_V4Studio.patch Added

@@ -0,0 +1,57 @@
+Index: gpac-0.6.1/applications/Makefile
+===================================================================
+--- gpac-0.6.1.orig/applications/Makefile
++++ gpac-0.6.1/applications/Makefile
+@@ -33,15 +33,15 @@ V4STUDIODIR=
+ INSTDIRS=mp4client
+ ifeq ($(CONFIG_XUL),no)
+ else
+-#INSTDIRS+=osmozilla
+-#APPDIRS+=osmozilla
++INSTDIRS+=osmozilla
++APPDIRS+=osmozilla
+ endif
+ 
+ #disable due to version incompatibilities
+ ifeq ($(USE_WXWIDGETS), yes)
+-#APPDIRS+=osmo4_wx
+-#V4STUDIODIR=V4Studio
+-#INSTDIRS+=osmo4_wx
++APPDIRS+=osmo4_wx
++V4STUDIODIR=V4Studio
++INSTDIRS+=osmo4_wx
+ endif
+ 
+ #MP4BOX_STATIC
+Index: gpac-0.6.1/applications/osmo4_wx/Makefile
+===================================================================
+--- gpac-0.6.1.orig/applications/osmo4_wx/Makefile
++++ gpac-0.6.1/applications/osmo4_wx/Makefile
+@@ -46,8 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
+ all: $(PROG)
+ 
+ Osmo4$(EXE): $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
+-
++	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+ 
+Index: gpac-0.6.1/applications/osmozilla/osmo_npapi.cpp
+===================================================================
+--- gpac-0.6.1.orig/applications/osmozilla/osmo_npapi.cpp
++++ gpac-0.6.1/applications/osmozilla/osmo_npapi.cpp
+@@ -372,11 +372,11 @@ NPError NS_PluginGetValue(NPPVariable aV
+ 	/* explicit plugin call */ \
+ 	"application/x-gpac::GPAC plugin;" \
+  
+-char * NP_GetMIMEDescription(void)
++/*char * NP_GetMIMEDescription(void)
+ {
+ 	return (char *) GPAC_PLUGIN_MIMETYPES;
+ }
+-
++*/
+ 
+ NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
+ {

gpac-0.6.1-libpng-version-detection.patch Added

@@ -0,0 +1,70 @@
+Index: gpac-0.6.1/configure
+===================================================================
+--- gpac-0.6.1.orig/configure
++++ gpac-0.6.1/configure
+@@ -1222,11 +1222,26 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-png_cflags="-I$prefix/include"
+-png_lflags="-L$prefix/lib -lpng -lz"
++png_flavor=""
++if [ -d /usr/include/libpng16 ] ; then \
++ png_flavor="png16"
++elif [ -d /usr/include/libpng15 ] ; then \
++ png_flavor="png15"
++elif [ -d /usr/include/libpng14 ] ; then \
++ png_flavor="png14"
++elif [ -d /usr/include/libpng12 ] ; then \
++ png_flavor="png12"
++else
++ png_flavor="png"
++fi
++
++png_cflags="-I$prefix/include/lib$png_flavor"
++png_lflags="-L$prefix/$libdir -l$png_flavor -lz"
++
+ if docc $png_cflags $png_lflags $LDFLAGS ; then
+ has_png="system"
+-elif docc $LDFLAGS -lpng -lz ; then
++elif docc $LDFLAGS -l$png_flavor -lz 2> /dev/null ; then
++
+ has_png="system"
+ fi
+ if test "$cross_prefix" = "" ; then
+@@ -1239,12 +1254,12 @@ if test "$cross_prefix" = "" ; then
+ fi
+ fi
+ if test "$has_png" = "no" ; then
+- if docc -I$local_inc/png -L$local_lib -lpng ; then
++ if docc -I$local_inc/$png_flavor -L$local_lib -l$png_flavor 2> /dev/null ; then
+ has_png="local"
+ fi
+ fi
+ 
+-
++sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
+ 
+ #look for MAD support
+ cat > $TMPC << EOF
+@@ -3024,6 +3039,7 @@ if test "$has_jpeg" != "no" ; then
+ fi
+ 
+ echo "CONFIG_PNG=$has_png" >> config.mak
++echo "png_flavor=$png_flavor" >> config.mak
+ if test "$has_png" != "no" ; then
+ echo "#define GPAC_HAS_PNG" >> $TMPH
+ fi
+Index: gpac-0.6.1/static.mak
+===================================================================
+--- gpac-0.6.1.orig/static.mak
++++ gpac-0.6.1/static.mak
+@@ -45,7 +45,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -l$(png_flavor)
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.6.1-no-pc.patch Added

gpac-0.6.1-x264-export.patch Added

v0.5.2.tar.gz/README Deleted

@@ -1,17 +0,0 @@
-README for GPAC version 0.5.0, May 2012.
-
-GPAC is a multimedia framework oriented towards rich media and distributed under the LGPL license (see COPYING).
-GPAC supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex 
-presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D). GPAC supports scripting of presentation for MPEG4/VRML/X3D through
-mozilla SpiderMonkey javascript engine.
-GPAC currently supports local playback, http progressive download, Adaptive HTTP Streaming (MPEG-DASH, HLS), RTP/RTSP streaming over UDP (unicast or multicast) or TCP and TS demuxing (from file, IP or DVB4Linux).
-GPAC also features MP4Box, a multimedia swiss-army knife for the prompt.
-
-For compilation and installation instruction, check INSTALLME file
-
-For GPAC configuration instruction, check gpac/doc/configuration.html or gpac/doc/man/gpac.1 (man gpac when installed)
-
-For more information, visit the GPAC website on sourceforge:
-	http://gpac.sourceforge.net
-		
-

v0.5.2.tar.gz/applications/m3u82mpd Deleted

v0.5.2.tar.gz/applications/m3u82mpd/m3u82mpd.vcproj Deleted

@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="m3u82mpd"
-	ProjectGUID="{91DD3CA8-5C56-4B02-B11C-6FDC373B99DA}"
-	RootNamespace="m3u82mpd"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/m3u82mpd.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/m3u82mpd.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\main.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/applications/m3u82mpd/main.c Deleted

@@ -1,122 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Copyright (c) Telecom ParisTech 2010 -
- *					All rights reserved
- *
- * This file is part of GPAC / m3u82mpd application
- *
- * GPAC is gf_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, or (at your option)
- * any later version.
- *
- * GPAC 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 this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-
-#include <gpac/internal/m3u8.h>
-#include <gpac/network.h>
-#include <gpac/download.h>
-
-
-int main(int argc, char **argv)
-{
-	GF_Err e;
-	VariantPlaylist * pl = NULL;
-	char *url = argv[1];
-	//char *cache_m3u8_file;
-	u32 i, count;
-	FILE *fmpd;
-	Bool verbose = 0;
-	u32 update_interval = 0;
-	char *m3u8_local_name = "file.m3u8";
-	Bool is_local = 0;
-
-	gf_sys_init(0);
-
-	gf_log_set_tool_level(GF_LOG_NETWORK, verbose ? GF_LOG_DEBUG : GF_LOG_INFO);
-
-	while (1) {
-
-		if (gf_url_is_local(url)) {
-			m3u8_local_name = url;
-			is_local = 1;
-		} else {
-			e = gf_dm_wget(url, m3u8_local_name, 0, 0);
-			if (e != GF_OK) return -1;
-		}
-
-		e = parse_root_playlist(m3u8_local_name, &pl, ".");
-		if (e != GF_OK) return -1;
-
-		fmpd = fopen(argv[2], "wt");
-
-		fprintf(fmpd, "<MPD type=\"Live\" xmlns=\"urn:3GPP:ns:PSS:AdaptiveHTTPStreamingMPD:2009\">\n");
-		fprintf(fmpd, " <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n");
-		fprintf(fmpd, " <Title>Media Presentation Description for file %s</Title>\n", url);
-		fprintf(fmpd, " <Source>Generated by GPAC %s</Source>\n", GPAC_FULL_VERSION);
-
-		fprintf(fmpd, " </ProgramInformation>\n");
-		fprintf(fmpd, " <Period start=\"PT0S\">\n");
-
-		count = gf_list_count(pl->programs);
-		for (i=0; i<count; i++) {
-			u32 j, count2;
-			Program *prog = gf_list_get(pl->programs, i);
-			count2 = gf_list_count(prog->bitrates);
-			for (j = 0; j<count2; j++) {
-				PlaylistElement *pe = gf_list_get(prog->bitrates, j);
-				fprintf(stdout, "%d, %d, %s, %s, %d\n", pe->durationInfo, pe->bandwidth, pe->title, pe->url, pe->elementType);
-				if (pe->elementType == TYPE_PLAYLIST) {
-					u32 k, count3;
-					char *tmp;
-					char c;
-					char baseURL[GF_MAX_PATH];
-					tmp = strrchr(url, '/');
-					if (tmp) {
-						tmp++;
-						c = tmp[0];
-						tmp[0] = 0;
-						strcpy(baseURL, url);
-						tmp[0] = c;
-					} else {
-						baseURL[0] = 0;
-					}
-					fprintf(fmpd, " <Representation mimeType=\"video/mp2t\">\n");
-					fprintf(fmpd, " <SegmentInfo duration=\"PT%dS\"", pe->durationInfo);
-					if (baseURL[0]) fprintf(fmpd, "baseURL=\"%s\"", baseURL);
-					fprintf(fmpd, ">\n");
-					count3 = gf_list_count(pe->element.playlist.elements);
-					update_interval = (count3 - 1) * pe->durationInfo * 1000;
-					for (k=0; k<count3; k++) {
-						PlaylistElement *elt = gf_list_get(pe->element.playlist.elements, k);
-						if (k) fprintf(fmpd, " <Url sourceURL=\"%s\"/>\n", elt->url);
-						else fprintf(fmpd, " <InitialisationSegmentURL sourceURL=\"%s\"/>\n", elt->url);
-					}
-					fprintf(fmpd, " </SegmentInfo>\n");
-					fprintf(fmpd, " </Representation>\n");
-				} else if (pe->elementType == TYPE_STREAM) {
-					fprintf(stdout, "Stream\n");
-				}
-			}
-		}
-		fprintf(fmpd, " </Period>\n");
-		fprintf(fmpd, "</MPD>");
-		fclose(fmpd);
-		variant_playlist_del(pl);
-		if (is_local) break;
-		gf_sleep(update_interval);
-	}
-
-	gf_sys_close();
-	return 0;
-}

v0.5.2.tar.gz/applications/mp42ts/mp42ts.h Deleted

@@ -1,202 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- * This file is part of GPAC / mp42ts application
- *
- * GPAC 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, or (at your option)
- * any later version.
- *
- * GPAC 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 this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <gpac/isomedia.h>
-#include <gpac/bifs.h>
-#include <gpac/esi.h>
-#include <gpac/mpegts.h>
-#include <gpac/avparse.h>
-#include <gpac/thread.h>
-
-
-typedef struct __m2ts_mux_program M2TS_Mux_Program;
-typedef struct __m2ts_mux M2TS_Mux;
-
-enum {
-	LOG_NO_LOG = 0,
-	LOG_PES = 1,
-	LOG_SECTION = 2,
-	LOG_TS = 3
-};
-
-
-typedef struct __m2ts_section {
-	struct __m2ts_section *next;
-	u8 *data;
-	u32 length;
-} M2TS_Mux_Section;
-
-typedef struct __m2ts_table {
-	struct __m2ts_table *next;
-	u8 table_id;
-	u8 version_number;
-	struct __m2ts_section *section;
-} M2TS_Mux_Table;
-
-typedef struct
-{
-	u32 sec;
-	u32 nanosec;
-} M2TS_Time;
-
-
-typedef struct __m2ts_mux_pck
-{
-	struct __m2ts_mux_pck *next;
-	char *data;
-	u32 data_len;
-	u32 flags;
-	u64 cts, dts;
-} M2TS_Packet;
-
-
-typedef struct __m2ts_mux_stream {
-	struct __m2ts_mux_stream *next;
-
-	u32 pid;
-	u8 continuity_counter;
-	struct __m2ts_mux_program *program;
-
-	/*average stream bit-rate in bit/sec*/
-	u32 bit_rate;
-
-	/*multiplexer time - NOT THE PCR*/
-	M2TS_Time time;
-
-
-	/* MPEG-4 SL Config */
-	GF_SLConfig sl_config;
-
-	/*table tools*/
-	M2TS_Mux_Table *tables;
-	/*total table sizes for bitrate estimation (PMT/PAT/...)*/
-	u32 total_table_size;
-	/* used for on-the-fly packetization of sections */
-	M2TS_Mux_Table *current_table;
-	M2TS_Mux_Section *current_section;
-	u32 current_section_offset;
-	u32 refresh_rate_ms;
-	Bool table_needs_update;
-
-	Bool (*process)(struct __m2ts_mux *muxer, struct __m2ts_mux_stream *stream);
-
-	/*PES tools*/
-	void *pes_packetizer;
-	u32 mpeg2_stream_type;
-	u32 mpeg2_stream_id;
-
-	GF_ESIPacket pck;
-	u32 pck_offset;
-	Bool force_new;
-
-	struct __elementary_stream_ifce *ifce;
-	Double ts_scale;
-	u64 initial_ts;
-
-	/*packet fifo*/
-	M2TS_Packet *pck_first, *pck_last;
-	/*packet reassembler (PES packets are most of the time full frames)*/
-	M2TS_Packet *pck_reassembler;
-	GF_Mutex *mx;
-	/*avg bitrate compute*/
-	u64 last_br_time;
-	u32 bytes_since_last_time;
-
-	/*MPEG-4 over MPEG-2*/
-	u8 table_id;
-	GF_SLHeader sl_header;
-	//GF_SLConfig sl_config;
-
-	u32 last_aac_time;
-} M2TS_Mux_Stream;
-
-
-struct __m2ts_mux_program {
-	struct __m2ts_mux_program *next;
-
-	struct __m2ts_mux *mux;
-	u16 number;
-	/*all streams but PMT*/
-	M2TS_Mux_Stream *streams;
-	/*PMT*/
-	M2TS_Mux_Stream *pmt;
-	/*pointer to PCR stream*/
-	M2TS_Mux_Stream *pcr;
-
-	/*TS time at pcr init*/
-	M2TS_Time ts_time_at_pcr_init;
-	u64 pcr_init_time, num_pck_at_pcr_init;
-	u64 last_pcr;
-	u32 last_sys_clock;
-
-	GF_Descriptor *iod;
-};
-
-struct __m2ts_mux {
-	M2TS_Mux_Program *programs;
-	M2TS_Mux_Stream *pat;
-
-	u16 ts_id;
-
-	Bool needs_reconfig;
-
-	/* used to indicate that the input data is pushed to the muxer (i.e. not read from a file)
-	or that the output data is sent on sockets (not written to a file) */
-	Bool real_time;
-
-	/* indicates if the multiplexer shall target a fix bit rate (monitoring timing and produce padding packets)
-	 or if the output stream will contain only input data*/
-	Bool fixed_rate;
-
-	/*output bit-rate in bit/sec*/
-	u32 bit_rate;
-
-	char dst_pck[188], null_pck[188];
-
-	/*multiplexer time, incremented each time a packet is sent
-	 used to monitor the sending of muxer related data (PAT, ...) */
-	M2TS_Time time;
-
-	/* Time of the muxer when the first call to process is made (first packet sent?) */
-	M2TS_Time init_ts_time;
-
-	/* System time when the muxer is started */
-	u32 init_sys_time;
-
-	Bool eos_found;
-	u32 pck_sent_over_br_window, last_br_time, avg_br;
-	u64 tot_pck_sent, tot_pad_sent;
-
-	Bool mpeg4_signaling;
-};
-
-
-enum
-{
-	GF_M2TS_STATE_IDLE,
-	GF_M2TS_STATE_DATA,
-	GF_M2TS_STATE_PADDING,
-	GF_M2TS_STATE_EOS,
-};
-

v0.5.2.tar.gz/applications/testapps/mp42ts Deleted

v0.5.2.tar.gz/applications/testapps/mp42ts/mp42ts.vcproj Deleted

@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="mp42ts"
-	ProjectGUID="{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/mp42ts.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/mp42ts.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../../bin/$(PlatformName)/$(ConfigurationName)/MP42TS.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../extra_lib/lib/w32_deb"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/mp42ts.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/mp42ts.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/mp42ts.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/mp42ts.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../../bin/$(PlatformName)/$(ConfigurationName)/MP42TS.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../extra_lib/lib/w32_rel"
-				ProgramDatabaseFile=".\Release/mp42ts.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/mp42ts.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\mp42ts\main.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\mp42ts\mp42ts.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/codeblocks Deleted

v0.5.2.tar.gz/build/codeblocks/GPAX.cbp Deleted

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="GPAX" />
-		<Option platforms="" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="debug">
-				<Option output="..\..\bin\w32_deb\GPAX" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\w32_deb" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add directory="..\..\include" />
-				</Compiler>
-				<Linker>
-					<Add library="kernel32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="winspool" />
-					<Add library="comdlg32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="ole32" />
-					<Add library="oleaut32" />
-					<Add library="uuid" />
-					<Add library="odbc32" />
-					<Add library="odbccp32" />
-					<Add library="js32" />
-					<Add library="zlib" />
-					<Add library="winmm" />
-					<Add library="ws2_32" />
-					<Add directory="..\..\extra_lib\lib\w32_deb" />
-				</Linker>
-			</Target>
-			<Target title="release">
-				<Option output="..\..\bin\w32_rel\GPAX" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DNDEBUG" />
-					<Add directory="..\..\include" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory="..\..\applications\GPAX" />
-				</ResourceCompiler>
-				<Linker>
-					<Add library="js32" />
-					<Add library="zlib" />
-					<Add library="winmm" />
-					<Add library="ws2_32" />
-					<Add directory="..\gpac\extra_lib\lib\w32_deb" />
-					<Add directory="..\..\extra_lib\lib\w32_rel" />
-				</Linker>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Unit filename="..\..\applications\GPAX\GPAX.cpp" />
-		<Unit filename="..\..\applications\GPAX\GPAX.def" />
-		<Unit filename="..\..\applications\GPAX\GPAX.h" />
-		<Unit filename="..\..\applications\GPAX\GPAX.idl" />
-		<Unit filename="..\..\applications\GPAX\GPAX.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="..\..\applications\GPAX\GPAX.rgs" />
-		<Unit filename="..\..\applications\GPAX\GPAXPlugin.cpp" />
-		<Unit filename="..\..\applications\GPAX\GPAXPlugin.h" />
-		<Unit filename="..\..\applications\GPAX\StdAfx.cpp" />
-		<Unit filename="..\..\applications\GPAX\StdAfx.h" />
-		<Unit filename="..\..\applications\GPAX\gpax.bmp" />
-		<Unit filename="..\..\applications\GPAX\resource.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/Osmo4.cbp Deleted

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="Osmo4" />
-		<Option platforms="" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\w32_rel\Osmo4" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add option="-O2" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_AFXDLL" />
-					<Add option="-D_MBCS" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\w32_deb\Osmo4" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add option="-g" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_AFXDLL" />
-					<Add option="-D_MBCS" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Unit filename="..\..\applications\osmo4_w32\AddressBar.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\AddressBar.h" />
-		<Unit filename="..\..\applications\osmo4_w32\FileProps.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\FileProps.h" />
-		<Unit filename="..\..\applications\osmo4_w32\MainFrm.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\MainFrm.h" />
-		<Unit filename="..\..\applications\osmo4_w32\OpenUrl.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\OpenUrl.h" />
-		<Unit filename="..\..\applications\osmo4_w32\Options.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\Options.h" />
-		<Unit filename="..\..\applications\osmo4_w32\Osmo4.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\Osmo4.h" />
-		<Unit filename="..\..\applications\osmo4_w32\Osmo4.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="..\..\applications\osmo4_w32\Playlist.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\Playlist.h" />
-		<Unit filename="..\..\applications\osmo4_w32\Resource.h" />
-		<Unit filename="..\..\applications\osmo4_w32\Sliders.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\Sliders.h" />
-		<Unit filename="..\..\applications\osmo4_w32\StdAfx.cpp" />
-		<Unit filename="..\..\applications\osmo4_w32\StdAfx.h" />
-		<Unit filename="..\..\applications\osmo4_w32\res\error.ico" />
-		<Unit filename="..\..\applications\osmo4_w32\res\maintool.bmp" />
-		<Unit filename="..\..\applications\osmo4_w32\res\message.ico" />
-		<Unit filename="..\..\applications\osmo4_w32\res\osmo4.ico" />
-		<Unit filename="..\..\applications\osmo4_w32\res\pause.ico" />
-		<Unit filename="..\..\applications\osmo4_w32\res\play.ico" />
-		<Unit filename="..\..\applications\osmo4_w32\res\playlist.bmp" />
-		<Unit filename="..\..\applications\osmo4_w32\res\stop.ico" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/aac_in.cbp Deleted

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="aac_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="0" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\faad" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\faad" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DGPAC_HAS_FAAD" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="faad" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\aac_in\aac_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\aac_in\aac_in.def" />
-		<Unit filename="..\..\modules\aac_in\faad_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ac3_in.cbp Deleted

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ac3_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DGPAC_HAS_LIBA52" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="a52" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\ac3_in\ac3_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ac3_in\ac3_in.def" />
-		<Unit filename="..\..\modules\ac3_in\liba52_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/amr_dec.cbp Deleted

@@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="amr_dec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\w32_rel\gm_amr_dec" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DMMS_IO" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\amr_dec\amr_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_dec.def" />
-		<Unit filename="..\..\modules\amr_dec\amr_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\a_refl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\a_refl.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\agc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\agc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\autocorr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\autocorr.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\az_lsp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\az_lsp.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\b_cn_cod.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\b_cn_cod.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\basic_op.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\basicop2.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\bgnscd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\bgnscd.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\bits2prm.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\bits2prm.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c1035pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c1035pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c2_11pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c2_11pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c2_9pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c2_9pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c3_14pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c3_14pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c4_17pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c4_17pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c8_31pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c8_31pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c_g_aver.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\c_g_aver.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\calc_cor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\calc_cor.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\calc_en.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\calc_en.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cbsearch.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cbsearch.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cl_ltp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cl_ltp.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cnst.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cnst_vad.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cod_amr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cod_amr.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\convolve.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\convolve.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\copy.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\copy.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cor_h.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\cor_h.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\count.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\count.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d1035pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d1035pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d2_11pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d2_11pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d2_9pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d2_9pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d3_14pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d3_14pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d4_17pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d4_17pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d8_31pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d8_31pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_gain_c.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_gain_c.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_gain_p.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_gain_p.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_homing.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_homing.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_plsf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_plsf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_plsf_3.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\d_plsf_5.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_amr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_amr.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_gain.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_gain.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_lag3.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_lag3.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_lag6.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dec_lag6.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dtx_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dtx_dec.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dtx_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\dtx_enc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ec_gains.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\enc_lag3.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\enc_lag6.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ex_ctrl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ex_ctrl.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\frame.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\g_adapt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\g_adapt.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\g_code.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\g_code.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\g_pitch.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\g_pitch.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\gain_q.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\gain_q.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\gc_pred.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\gc_pred.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\gmed_n.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\gmed_n.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\hp_max.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\hp_max.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\int_lpc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\int_lpc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\int_lsf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\int_lsf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\inter_36.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\inter_36.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\inv_sqrt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\inv_sqrt.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lag_wind.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lag_wind.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\levinson.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\levinson.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lflg_upd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\log2.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\log2.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lpc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lpc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsfwt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsfwt.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp_avg.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp_avg.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp_az.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp_az.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp_lsf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\lsp_lsf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\mac_32.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\mac_32.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\mode.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\n_proc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\n_proc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ol_ltp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ol_ltp.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\oper_32b.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\oper_32b.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\p_ol_wgh.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\p_ol_wgh.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ph_disp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ph_disp.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pitch_fr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pitch_fr.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pitch_ol.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pitch_ol.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\post_pro.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\post_pro.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pow2.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pow2.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pre_big.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pre_big.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pre_proc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pre_proc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pred_lt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pred_lt.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\preemph.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\preemph.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\prm2bits.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\prm2bits.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pstfilt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\pstfilt.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_gain_c.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_gain_c.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_gain_p.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_gain_p.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_plsf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_plsf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_plsf_3.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\q_plsf_5.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\qgain475.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\qgain475.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\qgain795.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\qgain795.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\qua_gain.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\qua_gain.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\r_fft.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\reorder.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\reorder.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\residu.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\residu.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\s10_8pf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\s10_8pf.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\set_sign.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\set_sign.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\set_zero.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\set_zero.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sid_sync.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sid_sync.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sp_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sp_dec.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sp_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sp_enc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\spreproc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\spreproc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\spstproc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\spstproc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sqrt_l.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\sqrt_l.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\strfunc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\strfunc.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\syn_filt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\syn_filt.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ton_stab.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\ton_stab.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\typedef.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\typedefs.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vad.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vad1.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vad1.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vad2.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vad2.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vadname.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\vadname.h" />
-		<Unit filename="..\..\modules\amr_dec\amr_nb\weight_a.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_dec\amr_nb\weight_a.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/amr_float_dec.cbp Deleted

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="amr_float_dec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="0" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DAMR_FLOAT_DEC_EXPORTS" />
-					<Add option="-DGPAC_HAS_AMR_FT" />
-					<Add option="-DGPAC_HAS_AMR_FT_WB" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DAMR_FLOAT_DEC_EXPORTS" />
-					<Add option="-DGPAC_HAS_AMR_FT" />
-					<Add option="-DGPAC_HAS_AMR_FT_WB" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\amr_dec\amr_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_float_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_float_dec.def" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\interf_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\interf_dec.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\interf_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\interf_enc.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\interf_rom.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\rom_dec.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\rom_enc.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\sp_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\sp_dec.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\sp_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\sp_enc.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_nb_ft\typedef.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_acelp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_acelp.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_dtx.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_dtx.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_gain.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_gain.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_if.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_if.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_lpc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_lpc.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_main.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_rom.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_util.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\dec_util.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_acelp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_acelp.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_dtx.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_dtx.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_gain.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_gain.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_if.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_if.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_lpc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_lpc.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_main.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_rom.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_util.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\enc_util.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\if_rom.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\if_rom.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\typedef.h" />
-		<Unit filename="..\..\modules\amr_float_dec\amr_wb_ft\typedefs.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/bifs_dec.cbp Deleted

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="bifs_dec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DBIFS_DEC_EXPORTS" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DBIFS_DEC_EXPORTS" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\bifs_dec\bifs_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\bifs_dec\bifs_dec.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ctx_load.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ctx_load" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\ctx_load\ctx_load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ctx_load\ctx_load.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/demo_is.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="demo_is" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\demo_is\demo_is.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\demo_is\demo_is.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/dummy_in.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="dummy_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\dummy_in\dummy_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\dummy_in\dummy_in.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/dx_hw.cbp Deleted

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="dx_hw" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-w" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory="..\..\modules\dx_hw" />
-				</ResourceCompiler>
-				<Linker>
-					<Add directory="..\..\extra_lib\lib\w32_deb" />
-				</Linker>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DGPAC_STATIC_CONFIG_H" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="opengl32" />
-			<Add library="dsound" />
-			<Add library="dxguid" />
-			<Add library="ddraw" />
-			<Add library="ole32" />
-			<Add library="gdi32" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\dx_hw\collide.cur" />
-		<Unit filename="..\..\modules\dx_hw\copy_pixels.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\dx_hw\dx_2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\dx_hw\dx_audio.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\dx_hw\dx_hw.def" />
-		<Unit filename="..\..\modules\dx_hw\dx_hw.h" />
-		<Unit filename="..\..\modules\dx_hw\dx_hw.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="..\..\modules\dx_hw\dx_video.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\dx_hw\dx_window.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\dx_hw\hand.cur" />
-		<Unit filename="..\..\modules\dx_hw\res\collide.cur" />
-		<Unit filename="..\..\modules\dx_hw\res\hand.cur" />
-		<Unit filename="..\..\modules\dx_hw\resource.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ffmpeg_in.cbp Deleted

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ffmpeg_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DFFMPEG_OLD_HEADERS" />
-		</Compiler>
-		<Linker>
-			<Add library="avformat-51" />
-			<Add library="avcodec-51" />
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\ffmpeg_in\ffmpeg_decode.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ffmpeg_in\ffmpeg_demux.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ffmpeg_in\ffmpeg_in.def" />
-		<Unit filename="..\..\modules\ffmpeg_in\ffmpeg_in.h" />
-		<Unit filename="..\..\modules\ffmpeg_in\ffmpeg_load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ft_font.cbp Deleted

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ft_font" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\freetype" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\freetype" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="freetype" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\ft_font\ft_font.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ft_font\ft_font.def" />
-		<Unit filename="..\..\modules\ft_font\ft_font.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/gdip_raster.cbp Deleted

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="gdip_raster" />
-		<Option platforms="" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="gdiplus" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\gdip_raster\gdip_font.cpp" />
-		<Unit filename="..\..\modules\gdip_raster\gdip_grad.cpp" />
-		<Unit filename="..\..\modules\gdip_raster\gdip_priv.h" />
-		<Unit filename="..\..\modules\gdip_raster\gdip_rend.cpp" />
-		<Unit filename="..\..\modules\gdip_raster\gdip_rend.def" />
-		<Unit filename="..\..\modules\gdip_raster\gdip_texture.cpp" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/gpac.workspace Deleted

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-	<Workspace title="gpac workspace">
-		<Project filename="GPAX.cbp" />
-		<Project filename="Osmo4.cbp" />
-		<Project filename="aac_in.cbp" />
-		<Project filename="ac3_in.cbp" />
-		<Project filename="amr_dec.cbp" />
-		<Project filename="amr_float_dec.cbp" />
-		<Project filename="bifs_dec.cbp" />
-		<Project filename="ctx_load.cbp" />
-		<Project filename="dummy_in.cbp" />
-		<Project filename="dx_hw.cbp" />
-		<Project filename="ffmpeg_in.cbp" />
-		<Project filename="ft_font.cbp" />
-		<Project filename="gdip_raster.cbp" />
-		<Project filename="gpac_js.cbp" />
-		<Project filename="img_in.cbp" />
-		<Project filename="ismacryp.cbp" />
-		<Project filename="isom_in.cbp" />
-		<Project filename="laser_dec.cbp" />
-		<Project filename="libgpac.cbp" />
-		<Project filename="mp3_in.cbp" />
-		<Project filename="mp4box.cbp" />
-		<Project filename="mp4client.cbp" />
-		<Project filename="mpegts_in.cbp" />
-		<Project filename="odf_dec.cbp" />
-		<Project filename="ogg.cbp" />
-		<Project filename="osmozilla.cbp" />
-		<Project filename="raw_out.cbp" />
-		<Project filename="rtp_in.cbp" />
-		<Project filename="saf_in.cbp" />
-		<Project filename="soft_raster.cbp" />
-		<Project filename="svg_in.cbp" />
-		<Project filename="timedtext.cbp" />
-		<Project filename="wav_out.cbp" />
-		<Project filename="wxOsmo4.cbp" />
-		<Project filename="xvid_dec.cbp" />
-		<Project filename="wiiis.cbp" />
-		<Project filename="demo_is.cbp" />
-		<Project filename="ui_rec.cbp">
-			<Depends filename="libgpac.cbp" />
-		</Project>
-		<Project filename="../../applications/epg_server/epg_server.cbp" active="1">
-			<Depends filename="libgpac.cbp" />
-		</Project>
-	</Workspace>
-</CodeBlocks_workspace_file>

v0.5.2.tar.gz/build/codeblocks/gpac_js.cbp Deleted

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="gpac_js" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DGPAC_JS_EXPORTS" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\js" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DGPAC_JS_EXPORTS" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\js" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add option='[[if (PLATFORM == PLATFORM_MSW) print(_T(&quot;-ljs32&quot;));;]]' />
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\gpac_js\gpac_js.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\gpac_js\gpac_js.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/img_in.cbp Deleted

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="img_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\openjpeg" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\openjpeg" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\img_in\bmp_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\img_in\img_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\img_in\img_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\img_in\img_in.def" />
-		<Unit filename="..\..\modules\img_in\img_in.h" />
-		<Unit filename="..\..\modules\img_in\jp2_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\img_in\jpeg_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\img_in\png_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ismacryp.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ismacryp" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\ismacryp\isma_ea.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ismacryp\ismacryp.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/isom_in.cbp Deleted

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="isom_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\isom_in\isom_cache.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\isom_in\isom_in.def" />
-		<Unit filename="..\..\modules\isom_in\isom_in.h" />
-		<Unit filename="..\..\modules\isom_in\load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\isom_in\read.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\isom_in\read_ch.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/laser_dec.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="laser_dec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\laser_dec\laser_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\laser_dec\laser_dec.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/libgpac.cbp Deleted

@@ -1,864 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="libgpac" />
-		<Option makefile="../../Makefile_cb" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<MakeCommands>
-			<Build command="$make -f $makefile make" />
-			<CompileFile command="$make -f $makefile $file" />
-			<Clean command="$make -f $makefile clean" />
-			<DistClean command="$make -f $makefile distclean" />
-		</MakeCommands>
-		<Build>
-			<Target title="debug">
-				<Option output="../../bin/$(TARGET_STR)/$(PROJECT_NAME)" prefix_auto="0" extension_auto="1" />
-				<Option working_dir="../../bin/$(TARGET_STR)" />
-				<Option object_output="obj/$(TARGET_STR)/$(PROJECT_NAME)" />
-				<Option additional_output="../../config.h;" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_GPAC_HAVE_CONFIG_H" />
-					<Add directory="../../include" />
-					<Add directory="../../extra_lib/include/zlib" />
-					<Add directory="../../extra_lib/include/js" />
-					<Add directory="../../extra_lib/include/jpeg" />
-					<Add directory="../../extra_lib/include/png" />
-					<Add directory="../../../gpac" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory="../../../gpac" />
-				</ResourceCompiler>
-			</Target>
-			<Target title="release">
-				<Option output="../../bin/$(TARGET_STR)/$(PROJECT_NAME)" prefix_auto="0" extension_auto="1" />
-				<Option working_dir="../../bin/$(TARGET_STR)" />
-				<Option object_output="obj/$(TARGET_STR)/$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="../../include" />
-					<Add directory="../../extra_lib/include/zlib" />
-					<Add directory="../../extra_lib/include/js" />
-					<Add directory="../../extra_lib/include/jpeg" />
-					<Add directory="../../extra_lib/include/png" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-D_DEBUG" />
-			<Add option="-D_LIB" />
-			<Add option="-DGPAC_HAVE_CONFIG_H" />
-		</Compiler>
-		<Linker>
-			<Add option='[[if (PLATFORM == PLATFORM_MSW) print(_T(&quot;-lws2_32 -lwinmm -lopengl32 -lglu32 -ljs32&quot;));;]]' />
-			<Add library="z" />
-			<Add library="jpeg" />
-			<Add library="png" />
-			<Add directory="../../extra_lib/lib/w32" />
-		</Linker>
-		<Unit filename="../../applications/testapps/epg_server/epg_server.cbp" />
-		<Unit filename="../../include/gpac/avparse.h" />
-		<Unit filename="../../include/gpac/base_coding.h" />
-		<Unit filename="../../include/gpac/bifs.h" />
-		<Unit filename="../../include/gpac/bifsengine.h" />
-		<Unit filename="../../include/gpac/bitstream.h" />
-		<Unit filename="../../include/gpac/color.h" />
-		<Unit filename="../../include/gpac/compositor.h" />
-		<Unit filename="../../include/gpac/config_file.h" />
-		<Unit filename="../../include/gpac/configuration.h" />
-		<Unit filename="../../include/gpac/constants.h" />
-		<Unit filename="../../include/gpac/crypt.h" />
-		<Unit filename="../../include/gpac/download.h" />
-		<Unit filename="../../include/gpac/enst/dvb_mpe.h">
-			<Option target="debug" />
-		</Unit>
-		<Unit filename="../../include/gpac/enst/internal/dvb_mpe_dev.h">
-			<Option target="debug" />
-		</Unit>
-		<Unit filename="../../include/gpac/enst/internal/reedsolomon.h">
-			<Option target="debug" />
-		</Unit>
-		<Unit filename="../../include/gpac/enst/internal/rtp_module_dev.h">
-			<Option target="debug" />
-		</Unit>
-		<Unit filename="../../include/gpac/esi.h" />
-		<Unit filename="../../include/gpac/events.h" />
-		<Unit filename="../../include/gpac/filestreamer.h" />
-		<Unit filename="../../include/gpac/ietf.h" />
-		<Unit filename="../../include/gpac/internal/avilib.h" />
-		<Unit filename="../../include/gpac/internal/bifs_dev.h" />
-		<Unit filename="../../include/gpac/internal/bifs_tables.h" />
-		<Unit filename="../../include/gpac/internal/camera.h" />
-		<Unit filename="../../include/gpac/internal/compositor_dev.h" />
-		<Unit filename="../../include/gpac/internal/config_static.h" />
-		<Unit filename="../../include/gpac/internal/crypt_dev.h" />
-		<Unit filename="../../include/gpac/internal/ietf_dev.h" />
-		<Unit filename="../../include/gpac/internal/isomedia_dev.h" />
-		<Unit filename="../../include/gpac/internal/laser_dev.h" />
-		<Unit filename="../../include/gpac/internal/media_dev.h" />
-		<Unit filename="../../include/gpac/internal/mesh.h" />
-		<Unit filename="../../include/gpac/internal/odf_dev.h" />
-		<Unit filename="../../include/gpac/internal/ogg.h" />
-		<Unit filename="../../include/gpac/internal/scenegraph_dev.h" />
-		<Unit filename="../../include/gpac/internal/swf_dev.h" />
-		<Unit filename="../../include/gpac/internal/terminal_dev.h" />
-		<Unit filename="../../include/gpac/internal/vobsub.h" />
-		<Unit filename="../../include/gpac/ismacryp.h" />
-		<Unit filename="../../include/gpac/isomedia.h" />
-		<Unit filename="../../include/gpac/laser.h" />
-		<Unit filename="../../include/gpac/list.h" />
-		<Unit filename="../../include/gpac/math.h" />
-		<Unit filename="../../include/gpac/media_tools.h" />
-		<Unit filename="../../include/gpac/mediaobject.h" />
-		<Unit filename="../../include/gpac/module.h" />
-		<Unit filename="../../include/gpac/modules/audio_out.h" />
-		<Unit filename="../../include/gpac/modules/codec.h" />
-		<Unit filename="../../include/gpac/modules/font.h" />
-		<Unit filename="../../include/gpac/modules/ipmp.h" />
-		<Unit filename="../../include/gpac/modules/js_usr.h" />
-		<Unit filename="../../include/gpac/modules/raster2d.h" />
-		<Unit filename="../../include/gpac/modules/service.h" />
-		<Unit filename="../../include/gpac/modules/term_ext.h" />
-		<Unit filename="../../include/gpac/modules/video_out.h" />
-		<Unit filename="../../include/gpac/mpeg4_odf.h" />
-		<Unit filename="../../include/gpac/mpegts.h" />
-		<Unit filename="../../include/gpac/network.h" />
-		<Unit filename="../../include/gpac/nodes_mpeg4.h" />
-		<Unit filename="../../include/gpac/nodes_svg.h" />
-		<Unit filename="../../include/gpac/nodes_x3d.h" />
-		<Unit filename="../../include/gpac/nodes_xbl.h" />
-		<Unit filename="../../include/gpac/options.h" />
-		<Unit filename="../../include/gpac/path2d.h" />
-		<Unit filename="../../include/gpac/scene_manager.h" />
-		<Unit filename="../../include/gpac/scenegraph.h" />
-		<Unit filename="../../include/gpac/scenegraph_svg.h" />
-		<Unit filename="../../include/gpac/scenegraph_vrml.h" />
-		<Unit filename="../../include/gpac/setup.h" />
-		<Unit filename="../../include/gpac/svg_types.h" />
-		<Unit filename="../../include/gpac/sync_layer.h" />
-		<Unit filename="../../include/gpac/term_info.h" />
-		<Unit filename="../../include/gpac/terminal.h" />
-		<Unit filename="../../include/gpac/thread.h" />
-		<Unit filename="../../include/gpac/token.h" />
-		<Unit filename="../../include/gpac/tools.h" />
-		<Unit filename="../../include/gpac/user.h" />
-		<Unit filename="../../include/gpac/utf.h" />
-		<Unit filename="../../include/gpac/xml.h" />
-		<Unit filename="../../include/gpac/yuv.h" />
-		<Unit filename="../../src/bifs/arith_decoder.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/bifs_codec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/bifs_node_tables.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/com_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/com_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/conditional.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/field_decode.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/field_encode.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/memory_decoder.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/predictive_mffield.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/quant.h" />
-		<Unit filename="../../src/bifs/quantize.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/script.h" />
-		<Unit filename="../../src/bifs/script_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/script_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/bifs/unquantize.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/audio_input.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/audio_mixer.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/audio_render.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/bindable.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/camera.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/compositor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/compositor_2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/compositor_3d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/compositor_node_init.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/drawable.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/drawable.h" />
-		<Unit filename="../../src/compositor/events.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/font_engine.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/gl_inc.h" />
-		<Unit filename="../../src/compositor/hardcoded_protos.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mesh.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mesh_collide.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mesh_tesselate.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_animstream.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_audio.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_background.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_background2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_bitmap.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_composite.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_form.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_geometry_2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_geometry_3d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_geometry_ifs2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_geometry_ils2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_gradients.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_grouping.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_grouping.h" />
-		<Unit filename="../../src/compositor/mpeg4_grouping_2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_grouping_3d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_layer_2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_layer_3d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_layout.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_lighting.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_path_layout.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_sensors.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_sound.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_text.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_textures.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_timesensor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/mpeg4_viewport.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/navigate.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/nodes_stacks.h" />
-		<Unit filename="../../src/compositor/offscreen_cache.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/offscreen_cache.h" />
-		<Unit filename="../../src/compositor/svg_base.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/svg_font.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/svg_geometry.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/svg_grouping.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/svg_media.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/svg_paint_servers.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/svg_text.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/texturing.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/texturing.h" />
-		<Unit filename="../../src/compositor/texturing_gl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/visual_manager.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/visual_manager.h" />
-		<Unit filename="../../src/compositor/visual_manager_2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/visual_manager_2d.h" />
-		<Unit filename="../../src/compositor/visual_manager_2d_draw.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/visual_manager_3d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/visual_manager_3d.h" />
-		<Unit filename="../../src/compositor/visual_manager_3d_gl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/compositor/x3d_geometry.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtcp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtp_depacketizer.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtp_packetizer.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtp_pck_3gpp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtp_pck_mpeg12.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtp_pck_mpeg4.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtsp_command.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtsp_common.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtsp_response.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/rtsp_session.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/ietf/sdp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/avc_ext.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_code_3gpp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_code_apple.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_code_base.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_code_drm.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_code_meta.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_dump.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/box_funcs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/data_map.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/hint_track.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/hinting.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/drm_sample.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/isom_intern.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/isom_read.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/isom_store.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/isom_write.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/media.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/media_odf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/meta.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/movie_fragments.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/sample_descs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/stbl_read.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/stbl_write.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/track.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/isomedia/tx3g.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/laser/lsr_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/laser/lsr_enc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/laser/lsr_tables.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/cbc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/cfb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/ctr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/des.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/ecb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/g_crypt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/ncfb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/nofb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/ofb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/rijndael-128.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/rijndael-192.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/rijndael-256.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/stream.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/mcrypt/tripledes.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/av_parsers.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/avilib.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/filestreamer.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/gpac_ogg.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/img.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/ismacryp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/isom_hinter.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/isom_tools.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/media_export.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/media_import.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/mpeg2_ps.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/mpeg2_ps.h" />
-		<Unit filename="../../src/media_tools/mpegts.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/saf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/text_import.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/media_tools/vobsub.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/desc_private.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/descriptors.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/ipmpx_code.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/ipmpx_dump.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/ipmpx_parse.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/oci_codec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/odf_code.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/odf_codec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/odf_command.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/odf_dump.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/odf_parse.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/qos.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/odf/slc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/encode_isom.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/loader_bt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/loader_isom.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/loader_qt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/loader_svg.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/loader_xmt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/scene_dump.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/scene_manager.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/scene_stats.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/swf_bifs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/swf_parse.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scene_manager/text_to_bifs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/base_scenegraph.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/commands.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/dom_events.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/dom_smjs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/mpeg4_animators.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/mpeg4_nodes.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/mpeg4_valuator.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/smil_anim.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/smil_timing.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/svg_attributes.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/svg_properties.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/svg_smjs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/svg_types.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/vrml_interpolators.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/vrml_proto.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/vrml_route.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/vrml_script.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/vrml_smjs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/vrml_tools.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/x3d_nodes.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/xbl_process.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/scenegraph/xml_ns.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/channel.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/clock.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/decoder.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/input_sensor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/input_sensor.h" />
-		<Unit filename="../../src/terminal/media_control.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/media_control.h" />
-		<Unit filename="../../src/terminal/media_manager.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/media_memory.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/media_memory.h" />
-		<Unit filename="../../src/terminal/media_object.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/media_sensor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/network_service.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/object_browser.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/object_manager.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/svg_external.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/term_node_init.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/terminal/terminal.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/base_encoding.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/bitstream.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/color.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/configfile.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/downloader.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/error.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/list.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/math.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/map.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/module.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/module_wrap.h" />
-		<Unit filename="../../src/utils/os_divers.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/os_file.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/os_module.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/os_net.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/os_thread.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/path2d.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/path2d_stroker.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/token.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/uni_bidi.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/url.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/sha1.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/utf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../src/utils/xml_parser.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/mp3_in.cbp Deleted

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="mp3_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\mad" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\mad" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DGPAC_HAS_MAD" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="mad" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\mp3_in\mad_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\mp3_in\mp3_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\mp3_in\mp3_in.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/mp4box.cbp Deleted

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="mp4box" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\w32_rel\MP4Box" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-				</Compiler>
-				<Linker>
-					<Add library="kernel32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="winspool" />
-					<Add library="comdlg32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="ole32" />
-					<Add library="oleaut32" />
-					<Add library="uuid" />
-					<Add library="odbc32" />
-					<Add library="odbccp32" />
-				</Linker>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\w32_deb\MP4Box" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-				</Compiler>
-				<Linker>
-					<Add library="kernel32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="winspool" />
-					<Add library="comdlg32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="ole32" />
-					<Add library="oleaut32" />
-					<Add library="uuid" />
-					<Add library="odbc32" />
-					<Add library="odbccp32" />
-				</Linker>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\applications\mp4box\filedump.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\applications\mp4box\fileimport.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\applications\mp4box\main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/mp4client.cbp Deleted

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="mp4client" />
-		<Option pch_mode="2" />
-		<Option default_target="debug" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\MP4Client" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\MP4Client" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\bin\$(TARGET_STR)" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="..\..\modules\demo_is\demo-sensor.bt" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\applications\mp4client\extract.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\applications\mp4client\main.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/mpegts_in.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="mpegts_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\mpegts_in\mpegts_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\mpegts_in\mpegts_in.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/odf_dec.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="odf_dec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\odf_dec\odf_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\odf_dec\odf_dec.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ogg.cbp Deleted

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ogg" />
-		<Option platforms="" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-DGPAC_HAS_VORBIS" />
-			<Add option="-DGPAC_HAS_THEORA" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="vorbis" />
-			<Add library="teora" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\ogg\ogg.def" />
-		<Unit filename="..\..\modules\ogg\ogg_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ogg\ogg_in.h" />
-		<Unit filename="..\..\modules\ogg\ogg_load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ogg\theora_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ogg\vorbis_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/osmozilla.cbp Deleted

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="osmozilla" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\nposmozilla" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\nposmozilla" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add option="-fexceptions" />
-			<Add option="[[" />
-			<Add option='if (PLATFORM == PLATFORM_MSW) { print(_T(&quot;-DXP_WIN&quot;));}' />
-			<Add option='else if (PLATFORM == PLATFORM_MAC) { print(_T(&quot;-DXP_MAC&quot;));}' />
-			<Add option='else { print(_T(&quot;-DXP_UNIX -DMOZ_X11&quot;));}' />
-			<Add option="]]" />
-			<Add option="-DNPBASIC_EXPORTS" />
-			<Add option="-DMOZILLA_STRICT_API" />
-			<Add option="-DXPCOM_GLUE" />
-			<Add option="-DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX" />
-			<Add directory="..\..\include" />
-			<Add directory="..\..\extra_lib\include\gecko-sdk\include" />
-		</Compiler>
-		<Linker>
-			<Add option="[[" />
-			<Add option='if (PLATFORM == PLATFORM_MSW) { print(_T(&quot;-lwinmm -lgdi32&quot;));}' />
-			<Add option="]]" />
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\applications\osmozilla\np_entry.cpp" />
-		<Unit filename="..\..\applications\osmozilla\npn_gate.cpp" />
-		<Unit filename="..\..\applications\osmozilla\npp_gate.cpp" />
-		<Unit filename="..\..\applications\osmozilla\npplat.h" />
-		<Unit filename="..\..\applications\osmozilla\nsIOsmozilla.h" />
-		<Unit filename="..\..\applications\osmozilla\osmozilla.cpp" />
-		<Unit filename="..\..\applications\osmozilla\osmozilla.def" />
-		<Unit filename="..\..\applications\osmozilla\osmozilla.h" />
-		<Unit filename="..\..\applications\osmozilla\osmozilla.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/raw_out.cbp Deleted

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="raw_out" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DRAW_OUT_EXPORTS" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_MBCS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DRAW_OUT_EXPORTS" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\raw_out\raw_out.def" />
-		<Unit filename="..\..\modules\raw_out\raw_video.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/rtp_in.cbp Deleted

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="rtp_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\rtp_in\rtp_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\rtp_in\rtp_in.def" />
-		<Unit filename="..\..\modules\rtp_in\rtp_in.h" />
-		<Unit filename="..\..\modules\rtp_in\rtp_session.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\rtp_in\rtp_signaling.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\rtp_in\rtp_stream.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\rtp_in\sdp_fetch.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\rtp_in\sdp_load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/saf_in.cbp Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="saf_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\saf_in\saf_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\saf_in\saf_in.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/sdl_out.cbp Deleted

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="sdl_out" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="sdl" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\sdl_out\audio.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\sdl_out\cursors.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\sdl_out\sdl_out.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\sdl_out\sdl_out.def" />
-		<Unit filename="..\..\modules\sdl_out\sdl_out.h" />
-		<Unit filename="..\..\modules\sdl_out\video.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/soft_raster.cbp Deleted

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="soft_raster" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\w32_rel\gm_soft_raster" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\soft_raster\ftgrays.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\soft_raster\rast_soft.def" />
-		<Unit filename="..\..\modules\soft_raster\rast_soft.h" />
-		<Unit filename="..\..\modules\soft_raster\raster_565.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\soft_raster\raster_argb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\soft_raster\raster_load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\soft_raster\raster_rgb.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\soft_raster\stencil.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\soft_raster\surface.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/svg_in.cbp Deleted

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="svg_in" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\zlib" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-					<Add directory="..\..\extra_lib\include\zlib" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="z" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\svg_in\svg_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\svg_in\svg_in.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/timedtext.cbp Deleted

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="timedtext" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\timedtext\timedtext.def" />
-		<Unit filename="..\..\modules\timedtext\timedtext_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\timedtext\timedtext_in.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/ui_rec.cbp Deleted

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="ui_rec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\ui_rec\ui_rec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\ui_rec\ui_rec.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/wav_out.cbp Deleted

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="wav_out" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Linker>
-			<Add option='[[if (PLATFORM == PLATFORM_MSW) print(_T(&quot;-lwinmm&quot;));;]]' />
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\wav_out\wav_out.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\wav_out\wav_out.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/wiiis.cbp Deleted

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="wiiis" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\extra_lib\include" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="wiiuse" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-		</Linker>
-		<Unit filename="..\..\modules\wiiis\wiiis.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\wiiis\wiiis.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/wxOsmo4.cbp Deleted

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="wxOsmo4" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\Osmo4" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\Osmo4" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-					<Add directory="..\..\include" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<ResourceCompiler>
-			<Add directory="..\..\applications\osmo4_wx" />
-		</ResourceCompiler>
-		<Linker>
-			<Add option='[[print(_T(&quot;-lwx_msw_core-2.8 -lwx_base-2.8 -luuid -loleaut32 -lole32 -lcomctl32&quot;));;]]' />
-			<Add library="gpac" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\applications\osmo4_wx\Playlist.cpp" />
-		<Unit filename="..\..\applications\osmo4_wx\Playlist.h" />
-		<Unit filename="..\..\applications\osmo4_wx\fileprops.cpp" />
-		<Unit filename="..\..\applications\osmo4_wx\fileprops.h" />
-		<Unit filename="..\..\applications\osmo4_wx\menubtn.cpp" />
-		<Unit filename="..\..\applications\osmo4_wx\menubtn.h" />
-		<Unit filename="..\..\applications\osmo4_wx\osmo4.ico" />
-		<Unit filename="..\..\applications\osmo4_wx\resource.h" />
-		<Unit filename="..\..\applications\osmo4_wx\wxGPACControl.cpp" />
-		<Unit filename="..\..\applications\osmo4_wx\wxGPACControl.h" />
-		<Unit filename="..\..\applications\osmo4_wx\wxOsmo4.cpp" />
-		<Unit filename="..\..\applications\osmo4_wx\wxOsmo4.h" />
-		<Unit filename="..\..\applications\osmo4_wx\wxOsmo4.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/codeblocks/xvid_dec.cbp Deleted

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="xvid_dec" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="release">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-fexceptions" />
-				</Compiler>
-			</Target>
-			<Target title="debug">
-				<Option output="..\..\bin\$(TARGET_STR)\gm_$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\$(TARGET_STR)\$(PROJECT_NAME)" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-fexceptions" />
-				</Compiler>
-			</Target>
-			<Environment>
-				<Variable name="TARGET_STR" value="$(TARGET_CC)_$(TARGET_NAME)" />
-			</Environment>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\include" />
-			<Add directory="..\..\extra_lib\include\xvid" />
-		</Compiler>
-		<Linker>
-			<Add library="gpac" />
-			<Add library="xvidcore" />
-			<Add directory="..\..\extra_lib\lib\w32" />
-			<Add directory="..\..\bin\$(TARGET_STR)" />
-		</Linker>
-		<Unit filename="..\..\modules\xvid_dec\xvid_dec.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\modules\xvid_dec\xvid_dec.def" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

v0.5.2.tar.gz/build/msevc4 Deleted

v0.5.2.tar.gz/build/msevc4/GPAC.VCW Deleted

@@ -1,434 +0,0 @@
-Microsoft eMbedded Visual Tools Workspace File, Format Version 4.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "GPAX"=.\GPAX.VCP - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "Osmo4"=.\Osmo4.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "aac_in"=.\aac_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ac3_in"=.\ac3_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "amr_dec"=.\amr_dec.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "bifs_dec"=.\bifs_dec.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ctx_load"=.\ctx_load.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dummy_in"=.\dummy_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ffmpeg_in"=.\ffmpeg_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ft_font"=.\ft_font.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gapi"=.\gapi.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gpac_js"=.\gpac_js.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "img_in"=.\img_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ismacryp"=.\ismacryp.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "isom_in"=.\isom_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "laser_dec"=.\laser_dec.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libgpac"=.\libgpac.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libgpac_dll"=.\libgpac_dll.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mp3_in"=.\mp3_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "odf_dec"=.\odf_dec.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "osmophone"=.\osmophone.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rtp_in"=.\rtp_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "saf_in"=.\saf_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "soft_rast"=.\soft_rast.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "svg_in"=.\svg_in.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "timedtext"=.\timedtext.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "wav_out"=.\wav_out.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xvid_dec"=.\xvid_dec.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libgpac_dll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

v0.5.2.tar.gz/build/msevc4/GPAX.VCP Deleted

@@ -1,192 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="GPAX" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=GPAX - Win32 (WCE ARMV4) Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GPAX.VCN".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GPAX.VCN" CFG="GPAX - Win32 (WCE ARMV4) Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GPAX - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "GPAX - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "GPAX - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/gpax_rel"
-# PROP Intermediate_Dir "obj/gpax_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GPAX_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/GPAX.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "GPAX - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/gpax_deb"
-# PROP Intermediate_Dir "obj/gpax_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAX_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAX_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/GPAX.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GPAX - Win32 (WCE ARMV4) Release"
-# Name "GPAX - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\gpax.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAX.cpp
-DEP_CPP_GPAX_=\
-	"..\..\applications\GPAX\GPAX.h"\
-	"..\..\applications\GPAX\GPAX_i.c"\
-	"..\..\applications\GPAX\GPAXPlugin.h"\
-	"..\..\applications\GPAX\StdAfx.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_GPAX_=\
-	"..\..\include\gpac\config.h"\
-	".\uiddef.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAX.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAX.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAX.idl
-# ADD MTL /tlb ".\GPAX.tlb"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAX.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAX.rgs
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAXPlugin.cpp
-DEP_CPP_GPAXP=\
-	"..\..\applications\GPAX\GPAX.h"\
-	"..\..\applications\GPAX\GPAXPlugin.h"\
-	"..\..\applications\GPAX\StdAfx.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_GPAXP=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\GPAXPlugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\StdAfx.cpp
-DEP_CPP_STDAF=\
-	"..\..\applications\GPAX\StdAfx.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\GPAX\StdAfx.h
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/Osmo4.vcp Deleted

@@ -1,310 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="Osmo4" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Application" 0xa301
-
-CFG=Osmo4 - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Osmo4.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Osmo4.vcn" CFG="Osmo4 - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Osmo4 - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Application")
-!MESSAGE "Osmo4 - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Osmo4 - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/osmo4_rel"
-# PROP Intermediate_Dir "obj/osmo4_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /d "_AFXDLL" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_AFXDLL" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 gx.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/Osmo4.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Osmo4 - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/osmo4_deb"
-# PROP Intermediate_Dir "obj/osmo4_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 gx.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/Osmo4.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Osmo4 - Win32 (WCE ARMV4) Release"
-# Name "Osmo4 - Win32 (WCE ARMV4) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\MainFrm.cpp
-DEP_CPP_MAINF=\
-	"..\..\applications\osmo4_wce\MainFrm.h"\
-	"..\..\applications\osmo4_wce\Osmo4.h"\
-	"..\..\applications\osmo4_wce\ProgressBar.h"\
-	"..\..\applications\osmo4_wce\StdAfx.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	{$(INCLUDE)}"gx.h"\
-	
-NODEP_CPP_MAINF=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\OpenDlg.cpp
-DEP_CPP_OPEND=\
-	"..\..\applications\osmo4_wce\OpenDlg.h"\
-	"..\..\applications\osmo4_wce\Osmo4.h"\
-	"..\..\applications\osmo4_wce\StdAfx.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_OPEND=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\Options.cpp
-DEP_CPP_OPTIO=\
-	"..\..\applications\osmo4_wce\Options.h"\
-	"..\..\applications\osmo4_wce\Osmo4.h"\
-	"..\..\applications\osmo4_wce\StdAfx.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\iso639.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	{$(INCLUDE)}"gx.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\Osmo4.cpp
-DEP_CPP_OSMO4=\
-	"..\..\applications\osmo4_wce\MainFrm.h"\
-	"..\..\applications\osmo4_wce\OpenDlg.h"\
-	"..\..\applications\osmo4_wce\Options.h"\
-	"..\..\applications\osmo4_wce\Osmo4.h"\
-	"..\..\applications\osmo4_wce\ProgressBar.h"\
-	"..\..\applications\osmo4_wce\StdAfx.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	{$(INCLUDE)}"gx.h"\
-	
-NODEP_CPP_OSMO4=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\Osmo4.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\ProgressBar.cpp
-DEP_CPP_PROGR=\
-	"..\..\applications\osmo4_wce\Osmo4.h"\
-	"..\..\applications\osmo4_wce\ProgressBar.h"\
-	"..\..\applications\osmo4_wce\StdAfx.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_PROGR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\StdAfx.cpp
-DEP_CPP_STDAF=\
-	"..\..\applications\osmo4_wce\StdAfx.h"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\MainFrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\newres.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\OpenDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\Options.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\Osmo4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\ProgressBar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\StdAfx.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\res\Cmdbar.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmo4_wce\res\Osmo4.ico
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\include\gpac\sync_layer.h
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/aac_in.vcp Deleted

@@ -1,159 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="aac_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=aac_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "aac_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "aac_in.vcn" CFG="aac_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "aac_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "aac_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "aac_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/aac_in_rel"
-# PROP Intermediate_Dir "obj/aac_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "AAC_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include/faad" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GPAC_HAS_FAAD" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 libfaad2.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_aac_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "aac_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/aac_in_deb"
-# PROP Intermediate_Dir "obj/aac_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "AAC_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/faad" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAC_HAS_FAAD" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 libfaad2.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_aac_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "aac_in - Win32 (WCE ARMV4) Release"
-# Name "aac_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\aac_in\aac_in.c
-DEP_CPP_AAC_I=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_AAC_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\aac_in\faad_dec.c
-DEP_CPP_FAAD_=\
-	"..\..\extra_lib\include\faad\faad.h"\
-	"..\..\extra_lib\include\faad\neaacdec.h"\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_FAAD_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/ac3_in.vcp Deleted

@@ -1,157 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="ac3_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=ac3_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ac3_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ac3_in.vcn" CFG="ac3_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ac3_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "ac3_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ac3_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/ac3_in_rel"
-# PROP Intermediate_Dir "obj/ac3_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "AC3_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../include" /I "../../extra_lib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GPAC_HAS_LIBA52" /YX /O2 /M$(CECrtMT) /c
-# SUBTRACT CPP /u
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 liba52.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_ac3_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "ac3_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/ac3_in_deb"
-# PROP Intermediate_Dir "obj/ac3_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "AC3_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAC_HAS_LIBA52" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 liba52.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_ac3_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ac3_in - Win32 (WCE ARMV4) Release"
-# Name "ac3_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\ac3_in\ac3_in.c
-DEP_CPP_AC3_I=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_AC3_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\ac3_in\liba52_dec.c
-DEP_CPP_LIBA5=\
-	"..\..\extra_lib\include\a52dec\a52.h"\
-	"..\..\extra_lib\include\a52dec\mm_accel.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LIBA5=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/amr_dec.vcp Deleted

@@ -1,2320 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="amr_dec" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=amr_dec - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "amr_dec.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "amr_dec.vcn" CFG="amr_dec - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "amr_dec - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "amr_dec - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "amr_dec - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/amr_dec_rel"
-# PROP Intermediate_Dir "obj/amr_dec_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "AMR_DEC_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "__MSDOS__" /D "MMS_IO" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_amr_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "amr_dec - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/amr_dec_deb"
-# PROP Intermediate_Dir "obj/amr_dec_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "AMR_DEC_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__MSDOS__" /D "MMS_IO" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_amr_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "amr_dec - Win32 (WCE ARMV4) Release"
-# Name "amr_dec - Win32 (WCE ARMV4) Debug"
-# Begin Group "AMR_NB"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\a_refl.c
-DEP_CPP_A_REF=\
-	"..\..\modules\amr_dec\amr_nb\a_refl.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\a_refl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\agc.c
-DEP_CPP_AGC_C=\
-	"..\..\modules\amr_dec\amr_nb\agc.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\agc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\autocorr.c
-DEP_CPP_AUTOC=\
-	"..\..\modules\amr_dec\amr_nb\autocorr.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\autocorr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\az_lsp.c
-DEP_CPP_AZ_LS=\
-	"..\..\modules\amr_dec\amr_nb\az_lsp.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\grid.tab"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\az_lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\b_cn_cod.c
-DEP_CPP_B_CN_=\
-	"..\..\modules\amr_dec\amr_nb\b_cn_cod.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\window.tab"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\b_cn_cod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\basic_op.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\basicop2.c
-DEP_CPP_BASIC=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\bgnscd.c
-DEP_CPP_BGNSC=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\bgnscd.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gmed_n.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\sqrt_l.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\bgnscd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\bits2prm.c
-DEP_CPP_BITS2=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\bitno.tab"\
-	"..\..\modules\amr_dec\amr_nb\bits2prm.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\bits2prm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c1035pf.c
-DEP_CPP_C1035=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c1035pf.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gray.tab"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\s10_8pf.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c1035pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c2_11pf.c
-DEP_CPP_C2_11=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_11pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_11pf.tab"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c2_11pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c2_9pf.c
-DEP_CPP_C2_9P=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_9pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_9pf.tab"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c2_9pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c3_14pf.c
-DEP_CPP_C3_14=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c3_14pf.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c3_14pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c4_17pf.c
-DEP_CPP_C4_17=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c4_17pf.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gray.tab"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c4_17pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c8_31pf.c
-DEP_CPP_C8_31=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c8_31pf.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\s10_8pf.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c8_31pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c_g_aver.c
-DEP_CPP_C_G_A=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c_g_aver.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\c_g_aver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\calc_cor.c
-DEP_CPP_CALC_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\calc_cor.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\calc_cor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\calc_en.c
-DEP_CPP_CALC_E=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\calc_en.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\calc_en.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cbsearch.c
-DEP_CPP_CBSEA=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c1035pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_11pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_9pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c3_14pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c4_17pf.h"\
-	"..\..\modules\amr_dec\amr_nb\c8_31pf.h"\
-	"..\..\modules\amr_dec\amr_nb\cbsearch.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cbsearch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cl_ltp.c
-DEP_CPP_CL_LT=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cl_ltp.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\convolve.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\enc_lag3.h"\
-	"..\..\modules\amr_dec\amr_nb\enc_lag6.h"\
-	"..\..\modules\amr_dec\amr_nb\g_pitch.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pitch_fr.h"\
-	"..\..\modules\amr_dec\amr_nb\pred_lt.h"\
-	"..\..\modules\amr_dec\amr_nb\q_gain_p.h"\
-	"..\..\modules\amr_dec\amr_nb\ton_stab.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cl_ltp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cnst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cnst_vad.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cod_amr.c
-DEP_CPP_COD_A=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cbsearch.h"\
-	"..\..\modules\amr_dec\amr_nb\cl_ltp.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst_vad.h"\
-	"..\..\modules\amr_dec\amr_nb\cod_amr.h"\
-	"..\..\modules\amr_dec\amr_nb\convolve.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\g_adapt.h"\
-	"..\..\modules\amr_dec\amr_nb\gain_q.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\levinson.h"\
-	"..\..\modules\amr_dec\amr_nb\lpc.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\ol_ltp.h"\
-	"..\..\modules\amr_dec\amr_nb\p_ol_wgh.h"\
-	"..\..\modules\amr_dec\amr_nb\pitch_fr.h"\
-	"..\..\modules\amr_dec\amr_nb\pre_big.h"\
-	"..\..\modules\amr_dec\amr_nb\pred_lt.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\qua_gain.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\spreproc.h"\
-	"..\..\modules\amr_dec\amr_nb\spstproc.h"\
-	"..\..\modules\amr_dec\amr_nb\ton_stab.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad.h"\
-	"..\..\modules\amr_dec\amr_nb\vad1.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cod_amr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\convolve.c
-DEP_CPP_CONVO=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\convolve.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\convolve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\copy.c
-DEP_CPP_COPY_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\copy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cor_h.c
-DEP_CPP_COR_H=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cor_h.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\cor_h.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\count.c
-DEP_CPP_COUNT=\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\count.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d1035pf.c
-DEP_CPP_D1035=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d1035pf.h"\
-	"..\..\modules\amr_dec\amr_nb\gray.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d1035pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d2_11pf.c
-DEP_CPP_D2_11=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d2_11pf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d2_11pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d2_9pf.c
-DEP_CPP_D2_9P=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c2_9pf.tab"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d2_9pf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d2_9pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d3_14pf.c
-DEP_CPP_D3_14=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d3_14pf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d3_14pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d4_17pf.c
-DEP_CPP_D4_17=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d4_17pf.h"\
-	"..\..\modules\amr_dec\amr_nb\gray.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d4_17pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d8_31pf.c
-DEP_CPP_D8_31=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d8_31pf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d8_31pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_gain_c.c
-DEP_CPP_D_GAI=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_gain_c.h"\
-	"..\..\modules\amr_dec\amr_nb\gains.tab"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_gain_c.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_gain_p.c
-DEP_CPP_D_GAIN=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_gain_p.h"\
-	"..\..\modules\amr_dec\amr_nb\gains.tab"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_gain_p.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_homing.c
-DEP_CPP_D_HOM=\
-	"..\..\modules\amr_dec\amr_nb\bitno.tab"\
-	"..\..\modules\amr_dec\amr_nb\bits2prm.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\d_homing.h"\
-	"..\..\modules\amr_dec\amr_nb\d_homing.tab"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_homing.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_plsf.c
-DEP_CPP_D_PLS=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_5.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_plsf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_plsf_3.c
-DEP_CPP_D_PLSF=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_3.tab"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\d_plsf_5.c
-DEP_CPP_D_PLSF_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_5.tab"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_amr.c
-DEP_CPP_DEC_A=\
-	"..\..\modules\amr_dec\amr_nb\agc.h"\
-	"..\..\modules\amr_dec\amr_nb\b_cn_cod.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\bgnscd.h"\
-	"..\..\modules\amr_dec\amr_nb\bitno.tab"\
-	"..\..\modules\amr_dec\amr_nb\c_g_aver.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d1035pf.h"\
-	"..\..\modules\amr_dec\amr_nb\d2_11pf.h"\
-	"..\..\modules\amr_dec\amr_nb\d2_9pf.h"\
-	"..\..\modules\amr_dec\amr_nb\d3_14pf.h"\
-	"..\..\modules\amr_dec\amr_nb\d4_17pf.h"\
-	"..\..\modules\amr_dec\amr_nb\d8_31pf.h"\
-	"..\..\modules\amr_dec\amr_nb\d_gain_c.h"\
-	"..\..\modules\amr_dec\amr_nb\d_gain_p.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_amr.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_gain.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_lag3.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_lag6.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_dec.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\ec_gains.h"\
-	"..\..\modules\amr_dec\amr_nb\ex_ctrl.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\int_lpc.h"\
-	"..\..\modules\amr_dec\amr_nb\int_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.tab"\
-	"..\..\modules\amr_dec\amr_nb\lsp_avg.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\ph_disp.h"\
-	"..\..\modules\amr_dec\amr_nb\pred_lt.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\sqrt_l.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_amr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_gain.c
-DEP_CPP_DEC_G=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_gain.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\qgain475.tab"\
-	"..\..\modules\amr_dec\amr_nb\qua_gain.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_gain.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_lag3.c
-DEP_CPP_DEC_L=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_lag3.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_lag3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_lag6.c
-DEP_CPP_DEC_LA=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_lag6.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dec_lag6.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dtx_dec.c
-DEP_CPP_DTX_D=\
-	"..\..\modules\amr_dec\amr_nb\a_refl.h"\
-	"..\..\modules\amr_dec\amr_nb\b_cn_cod.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\c_g_aver.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_dec.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.tab"\
-	"..\..\modules\amr_dec\amr_nb\lsp_az.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_5.tab"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dtx_dec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dtx_enc.c
-DEP_CPP_DTX_E=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.tab"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\dtx_enc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\e_homing.c
-DEP_CPP_E_HOM=\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\e_homing.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\e_homing.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ec_gains.c
-DEP_CPP_EC_GA=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\ec_gains.h"\
-	"..\..\modules\amr_dec\amr_nb\gains.tab"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\gmed_n.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ec_gains.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\enc_lag3.c
-DEP_CPP_ENC_L=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\enc_lag3.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\enc_lag3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\enc_lag6.c
-DEP_CPP_ENC_LA=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\enc_lag6.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\enc_lag6.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ex_ctrl.c
-DEP_CPP_EX_CT=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\ex_ctrl.h"\
-	"..\..\modules\amr_dec\amr_nb\gmed_n.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\sqrt_l.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ex_ctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\g_adapt.c
-DEP_CPP_G_ADA=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\g_adapt.h"\
-	"..\..\modules\amr_dec\amr_nb\gmed_n.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\g_adapt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\g_code.c
-DEP_CPP_G_COD=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\g_code.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\g_code.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\g_pitch.c
-DEP_CPP_G_PIT=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\g_pitch.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\g_pitch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\gain_q.c
-DEP_CPP_GAIN_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\calc_en.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\g_adapt.h"\
-	"..\..\modules\amr_dec\amr_nb\g_code.h"\
-	"..\..\modules\amr_dec\amr_nb\gain_q.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_gain_c.h"\
-	"..\..\modules\amr_dec\amr_nb\qgain475.h"\
-	"..\..\modules\amr_dec\amr_nb\qgain795.h"\
-	"..\..\modules\amr_dec\amr_nb\qua_gain.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\gain_q.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\gc_pred.c
-DEP_CPP_GC_PR=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\gc_pred.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\gmed_n.c
-DEP_CPP_GMED_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gmed_n.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\gmed_n.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\hp_max.c
-DEP_CPP_HP_MA=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\hp_max.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\hp_max.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\int_lpc.c
-DEP_CPP_INT_L=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\int_lpc.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_az.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\int_lpc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\int_lsf.c
-DEP_CPP_INT_LS=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\int_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\int_lsf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\inter_36.c
-DEP_CPP_INTER=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inter_36.h"\
-	"..\..\modules\amr_dec\amr_nb\inter_36.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\inter_36.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\inv_sqrt.c
-DEP_CPP_INV_S=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\inv_sqrt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lag_wind.c
-DEP_CPP_LAG_W=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lag_wind.h"\
-	"..\..\modules\amr_dec\amr_nb\lag_wind.tab"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lag_wind.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\levinson.c
-DEP_CPP_LEVIN=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\levinson.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\levinson.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lflg_upd.c
-DEP_CPP_LFLG_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\log2.c
-DEP_CPP_LOG2_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\log2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lpc.c
-DEP_CPP_LPC_C=\
-	"..\..\modules\amr_dec\amr_nb\autocorr.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lag_wind.h"\
-	"..\..\modules\amr_dec\amr_nb\levinson.h"\
-	"..\..\modules\amr_dec\amr_nb\lpc.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\window.tab"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lpc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsfwt.c
-DEP_CPP_LSFWT=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lsfwt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsfwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp.c
-DEP_CPP_LSP_C=\
-	"..\..\modules\amr_dec\amr_nb\az_lsp.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\int_lpc.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.tab"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp_avg.c
-DEP_CPP_LSP_A=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_avg.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_5.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp_avg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp_az.c
-DEP_CPP_LSP_AZ=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_az.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp_az.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp_lsf.c
-DEP_CPP_LSP_L=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\lsp_lsf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\mac_32.c
-DEP_CPP_MAC_3=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mac_32.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\mac_32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\mode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\n_proc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\n_proc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ol_ltp.c
-DEP_CPP_OL_LT=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst_vad.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\ol_ltp.h"\
-	"..\..\modules\amr_dec\amr_nb\p_ol_wgh.h"\
-	"..\..\modules\amr_dec\amr_nb\pitch_ol.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad.h"\
-	"..\..\modules\amr_dec\amr_nb\vad1.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ol_ltp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\oper_32b.c
-DEP_CPP_OPER_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\oper_32b.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\p_ol_wgh.c
-DEP_CPP_P_OL_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\calc_cor.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst_vad.h"\
-	"..\..\modules\amr_dec\amr_nb\corrwght.tab"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gmed_n.h"\
-	"..\..\modules\amr_dec\amr_nb\hp_max.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\p_ol_wgh.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad.h"\
-	"..\..\modules\amr_dec\amr_nb\vad1.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\p_ol_wgh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ph_disp.c
-DEP_CPP_PH_DI=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\ph_disp.h"\
-	"..\..\modules\amr_dec\amr_nb\ph_disp.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ph_disp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pitch_fr.c
-DEP_CPP_PITCH=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\convolve.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\enc_lag3.h"\
-	"..\..\modules\amr_dec\amr_nb\enc_lag6.h"\
-	"..\..\modules\amr_dec\amr_nb\inter_36.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pitch_fr.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pitch_fr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pitch_ol.c
-DEP_CPP_PITCH_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\calc_cor.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst_vad.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\hp_max.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pitch_ol.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad.h"\
-	"..\..\modules\amr_dec\amr_nb\vad1.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pitch_ol.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\post_pro.c
-DEP_CPP_POST_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\post_pro.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\post_pro.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pow2.c
-DEP_CPP_POW2_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pow2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pre_big.c
-DEP_CPP_PRE_B=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pre_big.h"\
-	"..\..\modules\amr_dec\amr_nb\residu.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\weight_a.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pre_big.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pre_proc.c
-DEP_CPP_PRE_P=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pre_proc.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pre_proc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pred_lt.c
-DEP_CPP_PRED_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\pred_lt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pred_lt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\preemph.c
-DEP_CPP_PREEM=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\preemph.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\preemph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\prm2bits.c
-DEP_CPP_PRM2B=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\bitno.tab"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\prm2bits.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\prm2bits.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pstfilt.c
-DEP_CPP_PSTFI=\
-	"..\..\modules\amr_dec\amr_nb\agc.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\preemph.h"\
-	"..\..\modules\amr_dec\amr_nb\pstfilt.h"\
-	"..\..\modules\amr_dec\amr_nb\residu.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\weight_a.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\pstfilt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_gain_c.c
-DEP_CPP_Q_GAI=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gains.tab"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\q_gain_c.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_gain_c.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_gain_p.c
-DEP_CPP_Q_GAIN=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gains.tab"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\q_gain_p.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_gain_p.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_plsf.c
-DEP_CPP_Q_PLS=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_plsf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_plsf_3.c
-DEP_CPP_Q_PLSF=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lsfwt.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_3.tab"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\q_plsf_5.c
-DEP_CPP_Q_PLSF_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\lsfwt.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_lsf.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf_5.tab"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\qgain475.c
-DEP_CPP_QGAIN=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mac_32.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\qgain475.h"\
-	"..\..\modules\amr_dec\amr_nb\qgain475.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\qgain475.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\qgain795.c
-DEP_CPP_QGAIN7=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\calc_en.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\g_adapt.h"\
-	"..\..\modules\amr_dec\amr_nb\gains.tab"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\mac_32.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\q_gain_p.h"\
-	"..\..\modules\amr_dec\amr_nb\qgain795.h"\
-	"..\..\modules\amr_dec\amr_nb\sqrt_l.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\qgain795.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\qua_gain.c
-DEP_CPP_QUA_G=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\qua_gain.h"\
-	"..\..\modules\amr_dec\amr_nb\qua_gain.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\qua_gain.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\r_fft.c
-DEP_CPP_R_FFT=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\reorder.c
-DEP_CPP_REORD=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\reorder.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\reorder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\residu.c
-DEP_CPP_RESID=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\residu.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\residu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\s10_8pf.c
-DEP_CPP_S10_8=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\s10_8pf.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\s10_8pf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\set_sign.c
-DEP_CPP_SET_S=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\inv_sqrt.h"\
-	"..\..\modules\amr_dec\amr_nb\set_sign.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\set_sign.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\set_zero.c
-DEP_CPP_SET_Z=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\set_zero.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sid_sync.c
-DEP_CPP_SID_S=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\sid_sync.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sid_sync.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sp_dec.c
-DEP_CPP_SP_DE=\
-	"..\..\modules\amr_dec\amr_nb\agc.h"\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\bgnscd.h"\
-	"..\..\modules\amr_dec\amr_nb\bitno.tab"\
-	"..\..\modules\amr_dec\amr_nb\bits2prm.h"\
-	"..\..\modules\amr_dec\amr_nb\c_g_aver.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_amr.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_dec.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\ec_gains.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_avg.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\ph_disp.h"\
-	"..\..\modules\amr_dec\amr_nb\post_pro.h"\
-	"..\..\modules\amr_dec\amr_nb\preemph.h"\
-	"..\..\modules\amr_dec\amr_nb\pstfilt.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\sp_dec.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sp_dec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sp_enc.c
-DEP_CPP_SP_EN=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\bitno.tab"\
-	"..\..\modules\amr_dec\amr_nb\cl_ltp.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst_vad.h"\
-	"..\..\modules\amr_dec\amr_nb\cod_amr.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\g_adapt.h"\
-	"..\..\modules\amr_dec\amr_nb\gain_q.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\levinson.h"\
-	"..\..\modules\amr_dec\amr_nb\lpc.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\p_ol_wgh.h"\
-	"..\..\modules\amr_dec\amr_nb\pitch_fr.h"\
-	"..\..\modules\amr_dec\amr_nb\pre_proc.h"\
-	"..\..\modules\amr_dec\amr_nb\prm2bits.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\sp_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\ton_stab.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad.h"\
-	"..\..\modules\amr_dec\amr_nb\vad1.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sp_enc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\spreproc.c
-DEP_CPP_SPREP=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\residu.h"\
-	"..\..\modules\amr_dec\amr_nb\spreproc.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\weight_a.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\spreproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\spstproc.c
-DEP_CPP_SPSTP=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\spstproc.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\spstproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sqrt_l.c
-DEP_CPP_SQRT_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\sqrt_l.h"\
-	"..\..\modules\amr_dec\amr_nb\sqrt_l.tab"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\sqrt_l.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\strfunc.c
-DEP_CPP_STRFU=\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\strfunc.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\strfunc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\syn_filt.c
-DEP_CPP_SYN_F=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\syn_filt.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\syn_filt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ton_stab.c
-DEP_CPP_TON_S=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\copy.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\set_zero.h"\
-	"..\..\modules\amr_dec\amr_nb\ton_stab.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\ton_stab.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\typedef.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\typedefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vad.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vad1.c
-DEP_CPP_VAD1_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst_vad.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad.h"\
-	"..\..\modules\amr_dec\amr_nb\vad1.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vad1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vad2.c
-DEP_CPP_VAD2_=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\log2.h"\
-	"..\..\modules\amr_dec\amr_nb\oper_32b.h"\
-	"..\..\modules\amr_dec\amr_nb\pow2.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\vad2.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vad2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vadname.c
-DEP_CPP_VADNA=\
-	"..\..\modules\amr_dec\amr_nb\vadname.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\vadname.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\weight_a.c
-DEP_CPP_WEIGH=\
-	"..\..\modules\amr_dec\amr_nb\basic_op.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\count.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	"..\..\modules\amr_dec\amr_nb\weight_a.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_nb\weight_a.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_dec.c
-DEP_CPP_AMR_D=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\amr_dec\amr_nb\agc.h"\
-	"..\..\modules\amr_dec\amr_nb\bgnscd.h"\
-	"..\..\modules\amr_dec\amr_nb\c_g_aver.h"\
-	"..\..\modules\amr_dec\amr_nb\cnst.h"\
-	"..\..\modules\amr_dec\amr_nb\d_homing.h"\
-	"..\..\modules\amr_dec\amr_nb\d_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\dec_amr.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_dec.h"\
-	"..\..\modules\amr_dec\amr_nb\dtx_enc.h"\
-	"..\..\modules\amr_dec\amr_nb\ec_gains.h"\
-	"..\..\modules\amr_dec\amr_nb\gc_pred.h"\
-	"..\..\modules\amr_dec\amr_nb\lsp_avg.h"\
-	"..\..\modules\amr_dec\amr_nb\mode.h"\
-	"..\..\modules\amr_dec\amr_nb\ph_disp.h"\
-	"..\..\modules\amr_dec\amr_nb\post_pro.h"\
-	"..\..\modules\amr_dec\amr_nb\preemph.h"\
-	"..\..\modules\amr_dec\amr_nb\pstfilt.h"\
-	"..\..\modules\amr_dec\amr_nb\q_plsf.h"\
-	"..\..\modules\amr_dec\amr_nb\sp_dec.h"\
-	"..\..\modules\amr_dec\amr_nb\typedef.h"\
-	"..\..\modules\amr_dec\amr_nb\typedefs.h"\
-	
-NODEP_CPP_AMR_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\amr_dec\amr_in.c
-DEP_CPP_AMR_I=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_AMR_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/bifs_dec.vcp Deleted

@@ -1,149 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="bifs_dec" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=bifs_dec - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "bifs_dec.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "bifs_dec.vcn" CFG="bifs_dec - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "bifs_dec - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "bifs_dec - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "bifs_dec - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/bifs_dec_rel"
-# PROP Intermediate_Dir "obj/bifs_dec_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "BIFS_DEC_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_bifs_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "bifs_dec - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/bifs_dec_deb"
-# PROP Intermediate_Dir "obj/bifs_dec_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "BIFS_DEC_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_bifs_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "bifs_dec - Win32 (WCE ARMV4) Release"
-# Name "bifs_dec - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\bifs_dec\bifs_dec.c
-DEP_CPP_BIFS_=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_BIFS_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/ctx_load.vcp Deleted

@@ -1,151 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="ctx_load" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=ctx_load - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ctx_load.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ctx_load.vcn" CFG="ctx_load - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ctx_load - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "ctx_load - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ctx_load - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/ctx_load_rel"
-# PROP Intermediate_Dir "obj/ctx_load_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "CTX_LOAD_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_ctx_load.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "ctx_load - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/ctx_load_deb"
-# PROP Intermediate_Dir "obj/ctx_load_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "CTX_LOAD_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_ctx_load.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ctx_load - Win32 (WCE ARMV4) Release"
-# Name "ctx_load - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\ctx_load\ctx_load.c
-DEP_CPP_CTX_L=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_CTX_L=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/dummy_in.vcp Deleted

@@ -1,135 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="dummy_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=dummy_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dummy_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dummy_in.vcn" CFG="dummy_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dummy_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "dummy_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "dummy_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/dumm_in_rel"
-# PROP Intermediate_Dir "obj/dumm_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "DUMMY_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_dummy_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "dummy_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/dumm_in_deb"
-# PROP Intermediate_Dir "obj/dumm_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DUMMY_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /FR /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_dummy_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dummy_in - Win32 (WCE ARMV4) Release"
-# Name "dummy_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\dummy_in\dummy_in.c
-DEP_CPP_DUMMY=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_DUMMY=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/ffmpeg_in.vcp Deleted

@@ -1,232 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="ffmpeg_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=ffmpeg_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ffmpeg_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ffmpeg_in.vcn" CFG="ffmpeg_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ffmpeg_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "ffmpeg_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ffmpeg_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/ffmpeg_in_rel"
-# PROP Intermediate_Dir "obj/ffmpeg_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "FFMPEG_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "CONFIG_WIN32" /D "CONFIG_MSVC" /D "EMULATE_INTTYPES" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_ffmpeg_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "ffmpeg_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/ffmpeg_in_deb"
-# PROP Intermediate_Dir "obj/ffmpeg_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "FFMPEG_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "CONFIG_WIN32" /D "CONFIG_MSVC" /D "EMULATE_INTTYPES" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_ffmpeg_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ffmpeg_in - Win32 (WCE ARMV4) Release"
-# Name "ffmpeg_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\ffmpeg_in\ffmpeg_decode.c
-DEP_CPP_FFMPE=\
-	"..\..\extra_lib\include\libavcodec\avcodec.h"\
-	"..\..\extra_lib\include\libavformat\avformat.h"\
-	"..\..\extra_lib\include\libavformat\avio.h"\
-	"..\..\extra_lib\include\libavutil\avutil.h"\
-	"..\..\extra_lib\include\libavutil\common.h"\
-	"..\..\extra_lib\include\libavutil\intfloat_readwrite.h"\
-	"..\..\extra_lib\include\libavutil\log.h"\
-	"..\..\extra_lib\include\libavutil\mathematics.h"\
-	"..\..\extra_lib\include\libavutil\mem.h"\
-	"..\..\extra_lib\include\libavutil\pixfmt.h"\
-	"..\..\extra_lib\include\libavutil\rational.h"\
-	"..\..\extra_lib\include\libswscale\swscale.h"\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\ffmpeg_in\ffmpeg_in.h"\
-	
-NODEP_CPP_FFMPE=\
-	"..\..\extra_lib\include\libavutil\config.h"\
-	"..\..\extra_lib\include\libavutil\internal.h"\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\ffmpeg_in\ffmpeg_demux.c
-DEP_CPP_FFMPEG=\
-	"..\..\extra_lib\include\libavcodec\avcodec.h"\
-	"..\..\extra_lib\include\libavformat\avformat.h"\
-	"..\..\extra_lib\include\libavformat\avio.h"\
-	"..\..\extra_lib\include\libavutil\avutil.h"\
-	"..\..\extra_lib\include\libavutil\common.h"\
-	"..\..\extra_lib\include\libavutil\intfloat_readwrite.h"\
-	"..\..\extra_lib\include\libavutil\log.h"\
-	"..\..\extra_lib\include\libavutil\mathematics.h"\
-	"..\..\extra_lib\include\libavutil\mem.h"\
-	"..\..\extra_lib\include\libavutil\pixfmt.h"\
-	"..\..\extra_lib\include\libavutil\rational.h"\
-	"..\..\extra_lib\include\libswscale\swscale.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\ffmpeg_in\ffmpeg_in.h"\
-	
-NODEP_CPP_FFMPEG=\
-	"..\..\extra_lib\include\libavutil\config.h"\
-	"..\..\extra_lib\include\libavutil\internal.h"\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\ffmpeg_in\ffmpeg_in.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\ffmpeg_in\ffmpeg_load.c
-DEP_CPP_FFMPEG_=\
-	"..\..\extra_lib\include\libavcodec\avcodec.h"\
-	"..\..\extra_lib\include\libavformat\avformat.h"\
-	"..\..\extra_lib\include\libavformat\avio.h"\
-	"..\..\extra_lib\include\libavutil\avutil.h"\
-	"..\..\extra_lib\include\libavutil\common.h"\
-	"..\..\extra_lib\include\libavutil\intfloat_readwrite.h"\
-	"..\..\extra_lib\include\libavutil\log.h"\
-	"..\..\extra_lib\include\libavutil\mathematics.h"\
-	"..\..\extra_lib\include\libavutil\mem.h"\
-	"..\..\extra_lib\include\libavutil\pixfmt.h"\
-	"..\..\extra_lib\include\libavutil\rational.h"\
-	"..\..\extra_lib\include\libswscale\swscale.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\ffmpeg_in\ffmpeg_in.h"\
-	
-NODEP_CPP_FFMPEG_=\
-	"..\..\extra_lib\include\libavutil\config.h"\
-	"..\..\extra_lib\include\libavutil\internal.h"\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/ft_font.vcp Deleted

@@ -1,141 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="ft_font" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=ft_font - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ft_font.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ft_font.vcn" CFG="ft_font - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ft_font - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "ft_font - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ft_font - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/ft_font_rel"
-# PROP Intermediate_Dir "obj/ft_font_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "FT_FONT_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include/freetype" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 freetype.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_ft_font.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "ft_font - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/ft_font_deb"
-# PROP Intermediate_Dir "obj/ft_font_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "FT_FONT_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/freetype" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 freetype.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_ft_font.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ft_font - Win32 (WCE ARMV4) Release"
-# Name "ft_font - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\ft_font\ft_font.c
-DEP_CPP_FT_FO=\
-	"..\..\extra_lib\include\freetype\freetype\config\ftheader.h"\
-	"..\..\extra_lib\include\freetype\ft2build.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_FT_FO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\ft_font\ft_font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/gapi.vcp Deleted

@@ -1,146 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="gapi" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=gapi - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gapi.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gapi.vcn" CFG="gapi - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gapi - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "gapi - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gapi - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/gapi_rel"
-# PROP Intermediate_Dir "obj/gapi_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GAPI_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 gx.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_gapi.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "gapi - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/gapi_deb"
-# PROP Intermediate_Dir "obj/gapi_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GAPI_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /FR /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 gx.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_gapi.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gapi - Win32 (WCE ARMV4) Release"
-# Name "gapi - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\gapi\gapi.cpp
-DEP_CPP_GAPI_=\
-	"..\..\extra_lib\include\GLES\egl.h"\
-	"..\..\extra_lib\include\GLES\gl.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\gapi\gapi.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"sipapi.h"\
-	{$(INCLUDE)}"winuserm.h"\
-	
-NODEP_CPP_GAPI_=\
-	"..\..\include\gpac\config.h"\
-	"C:\Program Files\WindowsCE\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\gapi\gapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/gpac_js.vcp Deleted

@@ -1,173 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="gpac_js" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=gpac_js - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gpac_js.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gpac_js.vcn" CFG="gpac_js - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gpac_js - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "gpac_js - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gpac_js - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/gjs_rel"
-# PROP Intermediate_Dir "obj/gjs_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GPAC_JS_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../include" /I "../../extra_lib/include/js" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "XP_PC" /O2 /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_gpac_js.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "gpac_js - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/gjs_deb"
-# PROP Intermediate_Dir "obj/gjs_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAC_JS_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/js" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "XP_PC" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_gpac_js.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gpac_js - Win32 (WCE ARMV4) Release"
-# Name "gpac_js - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\gpac_js\gpac_js.c
-DEP_CPP_GPAC_=\
-	"..\..\extra_lib\include\js\jsapi.h"\
-	"..\..\extra_lib\include\js\jsautocfg.h"\
-	"..\..\extra_lib\include\js\jscompat.h"\
-	"..\..\extra_lib\include\js\jscpucfg.h"\
-	"..\..\extra_lib\include\js\jslong.h"\
-	"..\..\extra_lib\include\js\jsosdep.h"\
-	"..\..\extra_lib\include\js\jsotypes.h"\
-	"..\..\extra_lib\include\js\jsproto.tbl"\
-	"..\..\extra_lib\include\js\jspubtd.h"\
-	"..\..\extra_lib\include\js\jstypes.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\js_usr.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_GPAC_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/img_in.vcp Deleted

@@ -1,259 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="img_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=img_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "img_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "img_in.vcn" CFG="img_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "img_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "img_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "img_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/img_in_rel"
-# PROP Intermediate_Dir "obj/img_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "IMG_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include/openjpeg" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GPAC_HAS_JP2" /D "OPJ_STATIC" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 LibOpenJPEG.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_img_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "img_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/img_in_deb"
-# PROP Intermediate_Dir "obj/img_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "IMG_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/png" /I "../../extra_lib/include/zlib" /I "../../extra_lib/include/jpeg" /I "../../extra_lib/include/openjpeg" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAC_HAS_JP2" /D "OPJ_STATIC" /FR /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 LibOpenJPEGd.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_img_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "img_in - Win32 (WCE ARMV4) Release"
-# Name "img_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\bmp_dec.c
-DEP_CPP_BMP_D=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\img_in\img_in.h"\
-	
-NODEP_CPP_BMP_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\img_dec.c
-DEP_CPP_IMG_D=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\img_in\img_in.h"\
-	
-NODEP_CPP_IMG_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\img_in.c
-DEP_CPP_IMG_I=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\img_in\img_in.h"\
-	
-NODEP_CPP_IMG_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\img_in.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\jp2_dec.c
-DEP_CPP_JP2_D=\
-	"..\..\extra_lib\include\openjpeg\openjpeg.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\img_in\img_in.h"\
-	
-NODEP_CPP_JP2_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\jpeg_dec.c
-DEP_CPP_JPEG_=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\img_in\img_in.h"\
-	
-NODEP_CPP_JPEG_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\img_in\png_dec.c
-DEP_CPP_PNG_D=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\img_in\img_in.h"\
-	
-NODEP_CPP_PNG_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/ismacryp.vcp Deleted

@@ -1,149 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="ismacryp" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=ismacryp - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ismacryp.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ismacryp.vcn" CFG="ismacryp - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ismacryp - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "ismacryp - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ismacryp - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/ismacryp_rel"
-# PROP Intermediate_Dir "obj/ismacryp_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ISMACRYP_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ISMACRYP_EXPORTS" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_ismacryp.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "ismacryp - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/ismacryp_deb"
-# PROP Intermediate_Dir "obj/ismacryp_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ISMACRYP_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ISMACRYP_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_ismacryp.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ismacryp - Win32 (WCE ARMV4) Release"
-# Name "ismacryp - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\ismacryp\isma_ea.c
-DEP_CPP_ISMAC=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\ismacryp.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_ISMAC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/isom_in.vcp Deleted

@@ -1,218 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="isom_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=isom_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "isom_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "isom_in.vcn" CFG="isom_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "isom_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "isom_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "isom_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/isom_in_deb"
-# PROP Intermediate_Dir "obj/isom_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ISOM_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_isom_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "isom_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/isom_in_deb"
-# PROP Intermediate_Dir "obj/isom_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ISOM_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_isom_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "isom_in - Win32 (WCE ARMV4) Release"
-# Name "isom_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\isom_in\isom_cache.c
-DEP_CPP_CACHE=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\isom_in\isom_in.h"\
-	
-NODEP_CPP_CACHE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\isom_in\isom_in.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\isom_in\load.c
-DEP_CPP_LOAD_=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\isom_in\isom_in.h"\
-	
-NODEP_CPP_LOAD_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\isom_in\read.c
-DEP_CPP_READ_=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ismacryp.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\isom_in\isom_in.h"\
-	
-NODEP_CPP_READ_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\isom_in\read_ch.c
-DEP_CPP_READ_C=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\isom_in\isom_in.h"\
-	
-NODEP_CPP_READ_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/laser_dec.vcp Deleted

@@ -1,150 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="laser_dec" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=laser_dec - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "laser_dec.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "laser_dec.vcn" CFG="laser_dec - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "laser_dec - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "laser_dec - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "laser_dec - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/laser_dec_rel"
-# PROP Intermediate_Dir "obj/laser_dec_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "LASER_DEC_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_laser_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "laser_dec - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/laser_dec_deb"
-# PROP Intermediate_Dir "obj/laser_dec_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "LASER_DEC_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_laser_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "laser_dec - Win32 (WCE ARMV4) Release"
-# Name "laser_dec - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\laser_dec\laser_dec.c
-DEP_CPP_LASER=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_LASER=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/libgpac.vcp Deleted

@@ -1,7135 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="libgpac" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
-
-CFG=libgpac - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libgpac.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libgpac.vcn" CFG="libgpac - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libgpac - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "libgpac - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-
-!IF "$(CFG)" == "libgpac - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/libgpac_rel"
-# PROP Intermediate_Dir "obj/libgpac_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include/zlib" /I "../../extra_lib/include/js" /I "../../extra_lib/include" /I "../../extra_lib/include/jpeg" /I "../../extra_lib/include/png" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libgpac - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/libgpac_deb"
-# PROP Intermediate_Dir "obj/libgpac_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/zlib" /I "../../extra_lib/include/js" /I "../../extra_lib/include" /I "../../extra_lib/include/jpeg" /I "../../extra_lib/include/png" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /FR /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libgpac - Win32 (WCE ARMV4) Release"
-# Name "libgpac - Win32 (WCE ARMV4) Debug"
-# Begin Group "utils"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\utils\base_encoding.c
-DEP_CPP_BASE_=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BASE_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\sha1.c
-DEP_CPP_SHA1_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SHA1_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\bitstream.c
-DEP_CPP_BITST=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BITST=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\color.c
-DEP_CPP_COLOR=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_COLOR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\configfile.c
-DEP_CPP_CONFI=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\downloader.c
-DEP_CPP_DOWNL=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_DOWNL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\error.c
-DEP_CPP_ERROR=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ERROR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\list.c
-DEP_CPP_LIST_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LIST_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\map.c
-DEP_CPP_MAP_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MAP_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\math.c
-DEP_CPP_MATH_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MATH_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\module.c
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\utils\module_wrap.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\module_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\os_divers.c
-DEP_CPP_OS_DI=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-
-SOURCE=..\..\src\utils\os_file.c
-DEP_CPP_OS_DI=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_OS_DI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\os_module.c
-DEP_CPP_OS_MO=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\utils\module_wrap.h"\
-	
-NODEP_CPP_OS_MO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\os_net.c
-DEP_CPP_OS_NE=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_OS_NE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\os_thread.c
-DEP_CPP_OS_TH=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_OS_TH=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\path2d.c
-DEP_CPP_PATH2=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_PATH2=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\path2d_stroker.c
-DEP_CPP_PATH2D=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_PATH2D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\token.c
-DEP_CPP_TOKEN=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_TOKEN=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\uni_bidi.c
-DEP_CPP_UNI_B=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_UNI_B=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\url.c
-DEP_CPP_URL_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_URL_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\utf.c
-DEP_CPP_UTF_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_UTF_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utils\xml_parser.c
-DEP_CPP_XML_P=\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_XML_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "odf"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\odf\desc_private.c
-DEP_CPP_DESC_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_DESC_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\descriptors.c
-DEP_CPP_DESCR=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_DESCR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\ipmpx_code.c
-DEP_CPP_IPMPX=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_IPMPX=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\ipmpx_dump.c
-DEP_CPP_IPMPX_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_IPMPX_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\ipmpx_parse.c
-DEP_CPP_IPMPX_P=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_IPMPX_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\oci_codec.c
-DEP_CPP_OCI_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_OCI_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\odf_code.c
-DEP_CPP_ODF_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_ODF_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\odf_codec.c
-DEP_CPP_ODF_CO=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ODF_CO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\odf_command.c
-DEP_CPP_ODF_COM=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ODF_COM=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\odf_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\odf_dump.c
-DEP_CPP_ODF_D=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ODF_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\odf_parse.c
-DEP_CPP_ODF_P=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ODF_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\qos.c
-DEP_CPP_QOS_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_QOS_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\odf\slc.c
-DEP_CPP_SLC_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SLC_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "bifs"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\bifs\arith_decoder.c
-DEP_CPP_ARITH=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_ARITH=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\bifs_codec.c
-DEP_CPP_BIFS_=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BIFS_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\bifs_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\bifs_node_tables.c
-DEP_CPP_BIFS_N=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\bifs_tables.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BIFS_N=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\bifs_tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\com_dec.c
-DEP_CPP_COM_D=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_COM_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\com_enc.c
-DEP_CPP_COM_E=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_COM_E=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\conditional.c
-DEP_CPP_CONDI=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_CONDI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\field_decode.c
-DEP_CPP_FIELD=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	"..\..\src\bifs\script.h"\
-	
-NODEP_CPP_FIELD=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\field_encode.c
-DEP_CPP_FIELD_=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\bifs_tables.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	"..\..\src\bifs\script.h"\
-	
-NODEP_CPP_FIELD_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\memory_decoder.c
-DEP_CPP_MEMOR=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_MEMOR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\predictive_mffield.c
-DEP_CPP_PREDI=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_PREDI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\quant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\quantize.c
-DEP_CPP_QUANT=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_QUANT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\script_dec.c
-DEP_CPP_SCRIP=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\script.h"\
-	
-NODEP_CPP_SCRIP=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\script_enc.c
-DEP_CPP_SCRIPT=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\script.h"\
-	
-NODEP_CPP_SCRIPT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\bifs\unquantize.c
-DEP_CPP_UNQUA=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_UNQUA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "isomedia"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\avc_ext.c
-DEP_CPP_AVC_E=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_AVC_E=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_code_3gpp.c
-DEP_CPP_BOX_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BOX_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_code_apple.c
-DEP_CPP_BOX_CO=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BOX_CO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_code_base.c
-DEP_CPP_BOX_COD=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BOX_COD=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_code_drm.c
-DEP_CPP_BOX_CODE=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BOX_CODE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_code_meta.c
-DEP_CPP_BOX_CODE_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BOX_CODE_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_dump.c
-DEP_CPP_BOX_D=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_BOX_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\box_funcs.c
-DEP_CPP_BOX_F=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BOX_F=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\data_map.c
-DEP_CPP_DATA_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_DATA_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\hint_track.c
-DEP_CPP_HINT_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_HINT_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\hinting.c
-DEP_CPP_HINTI=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_HINTI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\drm_sample.c
-DEP_CPP_ISMA_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISMA_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\isom_intern.c
-DEP_CPP_ISOM_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISOM_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\isom_read.c
-DEP_CPP_ISOM_R=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISOM_R=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\isom_store.c
-DEP_CPP_ISOM_S=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISOM_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\isom_write.c
-DEP_CPP_ISOM_W=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISOM_W=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\isomedia_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\media.c
-DEP_CPP_MEDIA=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MEDIA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\media_odf.c
-DEP_CPP_MEDIA_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MEDIA_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\meta.c
-DEP_CPP_META_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_META_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\movie_fragments.c
-DEP_CPP_MOVIE=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MOVIE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\sample_descs.c
-DEP_CPP_SAMPL=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SAMPL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\stbl_read.c
-DEP_CPP_STBL_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_STBL_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\stbl_write.c
-DEP_CPP_STBL_W=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_STBL_W=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\track.c
-DEP_CPP_TRACK=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_TRACK=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\isomedia\tx3g.c
-DEP_CPP_TX3G_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_TX3G_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "ietf"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\ietf_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtcp.c
-DEP_CPP_RTCP_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTCP_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtp.c
-DEP_CPP_RTP_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTP_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtp_depacketizer.c
-DEP_CPP_RTP_D=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\esi.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTP_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtp_packetizer.c
-DEP_CPP_RTP_P=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTP_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtp_pck_3gpp.c
-DEP_CPP_RTP_PC=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTP_PC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtp_pck_mpeg12.c
-DEP_CPP_RTP_PCK=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTP_PCK=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtp_pck_mpeg4.c
-DEP_CPP_RTP_PCK_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTP_PCK_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtsp_command.c
-DEP_CPP_RTSP_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTSP_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtsp_common.c
-DEP_CPP_RTSP_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTSP_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtsp_response.c
-DEP_CPP_RTSP_R=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTSP_R=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\rtsp_session.c
-DEP_CPP_RTSP_S=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RTSP_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ietf\sdp.c
-DEP_CPP_SDP_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SDP_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "scenegraph"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\base_scenegraph.c
-DEP_CPP_BASE_S=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_BASE_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\commands.c
-DEP_CPP_COMMA=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\laser_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_COMMA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\dom_events.c
-DEP_CPP_DOM_E=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_DOM_E=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\dom_smjs.c
-DEP_CPP_DOM_S=\
-	"..\..\extra_lib\include\js\jsapi.h"\
-	"..\..\extra_lib\include\js\jsautocfg.h"\
-	"..\..\extra_lib\include\js\jscompat.h"\
-	"..\..\extra_lib\include\js\jscpucfg.h"\
-	"..\..\extra_lib\include\js\jslong.h"\
-	"..\..\extra_lib\include\js\jsosdep.h"\
-	"..\..\extra_lib\include\js\jsotypes.h"\
-	"..\..\extra_lib\include\js\jsproto.tbl"\
-	"..\..\extra_lib\include\js\jspubtd.h"\
-	"..\..\extra_lib\include\js\jstypes.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_DOM_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\mpeg4_animators.c
-DEP_CPP_MPEG4=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MPEG4=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\mpeg4_nodes.c
-DEP_CPP_MPEG4_=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MPEG4_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\mpeg4_valuator.c
-DEP_CPP_MPEG4_V=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MPEG4_V=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\scenegraph_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\smil_anim.c
-DEP_CPP_SMIL_=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SMIL_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\smil_timing.c
-DEP_CPP_SMIL_T=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SMIL_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\svg_attributes.c
-DEP_CPP_SVG_A=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SVG_A=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\svg_properties.c
-DEP_CPP_SVG_P=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SVG_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\svg_smjs.c
-DEP_CPP_SVG_S=\
-	"..\..\extra_lib\include\js\jsapi.h"\
-	"..\..\extra_lib\include\js\jsautocfg.h"\
-	"..\..\extra_lib\include\js\jscompat.h"\
-	"..\..\extra_lib\include\js\jscpucfg.h"\
-	"..\..\extra_lib\include\js\jslong.h"\
-	"..\..\extra_lib\include\js\jsosdep.h"\
-	"..\..\extra_lib\include\js\jsotypes.h"\
-	"..\..\extra_lib\include\js\jsproto.tbl"\
-	"..\..\extra_lib\include\js\jspubtd.h"\
-	"..\..\extra_lib\include\js\jstypes.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SVG_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\svg_types.c
-DEP_CPP_SVG_T=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SVG_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\vrml_interpolators.c
-DEP_CPP_VRML_=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_VRML_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\vrml_proto.c
-DEP_CPP_VRML_P=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_VRML_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\vrml_route.c
-DEP_CPP_VRML_R=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_VRML_R=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\vrml_script.c
-DEP_CPP_VRML_S=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_VRML_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\vrml_smjs.c
-DEP_CPP_VRML_SM=\
-	"..\..\extra_lib\include\js\jsapi.h"\
-	"..\..\extra_lib\include\js\jsautocfg.h"\
-	"..\..\extra_lib\include\js\jscompat.h"\
-	"..\..\extra_lib\include\js\jscpucfg.h"\
-	"..\..\extra_lib\include\js\jslong.h"\
-	"..\..\extra_lib\include\js\jsosdep.h"\
-	"..\..\extra_lib\include\js\jsotypes.h"\
-	"..\..\extra_lib\include\js\jsproto.tbl"\
-	"..\..\extra_lib\include\js\jspubtd.h"\
-	"..\..\extra_lib\include\js\jstypes.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\js_usr.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_VRML_SM=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\vrml_tools.c
-DEP_CPP_VRML_T=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_VRML_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\x3d_nodes.c
-DEP_CPP_X3D_N=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_X3D_N=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\xbl_process.c
-DEP_CPP_XBL_P=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_xbl.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_XBL_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scenegraph\xml_ns.c
-DEP_CPP_XML_N=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_XML_N=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "media_tools"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\av_parsers.c
-DEP_CPP_AV_PA=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\internal\ogg.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_AV_PA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\avilib.c
-DEP_CPP_AVILI=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\avilib.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_AVILI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\avilib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\filestreamer.c
-DEP_CPP_FILES=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\filestreamer.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_FILES=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\gpac_ogg.c
-DEP_CPP_GPAC_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\ogg.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_GPAC_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\img.c
-DEP_CPP_IMG_C=\
-	"..\..\extra_lib\include\jpeg\jconfig.h"\
-	"..\..\extra_lib\include\jpeg\jmorecfg.h"\
-	"..\..\extra_lib\include\jpeg\jpeglib.h"\
-	"..\..\extra_lib\include\png\png.h"\
-	"..\..\extra_lib\include\png\pngconf.h"\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_IMG_C=\
-	"..\..\extra_lib\include\jpeg\jerror.h"\
-	"..\..\extra_lib\include\jpeg\jpegint.h"\
-	"..\..\extra_lib\include\png\config.h"\
-	"..\..\extra_lib\include\png\pngusr.h"\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\ismacryp.c
-DEP_CPP_ISMAC=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\ismacryp.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_ISMAC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\isom_hinter.c
-DEP_CPP_ISOM_H=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISOM_H=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\isom_tools.c
-DEP_CPP_ISOM_T=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ISOM_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\media_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\media_export.c
-DEP_CPP_MEDIA_E=\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\avilib.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\internal\ogg.h"\
-	"..\..\include\gpac\internal\vobsub.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\mpegts.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MEDIA_E=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\media_import.c
-DEP_CPP_MEDIA_I=\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\avilib.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\internal\ogg.h"\
-	"..\..\include\gpac\internal\vobsub.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\mpegts.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\xml.h"\
-	"..\..\src\media_tools\mpeg2_ps.h"\
-	
-NODEP_CPP_MEDIA_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\mpeg2_ps.c
-DEP_CPP_MPEG2=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\media_tools\mpeg2_ps.h"\
-	
-NODEP_CPP_MPEG2=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\mpeg2_ps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\mpegts.c
-DEP_CPP_MPEGT=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\internal\odf_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\mpegts.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MPEGT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\saf.c
-DEP_CPP_SAF_C=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SAF_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\text_import.c
-DEP_CPP_TEXT_=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\token.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_TEXT_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\media_tools\vobsub.c
-DEP_CPP_VOBSU=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\vobsub.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_VOBSU=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\vobsub.h
-# End Source File
-# End Group
-# Begin Group "scene_manager"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\encode_cbk.c
-DEP_CPP_ENCOD=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bifsengine.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ENCOD=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\encode_isom.c
-DEP_CPP_ENCODE=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ENCODE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\loader_bt.c
-DEP_CPP_LOADE=\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_LOADE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\loader_isom.c
-DEP_CPP_LOADER=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LOADER=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\loader_qt.c
-DEP_CPP_LOADER_=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LOADER_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\loader_svg.c
-DEP_CPP_LOADER_S=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\laser_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_LOADER_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\loader_xmt.c
-DEP_CPP_LOADER_X=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_LOADER_X=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\scene_dump.c
-DEP_CPP_SCENE=\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\bifs_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\bifs\quant.h"\
-	
-NODEP_CPP_SCENE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\scene_manager.c
-DEP_CPP_SCENE_=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bifs.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_SCENE_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\scene_stats.c
-DEP_CPP_SCENE_S=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SCENE_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\swf_bifs.c
-DEP_CPP_SWF_B=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\swf_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_SWF_B=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\swf_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\swf_parse.c
-DEP_CPP_SWF_P=\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\swf_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SWF_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scene_manager\text_to_bifs.c
-DEP_CPP_TEXT_T=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\media_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\include\gpac\xml.h"\
-	
-NODEP_CPP_TEXT_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "mcrypt"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\cbc.c
-DEP_CPP_CBC_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_CBC_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\cfb.c
-DEP_CPP_CFB_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_CFB_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\crypt_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\ctr.c
-DEP_CPP_CTR_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_CTR_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\des.c
-DEP_CPP_DES_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_DES_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\ecb.c
-DEP_CPP_ECB_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_ECB_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\g_crypt.c
-DEP_CPP_G_CRY=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_G_CRY=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\ncfb.c
-DEP_CPP_NCFB_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_NCFB_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\nofb.c
-DEP_CPP_NOFB_=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_NOFB_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\ofb.c
-DEP_CPP_OFB_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_OFB_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\mcrypt\rijndael-128.c"
-DEP_CPP_RIJND=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RIJND=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\mcrypt\rijndael-192.c"
-DEP_CPP_RIJNDA=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RIJNDA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\mcrypt\rijndael-256.c"
-DEP_CPP_RIJNDAE=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_RIJNDAE=\
-	"..\..\include\gpac\config.h"\
-	
-
-SOURCE=..\..\src\mcrypt\stream.c
-DEP_CPP_STREA=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mcrypt\tripledes.c
-DEP_CPP_TRIPL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\crypt.h"\
-	"..\..\include\gpac\internal\crypt_dev.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_TRIPL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "terminal"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\terminal\channel.c
-DEP_CPP_CHANN=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_CHANN=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\clock.c
-DEP_CPP_CLOCK=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_CLOCK=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\decoder.c
-DEP_CPP_DECOD=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\input_sensor.h"\
-	"..\..\src\terminal\media_control.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_DECOD=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\input_sensor.c
-DEP_CPP_INPUT=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\terminal\input_sensor.h"\
-	
-NODEP_CPP_INPUT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\input_sensor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_control.c
-DEP_CPP_MEDIA_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	
-NODEP_CPP_MEDIA_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_manager.c
-DEP_CPP_MEDIA_M=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_MEDIA_M=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_memory.c
-DEP_CPP_MEDIA_ME=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_MEDIA_ME=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_memory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_object.c
-DEP_CPP_MEDIA_O=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_MEDIA_O=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\media_sensor.c
-DEP_CPP_MEDIA_S=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	
-NODEP_CPP_MEDIA_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\mpeg4_inline.c
-DEP_CPP_MPEG4_I=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	
-NODEP_CPP_MPEG4_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\network_service.c
-DEP_CPP_NETWO=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_NETWO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\object_browser.c
-DEP_CPP_OBJEC=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\term_info.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_OBJEC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\object_manager.c
-DEP_CPP_OBJECT=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\input_sensor.h"\
-	"..\..\src\terminal\media_control.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_OBJECT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\scene.c
-DEP_CPP_SCENE_C=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\media_control.h"\
-	
-NODEP_CPP_SCENE_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\svg_external.c
-DEP_CPP_SVG_E=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_SVG_E=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\term_node_init.c
-DEP_CPP_TERM_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\terminal\input_sensor.h"\
-	
-NODEP_CPP_TERM_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\terminal\terminal.c
-DEP_CPP_TERMI=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\xml.h"\
-	"..\..\src\terminal\media_memory.h"\
-	
-NODEP_CPP_TERMI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\terminal_dev.h
-# End Source File
-# End Group
-# Begin Group "laser"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\laser_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\laser\lsr_dec.c
-DEP_CPP_LSR_D=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\laser_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LSR_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\laser\lsr_enc.c
-DEP_CPP_LSR_E=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\laser_dev.h"\
-	"..\..\include\gpac\internal\scenegraph_dev.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LSR_E=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\laser\lsr_tables.c
-DEP_CPP_LSR_T=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\laser_dev.h"\
-	"..\..\include\gpac\laser.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_LSR_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "compositor"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\compositor\audio_input.c
-DEP_CPP_AUDIO=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_AUDIO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\audio_mixer.c
-DEP_CPP_AUDIO_=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_AUDIO_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\audio_render.c
-DEP_CPP_AUDIO_R=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_AUDIO_R=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\bindable.c
-DEP_CPP_BINDA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	
-NODEP_CPP_BINDA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\camera.c
-DEP_CPP_CAMER=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_CAMER=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\camera.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\color.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\compositor.c
-DEP_CPP_COMPO=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_COMPO=\
-	"..\..\include\gpac\config.h"\
-	"..\..\src\compositor\chrono.h"\
-	"..\..\src\src\compositor\triscope_renoir\triscope_renoir.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\compositor_2d.c
-DEP_CPP_COMPOS=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_COMPOS=\
-	"..\..\include\gpac\config.h"\
-	"..\..\src\src\compositor\triscope_renoir\triscope_renoir.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\compositor_3d.c
-DEP_CPP_COMPOSI=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_COMPOSI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\compositor_dev.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\compositor_node_init.c
-DEP_CPP_COMPOSIT=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	
-NODEP_CPP_COMPOSIT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\drawable.c
-DEP_CPP_DRAWA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_DRAWA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\drawable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\events.c
-DEP_CPP_EVENT=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\font_engine.c
-DEP_CPP_FONT_=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_FONT_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\gl_inc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\hardcoded_protos.c
-DEP_CPP_HARDC=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\offscreen_cache.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_HARDC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mesh.c
-DEP_CPP_MESH_=\
-	"..\..\extra_lib\include\GLES\egl.h"\
-	"..\..\extra_lib\include\GLES\gl.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\compositor\gl_inc.h"\
-	
-NODEP_CPP_MESH_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\internal\mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mesh_collide.c
-DEP_CPP_MESH_C=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MESH_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mesh_tesselate.c
-DEP_CPP_MESH_T=\
-	"..\..\extra_lib\include\GLES\egl.h"\
-	"..\..\extra_lib\include\GLES\gl.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\src\compositor\gl_inc.h"\
-	
-NODEP_CPP_MESH_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_animstream.c
-DEP_CPP_MPEG4_A=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	
-NODEP_CPP_MPEG4_A=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_audio.c
-DEP_CPP_MPEG4_AU=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	
-NODEP_CPP_MPEG4_AU=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_background.c
-DEP_CPP_MPEG4_B=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_B=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_background2d.c
-DEP_CPP_MPEG4_BA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_BA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_bitmap.c
-DEP_CPP_MPEG4_BI=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_BI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_composite.c
-DEP_CPP_MPEG4_C=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_C=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_form.c
-DEP_CPP_MPEG4_F=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_F=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_geometry_2d.c
-DEP_CPP_MPEG4_G=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_G=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_geometry_3d.c
-DEP_CPP_MPEG4_GE=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_GE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_geometry_ifs2d.c
-DEP_CPP_MPEG4_GEO=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_GEO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_geometry_ils2d.c
-DEP_CPP_MPEG4_GEOM=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_GEOM=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_gradients.c
-DEP_CPP_MPEG4_GR=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	
-NODEP_CPP_MPEG4_GR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_grouping.c
-DEP_CPP_MPEG4_GRO=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_GRO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_grouping.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_grouping_2d.c
-DEP_CPP_MPEG4_GROU=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_GROU=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_grouping_3d.c
-DEP_CPP_MPEG4_GROUP=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_GROUP=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_layer_2d.c
-DEP_CPP_MPEG4_L=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_L=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_layer_3d.c
-DEP_CPP_MPEG4_LA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_LA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_layout.c
-DEP_CPP_MPEG4_LAY=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_LAY=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_lighting.c
-DEP_CPP_MPEG4_LI=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_LI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_path_layout.c
-DEP_CPP_MPEG4_P=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_P=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_sensors.c
-DEP_CPP_MPEG4_S=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_sound.c
-DEP_CPP_MPEG4_SO=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_SO=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_text.c
-DEP_CPP_MPEG4_T=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_T=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_textures.c
-DEP_CPP_MPEG4_TE=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\texturing.h"\
-	
-NODEP_CPP_MPEG4_TE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_timesensor.c
-DEP_CPP_MPEG4_TI=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	
-NODEP_CPP_MPEG4_TI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\mpeg4_viewport.c
-DEP_CPP_MPEG4_VI=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_MPEG4_VI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\navigate.c
-DEP_CPP_NAVIG=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_NAVIG=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\nodes_stacks.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\offscreen_cache.c
-DEP_CPP_OFFSC=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\offscreen_cache.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_OFFSC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\offscreen_cache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_base.c
-DEP_CPP_SVG_B=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_B=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_font.c
-DEP_CPP_SVG_F=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_F=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_geometry.c
-DEP_CPP_SVG_G=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_G=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_grouping.c
-DEP_CPP_SVG_GR=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\mpeg4_grouping.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\offscreen_cache.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_GR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_media.c
-DEP_CPP_SVG_M=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_M=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_paint_servers.c
-DEP_CPP_SVG_PA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_PA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\svg_text.c
-DEP_CPP_SVG_TE=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_SVG_TE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\texturing.c
-DEP_CPP_TEXTU=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	
-NODEP_CPP_TEXTU=\
-	"..\..\include\gpac\config.h"\
-	"..\..\src\src\compositor\triscope_renoir\triscope_renoir.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\texturing.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\texturing_gl.c
-DEP_CPP_TEXTUR=\
-	"..\..\extra_lib\include\GLES\egl.h"\
-	"..\..\extra_lib\include\GLES\gl.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\gl_inc.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_TEXTUR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager.c
-DEP_CPP_VISUA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_VISUA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager_2d.c
-DEP_CPP_VISUAL=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_VISUAL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager_2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager_2d_draw.c
-DEP_CPP_VISUAL_=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_VISUAL_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager_3d.c
-DEP_CPP_VISUAL_M=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\texturing.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_VISUAL_M=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager_3d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\visual_manager_3d_gl.c
-DEP_CPP_VISUAL_MA=\
-	"..\..\extra_lib\include\GLES\egl.h"\
-	"..\..\extra_lib\include\GLES\gl.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\gl_inc.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_VISUAL_MA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\compositor\x3d_geometry.c
-DEP_CPP_X3D_G=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\nodes_svg.h"\
-	"..\..\include\gpac\nodes_x3d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\src\compositor\drawable.h"\
-	"..\..\src\compositor\nodes_stacks.h"\
-	"..\..\src\compositor\visual_manager.h"\
-	"..\..\src\compositor\visual_manager_2d.h"\
-	"..\..\src\compositor\visual_manager_3d.h"\
-	
-NODEP_CPP_X3D_G=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Group
-# Begin Group "include"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\audio_out.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\avparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\base_coding.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\bifs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\bifsengine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\bitstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\codec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\compositor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\config_file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\configuration.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\constants.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\download.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\esi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\events.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\ietf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\ipmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\ismacryp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\isomedia.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\laser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\math.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\media_tools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\mediaobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\module.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\mpeg4_odf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\mpegts.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\network.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\nodes_mpeg4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\nodes_svg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\nodes_x3d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\options.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\path2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\raster2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\renderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\scene_manager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\scenegraph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\scenegraph_svg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\scenegraph_vrml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\service.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\svg_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\sync_layer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\term_info.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\terminal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\thread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\token.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\tools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\user.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\utf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\modules\video_out.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\xml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\gpac\yuv.h
-# End Source File
-# End Group
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/libgpac_dll.vcp Deleted

@@ -1,113 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="libgpac_dll" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=libgpac_dll - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libgpac_dll.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libgpac_dll.vcn" CFG="libgpac_dll - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libgpac_dll - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "libgpac_dll - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libgpac_dll - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/libgpac_dll_rel"
-# PROP Intermediate_Dir "obj/libgpac_dll_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "LIBGPAC_DLL_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/libgpac.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "libgpac_dll - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/libgpac_dll_deb"
-# PROP Intermediate_Dir "obj/libgpac_dll_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "LIBGPAC_DLL_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/libgpac.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libgpac_dll - Win32 (WCE ARMV4) Release"
-# Name "libgpac_dll - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\src\export.cpp
-DEP_CPP_EXPOR=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_EXPOR=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/mp3_in.vcp Deleted

@@ -1,157 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="mp3_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=mp3_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mp3_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mp3_in.vcn" CFG="mp3_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mp3_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "mp3_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mp3_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/mp3_in_rel"
-# PROP Intermediate_Dir "obj/mp3_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "MP3_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include/mad" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "GPAC_HAS_MAD" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 libmad.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_mp3_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "mp3_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/mp3_in_deb"
-# PROP Intermediate_Dir "obj/mp3_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "MP3_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/mad" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "GPAC_HAS_MAD" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 libmad.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_mp3_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mp3_in - Win32 (WCE ARMV4) Release"
-# Name "mp3_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\mp3_in\mad_dec.c
-DEP_CPP_MAD_D=\
-	"..\..\extra_lib\include\mad\mad.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MAD_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\mp3_in\mp3_in.c
-DEP_CPP_MP3_I=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_MP3_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/odf_dec.vcp Deleted

@@ -1,147 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="odf_dec" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=odf_dec - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "odf_dec.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "odf_dec.vcn" CFG="odf_dec - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "odf_dec - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "odf_dec - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "odf_dec - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/odf_dec_rel"
-# PROP Intermediate_Dir "obj/odf_dec_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ODF_DEC_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_odf_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "odf_dec - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/odf_dec_deb"
-# PROP Intermediate_Dir "obj/odf_dec_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ODF_DEC_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_odf_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "odf_dec - Win32 (WCE ARMV4) Release"
-# Name "odf_dec - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\odf_dec\odf_dec.c
-DEP_CPP_ODF_D=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_ODF_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/osmophone.vcp Deleted

@@ -1,200 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="osmophone" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Application" 0xa301
-
-CFG=osmophone - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "osmophone.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "osmophone.vcn" CFG="osmophone - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "osmophone - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Application")
-!MESSAGE "osmophone - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "osmophone - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/osmophone_rel"
-# PROP Intermediate_Dir "obj/osmophone_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 aygshell.lib commctrl.lib gx.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/osmophone.exe" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "osmophone - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/osmophone_deb"
-# PROP Intermediate_Dir "obj/osmophone_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /FR /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 aygshell.lib commctrl.lib gx.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/osmophone.exe" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "osmophone - Win32 (WCE ARMV4) Release"
-# Name "osmophone - Win32 (WCE ARMV4) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\applications\osmophone\main.cpp
-DEP_CPP_MAIN_=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\compositor.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\camera.h"\
-	"..\..\include\gpac\internal\compositor_dev.h"\
-	"..\..\include\gpac\internal\mesh.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\font.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\modules\video_out.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\options.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_svg.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\svg_types.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"sipapi.h"\
-	{$(INCLUDE)}"winuserm.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\include\gpac\config.h"\
-	"C:\Program Files\WindowsCE\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmophone\openfile.cpp
-DEP_CPP_OPENF=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"sipapi.h"\
-	{$(INCLUDE)}"winuserm.h"\
-	
-NODEP_CPP_OPENF=\
-	"..\..\include\gpac\config.h"\
-	"C:\Program Files\WindowsCE\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmophone\osmophone.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\applications\osmophone\newres.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\applications\osmophone\resource.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\applications\osmophone\Osmo4.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\Osmo4.ico
-# End Source File
-# End Group
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/rtp_in.vcp Deleted

@@ -1,275 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="rtp_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=rtp_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "rtp_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "rtp_in.vcn" CFG="rtp_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rtp_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "rtp_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "rtp_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/rtp_in_rel"
-# PROP Intermediate_Dir "obj/rtp_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "RTP_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_rtp_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "rtp_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/rtp_in_deb"
-# PROP Intermediate_Dir "obj/rtp_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "RTP_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_rtp_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rtp_in - Win32 (WCE ARMV4) Release"
-# Name "rtp_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\rtp_in.c
-DEP_CPP_RTP_I=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\rtp_in\rtp_in.h"\
-	
-NODEP_CPP_RTP_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\rtp_in.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\rtp_session.c
-DEP_CPP_RTP_S=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\rtp_in\rtp_in.h"\
-	
-NODEP_CPP_RTP_S=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\rtp_signaling.c
-DEP_CPP_RTP_SI=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\rtp_in\rtp_in.h"\
-	
-NODEP_CPP_RTP_SI=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\rtp_stream.c
-DEP_CPP_RTP_ST=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\rtp_in\rtp_in.h"\
-	
-NODEP_CPP_RTP_ST=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\sdp_fetch.c
-DEP_CPP_SDP_F=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\rtp_in\rtp_in.h"\
-	
-NODEP_CPP_SDP_F=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\rtp_in\sdp_load.c
-DEP_CPP_SDP_L=\
-	"..\..\include\gpac\base_coding.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\ietf.h"\
-	"..\..\include\gpac\internal\ietf_dev.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\network.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\rtp_in\rtp_in.h"\
-	
-NODEP_CPP_SDP_L=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/saf_in.vcp Deleted

@@ -1,134 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="saf_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=saf_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "saf_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "saf_in.vcn" CFG="saf_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "saf_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "saf_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "saf_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/saf_in_rel"
-# PROP Intermediate_Dir "obj/saf_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SAF_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SAF_IN_EXPORTS" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_saf_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "saf_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/saf_in_deb"
-# PROP Intermediate_Dir "obj/saf_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SAF_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SAF_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_saf_in.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "saf_in - Win32 (WCE ARMV4) Release"
-# Name "saf_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\saf_in\saf_in.c
-DEP_CPP_SAF_I=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_SAF_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/soft_rast.vcp Deleted

@@ -1,257 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="soft_rast" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=soft_rast - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "soft_rast.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "soft_rast.vcn" CFG="soft_rast - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "soft_rast - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "soft_rast - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "soft_rast - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/soft_rast_rel"
-# PROP Intermediate_Dir "obj/soft_rast_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SOFT_RAST_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_soft_raster.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "soft_rast - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/soft_rast_deb"
-# PROP Intermediate_Dir "obj/soft_rast_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SOFT_RAST_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /FR /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_soft_raster.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "soft_rast - Win32 (WCE ARMV4) Release"
-# Name "soft_rast - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\ftgrays.c
-DEP_CPP_FTGRA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_FTGRA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\rast_soft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\raster_565.c
-DEP_CPP_RASTE=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_RASTE=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\raster_argb.c
-DEP_CPP_RASTER=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_RASTER=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\raster_load.c
-DEP_CPP_RASTER_=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_RASTER_=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\raster_rgb.c
-DEP_CPP_RASTER_R=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_RASTER_R=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\stencil.c
-DEP_CPP_STENC=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_STENC=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\soft_raster\surface.c
-DEP_CPP_SURFA=\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\raster2d.h"\
-	"..\..\include\gpac\path2d.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\soft_raster\rast_soft.h"\
-	
-NODEP_CPP_SURFA=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/svg_in.vcp Deleted

@@ -1,149 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="svg_in" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=svg_in - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "svg_in.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "svg_in.vcn" CFG="svg_in - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "svg_in - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "svg_in - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "svg_in - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/svg_in_rel"
-# PROP Intermediate_Dir "obj/svg_in_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SVG_IN_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /I "../../extra_lib/include/zlib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SVG_IN_EXPORTS" /YX /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 zlib.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_svg_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_rel" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "svg_in - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/svg_in_deb"
-# PROP Intermediate_Dir "obj/svg_in_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SVG_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../extra_lib/include/zlib" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SVG_IN_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 zlib.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_svg_in.dll" /libpath:"../../extra_lib/lib/arm_ppc03_deb" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "svg_in - Win32 (WCE ARMV4) Release"
-# Name "svg_in - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\svg_in\svg_in.c
-DEP_CPP_SVG_I=\
-	"..\..\extra_lib\include\zlib\zconf.h"\
-	"..\..\extra_lib\include\zlib\zlib.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\scene_manager.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	
-NODEP_CPP_SVG_I=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/timedtext.vcp Deleted

@@ -1,176 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="timedtext" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=timedtext - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "timedtext.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "timedtext.vcn" CFG="timedtext - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "timedtext - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "timedtext - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "timedtext - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/ttxt_rel"
-# PROP Intermediate_Dir "obj/ttxt_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "TIMEDTEXT_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /out:"../../bin/arm_ppc03_rel/gm_timedtext.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "timedtext - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/ttxt_deb"
-# PROP Intermediate_Dir "obj/ttxt_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "TIMEDTEXT_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /out:"../../bin/arm_ppc03_deb/gm_timedtext.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "timedtext - Win32 (WCE ARMV4) Release"
-# Name "timedtext - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\timedtext\timedtext_dec.c
-DEP_CPP_TIMED=\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\color.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\events.h"\
-	"..\..\include\gpac\internal\isomedia_dev.h"\
-	"..\..\include\gpac\internal\terminal_dev.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\math.h"\
-	"..\..\include\gpac\mediaobject.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\ipmp.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\modules\term_ext.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\nodes_mpeg4.h"\
-	"..\..\include\gpac\scenegraph.h"\
-	"..\..\include\gpac\scenegraph_vrml.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\terminal.h"\
-	"..\..\include\gpac\thread.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\include\gpac\user.h"\
-	"..\..\include\gpac\utf.h"\
-	
-NODEP_CPP_TIMED=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\timedtext\timedtext_in.c
-DEP_CPP_TIMEDT=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\download.h"\
-	"..\..\include\gpac\isomedia.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\media_tools.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\modules\service.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_TIMEDT=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/wav_out.vcp Deleted

@@ -1,129 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="wav_out" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=wav_out - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wav_out.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wav_out.vcn" CFG="wav_out - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wav_out - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "wav_out - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "wav_out - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/wav_out_rel"
-# PROP Intermediate_Dir "obj/wav_out_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "WAV_OUT_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_wav_out.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "wav_out - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/wav_out_deb"
-# PROP Intermediate_Dir "obj/wav_out_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "WAV_OUT_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_wav_out.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wav_out - Win32 (WCE ARMV4) Release"
-# Name "wav_out - Win32 (WCE ARMV4) Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\wav_out\wav_out.c
-DEP_CPP_WAV_O=\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\audio_out.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\tools.h"\
-	
-NODEP_CPP_WAV_O=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msevc4/xvid_dec.vcp Deleted

@@ -1,475 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="xvid_dec" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302
-
-CFG=xvid_dec - Win32 (WCE ARMV4) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xvid_dec.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xvid_dec.vcn" CFG="xvid_dec - Win32 (WCE ARMV4) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xvid_dec - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE "xvid_dec - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-CPP=clarm.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "xvid_dec - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMV4Rel"
-# PROP BASE Intermediate_Dir "ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "obj/xvid_dec_rel"
-# PROP Intermediate_Dir "obj/xvid_dec_rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "XVID_DEC_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxt /I "../../include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /M$(CECrtMT) /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_rel/gm_xvid_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ELSEIF "$(CFG)" == "xvid_dec - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMV4Dbg"
-# PROP BASE Intermediate_Dir "ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/xvid_dec_deb"
-# PROP Intermediate_Dir "obj/xvid_dec_deb"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "XVID_DEC_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"../../bin/arm_ppc03_deb/gm_xvid_dec.dll" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xvid_dec - Win32 (WCE ARMV4) Release"
-# Name "xvid_dec - Win32 (WCE ARMV4) Debug"
-# Begin Group "xvid_wce"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\bitstream.cpp
-DEP_CPP_BITST=\
-	"..\..\modules\xvid_dec\xvid_wce\bitstream.h"\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant_matrix.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\bitstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp
-DEP_CPP_CODEC=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\decoder.cpp
-DEP_CPP_DECOD=\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\gmc.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mbprediction.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_align.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant_matrix.h"\
-	"..\..\modules\xvid_dec\xvid_wce\reduced.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\font.cpp
-DEP_CPP_FONT_=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\global.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\gmc.cpp
-DEP_CPP_GMC_C=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\gmc.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\gmc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\idct.cpp
-DEP_CPP_IDCT_=\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\image.cpp
-DEP_CPP_IMAGE=\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_align.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\reduced.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp
-DEP_CPP_INTER=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp
-DEP_CPP_MBCOD=\
-	"..\..\modules\xvid_dec\xvid_wce\bitstream.h"\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp
-DEP_CPP_MBPRE=\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mbprediction.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mbprediction.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mem_align.cpp
-DEP_CPP_MEM_A=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_align.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mem_align.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp
-DEP_CPP_MEM_T=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\mem_transfer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\portab.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\qpel.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp
-DEP_CPP_QPEL_=\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\qpel.inl"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\quant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp
-DEP_CPP_QUANT=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp
-DEP_CPP_QUANT_=\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant_matrix.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\quant_matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp
-DEP_CPP_QUANT_M=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant_matrix.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\reduced.cpp
-DEP_CPP_REDUC=\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\reduced.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\reduced.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\Rules.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\vlc_codes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\xvid.cpp
-DEP_CPP_XVID_=\
-	"..\..\modules\xvid_dec\xvid_wce\decoder.h"\
-	"..\..\modules\xvid_dec\xvid_wce\global.h"\
-	"..\..\modules\xvid_dec\xvid_wce\image.h"\
-	"..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"\
-	"..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"\
-	"..\..\modules\xvid_dec\xvid_wce\portab.h"\
-	"..\..\modules\xvid_dec\xvid_wce\quant.h"\
-	"..\..\modules\xvid_dec\xvid_wce\reduced.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\xvid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm
-
-!IF "$(CFG)" == "xvid_dec - Win32 (WCE ARMV4) Release"
-
-# Begin Custom Build
-IntDir=.\obj/xvid_dec_rel
-InputPath=..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm
-InputName=xvid_ppc
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	armasm -CPU StrongARM1 -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xvid_dec - Win32 (WCE ARMV4) Debug"
-
-# Begin Custom Build
-IntDir=.\obj/xvid_dec_deb
-InputPath=..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm
-InputName=xvid_ppc
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	armasm -CPU StrongARM1 -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\modules\modules_export.cpp
-DEP_CPP_MODUL=\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\setup.h"\
-	
-NODEP_CPP_MODUL=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\modules\xvid_dec\xvid_dec_wce.cpp
-DEP_CPP_XVID_D=\
-	"..\..\include\gpac\avparse.h"\
-	"..\..\include\gpac\bitstream.h"\
-	"..\..\include\gpac\config_file.h"\
-	"..\..\include\gpac\configuration.h"\
-	"..\..\include\gpac\constants.h"\
-	"..\..\include\gpac\list.h"\
-	"..\..\include\gpac\module.h"\
-	"..\..\include\gpac\modules\codec.h"\
-	"..\..\include\gpac\mpeg4_odf.h"\
-	"..\..\include\gpac\setup.h"\
-	"..\..\include\gpac\sync_layer.h"\
-	"..\..\include\gpac\tools.h"\
-	"..\..\modules\xvid_dec\xvid_wce\Rules.h"\
-	"..\..\modules\xvid_dec\xvid_wce\xvid.h"\
-	
-NODEP_CPP_XVID_D=\
-	"..\..\include\gpac\config.h"\
-	
-# End Source File
-# End Target
-# End Project

v0.5.2.tar.gz/build/msvc11 Deleted

v0.5.2.tar.gz/build/msvc11/GPAX.vcxproj Deleted

@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{72486240-A124-496E-A67A-E76FEC7E99BE}</ProjectGuid>
- <RootNamespace>GPAX</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <CustomBuildStep>
- <Message>
- </Message>
- <Command>
- </Command>
- <Outputs>
- </Outputs>
- </CustomBuildStep>
- <Midl>
- <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <CustomBuildStep>
- <Message>
- </Message>
- <Command>
- </Command>
- <Outputs>
- </Outputs>
- </CustomBuildStep>
- <Midl>
- <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <CustomBuildStep>
- <Message>
- </Message>
- <Command>
- </Command>
- <Outputs>
- </Outputs>
- </CustomBuildStep>
- <Midl>
- <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <CustomBuildStep>
- <Message>
- </Message>
- <Command>
- </Command>
- <Outputs>
- </Outputs>
- </CustomBuildStep>
- <Midl>
- <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <None Include="..\..\applications\GPAX\gpax.bmp" />
- <None Include="..\..\applications\GPAX\GPAX.def" />
- <None Include="..\..\applications\GPAX\GPAX.rgs" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\GPAX\GPAX.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\GPAX\GPAXPlugin.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\GPAX\StdAfx.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\applications\GPAX\GPAX.h" />
- <ClInclude Include="..\..\applications\GPAX\GPAXPlugin.h" />
- <ClInclude Include="..\..\applications\GPAX\resource.h" />
- <ClInclude Include="..\..\applications\GPAX\StdAfx.h" />
- </ItemGroup>
- <ItemGroup>
- <Midl Include="..\..\applications\GPAX\GPAX.idl">
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GPAX.tlb</TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GPAX.tlb</TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GPAX.tlb</TypeLibraryName>
- <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GPAX.tlb</TypeLibraryName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\applications\GPAX\GPAX.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/Osmo4.vcxproj Deleted

@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C79C2D73-06E9-4622-92CE-F166B1B51792}</ProjectGuid>
- <RootNamespace>Osmo4</RootNamespace>
- <Keyword>MFCProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <StackReserveSize>8388608</StackReserveSize>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <StackReserveSize>8388608</StackReserveSize>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\osmo4_w32\AddressBar.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\FileProps.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\MainFrm.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\OpenUrl.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\Options.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\Osmo4.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\Playlist.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\Sliders.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmo4_w32\StdAfx.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\applications\osmo4_w32\Osmo4.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\applications\osmo4_w32\AddressBar.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\FileProps.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\MainFrm.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\OpenUrl.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\Options.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\Osmo4.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\Playlist.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\Resource.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\Sliders.h" />
- <ClInclude Include="..\..\applications\osmo4_w32\StdAfx.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\applications\osmo4_w32\res\error.ico" />
- <None Include="..\..\applications\osmo4_w32\res\maintool.bmp" />
- <None Include="..\..\applications\osmo4_w32\res\message.ico" />
- <None Include="..\..\applications\osmo4_w32\res\osmo4.ico" />
- <None Include="..\..\applications\osmo4_w32\res\pause.ico" />
- <None Include="..\..\applications\osmo4_w32\res\play.ico" />
- <None Include="..\..\applications\osmo4_w32\res\playlist.bmp" />
- <None Include="..\..\applications\osmo4_w32\res\stop.ico" />
- <None Include="..\..\doc\osmo4.ico" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/aac_in.vcxproj Deleted

@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
- <RootNamespace>aac_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/aac_in_deb/aac_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/aac_in_deb/aac_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/aac_in_rel/aac_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/aac_in_rel/aac_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\aac_in\aac_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\aac_in\faad_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ac3_in.vcxproj Deleted

@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}</ProjectGuid>
- <RootNamespace>ac3_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Debug/ac3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Manifest>
- <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
- </Manifest>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Debug/ac3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Manifest>
- <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
- </Manifest>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release/ac3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Release/ac3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\ac3_in\ac3_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\ac3_in\liba52_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/amr_dec.vcxproj Deleted

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5ED5A1C8-DB34-4089-8E53-EFB225754D02}</ProjectGuid>
- <RootNamespace>amr_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <StackReserveSize>8388608</StackReserveSize>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <StackReserveSize>8388608</StackReserveSize>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\amr_dec\amr_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/amr_float_dec.vcxproj Deleted

@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5D3983BF-143F-49C3-9284-89778282AEFE}</ProjectGuid>
- <RootNamespace>amr_float_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\amr_float_dec\amr_float_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/audio_filter.vcxproj Deleted

@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C993119B-29B1-49C8-8EA3-A9ABF633164E}</ProjectGuid>
- <RootNamespace>audio_filter</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\audio_filter\audio_filter.c" />
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/avcap.vcxproj Deleted

@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{109C4F31-781F-4C9E-B160-E788A83F9387}</ProjectGuid>
- <RootNamespace>avcap</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_deb/avcap.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CallingConvention>Cdecl</CallingConvention>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_deb/avcap.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CallingConvention>Cdecl</CallingConvention>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_rel/avcap.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_rel/avcap.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\avcap\avcap.cpp" />
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/bifs_dec.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}</ProjectGuid>
- <RootNamespace>bifs_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\bifs_dec\bifs_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ctx_load.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}</ProjectGuid>
- <RootNamespace>ctx_load</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\ctx_load\ctx_load.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/dashcast.vcxproj Deleted

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
- <RootNamespace>dashcast</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\dashcast\audio_data.c" />
- <ClCompile Include="..\..\applications\dashcast\audio_decoder.c" />
- <ClCompile Include="..\..\applications\dashcast\audio_encoder.c" />
- <ClCompile Include="..\..\applications\dashcast\audio_muxer.c" />
- <ClCompile Include="..\..\applications\dashcast\circular_buffer.c" />
- <ClCompile Include="..\..\applications\dashcast\cmd_data.c" />
- <ClCompile Include="..\..\applications\dashcast\controler.c" />
- <ClCompile Include="..\..\applications\dashcast\dashcast.c" />
- <ClCompile Include="..\..\applications\dashcast\message_queue.c" />
- <ClCompile Include="..\..\applications\dashcast\register.c" />
- <ClCompile Include="..\..\applications\dashcast\task.c" />
- <ClCompile Include="..\..\applications\dashcast\video_data.c" />
- <ClCompile Include="..\..\applications\dashcast\video_decoder.c" />
- <ClCompile Include="..\..\applications\dashcast\video_encoder.c" />
- <ClCompile Include="..\..\applications\dashcast\video_muxer.c" />
- <ClCompile Include="..\..\applications\dashcast\video_scaler.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\applications\dashcast\audio_data.h" />
- <ClInclude Include="..\..\applications\dashcast\audio_decoder.h" />
- <ClInclude Include="..\..\applications\dashcast\audio_encoder.h" />
- <ClInclude Include="..\..\applications\dashcast\audio_muxer.h" />
- <ClInclude Include="..\..\applications\dashcast\circular_buffer.h" />
- <ClInclude Include="..\..\applications\dashcast\cmd_data.h" />
- <ClInclude Include="..\..\applications\dashcast\controler.h" />
- <ClInclude Include="..\..\applications\dashcast\libav_compat.h" />
- <ClInclude Include="..\..\applications\dashcast\message_queue.h" />
- <ClInclude Include="..\..\applications\dashcast\register.h" />
- <ClInclude Include="..\..\applications\dashcast\task.h" />
- <ClInclude Include="..\..\applications\dashcast\video_data.h" />
- <ClInclude Include="..\..\applications\dashcast\video_decoder.h" />
- <ClInclude Include="..\..\applications\dashcast\video_encoder.h" />
- <ClInclude Include="..\..\applications\dashcast\video_muxer.h" />
- <ClInclude Include="..\..\applications\dashcast\video_scaler.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/dummy_in.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{073E2381-4FDE-4C4D-A117-C489EB17C48B}</ProjectGuid>
- <RootNamespace>dummy_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\dummy_in\dummy_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/dx_hw.vcxproj Deleted

@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B64736BD-9245-4F40-961D-EB9822265764}</ProjectGuid>
- <RootNamespace>dx_hw</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <None Include="..\..\modules\dx_hw\collide.cur" />
- <None Include="..\..\modules\dx_hw\hand.cur" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\dx_hw\dx_2d.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\dx_hw\dx_audio.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\dx_hw\dx_video.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\dx_hw\dx_window.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\dx_hw\dx_hw.h" />
- <ClInclude Include="..\..\modules\dx_hw\resource.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\modules\dx_hw\dx_hw.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ffmpeg_in.vcxproj Deleted

@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{9FECAB79-BC70-4EEA-A23B-B64159F904B3}</ProjectGuid>
- <RootNamespace>ffmpeg_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <AdditionalDependencies>
- </AdditionalDependencies>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_decode.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_demux.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_load.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\ffmpeg_in\ffmpeg_in.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ft_font.vcxproj Deleted

@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{042D3628-67F3-4B5C-8BC0-CD9AFA416974}</ProjectGuid>
- <RootNamespace>ft_font</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ft_font_deb/ft_font.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Manifest>
- <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
- </Manifest>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ft_font_deb/ft_font.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Manifest>
- <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
- </Manifest>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ft_font_rel/ft_font.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ft_font_rel/ft_font.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\ft_font\ft_font.c" />
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\ft_font\ft_font.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/gdip_raster.vcxproj Deleted

@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{CAA5A551-006A-4119-8115-FB14692E719F}</ProjectGuid>
- <RootNamespace>gdip_raster</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\gdip_raster\gdip_font.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\gdip_raster\gdip_grad.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\gdip_raster\gdip_rend.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\gdip_raster\gdip_texture.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\gdip_raster\gdip_priv.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/gpac.sln Deleted

@@ -1,564 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcxproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcxproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcxproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcxproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcxproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_in", "dummy_in.vcxproj", "{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcxproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcxproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcxproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdip_raster", "gdip_raster.vcxproj", "{CAA5A551-006A-4119-8115-FB14692E719F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "img_in", "img_in.vcxproj", "{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isom_in", "isom_in.vcxproj", "{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laser_dec", "laser_dec.vcxproj", "{879E26B2-48DB-47B3-B82F-893696286E6F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcxproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_dll", "libgpac_dll.vcxproj", "{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcxproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcxproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcxproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odf_dec", "odf_dec.vcxproj", "{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcxproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcxproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcxproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtp_in", "rtp_in.vcxproj", "{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saf_in", "saf_in.vcxproj", "{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl_out", "sdl_out.vcxproj", "{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soft_raster", "soft_raster.vcxproj", "{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svg_in", "svg_in.vcxproj", "{402A8794-B724-44A3-B608-84B600ECA387}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timedtext", "timedtext.vcxproj", "{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wav_out", "wav_out.vcxproj", "{01183543-B182-4E32-9FD6-FC15C847316C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvid_dec", "xvid_dec.vcxproj", "{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ismacryp", "ismacryp.vcxproj", "{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcxproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac_js", "gpac_js.vcxproj", "{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_filter", "audio_filter.vcxproj", "{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platinum", "platinum.vcxproj", "{694C765F-DFD6-467E-A813-B3F887E822D4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "widgetman", "widgetman.vcxproj", "{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redirect_av", "redirect_av.vcxproj", "{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_rec", "ui_rec.vcxproj", "{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensvc_dec", "opensvc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpd_in", "mpd_in.vcxproj", "{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_dec", "amr_dec.vcxproj", "{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_float_dec", "amr_float_dec.vcxproj", "{5D3983BF-143F-49C3-9284-89778282AEFE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcxproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "validator.vcxproj", "{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avcap", "avcap.vcxproj", "{109C4F31-781F-4C9E-B160-E788A83F9387}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse_in", "mse_in.vcxproj", "{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{6274F5D2-A9CB-4DF9-BF9E-818416ACD347}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openhevc_dec", "openhevc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashcast", "dashcast.vcxproj", "{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.ActiveCfg = Debug|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.Build.0 = Debug|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.ActiveCfg = Release|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.Build.0 = Release|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|x64.ActiveCfg = Debug|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.ActiveCfg = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.Build.0 = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.ActiveCfg = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.Build.0 = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.ActiveCfg = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.Build.0 = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.ActiveCfg = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.Build.0 = Release|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.Build.0 = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.ActiveCfg = Debug|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.Build.0 = Debug|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.ActiveCfg = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.ActiveCfg = Release|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.Build.0 = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.ActiveCfg = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.ActiveCfg = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.Build.0 = Release|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.ActiveCfg = Debug|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.Build.0 = Debug|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.ActiveCfg = Release|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.Build.0 = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.ActiveCfg = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.Build.0 = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.ActiveCfg = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.Build.0 = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.ActiveCfg = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.Build.0 = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.ActiveCfg = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.Build.0 = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.ActiveCfg = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.Build.0 = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.ActiveCfg = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.Build.0 = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.ActiveCfg = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.Build.0 = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.ActiveCfg = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.Build.0 = Release|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.ActiveCfg = Debug|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.Build.0 = Debug|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.ActiveCfg = Release|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.Build.0 = Release|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.Build.0 = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.ActiveCfg = Debug|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.Build.0 = Debug|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.ActiveCfg = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.ActiveCfg = Release|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.Build.0 = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.ActiveCfg = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.Build.0 = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.ActiveCfg = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.Build.0 = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.ActiveCfg = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.Build.0 = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.ActiveCfg = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.Build.0 = Release|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.ActiveCfg = Debug|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.Build.0 = Debug|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.ActiveCfg = Release|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.Build.0 = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.ActiveCfg = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.Build.0 = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.ActiveCfg = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.Build.0 = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.ActiveCfg = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.Build.0 = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.ActiveCfg = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.Build.0 = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.ActiveCfg = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.ActiveCfg = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.Build.0 = Release|x64
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.Build.0 = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|x64.ActiveCfg = Debug|x64
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.ActiveCfg = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.Build.0 = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.Build.0 = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.ActiveCfg = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.Build.0 = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.ActiveCfg = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.Build.0 = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.ActiveCfg = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.Build.0 = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.ActiveCfg = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.Build.0 = Release|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.Build.0 = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.ActiveCfg = Debug|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.Build.0 = Debug|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.ActiveCfg = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.ActiveCfg = Release|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.Build.0 = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.ActiveCfg = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.Build.0 = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.ActiveCfg = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.Build.0 = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.ActiveCfg = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.Build.0 = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.ActiveCfg = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.Build.0 = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.ActiveCfg = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.Build.0 = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.ActiveCfg = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.Build.0 = Release|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.Build.0 = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.ActiveCfg = Debug|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.Build.0 = Debug|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.ActiveCfg = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.ActiveCfg = Release|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.Build.0 = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.ActiveCfg = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.Build.0 = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.ActiveCfg = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.Build.0 = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.ActiveCfg = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.Build.0 = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.ActiveCfg = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.Build.0 = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.ActiveCfg = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.Build.0 = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.ActiveCfg = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.Build.0 = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.ActiveCfg = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.Build.0 = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.ActiveCfg = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.Build.0 = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.ActiveCfg = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.Build.0 = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.ActiveCfg = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.Build.0 = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.ActiveCfg = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.Build.0 = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.ActiveCfg = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.Build.0 = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.ActiveCfg = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.Build.0 = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.ActiveCfg = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.Build.0 = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.Build.0 = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.ActiveCfg = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.Build.0 = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.ActiveCfg = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.Build.0 = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.Build.0 = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.ActiveCfg = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.Build.0 = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.ActiveCfg = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.Build.0 = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.ActiveCfg = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.Build.0 = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.Build.0 = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.ActiveCfg = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.Build.0 = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.ActiveCfg = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.Build.0 = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.ActiveCfg = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.Build.0 = Release|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.Build.0 = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|x64.ActiveCfg = Debug|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|x64.Build.0 = Debug|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|x64.ActiveCfg = Release|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|x64.Build.0 = Release|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.Build.0 = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.ActiveCfg = Debug|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.Build.0 = Debug|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.ActiveCfg = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.ActiveCfg = Release|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.Build.0 = Release|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.Build.0 = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|x64.ActiveCfg = Debug|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.ActiveCfg = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.Build.0 = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|x64.ActiveCfg = Release|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|x64.Build.0 = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.Build.0 = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.ActiveCfg = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.Build.0 = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.ActiveCfg = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.Build.0 = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.ActiveCfg = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.Build.0 = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.ActiveCfg = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.Build.0 = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.ActiveCfg = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.Build.0 = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.ActiveCfg = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.Build.0 = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.Build.0 = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.ActiveCfg = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.Build.0 = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.ActiveCfg = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C79C2D73-06E9-4622-92CE-F166B1B51792} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B64736BD-9245-4F40-961D-EB9822265764} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{CAA5A551-006A-4119-8115-FB14692E719F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{879E26B2-48DB-47B3-B82F-893696286E6F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{71071F01-C813-4384-BE38-0F4020BCC0EE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{402A8794-B724-44A3-B608-84B600ECA387} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{464697D2-BA44-446F-8223-1EB3969ED1A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{01183543-B182-4E32-9FD6-FC15C847316C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{4258687D-4905-46A6-9407-08F4F8A81CC0} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{694C765F-DFD6-467E-A813-B3F887E822D4} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5D3983BF-143F-49C3-9284-89778282AEFE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{109C4F31-781F-4C9E-B160-E788A83F9387} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
-	EndGlobalSection
-EndGlobal

v0.5.2.tar.gz/build/msvc11/gpac_js.vcxproj Deleted

@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}</ProjectGuid>
- <RootNamespace>gpac_js</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\gpac_js\gpac_js.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/hyb_in.vcxproj Deleted

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}</ProjectGuid>
- <RootNamespace>hyb_in</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\hyb_in\fm_fake_pull.c" />
- <ClCompile Include="..\..\modules\hyb_in\fm_fake_push.c" />
- <ClCompile Include="..\..\modules\hyb_in\fm_mmbtools.c" />
- <ClCompile Include="..\..\modules\hyb_in\hyb_in.c" />
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\hyb_in\hyb_in.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/img_in.vcxproj Deleted

@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}</ProjectGuid>
- <RootNamespace>img_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/img_in_deb/img_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/img_in_deb/img_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\img_in\bmp_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\img_in\img_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\img_in\img_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\img_in\jp2_dec.c" />
- <ClCompile Include="..\..\modules\img_in\jpeg_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\img_in\png_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\img_in\img_in.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ismacryp.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}</ProjectGuid>
- <RootNamespace>ismacryp</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\ismacryp\isma_ea.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/isom_in.vcxproj Deleted

@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{FC8F1F56-078E-470D-B252-68EDDE88AA9D}</ProjectGuid>
- <RootNamespace>isom_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/isom_in_deb/isom_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/isom_in_deb/isom_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\isom_in\isom_cache.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\isom_in\load.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\isom_in\read.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\isom_in\read_ch.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\isom_in\isom_in.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/laser_dec.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{879E26B2-48DB-47B3-B82F-893696286E6F}</ProjectGuid>
- <RootNamespace>laser_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\laser_dec\laser_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/libgpac.vcxproj Deleted

@@ -1,607 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\include\gpac\ait.h" />
- <ClInclude Include="..\..\include\gpac\avparse.h" />
- <ClInclude Include="..\..\include\gpac\base_coding.h" />
- <ClInclude Include="..\..\include\gpac\bifs.h" />
- <ClInclude Include="..\..\include\gpac\bitstream.h" />
- <ClInclude Include="..\..\include\gpac\cache.h" />
- <ClInclude Include="..\..\include\gpac\color.h" />
- <ClInclude Include="..\..\include\gpac\compositor.h" />
- <ClInclude Include="..\..\include\gpac\configuration.h" />
- <ClInclude Include="..\..\include\gpac\config_file.h" />
- <ClInclude Include="..\..\include\gpac\constants.h" />
- <ClInclude Include="..\..\include\gpac\crypt.h" />
- <ClInclude Include="..\..\include\gpac\dash.h" />
- <ClInclude Include="..\..\include\gpac\download.h" />
- <ClInclude Include="..\..\include\gpac\dsmcc.h" />
- <ClInclude Include="..\..\include\gpac\dvb_mpe.h" />
- <ClInclude Include="..\..\include\gpac\esi.h" />
- <ClInclude Include="..\..\include\gpac\events.h" />
- <ClInclude Include="..\..\include\gpac\events_constants.h" />
- <ClInclude Include="..\..\include\gpac\filestreamer.h" />
- <ClInclude Include="..\..\include\gpac\html5_media.h" />
- <ClInclude Include="..\..\include\gpac\html5_mse.h" />
- <ClInclude Include="..\..\include\gpac\ietf.h" />
- <ClInclude Include="..\..\include\gpac\internal\avilib.h" />
- <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h" />
- <ClInclude Include="..\..\include\gpac\internal\camera.h" />
- <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\laser_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\m3u8.h" />
- <ClInclude Include="..\..\include\gpac\internal\media_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\mesh.h" />
- <ClInclude Include="..\..\include\gpac\internal\mpd.h" />
- <ClInclude Include="..\..\include\gpac\internal\odf_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\odf_parse_common.h" />
- <ClInclude Include="..\..\include\gpac\internal\ogg.h" />
- <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h" />
- <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\smjs_api.h" />
- <ClInclude Include="..\..\include\gpac\internal\swf_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h" />
- <ClInclude Include="..\..\include\gpac\internal\vobsub.h" />
- <ClInclude Include="..\..\include\gpac\ismacryp.h" />
- <ClInclude Include="..\..\include\gpac\iso639.h" />
- <ClInclude Include="..\..\include\gpac\isomedia.h" />
- <ClInclude Include="..\..\include\gpac\laser.h" />
- <ClInclude Include="..\..\include\gpac\list.h" />
- <ClInclude Include="..\..\include\gpac\map.h" />
- <ClInclude Include="..\..\include\gpac\math.h" />
- <ClInclude Include="..\..\include\gpac\mediaobject.h" />
- <ClInclude Include="..\..\include\gpac\media_tools.h" />
- <ClInclude Include="..\..\include\gpac\module.h" />
- <ClInclude Include="..\..\include\gpac\modules\audio_out.h" />
- <ClInclude Include="..\..\include\gpac\modules\codec.h" />
- <ClInclude Include="..\..\include\gpac\modules\font.h" />
- <ClInclude Include="..\..\include\gpac\modules\hardcoded_proto.h" />
- <ClInclude Include="..\..\include\gpac\modules\ipmp.h" />
- <ClInclude Include="..\..\include\gpac\modules\js_usr.h" />
- <ClInclude Include="..\..\include\gpac\modules\raster2d.h" />
- <ClInclude Include="..\..\include\gpac\modules\service.h" />
- <ClInclude Include="..\..\include\gpac\modules\term_ext.h" />
- <ClInclude Include="..\..\include\gpac\modules\video_out.h" />
- <ClInclude Include="..\..\include\gpac\mpeg4_odf.h" />
- <ClInclude Include="..\..\include\gpac\mpegts.h" />
- <ClInclude Include="..\..\include\gpac\network.h" />
- <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h" />
- <ClInclude Include="..\..\include\gpac\nodes_svg.h" />
- <ClInclude Include="..\..\include\gpac\nodes_x3d.h" />
- <ClInclude Include="..\..\include\gpac\nodes_xbl.h" />
- <ClInclude Include="..\..\include\gpac\options.h" />
- <ClInclude Include="..\..\include\gpac\path2d.h" />
- <ClInclude Include="..\..\include\gpac\revision.h" />
- <ClInclude Include="..\..\include\gpac\ringbuffer.h" />
- <ClInclude Include="..\..\include\gpac\rtp_streamer.h" />
- <ClInclude Include="..\..\include\gpac\scenegraph.h" />
- <ClInclude Include="..\..\include\gpac\scenegraph_svg.h" />
- <ClInclude Include="..\..\include\gpac\scenegraph_vrml.h" />
- <ClInclude Include="..\..\include\gpac\scene_engine.h" />
- <ClInclude Include="..\..\include\gpac\scene_manager.h" />
- <ClInclude Include="..\..\include\gpac\setup.h" />
- <ClInclude Include="..\..\include\gpac\svg_types.h" />
- <ClInclude Include="..\..\include\gpac\sync_layer.h" />
- <ClInclude Include="..\..\include\gpac\terminal.h" />
- <ClInclude Include="..\..\include\gpac\term_info.h" />
- <ClInclude Include="..\..\include\gpac\thread.h" />
- <ClInclude Include="..\..\include\gpac\token.h" />
- <ClInclude Include="..\..\include\gpac\tools.h" />
- <ClInclude Include="..\..\include\gpac\unicode.h" />
- <ClInclude Include="..\..\include\gpac\user.h" />
- <ClInclude Include="..\..\include\gpac\utf.h" />
- <ClInclude Include="..\..\include\gpac\version.h" />
- <ClInclude Include="..\..\include\gpac\xml.h" />
- <ClInclude Include="..\..\include\win32\inttypes.h" />
- <ClInclude Include="..\..\include\win32\stdint.h" />
- <ClInclude Include="..\..\src\bifs\quant.h" />
- <ClInclude Include="..\..\src\bifs\script.h" />
- <ClInclude Include="..\..\src\compositor\drawable.h" />
- <ClInclude Include="..\..\src\compositor\gl_inc.h" />
- <ClInclude Include="..\..\src\compositor\mpeg4_grouping.h" />
- <ClInclude Include="..\..\src\compositor\nodes_stacks.h" />
- <ClInclude Include="..\..\src\compositor\offscreen_cache.h" />
- <ClInclude Include="..\..\src\compositor\texturing.h" />
- <ClInclude Include="..\..\src\compositor\visual_manager.h" />
- <ClInclude Include="..\..\src\compositor\visual_manager_2d.h" />
- <ClInclude Include="..\..\src\compositor\visual_manager_3d.h" />
- <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h" />
- <ClInclude Include="..\..\src\terminal\input_sensor.h" />
- <ClInclude Include="..\..\src\terminal\media_control.h" />
- <ClInclude Include="..\..\src\terminal\media_memory.h" />
- <ClInclude Include="..\..\src\utils\module_wrap.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\bifs\arith_decoder.c" />
- <ClCompile Include="..\..\src\bifs\bifs_codec.c" />
- <ClCompile Include="..\..\src\bifs\bifs_node_tables.c" />
- <ClCompile Include="..\..\src\bifs\com_dec.c" />
- <ClCompile Include="..\..\src\bifs\com_enc.c" />
- <ClCompile Include="..\..\src\bifs\conditional.c" />
- <ClCompile Include="..\..\src\bifs\field_decode.c" />
- <ClCompile Include="..\..\src\bifs\field_encode.c" />
- <ClCompile Include="..\..\src\bifs\memory_decoder.c" />
- <ClCompile Include="..\..\src\bifs\predictive_mffield.c" />
- <ClCompile Include="..\..\src\bifs\quantize.c" />
- <ClCompile Include="..\..\src\bifs\script_dec.c" />
- <ClCompile Include="..\..\src\bifs\script_enc.c" />
- <ClCompile Include="..\..\src\bifs\unquantize.c" />
- <ClCompile Include="..\..\src\compositor\audio_input.c" />
- <ClCompile Include="..\..\src\compositor\audio_mixer.c" />
- <ClCompile Include="..\..\src\compositor\audio_render.c" />
- <ClCompile Include="..\..\src\compositor\bindable.c" />
- <ClCompile Include="..\..\src\compositor\camera.c" />
- <ClCompile Include="..\..\src\compositor\compositor.c" />
- <ClCompile Include="..\..\src\compositor\compositor_2d.c" />
- <ClCompile Include="..\..\src\compositor\compositor_3d.c" />
- <ClCompile Include="..\..\src\compositor\compositor_node_init.c" />
- <ClCompile Include="..\..\src\compositor\drawable.c" />
- <ClCompile Include="..\..\src\compositor\events.c" />
- <ClCompile Include="..\..\src\compositor\font_engine.c" />
- <ClCompile Include="..\..\src\compositor\hardcoded_protos.c" />
- <ClCompile Include="..\..\src\compositor\hc_flash_shape.c" />
- <ClCompile Include="..\..\src\compositor\mesh.c" />
- <ClCompile Include="..\..\src\compositor\mesh_collide.c" />
- <ClCompile Include="..\..\src\compositor\mesh_tesselate.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_animstream.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_audio.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_background.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_background2d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_bitmap.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_composite.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_form.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_2d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_3d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ifs2d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ils2d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_gradients.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_layout.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_sound.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_text.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_textures.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c" />
- <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c" />
- <ClCompile Include="..\..\src\compositor\navigate.c" />
- <ClCompile Include="..\..\src\compositor\offscreen_cache.c" />
- <ClCompile Include="..\..\src\compositor\svg_base.c" />
- <ClCompile Include="..\..\src\compositor\svg_filters.c" />
- <ClCompile Include="..\..\src\compositor\svg_font.c" />
- <ClCompile Include="..\..\src\compositor\svg_geometry.c" />
- <ClCompile Include="..\..\src\compositor\svg_grouping.c" />
- <ClCompile Include="..\..\src\compositor\svg_media.c" />
- <ClCompile Include="..\..\src\compositor\svg_paint_servers.c" />
- <ClCompile Include="..\..\src\compositor\svg_text.c" />
- <ClCompile Include="..\..\src\compositor\texturing.c" />
- <ClCompile Include="..\..\src\compositor\texturing_gl.c" />
- <ClCompile Include="..\..\src\compositor\visual_manager.c" />
- <ClCompile Include="..\..\src\compositor\visual_manager_2d.c" />
- <ClCompile Include="..\..\src\compositor\visual_manager_2d_draw.c" />
- <ClCompile Include="..\..\src\compositor\visual_manager_3d.c" />
- <ClCompile Include="..\..\src\compositor\visual_manager_3d_gl.c" />
- <ClCompile Include="..\..\src\compositor\x3d_geometry.c" />
- <ClCompile Include="..\..\src\ietf\rtcp.c" />
- <ClCompile Include="..\..\src\ietf\rtp.c" />
- <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c" />
- <ClCompile Include="..\..\src\ietf\rtp_packetizer.c" />
- <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c" />
- <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c" />
- <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c" />
- <ClCompile Include="..\..\src\ietf\rtp_streamer.c" />
- <ClCompile Include="..\..\src\ietf\rtsp_command.c" />
- <ClCompile Include="..\..\src\ietf\rtsp_common.c" />
- <ClCompile Include="..\..\src\ietf\rtsp_response.c" />
- <ClCompile Include="..\..\src\ietf\rtsp_session.c" />
- <ClCompile Include="..\..\src\ietf\sdp.c" />
- <ClCompile Include="..\..\src\isomedia\avc_ext.c" />
- <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c" />
- <ClCompile Include="..\..\src\isomedia\box_code_adobe.c" />
- <ClCompile Include="..\..\src\isomedia\box_code_apple.c" />
- <ClCompile Include="..\..\src\isomedia\box_code_base.c" />
- <ClCompile Include="..\..\src\isomedia\box_code_drm.c" />
- <ClCompile Include="..\..\src\isomedia\box_code_meta.c" />
- <ClCompile Include="..\..\src\isomedia\box_dump.c" />
- <ClCompile Include="..\..\src\isomedia\box_funcs.c" />
- <ClCompile Include="..\..\src\isomedia\data_map.c" />
- <ClCompile Include="..\..\src\isomedia\drm_sample.c" />
- <ClCompile Include="..\..\src\isomedia\hinting.c" />
- <ClCompile Include="..\..\src\isomedia\hint_track.c" />
- <ClCompile Include="..\..\src\isomedia\isom_intern.c" />
- <ClCompile Include="..\..\src\isomedia\isom_read.c" />
- <ClCompile Include="..\..\src\isomedia\isom_store.c" />
- <ClCompile Include="..\..\src\isomedia\isom_write.c" />
- <ClCompile Include="..\..\src\isomedia\media.c" />
- <ClCompile Include="..\..\src\isomedia\media_odf.c" />
- <ClCompile Include="..\..\src\isomedia\meta.c" />
- <ClCompile Include="..\..\src\isomedia\movie_fragments.c" />
- <ClCompile Include="..\..\src\isomedia\sample_descs.c" />
- <ClCompile Include="..\..\src\isomedia\stbl_read.c" />
- <ClCompile Include="..\..\src\isomedia\stbl_write.c" />
- <ClCompile Include="..\..\src\isomedia\track.c" />
- <ClCompile Include="..\..\src\isomedia\ttml.c" />
- <ClCompile Include="..\..\src\isomedia\tx3g.c" />
- <ClCompile Include="..\..\src\laser\lsr_dec.c" />
- <ClCompile Include="..\..\src\laser\lsr_enc.c" />
- <ClCompile Include="..\..\src\laser\lsr_tables.c" />
- <ClCompile Include="..\..\src\mcrypt\cbc.c" />
- <ClCompile Include="..\..\src\mcrypt\cfb.c" />
- <ClCompile Include="..\..\src\mcrypt\ctr.c" />
- <ClCompile Include="..\..\src\mcrypt\des.c" />
- <ClCompile Include="..\..\src\mcrypt\ecb.c" />
- <ClCompile Include="..\..\src\mcrypt\g_crypt.c" />
- <ClCompile Include="..\..\src\mcrypt\ncfb.c" />
- <ClCompile Include="..\..\src\mcrypt\nofb.c" />
- <ClCompile Include="..\..\src\mcrypt\ofb.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-128.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-192.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-256.c" />
- <ClCompile Include="..\..\src\mcrypt\stream.c" />
- <ClCompile Include="..\..\src\mcrypt\tripledes.c" />
- <ClCompile Include="..\..\src\media_tools\ait.c" />
- <ClCompile Include="..\..\src\media_tools\avilib.c" />
- <ClCompile Include="..\..\src\media_tools\av_parsers.c" />
- <ClCompile Include="..\..\src\media_tools\dash_client.c" />
- <ClCompile Include="..\..\src\media_tools\dash_segmenter.c" />
- <ClCompile Include="..\..\src\media_tools\dsmcc.c" />
- <ClCompile Include="..\..\src\media_tools\dvb_mpe.c" />
- <ClCompile Include="..\..\src\media_tools\filestreamer.c" />
- <ClCompile Include="..\..\src\media_tools\gpac_ogg.c" />
- <ClCompile Include="..\..\src\media_tools\html5_media.c" />
- <ClCompile Include="..\..\src\media_tools\html5_mse.c" />
- <ClCompile Include="..\..\src\media_tools\img.c" />
- <ClCompile Include="..\..\src\media_tools\ismacryp.c" />
- <ClCompile Include="..\..\src\media_tools\isom_hinter.c" />
- <ClCompile Include="..\..\src\media_tools\isom_tools.c" />
- <ClCompile Include="..\..\src\media_tools\m2ts_mux.c" />
- <ClCompile Include="..\..\src\media_tools\m3u8.c" />
- <ClCompile Include="..\..\src\media_tools\media_export.c" />
- <ClCompile Include="..\..\src\media_tools\media_import.c" />
- <ClCompile Include="..\..\src\media_tools\mpd.c" />
- <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c" />
- <ClCompile Include="..\..\src\media_tools\mpegts.c" />
- <ClCompile Include="..\..\src\media_tools\reedsolomon.c" />
- <ClCompile Include="..\..\src\media_tools\saf.c" />
- <ClCompile Include="..\..\src\media_tools\text_import.c" />
- <ClCompile Include="..\..\src\media_tools\vobsub.c" />
- <ClCompile Include="..\..\src\media_tools\webvtt.c" />
- <ClCompile Include="..\..\src\odf\descriptors.c" />
- <ClCompile Include="..\..\src\odf\desc_private.c" />
- <ClCompile Include="..\..\src\odf\ipmpx_code.c" />
- <ClCompile Include="..\..\src\odf\ipmpx_dump.c" />
- <ClCompile Include="..\..\src\odf\ipmpx_parse.c" />
- <ClCompile Include="..\..\src\odf\oci_codec.c" />
- <ClCompile Include="..\..\src\odf\odf_code.c" />
- <ClCompile Include="..\..\src\odf\odf_codec.c" />
- <ClCompile Include="..\..\src\odf\odf_command.c" />
- <ClCompile Include="..\..\src\odf\odf_dump.c" />
- <ClCompile Include="..\..\src\odf\odf_parse.c" />
- <ClCompile Include="..\..\src\odf\qos.c" />
- <ClCompile Include="..\..\src\odf\slc.c" />
- <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c" />
- <ClCompile Include="..\..\src\scenegraph\commands.c" />
- <ClCompile Include="..\..\src\scenegraph\dom_events.c" />
- <ClCompile Include="..\..\src\scenegraph\dom_smjs.c" />
- <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c" />
- <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c" />
- <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c" />
- <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c" />
- <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c" />
- <ClCompile Include="..\..\src\scenegraph\smil_anim.c" />
- <ClCompile Include="..\..\src\scenegraph\smil_timing.c" />
- <ClCompile Include="..\..\src\scenegraph\svg_attributes.c" />
- <ClCompile Include="..\..\src\scenegraph\svg_properties.c" />
- <ClCompile Include="..\..\src\scenegraph\svg_smjs.c" />
- <ClCompile Include="..\..\src\scenegraph\svg_types.c" />
- <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c" />
- <ClCompile Include="..\..\src\scenegraph\vrml_proto.c" />
- <ClCompile Include="..\..\src\scenegraph\vrml_route.c" />
- <ClCompile Include="..\..\src\scenegraph\vrml_script.c" />
- <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c" />
- <ClCompile Include="..\..\src\scenegraph\vrml_tools.c" />
- <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c" />
- <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c" />
- <ClCompile Include="..\..\src\scenegraph\xbl_process.c" />
- <ClCompile Include="..\..\src\scenegraph\xml_ns.c" />
- <ClCompile Include="..\..\src\scene_manager\encode_isom.c" />
- <ClCompile Include="..\..\src\scene_manager\loader_bt.c" />
- <ClCompile Include="..\..\src\scene_manager\loader_isom.c" />
- <ClCompile Include="..\..\src\scene_manager\loader_qt.c" />
- <ClCompile Include="..\..\src\scene_manager\loader_svg.c" />
- <ClCompile Include="..\..\src\scene_manager\loader_xmt.c" />
- <ClCompile Include="..\..\src\scene_manager\scene_dump.c" />
- <ClCompile Include="..\..\src\scene_manager\scene_engine.c" />
- <ClCompile Include="..\..\src\scene_manager\scene_manager.c" />
- <ClCompile Include="..\..\src\scene_manager\scene_stats.c" />
- <ClCompile Include="..\..\src\scene_manager\swf_bifs.c" />
- <ClCompile Include="..\..\src\scene_manager\swf_parse.c" />
- <ClCompile Include="..\..\src\scene_manager\swf_svg.c" />
- <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c" />
- <ClCompile Include="..\..\src\terminal\channel.c" />
- <ClCompile Include="..\..\src\terminal\clock.c" />
- <ClCompile Include="..\..\src\terminal\decoder.c" />
- <ClCompile Include="..\..\src\terminal\input_sensor.c" />
- <ClCompile Include="..\..\src\terminal\media_control.c" />
- <ClCompile Include="..\..\src\terminal\media_manager.c" />
- <ClCompile Include="..\..\src\terminal\media_memory.c" />
- <ClCompile Include="..\..\src\terminal\media_object.c" />
- <ClCompile Include="..\..\src\terminal\media_sensor.c" />
- <ClCompile Include="..\..\src\terminal\mpeg4_inline.c" />
- <ClCompile Include="..\..\src\terminal\network_service.c" />
- <ClCompile Include="..\..\src\terminal\object_browser.c" />
- <ClCompile Include="..\..\src\terminal\object_manager.c" />
- <ClCompile Include="..\..\src\terminal\scene.c" />
- <ClCompile Include="..\..\src\terminal\svg_external.c" />
- <ClCompile Include="..\..\src\terminal\terminal.c" />
- <ClCompile Include="..\..\src\terminal\term_node_init.c" />
- <ClCompile Include="..\..\src\utils\alloc.c" />
- <ClCompile Include="..\..\src\utils\base_encoding.c" />
- <ClCompile Include="..\..\src\utils\bitstream.c" />
- <ClCompile Include="..\..\src\utils\cache.c" />
- <ClCompile Include="..\..\src\utils\color.c" />
- <ClCompile Include="..\..\src\utils\configfile.c" />
- <ClCompile Include="..\..\src\utils\dlmalloc.c" />
- <ClCompile Include="..\..\src\utils\downloader.c" />
- <ClCompile Include="..\..\src\utils\error.c" />
- <ClCompile Include="..\..\src\utils\list.c" />
- <ClCompile Include="..\..\src\utils\map.c" />
- <ClCompile Include="..\..\src\utils\math.c" />
- <ClCompile Include="..\..\src\utils\module.c" />
- <ClCompile Include="..\..\src\utils\os_config_init.c" />
- <ClCompile Include="..\..\src\utils\os_divers.c" />
- <ClCompile Include="..\..\src\utils\os_file.c" />
- <ClCompile Include="..\..\src\utils\os_module.c" />
- <ClCompile Include="..\..\src\utils\os_net.c" />
- <ClCompile Include="..\..\src\utils\os_thread.c" />
- <ClCompile Include="..\..\src\utils\path2d.c" />
- <ClCompile Include="..\..\src\utils\path2d_stroker.c" />
- <ClCompile Include="..\..\src\utils\ringbuffer.c" />
- <ClCompile Include="..\..\src\utils\sha1.c" />
- <ClCompile Include="..\..\src\utils\token.c" />
- <ClCompile Include="..\..\src\utils\unicode.c" />
- <ClCompile Include="..\..\src\utils\uni_bidi.c" />
- <ClCompile Include="..\..\src\utils\url.c" />
- <ClCompile Include="..\..\src\utils\utf.c" />
- <ClCompile Include="..\..\src\utils\xml_parser.c" />
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{233014D5-F6E5-419D-8757-FA9CE7337088}</ProjectGuid>
- <RootNamespace>libgpac</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac_static</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac_static</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac_static</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac_static</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>
- </Command>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <PreBuildEvent>
- <Command>
- </Command>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetMachine>MachineX64</TargetMachine>
- </Lib>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"$(ProjectDir)..\..\version.bat"</Command>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <PreBuildEvent>
- <Command>"$(ProjectDir)..\..\version.bat"</Command>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetMachine>MachineX64</TargetMachine>
- </Lib>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/libgpac_dll.vcxproj Deleted

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D3540754-E0CF-4604-AC11-82DE9BD4D814}</ProjectGuid>
- <RootNamespace>libgpac_dll</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <ProjectReference>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>..\..\extra_lib\lib\w32_deb;../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
- <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <ProjectReference>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
- <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac.vcxproj">
- <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mp3_in.vcxproj Deleted

@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}</ProjectGuid>
- <RootNamespace>mp3_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/mp3_in_deb/mp3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/mp3_in_deb/mp3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\mp3_in\mad_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\mp3_in\mp3_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mp42ts.vcxproj Deleted

@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\mp42ts\main.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <Private>true</Private>
- <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mp4box.vcxproj Deleted

@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{48E2C7C6-52EB-46FB-8722-00A62F46F497}</ProjectGuid>
- <RootNamespace>mp4box</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\mp4box\filedump.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\mp4box\fileimport.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\mp4box\live.c" />
- <ClCompile Include="..\..\applications\mp4box\main.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mp4client.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A35D99BF-D72D-4F56-99A1-97249B22BCE2}</ProjectGuid>
- <RootNamespace>mp4client</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
- <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <TypeLibraryName>.\obj/mp4client_deb/mp4client.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>User32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <TypeLibraryName>.\obj/mp4client_deb/mp4client.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>.\obj/mp4client_rel/mp4client.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TypeLibraryName>.\obj/mp4client_rel/mp4client.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\mp4client\extract.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\applications\mp4client\main.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\applications\mp4client\mp4client.rc" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\applications\mp4client\resource.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mpd_in.vcxproj Deleted

@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}</ProjectGuid>
- <RootNamespace>dash</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\mpd_in\mpd_in.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mpegts_in.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B38E812D-9823-48E7-BE5F-BF09B0AD4165}</ProjectGuid>
- <RootNamespace>mpegts_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\mpegts_in\mpegts_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/mse_in.vcxproj Deleted

@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}</ProjectGuid>
- <RootNamespace>dash</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\mse_in\mse_in.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/odf_dec.vcxproj Deleted

@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A86E6EF8-3683-4AD0-8878-7A0D51326088}</ProjectGuid>
- <RootNamespace>odf_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\odf_dec\odf_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ogg.vcxproj Deleted

@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}</ProjectGuid>
- <RootNamespace>ogg</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ogg_rel/ogg.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ogg_rel/ogg.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ogg_deb/ogg.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ogg_deb/ogg.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\ogg\ogg_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\ogg\ogg_load.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\ogg\theora_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\ogg\vorbis_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\ogg\ogg_in.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/openhevc.vcxproj Deleted

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>openhevc_dec</ProjectName>
- <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EF17C48B}</ProjectGuid>
- <RootNamespace>openhevc_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\openhevc_dec\openhevc_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/opensvc.vcxproj Deleted

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>opensvc_dec</ProjectName>
- <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EB17C48B}</ProjectGuid>
- <RootNamespace>opensvc_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_deb/opensvc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_deb/opensvc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\opensvc_dec\opensvc_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/osmophone.vcxproj Deleted

@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}</ProjectGuid>
- <RootNamespace>osmophone</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
- <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
- <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
- <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>
- </IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <StackReserveSize>65536</StackReserveSize>
- <StackCommitSize>4096</StackCommitSize>
- <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
- <BaseAddress>0x00010000</BaseAddress>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
- <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
- <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
- <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>
- </IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <StackReserveSize>65536</StackReserveSize>
- <StackCommitSize>4096</StackCommitSize>
- <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
- <BaseAddress>0x00010000</BaseAddress>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
- <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>
- </IgnoreSpecificDefaultLibraries>
- <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <StackReserveSize>65536</StackReserveSize>
- <StackCommitSize>4096</StackCommitSize>
- <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
- <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>
- </IgnoreSpecificDefaultLibraries>
- <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <StackReserveSize>65536</StackReserveSize>
- <StackCommitSize>4096</StackCommitSize>
- <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\osmophone\main.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- </PrecompiledHeader>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- </PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\..\applications\osmophone\openfile.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- </PrecompiledHeader>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- </PrecompiledHeader>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\applications\osmophone\osmophone.rc">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0809</Culture>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">0x0809</Culture>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0809</Culture>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|x64'">0x0809</Culture>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\applications\osmophone\newres.h" />
- <ClInclude Include="..\..\applications\osmophone\resource.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\doc\osmo4.ico" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/osmozilla.vcxproj Deleted

@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A0288B75-0D95-4106-A3A7-779A891E8FEF}</ProjectGuid>
- <RootNamespace>osmozilla</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nposmozilla</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nposmozilla</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nposmozilla</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nposmozilla</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CallingConvention>Cdecl</CallingConvention>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CallingConvention>Cdecl</CallingConvention>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
- <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
- <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
- <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_WIN64;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
- <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
- <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
- <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- <PostBuildEvent>
- <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\applications\osmozilla\osmo_npapi.cpp" />
- <ClCompile Include="..\..\applications\osmozilla\osmozilla.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\applications\osmozilla\osmozilla.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\applications\osmozilla\nsIOsmozilla.h" />
- <ClInclude Include="..\..\applications\osmozilla\osmo_npapi.h" />
- <ClInclude Include="..\..\applications\osmozilla\osmozilla.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/platinum.vcxproj Deleted

@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{694C765F-DFD6-467E-A813-B3F887E822D4}</ProjectGuid>
- <RootNamespace>platinum</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>platinum.lib;neptune.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>platinum.lib;neptune.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\platinum\GenericDevice.cpp" />
- <ClCompile Include="..\..\modules\platinum\GPACFileMediaServer.cpp" />
- <ClCompile Include="..\..\modules\platinum\GPACMediaController.cpp" />
- <ClCompile Include="..\..\modules\platinum\GPACMediaRenderer.cpp" />
- <ClCompile Include="..\..\modules\platinum\GPACPlatinum.cpp" />
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\platinum\GenericDevice.h" />
- <ClInclude Include="..\..\modules\platinum\GPACFileMediaServer.h" />
- <ClInclude Include="..\..\modules\platinum\GPACMediaController.h" />
- <ClInclude Include="..\..\modules\platinum\GPACMediaRenderer.h" />
- <ClInclude Include="..\..\modules\platinum\GPACPlatinum.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/raw_out.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}</ProjectGuid>
- <RootNamespace>raw_out</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\raw_out\raw_video.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/redirect_av.vcxproj Deleted

@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{073E2281-4FDE-4C4D-A217-C489DB17C48C}</ProjectGuid>
- <RootNamespace>redirect_av</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\redirect_av\redirect_av.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/rtp_in.vcxproj Deleted

@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E2DBD151-9523-4E1A-9478-F3F825668F6E}</ProjectGuid>
- <RootNamespace>rtp_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\rtp_in\rtp_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\rtp_in\rtp_session.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\rtp_in\rtp_signaling.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\rtp_in\rtp_stream.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\rtp_in\sdp_fetch.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\rtp_in\sdp_load.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\rtp_in\rtp_in.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/saf_in.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}</ProjectGuid>
- <RootNamespace>saf_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\saf_in\saf_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/sdl_out.vcxproj Deleted

@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{F346A9A7-CF8D-4409-8776-1D4244F96EF8}</ProjectGuid>
- <RootNamespace>sdl_out</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\DEVTOOLS\include;$(IncludePath)</IncludePath>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;;C:\devtools\lib\x64</LibraryPath>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\sdl_out\audio.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\sdl_out\cursors.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\sdl_out\sdl_out.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\sdl_out\video.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\sdl_out\sdl_out.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/soft_raster.vcxproj Deleted

@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{71071F01-C813-4384-BE38-0F4020BCC0EE}</ProjectGuid>
- <RootNamespace>soft_raster</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\soft_raster\ftgrays.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\soft_raster\raster_565.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\soft_raster\raster_argb.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\soft_raster\raster_load.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\soft_raster\raster_rgb.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\soft_raster\stencil.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\soft_raster\surface.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\soft_raster\rast_soft.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/svg_in.vcxproj Deleted

@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{402A8794-B724-44A3-B608-84B600ECA387}</ProjectGuid>
- <RootNamespace>svg_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\svg_in\svg_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/timedtext.vcxproj Deleted

@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{464697D2-BA44-446F-8223-1EB3969ED1A8}</ProjectGuid>
- <RootNamespace>timedtext</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\timedtext\timedtext_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\timedtext\timedtext_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/ui_rec.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{073E2381-4FDE-4C4D-A117-C489DB17C48C}</ProjectGuid>
- <RootNamespace>ui_rec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\ui_rec\ui_rec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/validator.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}</ProjectGuid>
- <RootNamespace>validator</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/validator_deb/validator.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/validator_deb/validator.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\validator\validator.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/vtt_in.vcxproj Deleted

@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E578716F-6663-4D83-AC79-57EA00D2F406}</ProjectGuid>
- <RootNamespace>vtt_in</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\vtt_in\vtt_in.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\vtt_in\vtt_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/wav_out.vcxproj Deleted

@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{01183543-B182-4E32-9FD6-FC15C847316C}</ProjectGuid>
- <RootNamespace>wav_out</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\wav_out\wav_out.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/widgetman.vcxproj Deleted

@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}</ProjectGuid>
- <RootNamespace>widgetman</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\widgetman\unzip.c" />
- <ClCompile Include="..\..\modules\widgetman\wgt_load.c" />
- <ClCompile Include="..\..\modules\widgetman\widget.c" />
- <ClCompile Include="..\..\modules\widgetman\widgetman.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\modules\widgetman\unzip.h" />
- <ClInclude Include="..\..\modules\widgetman\widgetman.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc11/xvid_dec.vcxproj Deleted

@@ -1,522 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{4258687D-4905-46A6-9407-08F4F8A81CC0}</ProjectGuid>
- <RootNamespace>xvid_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
- <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
- <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
- <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
- </Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\decoder.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\font.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\gmc.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\idct.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\image.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\reduced.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\xvid.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\modules\modules_export.cpp" />
- <ClCompile Include="..\..\modules\xvid_dec\xvid_dec.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\modules\xvid_dec\xvid_dec_wce.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\bitstream.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\decoder.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\global.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\gmc.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\image.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_align.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\portab.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\reduced.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\Rules.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\xvid.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- </ItemGroup>
- <ItemGroup>
- <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\qpel.inl">
- <FileType>Document</FileType>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- </ItemGroup>
- <ItemGroup>
- <MASM Include="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </MASM>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
- </ImportGroup>
-</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc8 Deleted

v0.5.2.tar.gz/build/msvc8/GPAX.vcproj Deleted

@@ -1,649 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="GPAX"
-	ProjectGUID="{72486240-A124-496E-A67A-E76FEC7E99BE}"
-	RootNamespace="GPAX"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;&#x0D;&#x0A;"
-				Outputs="$(OutDir)\regsvr32.trg"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/w32_deb/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="2"
-				ImportLibrary="$(IntDir)/$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description=""
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/w32_deb/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/w32_deb/GPAX.pch"
-				AssemblerListingLocation=".\obj/w32_deb/"
-				ObjectFile=".\obj/w32_deb/"
-				ProgramDataBaseFileName=".\obj/w32_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/w32_deb_vc8/GPAX.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/w32_deb/GPAX.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/w32_deb/GPAX.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;&#x0D;&#x0A;"
-				Outputs="$(OutDir)\regsvr32.trg"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/w32_rel/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="js32.lib zlib.lib winmm.lib ws2_32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/GPAX.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				SupportUnloadOfDelayLoadedDLL="false"
-				ImportLibrary="$(IntDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description=""
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/w32_rel/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_USR_DLL"
-				MinimalRebuild="false"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(PlatformName)/$(ConfigurationName)/$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC&quot; md &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\GPAX.dll &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\GPAX\gpax.bmp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.def"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.idl"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.rc"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.rgs"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAXPlugin.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAXPlugin.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\StdAfx.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\StdAfx.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/Osmo4.vcproj Deleted

@@ -1,892 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="Osmo4"
-	ProjectGUID="{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-	RootNamespace="Osmo4"
-	Keyword="MFCProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_rel/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				StackReserveSize="8388608"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_rel/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/osmo4_w32_rel/Osmo4.pdb"
-				SubSystem="9"
-				StackReserveSize="8388608"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_deb/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_deb/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;DEBUG;ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\AddressBar.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\FileProps.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\MainFrm.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\OpenUrl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Options.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Osmo4.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Osmo4.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Playlist.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Sliders.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\StdAfx.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\AddressBar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\FileProps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\MainFrm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\OpenUrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Osmo4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Playlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Sliders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\StdAfx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="res"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\error.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\maintool.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\message.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\osmo4.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\pause.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\play.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\playlist.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\stop.ico"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/V4Studio.vcproj Deleted

@@ -1,922 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="V4Studio"
-	ProjectGUID="{3CF33BCE-07EF-43F7-8BBC-2AE90CC36828}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj/v4studio_deb"
-			IntermediateDirectory=".\obj/v4studio_deb"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/v4studio_deb/V4Studio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../M4Systems/SceneGraph"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WXDEBUG__;WXDEBUG=1;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/v4studio_deb/V4Studio.pch"
-				AssemblerListingLocation=".\obj/v4studio_deb/"
-				ObjectFile=".\obj/v4studio_deb/"
-				ProgramDataBaseFileName=".\obj/v4studio_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="C:\Projets\wxWindows\include"
-				ResourceOutputFileName="rc\V4Studio.res"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase26d.lib wxmsw26d_core.lib wxmsw26d_adv.lib comctl32.lib ws2_32.lib odbc32.lib odbccp32.lib rpcrt4.lib"
-				OutputFile="../../bin/w32_deb/V4Studio.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/v4studio_deb/V4Studio.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/v4studio_deb/V4Studio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj/v4studio_rel"
-			IntermediateDirectory=".\obj/v4studio_rel"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/v4studio_rel/V4Studio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WXDEBUG__;WXDEBUG=1;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\obj/v4studio_rel/V4Studio.pch"
-				AssemblerListingLocation=".\obj/v4studio_rel/"
-				ObjectFile=".\obj/v4studio_rel/"
-				ProgramDataBaseFileName=".\obj/v4studio_rel/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="E:\MesProjets\wxWindows\include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase26.lib wxmsw26_core.lib wxmsw26_adv.lib ws2_32.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib winmm.lib"
-				OutputFile="../../bin/w32_rel/V4Studio.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/v4studio_rel/V4Studio.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/v4studio_rel/V4Studio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\appearance.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\blank.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\bullseye.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\cdrom.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\circle.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\close.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\colortransform.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\computer.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\copy.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\cross.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\cut.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\delete.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\drive.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\file1.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\floppy.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\folder1.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\folder2.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\fs.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\group.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\hand.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\ifs2d.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\ils2d.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\image.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\layer2d.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\lg.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\lineproperties.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\magnif1.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\material2d.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\movie.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\new.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\noentry.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\open.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\orderedgroup.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\paste.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\paste_use.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\pbrush.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\pencil.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\pntleft.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\pntright.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\preview.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\print.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\query.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\RCa01312"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\rect.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\redo.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\removble.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\resource_orig.xrc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\rg.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\rightarr.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\roller.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\save.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\shape.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\sound.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\t2d.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\text.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\tm2d.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\undo.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\v4.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\v4.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\V4Studio.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\v4studio\rc;\CVS\gpac\applications\v4studio\rc;\gpac2\applications\v4studio\rc;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\v4studio\rc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\wx\msw\watch1.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\rc\xlineproperties.bmp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="UI"
-			>
-			<File
-				RelativePath="..\..\applications\v4studio\V4CommandPanel.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4CommandPanel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4FieldList.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4FieldList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4StudioFrame.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4StudioFrame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4StudioTree.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4StudioTree.h"
-				>
-			</File>
-			<Filter
-				Name="TimeLine"
-				Filter="*.h"
-				>
-				<File
-					RelativePath="..\..\applications\v4studio\safe_include.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLine.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLine.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineCase.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineCase.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineElt.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineElt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineHdr.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineHdr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineLine.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\applications\v4studio\V4TimeLine\V4TimeLineLine.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="SceneManagment"
-			>
-			<File
-				RelativePath="..\..\applications\v4studio\V4Node.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4Node.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4NodePool.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4NodePool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4NodePools.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4NodePools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4SceneManager.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4SceneManager.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="GPACTerminal"
-			>
-			<File
-				RelativePath="..\..\applications\v4studio\V4Service.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\V4Service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\wxGPACPanel.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\v4studio\wxGPACPanel.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\applications\v4studio\V4StudioApp.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\v4studio\V4StudioApp.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/aac_in.vcproj Deleted

@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="aac_in"
-	ProjectGUID="{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-	RootNamespace="aac_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_deb/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_deb/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_FAAD"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)\"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\aac_in/gm_aac_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_rel/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="false"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_rel/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;NDEBUG;GPAC_HAS_FAAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/aac_in_rel/gm_aac_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\aac_in\aac_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\aac_in\faad_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ac3_in.vcproj Deleted

@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ac3_in"
-	ProjectGUID="{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-	RootNamespace="ac3_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/ac3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_LIBA52"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="liba52.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\ac3_in/gm_ac3_in.pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				OutputManifestFile="$(IntDir)\$(TargetFileName).embed.manifest"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_LIBA52"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib liba52.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/ac3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="liba52.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="false"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_LIBA52"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib liba52.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ac3_in\ac3_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ac3_in\liba52_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/amr_dec.vcproj Deleted

@@ -1,499 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="amr_dec"
-	ProjectGUID="{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
-	RootNamespace="amr_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_rel/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				StackReserveSize="8388608"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_rel/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;MMS_IO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/amr_dec_rel/gm_amr_dec.pdb"
-				SubSystem="9"
-				StackReserveSize="8388608"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_deb/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_deb/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;MMS_IO"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/amr_dec_deb/"
-				ObjectFile=".\obj/amr_dec_deb/"
-				ProgramDataBaseFileName=".\obj/amr_dec_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/amr_dec_deb/gm_amr_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/amr_float_dec.vcproj Deleted

@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="amr_float_dec"
-	ProjectGUID="{5D3983BF-143F-49C3-9284-89778282AEFE}"
-	RootNamespace="amr_float_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_deb/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_deb/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/amr_float_dec_deb/"
-				ObjectFile=".\obj/amr_float_dec_deb/"
-				ProgramDataBaseFileName=".\obj/amr_float_dec_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/amr_float_dec_deb/gm_amr_float_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_rel/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_rel/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/amr_float_dec_rel/gm_amr_float_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\amr_float_dec\amr_float_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/audio_filter.vcproj Deleted

@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="audio_filter"
-	ProjectGUID="{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-	RootNamespace="audio_filter"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_rel/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_rel/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/audio_filter_rel/gm_audio_filter.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_deb/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_deb/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/gm_audio_filter.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\audio_filter\audio_filter.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/avcap.vcproj Deleted

@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="avcap"
-	ProjectGUID="{109C4F31-781F-4C9E-B160-E788A83F9387}"
-	RootNamespace="avcap"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_dummy_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_dummy_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\avcap\avcap.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/bifs_dec.vcproj Deleted

@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="bifs_dec"
-	ProjectGUID="{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-	RootNamespace="bifs_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_rel/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_rel/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/bifs_dec_rel/gm_bifs_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_deb/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_deb/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/gm_bifs_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\bifs_dec\bifs_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ctx_load.vcproj Deleted

@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ctx_load"
-	ProjectGUID="{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-	RootNamespace="ctx_load"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_rel/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_rel/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ctx_load_rel/gm_ctx_load.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_deb/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_deb/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/gm_ctx_load.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ctx_load\ctx_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/demo_is.vcproj Deleted

@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="demo_is"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489EB17C48C}"
-	RootNamespace="demo_is"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/demo_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\modules\demo_is\demo_is.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/demo_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\demo_is\demo_is.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_demo_is.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/demo_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\demo_is\demo_is.def"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/demo_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\demo_is\demo_is.def"
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_demo_is.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\demo_is\demo_is.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\demo_is\demo_is.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/dummy_in.vcproj Deleted

@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="dummy_in"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-	RootNamespace="dummy_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_dummy_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_dummy_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\dummy_in\dummy_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/dx_hw.vcproj Deleted

@@ -1,673 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="dx_hw"
-	ProjectGUID="{B64736BD-9245-4F40-961D-EB9822265764}"
-	RootNamespace="dx_hw"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_rel/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;&quot;$(DXSDK_DIR)Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)Lib\x86&quot;;&quot;..\..\extra_lib\lib\$(PlatformName)\$(ConfigurationName)&quot;;&quot;$(DXSDK_DIR)Lib&quot;"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_rel/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER)"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dx_hw_rel/gm_dx_hw.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/dx_hw_rel/gm_dx_hw.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_deb/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;&quot;$(DXSDK_DIR)Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)Lib\x86&quot;;&quot;..\..\extra_lib\lib\$(PlatformName)\$(ConfigurationName)&quot;;&quot;$(DXSDK_DIR)Lib&quot;"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_deb/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/dx_hw_deb/"
-				ObjectFile=".\obj/dx_hw_deb/"
-				ProgramDataBaseFileName=".\obj/dx_hw_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libGLES_CM.lib ddraw.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)/; C:\Program Files\Windows Mobile 6 SDK\PocketPC\Lib\Armv4i"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/dx_hw_deb/gm_dx_hw.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\dx_hw\collide.cur"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\copy_pixels.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_2d.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_audio.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_hw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_hw.rc"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_video.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_window.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\hand.cur"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\resource.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ffmpeg_in.vcproj Deleted

@@ -1,541 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ffmpeg_in"
-	ProjectGUID="{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-	RootNamespace="ffmpeg_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_deb/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_deb/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../include/wince;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;EMULATE_INTTYPES"
-				MinimalRebuild="true"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ffmpeg_in.pdb"
-				SubSystem="9"
-				SupportUnloadOfDelayLoadedDLL="false"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles="avcodec-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avformat-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avutil-49.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0"
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_rel/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_rel/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/;../../include/wince;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;EMULATE_INTTYPES"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ffmpeg_in_rel/gm_ffmpeg_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_decode.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_demux.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_load.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/freenect.vcproj Deleted

@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="freenect"
-	ProjectGUID="{109C8F31-781F-4D9E-B160-E788A83F9387}"
-	RootNamespace="freenect"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/freenect.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freenect.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/freenect.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_dummy_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/freenect.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freenect.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/freenect.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_dummy_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\freenect\freenect.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ft_font.vcproj Deleted

@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ft_font"
-	ProjectGUID="{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
-	RootNamespace="ft_font"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_deb/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetype.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				OutputManifestFile="$(IntDir)\$(TargetFileName).embed.manifest"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_deb/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib freetype.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ft_font.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_rel/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetype.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_rel/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib freetype.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ft_font_rel/gm_ft_font.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ft_font\ft_font.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ft_font\ft_font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/gapi.vcproj Deleted

@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="gapi"
-	ProjectGUID="{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}"
-	RootNamespace="gapi"
-	>
-	<Platforms>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/gapi.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG;_USRDLL"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),NDEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/gm_gapi.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="_DllMainCRTStartup"
-				BaseAddress="0x00100000"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/gapi.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)/"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/gm_gapi.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="_DllMainCRTStartup"
-				BaseAddress="0x00100000"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\gapi\gapi.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					UsePrecompiledHeader="0"
-					BrowseInformation="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gapi\gapi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/gdip_raster.vcproj Deleted

@@ -1,580 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="gdip_raster"
-	ProjectGUID="{CAA5A551-006A-4119-8115-FB14692E719F}"
-	RootNamespace="gdip_raster"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_rel/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_rel/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/gdip_rel/gm_gdip_raster.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/gdip_rel/gm_gdip_raster.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_deb/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_deb/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/gdip_deb/"
-				ObjectFile=".\obj/gdip_deb/"
-				ProgramDataBaseFileName=".\obj/gdip_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/gdip_deb/gm_gdip_raster.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_font.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_grad.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_priv.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_rend.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_texture.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/gpac.sln Deleted

@@ -1,1029 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_in", "dummy_in.vcproj", "{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdip_raster", "gdip_raster.vcproj", "{CAA5A551-006A-4119-8115-FB14692E719F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "img_in", "img_in.vcproj", "{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isom_in", "isom_in.vcproj", "{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laser_dec", "laser_dec.vcproj", "{879E26B2-48DB-47B3-B82F-893696286E6F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_dll", "libgpac_dll.vcproj", "{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
-	ProjectSection(ProjectDependencies) = postProject
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odf_dec", "odf_dec.vcproj", "{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtp_in", "rtp_in.vcproj", "{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saf_in", "saf_in.vcproj", "{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl_out", "sdl_out.vcproj", "{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soft_raster", "soft_raster.vcproj", "{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svg_in", "svg_in.vcproj", "{402A8794-B724-44A3-B608-84B600ECA387}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timedtext", "timedtext.vcproj", "{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wav_out", "wav_out.vcproj", "{01183543-B182-4E32-9FD6-FC15C847316C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvid_dec", "xvid_dec.vcproj", "{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ismacryp", "ismacryp.vcproj", "{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gapi", "gapi.vcproj", "{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmophone", "osmophone.vcproj", "{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac_js", "gpac_js.vcproj", "{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_filter", "audio_filter.vcproj", "{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platinum", "platinum.vcproj", "{694C765F-DFD6-467E-A813-B3F887E822D4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "widgetman", "widgetman.vcproj", "{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redirect_av", "redirect_av.vcproj", "{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_rec", "ui_rec.vcproj", "{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensvc_dec", "opensvc.vcproj", "{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpd_in", "mpd_in.vcproj", "{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_dec", "amr_dec.vcproj", "{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_float_dec", "amr_float_dec.vcproj", "{5D3983BF-143F-49C3-9284-89778282AEFE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hyb_in", "hyb_in.vcproj", "{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "validator.vcproj", "{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avcap", "avcap.vcproj", "{109C4F31-781F-4C9E-B160-E788A83F9387}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4)
-		Debug|Smartphone 2003 (ARMV4) = Debug|Smartphone 2003 (ARMV4)
-		Debug|Win32 = Debug|Win32
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4)
-		Release|Smartphone 2003 (ARMV4) = Release|Smartphone 2003 (ARMV4)
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.Build.0 = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.ActiveCfg = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.Build.0 = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.ActiveCfg = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.Build.0 = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.Build.0 = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.ActiveCfg = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.Build.0 = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.ActiveCfg = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Win32.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Win32.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Win32.Build.0 = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.Build.0 = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.ActiveCfg = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.Build.0 = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.Build.0 = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.ActiveCfg = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.Build.0 = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.Build.0 = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Win32.Build.0 = Debug|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Win32.ActiveCfg = Release|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Win32.Build.0 = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Mixed Platforms.Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.Build.0 = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Mixed Platforms.Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.ActiveCfg = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.Build.0 = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.ActiveCfg = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

v0.5.2.tar.gz/build/msvc8/gpac_js.vcproj Deleted

@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="gpac_js"
-	ProjectGUID="{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-	RootNamespace="gpac_js"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_deb/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)\gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_deb/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)\gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_rel/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_rel/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)\gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\gpac_js\gpac_js.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/hyb_in.vcproj Deleted

@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="hyb_in"
-	ProjectGUID="{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}"
-	RootNamespace="hyb_in"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\hyb_in\fm_fake_pull.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\hyb_in\fm_fake_push.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\hyb_in\fm_mmbtools.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\hyb_in\hyb_in.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\hyb_in\hyb_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/img_in.vcproj Deleted

@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="img_in"
-	ProjectGUID="{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-	RootNamespace="img_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_deb/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include/openjpeg"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libjpeg.lib libpng.lib zlib.lib LibOpenJPEGd.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_deb/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include/openjpeg"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;$(NOINHERIT)"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libjpeg.lib libpng.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_img_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_rel/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include/openjpeg"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib zlib.lib libjpeg.lib LibOpenJPEG.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_rel/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include/openjpeg"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libpng.lib zlib.lib libjpeg.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/img_in_rel/gm_img_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\img_in\bmp_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\img_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\img_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\img_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\jp2_dec.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\jpeg_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\png_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ismacryp.vcproj Deleted

@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ismacryp"
-	ProjectGUID="{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-	RootNamespace="ismacryp"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_rel/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_rel/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_deb/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_deb/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ismacryp\isma_ea.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/isom_in.vcproj Deleted

@@ -1,578 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="isom_in"
-	ProjectGUID="{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-	RootNamespace="isom_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_deb/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_deb/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_isom_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_rel/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_rel/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/isom_in_rel/gm_isom_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\isom_in\isom_cache.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\isom_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\load.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\read.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\read_ch.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/laser_dec.vcproj Deleted

@@ -1,450 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="laser_dec"
-	ProjectGUID="{879E26B2-48DB-47B3-B82F-893696286E6F}"
-	RootNamespace="laser_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_deb/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_deb/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_laser_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_rel/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_rel/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/laser_dec_rel/gm_laser_dec.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/laser_dec_rel/gm_laser_dec.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\laser_dec\laser_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/libgpac.vcproj Deleted

@@ -1,6707 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="libgpac"
-	ProjectGUID="{233014D5-F6E5-419D-8757-FA9CE7337088}"
-	RootNamespace="libgpac"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/libgpac_static.lib"
-				AdditionalLibraryDirectories=""
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac/libgpac.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="false"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;NDEBUG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="utils"
-			>
-			<File
-				RelativePath="..\..\src\utils\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\base_encoding.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\bitstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\color.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\configfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\dlmalloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\sha1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\downloader.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\math.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\module.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\module_wrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_config_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_divers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_module.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_net.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_thread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\path2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\path2d_stroker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\ringbuffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\token.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\uni_bidi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\url.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\utf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\xml_parser.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="odf"
-			>
-			<File
-				RelativePath="..\..\src\odf\desc_private.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\descriptors.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_code.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\oci_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_code.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_command.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\odf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\qos.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\slc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="bifs"
-			>
-			<File
-				RelativePath="..\..\src\bifs\arith_decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\bifs_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\bifs_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\bifs_node_tables.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\bifs_tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\com_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\com_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\conditional.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\field_decode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\field_encode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\memory_decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\predictive_mffield.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\quant.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\quantize.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\unquantize.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="isomedia"
-			>
-			<File
-				RelativePath="..\..\src\isomedia\avc_ext.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_3gpp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_adobe.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_apple.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_base.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_drm.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_meta.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_funcs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\data_map.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\hint_track.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\hinting.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\drm_sample.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_intern.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_read.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_store.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_write.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\isomedia_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\media.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\media_odf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\meta.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\movie_fragments.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\sample_descs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\stbl_read.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\stbl_write.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\track.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\tx3g.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\ttml.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="ietf"
-			>
-			<File
-				RelativePath="..\..\include\gpac\internal\ietf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtcp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_depacketizer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_packetizer.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_3gpp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_mpeg12.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_mpeg4.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_streamer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_command.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_common.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_response.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_session.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\sdp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="scenegraph"
-			>
-			<File
-				RelativePath="..\..\src\scenegraph\base_scenegraph.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\commands.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\dom_events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\dom_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_animators.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_nodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_valuator.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\scenegraph_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\smil_anim.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\smil_timing.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\smjs_api.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_attributes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_properties.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_types.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_interpolators.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_proto.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_route.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_script.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_smjs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_tools.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\x3d_nodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\xbl_process.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\xml_ns.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="media_tools"
-			>
-			<File
-				RelativePath="..\..\src\media_tools\av_parsers.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\avilib.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\avilib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\ait.c"
-				>
-			</File>			
-			<File
-				RelativePath="..\..\src\media_tools\dsmcc.c"
-				>
-			</File>			
-			<File
-				RelativePath="..\..\src\media_tools\dvb_mpe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\dvb_mpe_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\filestreamer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\gpac_ogg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\img.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\ismacryp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\isom_hinter.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\isom_tools.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\m2ts_mux.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\m3u8.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\media_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\media_export.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\media_import.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dash_client.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpd.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpeg2_ps.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpeg2_ps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpegts.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\ogg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\reedsolomon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\reedsolomon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\saf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\text_import.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\vobsub.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\vobsub.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="scene_manager"
-			>
-			<File
-				RelativePath="..\..\src\scene_manager\encode_isom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_bt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_isom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_qt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_svg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_xmt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_engine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_stats.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_bifs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_svg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\swf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\text_to_bifs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="mcrypt"
-			>
-			<File
-				RelativePath="..\..\src\mcrypt\cbc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\cfb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\crypt_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ctr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\des.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ecb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\g_crypt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ncfb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\nofb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ofb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-128.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-192.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-256.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\stream.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\tripledes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="terminal"
-			>
-			<File
-				RelativePath="..\..\src\terminal\channel.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\clock.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\input_sensor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\input_sensor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_control.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_control.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_memory.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_object.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_sensor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\mpeg4_inline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\network_service.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\object_browser.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\object_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\scene.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\svg_external.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\term_node_init.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\terminal.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\terminal_dev.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="compositor"
-			>
-			<File
-				RelativePath="..\..\src\compositor\audio_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\audio_mixer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\audio_render.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\bindable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\camera.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\camera.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\compositor_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_node_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\drawable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\drawable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\font_engine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\gl_inc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\hardcoded_protos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\hc_flash_shape.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\mesh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh_collide.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh_tesselate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_animstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_audio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_background.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_background2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_composite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_form.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_ifs2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_ils2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_gradients.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layer_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layer_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_lighting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_path_layout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_sensors.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_sound.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_textures.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_timesensor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_viewport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\navigate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\nodes_stacks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\offscreen_cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\offscreen_cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_filters.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_geometry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_grouping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_media.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_paint_servers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\x3d_geometry.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="laser"
-			>
-			<File
-				RelativePath="..\..\include\gpac\internal\laser_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_tables.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath="..\..\include\gpac\modules\audio_out.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\avparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ait.h"
-				>
-			</File>		
-			<File
-				RelativePath="..\..\include\gpac\base_coding.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\bifs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\bitstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\codec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\compositor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\config_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\configuration.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\crypt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\download.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dsmcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dvb_mpe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\esi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\events.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\events_constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\filestreamer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ietf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\ipmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ismacryp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\iso639.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\isomedia.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\js_usr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\laser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\m3u8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\math.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\media_tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mediaobject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\module.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\mpd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mpeg4_odf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mpegts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\network.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_mpeg4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_svg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_x3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_xbl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\path2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\raster2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\rtp_streamer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scene_engine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scene_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph_svg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph_vrml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\svg_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\sync_layer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\term_ext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\term_info.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\terminal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\token.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\user.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\utf.h"
-				>
-			</File>
- <File
-				RelativePath="..\..\include\gpac\version.h"
-				>
- </File>
- <File
-				RelativePath="..\..\include\gpac\revision.h"
-				>
- </File>
- <File
-				RelativePath="..\..\include\gpac\modules\video_out.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\xml.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/libgpac_dll.vcproj Deleted

@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="libgpac_dll"
-	ProjectGUID="{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
-	RootNamespace="libgpac_dll"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_deb/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/$(ProjectName)"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName)"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseLibraryDependencyInputs="false"
-				AdditionalDependencies="js32.lib zlib.lib winmm.lib ws2_32.lib ssleay32.lib libeay32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\extra_lib\lib\w32_deb;&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/$(PlatformName)/$(ConfigurationName)/libgpac_dll/libgpac.pdb"
-				ImportLibrary=".\obj/$(PlatformName)/$(ConfigurationName)/libgpac_dll/libgpac.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/$(PlatformName)/$(ConfigurationName)/libgpac_dll/libgpac_dll.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac_dll"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac_dll"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_deb/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_USRDLL;_DEBUG"
-				MinimalRebuild="false"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				HeapReserveSize="0"
-				HeapCommitSize="0"
-				StackReserveSize="0"
-				StackCommitSize="0"
-				LargeAddressAware="0"
-				ImportLibrary="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.lib"
-				TargetMachine="3"
-				CLRUnmanagedCodeCheck="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_rel/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/$(ProjectName)"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName)"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="js32.lib zlib.lib winmm.lib ws2_32.lib opengl32.lib glu32.lib ssleay32.lib libeay32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="false"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_rel/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\src\export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/m3u82mpd.vcproj Deleted

@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="m3u82mpd"
-	ProjectGUID="{19EFBA5D-372A-4451-B003-6AB3F448ECD4}"
-	RootNamespace="m3u82mpd"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/m3u82mpd_deb/m3u82mpd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				LinkLibraryDependencies="true"
-				UseLibraryDependencyInputs="false"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/m3u82mpd.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/m3u82mpd_deb/m3u82mpd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/m3u82mpd_deb/m3u82mpd.pch"
-				AssemblerListingLocation=".\obj/m3u82mpd_deb/"
-				ObjectFile=".\obj/m3u82mpd_deb/"
-				ProgramDataBaseFileName=".\obj/m3u82mpd_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/w32_deb_vc8/m3u82mpd.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/m3u82mpd_deb/m3u82mpd.pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/m3u82mpd_rel/m3u82mpd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/m3u82mpd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC&quot; md &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\m3u82mpd.exe &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/m3u82mpd_rel/m3u82mpd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ProgramDatabaseFile=".\obj/m3u82mpd_rel/m3u82mpd.pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC&quot; md &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\m3u82mpd.exe &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\mpd_in\m3u8.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mpd_in\m3u8.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\m3u82mpd\main.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/m3u8_in.vcproj Deleted

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="m3u8_in"
-	ProjectGUID="{50860079-8DC4-432A-9B48-62EAECFA13DE}"
-	RootNamespace="dash"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DASH_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\m3u8_in\m3u8_in.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\m3u8_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\m3u8_in_load.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\m3u8_parser.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\m3u8_parser.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\playlist.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\playlist.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\m3u8_in\test.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/mp3_in.vcproj Deleted

@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="mp3_in"
-	ProjectGUID="{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-	RootNamespace="mp3_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_deb/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_deb/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_MAD"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libmad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_mp3_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_rel/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_rel/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_MAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libmad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/mp3_in_rel/gm_mp3_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\mp3_in\mad_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mp3_in\mp3_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/mp42ts.vcproj Deleted

@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="mp42ts"
-	ProjectGUID="{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj\mp42ts_deb\mp42ts.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj\mp42ts_deb/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\mp42ts_deb/"
-				ObjectFile=".\obj\mp42ts_deb/"
-				ProgramDataBaseFileName=".\obj\mp42ts_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP42TS.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj\mp42ts_rel\mp42ts.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\obj\mp42ts_rel/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\mp42ts_rel/"
-				ObjectFile=".\obj\mp42ts_rel/"
-				ProgramDataBaseFileName=".\obj\mp42ts_rel/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP42TS.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\mp42ts\main.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/mp4box.vcproj Deleted

@@ -1,526 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="mp4box"
-	ProjectGUID="{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-	RootNamespace="mp4box"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4box_deb/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				LinkLibraryDependencies="true"
-				UseLibraryDependencyInputs="false"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/MP4Box.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4box_deb/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/mp4box_deb/mp4box.pch"
-				AssemblerListingLocation=".\obj/mp4box_deb/"
-				ObjectFile=".\obj/mp4box_deb/"
-				ProgramDataBaseFileName=".\obj/mp4box_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/w32_deb_vc8/MP4Box.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/mp4box_deb/MP4Box.pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4box_rel/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP4Box.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4box_rel/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ProgramDatabaseFile=".\obj/mp4box_rel/MP4Box.pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC&quot; md &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\mp4box.exe &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\mp4box\filedump.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4box\fileimport.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4box\live.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4box\main.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/mp4client.vcproj Deleted

@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="mp4client"
-	ProjectGUID="{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-	RootNamespace="mp4client"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4client_deb/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib kernel32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP4Client.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4client_deb/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/mp4client_deb/mp4client.pch"
-				AssemblerListingLocation=".\obj/mp4client_deb/"
-				ObjectFile=".\obj/mp4client_deb/"
-				ProgramDataBaseFileName=".\obj/mp4client_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/w32_deb_vc8/MP4Client.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/mp4client_deb/MP4Client.pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4client_rel/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP4Client.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4client_rel/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/mp4client_rel/MP4Client.pdb"
-				SubSystem="9"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\mp4client\extract.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4client\main.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4client\mp4client.rc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4client\resource.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/mpd_in.vcproj Deleted

@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mpd_in"
-	ProjectGUID="{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-	RootNamespace="dash"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				RuntimeLibrary="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib secchk.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SubSystem="9"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mpd_in\mpd_in.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/mpegts_in.vcproj Deleted

@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="mpegts_in"
-	ProjectGUID="{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-	RootNamespace="mpegts_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_deb/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_deb/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_mpegts_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_rel/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_rel/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/mpegts_in_rel/gm_mpegts_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mpegts_in\mpegts_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/odf_dec.vcproj Deleted

@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="odf_dec"
-	ProjectGUID="{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-	RootNamespace="odf_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_rel/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_rel/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/odf_dec_rel/gm_odf_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_deb/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_deb/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\odf_dec\odf_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ogg.vcproj Deleted

@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ogg"
-	ProjectGUID="{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-	RootNamespace="ogg"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_rel/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ogg_static.lib vorbis_static.lib theora_static.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_rel/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib ogg_static.lib vorbis_static.lib theora_static.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ogg_rel/gm_ogg_xiph.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_deb/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vorbis_static.lib theora_static.lib ogg_static.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_deb/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib vorbis_static.lib theora_static.lib ogg_static.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\ogg_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\ogg_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\ogg_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\theora_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\vorbis_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/opencv_is.vcproj Deleted

@@ -1,577 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="opencv_is"
-	ProjectGUID="{1BC81DF7-4BD1-4C3F-8504-8FC73FBCE0EA}"
-	RootNamespace="opencv_is"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/opencv_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cv.lib cvaux.lib highgui.lib cxcore.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\modules\opencv_is\opencv_is.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/opencv_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\opencv_is\opencv_is.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_opencv_is.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/opencv_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\opencv_is\opencv_is.def"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/opencv_is.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\opencv_is\opencv_is.def"
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_opencv_is.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\opencv_is\opencv_is.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\opencv_is\opencv_is.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/opensvc.vcproj Deleted

@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="opensvc_dec"
-	ProjectGUID="{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-	RootNamespace="opensvc_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_opensvc_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_opensvc_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\opensvc_dec\opensvc_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/osd.vcproj Deleted

@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="osd"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489DE17D48C}"
-	RootNamespace="osd"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/osd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/osd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ui_rec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/osd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/osd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_ui_rec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\osd\osd.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/osmophone.vcproj Deleted

@@ -1,586 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="osmophone"
-	ProjectGUID="{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
-	RootNamespace="osmophone"
-	>
-	<Platforms>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_DEBUG;ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="libgpac.lib aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/osmophone.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;;&quot;../../bin/$(PlatformName)/$(ConfigurationName)&quot;"
-				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/osmophone.pdb"
-				SubSystem="9"
-				HeapReserveSize="0"
-				HeapCommitSize="0"
-				StackReserveSize="0"
-				StackCommitSize="0"
-				LargeAddressAware="2"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="-1"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;$(NOINHERIT)"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/osmophone.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				IgnoreDefaultLibraryNames="$(NOINHERIT)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/osmophone.pdb"
-				SubSystem="2"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),NDEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="libgpac.lib aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)&quot;;&quot;../../bin/$(PlatformName)/$(ConfigurationName)&quot;;$(NOINHERIT)"
-				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/osmophone.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;$(NOINHERIT)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),NDEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				IgnoreDefaultLibraryNames="$(NOINHERIT)"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/osmophone.pdb"
-				SubSystem="2"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmophone\main.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmophone\openfile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmophone\osmophone.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\code_cyril\gpac\applications\osmophone"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions="DEBUG;_AFXDLL;$(NOINHERIT)"
-						Culture="2057"
-						AdditionalIncludeDirectories="../../doc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\code_cyril\gpac\applications\osmophone"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions="DEBUG;_AFXDLL;$(NOINHERIT)"
-						Culture="2057"
-						AdditionalIncludeDirectories="../../doc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmophone\newres.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmophone\resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\doc\osmo4.ico"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/osmozilla.vcproj Deleted

@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="osmozilla"
-	ProjectGUID="{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-	RootNamespace="osmozilla"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_deb/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/osmozilla_deb/osmozilla.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/nposmozilla.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary=".\obj/osmozilla_deb/nposmozilla.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/osmozilla_deb/osmozilla.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(PlatformName)\$(ConfigurationName)\nposmozilla.xpt"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_deb/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/osmozilla_deb/osmozilla.pch"
-				AssemblerListingLocation=".\obj/osmozilla_deb/"
-				ObjectFile=".\obj/osmozilla_deb/"
-				ProgramDataBaseFileName=".\obj/osmozilla_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/w32_deb_vc8/nposmozilla.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/osmozilla_deb/nposmozilla.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/osmozilla_deb/nposmozilla.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC\mozilla&quot; md &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;copy ..\..\bin\w32_deb\nposmozilla.dll &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_rel/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\obj/osmozilla_rel/osmozilla.pch"
-				AssemblerListingLocation=".\obj/osmozilla_rel/"
-				ObjectFile=".\obj/osmozilla_rel/"
-				ProgramDataBaseFileName=".\obj/osmozilla_rel/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/nposmozilla.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				ProgramDatabaseFile=".\obj/osmozilla_rel/nposmozilla.pdb"
-				ImportLibrary=".\obj/osmozilla_rel/nposmozilla.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(PlatformName)\$(ConfigurationName)\nposmozilla.xpt"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_rel/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/nposmozilla.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				ProgramDatabaseFile=".\obj/osmozilla_rel/nposmozilla.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/osmozilla_rel/nposmozilla.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xpt_link ..\..\bin\w32_rel\nposmozilla.xpt ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32&#x0D;&#x0A;if not exist &quot;$(ProgramFiles)\GPAC\mozilla&quot; md &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\nposmozilla.dll &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\nposmozilla.xpt &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmo_npapi.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmozilla.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmozilla.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmozilla\nsIOsmozilla.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmo_npapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmozilla.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/platinum.vcproj Deleted

@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="platinum"
-	ProjectGUID="{694C765F-DFD6-467E-A813-B3F887E822D4}"
-	RootNamespace="platinum"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib ws2_32.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/platinum_deb/platinum.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="3"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib ws2.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib Iphlpapi.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="false"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/platinum_deb/platinum.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib ws2.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib Iphlpapi.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				StackReserveSize="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\GPAC"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\platinum\GenericDevice.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GenericDevice.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACFileMediaServer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACFileMediaServer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaController.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaController.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaRenderer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaRenderer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACPlatinum.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACPlatinum.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/raw_out.vcproj Deleted

@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="raw_out"
-	ProjectGUID="{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-	RootNamespace="raw_out"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_rel/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_rel/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/raw_out_rel/gm_raw_out.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_deb/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_deb/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\raw_out\raw_video.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/redirect_av.vcproj Deleted

@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="redirect_av"
-	ProjectGUID="{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-	RootNamespace="redirect_av"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include;../../include/wince;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_redirect_av.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include;../../include/wince;../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="secchk.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_redirect_av.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\redirect_av\redirect_av.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/rtp_in.vcproj Deleted

@@ -1,656 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="rtp_in"
-	ProjectGUID="{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-	RootNamespace="rtp_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_rel/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_rel/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/rtp_in_rel/gm_rtp_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_deb/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_deb/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_session.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_signaling.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_stream.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\sdp_fetch.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\sdp_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/rvc_dec.vcproj Deleted

@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="rvc_dec"
-	ProjectGUID="{073E2381-4FDE-4D4D-B227-C489EB17C48B}"
-	RootNamespace="rvc_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/rvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/rvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_opensvc_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/rvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/rvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_opensvc_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\rvc_dec\rvc_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/saf_in.vcproj Deleted

@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="saf_in"
-	ProjectGUID="{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
-	RootNamespace="saf_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\Release/gm_saf_in.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\modules\modules_export.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\saf_in\saf_in.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/sdl_out.vcproj Deleted

@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="sdl_out"
-	ProjectGUID="{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
-	RootNamespace="sdl_out"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_deb/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/SDL"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_deb/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_rel/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/SDL"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_rel/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib SDL.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/sdl_out_rel/gm_sdl_out.pdb"
-				SubSystem="9"
-				ImportLibrary=".\obj/sdl_out_rel/gm_sdl_out.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\sdl_out\audio.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\cursors.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\sdl_out.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\sdl_out.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\video.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/soft_raster.vcproj Deleted

@@ -1,694 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="soft_raster"
-	ProjectGUID="{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-	RootNamespace="soft_raster"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_rel/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_rel/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/soft_raster_rel/gm_soft_raster.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_deb/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_deb/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\soft_raster\ftgrays.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\rast_soft.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_565.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_argb.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_rgb.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\stencil.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\surface.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/svg_in.vcproj Deleted

@@ -1,458 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="svg_in"
-	ProjectGUID="{402A8794-B724-44A3-B608-84B600ECA387}"
-	RootNamespace="svg_in"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_rel/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_rel/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_deb/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_deb/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\svg_in\svg_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/timedtext.vcproj Deleted

@@ -1,492 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="timedtext"
-	ProjectGUID="{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-	RootNamespace="timedtext"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_rel/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_rel/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ttxt_rel/gm_timedtext.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_deb/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_deb/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\timedtext\timedtext_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\timedtext\timedtext_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/ui_rec.vcproj Deleted

@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ui_rec"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
-	RootNamespace="ui_rec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ui_rec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_ui_rec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ui_rec\ui_rec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/validator.vcproj Deleted

@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="validator"
-	ProjectGUID="{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
-	RootNamespace="validator"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_deb/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_deb/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_validator.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_rel/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_rel/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/validator_rel/gm_validator.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\validator\validator.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/wav_out.vcproj Deleted

@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="wav_out"
-	ProjectGUID="{01183543-B182-4E32-9FD6-FC15C847316C}"
-	RootNamespace="wav_out"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_rel/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_rel/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/wav_out_rel/gm_wav_out.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_deb/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_deb/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\wav_out\wav_out.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/widgetman.vcproj Deleted

@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="widgetman"
-	ProjectGUID="{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-	RootNamespace="widgetman"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_rel/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/widgetman_rel/widgetman.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_rel/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)\$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/widgetman_rel/widgetman.bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_deb/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../extra_lib/include/zlib;../../include;../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_deb/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../extra_lib/include/zlib;../../include;../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\unzip.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\unzip.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\wgt_load.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\widget.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\widgetman.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\widgetman.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/wiiis.vcproj Deleted

@@ -1,578 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="wiiis"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489EB17C58C}"
-	RootNamespace="wiiis"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/wiiis.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wiiuse.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/win32/debug"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\modules\wiiis\wiiis.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/wiiis.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\wiiis\wiiis.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_wiiis.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/wiiis.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\wiiis\wiiis.def"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/wiiis.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\wiiis\wiiis.def"
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_wiiis.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\wiiis\wiiis.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\wiiis\wiiis.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/wxOsmo4.vcproj Deleted

@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="wxOsmo4"
-	ProjectGUID="{5918F35F-541A-4F48-BEFD-57AD665FEE03}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj/osmo4_wx_rel"
-			IntermediateDirectory=".\obj/osmo4_wx_rel"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_wx_rel/wxOsmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\obj/osmo4_wx_rel/wxOsmo4.pch"
-				AssemblerListingLocation=".\obj/osmo4_wx_rel/"
-				ObjectFile=".\obj/osmo4_wx_rel/"
-				ProgramDataBaseFileName=".\obj/osmo4_wx_rel/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase26.lib wxmsw26_core.lib comctl32.lib ws2_32.lib odbc32.lib odbccp32.lib rpcrt4.lib"
-				OutputFile="../../bin/w32_rel/wxOsmo4.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/osmo4_wx_rel/wxOsmo4.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/osmo4_wx_rel/wxOsmo4.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj/osmo4_wx_deb"
-			IntermediateDirectory=".\obj/osmo4_wx_deb"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_wx_deb/wxOsmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/osmo4_wx_deb/wxOsmo4.pch"
-				AssemblerListingLocation=".\obj/osmo4_wx_deb/"
-				ObjectFile=".\obj/osmo4_wx_deb/"
-				ProgramDataBaseFileName=".\obj/osmo4_wx_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase26.lib wxmsw26_core.lib wxmsw26_adv.lib comctl32.lib ws2_32.lib odbc32.lib odbccp32.lib rpcrt4.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/osmo4_wx_deb/wxOsmo4.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/osmo4_wx_deb/wxOsmo4.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\fileprops.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\menubtn.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\Playlist.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\wxGPACControl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\wxOsmo4.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\wxOsmo4.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_wx"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_wx"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\fileprops.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\menubtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\Playlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\wxGPACControl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\wxOsmo4.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_wx\osmo4.ico"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc8/xvid_dec.vcproj Deleted

@@ -1,1237 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="xvid_dec"
-	ProjectGUID="{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-	RootNamespace="xvid_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_rel/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxvidcore.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/xvid_dec_rel/xvid_dec.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_rel/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/xvid_dec_rel/gm_xvid_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_deb/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxvidcore.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_deb/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="xvid_wce"
-			>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\bitstream.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\decoder.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\decoder.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\font.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\global.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\gmc.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\gmc.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\idct.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\image.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\image.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mbprediction.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_align.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\portab.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\qpel.inl"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\reduced.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\reduced.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\Rules.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\xvid.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\xvid.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="armasm -CPU StrongARM1 -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;&quot;"
-						Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="armasm -CPU StrongARM1 -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;&quot;"
-						Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\xvid_dec\xvid_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\xvid_dec\xvid_dec_wce.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9 Deleted

v0.5.2.tar.gz/build/msvc9/GPAX.vcproj Deleted

@@ -1,662 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="GPAX"
-	ProjectGUID="{72486240-A124-496E-A67A-E76FEC7E99BE}"
-	RootNamespace="GPAX"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;&#x0D;&#x0A;"
-				Outputs="$(OutDir)\regsvr32.trg"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/w32_deb/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description=""
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/w32_deb/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/w32_deb/GPAX.pch"
-				AssemblerListingLocation=".\obj/w32_deb/"
-				ObjectFile=".\obj/w32_deb/"
-				ProgramDataBaseFileName=".\obj/w32_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/w32_deb_vc8/GPAX.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/w32_deb/GPAX.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/w32_deb/GPAX.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;&#x0D;&#x0A;"
-				Outputs="$(OutDir)\regsvr32.trg"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/w32_rel/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="js32.lib zlib.lib winmm.lib ws2_32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/GPAX.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				SupportUnloadOfDelayLoadedDLL="false"
-				ImportLibrary="$(IntDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description=""
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/w32_rel/GPAX.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_USR_DLL"
-				MinimalRebuild="false"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName"
-				ModuleDefinitionFile="..\..\applications\GPAX\GPAX.def"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)/$(ConfigurationName)/$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\GPAX\gpax.bmp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.def"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.idl"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCMIDLTool"
-					TypeLibraryName=".\GPAX.tlb"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.rc"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\applications\GPAX;$(OUTDIR)"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAX.rgs"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAXPlugin.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\GPAXPlugin.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\StdAfx.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\GPAX\StdAfx.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/Osmo4.vcproj Deleted

@@ -1,905 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Osmo4"
-	ProjectGUID="{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-	RootNamespace="Osmo4"
-	Keyword="MFCProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_rel/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="2"
-				StackReserveSize="8388608"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_rel/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/osmo4_w32_rel/Osmo4.pdb"
-				SubSystem="9"
-				StackReserveSize="8388608"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_deb/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmo4_w32_deb/Osmo4.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;DEBUG;ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/Osmo4.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\AddressBar.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\FileProps.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\MainFrm.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\OpenUrl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Options.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Osmo4.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Osmo4.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\gpac\applications\osmo4_w32"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Playlist.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Sliders.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\StdAfx.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\AddressBar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\FileProps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\MainFrm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\OpenUrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Osmo4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Playlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\Sliders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\StdAfx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="res"
-			>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\error.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\maintool.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\message.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\osmo4.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\pause.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\play.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\playlist.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmo4_w32\res\stop.ico"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/V4Studio.vcproj Deleted

v0.5.2.tar.gz/build/msvc9/aac_in.vcproj Deleted

@@ -1,508 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="aac_in"
-	ProjectGUID="{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-	RootNamespace="aac_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_deb/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_deb/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_FAAD"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)\"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\aac_in/gm_aac_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_rel/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/aac_in_rel/aac_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;NDEBUG;GPAC_HAS_FAAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libfaad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/aac_in_rel/gm_aac_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\aac_in\aac_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\aac_in\faad_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ac3_in.vcproj Deleted

@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ac3_in"
-	ProjectGUID="{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-	RootNamespace="ac3_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/ac3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_LIBA52"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="liba52.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\ac3_in/gm_ac3_in.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				OutputManifestFile="$(IntDir)\$(TargetFileName).embed.manifest"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_LIBA52"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib liba52.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/ac3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="liba52.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_LIBA52"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib liba52.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ac3_in\ac3_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ac3_in\liba52_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/amr_dec.vcproj Deleted

@@ -1,5331 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="amr_dec"
-	ProjectGUID="{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
-	RootNamespace="amr_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_rel/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				StackReserveSize="8388608"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_rel/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;MMS_IO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/amr_dec_rel/gm_amr_dec.pdb"
-				SubSystem="9"
-				StackReserveSize="8388608"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_deb/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_dec_deb/amr_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;MMS_IO"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/amr_dec_deb/"
-				ObjectFile=".\obj/amr_dec_deb/"
-				ProgramDataBaseFileName=".\obj/amr_dec_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/amr_dec_deb/gm_amr_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="amr_nb_dec"
-			>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\a_refl.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\a_refl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\agc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\agc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\autocorr.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\autocorr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\az_lsp.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\az_lsp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\b_cn_cod.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\b_cn_cod.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\basic_op.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\basicop2.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\bgnscd.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\bgnscd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\bits2prm.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\bits2prm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c1035pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c1035pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c2_11pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c2_11pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c2_9pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c2_9pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c3_14pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c3_14pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c4_17pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c4_17pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c8_31pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c8_31pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c_g_aver.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\c_g_aver.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\calc_cor.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\calc_cor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\calc_en.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\calc_en.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cbsearch.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cbsearch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cl_ltp.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cl_ltp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cnst.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cnst_vad.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cod_amr.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cod_amr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\convolve.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\convolve.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\copy.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\copy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cor_h.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\cor_h.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\count.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\count.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d1035pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d1035pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d2_11pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d2_11pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d2_9pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d2_9pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d3_14pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d3_14pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d4_17pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d4_17pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d8_31pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d8_31pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_gain_c.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_gain_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_gain_p.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_gain_p.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_homing.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_homing.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_plsf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_plsf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_plsf_3.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\d_plsf_5.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_amr.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_amr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_gain.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_gain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_lag3.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_lag3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_lag6.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dec_lag6.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dtx_dec.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dtx_dec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dtx_enc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\dtx_enc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ec_gains.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\enc_lag6.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ex_ctrl.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ex_ctrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\frame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\g_adapt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\g_adapt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\g_code.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\g_code.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\g_pitch.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\g_pitch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\gain_q.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\gain_q.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\gc_pred.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\gc_pred.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\gmed_n.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\gmed_n.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\hp_max.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\hp_max.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\int_lpc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\int_lpc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\int_lsf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\int_lsf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\inter_36.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\inter_36.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\inv_sqrt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\inv_sqrt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lag_wind.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lag_wind.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\levinson.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\levinson.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lflg_upd.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\log2.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\log2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lpc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lpc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsfwt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsfwt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp_avg.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp_avg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp_az.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp_az.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp_lsf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\lsp_lsf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\mac_32.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\mac_32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\mode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\n_proc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\n_proc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ol_ltp.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ol_ltp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\oper_32b.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\oper_32b.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\p_ol_wgh.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\p_ol_wgh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ph_disp.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ph_disp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pitch_fr.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pitch_fr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pitch_ol.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pitch_ol.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\post_pro.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\post_pro.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pow2.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pow2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pre_big.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pre_big.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pre_proc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pre_proc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pred_lt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pred_lt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\preemph.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\preemph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\prm2bits.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\prm2bits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pstfilt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\pstfilt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_gain_c.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_gain_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_gain_p.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_gain_p.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_plsf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_plsf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_plsf_3.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\q_plsf_5.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\qgain475.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\qgain475.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\qgain795.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\qgain795.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\qua_gain.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\qua_gain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\r_fft.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\reorder.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\reorder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\residu.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\residu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\s10_8pf.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\s10_8pf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\set_sign.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\set_sign.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\set_zero.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\set_zero.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sid_sync.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sid_sync.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sp_dec.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sp_dec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sp_enc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sp_enc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\spreproc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\spreproc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\spstproc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\spstproc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sqrt_l.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\sqrt_l.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\strfunc.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\strfunc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\syn_filt.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\syn_filt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ton_stab.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\ton_stab.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\typedef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\typedefs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vad.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vad1.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vad1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vad2.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vad2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vadname.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\vadname.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\weight_a.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_dec\amr_nb\weight_a.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_nb\enc_lag3.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/amr_float_dec.vcproj Deleted

@@ -1,1449 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="amr_float_dec"
-	ProjectGUID="{5D3983BF-143F-49C3-9284-89778282AEFE}"
-	RootNamespace="amr_float_dec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_deb/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_deb/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/amr_float_dec_deb/"
-				ObjectFile=".\obj/amr_float_dec_deb/"
-				ProgramDataBaseFileName=".\obj/amr_float_dec_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/amr_float_dec_deb/gm_amr_float_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_rel/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/amr_float_dec_rel/amr_float_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/amr_float_dec_rel/gm_amr_float_dec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="amr_nb_ft"
-			>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\interf_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\interf_dec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\interf_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\interf_enc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\interf_rom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\rom_dec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\rom_enc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\sp_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\sp_dec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\sp_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\sp_enc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_nb_ft\typedef.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="amr_wb_ft"
-			>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_acelp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_acelp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_dtx.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_dtx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_gain.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_gain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_if.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_if.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_lpc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_lpc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_main.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_rom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_util.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\dec_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_acelp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_acelp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_dtx.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_dtx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_gain.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_gain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_if.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_if.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_lpc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_lpc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_main.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_rom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_util.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\enc_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\if_rom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\if_rom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\typedef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\amr_float_dec\amr_wb_ft\typedefs.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\modules\amr_float_dec\amr_float_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\amr_dec\amr_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/audio_filter.vcproj Deleted

@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="audio_filter"
-	ProjectGUID="{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-	RootNamespace="audio_filter"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_rel/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_rel/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/audio_filter_rel/gm_audio_filter.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_deb/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/audio_filter_deb/audio_filter.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/gm_audio_filter.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\audio_filter\audio_filter.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/avcap.vcproj Deleted

@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="avcap"
-	ProjectGUID="{109C4F31-781F-4C9E-B160-E788A83F9387}"
-	RootNamespace="avcap"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_dummy_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/avcap.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_dummy_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\avcap\avcap.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/bifs_dec.vcproj Deleted

@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="bifs_dec"
-	ProjectGUID="{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-	RootNamespace="bifs_dec"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_rel/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_rel/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/bifs_dec_rel/gm_bifs_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_deb/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/bifs_dec_deb/bifs_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/gm_bifs_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\bifs_dec\bifs_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ctx_load.vcproj Deleted

@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ctx_load"
-	ProjectGUID="{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-	RootNamespace="ctx_load"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_rel/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_rel/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ctx_load_rel/gm_ctx_load.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_deb/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ctx_load_deb/ctx_load.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)/gm_ctx_load.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ctx_load\ctx_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/demo_is.vcproj Deleted

v0.5.2.tar.gz/build/msvc9/dummy_in.vcproj Deleted

@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="dummy_in"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-	RootNamespace="dummy_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_dummy_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/dummy_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_dummy_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\dummy_in\dummy_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/dx_hw.vcproj Deleted

@@ -1,682 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="dx_hw"
-	ProjectGUID="{B64736BD-9245-4F40-961D-EB9822265764}"
-	RootNamespace="dx_hw"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_rel/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;&quot;$(DXSDK_DIR)Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib dsound.lib dxguid.lib ddraw.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)Lib\x86&quot;;&quot;..\..\extra_lib\lib\$(PlatformName)\$(ConfigurationName)&quot;;&quot;$(DXSDK_DIR)Lib&quot;"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_rel/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER)"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dx_hw_rel/gm_dx_hw.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/dx_hw_rel/gm_dx_hw.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_deb/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;&quot;$(DXSDK_DIR)Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib dsound.lib dxguid.lib ddraw.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)Lib\x86&quot;;&quot;..\..\extra_lib\lib\$(PlatformName)\$(ConfigurationName)&quot;;&quot;$(DXSDK_DIR)Lib&quot;"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dx_hw_deb/dx_hw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/dx_hw_deb/"
-				ObjectFile=".\obj/dx_hw_deb/"
-				ProgramDataBaseFileName=".\obj/dx_hw_deb/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libGLES_CM.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/dx_hw_deb/gm_dx_hw.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\dx_hw\collide.cur"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\copy_pixels.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_2d.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_audio.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_hw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_hw.rc"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-					AdditionalIncludeDirectories="\gpac\modules\dx_hw"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_video.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\dx_window.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\hand.cur"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\dx_hw\resource.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ffmpeg_in.vcproj Deleted

@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ffmpeg_in"
-	ProjectGUID="{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-	RootNamespace="ffmpeg_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_deb/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4090"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_deb/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../include/wince"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;EMULATE_INTTYPES"
-				MinimalRebuild="true"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ffmpeg_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				SupportUnloadOfDelayLoadedDLL="false"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles="avcodec-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avformat-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avutil-49.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0"
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_rel/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4090"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_rel/ffmpeg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../include/wince"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;EMULATE_INTTYPES"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="secchk.lib ccrtrtti.lib avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ffmpeg_in_rel/gm_ffmpeg_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_decode.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_demux.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ffmpeg_in\ffmpeg_load.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ft_font.vcproj Deleted

@@ -1,436 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ft_font"
-	ProjectGUID="{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
-	RootNamespace="ft_font"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_deb/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetype.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				OutputManifestFile="$(IntDir)\$(TargetFileName).embed.manifest"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_deb/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib freetype.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ft_font.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_rel/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetype.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ft_font_rel/ft_font.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib freetype.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ft_font_rel/gm_ft_font.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ft_font\ft_font.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ft_font\ft_font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/gapi.vcproj Deleted

@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gapi"
-	ProjectGUID="{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}"
-	RootNamespace="gapi"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/gapi.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG;_USRDLL"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),NDEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/gm_gapi.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="_DllMainCRTStartup"
-				BaseAddress="0x00100000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/gapi.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)/"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\gapi/gm_gapi.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="_DllMainCRTStartup"
-				BaseAddress="0x00100000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\gapi\gapi.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					UsePrecompiledHeader="0"
-					BrowseInformation="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gapi\gapi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/gdip_raster.vcproj Deleted

@@ -1,589 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gdip_raster"
-	ProjectGUID="{CAA5A551-006A-4119-8115-FB14692E719F}"
-	RootNamespace="gdip_raster"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_rel/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_rel/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/gdip_rel/gm_gdip_raster.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/gdip_rel/gm_gdip_raster.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_deb/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gdip_deb/gdip_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj/gdip_deb/"
-				ObjectFile=".\obj/gdip_deb/"
-				ProgramDataBaseFileName=".\obj/gdip_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/gdip_deb/gm_gdip_raster.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_font.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_grad.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_priv.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_rend.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\gdip_raster\gdip_texture.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/gpac.sln Deleted

@@ -1,973 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_in", "dummy_in.vcproj", "{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdip_raster", "gdip_raster.vcproj", "{CAA5A551-006A-4119-8115-FB14692E719F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "img_in", "img_in.vcproj", "{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isom_in", "isom_in.vcproj", "{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laser_dec", "laser_dec.vcproj", "{879E26B2-48DB-47B3-B82F-893696286E6F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_dll", "libgpac_dll.vcproj", "{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
-	ProjectSection(ProjectDependencies) = postProject
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odf_dec", "odf_dec.vcproj", "{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtp_in", "rtp_in.vcproj", "{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saf_in", "saf_in.vcproj", "{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl_out", "sdl_out.vcproj", "{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soft_raster", "soft_raster.vcproj", "{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svg_in", "svg_in.vcproj", "{402A8794-B724-44A3-B608-84B600ECA387}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timedtext", "timedtext.vcproj", "{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wav_out", "wav_out.vcproj", "{01183543-B182-4E32-9FD6-FC15C847316C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvid_dec", "xvid_dec.vcproj", "{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ismacryp", "ismacryp.vcproj", "{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gapi", "gapi.vcproj", "{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmophone", "osmophone.vcproj", "{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac_js", "gpac_js.vcproj", "{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_filter", "audio_filter.vcproj", "{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platinum", "platinum.vcproj", "{694C765F-DFD6-467E-A813-B3F887E822D4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "widgetman", "widgetman.vcproj", "{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redirect_av", "redirect_av.vcproj", "{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpd_in", "mpd_in.vcproj", "{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensvc_dec", "opensvc.vcproj", "{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "validator.vcproj", "{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avcap", "avcap.vcproj", "{109C4F31-781F-4C9E-B160-E788A83F9387}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openhevc_dec", "openhevc.vcproj", "{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse_in", "mse_in.vcproj", "{BD61B537-632E-42D2-944E-628800413629}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4)
-		Debug|Smartphone 2003 (ARMV4) = Debug|Smartphone 2003 (ARMV4)
-		Debug|Win32 = Debug|Win32
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4)
-		Release|Smartphone 2003 (ARMV4) = Release|Smartphone 2003 (ARMV4)
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.Build.0 = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.Build.0 = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.ActiveCfg = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.Build.0 = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.ActiveCfg = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.Build.0 = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.Build.0 = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.ActiveCfg = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.Build.0 = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.ActiveCfg = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{F9AF60FE-C2F2-4D94-9667-E4FCC6FAA466}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Mixed Platforms.Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.Build.0 = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Mixed Platforms.Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.ActiveCfg = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.Build.0 = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.ActiveCfg = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Debug|Win32.Build.0 = Debug|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Release|Win32.ActiveCfg = Release|Win32
-		{BD61B537-632E-42D2-944E-628800413629}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

v0.5.2.tar.gz/build/msvc9/gpac_js.vcproj Deleted

@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gpac_js"
-	ProjectGUID="{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-	RootNamespace="gpac_js"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_deb/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)\gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_rel/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_deb/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)\gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/gpac_js_rel/gpac_js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)\gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\gpac_js\gpac_js.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/gpac_static.sln Deleted

@@ -1,177 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-	ProjectSection(ProjectDependencies) = postProject
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmophone", "osmophone.vcproj", "{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
-	ProjectSection(ProjectDependencies) = postProject
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashmuxts", "..\..\applications\dashmuxts\dashmuxts.vcproj", "{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_static", "libgpac_static.vcproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4)
-		Debug|Smartphone 2003 (ARMV4) = Debug|Smartphone 2003 (ARMV4)
-		Debug|Win32 = Debug|Win32
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4)
-		Release|Smartphone 2003 (ARMV4) = Release|Smartphone 2003 (ARMV4)
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.Build.0 = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.Build.0 = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

v0.5.2.tar.gz/build/msvc9/img_in.vcproj Deleted

@@ -1,635 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="img_in"
-	ProjectGUID="{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-	RootNamespace="img_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_deb/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libjpeg.lib libpng.lib zlib.lib LibOpenJPEGd.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_deb/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;$(NOINHERIT)"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libjpeg.lib libpng.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_img_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_rel/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib zlib.lib libjpeg.lib LibOpenJPEG.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/img_in_rel/img_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libpng.lib zlib.lib libjpeg.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/img_in_rel/gm_img_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\img_in\bmp_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\img_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\img_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\img_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\jp2_dec.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\jpeg_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\img_in\png_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ismacryp.vcproj Deleted

@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ismacryp"
-	ProjectGUID="{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-	RootNamespace="ismacryp"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_rel/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_rel/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_deb/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ismacryp_deb/ismacryp.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ismacryp\isma_ea.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/isom_in.vcproj Deleted

@@ -1,551 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="isom_in"
-	ProjectGUID="{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-	RootNamespace="isom_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_deb/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_deb/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_isom_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_rel/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/isom_in_rel/isom_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/isom_in_rel/gm_isom_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\isom_in\isom_cache.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\isom_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\load.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\read.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\isom_in\read_ch.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/laser_dec.vcproj Deleted

@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="laser_dec"
-	ProjectGUID="{879E26B2-48DB-47B3-B82F-893696286E6F}"
-	RootNamespace="laser_dec"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_deb/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_deb/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_laser_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_rel/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/laser_dec_rel/laser_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/laser_dec_rel/gm_laser_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/laser_dec_rel/gm_laser_dec.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\laser_dec\laser_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/libgpac.vcproj Deleted

@@ -1,7364 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libgpac"
-	ProjectGUID="{233014D5-F6E5-419D-8757-FA9CE7337088}"
-	RootNamespace="libgpac"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../extra_lib/include/zlib,../../extra_lib/include/js,../../extra_lib/include/jpeg,../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/ignore:4221"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac/libgpac.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../extra_lib/include/zlib,../../extra_lib/include/js,../../extra_lib/include/jpeg,../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="false"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/ignore:4221"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;NDEBUG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="utils"
-			>
-			<File
-				RelativePath="..\..\src\utils\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\base_encoding.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\bitstream.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\color.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\configfile.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\dlmalloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\downloader.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\error.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\list.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\math.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\module.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\module_wrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_config_init.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_divers.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_file.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_module.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_net.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_thread.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\path2d.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\path2d_stroker.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\ringbuffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\sha1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\token.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\uni_bidi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\url.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\utf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\xml_parser.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="odf"
-			>
-			<File
-				RelativePath="..\..\src\odf\desc_private.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\descriptors.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_code.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\oci_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_code.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_command.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\odf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\qos.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\slc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="bifs"
-			>
-			<File
-				RelativePath="..\..\src\bifs\arith_decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\bifs_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\bifs_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\bifs_node_tables.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\bifs_tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\com_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\com_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\conditional.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\field_decode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\field_encode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\memory_decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\predictive_mffield.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\quant.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\quantize.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\unquantize.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="isomedia"
-			>
-			<File
-				RelativePath="..\..\src\isomedia\avc_ext.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_3gpp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_adobe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_apple.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_base.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_drm.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_meta.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_funcs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\data_map.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\drm_sample.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\ttml.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\hint_track.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\hinting.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_intern.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_read.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_store.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_write.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\isomedia_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\media.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\media_odf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\meta.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\movie_fragments.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\sample_descs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\stbl_read.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\stbl_write.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\track.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\tx3g.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="ietf"
-			>
-			<File
-				RelativePath="..\..\include\gpac\internal\ietf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtcp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_depacketizer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_packetizer.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_3gpp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_mpeg12.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_mpeg4.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_streamer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_command.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_common.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_response.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_session.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\sdp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="scenegraph"
-			>
-			<File
-				RelativePath="..\..\src\scenegraph\base_scenegraph.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\commands.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\dom_events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\dom_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\html5_media_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\html5_mse_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_animators.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_nodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_valuator.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\scenegraph_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\smil_anim.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\smil_timing.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_attributes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_properties.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_types.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_interpolators.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_proto.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_route.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_script.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_smjs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_tools.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\x3d_nodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\xbl_process.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\xml_ns.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="media_tools"
-			>
-			<File
-				RelativePath="..\..\src\media_tools\ait.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\av_parsers.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\avilib.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\avilib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dash_client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dash_segmenter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dsmcc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dvb_mpe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\dvb_mpe_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\filestreamer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\gpac_ogg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\html5_media.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\html5_mse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\img.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\ismacryp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\isom_hinter.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\isom_tools.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\m2ts_mux.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\m3u8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\media_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\media_export.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\media_import.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpeg2_ps.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpeg2_ps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpegts.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\ogg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\reedsolomon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\reedsolomon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\saf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\text_import.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\vobsub.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\vobsub.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="scene_manager"
-			>
-			<File
-				RelativePath="..\..\src\scene_manager\encode_isom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_bt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_isom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_qt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_svg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_xmt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_engine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_stats.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_bifs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\swf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_svg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\text_to_bifs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="mcrypt"
-			>
-			<File
-				RelativePath="..\..\src\mcrypt\cbc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\cfb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\crypt_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ctr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\des.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ecb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\g_crypt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ncfb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\nofb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ofb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-128.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-192.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-256.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\stream.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\tripledes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="terminal"
-			>
-			<File
-				RelativePath="..\..\src\terminal\channel.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\clock.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\input_sensor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\input_sensor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_control.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_control.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_memory.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_object.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_sensor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\mpeg4_inline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\network_service.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\object_browser.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\object_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\scene.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\svg_external.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\term_node_init.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\terminal.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\terminal_dev.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="compositor"
-			>
-			<File
-				RelativePath="..\..\src\compositor\audio_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\audio_mixer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\audio_render.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\bindable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\camera.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\camera.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\compositor_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_node_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\drawable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\drawable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\font_engine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\gl_inc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\hardcoded_protos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\hc_flash_shape.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\mesh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh_collide.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh_tesselate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_animstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_audio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_background.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_background2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_composite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_form.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_ifs2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_ils2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_gradients.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layer_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layer_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_lighting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_path_layout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_sensors.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_sound.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_textures.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_timesensor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_viewport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\navigate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\nodes_stacks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\offscreen_cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\offscreen_cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_filters.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_geometry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_grouping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_media.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_paint_servers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\x3d_geometry.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="laser"
-			>
-			<File
-				RelativePath="..\..\include\gpac\internal\laser_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_tables.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath="..\..\include\gpac\ait.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\audio_out.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\avparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\base_coding.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\bifs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\bitstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\codec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\compositor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\config_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\configuration.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\crypt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\download.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dsmcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dvb_mpe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\esi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\events.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\events_constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\filestreamer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\hardcoded_proto.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\html5_media.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\html5_mse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ietf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\ipmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ismacryp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\iso639.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\isomedia.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\js_usr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\laser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\m3u8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\math.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\media_tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mediaobject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\module.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\mpd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mpeg4_odf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mpegts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\network.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_mpeg4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_svg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_x3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_xbl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\path2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\raster2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\rtp_streamer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scene_engine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scene_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph_svg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph_vrml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\svg_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\sync_layer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\term_ext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\term_info.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\terminal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\token.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\user.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\utf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\video_out.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\xml.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/libgpac_dll.vcproj Deleted

@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libgpac_dll"
-	ProjectGUID="{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
-	RootNamespace="libgpac_dll"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_deb/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/$(ProjectName)"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName)"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseLibraryDependencyInputs="false"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/$(PlatformName)/$(ConfigurationName)/libgpac_dll/libgpac.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/$(PlatformName)/$(ConfigurationName)/libgpac_dll/libgpac.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/$(PlatformName)/$(ConfigurationName)/libgpac_dll/libgpac_dll.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac_dll"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac_dll"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_deb/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_USRDLL;_DEBUG"
-				MinimalRebuild="false"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				HeapReserveSize="0"
-				HeapCommitSize="0"
-				StackReserveSize="0"
-				StackCommitSize="0"
-				LargeAddressAware="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.lib"
-				TargetMachine="3"
-				CLRUnmanagedCodeCheck="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_rel/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/$(ProjectName)"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName)"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="js32.lib zlib.lib winmm.lib ws2_32.lib opengl32.lib glu32.lib libeay32.lib ssleay32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="false"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/libgpac_dll_rel/libgpac_dll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/$(ProjectName)"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				IgnoreDefaultLibraryNames=""
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\src\export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/libgpac_static.vcproj Deleted

@@ -1,6792 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libgpac_static"
-	ProjectGUID="{233014D5-F6E5-419D-8757-FA9CE7337088}"
-	RootNamespace="libgpac"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_WINDOWS;GPAC_STATIC_MODULES;GPAC_HAS_FAAD;GPAC_HAS_LIBA52;GPAC_HAS_JP2;OPJ_STATIC;GPAC_HAS_MAD;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/ignore:4221"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac/libgpac.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include/freetype"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;GPAC_STATIC_MODULES;GPAC_HAS_FAAD;GPAC_HAS_LIBA52"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="false"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/ignore:4221"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;NDEBUG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="utils"
-			>
-			<File
-				RelativePath="..\..\src\utils\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\base_encoding.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\bitstream.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\color.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\configfile.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\dlmalloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\downloader.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\error.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\list.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\math.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\module.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\module_wrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_config_init.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_divers.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_file.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_module.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_net.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\os_thread.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\path2d.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\path2d_stroker.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\ringbuffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\sha1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\token.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\uni_bidi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\url.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\utf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\xml_parser.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="odf"
-			>
-			<File
-				RelativePath="..\..\src\odf\desc_private.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\descriptors.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_code.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\ipmpx_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\oci_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_code.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_command.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\odf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\odf_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\qos.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\odf\slc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="bifs"
-			>
-			<File
-				RelativePath="..\..\src\bifs\arith_decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\bifs_codec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\bifs_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\bifs_node_tables.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\bifs_tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\com_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\com_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\conditional.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\field_decode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\field_encode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\memory_decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\predictive_mffield.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\quant.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\quantize.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\script_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\bifs\unquantize.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="isomedia"
-			>
-			<File
-				RelativePath="..\..\src\isomedia\avc_ext.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_3gpp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_adobe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_apple.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_drm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_code_meta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_dump.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\box_funcs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\data_map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\drm_sample.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\generic_subtitle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\hint_track.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\hinting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_intern.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_read.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_store.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\isom_write.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\isomedia_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\media.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\media_odf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\meta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\movie_fragments.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\sample_descs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\stbl_read.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\stbl_write.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\track.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\isomedia\tx3g.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="ietf"
-			>
-			<File
-				RelativePath="..\..\include\gpac\internal\ietf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtcp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_depacketizer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_packetizer.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_3gpp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_mpeg12.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_pck_mpeg4.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtp_streamer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_command.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_common.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_response.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\rtsp_session.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\ietf\sdp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="scenegraph"
-			>
-			<File
-				RelativePath="..\..\src\scenegraph\base_scenegraph.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\commands.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\dom_events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\dom_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_animators.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_nodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\mpeg4_valuator.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\scenegraph_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\smil_anim.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\smil_timing.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_attributes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_properties.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_smjs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\svg_types.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_interpolators.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_proto.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_route.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_script.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_smjs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\vrml_tools.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\x3d_nodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\xbl_process.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scenegraph\xml_ns.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="media_tools"
-			>
-			<File
-				RelativePath="..\..\src\media_tools\ait.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\av_parsers.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\avilib.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\avilib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dash_client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dash_segmenter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dsmcc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\dvb_mpe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\dvb_mpe_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\filestreamer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\gpac_ogg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\img.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\ismacryp.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\isom_hinter.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\isom_tools.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\m2ts_mux.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\m3u8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\media_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\media_export.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\media_import.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpeg2_ps.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpeg2_ps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\mpegts.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\ogg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\reedsolomon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\reedsolomon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\saf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\text_import.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\media_tools\vobsub.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\vobsub.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="scene_manager"
-			>
-			<File
-				RelativePath="..\..\src\scene_manager\encode_isom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_bt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_isom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_qt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_svg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\loader_xmt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_dump.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_engine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\scene_stats.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_bifs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\swf_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\swf_svg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\scene_manager\text_to_bifs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="terminal"
-			>
-			<File
-				RelativePath="..\..\src\terminal\channel.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\clock.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\decoder.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\input_sensor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\input_sensor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_control.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_control.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_memory.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_object.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\media_sensor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\mpeg4_inline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\network_service.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\object_browser.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\object_manager.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\scene.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\svg_external.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\term_node_init.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\terminal\terminal.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\terminal_dev.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="compositor"
-			>
-			<File
-				RelativePath="..\..\src\compositor\audio_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\audio_mixer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\audio_render.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\bindable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\camera.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\camera.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\compositor_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\compositor_node_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\drawable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\drawable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\font_engine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\gl_inc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\hardcoded_protos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\hc_flash_shape.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\mesh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh_collide.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mesh_tesselate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_animstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_audio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_background.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_background2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_composite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_form.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_ifs2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_geometry_ils2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_gradients.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_grouping_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layer_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layer_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_layout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_lighting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_path_layout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_sensors.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_sound.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_textures.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_timesensor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\mpeg4_viewport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\navigate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\nodes_stacks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\offscreen_cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\offscreen_cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_filters.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_geometry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_grouping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_media.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_paint_servers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\svg_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\texturing_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_2d_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\visual_manager_3d_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\compositor\x3d_geometry.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="laser"
-			>
-			<File
-				RelativePath="..\..\include\gpac\internal\laser_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_dec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_enc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\laser\lsr_tables.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath="..\..\include\gpac\ait.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\audio_out.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\avparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\base_coding.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\bifs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\bitstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\codec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\compositor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\config_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\configuration.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\crypt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\download.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dsmcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\dvb_mpe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\esi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\events.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\events_constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\filestreamer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\hardcoded_proto.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ietf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\ipmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\ismacryp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\iso639.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\isomedia.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\js_usr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\laser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\m3u8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\math.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\media_tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mediaobject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\module.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\mpd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mpeg4_odf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\mpegts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\network.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_mpeg4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_svg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_x3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\nodes_xbl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\path2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\raster2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\rtp_streamer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scene_engine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scene_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph_svg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\scenegraph_vrml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\svg_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\sync_layer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\term_ext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\term_info.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\terminal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\token.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\user.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\utf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\modules\video_out.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\xml.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="mcrypt"
-			>
-			<File
-				RelativePath="..\..\src\mcrypt\cbc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\cfb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\gpac\internal\crypt_dev.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ctr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\des.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ecb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\g_crypt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ncfb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\nofb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\ofb.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-128.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-192.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\rijndael-256.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\stream.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\mcrypt\tripledes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="modules"
-			>
-			<File
-				RelativePath="..\..\modules\aac_in\aac_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\ac3_in\ac3_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\audio_filter\audio_filter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\bifs_dec\bifs_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\ctx_load\ctx_load.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\dummy_in\dummy_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\aac_in\faad_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\ft_font\ft_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\ft_font\ft_font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\gpac_js\gpac_js.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\ismacryp\isma_ea.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\laser_dec\laser_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\ac3_in\liba52_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\mp3_in\mad_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\mp3_in\mp3_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\mpd_in\mpd_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\mpegts_in\mpegts_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\odf_dec\odf_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\openhevc_dec\openhevc_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\opensvc_dec\opensvc_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\raw_out\raw_video.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\redirect_av\redirect_av.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\saf_in\saf_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\svg_in\svg_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\timedtext\timedtext_dec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\timedtext\timedtext_in.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\validator\validator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\wav_out\wav_out.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_dec.c"
-				>
-			</File>
-			<Filter
-				Name="dx"
-				>
-				<File
-					RelativePath="..\..\modules\dx_hw\collide.cur"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\copy_pixels.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\dx_2d.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\dx_audio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\dx_hw.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\dx_hw.rc"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\dx_video.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\dx_window.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\hand.cur"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\modules_export.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\dx_hw\resource.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="SDL"
-				>
-				<File
-					RelativePath="..\..\modules\sdl_out\audio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\sdl_out\cursors.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\sdl_out\sdl_out.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\sdl_out\sdl_out.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\sdl_out\video.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="img"
-				>
-				<File
-					RelativePath="..\..\modules\img_in\bmp_dec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\img_in\img_dec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\img_in\img_in.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\img_in\img_in.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\img_in\jp2_dec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\img_in\jpeg_dec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\img_in\png_dec.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="isom"
-				>
-				<File
-					RelativePath="..\..\modules\isom_in\isom_cache.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\isom_in\isom_in.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\isom_in\load.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\isom_in\read.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\isom_in\read_ch.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ffmpeg"
-				>
-				<File
-					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_decode.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_demux.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_in.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_load.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="soft_raster"
-				>
-				<File
-					RelativePath="..\..\modules\soft_raster\ftgrays.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\rast_soft.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\raster_565.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\raster_argb.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\raster_load.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\raster_rgb.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\stencil.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\soft_raster\surface.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ogg"
-				>
-				<File
-					RelativePath="..\..\modules\ogg\ogg_in.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ogg\ogg_in.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ogg\ogg_load.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ogg\theora_dec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\ogg\vorbis_dec.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="rtp"
-				>
-				<File
-					RelativePath="..\..\modules\rtp_in\rtp_in.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\rtp_in\rtp_in.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\rtp_in\rtp_session.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\rtp_in\rtp_signaling.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\rtp_in\rtp_stream.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\rtp_in\sdp_fetch.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\rtp_in\sdp_load.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="widgetman"
-				>
-				<File
-					RelativePath="..\..\modules\widgetman\unzip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\widgetman\unzip.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\widgetman\wgt_load.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\widgetman\widget.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\widgetman\widgetman.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\modules\widgetman\widgetman.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mp3_in.vcproj Deleted

@@ -1,507 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mp3_in"
-	ProjectGUID="{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-	RootNamespace="mp3_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_deb/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_deb/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_MAD"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libmad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_mp3_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_rel/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmad.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp3_in_rel/mp3_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_MAD"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib libmad.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/mp3_in_rel/gm_mp3_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\mp3_in\mad_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mp3_in\mp3_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mp42ts.vcproj Deleted

@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mp42ts"
-	ProjectGUID="{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj\mp42ts_deb\mp42ts.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj\mp42ts_deb/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\mp42ts_deb/"
-				ObjectFile=".\obj\mp42ts_deb/"
-				ProgramDataBaseFileName=".\obj\mp42ts_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP42TS.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj\mp42ts_rel\mp42ts.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\obj\mp42ts_rel/$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\mp42ts_rel/"
-				ObjectFile=".\obj\mp42ts_rel/"
-				ProgramDataBaseFileName=".\obj\mp42ts_rel/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP42TS.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\mp42ts\main.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mp4box.vcproj Deleted

@@ -1,535 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mp4box"
-	ProjectGUID="{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-	RootNamespace="mp4box"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4box_deb/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				LinkLibraryDependencies="true"
-				UseLibraryDependencyInputs="false"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/MP4Box.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC&quot; md &quot;$(ProgramFiles)\GPAC&quot; &amp; copy ..\..\bin\w32_rel\mp4box.exe &quot;$(ProgramFiles)\GPAC&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4box_deb/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/mp4box_deb/mp4box.pch"
-				AssemblerListingLocation=".\obj/mp4box_deb/"
-				ObjectFile=".\obj/mp4box_deb/"
-				ProgramDataBaseFileName=".\obj/mp4box_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/w32_deb_vc8/MP4Box.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/w32_deb"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/mp4box_deb/MP4Box.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4box_rel/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP4Box.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4box_rel/mp4box.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ProgramDatabaseFile=".\obj/mp4box_rel/MP4Box.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC&quot; md &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\mp4box.exe &quot;$(ProgramFiles)\GPAC&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\mp4box\filedump.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4box\fileimport.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4box\live.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4box\main.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mp4client.vcproj Deleted

@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mp4client"
-	ProjectGUID="{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-	RootNamespace="mp4client"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4client_deb/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP4Client.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4client_deb/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/mp4client_deb/mp4client.pch"
-				AssemblerListingLocation=".\obj/mp4client_deb/"
-				ObjectFile=".\obj/mp4client_deb/"
-				ProgramDataBaseFileName=".\obj/mp4client_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/w32_deb_vc8/MP4Client.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/mp4client_deb/MP4Client.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/mp4client_rel/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/MP4Client.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;"
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mp4client_rel/mp4client.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/mp4client_rel/MP4Client.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\mp4client\extract.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\applications\mp4client\main.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mpd_in.vcproj Deleted

@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mpd_in"
-	ProjectGUID="{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-	RootNamespace="dash"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mpd_in\mpd_in.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mpegts_in.vcproj Deleted

@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mpegts_in"
-	ProjectGUID="{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-	RootNamespace="mpegts_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_deb/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_deb/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_mpegts_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_rel/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/mpegts_in_rel/mpegts_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/mpegts_in_rel/gm_mpegts_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mpegts_in\mpegts_in.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/mse_in.vcproj Deleted

@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="mse_in"
-	ProjectGUID="{BD61B537-632E-42D2-944E-628800413629}"
-	RootNamespace="dash"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\mse_in\mse_in.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/odf_dec.vcproj Deleted

@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="odf_dec"
-	ProjectGUID="{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-	RootNamespace="odf_dec"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_rel/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_rel/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/odf_dec_rel/gm_odf_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_deb/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/odf_dec_deb/odf_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\odf_dec\odf_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ogg.vcproj Deleted

@@ -1,591 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ogg"
-	ProjectGUID="{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-	RootNamespace="ogg"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_rel/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ogg_static.lib vorbis_static.lib theora_static.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_rel/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib ogg_static.lib vorbis_static.lib theora_static.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ogg_rel/gm_ogg_xiph.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_deb/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vorbis_static.lib theora_static.lib ogg_static.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ogg_deb/ogg.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib vorbis_static.lib theora_static.lib ogg_static.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\ogg_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\ogg_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\ogg_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\theora_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ogg\vorbis_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/opencv_is.vcproj Deleted

v0.5.2.tar.gz/build/msvc9/openhevc.vcproj Deleted

@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="openhevc_dec"
-	ProjectGUID="{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
-	RootNamespace="openhevc_dec"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/openhevc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/openhevc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_openhevc_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/openhevc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/openhevc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_openhevc_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\openhevc_dec\openhevc_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/opensvc.vcproj Deleted

@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="opensvc_dec"
-	ProjectGUID="{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-	RootNamespace="opensvc_dec"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_opensvc_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/opensvc_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_opensvc_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\opensvc_dec\opensvc_dec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/osmophone.vcproj Deleted

@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="osmophone"
-	ProjectGUID="{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
-	RootNamespace="osmophone"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_DEBUG;ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="libgpac.lib aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/osmophone.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)&quot;;&quot;../../bin/$(PlatformName)/$(ConfigurationName)&quot;"
-				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/osmophone.pdb"
-				SubSystem="9"
-				HeapReserveSize="0"
-				HeapCommitSize="0"
-				StackReserveSize="0"
-				StackCommitSize="0"
-				LargeAddressAware="2"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;$(NOINHERIT)"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ObjectFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				ProgramDataBaseFileName=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),DEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/osmophone.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				IgnoreDefaultLibraryNames="$(NOINHERIT)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj\$(PlatformName)\$(ConfigurationName)\osmophone/osmophone.pdb"
-				SubSystem="2"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),NDEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="libgpac.lib aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)&quot;;&quot;../../bin/$(PlatformName)/$(ConfigurationName)&quot;;$(NOINHERIT)"
-				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/osmophone.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles="gx.dll|D:\CVS\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;libGLES_CM.dll|D:\CVS\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;js.dll|D:\CVS\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0"
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/osmophone.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),NDEBUG,UNICODE,_UNICODE,$(CePlatform),ARM,_ARM_,ARMV4"
-				Culture="1033"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="aygshell.lib commctrl.lib gx.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/osmophone.pdb"
-				SubSystem="9"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="WinMainCRTStartup"
-				BaseAddress="0x00010000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmophone\main.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmophone\openfile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmophone\osmophone.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\code_cyril\gpac\applications\osmophone"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions="DEBUG;_AFXDLL;$(NOINHERIT)"
-						Culture="2057"
-						AdditionalIncludeDirectories="../../doc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\code_cyril\gpac\applications\osmophone"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\code_cyril\gpac\applications\osmophone"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmophone\newres.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmophone\resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\doc\osmo4.ico"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/osmozilla.vcproj Deleted

@@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="osmozilla"
-	ProjectGUID="{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-	RootNamespace="osmozilla"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_deb/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/osmozilla_deb/osmozilla.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/nposmozilla.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/osmozilla_deb/nposmozilla.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/osmozilla_deb/osmozilla.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(PlatformName)\$(ConfigurationName)\nposmozilla.xpt"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_deb/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\obj/osmozilla_deb/osmozilla.pch"
-				AssemblerListingLocation=".\obj/osmozilla_deb/"
-				ObjectFile=".\obj/osmozilla_deb/"
-				ProgramDataBaseFileName=".\obj/osmozilla_deb/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/w32_deb_vc8/nposmozilla.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\obj/osmozilla_deb/nposmozilla.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/osmozilla_deb/nposmozilla.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProgramFiles)\GPAC\mozilla&quot; md &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;copy ..\..\bin\w32_deb\nposmozilla.dll &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_rel/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\obj/osmozilla_rel/osmozilla.pch"
-				AssemblerListingLocation=".\obj/osmozilla_rel/"
-				ObjectFile=".\obj/osmozilla_rel/"
-				ProgramDataBaseFileName=".\obj/osmozilla_rel/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/nposmozilla.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				ProgramDatabaseFile=".\obj/osmozilla_rel/nposmozilla.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/osmozilla_rel/nposmozilla.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(PlatformName)\$(ConfigurationName)\nposmozilla.xpt"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/osmozilla_rel/osmozilla.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\extra_lib\include\xulrunner-sdk\include;..\..\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib user32.lib gdi32.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/nposmozilla.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\applications\osmozilla\osmozilla.def"
-				ProgramDatabaseFile=".\obj/osmozilla_rel/nposmozilla.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/osmozilla_rel/nposmozilla.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xpt_link ..\..\bin\w32_rel\nposmozilla.xpt ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32&#x0D;&#x0A;if not exist &quot;$(ProgramFiles)\GPAC\mozilla&quot; md &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\nposmozilla.dll &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;copy ..\..\bin\w32_rel\nposmozilla.xpt &quot;$(ProgramFiles)\GPAC\mozilla&quot;&#x0D;&#x0A;"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmo_npapi.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmozilla.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmozilla.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="../../include"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\applications\osmozilla\nsIOsmozilla.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmo_npapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\applications\osmozilla\osmozilla.h"
-				>
-			</File>
- 		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/platinum.vcproj Deleted

@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="platinum"
-	ProjectGUID="{694C765F-DFD6-467E-A813-B3F887E822D4}"
-	RootNamespace="platinum"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib ws2_32.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/platinum_deb/platinum.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="3"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="2"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib ws2.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib Iphlpapi.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../modules/platinum/sdk/lib_arm, ../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum.lib neptune.lib winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/platinum_deb/platinum.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/platinum_deb/platinum.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js;../../extra_lib/include/platinum"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="platinum_d.lib neptune_d.lib ws2.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib Iphlpapi.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../modules/platinum/sdk/lib_arm, ../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				StackReserveSize="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\GPAC"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\platinum\GenericDevice.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GenericDevice.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACFileMediaServer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACFileMediaServer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaController.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaController.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaRenderer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACMediaRenderer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACPlatinum.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\platinum\GPACPlatinum.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/raw_out.vcproj Deleted

@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="raw_out"
-	ProjectGUID="{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-	RootNamespace="raw_out"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_rel/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_rel/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/raw_out_rel/gm_raw_out.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_deb/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/raw_out_deb/raw_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\raw_out\raw_video.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/redirect_av.vcproj Deleted

@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="redirect_av"
-	ProjectGUID="{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-	RootNamespace="redirect_av"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4090"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\redirect_av\redirect_av.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_redirect_av.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4090"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/redirect_av.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\redirect_av\redirect_av.def"
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_redirect_av.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\redirect_av\redirect_av.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/rtp_in.vcproj Deleted

@@ -1,665 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="rtp_in"
-	ProjectGUID="{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-	RootNamespace="rtp_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_rel/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_rel/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/rtp_in_rel/gm_rtp_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_deb/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/rtp_in_deb/rtp_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_in.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_session.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_signaling.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\rtp_stream.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\sdp_fetch.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\rtp_in\sdp_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/saf_in.vcproj Deleted

@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="saf_in"
-	ProjectGUID="{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
-	RootNamespace="saf_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\Release/gm_saf_in.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/saf_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\modules\modules_export.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\modules\saf_in\saf_in.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/sdl_out.vcproj Deleted

@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="sdl_out"
-	ProjectGUID="{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
-	RootNamespace="sdl_out"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_deb/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/SDL"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_deb/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_rel/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/SDL"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_rel/sdl_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib SDL.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/sdl_out_rel/gm_sdl_out.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\obj/sdl_out_rel/gm_sdl_out.lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\sdl_out\audio.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\cursors.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\sdl_out.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\sdl_out.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\sdl_out\video.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/soft_raster.vcproj Deleted

@@ -1,703 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="soft_raster"
-	ProjectGUID="{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-	RootNamespace="soft_raster"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_rel/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_rel/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/soft_raster_rel/gm_soft_raster.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_deb/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/soft_raster_deb/soft_raster.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\soft_raster\ftgrays.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\rast_soft.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_565.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_argb.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_load.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\raster_rgb.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\stencil.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\soft_raster\surface.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/svg_in.vcproj Deleted

@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="svg_in"
-	ProjectGUID="{402A8794-B724-44A3-B608-84B600ECA387}"
-	RootNamespace="svg_in"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_rel/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_rel/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_deb/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/svg_in_deb/svg_in.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\svg_in\svg_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/timedtext.vcproj Deleted

@@ -1,501 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="timedtext"
-	ProjectGUID="{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-	RootNamespace="timedtext"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_rel/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_rel/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/ttxt_rel/gm_timedtext.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_deb/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ttxt_deb/timedtext.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\timedtext\timedtext_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\timedtext\timedtext_in.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ts2hds.vcproj Deleted

@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ts2hds"
-	ProjectGUID="{4EEE620A-776D-4D48-AF1B-636B3F255E4C}"
-	RootNamespace="ts2hds"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib libeay32.lib ssleay32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/ts2hds.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib libeay32.lib ssleay32.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/ts2hds.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\applications\ts2hds\f4m.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\ts2hds\f4v.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\ts2hds\main.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\applications\ts2hds\ts2hds.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/ui_rec.vcproj Deleted

@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="demo_is"
-	ProjectGUID="{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
-	RootNamespace="ui_rec"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile="..\..\modules\ui_rec\ui_rec.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\ui_rec\ui_rec.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ui_rec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\ui_rec\ui_rec.def"
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/ui_rec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\ui_rec\ui_rec.def"
-				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_ui_rec.pdb"
-				SubSystem="9"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\ui_rec\ui_rec.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\ui_rec\ui_rec.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/validator.vcproj Deleted

@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="validator"
-	ProjectGUID="{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
-	RootNamespace="validator"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_deb/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_deb/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_validator.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="$(SolutionDir)Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="../../include"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_rel/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/validator_rel/validator.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\obj/validator_rel/gm_validator.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\validator\validator.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/wav_out.vcproj Deleted

@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="wav_out"
-	ProjectGUID="{01183543-B182-4E32-9FD6-FC15C847316C}"
-	RootNamespace="wav_out"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_rel/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_rel/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/wav_out_rel/gm_wav_out.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_deb/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/wav_out_deb/wav_out.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\wav_out\wav_out.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/widgetman.vcproj Deleted

@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="widgetman"
-	ProjectGUID="{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-	RootNamespace="widgetman"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_rel/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)\$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/widgetman_rel/widgetman.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_rel/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/js,../../extra_lib/include/zlib"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;NDEBUG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)\$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/widgetman_rel/widgetman.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_deb/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../extra_lib/include/zlib;../../include;../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Smartphone 2003 (ARMV4)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/widgetman_deb/widgetman.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../extra_lib/include/zlib;../../include;../../extra_lib/include/js"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_DEBUG"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/gm_$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\unzip.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\unzip.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\wgt_load.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\widget.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\widgetman.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\widgetman\widgetman.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/msvc9/wiiis.vcproj Deleted

v0.5.2.tar.gz/build/msvc9/wxOsmo4.vcproj Deleted

v0.5.2.tar.gz/build/msvc9/xvid_dec.vcproj Deleted

@@ -1,1246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="xvid_dec"
-	ProjectGUID="{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-	RootNamespace="xvid_dec"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Smartphone 2003 (ARMV4)"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_rel/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxvidcore.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\obj/xvid_dec_rel/xvid_dec.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_rel/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\obj/xvid_dec_rel/gm_xvid_dec.pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_deb/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxvidcore.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				GenerateManifest="true"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
-			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\obj/xvid_dec_deb/xvid_dec.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib "
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="xvid_wce"
-			>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\bitstream.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\decoder.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\decoder.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\font.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\global.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\gmc.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\gmc.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\idct.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\image.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\image.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mbprediction.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_align.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\portab.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\qpel.inl"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\reduced.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\reduced.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\Rules.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\xvid.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\xvid.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="armasm -CPU StrongARM1 -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;&quot;&#x0D;&#x0A;"
-						Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="armasm -CPU StrongARM1 -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;&quot;&#x0D;&#x0A;"
-						Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\modules\modules_export.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\modules\xvid_dec\xvid_dec.c"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\modules\xvid_dec\xvid_dec_wce.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

v0.5.2.tar.gz/build/xcode/build Deleted

v0.5.2.tar.gz/build/xcode/build/Release-iphonesimulator Deleted

v0.5.2.tar.gz/build/xcode/build/Release-iphonesimulator/libgpac_dynamic.dylib Deleted

v0.5.2.tar.gz/fixEOL.sh Deleted

v0.6.1.tar.gz/.gitattributes Added

v0.6.1.tar.gz/.github Added

v0.6.1.tar.gz/.github/ISSUE_TEMPLATE.md Added

v0.6.1.tar.gz/.gitignore Added

v0.5.2.tar.gz/.travis.yml -> v0.6.1.tar.gz/.travis.yml Changed

@@ -1,11 +1,24 @@
-language: c
-compiler: gcc
-before_install: 
-  - sudo apt-get update -qq
-install:
-  - sudo apt-get install -y pkg-config g++ zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra-53 libavdevice-dev libmozjs185-dev
-env:
-  - GPAC_CONFIGURE_OPTIONS=--disable-all
-  - GPAC_CONFIGURE_OPTIONS=
-script: 
-  - ./configure $GPAC_CONFIGURE_OPTIONS && make
+language: c
+compiler: gcc
+before_install: 
+  - sudo apt-get update -qq
+install:
+  - sudo apt-get install build-essential fakeroot dpkg-dev devscripts ccache debhelper pkg-config g++ 
+  - sudo apt-get install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra-53 libavdevice-dev libmozjs185-dev
+  - sudo apt-get install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev
+env:
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/all" GPAC_CONFIGURE_OPTIONS="" GPAC_CONFIGURE_ECFLAGS="" GPAC_CONFIGURE_ELDFLAGS="" GPAC_CONFIGURE_CROSS="" TARGET=""
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/disable-all" GPAC_CONFIGURE_OPTIONS="--disable-all" GPAC_CONFIGURE_ECFLAGS="" GPAC_CONFIGURE_ELDFLAGS="" GPAC_CONFIGURE_CROSS="" TARGET=""
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/static-mp4box" GPAC_CONFIGURE_OPTIONS="--static-mp4box" GPAC_CONFIGURE_ECFLAGS="" GPAC_CONFIGURE_ELDFLAGS="" GPAC_CONFIGURE_CROSS="" TARGET=""
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/static-modules" GPAC_CONFIGURE_OPTIONS="--static-modules" GPAC_CONFIGURE_ECFLAGS="" GPAC_CONFIGURE_ELDFLAGS="" GPAC_CONFIGURE_CROSS="" TARGET=""
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/disable-manual" GPAC_CONFIGURE_OPTIONS="--use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse" GPAC_CONFIGURE_ECFLAGS="" GPAC_CONFIGURE_ELDFLAGS="" TARGET=""
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/i686-w64-mingw32" GPAC_CONFIGURE_OPTIONS="--static-mp4box --use-zlib=no" GPAC_CONFIGURE_ECFLAGS="-Ibuild/i686-w64-mingw32/include -w -fPIC" GPAC_CONFIGURE_ELDFLAGS="-Lbuild/i686-w64-mingw32/lib" GPAC_CONFIGURE_CROSS="--target-os=mingw32 --cross-prefix=i686-w64-mingw32-" TARGET=""
+  - GPAC_CONFIGURE_PREFIX="--prefix=build/x86_64-w64-mingw32" GPAC_CONFIGURE_OPTIONS="--static-mp4box --use-zlib=no" GPAC_CONFIGURE_ECFLAGS="-Ibuild/x86_64-w64-mingw32/include -w -fPIC" GPAC_CONFIGURE_ELDFLAGS="-Lbuild/x86_64-w64-mingw32/lib" GPAC_CONFIGURE_CROSS="--target-os=mingw32 --cross-prefix=x86_64-w64-mingw32-" TARGET=""
+ 
+script: 
+  - ./configure $GPAC_CONFIGURE_PREFIX $GPAC_CONFIGURE_OPTIONS --extra-cflags="$GPAC_CONFIGURE_ECFLAGS" --extra-ldflags="$GPAC_CONFIGURE_ELDFLAGS" && make clean && make $TARGET && make install
+
+notifications:
+  email:
+    recipients:
+      - travisci@gpac.io

v0.5.2.tar.gz/AUTHORS -> v0.6.1.tar.gz/AUTHORS Changed

v0.5.2.tar.gz/BUGS -> v0.6.1.tar.gz/BUGS Changed

v0.5.2.tar.gz/Changelog -> v0.6.1.tar.gz/Changelog Changed

v0.5.2.tar.gz/Clean.bat -> v0.6.1.tar.gz/Clean.bat Changed

@@ -1,23 +1,23 @@
-cd src
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd modules
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd build
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd applications
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-cd bin
-DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
-cd ..
-
-
-
-
+cd src
+DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
+cd ..
+
+cd modules
+DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
+cd ..
+
+cd build
+DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
+cd ..
+
+cd applications
+DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.dll *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
+cd ..
+
+cd bin
+DEL /S *.obj *.lib *.pch *.pdb *.idb *.exp *.plg *.res *.plg *.ncb *.opt *.APS *.ilk *.SUP *.sbr *.map *.vcl *.o *.exe *.a *.NCB *.OPT *.vcb *.vco *.bsc *.HLP *.hm *.LOG *.ph
+cd ..
+
+
+
+

v0.5.2.tar.gz/INSTALLME -> v0.6.1.tar.gz/INSTALLME Changed

@@ -1,11 +1,14 @@
-Installation instructions for latest GPAC svn version and GPAC release 0.5.0 - May 2012:
+Installation instructions for latest GPAC GIT version - March 2015:
 
-For Windows, Linux and Mac OS X versions, follow the instructions on http://gpac.sourceforge.net/home_download.php
+For Windows, Linux and Mac OS X versions, follow the instructions on http://gpac.io/downloads/
 
 For Android, follow the instructions in gpac/build/android/README
 
-For WindowsMobile platform, get the latest package of gpac extra libs available on GPAC svn:
-http://gpac.svn.sourceforge.net/viewvc/gpac/trunk/gpac_extra_libs/gpac_extra_libs.zip
+(WindowsMobile platform is no longer maintained)
+For WindowsMobile platform, get the latest package of gpac extra libs available here:
+
+https://sourceforge.net/p/gpac/code/HEAD/tree/trunk/gpac_extra_libs/
+
 and follow the instructions in gpac/doc/INSTALL.wCE
 
 
@@ -20,8 +23,8 @@
 extra lib package available at http://sourceforge.net/projects/gpac. Compilation instructions for these libraries 
 are provided per library in the package. 
 
-	The current extra_lib package to use with gpac 0.5.0 is gpac_extra_libs available at sourceforge: 
-http://gpac.svn.sourceforge.net/viewvc/gpac/trunk/gpac_extra_libs/gpac_extra_libs.zip?view=log	
+	The current extra_lib package to use with gpac is gpac_extra_libs available here: 
+http://download.tsi.telecom-paristech.fr/gpac/gpac_extra_libs.zip
 
 	In case you have some of these libs already installed on your system, the detailed list of dependencies is
 	* freetype2 from version 2.1.4 on.
@@ -30,7 +33,7 @@
 	* Libpng version 1.2.33 (older versions should work)
 	* MAD version 0.15.1b (older versions should work)
 	* xvid version 1.0 (0.9.0 / .1 / .2 should also work)
-	* ffmpeg (latest stable API version checked was 08 February 2007 snapshot, you may need to change a few things with current versions)
+	* ffmpeg (latest stable API version checked was 17 February 2016 snapshot, you may need to change a few things with current versions)
 	* libogg 1.1, libvorbis 1.1 and libtheora 1.0 from Xiph.org (newer versions work)
 	* faad2, version 2.0 or above (2.6.1 working)
 	* liba52, version 0.7.4
@@ -39,22 +42,26 @@
 
 * Installing GPAC
 
-/!\ GPAC won't compile if the 'svnversion' command (shipped with every Subversion package) is not in your path /!\
+/!\ GPAC won't compile if the 'git' command is not in your path /!\
+
+!! WARNING !!
+The following instructions may not be completely up to data
+You should use online instructions which may be more up-to-date:
+http://gpac.io/2011/04/18/command-line-gpac-compiling-on-windows-x86-using-free-microsoft-visual-c/
 
-!!OUTDATED - please see online instructions instead!!
 Detailed instruction for Win32 MSVC Compilation are available in gpac/doc/INSTALL.w32
 
 Detailed instruction for WinCE eVC Compilation are available in gpac/doc/INSTALL.wCE
-s
+
 Detailed instruction for GCC Compilation are available in gpac/doc/INSTALL.gcc
 
 Detailed instruction for GCC cross-compilation for familiar+GPE systems are available in gpac/doc/INSTALL.gpe
 	
 Detailed instruction for GCCE/Symbian cross-compilation for Symbian v9.1 systems are available in gpac/doc/INSTALL.symbian
+
+Detailed instruction for iOS Compilation are available in gpac/build/xcode/README_IOS.txt
 	
 * Configuring GPAC
 
 GPAC's client configuration is documented in gpac/doc/configuration.html
 MP4Box documentation is available online at http://gpac.sourceforge.net
-
-

v0.5.2.tar.gz/Makefile -> v0.6.1.tar.gz/Makefile Changed

@@ -8,21 +8,24 @@
 all:	version
 	$(MAKE) -C src all
 	$(MAKE) -C applications all
+ifneq ($(MP4BOX_STATIC),yes)
 	$(MAKE) -C modules all
+endif
 
-SVNREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
+GITREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
+TAG:=$(shell git --git-dir=$(SRC_PATH)/.git describe --tags --abbrev=0 2> /dev/null)
+VERSION:=$(shell echo `git --git-dir=$(SRC_PATH)/.git describe --tags --long  || echo "UNKNOWN"` | sed "s/^$(TAG)-//")
+BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
 
 version:
-	@if [ -d $(SRC_PATH)/".svn" ]; then \
-		if which svnversion >/dev/null; then \
-			echo "#define GPAC_SVN_REVISION	\"$(shell svnversion $(SRC_PATH) )\"" > $(SVNREV_PATH).new ; \
-			if ! diff -q $(SVNREV_PATH) $(SVNREV_PATH).new >/dev/null ; then \
-				mv $(SVNREV_PATH).new  $(SVNREV_PATH) ;  \
-			fi ; \
-		fi \
+	@if [ -d $(SRC_PATH)/".git" ]; then \
+		echo "#define GPAC_GIT_REVISION	\"$(VERSION)-$(BRANCH)\"" > $(GITREV_PATH).new; \
+		if ! diff -q $(GITREV_PATH) $(GITREV_PATH).new >/dev/null ; then \
+			mv $(GITREV_PATH).new  $(GITREV_PATH); \
+		fi; \
 	else \
-		echo "No SVN Version found" ; \
-	fi \
+		echo "No GIT Version found" ; \
+	fi
 
 lib:	version
 	$(MAKE) -C src all
@@ -38,7 +41,7 @@
 
 instmoz:
 	$(MAKE) -C applications/osmozilla install
-
+	
 depend:
 	$(MAKE) -C src dep
 	$(MAKE) -C applications dep
@@ -72,59 +75,60 @@
 
 dep:	depend
 
-# tar release (use 'make -k tar' on a checkouted tree)
-FILE=gpac-$(shell grep "\#define GPAC_VERSION " include/gpac/version.h | \
-                    cut -d "\"" -f 2 )
-
-tar:
-	( tar zcvf ~/$(FILE).tar.gz ../gpac --exclude CVS --exclude bin --exclude lib --exclude Obj --exclude temp --exclude amr_nb --exclude amr_nb_ft --exclude amr_wb_ft --exclude *.mak --exclude *.o --exclude *.~*)
-
 install:
 	$(INSTALL) -d "$(DESTDIR)$(prefix)"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(libdir)"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
 ifeq ($(DISABLE_ISOFF), no) 
-ifeq ($(CONFIG_LINUX), yes)
 ifneq ($(CONFIG_FFMPEG), no)
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast "$(DESTDIR)$(prefix)/bin"
-endif
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin"
 endif
 endif
 ifeq ($(DISABLE_ISOFF), no)
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP42TS "$(DESTDIR)$(prefix)/bin"
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Box$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin"
+ifneq ($(MP4BOX_STATIC), yes)
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP42TS$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin"
 endif
+endif
+ifneq ($(MP4BOX_STATIC), yes)
 ifeq ($(DISABLE_PLAYER), no)
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Client$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin"
+endif
 endif
 	if [ -d  $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
 	$(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
 	fi
 	$(INSTALL) -d "$(DESTDIR)$(moddir)"
-	$(INSTALL) bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
-	rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
-	rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
+ifneq ($(MP4BOX_STATIC),yes)
+	$(INSTALL) bin/gcc/*$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
+	rm -f $(DESTDIR)$(moddir)/libgpac$(DYN_LIB_SUFFIX)
+	rm -f $(DESTDIR)$(moddir)/nposmozilla$(DYN_LIB_SUFFIX)
 	$(MAKE) installdylib
+endif
 	$(INSTALL) -d "$(DESTDIR)$(mandir)"
-	$(INSTALL) -d "$(DESTDIR)$(mandir)/man1";
-	if [ -d  doc ] ; then \
-	$(INSTALL) $(INSTFLAGS) -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \
-	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac" ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ;  \
-	fi
-	if [ -d  gui ] ; then \
-	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui" ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/" ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/" ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/" ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 gui/mpegu-core.js "$(DESTDIR)$(prefix)/share/gpac/gui/" ; \
-	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/icons" ; \
-	$(INSTALL) $(INSTFLAGS) -m 644 gui/icons/*.svg "$(DESTDIR)$(prefix)/share/gpac/gui/icons/" ; \
-	cp -R gui/extensions "$(DESTDIR)$(prefix)/share/gpac/gui/" ; \
-	rm -rf "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/*.svn" ; \
-	fi
+	$(INSTALL) -d "$(DESTDIR)$(mandir)/man1"
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac"
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/  
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui"
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/" 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/" 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/" 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/mpegu-core.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/icons"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/extensions"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders/"
+ifeq ($(CONFIG_DARWIN),yes)
+	cp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/" 
+	cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/" 
+	cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/" 
+else
+	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/" 
+	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/" 
+	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/" 
+endif
 
 lninstall:
 	$(INSTALL) -d "$(DESTDIR)$(prefix)"
@@ -132,23 +136,28 @@
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
 ifeq ($(DISABLE_ISOFF), no) 
 ifneq ($(CONFIG_FFMPEG), no)
-	ln -s $(SRC_PATH)/bin/gcc/DashCast "$(DESTDIR)$(prefix)/bin/DashCast"
+	ln -sf $(BUILD_PATH)/bin/gcc/DashCast$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/DashCast$(EXE_SUFFIX)
 endif
 endif
 ifeq ($(DISABLE_ISOFF), no)
-	ln -s $(SRC_PATH)/bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin/MP4Box"
-	ln -s $(SRC_PATH)/bin/gcc/MP42TS "$(DESTDIR)$(prefix)/bin/MP42TS"
+	ln -sf $(BUILD_PATH)/bin/gcc/MP4Box$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP4Box$(EXE_SUFFIX)
+	ln -sf $(BUILD_PATH)/bin/gcc/MP42TS$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP42TS$(EXE_SUFFIX)
 endif
+ifneq ($(MP4BOX_STATIC),yes)
 ifeq ($(DISABLE_PLAYER), no)
-	ln -s $(SRC_PATH)/bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin/MP4Client"
+	ln -sf $(BUILD_PATH)/bin/gcc/MP4Client$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP4Client$(EXE_SUFFIX)
+endif
 endif
 ifeq ($(CONFIG_DARWIN),yes)
-	ln -s $(SRC_PATH)/bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION).$(DYN_LIB_SUFFIX)
-	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
+	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_MAJOR)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_MAJOR) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
 else
-	ln -s $(SRC_PATH)/bin/gcc/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
-	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
-	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
+	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
+ifeq ($(DESTDIR)$(prefix),$(prefix))
+	ldconfig || true
+endif
 endif
 
 uninstall:
@@ -170,25 +179,27 @@
 	rm -rf $(DESTDIR)$(prefix)/include/gpac
 
 installdylib:
+ifneq ($(MP4BOX_STATIC),yes)
 ifeq ($(CONFIG_WIN32),yes)
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll.a $(DESTDIR)$(prefix)/$(libdir)
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(DESTDIR)$(prefix)/bin
 else
 ifeq ($(DEBUGBUILD),no)
-	$(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX)
+	$(STRIP) bin/gcc/libgpac$(DYN_LIB_SUFFIX)
 endif
 ifeq ($(CONFIG_DARWIN),yes)
-	$(INSTALL) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION).$(DYN_LIB_SUFFIX)
-	ln -sf libgpac.$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
+	$(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION)$(DYN_LIB_SUFFIX)
+	ln -sf libgpac.$(VERSION)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
 else
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
-	ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
-	ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
+	ln -sf libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
+	ln -sf libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
 ifeq ($(DESTDIR)$(prefix),$(prefix))
 	ldconfig || true
 endif
 endif
 endif
+endif
 
 install-lib:
 	mkdir -p "$(DESTDIR)$(prefix)/include/gpac"
@@ -214,20 +225,30 @@
 
 ifeq ($(CONFIG_DARWIN),yes)
 dmg:
+	@if [ ! -z "$(shell git diff  master..origin/master)" ]; then \
+		echo "Local revision and remote revision are not congruent; you may have local commit."; \
+		echo "Please consider pushing your commit before generating an installer"; \
+		exit 1; \
+	fi
 	rm "bin/gcc/MP4Client"
 	$(MAKE) -C applications/mp4client
-	./mkdmg.sh
+	./mkdmg.sh $(arch)
 endif
 
 ifeq ($(CONFIG_LINUX),yes)
 deb:
+	@if [ ! -z "$(shell git diff  master..origin/master)" ]; then \
+		echo "Local revision and remote revision are not congruent; you may have local commit."; \
+		echo "Please consider pushing your commit before generating an installer"; \
+		exit 1; \
+	fi
+	git checkout --	debian/changelog
 	fakeroot debian/rules clean
-	sed -i "s/.DEV/.DEV-r`svnversion \"$(SRC_PATH)\"`/" debian/changelog
+	sed -i "s/-DEV/-DEV-rev$(VERSION)-$(BRANCH)/" debian/changelog
 	fakeroot debian/rules configure
 	fakeroot debian/rules binary
 	rm -rf debian/
-	svn cleanup
-	svn up
+	git checkout debian
 endif
 
 help:
@@ -242,7 +263,6 @@
 	@echo 
 	@echo "clean: clean src repository"
 	@echo "distclean: clean src repository and host config file"
-	@echo "tar: create GPAC tarball"
 	@echo 
 	@echo "install: install applications and modules on system"
 	@echo "uninstall: uninstall applications and modules"

v0.6.1.tar.gz/README.md Added

@@ -0,0 +1,20 @@
+[![Build Status](https://travis-ci.org/gpac/gpac.svg?branch=master)](https://travis-ci.org/gpac/gpac)
+
+README for GPAC version 0.6.1
+
+GPAC is a multimedia framework oriented towards rich media and distributed under the LGPL license (see COPYING).
+GPAC supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex 
+presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D). GPAC supports scripting of presentation for MPEG4/VRML/X3D through
+mozilla SpiderMonkey javascript engine.
+GPAC currently supports local playback, http progressive download, Adaptive HTTP Streaming (MPEG-DASH, HLS), RTP/RTSP streaming over UDP (unicast or multicast) or TCP and TS demuxing (from file, IP or DVB4Linux).
+GPAC also features MP4Box, a multimedia swiss-army knife for the prompt.
+
+For compilation and installation instruction, check INSTALLME file
+
+For GPAC configuration instruction, check gpac/doc/configuration.html or gpac/doc/man/gpac.1 (man gpac when installed)
+
+For more information, visit the GPAC website:
+	http://gpac.io
+
+		
+

v0.5.2.tar.gz/TODO -> v0.6.1.tar.gz/TODO Changed

v0.5.2.tar.gz/applications/GPAX/GPAXPlugin.cpp -> v0.6.1.tar.gz/applications/GPAX/GPAXPlugin.cpp Changed

v0.5.2.tar.gz/applications/Makefile -> v0.6.1.tar.gz/applications/Makefile Changed

v0.5.2.tar.gz/applications/dashcast/Makefile -> v0.6.1.tar.gz/applications/dashcast/Makefile Changed

@@ -4,7 +4,7 @@
 
 CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)
 
-LINKLIBS=$(GPAC_SH_FLAGS)
+LINKFLAGS=$(GPAC_SH_FLAGS)
 
 ifeq ($(DEBUGBUILD), yes)
 CFLAGS+=-g
@@ -26,13 +26,10 @@
 
 ifneq ($(CONFIG_LIBAVRESAMPLE),no)
 CFLAGS+=-DDC_AUDIO_RESAMPLER
-LINKLIBS+=-lavresample
+LINKFLAGS+=-lavresample
 endif
 
 
-#common obj
-OBJS= dashcast.o audio_data.o audio_decoder.o audio_encoder.o audio_muxer.o circular_buffer.o cmd_data.o controler.o message_queue.o register.o video_data.o video_decoder.o video_encoder.o video_muxer.o video_scaler.o task.o
-
 ifeq ($(CONFIG_WIN32),yes)
 EXE=.exe
 PROG=DashCast$(EXE)
@@ -41,11 +38,25 @@
 PROG=DashCast
 endif
 
-LINKLIBS+= $(ffmpeg_lflags)
+
+ifeq ($(STATICBUILD),yes)
+##include static modules and other deps for libgpac
+include ../../static.mak
+LINKFLAGS+=-lgpac_static
+LINKFLAGS+=$(EXTRALIBS)
+else
+LINKFLAGS+=-lgpac
+endif
+
+#common obj
+OBJS= dashcast.o audio_data.o audio_decoder.o audio_encoder.o audio_muxer.o circular_buffer.o cmd_data.o controler.o message_queue.o register.o video_data.o video_decoder.o video_encoder.o video_muxer.o video_scaler.o task.o
+
+
+LINKFLAGS+= $(ffmpeg_lflags)
 
 ifeq ($(CONFIG_DARWIN), yes)
 #fixme - use proper detection of libavdevice dependencies
-LINKLIBS+=-lavfilter -lswresample -lbz2 
+LINKFLAGS+=-lavfilter -lswresample -lbz2 
 endif
 
 
@@ -54,7 +65,7 @@
 all: $(PROG)
 
 DashCast$(EXE): $(OBJS)
-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc  -lgpac $(LINKLIBS)
+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LINKFLAGS)
 
 clean: 
 	rm -f $(OBJS) ../../bin/gcc/$(PROG)

v0.5.2.tar.gz/applications/dashcast/audio_data.c -> v0.6.1.tar.gz/applications/dashcast/audio_data.c Changed

@@ -57,11 +57,11 @@
 	dc_circular_buffer_create(&audio_input_data->circular_buf, AUDIO_CB_SIZE, mode, num_consumers);
 
 	for (i = 0; i < AUDIO_CB_SIZE; i++) {
-		AudioDataNode *audio_data_node = gf_malloc(sizeof(AudioDataNode));
+		AudioDataNode *audio_data_node = (AudioDataNode*)gf_malloc(sizeof(AudioDataNode));
 		audio_input_data->circular_buf.list[i].data = (void *) audio_data_node;
 
 		audio_data_node->abuf_size = MAX_AUDIO_PACKET_SIZE;
-		audio_data_node->abuf = gf_malloc(audio_data_node->abuf_size * sizeof(uint8_t));
+		audio_data_node->abuf = (uint8_t*)gf_malloc(audio_data_node->abuf_size * sizeof(uint8_t));
 	}
 
 	audio_input_data->aframe = FF_ALLOC_FRAME();
@@ -81,7 +81,7 @@
 	int i;
 	if (audio_input_data->circular_buf.list) {
 		for (i = 0; i < AUDIO_CB_SIZE; i++) {
-			AudioDataNode *audio_data_node = audio_input_data->circular_buf.list[i].data;
+			AudioDataNode *audio_data_node = (AudioDataNode*)audio_input_data->circular_buf.list[i].data;
 			gf_free(audio_data_node->abuf);
 			gf_free(audio_data_node);
 		}

v0.5.2.tar.gz/applications/dashcast/audio_decoder.c -> v0.6.1.tar.gz/applications/dashcast/audio_decoder.c Changed

@@ -147,15 +147,16 @@
 	*num_planes_out = av_sample_fmt_is_planar(DC_AUDIO_SAMPLE_FORMAT) ? DC_AUDIO_NUM_CHANNELS : 1;
 	*output = (uint8_t**)av_malloc(*num_planes_out*sizeof(uint8_t*));
 	for (i=0; i<*num_planes_out; i++) {
-		*output[i] = (uint8_t*)av_malloc(DC_AUDIO_MAX_CHUNCK_SIZE); //FIXME: fix using size below av_samples_get_buffer_size()
+		(*output) [i] = (uint8_t*)av_malloc(DC_AUDIO_MAX_CHUNCK_SIZE); //FIXME: fix using size below av_samples_get_buffer_size()
 	}
 
-	if (avresample_convert(audio_input_file->aresampler, *output, DC_AUDIO_MAX_CHUNCK_SIZE, audio_input_data->aframe->nb_samples, audio_input_data->aframe->extended_data, audio_input_data->aframe->linesize[0], audio_input_data->aframe->nb_samples) < 0) {
+	i = avresample_convert(audio_input_file->aresampler, *output, DC_AUDIO_MAX_CHUNCK_SIZE, audio_input_data->aframe->nb_samples, audio_input_data->aframe->extended_data, audio_input_data->aframe->linesize[0], audio_input_data->aframe->nb_samples);
+	if (i < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not resample audio frame. Aborting.\n"));
 		return -1;
 	}
 
-	return 0;
+	return i;
 }
 #endif
 
@@ -177,7 +178,7 @@
 				AVPacket *packet_copy;
 				assert(audio_input_file->av_pkt_list);
 				gf_mx_p(audio_input_file->av_pkt_list_mutex);
-				packet_copy = gf_list_pop_front(audio_input_file->av_pkt_list);
+				packet_copy = (AVPacket*)gf_list_pop_front(audio_input_file->av_pkt_list);
 				gf_mx_v(audio_input_file->av_pkt_list_mutex);
 
 				if (packet_copy == NULL) {
@@ -288,16 +289,18 @@
 					exit(1);
 #else
 					uint8_t **output;
+					int nb_samp;
 					if (ensure_resampler(audio_input_file, sample_rate, num_channels, channel_layout, sample_format)) {
 						return -1;
 					}
 
-					if (resample_audio(audio_input_file, audio_input_data, codec_ctx, &output, &num_planes_out, num_channels, sample_format)) {
+					nb_samp = resample_audio(audio_input_file, audio_input_data, codec_ctx, &output, &num_planes_out, num_channels, sample_format);
+					if (nb_samp<0) {
 						return -1;
-					} else {
-						data = output;
-						av_samples_get_buffer_size(&data_size, num_channels, audio_input_data->aframe->nb_samples, sample_format, 0);
 					}
+
+					av_samples_get_buffer_size(&data_size, DC_AUDIO_NUM_CHANNELS, nb_samp, DC_AUDIO_SAMPLE_FORMAT, 0);
+					data = output;
 #endif
 				} else {
 					/*no resampling needed: read data from the AVFrame*/
@@ -379,7 +382,7 @@
 	if (audio_input_file->av_pkt_list_mutex) {
 		gf_mx_p(audio_input_file->av_pkt_list_mutex);
 		while (gf_list_count(audio_input_file->av_pkt_list)) {
-			AVPacket *pkt = gf_list_last(audio_input_file->av_pkt_list);
+			AVPacket *pkt = (AVPacket*)gf_list_last(audio_input_file->av_pkt_list);
 			av_free_packet(pkt);
 			gf_list_rem_last(audio_input_file->av_pkt_list);
 		}

v0.5.2.tar.gz/applications/dashcast/audio_encoder.c -> v0.6.1.tar.gz/applications/dashcast/audio_encoder.c Changed

@@ -54,15 +54,23 @@
 	audio_output_file->codec_ctx->codec_id = audio_output_file->codec->id;
 	audio_output_file->codec_ctx->codec_type = AVMEDIA_TYPE_AUDIO;
 	audio_output_file->codec_ctx->bit_rate = audio_data_conf->bitrate;
-	audio_output_file->codec_ctx->sample_rate = audio_data_conf->samplerate;
+	audio_output_file->codec_ctx->sample_rate = DC_AUDIO_SAMPLE_RATE /*audio_data_conf->samplerate*/;
+
 	{
 		AVRational time_base;
 		time_base.num = 1;
-		time_base.den = audio_data_conf->samplerate;
+		time_base.den = audio_output_file->codec_ctx->sample_rate;
 		audio_output_file->codec_ctx->time_base = time_base;
 	}
 	audio_output_file->codec_ctx->channels = audio_data_conf->channels;
-	audio_output_file->codec_ctx->channel_layout = AV_CH_LAYOUT_STEREO; /*FIXME: depends on channels -> http://ffmpeg.org/doxygen/trunk/channel__layout_8c_source.html#l00074*/
+	
+	/*FIXME: depends on channels -> http://ffmpeg.org/doxygen/trunk/channel__layout_8c_source.html#l00074*/
+	if (audio_data_conf->channels == 1) {
+		audio_output_file->codec_ctx->channel_layout = AV_CH_LAYOUT_MONO;
+	} else {
+		audio_output_file->codec_ctx->channel_layout = AV_CH_LAYOUT_STEREO;
+	}
+
 	audio_output_file->codec_ctx->sample_fmt = audio_output_file->codec->sample_fmts[0];
 #ifdef DC_AUDIO_RESAMPLER
 	audio_output_file->aresampler = NULL;

v0.5.2.tar.gz/applications/dashcast/audio_muxer.c -> v0.6.1.tar.gz/applications/dashcast/audio_muxer.c Changed

@@ -26,6 +26,7 @@
 #include "audio_muxer.h"
 #include "libavformat/avio.h"
 
+#ifndef GPAC_DISABLE_ISOM
 
 int dc_gpac_audio_moov_create(AudioOutputFile *audio_output_file, char *filename)
 {
@@ -54,7 +55,7 @@
 	esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
 	if (!strcmp(audio_output_file->codec_ctx->codec->name, "aac")) { //TODO: find an automatic table
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_LCP;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
 		esd->decoderConfig->bufferSizeDB = 20;
 		esd->slConfig->timestampResolution = audio_codec_ctx->sample_rate;
 		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
@@ -222,6 +223,10 @@
 	return 0;
 }
 
+#endif
+
+
+
 int dc_ffmpeg_audio_muxer_open(AudioOutputFile *audio_output_file, char *filename)
 {
 	AVStream *audio_stream;
@@ -352,42 +357,44 @@
 	snprintf(name, sizeof(name), "audio encoder %s", audio_data_conf->filename);
 	dc_consumer_init(&audio_output_file->consumer, AUDIO_CB_SIZE, name);
 
+#ifndef GPAC_DISABLE_ISOM
 	audio_output_file->sample = gf_isom_sample_new();
 	audio_output_file->isof = NULL;
-	audio_output_file->muxer_type = muxer_type;
+#endif
 
+	audio_output_file->muxer_type = muxer_type;
 	audio_output_file->frame_per_seg = frame_per_seg;
 	audio_output_file->frame_per_frag = frame_per_frag;
-
 	audio_output_file->seg_marker = seg_marker;
-
 	return 0;
 }
 
 void dc_audio_muxer_free(AudioOutputFile *audio_output_file)
 {
+#ifndef GPAC_DISABLE_ISOM
 	if (audio_output_file->isof != NULL) {
 		gf_isom_close(audio_output_file->isof);
 	}
-
 	//gf_isom_sample_del(&audio_output_file->sample);
+#endif
 }
 
 GF_Err dc_audio_muxer_open(AudioOutputFile *audio_output_file, char *directory, char *id_name, int seg)
 {
-	GF_Err ret;
+	GF_Err ret = GF_NOT_SUPPORTED;
 	char name[GF_MAX_PATH];
 
 	switch (audio_output_file->muxer_type) {
 	case FFMPEG_AUDIO_MUXER:
 		snprintf(name, sizeof(name), "%s/%s_%d_ffmpeg.mp4", directory, id_name, seg);
 		return dc_ffmpeg_audio_muxer_open(audio_output_file, name);
+#ifndef GPAC_DISABLE_ISOM
 	case GPAC_AUDIO_MUXER:
 		snprintf(name, sizeof(name), "%s/%s_%d_gpac.mp4", directory, id_name, seg);
 		dc_gpac_audio_moov_create(audio_output_file, name);
 		return dc_gpac_audio_isom_open_seg(audio_output_file, NULL);
 	case GPAC_INIT_AUDIO_MUXER:
-		if (seg == 0) {
+		if (seg == 1) {
 			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
 			dc_gpac_audio_moov_create(audio_output_file, name);
 			audio_output_file->first_dts = 0;
@@ -395,11 +402,13 @@
 		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
 		ret = dc_gpac_audio_isom_open_seg(audio_output_file, name);
 		return ret;
+#endif
 	default:
-		return GF_BAD_PARAM;
+		ret = GF_BAD_PARAM;
+		break;
 	}
 
-	return GF_BAD_PARAM;
+	return ret;
 }
 
 int dc_audio_muxer_write(AudioOutputFile *audio_output_file, int frame_nb)
@@ -407,6 +416,7 @@
 	switch (audio_output_file->muxer_type) {
 	case FFMPEG_AUDIO_MUXER:
 		return dc_ffmpeg_audio_muxer_write(audio_output_file);
+#ifndef GPAC_DISABLE_ISOM
 	case GPAC_AUDIO_MUXER:
 	case GPAC_INIT_AUDIO_MUXER:
 		if (frame_nb % audio_output_file->frame_per_frag == 0) {
@@ -418,14 +428,17 @@
 		if (frame_nb % audio_output_file->frame_per_frag == audio_output_file->frame_per_frag - 1) {
 			gf_isom_flush_fragments(audio_output_file->isof, 1);
 		}
+		//TODO - do same as video, flush based on time in case of losses
 		if (frame_nb + 1 == audio_output_file->frame_per_seg) {
 			return 1;
 		}
+
 		return 0;
+#endif
+
 	default:
 		return GF_BAD_PARAM;
 	}
-
 	return GF_BAD_PARAM;
 }
 
@@ -434,11 +447,13 @@
 	switch (audio_output_file->muxer_type) {
 	case FFMPEG_AUDIO_MUXER:
 		return dc_ffmpeg_audio_muxer_close(audio_output_file);
+#ifndef GPAC_DISABLE_ISOM
 	case GPAC_AUDIO_MUXER:
 		dc_gpac_audio_isom_close_seg(audio_output_file);
 		return dc_gpac_audio_isom_close(audio_output_file);
 	case GPAC_INIT_AUDIO_MUXER:
 		return dc_gpac_audio_isom_close_seg(audio_output_file);
+#endif
 	default:
 		return GF_BAD_PARAM;
 	}

v0.5.2.tar.gz/applications/dashcast/audio_muxer.h -> v0.6.1.tar.gz/applications/dashcast/audio_muxer.h Changed

v0.5.2.tar.gz/applications/dashcast/circular_buffer.c -> v0.6.1.tar.gz/applications/dashcast/circular_buffer.c Changed

v0.5.2.tar.gz/applications/dashcast/cmd_data.c -> v0.6.1.tar.gz/applications/dashcast/cmd_data.c Changed

@@ -55,7 +55,7 @@
 }
 
 
-#define DEFAULT_VIDEO_BITRATE 400000
+#define DEFAULT_VIDEO_BITRATE 1000000
 #define DEFAULT_VIDEO_FRAMERATE 25
 #define DEFAULT_VIDEO_WIDTH 640
 #define DEFAULT_VIDEO_HEIGHT 480
@@ -228,14 +228,14 @@
 	fprintf(stdout, "\33[34m\33[1m");
 	fprintf(stdout, "Configurations:\n");
 	for (i=0; i<gf_list_count(cmd_data->video_lst); i++) {
-		VideoDataConf *video_data_conf = gf_list_get(cmd_data->video_lst, i);
+		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(cmd_data->video_lst, i);
 		fprintf(stdout, " id:%s\tres:%dx%d\tvbr:%d\n", video_data_conf->filename,
 		 video_data_conf->width, video_data_conf->height,
 		 video_data_conf->bitrate/*, video_data_conf->framerate, video_data_conf->codec*/);
 	}
 
 	for (i=0; i<gf_list_count(cmd_data->audio_lst); i++) {
-		AudioDataConf *audio_data_conf = gf_list_get(cmd_data->audio_lst, i);
+		AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_get(cmd_data->audio_lst, i);
 		fprintf(stdout, " id:%s\tabr:%d\n", audio_data_conf->filename, audio_data_conf->bitrate/*, audio_data_conf->samplerate, audio_data_conf->channels,audio_data_conf->codec*/);
 	}
 	fprintf(stdout, "\33[0m");
@@ -287,7 +287,7 @@
 		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
 
 		if (strcmp(section_type, "video") == 0) {
-			VideoDataConf *video_data_conf = gf_malloc(sizeof(VideoDataConf));
+			VideoDataConf *video_data_conf = (VideoDataConf*)gf_malloc(sizeof(VideoDataConf));
 
 			strcpy(video_data_conf->source_id, section_name);
 			strcpy(video_data_conf->filename, gf_cfg_get_key(conf, section_name, "source"));
@@ -307,7 +307,7 @@
 		}
 		else if (strcmp(section_type, "audio") == 0)
 		{
-			AudioDataConf *audio_data_conf = gf_malloc(sizeof(AudioDataConf));
+			AudioDataConf *audio_data_conf = (AudioDataConf*)gf_malloc(sizeof(AudioDataConf));
 			strcpy(audio_data_conf->source_id, section_name);
 			strcpy(audio_data_conf->filename, gf_cfg_get_key(conf, section_name, "source"));
 
@@ -328,14 +328,14 @@
 	fprintf(stdout, "\33[34m\33[1m");
 	fprintf(stdout, "Sources:\n");
 	for (i=0; i<gf_list_count(cmd_data->vsrc); i++) {
-		VideoDataConf *video_data_conf = gf_list_get(cmd_data->vsrc, i);
+		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(cmd_data->vsrc, i);
 		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&video_data_conf->start_time));
 		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&video_data_conf->end_time));
 		fprintf(stdout, " id:%s\tsource:%s\tstart:%s\tend:%s\n", video_data_conf->source_id, video_data_conf->filename, start_time, end_time);
 	}
 
 	for (i=0; i<gf_list_count(cmd_data->asrc); i++) {
-		AudioDataConf *audio_data_conf = gf_list_get(cmd_data->asrc, i);
+		AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_get(cmd_data->asrc, i);
 		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&audio_data_conf->start_time));
 		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&audio_data_conf->end_time));
 		fprintf(stdout, " id:%s\tsource:%s\tstart:%s\tend:%s\n", audio_data_conf->source_id, audio_data_conf->filename, start_time, end_time);
@@ -356,7 +356,7 @@
 	cmd_data->ast_offset = -1;
 	cmd_data->min_buffer_time = -1;
 	cmd_data->minimum_update_period = -1;
-	cmd_data->use_source_timing = 1;
+	cmd_data->use_source_timing = GF_TRUE;
 
 	cmd_data->audio_lst = gf_list_new();
 	cmd_data->video_lst = gf_list_new();
@@ -367,14 +367,14 @@
 void dc_cmd_data_destroy(CmdData *cmd_data)
 {
 	while (gf_list_count(cmd_data->audio_lst)) {
-		AudioDataConf *audio_data_conf = gf_list_last(cmd_data->audio_lst);
+		AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_last(cmd_data->audio_lst);
 		gf_list_rem_last(cmd_data->audio_lst);
 		gf_free(audio_data_conf);
 	}
 	gf_list_del(cmd_data->audio_lst);
 
 	while (gf_list_count(cmd_data->video_lst)) {
-		VideoDataConf *video_data_conf = gf_list_last(cmd_data->video_lst);
+		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_last(cmd_data->video_lst);
 		gf_list_rem_last(cmd_data->video_lst);
 		gf_free(video_data_conf);
 	}
@@ -385,7 +385,7 @@
 	gf_cfg_del(cmd_data->conf);
 	gf_cfg_del(cmd_data->switch_conf);
 	if (cmd_data->logfile)
-		fclose(cmd_data->logfile);
+		gf_fclose(cmd_data->logfile);
 
 	dc_task_destroy(&cmd_data->task_list);
 
@@ -394,7 +394,7 @@
 
 static void on_dc_log(void *cbk, u32 ll, u32 lm, const char *av_fmt_ctx, va_list list)
 {
-	FILE *logs = cbk;
+	FILE *logs = (FILE*)cbk;
 	vfprintf(logs, av_fmt_ctx, list);
 	fflush(logs);
 }
@@ -437,7 +437,6 @@
 	 " - if input is from stdin, use \"pipe:\"\n"
 	 " -vf string set the input video format\n"
 #ifdef WIN32
-	 " - to capture from a VfW webcam, set vfwcap\n"
 	 " - to capture from a directshow device, set dshow\n"
 #else
 	 " - to capture from a webcam, set video4linux2\n"
@@ -449,6 +448,7 @@
 	 " -vfr N force the input video framerate\n"
 	 " -vres WxH force the video resolution (e.g. 640x480)\n"
 	 " -vcrop XxY crop the source video from X pixels left and Y pixels top. Must be used with -vres.\n"
+	 " -demux-buffer SIZE sets demux buffer size to SIZE.\n"
 	 "* Audio options:\n"
 	 " -a string set the source name for an audio input\n"
 	 " - if input is from microphone, use \"plughw:[x],[y]\"\n"
@@ -476,7 +476,7 @@
 	 "\n"
 	 "DASH options:\n"
 	 " -seg-dur dur:int set the segment duration in millisecond (default value: 1000)\n"
-	 " -frag-dur dur:int set the fragment duration in millisecond (default value: 1000)\n"
+	 " -frag dur:int set the fragment duration in millisecond (default value: 1000) (same as -frag-dur)\n"
 	 " -seg-marker marker:4cc add a marker box named marker at the end of DASH segment\n"
 	 " -out outdir:str outdir is the output data directory (default: output)\n"
 	 " -mpd mpdname:str mpdname is the MPD file name (default: dashcast.mpd)\n"
@@ -493,9 +493,11 @@
 	 " DashCast -av test.avi -live-media\n"
 	 " DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media\n"
 #ifdef WIN32
-	 " DashCast -vf vfwcap -vres 1280x720 -vfr 24 -v 0 -live\n"
 	 " DashCast -vf dshow -vres 1280x720 -vfr 24 -v video=\"screen-capture-recorder\" -live (please install http://screencapturer.sf.net/)\n"
-	 " DashCast -vf dshow -vres 1280x720 -vfr 24 -v video=\"YOUR-WEBCAM\" -pixf yuv420p -live\n"
+	 " DashCast -vf dshow -vres 1280x720 -vfr 24 -v video=\"YOUR-WEBCAM\" -pixf yuv420p -live (see https://trac.ffmpeg.org/wiki/DirectShow)\n"
+#elif defined(__DARWIN) || defined(__APPLE__)
+	 " DashCast -vf avfoundation -vres 1280x720 -v \"FaceTime HD Camera\" -vfr 25 -live\n"
+	 " DashCast -vf avfoundation -vres 1280x720 -v \"Capture screen 0\" -vfr 25 -live\n"
 #else
 	 " DashCast -vf video4linux2 -vres 1280x720 -vfr 24 -v4l2f mjpeg -v /dev/video0 -af alsa -a plughw:1,0 -live\n"
 	 " DashCast -vf x11grab -vres 800x600 -vfr 25 -v :0.0 -live\n"
@@ -522,6 +524,7 @@
 
 	gf_sys_init(use_mem_track);
 
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
 	if (use_mem_track) {
 		gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
 	}
@@ -695,7 +698,7 @@
 			}
 			cmd_data->seg_dur = atoi(argv[i]);
 			i++;
-		} else if (strcmp(argv[i], "-frag-dur") == 0) {
+		} else if ((strcmp(argv[i], "-frag-dur") == 0) || (strcmp(argv[i], "-frag") == 0)) {
 			DASHCAST_CHECK_NEXT_ARG
 			if (cmd_data->frag_dur != 0) {
 				fprintf(stderr, "Fragment duration has already been specified.\n");
@@ -749,6 +752,10 @@
 			}
 			cmd_data->min_buffer_time = (float)atof(argv[i]);
 			i++;
+		} else if (strcmp(argv[i], "-demux-buffer") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			cmd_data->video_data_conf.demux_buffer_size = (int)atoi(argv[i]);
+			i++;
 		} else if (strcmp(argv[i], "-base-url") == 0) {
 			DASHCAST_CHECK_NEXT_ARG
 			if (strcmp(cmd_data->base_url, "") != 0) {
@@ -765,7 +772,7 @@
 			cmd_data->mode = LIVE_CAMERA;
 			i++;
 		} else if (strcmp(argv[i], "-npts") == 0) {
-			cmd_data->use_source_timing = 0;
+			cmd_data->use_source_timing = GF_FALSE;
 			i++;
 		} else if (strcmp(argv[i], "-live-media") == 0) {
 			cmd_data->mode = LIVE_MEDIA;
@@ -797,7 +804,7 @@
 #endif
 		} else if (!strcmp(argv[i], "-lf") || !strcmp(argv[i], "-log-file")) {
 			DASHCAST_CHECK_NEXT_ARG
-			cmd_data->logfile = gf_f64_open(argv[i], "wt");
+			cmd_data->logfile = gf_fopen(argv[i], "wt");
 			gf_log_set_callback(cmd_data->logfile, on_dc_log);
 			i++;
 		} else if (strcmp(argv[i], "-gdr") == 0) {
@@ -859,6 +866,11 @@
 		cmd_data->min_buffer_time = 1.0;
 	}
 
+	if ((cmd_data->minimum_update_period == -1) && (cmd_data->mode == LIVE_CAMERA)) {
+		fprintf(stderr, "MPD refresh time not set in live - defaulting to segment duration\n");
+		cmd_data->minimum_update_period = cmd_data->seg_dur;
+	}
+
 	//safety checks
 	if (cmd_data->video_data_conf.crop_x || cmd_data->video_data_conf.crop_y) {
 		if (cmd_data->video_data_conf.width == -1 && cmd_data->video_data_conf.height == -1) {

v0.5.2.tar.gz/applications/dashcast/controler.c -> v0.6.1.tar.gz/applications/dashcast/controler.c Changed

@@ -43,10 +43,11 @@
 # error
 #endif
 
+#include <gpac/network.h>
 
 typedef struct {
 	int segnum;
-	u64 time;
+	u64 utc_time, ntpts;
 } segtime;
 
 
@@ -72,10 +73,13 @@
 
 void optimize_seg_frag_dur(int *seg, int *frag)
 {
+	int min_rem;
 	int seg_nb = *seg;
 	int frag_nb = *frag;
+	if (!frag_nb) frag_nb = 1;
+
+	min_rem = seg_nb % frag_nb;
 
-	int min_rem = seg_nb % frag_nb;
 	if (seg_nb % (frag_nb + 1) < min_rem) {
 		min_rem = seg_nb % (frag_nb + 1);
 		*seg = seg_nb;
@@ -99,7 +103,7 @@
 
 Bool change_source_thread(void *params)
 {
-	int ret = 0;
+	Bool ret = GF_FALSE;
 	return ret;
 }
 
@@ -137,20 +141,20 @@
 	snprintf(name, sizeof(name), "%s/%s", cmddata->out_dir, cmddata->mpd_filename);
 
 	if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
-		audio_data_conf = gf_list_get(cmddata->audio_lst, 0);
+		audio_data_conf = (const AudioDataConf*)gf_list_get(cmddata->audio_lst, 0);
 		audio_seg_dur = (int)((audio_data_conf->samplerate / (double) audio_frame_size) * (cmddata->seg_dur / 1000.0));
 		audio_frag_dur = (int)((audio_data_conf->samplerate / (double) audio_frame_size) * (cmddata->frag_dur / 1000.0));
 		optimize_seg_frag_dur(&audio_seg_dur, &audio_frag_dur);
 	}
 
 	if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
-		video_data_conf = gf_list_get(cmddata->video_lst, 0);
+		video_data_conf = (VideoDataConf*)gf_list_get(cmddata->video_lst, 0);
 		video_seg_dur = (int)(video_data_conf->framerate * (cmddata->seg_dur / 1000.0));
 		video_frag_dur = (int)(video_data_conf->framerate * (cmddata->frag_dur / 1000.0));
 		optimize_seg_frag_dur(&video_seg_dur, &video_frag_dur);
 	}
 
-	f = fopen(name, "w");
+	f = gf_fopen(name, "w");
 	//TODO: if (!f) ...
 
 	//	time_t t = time(NULL);
@@ -183,7 +187,7 @@
 		fprintf(f, " <BaseURL>%s</BaseURL>\n", cmddata->base_url);
 	}
 
-	fprintf(f, " <Period start=\"0\" id=\"\">\n");
+	fprintf(f, " <Period start=\"PT0H0M0.000S\" id=\"P1\">\n");
 
 	if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
 		fprintf(f, " <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
@@ -205,7 +209,7 @@
 
 
 		for (i = 0; i < gf_list_count(cmddata->audio_lst); i++) {
-			audio_data_conf = gf_list_get(cmddata->audio_lst, i);
+			audio_data_conf = (const AudioDataConf*)gf_list_get(cmddata->audio_lst, i);
 			fprintf(f,
 			 " <Representation id=\"%s\" mimeType=\"audio/mp4\" codecs=\"mp4a.40.2\" "
 			 "audioSamplingRate=\"%d\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
@@ -230,7 +234,7 @@
 		fprintf(f, "/>\n");
 
 		for (i = 0; i < gf_list_count(cmddata->video_lst); i++) {
-			video_data_conf = gf_list_get(cmddata->video_lst, i);
+			video_data_conf = (VideoDataConf*)gf_list_get(cmddata->video_lst, i);
 			fprintf(f, " <Representation id=\"%s\" mimeType=\"video/mp4\" codecs=\"%s\" "
 			 "width=\"%d\" height=\"%d\" frameRate=\"%d\" sar=\"1:1\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
 			 " </Representation>\n", video_data_conf->filename,
@@ -246,11 +250,7 @@
 
 	fprintf(f, "</MPD>\n");
 
-	fclose(f);
-
-//	fprintf(stdout, "\33[34m\33[1m");
-	fprintf(stdout, "MPD file generated: %s/%s\n", cmddata->out_dir, cmddata->mpd_filename);
-//	fprintf(stdout, "\33[0m");
+	gf_fclose(f);
 }
 
 static u32 mpd_thread(void *params)
@@ -268,7 +268,8 @@
 	segtime main_seg_time;
 	Bool first = GF_TRUE;
 	main_seg_time.segnum = 0;
-	main_seg_time.time = 0;
+	main_seg_time.utc_time = 0;
+	main_seg_time.ntpts = 0;
 
 	if (cmddata->mode == LIVE_CAMERA || cmddata->mode == LIVE_MEDIA) {
 		while (1) {
@@ -276,7 +277,7 @@
 			time_t t;
 			segtime seg_time;
 			seg_time.segnum = 0;
-			seg_time.time = 0;
+			seg_time.utc_time = 0;
 
 			if (cmddata->exit_signal) {
 				break;
@@ -291,10 +292,6 @@
 					continue;
 				}
 
-				if (cmddata->ast_offset>0) {
-					seg_time.time += cmddata->ast_offset;
-				}
-
 				if (cmddata->use_dynamic_ast) {
 					main_seg_time = seg_time;
 				} else {
@@ -311,18 +308,20 @@
 				}
 			}
 
-			//printf time at which we generate MPD
-			t = seg_time.time / 1000;
-			msecs = (u32) ( (seg_time.time - t*1000) );
+
+			t = (seg_time.ntpts >> 32) - GF_NTP_SEC_1900_TO_1970;
+			msecs = (u32) ( (seg_time.ntpts & 0xFFFFFFFF) * (1000.0/0xFFFFFFFF) );
 			ast_time = *gmtime(&t);
-			strftime(availability_start_time, 64, "%Y-%m-%dT%H:%M:%S", &ast_time);
-			fprintf(stdout, "Generating MPD at %s.%d\n", availability_start_time, msecs);
+			fprintf(stdout, "Generating MPD at %d-%02d-%02dT%02d:%02d:%02d.%03dZ\n", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs);
 
-			t = main_seg_time.time / 1000;
-			msecs = (u32) ( (main_seg_time.time - t*1000) );
+			t = (main_seg_time.ntpts >> 32) - GF_NTP_SEC_1900_TO_1970;
+			if (cmddata->ast_offset>0) {
+				t += cmddata->ast_offset/1000;
+			}
+			msecs = (u32) ( (main_seg_time.ntpts & 0xFFFFFFFF) * (1000.0/0xFFFFFFFF) );
 			ast_time = *gmtime(&t);
-			sprintf(availability_start_time, "%d-%02d-%02dT%02d:%02d:%02d.%d", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs);
-			fprintf(stdout, "StartTime: %s - startNumber %d - last number %d\n", availability_start_time, main_seg_time.segnum, seg_time.segnum);
+			sprintf(availability_start_time, "%d-%02d-%02dT%02d:%02d:%02d.%03dZ", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs);
+			fprintf(stdout, "StartTime: %s - startNumber %d - last number %d\n", availability_start_time, main_seg_time.segnum+1, seg_time.segnum+1);
 
 			if (cmddata->time_shift != -1) {
 				int ts, h, m, s;
@@ -334,7 +333,7 @@
 				snprintf(time_shift, sizeof(time_shift), "timeShiftBufferDepth=\"PT%02dH%02dM%02dS\"", h, m, s);
 			}
 
-			dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, main_seg_time.segnum, cmddata->ast_offset);
+			dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, main_seg_time.segnum+1, cmddata->ast_offset);
 		}
 	} else {
 
@@ -362,7 +361,7 @@
 			fprintf(stdout, "Duration: %s\n", presentation_duration);
 		}
 
-		dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, 0, cmddata->ast_offset);
+		dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, 1, cmddata->ast_offset);
 	}
 
 	return 0;
@@ -416,7 +415,7 @@
 		}
 	}
 
-	return 0;
+	return GF_FALSE;
 }
 
 Bool dasher_thread(void *params)
@@ -544,7 +543,7 @@
 //
 //	}
 
-	return 0;
+	return GF_FALSE;
 }
 
 static u32 keyboard_thread(void *params)
@@ -752,10 +751,11 @@
 	segtime time_at_segment_start;
 	VideoMuxerType muxer_type = VIDEO_MUXER;
 	VideoThreadParam *thread_params = (VideoThreadParam*)params;
-
+	u32 sec, frac;
+	Bool init_mpd = GF_FALSE;
 	CmdData *in_data = thread_params->in_data;
 	int video_conf_idx = thread_params->video_conf_idx;
-	VideoDataConf *video_data_conf = gf_list_get(in_data->video_lst, video_conf_idx);
+	VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(in_data->video_lst, video_conf_idx);
 
 	VideoScaledData *video_scaled_data = thread_params->video_scaled_data;
 	int video_cb_size = (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) ? 1 : VIDEO_CB_DEFAULT_SIZE;
@@ -804,6 +804,12 @@
 		return -1;
 	}
 
+	if (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) {
+		init_mpd = GF_TRUE;
+	}
+
+
+	time_at_segment_start.ntpts = 0;
 	start_utc = gf_net_get_utc();
 	seg_utc = 0;
 	while (1) {
@@ -811,19 +817,47 @@
 		//log time at segment start, because segment availabilityStartTime is computed from AST anchor + segment duration
 		//logging at the end of the segment production will induce one segment delay
 		time_at_segment_start.segnum = seg_nb;
-		time_at_segment_start.time = gf_net_get_utc();
+		time_at_segment_start.utc_time = gf_net_get_utc();
+		gf_net_get_ntp(&sec, &frac);
+
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
+			if (time_at_segment_start.ntpts) {
+				u32 ref_sec, ref_frac;
+				Double tr, t;
+				ref_sec = (time_at_segment_start.ntpts>>32) & 0xFFFFFFFFULL;
+				ref_frac = (u32) (time_at_segment_start.ntpts & 0xFFFFFFFFULL);
+				tr = ref_sec * 1000.0;
+				tr += ref_frac*1000.0 /0xFFFFFFFF;
+				t = sec * 1000.0;
+				t += frac*1000.0 /0xFFFFFFFF;
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] NTP diff since last segment start in msec is %f\n", t - tr));
 
-		if (dc_video_muxer_open(&out_file, in_data->out_dir, video_data_conf->filename, seg_nb) < 0) {
+			}
+		}
+#endif
+
+		time_at_segment_start.ntpts = sec;
+		time_at_segment_start.ntpts <<= 32;
+		time_at_segment_start.ntpts |= frac;
+
+		//force writing MPD before any encoding happens (eg don't wait for the end of the first segment)
+		if (init_mpd) {
+			init_mpd = GF_FALSE;
+			dc_message_queue_put(mq, &time_at_segment_start, sizeof(time_at_segment_start));
+		}
+
+		assert(! out_file.segment_started);
+
+		if (dc_video_muxer_open(&out_file, in_data->out_dir, video_data_conf->filename, seg_nb+1) < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video file.\n"));
 			in_data->exit_signal = 1;
 			return -1;
 		}
 //		fprintf(stdout, "Header size: %d\n", ret);
 		while (1) {
-//			if (seg_frame_max > 0) {
-//				if (frame_nb == seg_frame_max)
-//					break;
-//			}
+			u64 ntpts = gf_net_get_ntp_ts();
+
 			//we have the RAP already encoded, skip coder
 			if (loss_state == 2) {
 				ret = 1;
@@ -845,13 +879,14 @@
 
 			if (ret > 0) {
 				int r;
+
 				/*resync at first RAP: flush current broken segment and restart next one on rap*/
 				if ((loss_state==1) && out_file.codec_ctx->coded_frame->key_frame) {
 					loss_state = 2;
 					break;
 				}
 
-				r = dc_video_muxer_write(&out_file, frame_nb, in_data->insert_utc);
+				r = dc_video_muxer_write(&out_file, frame_nb, in_data->insert_utc ? ntpts : 0);
 				if (r < 0) {
 					quit = 1;
 					in_data->exit_signal = 1;
@@ -884,7 +919,6 @@
 			int seg_diff;
 			seg_utc = gf_net_get_utc();
 			diff = (int) (seg_utc - start_utc);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[video_encoder] UTC diff %d - cumulated segment duration %d -> %d\n", diff, (seg_nb+1) * real_video_seg_dur, diff - (seg_nb+1) * real_video_seg_dur));
 
 			//if seg UTC is after next segment UTC (current ends at seg_nb+1, next at seg_nb+2), adjust numbers
 			if (diff > (seg_nb+2) * real_video_seg_dur) {
@@ -895,7 +929,7 @@
 
 					//do a rough estimate of losses to adjust timing...
 					if (! in_data->use_source_timing) {
-						out_file.first_dts += out_file.codec_ctx->time_base.den;
+						out_file.first_dts_in_fragment += out_file.codec_ctx->time_base.den;
 					}
 				}
 				//wait for RAP to cut next segment
@@ -970,7 +1004,7 @@
 
 	CmdData *in_data = thread_params->in_data;
 	int audio_conf_idx = thread_params->audio_conf_idx;
-	AudioDataConf *audio_data_conf = gf_list_get(in_data->audio_lst, audio_conf_idx);
+	AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_get(in_data->audio_lst, audio_conf_idx);
 
 	AudioInputData *audio_input_data = thread_params->audio_input_data;
 	AudioOutputFile audio_output_file;
@@ -1016,7 +1050,7 @@
 	while (1) {
 		frame_nb = 0;
 		quit = 0;
-		if (dc_audio_muxer_open(&audio_output_file, in_data->out_dir, audio_data_conf->filename, seg_nb) < 0) {
+		if (dc_audio_muxer_open(&audio_output_file, in_data->out_dir, audio_data_conf->filename, seg_nb+1) < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio.\n"));
 			in_data->exit_signal = 1;
 			return -1;
@@ -1102,7 +1136,7 @@
 				}
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[audio_encoder] UTC diff %d - cumulated segment duration %d -> %d\n", diff, (seg_nb+1) * real_audio_seg_dur, diff - (seg_nb+1) * real_audio_seg_dur));
 				t.segnum = seg_nb;
-				t.time = gf_net_get_utc();
+				t.utc_time = gf_net_get_utc();
 				//time_t t = time(NULL);
 				dc_message_queue_put(mq, &t, sizeof(t));
 			}
@@ -1155,7 +1189,7 @@
 
 	//Video parameters
 	VideoThreadParam vdecoder_th_params;
-	VideoThreadParam *vencoder_th_params = alloca(gf_list_count(in_data->video_lst) * sizeof(VideoThreadParam));
+	VideoThreadParam *vencoder_th_params = (VideoThreadParam*)alloca(gf_list_count(in_data->video_lst) * sizeof(VideoThreadParam));
 	VideoInputData video_input_data;
 	VideoInputFile *video_input_file[MAX_SOURCE_NUMBER];
 	VideoScaledDataList video_scaled_data_list;
@@ -1163,7 +1197,7 @@
 
 	//Audio parameters
 	AudioThreadParam adecoder_th_params;
-	AudioThreadParam *aencoder_th_params = alloca(gf_list_count(in_data->audio_lst) * sizeof(AudioThreadParam));
+	AudioThreadParam *aencoder_th_params = (AudioThreadParam*)alloca(gf_list_count(in_data->audio_lst) * sizeof(AudioThreadParam));
 	AudioInputData audio_input_data;
 	AudioInputFile audio_input_file;
 
@@ -1182,7 +1216,7 @@
 	dc_register_libav();
 
 	for (i = 0; i < MAX_SOURCE_NUMBER; i++)
-		video_input_file[i] = gf_malloc(sizeof(VideoInputFile));
+		video_input_file[i] = (VideoInputFile*)gf_malloc(sizeof(VideoInputFile));
 
 	dc_message_queue_init(&mq);
 	dc_message_queue_init(&delete_seg_mq);
@@ -1198,7 +1232,7 @@
 
 	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
 		dc_video_scaler_list_init(&video_scaled_data_list, in_data->video_lst);
-		vscaler_th_params = gf_malloc(video_scaled_data_list.size * sizeof(VideoThreadParam));
+		vscaler_th_params = (VideoThreadParam*)gf_malloc(video_scaled_data_list.size * sizeof(VideoThreadParam));
 
 		/* Open input video */
 		if (dc_video_decoder_open(video_input_file[0], &in_data->video_data_conf, in_data->mode, in_data->no_loop, video_scaled_data_list.size) < 0) {
@@ -1216,7 +1250,7 @@
 
 		/* open other input videos for source switching */
 		for (i = 0; i < gf_list_count(in_data->vsrc); i++) {
-			VideoDataConf *video_data_conf = gf_list_get(in_data->vsrc, i);
+			VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(in_data->vsrc, i);
 			if (dc_video_decoder_open(video_input_file[i + 1], video_data_conf, LIVE_MEDIA, 1, video_scaled_data_list.size) < 0) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input video.\n"));
 				ret = -1;
@@ -1293,14 +1327,14 @@
 
 	//Communication between decoder and audio encoder
 	for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
-		AudioDataConf *tmadata = gf_list_get(in_data->audio_lst, i);
+		AudioDataConf *tmadata = (AudioDataConf*)gf_list_get(in_data->audio_lst, i);
 		tmadata->channels = in_data->audio_data_conf.channels;
 		tmadata->samplerate = in_data->audio_data_conf.samplerate;
 	}
 
 	//Communication between decoder and video encoder
 	for (i = 0; i < gf_list_count(in_data->video_lst); i++) {
-		VideoDataConf *tmvdata = gf_list_get(in_data->video_lst, i);
+		VideoDataConf *tmvdata = (VideoDataConf*)gf_list_get(in_data->video_lst, i);
 		tmvdata->framerate = in_data->video_data_conf.framerate;
 		if (in_data->use_source_timing) {
 			tmvdata->time_base = in_data->video_data_conf.time_base;
@@ -1324,7 +1358,7 @@
 	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
 		/* Create video encoder threads */
 		for (i=0; i<gf_list_count(in_data->video_lst); i++) {
-			VideoDataConf * video_data_conf = gf_list_get(in_data->video_lst, i);
+			VideoDataConf * video_data_conf = (VideoDataConf*)gf_list_get(in_data->video_lst, i);
 
 			vencoder_th_params[i].in_data = in_data;
 			vencoder_th_params[i].video_conf_idx = i;

v0.5.2.tar.gz/applications/dashcast/dashcast.c -> v0.6.1.tar.gz/applications/dashcast/dashcast.c Changed

v0.5.2.tar.gz/applications/dashcast/message_queue.c -> v0.6.1.tar.gz/applications/dashcast/message_queue.c Changed

v0.5.2.tar.gz/applications/dashcast/register.c -> v0.6.1.tar.gz/applications/dashcast/register.c Changed

v0.5.2.tar.gz/applications/dashcast/task.c -> v0.6.1.tar.gz/applications/dashcast/task.c Changed

v0.5.2.tar.gz/applications/dashcast/video_data.c -> v0.6.1.tar.gz/applications/dashcast/video_data.c Changed

v0.5.2.tar.gz/applications/dashcast/video_data.h -> v0.6.1.tar.gz/applications/dashcast/video_data.h Changed

v0.5.2.tar.gz/applications/dashcast/video_decoder.c -> v0.6.1.tar.gz/applications/dashcast/video_decoder.c Changed

@@ -91,6 +91,16 @@
 
 	video_input_file->av_fmt_ctx = NULL;
 
+	if (video_data_conf->demux_buffer_size) {
+		char szBufSize[100];
+		sprintf(szBufSize, "%d", video_data_conf->demux_buffer_size);
+		ret = av_dict_set(&options, "buffer_size", szBufSize, 0);
+		if (ret < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set demuxer's input buffer size.\n"));
+			return -1;
+		}
+	}
+
 	/* Open video */
 	open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, options ? &options : NULL);
 	if ( (open_res < 0) && !stricmp(video_data_conf->filename, "screen-capture-recorder") ) {
@@ -156,7 +166,14 @@
 	video_input_file->sar = codec_ctx->sample_aspect_ratio;
 
 	video_input_file->pix_fmt = codec_ctx->pix_fmt;
-	if (video_data_conf->framerate >= 0 && codec_ctx->time_base.num) {
+	if (codec_ctx->time_base.num==1) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("AVCTX give frame duration of %d/%d - keeping requested rate %d, but this may result in unexpected behaviour.\n", codec_ctx->time_base.num, codec_ctx->time_base.den, video_data_conf->framerate ));
+
+		if (codec_ctx->time_base.den==1000000) {
+			codec_ctx->time_base.num = codec_ctx->time_base.den / video_data_conf->framerate;
+		}
+	}
+	else if (video_data_conf->framerate >= 0 && codec_ctx->time_base.num) {
 		video_data_conf->framerate = codec_ctx->time_base.den / codec_ctx->time_base.num;
 	}
 	if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
@@ -177,7 +194,7 @@
 	}
 
 	if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Invalid input framerate.\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Invalid input framerate %d (AVCTX timebase is %d/%d).\n", video_data_conf->framerate, codec_ctx->time_base.num, codec_ctx->time_base.den));
 		return -1;
 	}
 
@@ -270,16 +287,21 @@
 
 		/* Is this a packet from the video stream? */
 		if (packet.stream_index == video_input_file->vstream_idx) {
-			if (!already_locked) {
+			u32 nb_retry = 10;
+			while (!already_locked) {
 				if (dc_producer_lock(&video_input_data->producer, &video_input_data->circular_buf) < 0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[dashcast] Live system dropped a video frame\n"));
+					if (!nb_retry) break;
+					gf_sleep(10);
+					nb_retry--;
 					continue;
 				}
-
 				dc_producer_unlock_previous(&video_input_data->producer, &video_input_data->circular_buf);
-
 				already_locked = 1;
 			}
+			if (!already_locked) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[dashcast] Live system dropped a video frame\n"));
+				continue;
+			}
 
 			video_data_node = (VideoDataNode *) dc_producer_produce(&video_input_data->producer, &video_input_data->circular_buf);
 			video_data_node->source_number = source_number;
@@ -308,30 +330,48 @@
 						video_input_file->pts_init = 1;
 						video_input_file->utc_at_init = gf_net_get_utc();
 						video_input_file->first_pts = packet.pts;
-						video_input_file->computed_pts = 0;
-						video_input_data->frame_duration = codec_ctx->time_base.num;
-						video_input_file->sync_tolerance = 9*video_input_data->frame_duration/5;
-						//TODO - check with audio if sync is OK
+						video_input_file->prev_pts = 0;
+						video_input_data->frame_duration = 0;
 					}
-					//perform FPS re-linearisation
-					pts = packet.pts - video_input_file->first_pts;
-					if (pts - video_input_file->prev_pts > video_input_file->sync_tolerance) {
-						u32 nb_lost=0;
-						while (pts > video_input_file->computed_pts) {
-							video_input_file->computed_pts += video_input_data->frame_duration;
-							nb_lost++;
+					if (video_input_file->pts_init && (video_input_file->pts_init!=3) ) {
+						if (packet.pts==AV_NOPTS_VALUE) {
+							video_input_file->pts_init=1;
+						} else if (video_input_file->pts_init==1) {
+							video_input_file->pts_init=2;
+							video_input_file->pts_dur_estimate = packet.pts;
+						} else if (video_input_file->pts_init==2) {
+							video_input_file->pts_init=3;
+							video_input_data->frame_duration = packet.pts - video_input_file->pts_dur_estimate;
+							video_input_file->sync_tolerance = 9*video_input_data->frame_duration/5;
+							//TODO - check with audio if sync is OK
 						}
+					}
 
-						if (nb_lost) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DashCast] Capture lost %d video frames \n", nb_lost));
-						}
+					//move to 0-based PTS
+					if (packet.pts!=AV_NOPTS_VALUE) {
+						pts = packet.pts - video_input_file->first_pts;
+					} else {
+						pts = video_input_file->prev_pts + video_input_data->frame_duration;
 					}
 
-//					fprintf(stdout, "Capture PTS %g - UTC diff %g - Computed PTS %g\n", (Double) pts / codec_ctx->time_base.den, (Double) (gf_net_get_utc() - video_input_file->utc_at_init) / 1000, (Double) video_input_file->computed_pts / codec_ctx->time_base.den);
+					//check for drop frames
+#ifndef GPAC_DISABLE_LOG
+					if (0 && gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_WARNING)) {
+						if (pts - video_input_file->prev_pts > video_input_file->sync_tolerance) {
+							u32 nb_lost=0;
+							while (video_input_file->prev_pts + video_input_data->frame_duration + video_input_file->sync_tolerance < pts) {
+								video_input_file->prev_pts += video_input_data->frame_duration;
+								nb_lost++;
+							}
+							if (nb_lost) {
+								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DashCast] Capture lost %d video frames \n", nb_lost));
+							}
+						}
+					}
+#endif
 
 					video_input_file->prev_pts = pts;
-					video_data_node->vframe->pts = video_input_file->computed_pts;
-					video_input_file->computed_pts += video_input_data->frame_duration;
+					video_data_node->vframe->pts = pts;
 				}
 
 				if (video_data_node->vframe->pts==AV_NOPTS_VALUE) {
@@ -343,7 +383,7 @@
 				}
 				video_input_file->frame_decoded++;
 
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Video Frame TS "LLU" decoded at UTC "LLU" ms\n", video_data_node->vframe->pts, gf_net_get_utc() ));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DashCast] Video Frame TS "LLU" decoded at UTC "LLU" ms\n", video_data_node->vframe->pts, gf_net_get_utc() ));
 
 				// For a decode/encode process we must free this memory.
 				//But if the input is raw and there is no need to decode then

v0.5.2.tar.gz/applications/dashcast/video_decoder.h -> v0.6.1.tar.gz/applications/dashcast/video_decoder.h Changed

v0.5.2.tar.gz/applications/dashcast/video_encoder.c -> v0.6.1.tar.gz/applications/dashcast/video_encoder.c Changed

@@ -130,8 +130,12 @@
 		build_dict(video_output_file->codec_ctx->priv_data, video_data_conf->custom);
 	} else if (video_data_conf->low_delay) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video Encoder: applying default options (preset=ultrafast tune=zerolatency)\n"));
+		av_opt_set(video_output_file->codec_ctx->priv_data, "vprofile", "baseline", 0);
 		av_opt_set(video_output_file->codec_ctx->priv_data, "preset", "ultrafast", 0);
 		av_opt_set(video_output_file->codec_ctx->priv_data, "tune", "zerolatency", 0);
+		if (strstr(video_data_conf->codec, "264")) {
+			av_opt_set(video_output_file->codec_ctx->priv_data, "x264opts", "no-mbtree:sliced-threads:sync-lookahead=0", 0);
+		}
 	}
 
 	if (video_output_file->gdr) {
@@ -188,10 +192,24 @@
 		pkt.data = video_output_file->vbuf;
 		pkt.size = video_output_file->vbuf_size;
 		pkt.pts = pkt.dts = video_data_node->vframe->pkt_dts = video_data_node->vframe->pkt_pts = video_data_node->vframe->pts;
+		video_data_node->vframe->pict_type = 0;
+		video_data_node->vframe->width = video_codec_ctx->width;
+		video_data_node->vframe->height = video_codec_ctx->height;
+		video_data_node->vframe->format = video_codec_ctx->pix_fmt;
+
+
 #ifdef LIBAV_ENCODE_OLD
+		if (!video_output_file->segment_started)
+			video_data_node->vframe->pict_type = FF_I_TYPE;
+
 		video_output_file->encoded_frame_size = avcodec_encode_video(video_codec_ctx, video_output_file->vbuf, video_output_file->vbuf_size, video_data_node->vframe);
 		got_packet = video_output_file->encoded_frame_size>=0 ? 1 : 0;
 #else
+		//this is correct but unfortunately doesn't work with some versions of FFMPEG (output is just grey video ...)
+
+		if (!video_output_file->segment_started)
+			video_data_node->vframe->pict_type = AV_PICTURE_TYPE_I;
+
 		video_output_file->encoded_frame_size = avcodec_encode_video2(video_codec_ctx, &pkt, video_data_node->vframe, &got_packet);
 #endif
 
@@ -222,7 +240,7 @@
 		return -1;
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Video %s Frame TS "LLU" encoded at UTC "LLU" ms\n", video_output_file->rep_id, /*video_data_node->source_number, */video_data_node->vframe->pts, gf_net_get_utc() ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DashCast] Video %s Frame TS "LLU" encoded at UTC "LLU" ms\n", video_output_file->rep_id, /*video_data_node->source_number, */video_data_node->vframe->pts, gf_net_get_utc() ));
 
 	/* if zero size, it means the image was buffered */
 //	if (out_size > 0) {

v0.5.2.tar.gz/applications/dashcast/video_muxer.c -> v0.6.1.tar.gz/applications/dashcast/video_muxer.c Changed

@@ -45,7 +45,7 @@
 	GF_BitStream *bs;
 	if (!extradata || (extradata_size < sizeof(u32)))
 		return GF_BAD_PARAM;
-	bs = gf_bs_new(extradata, extradata_size, GF_BITSTREAM_READ);
+	bs = gf_bs_new((const char *) extradata, extradata_size, GF_BITSTREAM_READ);
 	if (!bs)
 		return GF_BAD_PARAM;
 	if (gf_bs_read_u32(bs) != 0x00000001) {
@@ -150,13 +150,13 @@
 	return GF_OK;
 #else
 	HEVCState hevc;
-	GF_HEVCParamArray *vpss = NULL, *spss = NULL, *ppss = NULL;
+	GF_HEVCParamArray *vpss = NULL, *spss = NULL, *ppss = NULL, *seis = NULL;
 	GF_BitStream *bs;
 	char *buffer = NULL;
 	u32 buffer_size = 0;
 	if (!extradata || (extradata_size < sizeof(u32)))
 		return GF_BAD_PARAM;
-	bs = gf_bs_new(extradata, extradata_size, GF_BITSTREAM_READ);
+	bs = gf_bs_new((const char *) extradata, extradata_size, GF_BITSTREAM_READ);
 	if (!bs)
 		return GF_BAD_PARAM;
 
@@ -167,11 +167,19 @@
 		s32 idx;
 		GF_AVCConfigSlot *slc;
 		u8 nal_unit_type, temporal_id, layer_id;
-		u64 nal_start;
+		u64 nal_start, start_code;
 		u32 nal_size;
 
-		if (gf_bs_read_u32(bs) != 0x00000001) {
+		start_code = gf_bs_read_u32(bs);
+		if (start_code>>8 == 0x000001) {
+			nal_start = gf_bs_get_position(bs) - 1;
+			gf_bs_seek(bs, nal_start);
+			start_code = 1;
+		}
+		if (start_code != 0x00000001) {
 			gf_bs_del(bs);
+			if (buffer) gf_free(buffer);
+			if (vpss && spss && ppss) return GF_OK;
 			return GF_BAD_PARAM;
 		}
 		nal_start = gf_bs_get_position(bs);
@@ -307,6 +315,20 @@
 				gf_list_add(ppss->nalus, slc);
 			}
 			break;
+		case GF_HEVC_NALU_SEI_PREFIX:
+			if (!seis) {
+				GF_SAFEALLOC(seis, GF_HEVCParamArray);
+				seis->nalus = gf_list_new();
+				seis->array_completeness = 0;
+				seis->type = GF_HEVC_NALU_SEI_PREFIX;
+			}
+			slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			slc->size = nal_size;
+			slc->id = idx;
+			slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+			memcpy(slc->data, buffer, sizeof(char)*slc->size);
+			gf_list_add(seis->nalus, slc);
+			break;
 		default:
 			break;
 		}
@@ -318,12 +340,14 @@
 	}
 
 	gf_bs_del(bs);
-	gf_free(buffer);
+	if (buffer) gf_free(buffer);
 
 	return GF_OK;
 #endif
 }
 
+#ifndef GPAC_DISABLE_ISOM
+
 static GF_Err dc_gpac_video_write_config(VideoOutputFile *video_output_file, u32 *di, u32 track) {
 	GF_Err ret;
 	if (video_output_file->codec_ctx->codec_id == CODEC_ID_H264) {
@@ -443,15 +467,13 @@
 		return -1;
 	}
 
-	//gf_isom_add_track_to_root_od(video_output_file->isof,1);
-
 	ret = gf_isom_finalize_for_fragment(video_output_file->isof, track);
 	if (ret != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	ret = gf_media_get_rfc_6381_codec_name(video_output_file->isof, track, video_output_file->video_data_conf->codec6381);
+	ret = gf_media_get_rfc_6381_codec_name(video_output_file->isof, track, video_output_file->video_data_conf->codec6381, GF_FALSE, GF_FALSE);
 	if (ret != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
 		return -1;
@@ -468,16 +490,6 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_start_segment\n", gf_error_to_string(ret)));
 		return -1;
 	}
-
-//	ret = gf_isom_set_traf_base_media_decode_time(video_output_file->isof, 1,
-//			video_output_file->first_dts);
-//	if (ret != GF_OK) {
-//		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_traf_base_media_decode_time\n", gf_error_to_string(ret)));
-//		return -1;
-//	}
-//
-//	video_output_file->first_dts += video_output_file->frame_per_segment;
-
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Opening new segment %s at UTC "LLU" ms\n", filename, gf_net_get_utc() ));
 	return 0;
 }
@@ -569,9 +581,12 @@
 	return 0;
 }
 
+#endif
+
+
 int dc_raw_h264_open(VideoOutputFile *video_output_file, char *filename)
 {
-	video_output_file->file = fopen(filename, "w");
+	video_output_file->file = gf_fopen(filename, "w");
 	return 0;
 }
 
@@ -583,7 +598,7 @@
 
 int dc_raw_h264_close(VideoOutputFile *video_output_file)
 {
-	fclose(video_output_file->file);
+	gf_fclose(video_output_file->file);
 	return 0;
 }
 
@@ -720,8 +735,11 @@
 	snprintf(name, sizeof(name), "video encoder %s", video_data_conf->filename);
 	dc_consumer_init(&video_output_file->consumer, video_cb_size, name);
 
+#ifndef GPAC_DISABLE_ISOM
 	video_output_file->sample = gf_isom_sample_new();
 	video_output_file->isof = NULL;
+#endif
+
 	video_output_file->muxer_type = muxer_type;
 
 	video_output_file->frame_per_segment = frame_per_segment;
@@ -740,12 +758,13 @@
 
 int dc_video_muxer_free(VideoOutputFile *video_output_file)
 {
+#ifndef GPAC_DISABLE_ISOM
 	if (video_output_file->isof != NULL) {
 		gf_isom_close(video_output_file->isof);
 	}
 
 	gf_isom_sample_del(&video_output_file->sample);
-
+#endif
 	return 0;
 }
 
@@ -760,15 +779,16 @@
 	case RAW_VIDEO_H264:
 		snprintf(name, sizeof(name), "%s/%s_%d.264", directory, id_name, seg);
 		return dc_raw_h264_open(video_output_file, name);
+#ifndef GPAC_DISABLE_ISOM
 	case GPAC_VIDEO_MUXER:
 		snprintf(name, sizeof(name), "%s/%s_%d_gpac.mp4", directory, id_name, seg);
 		dc_gpac_video_moov_create(video_output_file, name);
 		return dc_gpac_video_isom_open_seg(video_output_file, NULL);
 	case GPAC_INIT_VIDEO_MUXER_AVC1:
-		if (seg == 0) {
+		if (seg == 1) {
 			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
 			dc_gpac_video_moov_create(video_output_file, name);
-			video_output_file->first_dts = 0;
+			video_output_file->first_dts_in_fragment = 0;
 		}
 		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
 		return dc_gpac_video_isom_open_seg(video_output_file, name);
@@ -776,10 +796,11 @@
 		if (seg == 0) {
 			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
 			dc_gpac_video_moov_create(video_output_file, name);
-			video_output_file->first_dts = 0;
+			video_output_file->first_dts_in_fragment = 0;
 		}
 		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
 		return dc_gpac_video_isom_open_seg(video_output_file, name);
+#endif
 	default:
 		return GF_BAD_PARAM;
 	};
@@ -787,49 +808,55 @@
 	return -2;
 }
 
-int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, Bool insert_utc)
+int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, u64 ntp_timestamp)
 {
-	u64 frame_dur;
-	GF_Err ret;
+	Bool segment_close = GF_FALSE;
+	Bool fragment_close = GF_FALSE;
 	switch (video_output_file->muxer_type) {
 	case FFMPEG_VIDEO_MUXER:
 		return dc_ffmpeg_video_muxer_write(video_output_file);
 	case RAW_VIDEO_H264:
 		return dc_raw_h264_write(video_output_file);
+#ifndef GPAC_DISABLE_ISOM
 	case GPAC_VIDEO_MUXER:
 	case GPAC_INIT_VIDEO_MUXER_AVC1:
 	case GPAC_INIT_VIDEO_MUXER_AVC3:
 		if (video_output_file->use_source_timing) {
+			GF_Err ret;
 			if (!video_output_file->fragment_started) {
 				video_output_file->fragment_started = 1;
 				ret = gf_isom_start_fragment(video_output_file->isof, 1);
 				if (ret < 0)
 					return -1;
 
-				video_output_file->first_dts = video_output_file->codec_ctx->coded_frame->pkt_dts;
+				//insert UTC for each fragment
+				if (ntp_timestamp) {
+					gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, ntp_timestamp, video_output_file->codec_ctx->coded_frame->pts);
+				}
+
+				video_output_file->first_dts_in_fragment = video_output_file->codec_ctx->coded_frame->pkt_dts;
 				if (!video_output_file->segment_started) {
-					u32 sec, frac;
-					u64 ntpts;
 					video_output_file->pts_at_segment_start = video_output_file->codec_ctx->coded_frame->pts;
 					video_output_file->segment_started = 1;
+					if (!video_output_file->nb_segments) {
+						video_output_file->pts_at_first_segment = video_output_file->pts_at_segment_start;
+					}
 
-					if (insert_utc) {
-						gf_net_get_ntp(&sec, &frac);
-						ntpts = sec;
-						ntpts <<= 32;
-						ntpts |= frac;
-						gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, ntpts, video_output_file->pts_at_segment_start);
+#ifndef GPAC_DISABLE_LOG
+					if (ntp_timestamp && gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
+						if (!video_output_file->ntp_at_first_dts) {
+							video_output_file->ntp_at_first_dts = ntp_timestamp;
+						} else {
+							s32 ntp_diff = gf_net_get_ntp_diff_ms(video_output_file->ntp_at_first_dts);
+							s32 ts_diff = (s32) ( 1000 * (video_output_file->codec_ctx->coded_frame->pts - video_output_file->pts_at_first_segment) / video_output_file->timescale );
+
+							s32 diff_ms = ts_diff - ntp_diff;
+							GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Video Segment start NTP diff: %d ms TS diff: %d ms drift: %d ms\n", ntp_diff, ts_diff, diff_ms));
+						}
 					}
+#endif
 				}
-				gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts);
-			}
-
-			//keep track of previous frame dur and use last dur as the default duration for next sample
-			//this works fine because we perform frame rate regulation at the capture stage
-			frame_dur = video_output_file->codec_ctx->coded_frame->pts - video_output_file->last_pts;
-			if (frame_dur && (video_output_file->frame_dur>(u32) frame_dur)) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("New frame dur detected: %d vs %d old\n", (u32) frame_dur, (u32) video_output_file->frame_dur));
-				video_output_file->frame_dur = (u32)frame_dur;
+				gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts_in_fragment);
 			}
 
 			if (dc_gpac_video_isom_write(video_output_file) < 0) {
@@ -837,62 +864,63 @@
 			}
 			video_output_file->last_pts = video_output_file->codec_ctx->coded_frame->pts;
 			video_output_file->last_dts = video_output_file->codec_ctx->coded_frame->pkt_dts;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DashCast] PTS: "LLU", DTS: "LLU", first DTS in frag: "LLU", timescale: %d, frag dur: %d\n", video_output_file->last_pts, video_output_file->last_dts, video_output_file->first_dts_in_fragment, video_output_file->timescale, video_output_file->frag_dur));
 
-			if (( video_output_file->last_dts - video_output_file->first_dts + video_output_file->frame_dur) * 1000 >= video_output_file->frag_dur * video_output_file->timescale) {
-				gf_isom_flush_fragments(video_output_file->isof, 1);
+			//we may have rounding errors on the input PTS :( add half frame dur safety
+			//flush segments based on the cumultated duration , to avoid drift
+			/* Check why segment tests work on PTS while fragment tests work on DTS ? */
+			/* Check why fragment closing is not tested based on accumulation of fragment duration to avoid drifts */
+			segment_close = ((video_output_file->last_pts - video_output_file->pts_at_first_segment + video_output_file->frame_dur) * 1000 >=
+			 (video_output_file->nb_segments+1)*video_output_file->seg_dur * (u64)video_output_file->timescale);
+#if 0
+			segment_close = ((video_output_file->last_pts - video_output_file->pts_at_segment_start + 3*video_output_file->frame_dur/2) * 1000 >=
+			 (video_output_file->seg_dur * (u64)video_output_file->timescale);
+#endif
+			 fragment_close = ((video_output_file->last_dts - video_output_file->first_dts_in_fragment + video_output_file->frame_dur) * 1000 >=
+			 (video_output_file->frag_dur * (u64)video_output_file->timescale));
+
+			if (segment_close || fragment_close) {
+			gf_isom_flush_fragments(video_output_file->isof, 1);
 				video_output_file->fragment_started = 0;
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Flushed fragment to disk at UTC "LLU" ms - last coded frame PTS %d\n", gf_net_get_utc(), video_output_file->codec_ctx->coded_frame->pts));
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Flushed fragment at UTC "LLU" ms - First DTS "LLU" last PTS "LLU" - First Segment PTS "LLU" timescale %d\n", gf_net_get_utc(), video_output_file->first_dts_in_fragment, video_output_file->codec_ctx->coded_frame->pts, video_output_file->pts_at_segment_start, video_output_file->timescale));
 			}
 
-			//we may have rounding errors on the input PTS :( add half frame dur safety
-			if (1000 * ( video_output_file->last_pts - video_output_file->pts_at_segment_start + 3*video_output_file->frame_dur/2) /video_output_file->timescale >= video_output_file->seg_dur ) {
-				return 1;
-			}
-			return 0;
+			if (segment_close) {
+			return 1;
 		}
+		return 0;
+	}
 
-		if (frame_nb % video_output_file->frame_per_fragment == 0) {
+	if (frame_nb % video_output_file->frame_per_fragment == 0) {
 			gf_isom_start_fragment(video_output_file->isof, 1);
 
 			if (!video_output_file->segment_started) {
-				u32 sec, frac;
-				u64 ntpts;
-
 				video_output_file->pts_at_segment_start = video_output_file->codec_ctx->coded_frame->pts;
 				video_output_file->segment_started = 1;
 
-				if (insert_utc) {
-					time_t secs;
-					struct tm t;
-					gf_net_get_ntp(&sec, &frac);
-					ntpts = sec;
-					ntpts <<= 32;
-					ntpts |= frac;
-					gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, ntpts, video_output_file->pts_at_segment_start);
-
-					secs = sec - GF_NTP_SEC_1900_TO_1970;
-					t = *gmtime(&secs);
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Producer reference clock: Timestamp %d matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ (NTP frac part %u) \n", (u32) video_output_file->pts_at_segment_start, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, (u32) frac ));
-
+				if (ntp_timestamp) {
+					gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, ntp_timestamp, video_output_file->pts_at_segment_start);
 				}
 			}
 
 
-			gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts);
-			video_output_file->first_dts += video_output_file->frame_per_fragment;
+			gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts_in_fragment);
+			video_output_file->first_dts_in_fragment += video_output_file->frame_per_fragment;
 		}
 
 		dc_gpac_video_isom_write(video_output_file);
 
 		if (frame_nb % video_output_file->frame_per_fragment == video_output_file->frame_per_fragment - 1) {
 			gf_isom_flush_fragments(video_output_file->isof, 1);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Flushed fragment to disk at UTC "LLU" ms - last coded frame PTS %d\n", gf_net_get_utc(), video_output_file->codec_ctx->coded_frame->pts));
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Flushed fragment to disk at UTC "LLU" ms - last coded frame PTS "LLU"\n", gf_net_get_utc(), video_output_file->codec_ctx->coded_frame->pts));
 		}
 
 		if (frame_nb + 1 == video_output_file->frame_per_segment)
 			return 1;
 
 		return 0;
+#endif
+
 	default:
 		return -2;
 	}
@@ -903,18 +931,21 @@
 int dc_video_muxer_close(VideoOutputFile *video_output_file)
 {
 	video_output_file->fragment_started = video_output_file->segment_started = 0;
+	video_output_file->nb_segments++;
 
 	switch (video_output_file->muxer_type) {
 	case FFMPEG_VIDEO_MUXER:
 		return dc_ffmpeg_video_muxer_close(video_output_file);
 	case RAW_VIDEO_H264:
 		return dc_raw_h264_close(video_output_file);
+#ifndef GPAC_DISABLE_ISOM
 	case GPAC_VIDEO_MUXER:
 		dc_gpac_video_isom_close_seg(video_output_file);
 		return dc_gpac_video_isom_close(video_output_file);
 	case GPAC_INIT_VIDEO_MUXER_AVC1:
 	case GPAC_INIT_VIDEO_MUXER_AVC3:
 		return dc_gpac_video_isom_close_seg(video_output_file);
+#endif
 	default:
 		return -2;
 	}

v0.5.2.tar.gz/applications/dashcast/video_muxer.h -> v0.6.1.tar.gz/applications/dashcast/video_muxer.h Changed

@@ -36,7 +36,6 @@
 
 #include "video_scaler.h"
 
-
 typedef enum {
 	FFMPEG_VIDEO_MUXER,
 	RAW_VIDEO_H264,
@@ -61,8 +60,11 @@
 
 	FILE *file;
 
+#ifndef GPAC_DISABLE_ISOM
 	GF_ISOFile *isof;
 	GF_ISOSample *sample;
+#endif
+
 	u32 trackID;
 	/* Index of the video stream in the file */
 	int vstream_idx;
@@ -80,7 +82,8 @@
 	int seg_dur;
 	int frag_dur;
 
-	u64 first_dts;
+	u64 first_dts_in_fragment;
+	u64 ntp_at_first_dts;
 
 	u32 seg_marker;
 
@@ -89,10 +92,11 @@
 
 	Bool use_source_timing;
 
-	u64 pts_at_segment_start;
+	u64 pts_at_segment_start, pts_at_first_segment;
 	u64 last_pts, last_dts;
 	u64 frame_dur;
 	u32 timescale;
+	u32 nb_segments;
 	Bool fragment_started, segment_started;
 	const char *rep_id;
 } VideoOutputFile;
@@ -103,7 +107,7 @@
 
 int dc_video_muxer_open(VideoOutputFile *video_output_file, char *directory, char *id_name, int seg);
 
-int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, Bool insert_utc);
+int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, u64 ntp_timestamp);
 
 int dc_video_muxer_close(VideoOutputFile *video_output_file);

v0.5.2.tar.gz/applications/dashcast/video_scaler.c -> v0.6.1.tar.gz/applications/dashcast/video_scaler.c Changed

@@ -32,7 +32,7 @@
 
 VideoScaledDataNode * dc_video_scaler_node_create(int width, int height, int crop_x, int crop_y, int pix_fmt)
 {
-	VideoScaledDataNode *video_scaled_data_node = gf_malloc(sizeof(VideoDataNode));
+	VideoScaledDataNode *video_scaled_data_node = (VideoScaledDataNode*)gf_malloc(sizeof(VideoDataNode));
 	if (video_scaled_data_node) {
 		video_scaled_data_node->v_frame = FF_ALLOC_FRAME();
 		if (crop_x || crop_y) {
@@ -92,7 +92,7 @@
 			video_scaled_data->out_height = video_data_conf->height;
 			video_scaled_data->num_consumers = 1;
 
-			video_scaled_data_list->video_scaled_data = gf_realloc(video_scaled_data_list->video_scaled_data, (video_scaled_data_list->size+1)*sizeof(VideoScaledData*));
+			video_scaled_data_list->video_scaled_data = (VideoScaledData**)gf_realloc(video_scaled_data_list->video_scaled_data, (video_scaled_data_list->size+1)*sizeof(VideoScaledData*));
 
 			video_scaled_data_list->video_scaled_data[video_scaled_data_list->size] = video_scaled_data;
 			video_scaled_data_list->size++;

v0.5.2.tar.gz/applications/generators/MPEG4/main.c -> v0.6.1.tar.gz/applications/generators/MPEG4/main.c Changed

@@ -229,7 +229,7 @@
 		}
 	}
 
-	f = fopen(sPath, "wt");
+	f = gf_fopen(sPath, "wt");
 	fprintf(f, "%s\n", cprt);
 
 
@@ -258,7 +258,7 @@
 		}
 		fprintf(f, "\n\n#endif\t\t/*_%s_H*/\n\n", name);
 	}
-	fclose(f);
+	gf_fclose(f);
 }
 
 void TranslateToken(char *token)
@@ -1624,7 +1624,7 @@
 		char szFile[100];
 		FILE *f;
 		sprintf(szFile, "NdtListV%d.html", i+1);
-		f = fopen(szFile, "wt");
+		f = gf_fopen(szFile, "wt");
 
 		fprintf(f, "<html>\n"\
 		 "<head>\n"\
@@ -1684,7 +1684,7 @@
 
 			fprintf(f, "</TABLE>\n");
 		}
-		fclose(f);
+		gf_fclose(f);
 	}
 
 }
@@ -1715,7 +1715,7 @@
 		if (!strcmp(argv[i], "-ndt")) {
 			generate_ndt = 1;
 		} else if (argv[i][0]=='-') {
-			fskip = fopen(argv[i+1], "rt");
+			fskip = gf_fopen(argv[i+1], "rt");
 			if (!fskip) {
 				printf("file %s not found\n", argv[i+1]);
 				return 0;
@@ -1726,10 +1726,10 @@
 	nbVersion=1;
 	while (1) {
 		sprintf(szTempFile, "templates%u.txt", nbVersion);
-		nodes = fopen(szTempFile, "rt");
+		nodes = gf_fopen(szTempFile, "rt");
 		if (!nodes) {
 			sprintf(szTempFile, "template%u.txt", nbVersion);
-			nodes = fopen(szTempFile, "rt");
+			nodes = gf_fopen(szTempFile, "rt");
 		}
 		if (!nodes) break;
 
@@ -1740,7 +1740,7 @@
 		//special case for viewport: it is present in V1 but empty
 		if (nbVersion==1) CheckInTable("SFViewportNode", NDTs);
 		nbVersion++;
-		fclose(nodes);
+		gf_fclose(nodes);
 	}
 	nbVersion--;
 	printf("BIFS tables parsed: %d versions\n", nbVersion);
@@ -1752,7 +1752,7 @@
 
 	if (fskip) {
 		parse_profile(BNodes, fskip);
-		fclose(fskip);
+		gf_fclose(fskip);
 	}
 
 	//write the nodes def

v0.5.2.tar.gz/applications/generators/SVG/html.c -> v0.6.1.tar.gz/applications/generators/SVG/html.c Changed

v0.5.2.tar.gz/applications/generators/SVG/laser.c -> v0.6.1.tar.gz/applications/generators/SVG/laser.c Changed

v0.5.2.tar.gz/applications/generators/SVG/main.c -> v0.6.1.tar.gz/applications/generators/SVG/main.c Changed

v0.5.2.tar.gz/applications/generators/SVG/v3.c -> v0.6.1.tar.gz/applications/generators/SVG/v3.c Changed

@@ -181,23 +181,23 @@
 		if (!strcmp(att->svg_name, "x") || !strcmp(att->svg_name, "y")) {
 			fprintf(output, "\tif (!stricmp(attribute_name, \"%s\")) {\n", att->svg_name);
 			fprintf(output, "\t\tif (element_tag == TAG_SVG_text) return TAG_SVG_ATT_text_%s;\n", att->implementation_name);
-			fprintf(output, "\t\telse if (element_tag == TAG_SVG_cursorManager) return TAG_SVG_ATT_cursorManager_%s;\n", att->svg_name, att->implementation_name);
-			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->svg_name, att->implementation_name);
+			fprintf(output, "\t\telse if (element_tag == TAG_SVG_cursorManager) return TAG_SVG_ATT_cursorManager_%s;\n", att->implementation_name);
+			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->implementation_name);
 			fprintf(output, "\t}\n");
 		} else if (!strcmp(att->svg_name, "rotate")) {
 			fprintf(output, "\tif (!stricmp(attribute_name, \"%s\")) {\n", att->svg_name);
 			fprintf(output, "\t\tif (element_tag == TAG_SVG_text) return TAG_SVG_ATT_text_%s;\n", att->implementation_name);
-			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->svg_name, att->implementation_name);
+			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->implementation_name);
 			fprintf(output, "\t}\n");
 		} else if (!strcmp(att->svg_name, "type")) {
 			fprintf(output, "\tif (!stricmp(attribute_name, \"%s\")) {\n", att->svg_name);
 			fprintf(output, "\t\tif (element_tag == TAG_SVG_animateTransform) return TAG_SVG_ATT_transform_type;\n");
-			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->svg_name, att->implementation_name);
+			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->implementation_name);
 			fprintf(output, "\t}\n");
 		} else if (!strcmp(att->svg_name, "fill")) {
 			fprintf(output, "\tif (!stricmp(attribute_name, \"%s\")) {\n", att->svg_name);
-			fprintf(output, "\t\tif (element_tag == TAG_SVG_animate || element_tag == TAG_SVG_animateColor || element_tag == TAG_SVG_animateMotion || element_tag == TAG_SVG_animateTransform || element_tag == TAG_SVG_animation || element_tag == TAG_SVG_audio || element_tag == TAG_SVG_video || element_tag == TAG_SVG_set) return TAG_SVG_ATT_smil_fill;\n", att->svg_name, att->implementation_name);
-			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->svg_name, att->implementation_name);
+			fprintf(output, "\t\tif (element_tag == TAG_SVG_animate || element_tag == TAG_SVG_animateColor || element_tag == TAG_SVG_animateMotion || element_tag == TAG_SVG_animateTransform || element_tag == TAG_SVG_animation || element_tag == TAG_SVG_audio || element_tag == TAG_SVG_video || element_tag == TAG_SVG_set) return TAG_SVG_ATT_smil_fill;\n");
+			fprintf(output, "\t\telse return TAG_SVG_ATT_%s;\n", att->implementation_name);
 			fprintf(output, "\t}\n");
 		} else {
 			fprintf(output, "\tif (!stricmp(attribute_name, \"%s\")) return TAG_SVG_ATT_%s;\n", att->svg_name, att->implementation_name);

v0.5.2.tar.gz/applications/generators/X3D/main.c -> v0.6.1.tar.gz/applications/generators/X3D/main.c Changed

@@ -180,7 +180,7 @@
 		sprintf(sPath, "..%c..%c..%csrc%cscenegraph%cx3d_nodes.c", GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
 	}
 
-	f = fopen(sPath, "wt");
+	f = gf_fopen(sPath, "wt");
 	fprintf(f, "%s\n", COPYRIGHT);
 
 	{
@@ -203,7 +203,7 @@
 		fprintf(f, "#ifdef __cplusplus\n}\n#endif\n\n");
 		fprintf(f, "\n\n#endif\t\t/*_GF_X3D_NODES_H*/\n\n");
 	}
-	fclose(f);
+	gf_fclose(f);
 }
 
 void TranslateToken(char *token)
@@ -1208,7 +1208,7 @@
 	X3DField *bf;
 	u32 nb_nodes, nb_imp;
 
-	nodes = fopen("templates_X3D.txt", "rt");
+	nodes = gf_fopen("templates_X3D.txt", "rt");
 	if (!nodes) {
 		fprintf(stdout, "cannot open \"templates_X3D.txt\" - aborting\n");
 		return 0;
@@ -1218,14 +1218,14 @@
 	NDTs = gf_list_new();
 	//all nodes are in the same list but we keep version info
 	ParseTemplateFile(nodes, XNodes, NDTs);
-	fclose(nodes);
+	gf_fclose(nodes);
 
 	if (argc>1) {
-		pf = fopen(argv[1], "rt");
+		pf = gf_fopen(argv[1], "rt");
 		if (!pf) fprintf(stdout, "Cannot open profile file %s\n", argv[1]);
 		else {
 			parse_profile(XNodes, pf);
-			fclose(pf);
+			gf_fclose(pf);
 		}
 	}

v0.5.2.tar.gz/applications/mp42avi/main.c -> v0.6.1.tar.gz/applications/mp42avi/main.c Changed

v0.5.2.tar.gz/applications/mp42ts/Makefile -> v0.6.1.tar.gz/applications/mp42ts/Makefile Changed

v0.5.2.tar.gz/applications/mp42ts/main.c -> v0.6.1.tar.gz/applications/mp42ts/main.c Changed

@@ -40,28 +40,26 @@
 #include <gpac/webvtt.h>
 #endif
 
-#ifdef GPAC_DISABLE_ISOM
-
-#error "Cannot compile MP42TS if GPAC is not built with ISO File Format support"
-
-#endif
 
 #ifdef GPAC_DISABLE_MPEG2TS_MUX
-
 #error "Cannot compile MP42TS if GPAC is not built with MPEG2-TS Muxing support"
-
 #endif
 
 #define MP42TS_PRINT_TIME_MS 500 /*refresh printed info every CLOCK_REFRESH ms*/
 #define MP42TS_VIDEO_FREQ 1000 /*meant to send AVC IDR only every CLOCK_REFRESH ms*/
 
+
+s32 temi_id_1 = -1;
+s32 temi_id_2 = -1;
+
 u32 temi_url_insertion_delay = 1000;
-Bool temi_disable_loop = 0;
+u32 temi_offset = 0;
+Bool temi_disable_loop = GF_FALSE;
 FILE *logfile = NULL;
 
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
-	FILE *logs = cbk;
+	FILE *logs = (FILE*)cbk;
 	vfprintf(logs, fmt, list);
 	fflush(logs);
 }
@@ -72,7 +70,7 @@
 	 "GPAC Copyright (c) Telecom ParisTech 2000-2014\n"
 	 "GPAC Configuration: " GPAC_CONFIGURATION "\n"
 	 "Features: %s\n\n", gpac_features());
-	fprintf(stderr, "mp2ts <inputs> <destinations> [options]\n"
+	fprintf(stderr, "mp42ts <inputs> <destinations> [options]\n"
 	 "\n"
 	 "Inputs:\n"
 	 "-src filename[:OPTS] specifies an input file used for a TS service\n"
@@ -108,20 +106,26 @@
 	 "-pcr-init V sets initial value V for PCR - if not set, random value is used\n"
 	 "-pcr-offset V offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media.\n"
 	 "-psi-rate V sets PSI refresh rate V in ms (default 100ms).\n"
-	 " * If 0, PSI data is only send once at the begining or before each IDR when -rap option is set.\n"
+	 " * If 0, PSI data is only send once at the beginning or before each IDR when -rap option is set.\n"
 	 " * This should be set to 0 for DASH streams.\n"
 	 "-time n request the muxer to stop after n ms\n"
 	 "-single-au forces 1 PES = 1 AU (disabled by default)\n"
+	 "-multi-au forces 1 PES = N AU for all streams (disabled by default).\n"
+	 " By default, audio streams pack N AUs in one PES but video and systems data use 1 AU per PES.\n"
 	 "-rap forces RAP/IDR to be aligned with PES start for video streams (disabled by default)\n"
 	 " in this mode, PAT, PMT and PCR will be inserted before the first TS packet of the RAP PES\n"
 	 "-flush-rap same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT\n"
 	 "-nb-pack N specifies to pack up to N TS packets together before sending on network or writing to file\n"
-	 "-pcr-ms N sets max interval in ms between 2 PCR. Default is 100 ms\n"
+	 "-pcr-ms N sets max interval in ms between 2 PCR. Default is 100 ms or at each PES header\n"
+	 "-force-pcr-only allows sending PCR-only packets to enforce the requested PCR rate - STILL EXPERIMENTAL.\n"
 	 "-ttl N specifies Time-To-Live for multicast. Default is 1.\n"
 	 "-ifce IPIFCE specifies default IP interface to use. Default is IF_ANY.\n"
-	 "-temi [URL] Inserts TEMI time codes in adaptation field. URL is optionnal\n"
-	 "-temi-delay DelayMS Specifies delay between two TEMI url descriptors\n"
+	 "-temi [URL] Inserts TEMI time codes in adaptation field. URL is optionnal, and can be a number for external timeline IDs\n"
+	 "-temi-delay DelayMS Specifies delay between two TEMI url descriptors (default is 1000)\n"
+	 "-temi-offset OffsetMS Specifies an offset in ms to add to TEMI (by default TEMI starts at 0)\n"
 	 "-temi-noloop Do not restart the TEMI timeline at the end of the source\n"
+	 "-temi2 ID Inserts a secondary TEMI time codes in adaptation field of the audio PID if any. ID shall be set to the desired external timeline IDs\n"
+	 "-insert-ntp Inserts NTP timestamp in TEMI timeline descriptor\n"
 	 "-sdt-rate MS Gives the SDT carrousel rate in milliseconds. If 0 (default), SDT is not sent\n"
 	 "\n"
 	 "MPEG-4/T-DMB options:\n"
@@ -148,7 +152,11 @@
 #define MAX_MUX_SRC_PROG	100
 typedef struct
 {
+
+#ifndef GPAC_DISABLE_ISOM
 	GF_ISOFile *mp4;
+#endif
+
 	u32 nb_streams, pcr_idx;
 	GF_ESInterface streams[40];
 	GF_Descriptor *iod;
@@ -176,6 +184,7 @@
 	Double last_ntp;
 } M2TSSource;
 
+#ifndef GPAC_DISABLE_ISOM
 typedef struct
 {
 	GF_ISOFile *mp4;
@@ -194,9 +203,11 @@
 	M2TSSource *source;
 
 	const char *temi_url;
-	u32 last_temi_url;
+	u32 last_temi_url, timeline_id;
+	Bool insert_ntp;
 
 } GF_ESIMP4;
+#endif
 
 typedef struct
 {
@@ -235,7 +246,7 @@
 #endif
 };
 
-static u32 format_af_descriptor(char *af_data, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 *last_url_time)
+static u32 format_af_descriptor(char *af_data, u32 timeline_id, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 *last_url_time)
 {
 	u32 res;
 	u32 len;
@@ -248,7 +259,7 @@
 	} else {
 		last_time = (u32) (1000*timecode/timescale);
 	}
-	if (!*last_url_time || (last_time - *last_url_time + 1 >= temi_url_insertion_delay) ) {
+	if (temi_url && (!*last_url_time || (last_time - *last_url_time + 1 >= temi_url_insertion_delay)) ) {
 		*last_url_time = last_time + 1;
 		len = 0;
 		gf_bs_write_int(bs,	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR, 8);
@@ -259,7 +270,7 @@
 		gf_bs_write_int(bs,	0, 1); //splicing_flag
 		gf_bs_write_int(bs,	0, 1); //use_base_temi_url
 		gf_bs_write_int(bs,	0xFF, 5); //reserved
-		gf_bs_write_int(bs,	0, 7); //timeline_id
+		gf_bs_write_int(bs,	timeline_id, 7); //timeline_id
 
 		if (strlen(temi_url)) {
 			char *url = (char *)temi_url;
@@ -282,16 +293,17 @@
 	}
 
 	if (timescale || ntp) {
+		Bool use64 = (timecode > 0xFFFFFFFFUL) ? GF_TRUE : GF_FALSE;
 		len = 3; //3 bytes flags
 
-		if (timescale) len += 4 + ((timecode > 0xFFFFFFFFUL) ? 8 : 4);
+		if (timescale) len += 4 + (use64 ? 8 : 4);
 		if (ntp) len += 8;
 
 		//write timeline descriptor
 		gf_bs_write_int(bs,	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR, 8);
 		gf_bs_write_int(bs,	len, 8);
 
-		gf_bs_write_int(bs,	timescale ? ((timecode > 0xFFFFFFUL) ? 2 : 1) : 0, 2); //has_timestamp
+		gf_bs_write_int(bs,	timescale ? (use64 ? 2 : 1) : 0, 2); //has_timestamp
 		gf_bs_write_int(bs,	ntp ? 1 : 0, 1); //has_ntp
 		gf_bs_write_int(bs,	0, 1); //has_ptp
 		gf_bs_write_int(bs,	0, 2); //has_timecode
@@ -299,10 +311,10 @@
 		gf_bs_write_int(bs,	0, 1); //paused
 		gf_bs_write_int(bs,	0, 1); //discontinuity
 		gf_bs_write_int(bs,	0xFF, 7); //reserved
-		gf_bs_write_int(bs,	0, 8); //timeline_id
+		gf_bs_write_int(bs,	timeline_id, 8); //timeline_id
 		if (timescale) {
 			gf_bs_write_u32(bs,	timescale); //timescale
-			if (timecode > 0xFFFFFFUL)
+			if (use64)
 				gf_bs_write_u64(bs,	timecode); //timestamp
 			else
 				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
@@ -316,6 +328,8 @@
 	return res;
 }
 
+#ifndef GPAC_DISABLE_ISOM
+
 static GF_Err mp4_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
 {
 	char af_data[188];
@@ -343,12 +357,25 @@
 		pck.cts = priv->sample->DTS + priv->ts_offset;
 		if (priv->is_repeat) pck.flags |= GF_ESI_DATA_REPEAT;
 
-		if (priv->temi_url) {
+		if (priv->timeline_id) {
+			u64 ntp=0;
 			u64 tc = priv->sample->DTS + priv->sample->CTS_Offset;
 			if (temi_disable_loop) {
 				tc += priv->ts_offset;
 			}
-			pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->sample->DTS + priv->sample->CTS_Offset, ifce->timescale, 0, priv->temi_url, &priv->last_temi_url);
+
+			if (temi_offset) {
+				tc += ((u64) temi_offset) * ifce->timescale / 1000;
+			}
+
+			if (priv->insert_ntp) {
+				u32 sec, frac;
+				gf_net_get_ntp(&sec, &frac);
+				ntp = sec;
+				ntp <<= 32;
+				ntp |= frac;
+			}
+			pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, tc, ifce->timescale, ntp, priv->temi_url, &priv->last_temi_url);
 			pck.mpeg2_af_descriptors = af_data;
 		}
 
@@ -363,7 +390,7 @@
 		}
 
 		if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
-			pck.data = priv->dsi;
+			pck.data = (char*)priv->dsi;
 			pck.data_len = priv->dsi_size;
 			ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
 			pck.flags &= ~GF_ESI_DATA_AU_START;
@@ -425,12 +452,12 @@
 				duration = (u64) (gf_isom_get_duration(priv->mp4) * scale);
 				priv->ts_offset += duration;
 				priv->sample_number = 0;
-				priv->is_repeat = (priv->sample_count==1) ? 1 : 0;
+				priv->is_repeat = (priv->sample_count==1) ? GF_TRUE : GF_FALSE;
 			}
 			else if (priv->image_repeat_ms && priv->source->nb_real_streams) {
 				priv->nb_repeat_last++;
 				priv->sample_number--;
-				priv->is_repeat = 1;
+				priv->is_repeat = GF_TRUE;
 			} else {
 				if (!(ifce->caps & GF_ESI_STREAM_IS_OVER)) {
 					ifce->caps |= GF_ESI_STREAM_IS_OVER;
@@ -473,7 +500,7 @@
 	priv->track = track_num;
 	priv->mtype = gf_isom_get_media_type(priv->mp4, priv->track);
 	priv->mstype = gf_isom_get_media_subtype(priv->mp4, priv->track, 1);
-	priv->loop = source->real_time ? 1 : 0;
+	priv->loop = source->real_time ? GF_TRUE : GF_FALSE;
 	priv->sample_count = gf_isom_get_sample_count(mp4, track_num);
 	source->samples_count += priv->sample_count;
 	if (priv->sample_count>1)
@@ -589,6 +616,8 @@
 
 }
 
+#endif //GPAC_DISABLE_ISOM
+
 
 #ifndef GPAC_DISABLE_SENG
 static GF_Err seng_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
@@ -649,7 +678,7 @@
 	case GF_ESI_INPUT_DATA_FLUSH:
 		/*flush rtcp channel*/
 		while (1) {
-			Bool has_sr=0;
+			Bool has_sr = GF_FALSE;
 			size = gf_rtp_read_rtcp(rtp->rtp_ch, buffer, 8000);
 			if (!size) break;
 			e = gf_rtp_decode_rtcp(rtp->rtp_ch, buffer, size, &has_sr);
@@ -669,7 +698,7 @@
 				}
 				rtp->ts_offset = rtp->rtp_ch->last_SR_rtp_time;
 				rtp->ts_offset -= (s64) (time * rtp->rtp_ch->TimeScale);
-				rtp->rtcp_init = 1;
+				rtp->rtcp_init = GF_TRUE;
 			}
 		}
 		/*flush rtp channel*/
@@ -760,7 +789,7 @@
 
 			/*since we don't inspect the RTP content, we can only concatenate SPS and PPS indicated in SDP*/
 			if (hdr->randomAccessPointFlag && rtp->dsi_and_rap) {
-				rtp->pck.data = rtp->dsi_and_rap;
+				rtp->pck.data = (char*)rtp->dsi_and_rap;
 				rtp->pck.data_len = rtp->avc_dsi_size;
 
 				rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
@@ -778,7 +807,7 @@
 			rtp->dsi_and_rap = gf_malloc(sizeof(char)*(rtp->pck.data_len));
 			memcpy(rtp->dsi_and_rap, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
 			memcpy((char *) rtp->dsi_and_rap + rtp->depacketizer->sl_map.configSize, payload, size);
-			rtp->pck.data = rtp->dsi_and_rap;
+			rtp->pck.data = (char*)rtp->dsi_and_rap;
 		}
 		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
 	}
@@ -812,7 +841,7 @@
 	memset(&trans, 0, sizeof(GF_RTSPTransport));
 	trans.Profile = media->Profile;
 	trans.source = conn ? conn->host : sdp->o_address;
-	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? 0 : 1;
+	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
 	if (!trans.IsUnicast) {
 		trans.port_first = media->PortNumber;
 		trans.port_last = media->PortNumber + 1;
@@ -847,11 +876,11 @@
 	if (rtp->depacketizer->sl_map.config) {
 		switch (ifce->object_type_indication) {
 		case GPAC_OTI_VIDEO_MPEG4_PART2:
-			rtp->cat_dsi = 1;
+			rtp->cat_dsi = GF_TRUE;
 			break;
 		case GPAC_OTI_VIDEO_AVC:
 		case GPAC_OTI_VIDEO_SVC:
-			rtp->is_264 = 1;
+			rtp->is_264 = GF_TRUE;
 			rtp->depacketizer->flags |= GF_RTP_AVC_USE_ANNEX_B;
 			{
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -863,12 +892,12 @@
 
 					bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 					for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
-						slc = gf_list_get(avccfg->sequenceParameterSets, i);
+						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->sequenceParameterSets, i);
 						gf_bs_write_u32(bs, 1);
 						gf_bs_write_data(bs, slc->data, slc->size);
 					}
 					for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
-						slc = gf_list_get(avccfg->pictureParameterSets, i);
+						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->pictureParameterSets, i);
 						gf_bs_write_u32(bs, 1);
 						gf_bs_write_data(bs, slc->data, slc->size);
 					}
@@ -880,22 +909,22 @@
 			}
 			break;
 		case GPAC_OTI_AUDIO_AAC_MPEG4:
-			ifce->decoder_config = gf_malloc(sizeof(char) * rtp->depacketizer->sl_map.configSize);
+			ifce->decoder_config = (char*)gf_malloc(sizeof(char) * rtp->depacketizer->sl_map.configSize);
 			ifce->decoder_config_size = rtp->depacketizer->sl_map.configSize;
 			memcpy(ifce->decoder_config, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
 			break;
 		}
 	}
 	if (rtp->depacketizer->sl_map.StreamStateIndication) {
-		rtp->use_carousel = 1;
+		rtp->use_carousel = GF_TRUE;
 		rtp->au_sn=0;
 	}
 
 	/*DTS signaling is only supported for MPEG-4 visual*/
 	if (rtp->depacketizer->sl_map.DTSDeltaLength) ifce->caps |= GF_ESI_SIGNAL_DTS;
 
-	gf_rtp_depacketizer_reset(rtp->depacketizer, 1);
-	e = gf_rtp_initialize(rtp->rtp_ch, 0x100000ul, 0, 0, 10, 200, NULL);
+	gf_rtp_depacketizer_reset(rtp->depacketizer, GF_TRUE);
+	e = gf_rtp_initialize(rtp->rtp_ch, 0x100000ul, GF_FALSE, 0, 10, 200, NULL);
 	if (e!=GF_OK) {
 		gf_rtp_del(rtp->rtp_ch);
 		fprintf(stderr, "Cannot initialize RTP channel: %s\n", gf_error_to_string(e));
@@ -905,10 +934,12 @@
 }
 #endif /*GPAC_DISABLE_STREAMING*/
 
+#ifndef GPAC_DISABLE_SENG
 static GF_Err void_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
 {
 	return GF_OK;
 }
+#endif
 
 /*AAC import features*/
 #ifndef GPAC_DISABLE_PLAYER
@@ -993,8 +1024,12 @@
 							GF_Err e;
 							source->streams[i].timescale = esd->slConfig->timestampResolution;
 							e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
-							assert(!e);
-							if (!source->streams[i].sl_config) source->streams[i].sl_config = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
+							if (e != GF_OK) {
+								fprintf(stderr, "Failed updating TS program timescale\n");
+							}
+							else if (!source->streams[i].sl_config)
+								source->streams[i].sl_config = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
+
 							memcpy(source->streams[i].sl_config, esd->slConfig, sizeof(GF_SLConfig));
 							break;
 						}
@@ -1150,7 +1185,9 @@
 	u64 last_src_modif, mod_time;
 	M2TSSource *source = (M2TSSource *)param;
 	GF_SceneEngine *seng = source->seng;
+#ifndef GPAC_DISABLE_PLAYER
 	GF_SimpleDataDescriptor *audio_desc;
+#endif
 	Bool update_context=0;
 	Bool force_rap, adjust_carousel_time, discard_pending, signal_rap, signal_critical, version_inc, aggregate_au;
 	u32 period, ts_delta;
@@ -1162,6 +1199,7 @@
 	last_src_modif = source->bifs_src_name ? gf_file_modification_time(source->bifs_src_name) : 0;
 
 	/*send the audio descriptor*/
+#ifndef GPAC_DISABLE_PLAYER
 	if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL && audio_OD_stream_id!=(u32)-1) {
 		audio_desc = source->streams[audio_OD_stream_id].input_udta;
 		if (audio_desc && audio_desc->data) /*RTP/UDP + MP3 case*/
@@ -1176,6 +1214,7 @@
 			source->streams[audio_OD_stream_id].input_udta = NULL;
 		}
 	}
+#endif
 
 	while (run) {
 		if (!gf_prompt_has_input()) {
@@ -1187,13 +1226,13 @@
 					fprintf(stderr, "Update file modified - processing\n");
 					last_src_modif = mod_time;
 
-					srcf = gf_f64_open(source->bifs_src_name, "rt");
+					srcf = gf_fopen(source->bifs_src_name, "rt");
 					if (!srcf) continue;
 
 					/*checks if we have a broadcast config*/
 					if (!fgets(flag_buf, 200, srcf))
 						flag_buf[0] = '\0';
-					fclose(srcf);
+					gf_fclose(srcf);
 
 					aggregate_au = force_rap = adjust_carousel_time = discard_pending = signal_rap = signal_critical = 0;
 					version_inc = 1;
@@ -1354,21 +1393,23 @@
 }
 #endif
 
-static Bool open_source(M2TSSource *source, char *src, u32 carousel_rate, u32 mpeg4_signaling, char *update, char *audio_input_ip, u16 audio_input_port, char *video_buffer, Bool force_real_time, u32 bifs_use_pes, const char *temi_url, Bool compute_max_size)
+static Bool open_source(M2TSSource *source, char *src, u32 carousel_rate, u32 mpeg4_signaling, char *update, char *audio_input_ip, u16 audio_input_port, char *video_buffer, Bool force_real_time, u32 bifs_use_pes, const char *temi_url, Bool compute_max_size, Bool insert_ntp)
 {
 #ifndef GPAC_DISABLE_STREAMING
 	GF_SDPInfo *sdp;
 #endif
-	u32 i;
 	s64 min_offset = 0;
 
 	memset(source, 0, sizeof(M2TSSource));
 	source->mpeg4_signaling = mpeg4_signaling;
 
 	/*open ISO file*/
+#ifndef GPAC_DISABLE_ISOM
 	if (gf_isom_probe_file(src)) {
+		u32 i;
 		u32 nb_tracks;
 		Bool has_bifs_od = 0;
+		Bool temi_assigned = 0;
 		u32 first_audio = 0;
 		u32 first_other = 0;
 		source->mp4 = gf_isom_open(src, GF_ISOM_OPEN_READ, 0);
@@ -1409,7 +1450,17 @@
 						/*get first visual stream as PCR*/
 						if (!source->pcr_idx) {
 							source->pcr_idx = i+1;
-							((GF_ESIMP4 *)source->streams[i].input_udta)->temi_url = temi_url;
+							if ((temi_id_1>=0) || (temi_id_2>=0)) {
+								temi_assigned = GF_TRUE;
+								((GF_ESIMP4 *)source->streams[i].input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
+								((GF_ESIMP4 *)source->streams[i].input_udta)->insert_ntp = insert_ntp;
+
+								if (temi_url && (temi_id_1>=0))
+									((GF_ESIMP4 *)source->streams[i].input_udta)->temi_url = temi_url;
+
+								if (temi_id_1>=0) temi_id_1 = -1;
+								else temi_id_2 = -1;
+							}
 						}
 					}
 					break;
@@ -1445,6 +1496,16 @@
 			}
 		}
 		if (has_bifs_od && !source->mpeg4_signaling) source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+		if ( !temi_assigned && first_audio && ((temi_id_1>=0) || (temi_id_2>=0) ) ) {
+			((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
+			((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->insert_ntp = insert_ntp;
+
+			if (temi_url && (temi_id_1>=0) )
+				((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->temi_url = temi_url;
+
+			if (temi_id_1>=0) temi_id_1 = -1;
+			else temi_id_2 = -1;
+		}
 
 		/*if no visual PCR found, use first audio*/
 		if (!source->pcr_idx) source->pcr_idx = first_audio;
@@ -1520,26 +1581,28 @@
 		}
 		return 1;
 	}
+#endif
+
 
 #ifndef GPAC_DISABLE_STREAMING
 	/*open SDP file*/
 	if (strstr(src, ".sdp")) {
 		GF_X_Attribute *att;
 		char *sdp_buf;
-		u32 sdp_size;
+		u32 sdp_size, i;
 		GF_Err e;
-		FILE *_sdp = fopen(src, "rt");
+		FILE *_sdp = gf_fopen(src, "rt");
 		if (!_sdp) {
 			fprintf(stderr, "Error opening %s - no such file\n", src);
 			return 0;
 		}
-		gf_f64_seek(_sdp, 0, SEEK_END);
-		sdp_size = (u32)gf_f64_tell(_sdp);
-		gf_f64_seek(_sdp, 0, SEEK_SET);
+		gf_fseek(_sdp, 0, SEEK_END);
+		sdp_size = (u32)gf_ftell(_sdp);
+		gf_fseek(_sdp, 0, SEEK_SET);
 		sdp_buf = (char*)gf_malloc(sizeof(char)*sdp_size);
 		memset(sdp_buf, 0, sizeof(char)*sdp_size);
 		sdp_size = (u32) fread(sdp_buf, 1, sdp_size, _sdp);
-		fclose(_sdp);
+		gf_fclose(_sdp);
 
 		sdp = gf_sdp_info_new();
 		e = gf_sdp_info_parse(sdp, sdp_buf, sdp_size);
@@ -1597,6 +1660,7 @@
 #ifndef GPAC_DISABLE_SENG
 		if (strstr(src, ".bt")) //open .bt file
 		{
+			u32 i;
 			u32 load_type=0;
 			source->seng = gf_seng_init(source, src, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
 			if (!source->seng) {
@@ -1625,6 +1689,7 @@
 				}
 			}
 
+#ifndef GPAC_DISABLE_PLAYER
 			/*when an audio input is present, declare it and store OD + ESD_U*/
 			if (audio_input_ip) {
 				/*add the audio program*/
@@ -1682,6 +1747,7 @@
 				}
 				source->nb_streams++;
 			}
+#endif
 
 			/*when an audio input is present, declare it and store OD + ESD_U*/
 			if (video_buffer) {
@@ -1738,9 +1804,9 @@
 		} else
 #endif
 		{
-			FILE *f = fopen(src, "rt");
+			FILE *f = gf_fopen(src, "rt");
 			if (f) {
-				fclose(f);
+				gf_fclose(f);
 				fprintf(stderr, "Error opening %s - not a supported input media, skipping.\n", src);
 			} else {
 				fprintf(stderr, "Error opening %s - no such file.\n", src);
@@ -1759,15 +1825,15 @@
 || ((strlen(arg) == strlen(param)) && ++i && (i<argc) && (next_arg = argv[i]))))
 
 /*parse MP42TS arguments*/
-static GFINLINE GF_Err parse_args(int argc, char **argv, u32 *mux_rate, u32 *carrousel_rate, s64 *pcr_init_val, u32 *pcr_offset, u32 *psi_refresh_rate, Bool *single_au_pes, u32 *bifs_use_pes,
+static GFINLINE GF_Err parse_args(int argc, char **argv, u32 *mux_rate, u32 *carrousel_rate, s64 *pcr_init_val, u32 *pcr_offset, u32 *psi_refresh_rate, GF_M2TS_PackMode *pes_packing_mode, u32 *bifs_use_pes,
 M2TSSource *sources, u32 *nb_sources, char **bifs_src_name,
 Bool *real_time, u32 *run_time, char **video_buffer, u32 *video_buffer_size,
 u32 *audio_input_type, char **audio_input_ip, u16 *audio_input_port,
 u32 *output_type, char **ts_out, char **udp_out, char **rtp_out, u16 *output_port,
- char** segment_dir, u32 *segment_duration, char **segment_manifest, u32 *segment_number, char **segment_http_prefix, u32 *split_rap, u32 *nb_pck_pack, u32 *pcr_ms, u32 *ttl, const char **ip_ifce, const char **temi_url, u32 *sdt_refresh_rate)
+ char** segment_dir, u32 *segment_duration, char **segment_manifest, u32 *segment_number, char **segment_http_prefix, u32 *split_rap, u32 *nb_pck_pack, u32 *pcr_ms, u32 *ttl, const char **ip_ifce, const char **temi_url, u32 *sdt_refresh_rate, Bool *enable_forced_pcr)
 {
 	Bool rate_found=0, mpeg4_carousel_found=0, time_found=0, src_found=0, dst_found=0, audio_input_found=0, video_input_found=0,
-	 seg_dur_found=0, seg_dir_found=0, seg_manifest_found=0, seg_number_found=0, seg_http_found=0, real_time_found=0;
+	 seg_dur_found=0, seg_dir_found=0, seg_manifest_found=0, seg_number_found=0, seg_http_found=0, real_time_found=0, insert_ntp=0;
 	char *arg = NULL, *next_arg = NULL, *error_msg = "no argument found";
 	u32 mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_NONE;
 	Bool force_real_time = 0;
@@ -1794,14 +1860,14 @@
 				goto error;
 			}
 			video_input_found = 1;
-			f = fopen(next_arg, "rb");
+			f = gf_fopen(next_arg, "rb");
 			if (!f) {
 				error_msg = "video file not found: ";
 				goto error;
 			}
-			gf_f64_seek(f, 0, SEEK_END);
-			*video_buffer_size = (u32)gf_f64_tell(f);
-			gf_f64_seek(f, 0, SEEK_SET);
+			gf_fseek(f, 0, SEEK_END);
+			*video_buffer_size = (u32)gf_ftell(f);
+			gf_fseek(f, 0, SEEK_SET);
 			assert(*video_buffer_size);
 			*video_buffer = (char*) gf_malloc(*video_buffer_size);
 			{
@@ -1809,7 +1875,7 @@
 				if (read != *video_buffer_size)
 					fprintf(stderr, "Error while reading video file, has readen %u chars instead of %u.\n", read, *video_buffer_size);
 			}
-			fclose(f);
+			gf_fclose(f);
 		} else if (CHECK_PARAM("-audio")) {
 			if (audio_input_found) {
 				error_msg = "multiple '-audio' found";
@@ -1904,11 +1970,15 @@
 			time_found = 1;
 			*run_time = atoi(next_arg);
 		} else if (!stricmp(arg, "-single-au")) {
-			*single_au_pes = 1;
+			*pes_packing_mode = GF_M2TS_PACK_NONE;
+		} else if (!stricmp(arg, "-multi-au")) {
+			*pes_packing_mode = GF_M2TS_PACK_ALL;
 		} else if (!stricmp(arg, "-rap")) {
 			*split_rap = 1;
 		} else if (!stricmp(arg, "-flush-rap")) {
 			*split_rap = 2;
+		} else if (!stricmp(arg, "-force-pcr-only")) {
+			*enable_forced_pcr = GF_TRUE;
 		} else if (CHECK_PARAM("-nb-pack")) {
 			*nb_pck_pack = atoi(next_arg);
 		} else if (CHECK_PARAM("-nb-pck")) {
@@ -1926,7 +1996,7 @@
 			if (gf_log_set_tools_levels(next_arg) != GF_OK)
 				return GF_BAD_PARAM;
 		} else if (CHECK_PARAM("-lf")) {
-			logfile = gf_f64_open(next_arg, "wt");
+			logfile = gf_fopen(next_arg, "wt");
 			gf_log_set_callback(logfile, on_gpac_log);
 		} else if (CHECK_PARAM("-segment-dir")) {
 			if (seg_dir_found) {
@@ -1941,19 +2011,19 @@
 			}
 			seg_dur_found = 1;
 			*segment_duration = atoi(next_arg);
-		} else if (CHECK_PARAM("-segment-manifest=")) {
+		} else if (CHECK_PARAM("-segment-manifest")) {
 			if (seg_manifest_found) {
 				goto error;
 			}
 			seg_manifest_found = 1;
 			*segment_manifest = next_arg;
-		} else if (CHECK_PARAM("-segment-http-prefix=")) {
+		} else if (CHECK_PARAM("-segment-http-prefix")) {
 			if (seg_http_found) {
 				goto error;
 			}
 			seg_http_found = 1;
 			*segment_http_prefix = next_arg;
-		} else if (CHECK_PARAM("-segment-number=")) {
+		} else if (CHECK_PARAM("-segment-number")) {
 			if (seg_number_found) {
 				goto error;
 			}
@@ -1972,16 +2042,54 @@
 			dst_found = 1;
 			*ts_out = gf_strdup(next_arg);
 		} else if (CHECK_PARAM("-temi")) {
-			*temi_url = next_arg;
-			if (strlen(next_arg) > 150) {
-				fprintf(stderr, "URLs longer than 150 bytes are not currently supported\n");
-				return GF_NOT_SUPPORTED;
+			if (next_arg[0]=='-') {
+				*temi_url = NULL;
+				i--;
+				temi_id_1 = 150;
+			} else {
+				u32 temi_id = 0;
+				if (sscanf(next_arg, "%d", &temi_id) == 1) {
+					if (temi_id < 0x80 || temi_id>0xFF) {
+						fprintf(stderr, "TEMI external timeline IDs shall be in the range [0x80, 0xFF], but %d was specified\n", temi_id);
+						return GF_BAD_PARAM;
+					}
+				}
+				if (!temi_id) {
+					*temi_url = next_arg;
+					if (strlen(next_arg) > 150) {
+						fprintf(stderr, "URLs longer than 150 bytes are not currently supported\n");
+						return GF_NOT_SUPPORTED;
+					}
+					temi_id_1 = 0;
+				} else {
+					temi_id_1 = temi_id;
+					*temi_url = NULL;
+				}
 			}
-		}
-		else if (CHECK_PARAM("-temi-delay")) {
+		} else if (CHECK_PARAM("-temi2")) {
+			u32 temi_id = 0;
+			if (next_arg[0]=='-') {
+				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
+				return GF_BAD_PARAM;
+			}
+			if (sscanf(next_arg, "%d", &temi_id) == 1) {
+				if (temi_id < 0x80 || temi_id>0xFF) {
+					fprintf(stderr, "TEMI external timeline IDs shall be in the range [0x80, 0xFF], but %d was specified\n", temi_id);
+					return GF_BAD_PARAM;
+				}
+				temi_id_2 = temi_id;
+			} else {
+				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
+				return GF_BAD_PARAM;
+			}
+		} else if (CHECK_PARAM("-temi-delay")) {
 			temi_url_insertion_delay = atoi(next_arg);
+		} else if (CHECK_PARAM("-temi-offset")) {
+			temi_offset = atoi(next_arg);
 		} else if (!stricmp(arg, "-temi-noloop")) {
 			temi_disable_loop = 1;
+		} else if (!stricmp(arg, "-insert-ntp")) {
+			insert_ntp = GF_TRUE;
 		}
 		else if (CHECK_PARAM("-dst-udp")) {
 			char *sep = strchr(next_arg, ':');
@@ -2019,7 +2127,7 @@
 	if (*real_time) force_real_time = 1;
 	rate_found = 1;
 
-	/*second pass: other*/
+	/*second pass: open sources*/
 	for (i=1; i<argc; i++) {
 		u32 res;
 		char *src_args;
@@ -2037,7 +2145,7 @@
 			src_args = src_args + 1;
 		}
 
-		res = open_source(&sources[*nb_sources], next_arg, *carrousel_rate, mpeg4_signaling, *bifs_src_name, *audio_input_ip, *audio_input_port, *video_buffer, force_real_time, *bifs_use_pes, *temi_url, (*pcr_offset == (u32) -1) ? 1 : 0);
+		res = open_source(&sources[*nb_sources], next_arg, *carrousel_rate, mpeg4_signaling, *bifs_src_name, *audio_input_ip, *audio_input_port, *video_buffer, force_real_time, *bifs_use_pes, *temi_url, (*pcr_offset == (u32) -1) ? 1 : 0, insert_ntp);
 
 
 		//we may have arguments
@@ -2056,6 +2164,9 @@
 				for (k=0; k<*nb_sources; k++) {
 					if (sources[k].ID == sources[*nb_sources].ID) {
 						sources[*nb_sources].is_not_program_declaration = 1;
+						if (sources[k].max_sample_size < sources[*nb_sources].max_sample_size)
+							sources[k].max_sample_size = sources[*nb_sources].max_sample_size;
+
 						break;
 					}
 				}
@@ -2110,7 +2221,7 @@
 		sprintf(manifest_name, "%s", manifest);
 	}
 
-	manifest_fp = fopen(tmp_manifest, "w");
+	manifest_fp = gf_fopen(tmp_manifest, "w");
 	if (!manifest_fp) {
 		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
 		return GF_BAD_PARAM;
@@ -2125,7 +2236,7 @@
 	if (end) {
 		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
 	}
-	fclose(manifest_fp);
+	gf_fclose(manifest_fp);
 
 	if (!rename(tmp_manifest, manifest_name)) {
 		return GF_OK;
@@ -2151,9 +2262,10 @@
 	char *ts_pack_buffer = NULL;
 	GF_Err e;
 	u32 run_time;
-	Bool real_time, single_au_pes, is_stdout;
+	Bool real_time, is_stdout;
 	s64 pcr_init_val = -1;
 	u32 usec_till_next, ttl, split_rap, sdt_refresh_rate;
+	GF_M2TS_PackMode pes_packing_mode;
 	u32 i, j, mux_rate, nb_sources, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate, nb_pck_pack, nb_pck_in_pack, pcr_ms;
 	char *ts_out = NULL, *udp_out = NULL, *rtp_out = NULL, *audio_input_ip = NULL;
 	FILE *ts_output_file = NULL;
@@ -2180,7 +2292,7 @@
 	const char *ip_ifce = NULL;
 	GF_M2TS_Time prev_seg_time;
 	GF_M2TS_Mux *muxer;
-
+	Bool enable_forced_pcr = GF_FALSE;
 	/*****************/
 	/* gpac init */
 	/*****************/
@@ -2225,7 +2337,7 @@
 	aac_reader = AAC_Reader_new();
 #endif
 	muxer = NULL;
-	single_au_pes = 0;
+	pes_packing_mode = GF_M2TS_PACK_AUDIO_ONLY;
 	bifs_use_pes = 0;
 	split_rap = 0;
 	ttl = 1;
@@ -2235,11 +2347,11 @@
 	/***********************/
 	/* parse arguments */
 	/***********************/
-	if (GF_OK != parse_args(argc, argv, &mux_rate, &carrousel_rate, &pcr_init_val, &pcr_offset, &psi_refresh_rate, &single_au_pes, &bifs_use_pes, sources, &nb_sources, &bifs_src_name,
+	if (GF_OK != parse_args(argc, argv, &mux_rate, &carrousel_rate, &pcr_init_val, &pcr_offset, &psi_refresh_rate, &pes_packing_mode, &bifs_use_pes, sources, &nb_sources, &bifs_src_name,
 	 &real_time, &run_time, &video_buffer, &video_buffer_size,
 	 &audio_input_type, &audio_input_ip, &audio_input_port,
 	 &output_type, &ts_out, &udp_out, &rtp_out, &output_port,
-	 &segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &pcr_ms, &ttl, &ip_ifce, &insert_temi, &sdt_refresh_rate)) {
+	 &segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &pcr_ms, &ttl, &ip_ifce, &insert_temi, &sdt_refresh_rate, &enable_forced_pcr)) {
 		goto exit;
 	}
 
@@ -2252,16 +2364,19 @@
 	/* create mp42ts muxer */
 	/***************************/
 	muxer = gf_m2ts_mux_new(mux_rate, psi_refresh_rate, real_time);
-	if (muxer) gf_m2ts_mux_use_single_au_pes_mode(muxer, single_au_pes);
+	if (!muxer) {
+		fprintf(stderr, "Could not create the muxer. Aborting.\n");
+		goto exit;
+	}
+	gf_m2ts_mux_use_single_au_pes_mode(muxer, pes_packing_mode);
 	if (pcr_init_val>=0) gf_m2ts_mux_set_initial_pcr(muxer, (u64) pcr_init_val);
 	gf_m2ts_mux_set_pcr_max_interval(muxer, pcr_ms);
+	gf_m2ts_mux_enable_pcr_only_packets(muxer, enable_forced_pcr);
+
 
 	if (ts_out != NULL) {
 		if (segment_duration) {
-			char *dot;
 			strcpy(segment_prefix, ts_out);
-			dot = strrchr(segment_prefix, '.');
-			dot[0] = 0;
 			if (segment_dir) {
 				if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
 					sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
@@ -2282,7 +2397,7 @@
 			ts_output_file = stdout;
 			is_stdout = GF_TRUE;
 		} else {
-			ts_output_file = fopen(ts_out, "wb");
+			ts_output_file = gf_fopen(ts_out, "wb");
 			is_stdout = GF_FALSE;
 		}
 		if (!ts_output_file) {
@@ -2357,7 +2472,7 @@
 				fprintf(stderr, "Error initializing UDP socket for %s:%d : %s\n", audio_input_ip, audio_input_port, gf_error_to_string(e));
 				goto exit;
 			}
-			gf_sk_set_buffer_size(audio_input_udp_sk, 0, UDP_BUFFER_SIZE);
+			gf_sk_set_buffer_size(audio_input_udp_sk, 0, GF_M2TS_UDP_BUFFER_SIZE);
 			gf_sk_set_block_mode(audio_input_udp_sk, 0);
 
 			/*allocate data buffer*/
@@ -2519,7 +2634,7 @@
 				gf_fwrite(ts_pck, 1, 188 * nb_pck_in_pack, ts_output_file);
 				if (segment_duration && (muxer->time.sec > prev_seg_time.sec + segment_duration)) {
 					prev_seg_time = muxer->time;
-					fclose(ts_output_file);
+					gf_fclose(ts_output_file);
 					segment_index++;
 					if (segment_dir) {
 						if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
@@ -2530,7 +2645,7 @@
 					} else {
 						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
 					}
-					ts_output_file = fopen(segment_name, "wb");
+					ts_output_file = gf_fopen(segment_name, "wb");
 					if (!ts_output_file) {
 						fprintf(stderr, "Error opening %s\n", segment_name);
 						goto exit;
@@ -2604,7 +2719,7 @@
 			u32 now=gf_sys_clock();
 			if (now > last_print_time + MP42TS_PRINT_TIME_MS) {
 				last_print_time = now;
-				fprintf(stderr, "M2TS: time % 6d - TS time % 6d - avg bitrate % 8d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
+				fprintf(stderr, "M2TS: time % 6d - TS time % 6d - bitrate % 8d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
 
 				if (gf_prompt_has_input()) {
 					char c = gf_prompt_get_char();
@@ -2640,10 +2755,10 @@
 
 	{
 		u64 bits = muxer->tot_pck_sent*8*188;
-		u32 dur_sec = gf_m2ts_get_ts_clock(muxer) / 1000;
-		if (!dur_sec) dur_sec = 1;
-		fprintf(stderr, "Done muxing - %d sec - average rate %d kbps "LLD" packets written\n", dur_sec, (u32) (bits/dur_sec/1000), muxer->tot_pck_sent);
-		fprintf(stderr, "\tPadding: "LLD" packets - "LLD" PES padded bytes (%g kbps)\n", muxer->tot_pad_sent, muxer->tot_pes_pad_bytes, (Double) (muxer->tot_pes_pad_bytes*8.0/dur_sec/1000) );
+		u64 dur_ms = gf_m2ts_get_ts_clock(muxer);
+		if (!dur_ms) dur_ms = 1;
+		fprintf(stderr, "Done muxing - %.02f sec - %sbitrate %d kbps "LLD" packets written\n", ((Double) dur_ms)/1000.0,mux_rate ? "" : "average ", (u32) (bits/dur_ms), muxer->tot_pck_sent);
+		fprintf(stderr, " Padding: "LLD" packets (%g kbps) - "LLD" PES padded bytes (%g kbps)\n", muxer->tot_pad_sent, (Double) (muxer->tot_pad_sent*188*8.0/dur_ms) , muxer->tot_pes_pad_bytes, (Double) (muxer->tot_pes_pad_bytes*8.0/dur_ms) );
 	}
 
 exit:
@@ -2652,7 +2767,7 @@
 	if (segment_duration) {
 		write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index - segment_number, segment_index, 1);
 	}
-	if (ts_output_file && !is_stdout) fclose(ts_output_file);
+	if (ts_output_file && !is_stdout) gf_fclose(ts_output_file);
 	if (ts_output_udp_sk) gf_sk_del(ts_output_udp_sk);
 #ifndef GPAC_DISABLE_STREAMING
 	if (ts_output_rtp) gf_rtp_del(ts_output_rtp);
@@ -2681,7 +2796,10 @@
 			}
 		}
 		if (sources[i].iod) gf_odf_desc_del((GF_Descriptor*)sources[i].iod);
+#ifndef GPAC_DISABLE_ISOM
 		if (sources[i].mp4) gf_isom_close(sources[i].mp4);
+#endif
+
 #ifndef GPAC_DISABLE_SENG
 		if (sources[i].seng) {
 			gf_seng_terminate(sources[i].seng);
@@ -2695,12 +2813,12 @@
 	if (aac_reader) AAC_Reader_del(aac_reader);
 #endif
 
-	if (logfile) fclose(logfile);
+	if (logfile) gf_fclose(logfile);
 	gf_sys_close();
 
 #ifdef GPAC_MEMORY_TRACKING
-	if (enable_mem_tracker && (gf_memory_size() != 0)) {
- gf_memory_print();
+	if (enable_mem_tracker && (gf_memory_size() || gf_file_handles_count() )) {
+		gf_memory_print();
 		return 2;
 	}
 #endif

v0.5.2.tar.gz/applications/mp4box/Makefile -> v0.6.1.tar.gz/applications/mp4box/Makefile Changed

@@ -14,53 +14,43 @@
 LDFLAGS+=-pg
 endif
 
-#common obj
-OBJS=main.o filedump.o fileimport.o 
-ifeq ($(DISABLE_STREAMING),no)
-OBJS+=live.o
+LINKFLAGS=-L../../bin/gcc -L../../extra_lib/lib/gcc
+
+ifeq ($(STATICBUILD),yes)
+##include static modules and other deps for libgpac
+include ../../static.mak
+LINKFLAGS+=-lgpac_static
+LINKFLAGS+=$(EXTRALIBS)
+else
+LINKFLAGS+=-lgpac
 endif
 
-LINKFLAGS=-L../../bin/gcc -L../../extra_lib/lib/gcc
 
 ifeq ($(CONFIG_WIN32),yes)
 EXE=.exe
 PROG=MP4Box$(EXE)
-ifeq ($(MP4BOX_STATIC),yes)
-ifneq ($(CONFIG_ZLIB),no)
-LINKFLAGS+=-lz
-endif
-LINKFLAGS+=-lgpac_static $(EXTRALIBS)
-else
-LINKFLAGS+=-lgpac
-endif
+LINKFLAGS+=-municode
 
 else
 
 EXT=
 PROG=MP4Box
+
 ifeq ($(MP4BOX_STATIC),yes)
-ifneq ($(CONFIG_ZLIB),no)
-LINKFLAGS+=-lz
+LINKFLAGS+= $(GPAC_SH_FLAGS)
 endif
-LINKFLAGS+=-lgpac_static $(EXTRALIBS) $(GPAC_SH_FLAGS)
 
-# spidermonkey support
-ifeq ($(CONFIG_JS),no)
-else
-SCENEGRAPH_CFLAGS+=$(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB="yes"
-endif
-LINKFLAGS+=$(JS_LIBS)
 endif
 
-else
-LINKFLAGS+=-lgpac
-endif
 
+#common obj
+OBJS=main.o filedump.o fileimport.o 
+ifeq ($(DISABLE_STREAMING),no)
+OBJS+=live.o
 endif
 
 
+
 SRCS := $(OBJS:.o=.c) 
 
 all: $(PROG)

v0.5.2.tar.gz/applications/mp4box/filedump.c -> v0.6.1.tar.gz/applications/mp4box/filedump.c Changed

@@ -82,7 +82,7 @@
 	return lcode;
 }
 
-GF_Err dump_cover_art(GF_ISOFile *file, char *inName)
+GF_Err dump_isom_cover_art(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
 	const char *tag;
 	char szName[1024];
@@ -97,11 +97,23 @@
 		return e;
 	}
 
-	sprintf(szName, "%s.%s", inName, (tag_len>>31) ? "png" : "jpg");
-	t = gf_f64_open(szName, "wb");
+	if (inName) {
+		if (is_final_name) {
+			strcpy(szName, inName);
+		} else {
+			sprintf(szName, "%s.%s", inName, (tag_len>>31) ? "png" : "jpg");
+		}
+		t = gf_fopen(szName, "wb");
+		if (!t) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szName);
+			return GF_IO_ERR;
+		}
+	} else {
+		t = stdout;
+	}
 	gf_fwrite(tag, tag_len & 0x7FFFFFFF, 1, t);
 
-	fclose(t);
+	if (inName) gf_fclose(t);
 	return GF_OK;
 }
 
@@ -113,13 +125,13 @@
 	char *tag, *ext;
 	FILE *t;
 	u32 tag_len;
-	t = gf_f64_open(inName, "rb");
-	gf_f64_seek(t, 0, SEEK_END);
-	tag_len = (u32) gf_f64_tell(t);
-	gf_f64_seek(t, 0, SEEK_SET);
+	t = gf_fopen(inName, "rb");
+	gf_fseek(t, 0, SEEK_END);
+	tag_len = (u32) gf_ftell(t);
+	gf_fseek(t, 0, SEEK_SET);
 	tag = gf_malloc(sizeof(char) * tag_len);
 	tag_len = (u32) fread(tag, sizeof(char), tag_len, t);
-	fclose(t);
+	gf_fclose(t);
 
 	ext = strrchr(inName, '.');
 	if (!stricmp(ext, ".png")) tag_len |= 0x80000000;
@@ -132,7 +144,7 @@
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
 
-GF_Err dump_file_text(char *file, char *inName, GF_SceneDumpFormat dump_mode, Bool do_log)
+GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log)
 {
 	GF_Err e;
 	GF_SceneManager *ctx;
@@ -188,7 +200,7 @@
 	if (do_log) {
 		char szLog[GF_MAX_PATH];
 		sprintf(szLog, "%s_dec.logs", inName);
-		logs = gf_f64_open(szLog, "wt");
+		logs = gf_fopen(szLog, "wt");
 
 		gf_log_set_tool_level(GF_LOG_CODING, GF_LOG_DEBUG);
 		prev_logs = gf_log_set_callback(logs, scene_coding_log);
@@ -199,7 +211,7 @@
 	if (logs) {
 		gf_log_set_tool_level(GF_LOG_CODING, GF_LOG_ERROR);
 		gf_log_set_callback(NULL, prev_logs);
-		fclose(logs);
+		gf_fclose(logs);
 	}
 	if (!e && dump_mode != GF_SM_DUMP_SVG) {
 		u32 count = gf_list_count(ctx->streams);
@@ -208,7 +220,7 @@
 		else
 			fprintf(stderr, "Scene loaded - dumping root scene\n");
 
-		e = gf_sm_dump(ctx, inName, dump_mode);
+		e = gf_sm_dump(ctx, inName, is_final_name, dump_mode);
 	}
 
 	gf_sm_del(ctx);
@@ -343,7 +355,7 @@
 	gf_list_add(sample_list, au);
 }
 
-void dump_scene_stats(char *file, char *inName, u32 stat_level)
+void dump_isom_scene_stats(char *file, char *inName, Bool is_final_name, u32 stat_level)
 {
 	GF_Err e;
 	FILE *dump;
@@ -385,11 +397,15 @@
 
 	if (inName) {
 		strcpy(szBuf, inName);
-		strcat(szBuf, "_stat.xml");
-		dump = gf_f64_open(szBuf, "wt");
+		if (!is_final_name) strcat(szBuf, "_stat.xml");
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			return;
+		}
 		close = 1;
 	} else {
-		dump = stderr;
+		dump = stdout;
 		close = 0;
 	}
 
@@ -467,7 +483,7 @@
 	} else {
 		fprintf(dump, "</SceneStatistics>\n");
 	}
-	if (dump && close) fclose(dump);
+	if (dump && close) gf_fclose(dump);
 	fprintf(stderr, "done\n");
 }
 #endif /*GPAC_DISABLE_SCENE_STATS*/
@@ -735,19 +751,25 @@
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
-void dump_isom_xml(GF_ISOFile *file, char *inName)
+void dump_isom_xml(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
 	FILE *dump;
 	char szBuf[1024];
 
 	if (inName) {
 		strcpy(szBuf, inName);
-		strcat(szBuf, "_info.xml");
-		dump = gf_f64_open(szBuf, "wt");
-		gf_isom_dump(file, dump);
-		fclose(dump);
+		if (!is_final_name) {
+			strcat(szBuf, "_info.xml");
+		}
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s\n", szBuf);
+		} else {
+			gf_isom_dump(file, dump);
+			gf_fclose(dump);
+		}
 	} else {
-		gf_isom_dump(file, stderr);
+		gf_isom_dump(file, stdout);
 	}
 }
 #endif
@@ -755,7 +777,7 @@
 
 #if !defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_ISOM_DUMP)
 
-void dump_file_rtp(GF_ISOFile *file, char *inName)
+void dump_isom_rtp(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
 	u32 i, j, size;
 	FILE *dump;
@@ -764,10 +786,14 @@
 
 	if (inName) {
 		strcpy(szBuf, inName);
-		strcat(szBuf, "_rtp.xml");
-		dump = gf_f64_open(szBuf, "wt");
+		if (!is_final_name) strcat(szBuf, "_rtp.xml");
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s\n", szBuf);
+			return;
+		}
 	} else {
-		dump = stderr;
+		dump = stdout;
 	}
 
 	fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
@@ -787,11 +813,11 @@
 		fprintf(dump, "</RTPHintTrack>\n");
 	}
 	fprintf(dump, "</RTPFile>\n");
-	if (inName) fclose(dump);
+	if (inName) gf_fclose(dump);
 }
 #endif
 
-void dump_file_timestamps(GF_ISOFile *file, char *inName)
+void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
 	u32 i, j, k, count;
 	Bool has_error;
@@ -800,10 +826,14 @@
 
 	if (inName) {
 		strcpy(szBuf, inName);
-		strcat(szBuf, "_ts.txt");
-		dump = gf_f64_open(szBuf, "wt");
+		if (!is_final_name) strcat(szBuf, "_ts.txt");
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s\n", szBuf);
+			return;
+		}
 	} else {
-		dump = stderr;
+		dump = stdout;
 	}
 
 	has_error = 0;
@@ -820,6 +850,10 @@
 			s32 roll_distance;
 			u32 index;
 			GF_ISOSample *samp = gf_isom_get_sample_info(file, i+1, j+1, &index, &offset);
+			if (!samp) {
+				fprintf(dump, " SAMPLE #%d IN TRACK #%d NOT THERE !!!\n", j+1, i+1);
+				continue;
+			}
 			gf_isom_get_sample_flags(file, i+1, j+1, &isLeading, &dependsOn, &dependedOn, &redundant);
 			gf_isom_get_sample_rap_roll_info(file, i+1, j+1, &is_rap, &has_roll, &roll_distance);
 			dts = samp->DTS;
@@ -859,12 +893,11 @@
 		fprintf(dump, "\n\n");
 		gf_set_progress("Analysing Track Timing", count, count);
 	}
-	if (inName) fclose(dump);
+	if (inName) gf_fclose(dump);
 	if (has_error) fprintf(stderr, "\tFile has CTTS table errors\n");
 }
 
 
-#ifndef GPAC_DISABLE_AV_PARSERS
 
 static u32 read_nal_size_hdr(char *ptr, u32 nalh_size)
 {
@@ -879,7 +912,43 @@
 	return nal_size;
 }
 
-static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, Bool is_hevc, AVCState *avc, u32 nalh_size)
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+static void dump_sei(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_hevc)
+{
+	u32 sei_idx=0;
+	u32 i=2;
+	fprintf(dump, " SEI=\"");
+	while (i+1 < ptr_size) {
+		u32 sei_type = 0;
+		u32 sei_size = 0;
+		while (ptr[i] == 0xFF) {
+			sei_type+= 255;
+			i++;
+		}
+		sei_type += ptr[i];
+		i++;
+		while (ptr[i] == 0xFF) {
+			sei_size += 255;
+			i++;
+		}
+		sei_size += ptr[i];
+		i++;
+		i+=sei_size;
+
+		if (sei_idx) fprintf(dump, ",");
+		fprintf(dump, "(type=%u, size=%u)", sei_type, sei_size);
+		sei_idx++;
+		if (ptr[i]== 0x80) {
+			i=ptr_size;
+			break;
+		}
+	}
+	if (i!=ptr_size) fprintf(dump, "(garbage at end)");
+	fprintf(dump, "\"");
+}
+
+static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size)
 {
 	s32 res;
 	u8 type;
@@ -889,9 +958,11 @@
 	u32 data_offset, idx, data_size;
 	GF_BitStream *bs;
 
-	if (is_hevc) {
+	if (hevc) {
 #ifndef GPAC_DISABLE_HEVC
-		type = (ptr[0] & 0x7E) >> 1;
+		bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+		res = gf_media_hevc_parse_nalu(bs, hevc, &type, &temporal_id, &quality_id);
+
 		fprintf(dump, "code=\"%d\" type=\"", type);
 		switch (type) {
 		case GF_HEVC_NALU_SLICE_TRAIL_N:
@@ -944,12 +1015,15 @@
 			break;
 
 		case GF_HEVC_NALU_VID_PARAM:
+			gf_media_hevc_read_vps(ptr, ptr_size, hevc);
 			fputs("Video Parameter Set", dump);
 			break;
 		case GF_HEVC_NALU_SEQ_PARAM:
+			gf_media_hevc_read_sps(ptr, ptr_size, hevc);
 			fputs("Sequence Parameter Set", dump);
 			break;
 		case GF_HEVC_NALU_PIC_PARAM:
+			gf_media_hevc_read_pps(ptr, ptr_size, hevc);
 			fputs("Picture Parameter Set", dump);
 			break;
 		case GF_HEVC_NALU_ACCESS_UNIT:
@@ -986,13 +1060,26 @@
 			break;
 		}
 		fputs("\"", dump);
-		fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", ((ptr[0] & 0x1) << 5) | (ptr[1]>>3), (ptr[1] & 0x7) );
+
+		if ((type==GF_HEVC_NALU_SEI_PREFIX) || (type==GF_HEVC_NALU_SEI_SUFFIX)) {
+			dump_sei(dump, (u8 *) ptr, ptr_size, hevc ? GF_TRUE : GF_FALSE);
+		}
+
+		if (type<GF_HEVC_NALU_VID_PARAM) {
+
+			fprintf(dump, " slice=\"%s\" poc=\"%d\"", (hevc->s_info.slice_type==GF_HEVC_TYPE_I) ? "I" : (hevc->s_info.slice_type==GF_HEVC_TYPE_P) ? "P" : (hevc->s_info.slice_type==GF_HEVC_TYPE_B) ? "B" : "Unknown", hevc->s_info.poc);
+			fprintf(dump, " first_slice_in_pic=\"%d\"", hevc->s_info.first_slice_segment_in_pic_flag);
+			fprintf(dump, " dependent_slice_segment=\"%d\"", hevc->s_info.dependent_slice_segment_flag);
+		}
+
+		fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", quality_id, temporal_id);
+
 #endif //GPAC_DISABLE_HEVC
 		return;
 	}
 
 	bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
-	type = ptr[0] & 0x1F;
+	type = gf_bs_read_u8(bs) & 0x1F;
 	fprintf(dump, "code=\"%d\" type=\"", type);
 	res = 0;
 	switch (type) {
@@ -1087,6 +1174,11 @@
 		break;
 	}
 	fputs("\"", dump);
+
+	if (type==GF_AVC_NALU_SEI) {
+		dump_sei(dump, (u8 *) ptr, ptr_size, GF_FALSE);
+	}
+
 	if (res<0)
 		fprintf(dump, " status=\"error decoding slice\"");
 
@@ -1094,7 +1186,7 @@
 }
 #endif
 
-void dump_file_nal(GF_ISOFile *file, u32 trackID, char *inName)
+void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name)
 {
 	u32 i, count, track, nalh_size, timescale, cur_extract_mode;
 	FILE *dump;
@@ -1103,22 +1195,40 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 	Bool is_hevc = GF_FALSE;
 	AVCState avc;
+	HEVCState hevc;
 	GF_AVCConfig *avccfg, *svccfg;
 	GF_HEVCConfig *hevccfg, *shvccfg;
 	GF_AVCConfigSlot *slc;
+#endif
 
+	track = gf_isom_get_track_by_id(file, trackID);
+	nalh_size = 0;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
 	memset(&avc, 0, sizeof(AVCState));
+	avccfg = gf_isom_avc_config_get(file, track, 1);
+	svccfg = gf_isom_svc_config_get(file, track, 1);
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevccfg = gf_isom_hevc_config_get(file, track, 1);
+	shvccfg = gf_isom_shvc_config_get(file, track, 1);
+	if (!avccfg && !svccfg && !hevccfg && !shvccfg) {
+		fprintf(stderr, "Error: Track #%d is not NALU-based!\n", trackID);
+		return;
+	}
 #endif
 
 	if (inName) {
 		char szBuf[GF_MAX_PATH];
 		strcpy(szBuf, inName);
-		sprintf(szBuf, "%s_%d_nalu.xml", inName, trackID);
-		dump = gf_f64_open(szBuf, "wt");
+		if (!is_final_name) sprintf(szBuf, "%s_%d_nalu.xml", inName, trackID);
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			return;
+		}
+		dump = gf_fopen(szBuf, "wt");
 	} else {
-		dump = stderr;
+		dump = stdout;
 	}
-	track = gf_isom_get_track_by_id(file, trackID);
 
 	count = gf_isom_get_sample_count(file, track);
 
@@ -1129,10 +1239,6 @@
 	fprintf(dump, "<NALUTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	avccfg = gf_isom_avc_config_get(file, track, 1);
-	svccfg = gf_isom_svc_config_get(file, track, 1);
-	hevccfg = gf_isom_hevc_config_get(file, track, 1);
-	shvccfg = gf_isom_shvc_config_get(file, track, 1);
 	//for tile tracks the hvcC is stored in the 'tbas' track
 	if (!hevccfg && gf_isom_get_reference_count(file, track, GF_4CC('t','b','a','s'))) {
 		u32 tk = 0;
@@ -1146,7 +1252,7 @@
 		for (i=0; i<gf_list_count(arr); i++) {\
 			slc = gf_list_get(arr, i);\
 			fprintf(dump, " <%s number=\"%d\" size=\"%d\" ", name, i+1, slc->size);\
-			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc, &avc, nalh_size);\
+			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size);\
 			fprintf(dump, "/>\n");\
 		}\
 	}\
@@ -1203,6 +1309,7 @@
 		}
 #endif
 	}
+
 #endif
 	fprintf(dump, " </NALUConfig>\n");
 
@@ -1263,7 +1370,7 @@
 			} else {
 				fprintf(dump, " <NALU number=\"%d\" size=\"%d\" ", idx, nal_size);
 #ifndef GPAC_DISABLE_AV_PARSERS
-				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc, &avc, nalh_size);
+				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size);
 #endif
 				fprintf(dump, "/>\n");
 			}
@@ -1280,7 +1387,7 @@
 	fprintf(dump, " </NALUSamples>\n");
 	fprintf(dump, "</NALUTrack>\n");
 
-	if (inName) fclose(dump);
+	if (inName) gf_fclose(dump);
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (avccfg) gf_odf_avc_cfg_del(avccfg);
 	if (svccfg) gf_odf_avc_cfg_del(svccfg);
@@ -1295,7 +1402,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
-void dump_file_ismacryp(GF_ISOFile *file, char *inName)
+void dump_isom_ismacryp(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
 	u32 i, j;
 	FILE *dump;
@@ -1303,10 +1410,14 @@
 
 	if (inName) {
 		strcpy(szBuf, inName);
-		strcat(szBuf, "_ismacryp.xml");
-		dump = gf_f64_open(szBuf, "wt");
+		if (!is_final_name) strcat(szBuf, "_ismacryp.xml");
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			return;
+		}
 	} else {
-		dump = stderr;
+		dump = stdout;
 	}
 
 	fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
@@ -1326,11 +1437,11 @@
 		fprintf(dump, "</ISMACrypTrack >\n");
 	}
 	fprintf(dump, "</ISMACrypFile>\n");
-	if (inName) fclose(dump);
+	if (inName) gf_fclose(dump);
 }
 
 
-void dump_timed_text_track(GF_ISOFile *file, u32 trackID, char *inName, Bool is_convert, GF_TextDumpType dump_type)
+void dump_isom_timed_text(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool is_convert, GF_TextDumpType dump_type)
 {
 	FILE *dump;
 	GF_Err e;
@@ -1355,16 +1466,23 @@
 	if (inName) {
 		char *ext;
 		ext = ((dump_type==GF_TEXTDUMPTYPE_SVG) ? "svg" : ((dump_type==GF_TEXTDUMPTYPE_SRT) ? "srt" : "ttxt"));
-		if (is_convert)
+		if (is_final_name) {
+			strcpy(szBuf, inName) ;
+		} else if (is_convert)
 			sprintf(szBuf, "%s.%s", inName, ext) ;
 		else
 			sprintf(szBuf, "%s_%d_text.%s", inName, trackID, ext);
-		dump = gf_f64_open(szBuf, "wt");
+		
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			return;
+		}
 	} else {
 		dump = stdout;
 	}
 	e = gf_isom_text_dump(file, track, dump, dump_type);
-	if (inName) fclose(dump);
+	if (inName) gf_fclose(dump);
 
 	if (e) fprintf(stderr, "Conversion failed (%s)\n", gf_error_to_string(e));
 	else fprintf(stderr, "Conversion done\n");
@@ -1374,7 +1492,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
-void DumpSDP(GF_ISOFile *file, char *inName)
+void dump_isom_sdp(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
 	const char *sdp;
 	u32 size, i;
@@ -1384,12 +1502,18 @@
 	if (inName) {
 		char *ext;
 		strcpy(szBuf, inName);
-		ext = strchr(szBuf, '.');
-		if (ext) ext[0] = 0;
-		strcat(szBuf, "_sdp.txt");
-		dump = gf_f64_open(szBuf, "wt");
+		if (!is_final_name) {
+			ext = strchr(szBuf, '.');
+			if (ext) ext[0] = 0;
+			strcat(szBuf, "_sdp.txt");
+		}
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			return;
+		}
 	} else {
-		dump = stderr;
+		dump = stdout;
 		fprintf(dump, "* File SDP content *\n\n");
 	}
 	//get the movie SDP
@@ -1404,7 +1528,7 @@
 		fprintf(dump, "%s", sdp);
 	}
 	fprintf(dump, "\n\n");
-	if (inName) fclose(dump);
+	if (inName) gf_fclose(dump);
 }
 
 #endif
@@ -1473,7 +1597,7 @@
 	fprintf(stderr, "\n");
 }
 
-GF_Err dump_udta(GF_ISOFile *file, char *inName, u32 dump_udta_type, u32 dump_udta_track)
+GF_Err dump_isom_udta(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_udta_type, u32 dump_udta_track)
 {
 	char szName[1024], *data;
 	FILE *t;
@@ -1494,16 +1618,24 @@
 	if (e) {
 		fprintf(stderr, "Error dumping UDTA %s: %s\n", gf_4cc_to_str(dump_udta_type), gf_error_to_string(e) );
 		return e;
-	} 
-	sprintf(szName, "%s_%s.udta", inName, gf_4cc_to_str(dump_udta_type) );
-	t = fopen(szName, "wb");
-	if (!t) {
-		gf_free(data);
-		fprintf(stderr, "Cannot open file %s\n", szName );
-		return GF_IO_ERR;
+	}
+	if (inName) {
+		if (is_final_name)
+			strcpy(szName, inName);
+		else
+			sprintf(szName, "%s_%s.udta", inName, gf_4cc_to_str(dump_udta_type) );
+		
+		t = gf_fopen(szName, "wb");
+		if (!t) {
+			gf_free(data);
+			fprintf(stderr, "Cannot open file %s\n", szName );
+			return GF_IO_ERR;
+		}
+	} else {
+		t = stdout;
 	}
 	res = (u32) fwrite(data, 1, count, t);
-	fclose(t);
+	if (inName) gf_fclose(t);
 	gf_free(data);
 	if (count != res) {
 		fprintf(stderr, "Error writing udta to file\n");
@@ -1514,25 +1646,27 @@
 }
 
 
-GF_Err dump_chapters(GF_ISOFile *file, char *inName, Bool dump_ogg)
+GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, Bool dump_ogg)
 {
 	char szName[1024];
 	FILE *t;
 	u32 i, count;
 	count = gf_isom_get_chapter_count(file, 0);
-	strcpy(szName, inName);
-	if (dump_ogg) {
-		strcat(szName, ".txt");
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Extracting OGG chapters to %s\n", szName));
-	}
-	else {
-		strcat(szName, ".chap");
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Extracting chapters to %s\n", szName));
+	if (inName) {
+		strcpy(szName, inName);
+		if (!is_final_name) {
+			if (dump_ogg) {
+				strcat(szName, ".txt");
+			} else {
+				strcat(szName, ".chap");
+			}
+		}
+		t = gf_fopen(szName, "wt");
+		if (!t) return GF_IO_ERR;
+	} else {
+		t = stdout;
 	}
 
-	t = gf_f64_open(szName, "wt");
-	if (!t) return GF_IO_ERR;
-
 	for (i=0; i<count; i++) {
 		u64 chapter_time;
 		const char *name;
@@ -1546,7 +1680,7 @@
 			fprintf(t, "AddChapterBySecond("LLD",%s)\n", chapter_time, name);
 		}
 	}
-	fclose(t);
+	if (inName) gf_fclose(t);
 	return GF_OK;
 }
 
@@ -1587,7 +1721,22 @@
 	}
 }
 
-#ifndef GPAC_DISABLE_HEVC
+
+static void print_config_hash(GF_List *xps_array, char *szName)
+{
+	u32 i, j;
+	GF_AVCConfigSlot *slc;
+	u8 hash[20];
+	for (i=0; i<gf_list_count(xps_array); i++) {
+		slc = gf_list_get(xps_array, i);
+		gf_sha1_csum((u8 *) slc->data, slc->size, hash);
+		fprintf(stderr, "\t%s#%d hash: ", szName, i+1);
+		for (j=0; j<20; j++) fprintf(stderr, "%02X", hash[j]);
+		fprintf(stderr, "\n");
+	}
+}
+
+#if !defined(GPAC_DISABLE_HEVC) && !defined( GPAC_DISABLE_AV_PARSERS)
 void dump_hevc_track_info(GF_ISOFile *file, u32 trackNum, GF_HEVCConfig *hevccfg, HEVCState *hevc_state)
 {
 	u32 k, idx;
@@ -1631,14 +1780,23 @@
 			}
 			fprintf(stderr, "\n");
 		}
+
 	}
 	fprintf(stderr, "\tBit Depth luma %d - Chroma %d - %d temporal layers\n", hevccfg->luma_bit_depth, hevccfg->chroma_bit_depth, hevccfg->numTemporalLayers);
 	if (hevccfg->is_shvc) {
 		fprintf(stderr, "\t%sNum Layers: %d (scalability mask 0x%02X)%s\n", hevccfg->non_hevc_base_layer ? "Non-HEVC base layer - " : "", hevccfg->num_layers, hevccfg->scalability_mask, hevccfg->complete_representation ? "" : " - no VCL data");
 	}
+
+	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
+		GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+		if (ar->type==GF_HEVC_NALU_SEQ_PARAM) print_config_hash(ar->nalus, "SPS");
+		else if (ar->type==GF_HEVC_NALU_PIC_PARAM) print_config_hash(ar->nalus, "PPS");
+		else if (ar->type==GF_HEVC_NALU_VID_PARAM) print_config_hash(ar->nalus, "VPS");
+	}
 }
 #endif
 
+
 void DumpTrackInfo(GF_ISOFile *file, u32 trackID, Bool full_dump)
 {
 	Float scale;
@@ -1657,7 +1815,10 @@
 	}
 
 	timescale = gf_isom_get_media_timescale(file, trackNum);
-	fprintf(stderr, "Track # %d Info - TrackID %d - TimeScale %d - Media Duration %s\n", trackNum, trackID, timescale, format_duration(gf_isom_get_media_duration(file, trackNum), timescale, szDur));
+	fprintf(stderr, "Track # %d Info - TrackID %d - TimeScale %d\n", trackNum, trackID, timescale);
+	fprintf(stderr, "Media Duration %s - ", format_duration(gf_isom_get_media_duration(file, trackNum), timescale, szDur));
+	fprintf(stderr, "Indicated Duration %s\n", format_duration(gf_isom_get_media_original_duration(file, trackNum), timescale, szDur));
+
 	nb_edits = gf_isom_get_edit_segment_count(file, trackNum);
 	if (nb_edits)
 		fprintf(stderr, "Track has %d edit lists: track duration is %s\n", nb_edits, format_duration(gf_isom_get_track_duration(file, trackNum), gf_isom_get_timescale(file), szDur));
@@ -1787,18 +1948,23 @@
 						fprintf(stderr, "\tAVC Info: %d SPS - %d PPS", gf_list_count(avccfg->sequenceParameterSets) , gf_list_count(avccfg->pictureParameterSets) );
 						fprintf(stderr, " - Profile %s @ Level %g\n", gf_avc_get_profile_name(avccfg->AVCProfileIndication), ((Double)avccfg->AVCLevelIndication)/10.0 );
 						fprintf(stderr, "\tNAL Unit length bits: %d\n", 8*avccfg->nal_unit_size);
-						slc = gf_list_get(avccfg->sequenceParameterSets, 0);
-						if (slc) {
+						for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
+							slc = gf_list_get(avccfg->sequenceParameterSets, i);
 							gf_avc_get_sps_info(slc->data, slc->size, NULL, NULL, NULL, &par_n, &par_d);
 							if ((par_n>0) && (par_d>0)) {
 								u32 tw, th;
 								gf_isom_get_track_layout_info(file, trackNum, &tw, &th, NULL, NULL, NULL);
 								fprintf(stderr, "\tPixel Aspect Ratio %d:%d - Indicated track size %d x %d\n", par_n, par_d, tw, th);
 							}
+							if (!full_dump) break;
 						}
 						if (avccfg->chroma_bit_depth) {
 							fprintf(stderr, "\tChroma format %d - Luma bit depth %d - chroma bit depth %d\n", avccfg->chroma_format, avccfg->luma_bit_depth, avccfg->chroma_bit_depth);
 						}
+
+						print_config_hash(avccfg->sequenceParameterSets, "SPS");
+						print_config_hash(avccfg->pictureParameterSets, "PPS");
+
 						gf_odf_avc_cfg_del(avccfg);
 					}
 					if (svccfg) {
@@ -1817,6 +1983,10 @@
 								}
 							}
 						}
+						print_config_hash(svccfg->sequenceParameterSets, "SPS");
+						print_config_hash(svccfg->pictureParameterSets, "PPS");
+						print_config_hash(svccfg->sequenceParameterSetExtensions, "SPSEx");
+
 						gf_odf_avc_cfg_del(svccfg);
 					}
 #endif /*GPAC_DISABLE_AV_PARSERS*/
@@ -1916,9 +2086,14 @@
 					if (full_dump) fprintf(stderr, "\t");
 					if (e) fprintf(stderr, "Corrupted AAC Config\n");
 					else {
-						fprintf(stderr, "%s - %d Channel(s) - SampleRate %d", gf_m4a_object_type_name(a_cfg.base_object_type), a_cfg.nb_chan, a_cfg.base_sr);
+						char *heaac = "";
+						if (!is_mp2 && a_cfg.has_sbr) {
+							if (a_cfg.has_ps) heaac = "(HE-AAC v2) ";
+							else heaac = "(HE-AAC v1) ";
+						}
+						fprintf(stderr, "%s %s- %d Channel(s) - SampleRate %d", gf_m4a_object_type_name(a_cfg.base_object_type), heaac, a_cfg.nb_chan, a_cfg.base_sr);
 						if (is_mp2) fprintf(stderr, " (MPEG-2 Signaling)");
-						if (a_cfg.has_sbr) fprintf(stderr, " - SBR SampleRate %d", a_cfg.sbr_sr);
+						if (a_cfg.has_sbr) fprintf(stderr, " - SBR: SampleRate %d Type %s", a_cfg.sbr_sr, gf_m4a_object_type_name(a_cfg.sbr_object_type));
 						if (a_cfg.has_ps) fprintf(stderr, " - PS");
 						fprintf(stderr, "\n");
 					}
@@ -2016,7 +2191,7 @@
 				else
 					fprintf(stderr, "Synchronized on stream %d\n", esd->OCRESID);
 			} else {
-				fprintf(stderr, "\tDecoding Buffer size %d - Average bitrate %d kbps - Max Bitrate %d kbps\n", esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate/1000, esd->decoderConfig->maxBitrate/1000);
+				fprintf(stderr, "\tDecoding Buffer size %d - Bitrate: avg %d - max %d kbps\n", esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate/1000, esd->decoderConfig->maxBitrate/1000);
 				if (esd->dependsOnESID)
 					fprintf(stderr, "\tDepends on stream %d for decoding\n", esd->dependsOnESID);
 				else
@@ -2074,7 +2249,7 @@
 					if (IV_size) fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
 				} else if(gf_isom_is_cenc_media(file, trackNum, 1)) {
 					gf_isom_get_cenc_info(file, trackNum, 1, NULL, &scheme_type, &version, &IV_size);
-					fprintf(stderr, "\n*Encrypted stream - CENC scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
+					fprintf(stderr, "\n*Encrypted stream - CENC scheme %s (version: major=%u, minor=%u)\n", gf_4cc_to_str(scheme_type), (version&0xFFFF0000)>>16, version&0xFFFF);
 					if (IV_size) fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
 				} else if(gf_isom_is_adobe_protection_media(file, trackNum, 1)) {
 					gf_isom_get_adobe_protection_info(file, trackNum, 1, NULL, &scheme_type, &version);
@@ -2162,18 +2337,76 @@
 		u32 w, h;
 		s16 l;
 		s32 tx, ty;
+		const char *content_encoding = NULL;
+		const char *mime = NULL;
+		const char *config = NULL;
+		const char *_namespace = NULL;
+		const char *schema_loc = NULL;
+		const char *auxiliary_mimes = NULL;
 		gf_isom_get_track_layout_info(file, trackNum, &w, &h, &tx, &ty, &l);
-		fprintf(stderr, "Timed Text - Size %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
+		if (msub_type == GF_ISOM_SUBTYPE_SBTT) {
+			gf_isom_stxt_get_description(file, trackNum, 1, &mime, &content_encoding, &config);
+			fprintf(stderr, "Textual Subtitle Stream ");
+			fprintf(stderr, "- mime %s", mime);
+			if (content_encoding != NULL) {
+				fprintf(stderr, " - encoding %s", content_encoding);
+			}
+			if (config != NULL) {
+				fprintf(stderr, " - %d bytes config", (u32) strlen(config));
+			}
+		} else if (msub_type == GF_ISOM_SUBTYPE_STXT) {
+			gf_isom_stxt_get_description(file, trackNum, 1, &mime, &content_encoding, &config);
+			fprintf(stderr, "Simple Timed Text Stream ");
+			fprintf(stderr, "- mime %s", mime);
+			if (content_encoding != NULL) {
+				fprintf(stderr, " - encoding %s", content_encoding);
+			}
+			if (config != NULL) {
+				fprintf(stderr, " - %d bytes config", (u32) strlen(config));
+			}
+		} else if (msub_type == GF_ISOM_SUBTYPE_STPP) {
+			gf_isom_xml_subtitle_get_description(file, trackNum, 1, &_namespace, &schema_loc, &auxiliary_mimes);
+			fprintf(stderr, "XML Subtitle Stream ");
+			fprintf(stderr, "- namespace %s", _namespace);
+			if (schema_loc != NULL) {
+				fprintf(stderr, " - schema-location %s", schema_loc);
+			}
+			if (auxiliary_mimes != NULL) {
+				fprintf(stderr, " - auxiliary-mime-types %s", auxiliary_mimes);
+			}
+		} else {
+			fprintf(stderr, "Unknown Text Stream");
+		}
+		fprintf(stderr, "\n Size %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
 	} else if (mtype == GF_ISOM_MEDIA_META) {
-		Bool is_xml = 0;
-		const char *mime_or_namespace = NULL;
 		const char *content_encoding = NULL;
-		const char *schema_loc = NULL;
-		gf_isom_get_timed_meta_data_info(file, trackNum, 1, &is_xml, &mime_or_namespace, &content_encoding, &schema_loc);
-		fprintf(stderr, "%s Metadata stream\n\t%s %s\n\tencoding %s", is_xml ? "Xml" : "Text", is_xml ? "namespace" : "mime-type", mime_or_namespace, content_encoding);
-		if (is_xml && schema_loc != NULL)
-			fprintf(stderr, "\n\tschema %s\n", schema_loc);
-		fprintf(stderr, "\n");
+		if (msub_type == GF_ISOM_SUBTYPE_METT) {
+			const char *mime = NULL;
+			const char *config = NULL;
+			gf_isom_stxt_get_description(file, trackNum, 1, &mime, &content_encoding, &config);
+			fprintf(stderr, "Textual Metadata Stream - mime %s", mime);
+			if (content_encoding != NULL) {
+				fprintf(stderr, " - encoding %s", content_encoding);
+			}
+			if (config != NULL) {
+				fprintf(stderr, " - %d bytes config", (u32) strlen(config));
+			}
+			fprintf(stderr, "\n");
+		} else if (msub_type == GF_ISOM_SUBTYPE_METX) {
+			const char *_namespace = NULL;
+			const char *schema_loc = NULL;
+			gf_isom_get_xml_metadata_description(file, trackNum, 1, &_namespace, &schema_loc, &content_encoding);
+			fprintf(stderr, "XML Metadata Stream - namespace %s", _namespace);
+			if (content_encoding != NULL) {
+				fprintf(stderr, " - encoding %s", content_encoding);
+			}
+			if (schema_loc != NULL) {
+				fprintf(stderr, " - schema-location %s", schema_loc);
+			}
+			fprintf(stderr, "\n");
+		} else {
+			fprintf(stderr, "Unknown Metadata Stream\n");
+		}
 	} else {
 		GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(file, trackNum, 1);
 		if (udesc) {
@@ -2197,6 +2430,12 @@
 		}
 	}
 
+	{
+		char szCodec[100];
+		gf_media_get_rfc_6381_codec_name(file, trackNum, szCodec, GF_FALSE, GF_FALSE);
+		fprintf(stderr, "\tRFC6381 Codec Parameters: %s\n", szCodec);
+	}
+
 	DumpMetaItem(file, 0, trackNum, "Track Meta");
 
 	gf_isom_get_track_switch_group_count(file, trackNum, &alt_group, &nb_groups);
@@ -2222,6 +2461,25 @@
 		}
 	}
 
+	switch (gf_isom_has_sync_points(file, trackNum)) {
+	case 0:
+		fprintf(stderr, "\tAll samples are sync\n");
+		break;
+	case 1:
+	{
+		u32 nb_sync = gf_isom_get_sync_point_count(file, trackNum) - 1;
+		if (! nb_sync) {
+			fprintf(stderr, "\tOnly one sync sample\n");
+		} else {
+			fprintf(stderr, "\tAverage GOP length: %d samples\n", gf_isom_get_sample_count(file, trackNum) / nb_sync);
+		}
+	}
+	break;
+	case 2:
+		fprintf(stderr, "\tNo sync sample found\n");
+		break;
+	}
+
 	if (!full_dump) {
 		fprintf(stderr, "\n");
 		return;
@@ -2355,8 +2613,11 @@
 	}
 
 	timescale = gf_isom_get_timescale(file);
-	fprintf(stderr, "* Movie Info *\n\tTimescale %d - Duration %s\n\t%d track(s)\n",
-	 timescale, format_duration(gf_isom_get_duration(file), timescale, szDur), gf_isom_get_track_count(file));
+	i=gf_isom_get_track_count(file);
+	fprintf(stderr, "* Movie Info *\n\tTimescale %d - %d track%s\n", timescale, i, i>1 ? "s" : "");
+
+	fprintf(stderr, "\tComputed Duration %s", format_duration(gf_isom_get_duration(file), timescale, szDur));
+	fprintf(stderr, " - Indicated Duration %s\n", format_duration(gf_isom_get_original_duration(file), timescale, szDur));
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (gf_isom_is_fragmented(file)) {
@@ -2702,7 +2963,7 @@
 	GF_M2TS_Demuxer *ts;
 	FILE *src;
 
-	src = gf_f64_open(mpeg2ts_file, "rb");
+	src = gf_fopen(mpeg2ts_file, "rb");
 	if (!src) {
 		fprintf(stderr, "Cannot open %s: no such file\n", mpeg2ts_file);
 		return;
@@ -2721,21 +2982,21 @@
 			dumper.dump_pid = atoi(pid+1);
 			pid[0] = 0;
 			sprintf(dumper.dump, "%s_%d.raw", out_name, dumper.dump_pid);
-			dumper.pes_out = gf_f64_open(dumper.dump, "wb");
+			dumper.pes_out = gf_fopen(dumper.dump, "wb");
 #if 0
 			sprintf(dumper.nhml, "%s_%d.nhml", pes_out_name, dumper.dump_pid);
-			dumper.pes_out_nhml = gf_f64_open(dumper.nhml, "wt");
+			dumper.pes_out_nhml = gf_fopen(dumper.nhml, "wt");
 			sprintf(dumper.info, "%s_%d.info", pes_out_name, dumper.dump_pid);
-			dumper.pes_out_info = gf_f64_open(dumper.info, "wb");
+			dumper.pes_out_info = gf_fopen(dumper.info, "wb");
 #endif
 			pid[0] = '#';
 		}
 	}
 
 
-	gf_f64_seek(src, 0, SEEK_END);
-	fsize = gf_f64_tell(src);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_END);
+	fsize = gf_ftell(src);
+	gf_fseek(src, 0, SEEK_SET);
 	fdone = 0;
 
 	/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
@@ -2750,7 +3011,7 @@
 
 	if (prog_num) {
 		sprintf(dumper.timestamps_info_name, "%s_prog_%d_timestamps.txt", mpeg2ts_file, prog_num/*, mpeg2ts_file*/);
-		dumper.timestamps_info_file = gf_f64_open(dumper.timestamps_info_name, "wt");
+		dumper.timestamps_info_file = gf_fopen(dumper.timestamps_info_name, "wt");
 		if (!dumper.timestamps_info_file) {
 			fprintf(stderr, "Cannot open file %s\n", dumper.timestamps_info_name);
 			return;
@@ -2759,7 +3020,7 @@
 	}
 
 	gf_m2ts_reset_parsers(ts);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_SET);
 	fdone = 0;
 
 
@@ -2774,21 +3035,19 @@
 	}
 
 
-	fclose(src);
+	gf_fclose(src);
 	gf_m2ts_demux_del(ts);
-	if (dumper.pes_out) fclose(dumper.pes_out);
+	if (dumper.pes_out) gf_fclose(dumper.pes_out);
 #if 0
 	if (dumper.pes_out_nhml) {
 		if (dumper.is_info_dumped) fprintf(dumper.pes_out_nhml, "</NHNTStream>\n");
-		fclose(dumper.pes_out_nhml);
-		fclose(dumper.pes_out_info);
+		gf_fclose(dumper.pes_out_nhml);
+		gf_fclose(dumper.pes_out_info);
 	}
 #endif
-	if (dumper.timestamps_info_file) fclose(dumper.timestamps_info_file);
+	if (dumper.timestamps_info_file) gf_fclose(dumper.timestamps_info_file);
 
 }
 
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
-
-

v0.5.2.tar.gz/applications/mp4box/fileimport.c -> v0.6.1.tar.gz/applications/mp4box/fileimport.c Changed

@@ -54,6 +54,53 @@
 	GF_List *imports;
 } WGTEnum;
 
+GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array)
+{
+	char *data = NULL;
+	u32 size;
+	bin128 uuid;
+	memset(uuid, 0 , 16);
+
+	if (!udta_type && !is_box_array) return GF_BAD_PARAM;
+
+	if (!src) {
+		return gf_isom_remove_user_data(dest, tracknum, udta_type, uuid);
+	}
+
+#ifndef GPAC_DISABLE_CORE_TOOLS
+	if (!strnicmp(src, "base64", 6)) {
+		src += 7;
+		size = (u32) strlen(src);
+		data = gf_malloc(sizeof(char) * size);
+		size = gf_base64_decode(src, size, data, size);
+	} else
+#endif
+	{
+		FILE *t = gf_fopen(src, "rb");
+		if (!t) return GF_IO_ERR;
+		fseek(t, 0, SEEK_END);
+		size = ftell(t);
+		fseek(t, 0, SEEK_SET);
+		data = gf_malloc(sizeof(char)*size);
+		if (size != fread(data, 1, size, t) ) {
+			gf_free(data);
+			gf_fclose(t);
+			return GF_IO_ERR;
+		}
+		gf_fclose(t);
+	}
+
+	if (size && data) {
+		if (is_box_array) {
+			gf_isom_add_user_data_boxes(dest, tracknum, data, size);
+		} else {
+			gf_isom_add_user_data(dest, tracknum, udta_type, uuid, data, size);
+		}
+		gf_free(data);
+	}
+	return GF_OK;
+}
+
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 
 extern u32 swf_flags;
@@ -194,54 +241,10 @@
 	}
 }
 
-GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array)
-{
-	char *data = NULL;
-	u32 size;
-	bin128 uuid;
-	memset(uuid, 0 , 16);
-
-	if (!udta_type && !is_box_array) return GF_BAD_PARAM;
-
-	if (!src) {
-		return gf_isom_remove_user_data(dest, tracknum, udta_type, uuid);
-	}
-
-	if (!strnicmp(src, "base64", 6)) {
-		src += 7;
-		size = (u32) strlen(src);
-		data = gf_malloc(sizeof(char) * size);
-		size = gf_base64_decode(src, size, data, size);
-	} else {
-		FILE *t = fopen(src, "rb");
-		if (!t) return GF_IO_ERR;
-		fseek(t, 0, SEEK_END);
-		size = ftell(t);
-		fseek(t, 0, SEEK_SET);
-		data = gf_malloc(sizeof(char)*size);
-		if (size != fread(data, 1, size, t) ) {
-			gf_free(data);
-			fclose(t);
-			return GF_IO_ERR;
-		}
-		fclose(t);
-	}
-
-	if (size && data) {
-		if (is_box_array) {
-			gf_isom_add_user_data_boxes(dest, tracknum, data, size);
-		} else {
-			gf_isom_add_user_data(dest, tracknum, udta_type, uuid, data, size);
-		}
-		gf_free(data);
-	}
-	return GF_OK;
-}
-
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample)
 {
 	u32 track_id, i, j, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, tile_mode, txt_flags;
-	s32 par_d, par_n, prog_id, delay;
+	s32 par_d, par_n, prog_id, delay, max_layer_id_plus_one, max_temporal_id_plus_one;
 	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
 	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset, rap_only;
 	u32 group, handler, rvc_predefined, check_track_for_svc, check_track_for_shvc;
@@ -283,6 +286,7 @@
 	tile_mode = 0;
 	rap_only = 0;
 	txt_flags = 0;
+	max_layer_id_plus_one = max_temporal_id_plus_one = -1;
 
 	tw = th = tx = ty = txtw = txth = txtx = txty = 0;
 	par_d = par_n = -2;
@@ -370,6 +374,10 @@
 		}
 		else if (!stricmp(ext+1, "subsamples")) import_flags |= GF_IMPORT_SET_SUBSAMPLES;
 		else if (!stricmp(ext+1, "forcesync")) import_flags |= GF_IMPORT_FORCE_SYNC;
+		else if (!stricmp(ext+1, "xps_inband")) import_flags |= GF_IMPORT_FORCE_XPS_INBAND;
+		else if (!strnicmp(ext+1, "max_lid=", 8)) max_layer_id_plus_one = 1 + atoi(ext+9);
+		else if (!strnicmp(ext+1, "max_tid=", 8)) max_temporal_id_plus_one = 1 + atoi(ext+9);
+
 		/*force all composition offsets to be positive*/
 		else if (!strnicmp(ext+1, "negctts", 7)) negative_cts_offset = 1;
 		else if (!strnicmp(ext+1, "stype=", 6)) {
@@ -462,6 +470,9 @@
 		}
 
 		/*EXPERIMENTAL OPTIONS NOT DOCUMENTED*/
+		else if (!strnicmp(ext+1, "tilesnox", 8)) {
+			tile_mode = 2;
+		}
 		else if (!strnicmp(ext+1, "tiles", 5)) {
 			tile_mode = 1;
 		}
@@ -568,6 +579,10 @@
 	import.video_fps = force_fps;
 	import.frames_per_sample = frames_per_sample;
 	import.flags = import_flags;
+	if (max_layer_id_plus_one>=0)
+		import.max_layer_id_plus_one = (u8) max_layer_id_plus_one;
+	if (max_temporal_id_plus_one>=0)
+		import.max_temporal_id_plus_one = (u8) max_temporal_id_plus_one;
 
 	if (!import.nb_tracks) {
 		u32 count, o_count;
@@ -659,7 +674,9 @@
 				switch (gf_isom_get_media_subtype(import.dest, i+1, 1)) {
 				case GF_ISOM_SUBTYPE_HVC1:
 				case GF_ISOM_SUBTYPE_HEV1:
-					tile_mode = 2;
+					break;
+				default:
+					tile_mode = 0;
 					break;
 				}
 			}
@@ -769,25 +786,29 @@
 			}
 
 			if (rvc_config) {
-				FILE *f = gf_f64_open(rvc_config, "rb");
+				FILE *f = gf_fopen(rvc_config, "rb");
 				if (f) {
 					char *data;
 					u32 size;
 					size_t read;
-					gf_f64_seek(f, 0, SEEK_END);
-					size = (u32) gf_f64_tell(f);
-					gf_f64_seek(f, 0, SEEK_SET);
+					gf_fseek(f, 0, SEEK_END);
+					size = (u32) gf_ftell(f);
+					gf_fseek(f, 0, SEEK_SET);
 					data = gf_malloc(sizeof(char)*size);
 					read = fread(data, 1, size, f);
-					assert(read);
-					assert(read == size);
-					fclose(f);
+					gf_fclose(f);
+					if (read != size) {
+						fprintf(stderr, "Error: could not read rvc config from %s\n", rvc_config);
+						e = GF_IO_ERR;
+						goto exit;
+					}
 #ifdef GPAC_DISABLE_ZLIB
 					fprintf(stderr, "Error: no zlib support - RVC not available\n");
 					e = GF_NOT_SUPPORTED;
 					goto exit;
-#endif
+#else
 					gf_gz_compress_payload(&data, size, &size);
+#endif
 					gf_isom_set_rvc_config(import.dest, track, 1, 0, "application/rvc-config+xml+gz", data, size);
 					gf_free(data);
 				}
@@ -811,7 +832,9 @@
 				switch (gf_isom_get_media_subtype(import.dest, track, 1)) {
 				case GF_ISOM_SUBTYPE_HVC1:
 				case GF_ISOM_SUBTYPE_HEV1:
-					tile_mode = 2;
+					break;
+				default:
+					tile_mode = 0;
 					break;
 				}
 			}
@@ -856,8 +879,8 @@
 			//TODO - merge
 		}
 	}
-	if (tile_mode == 2) {
-		gf_media_split_hevc_tiles(import.dest);
+	if (tile_mode) {
+		e = gf_media_split_hevc_tiles(import.dest, (tile_mode==1) ? GF_TRUE : GF_FALSE);
 	}
 
 
@@ -987,12 +1010,12 @@
 		case GF_ISOM_MEDIA_MPEGJ:
 		case GF_ISOM_MEDIA_MPEG7:
 		case GF_ISOM_MEDIA_FLASH:
-			fprintf(stderr, "WARNING: Track ID %d (type %s) not handled by spliter - skipping\n", gf_isom_get_track_id(mp4, i+1), gf_4cc_to_str(mtype));
+			fprintf(stderr, "WARNING: Track ID %d (type %s) not handled by splitter - skipping\n", gf_isom_get_track_id(mp4, i+1), gf_4cc_to_str(mtype));
 			continue;
 		default:
 			/*for all other track types, only split if more than one sample*/
 			if (gf_isom_get_sample_count(mp4, i+1)==1) {
-				fprintf(stderr, "WARNING: Track ID %d (type %s) not handled by spliter - skipping\n", gf_isom_get_track_id(mp4, i+1), gf_4cc_to_str(mtype));
+				fprintf(stderr, "WARNING: Track ID %d (type %s) not handled by splitter - skipping\n", gf_isom_get_track_id(mp4, i+1), gf_4cc_to_str(mtype));
 				continue;
 			}
 			tks[nb_tk].can_duplicate = 1;
@@ -1024,7 +1047,7 @@
 		nb_tk++;
 	}
 	if (!nb_tk) {
-		fprintf(stderr, "No suitable tracks found for spliting file\n");
+		fprintf(stderr, "No suitable tracks found for splitting file\n");
 		gf_free(tks);
 		return GF_NOT_SUPPORTED;
 	}
@@ -1041,8 +1064,17 @@
 		return GF_NOT_SUPPORTED;
 	}
 	if (needs_rap_sync) {
+		Bool has_enough_sync = GF_FALSE;
 		tki = &tks[needs_rap_sync-1];
-		if ((gf_isom_get_sync_point_count(mp4, tki->tk)==1) && (chunk_start != 0.0f)) {
+
+		if (chunk_start == 0.0f)
+			has_enough_sync = GF_TRUE;
+		else if (gf_isom_get_sync_point_count(mp4, tki->tk) > 1)
+			has_enough_sync = GF_TRUE;
+		else if (gf_isom_get_sample_group_info(mp4, tki->tk, 1, GF_4CC('r', 'a', 'p', ' '), NULL, NULL, NULL))
+			has_enough_sync = GF_TRUE;
+
+		if (!has_enough_sync) {
 			fprintf(stderr, "Not enough Random Access points in input file - cannot split\n");
 			gf_free(tks);
 			return GF_NOT_SUPPORTED;
@@ -1110,13 +1142,21 @@
 	cur_file = 0;
 	while (nb_tk_done<nb_tk) {
 		Double last_rap_sample_time, max_dts, file_split_dur;
-		Bool is_last;
+		Bool is_last_rap;
+		Bool all_av_done = GF_FALSE;
 
 		if (chunk_extraction) {
 			sprintf(szFile, "%s_%d_%d%s", szName, (u32) chunk_start, (u32) (chunk_start+split_dur), ext);
 			if (outName) strcpy(szFile, outName);
 		} else {
 			sprintf(szFile, "%s_%03d%s", szName, cur_file+1, ext);
+			if (outName) {
+				char *the_file = gf_url_concatenate(outName, szFile);
+				if (the_file) {
+					strcpy(szFile, the_file);
+					gf_free(the_file);
+				}
+			}
 		}
 		dest = gf_isom_open(szFile, GF_ISOM_WRITE_EDIT, tmpdir);
 		/*clone all tracks*/
@@ -1137,15 +1177,16 @@
 			gf_isom_remove_edit_segments(dest, tki->dst_tk);
 		}
 		do_add = 1;
-		is_last = 0;
+		is_last_rap = 0;
 		last_rap_sample_time = 0;
 		file_split_dur = split_dur;
 
 		size_exceeded = 0;
 		max_dts = 0;
 		while (do_add) {
+			Bool is_rap;
 			Double time;
-			u32 nb_over;
+			u32 nb_over, nb_av = 0;
 			/*perfom basic de-interleaving to make sure we're not importing too much of a given track*/
 			u32 nb_add = 0;
 			/*add one sample of each track*/
@@ -1154,6 +1195,8 @@
 				u64 dts;
 				tki = &tks[i];
 
+				if (!tki->can_duplicate) nb_av++;
+
 				if (tki->stop_state)
 					continue;
 				if (tki->last_sample==tki->sample_count)
@@ -1167,6 +1210,10 @@
 					samp = gf_isom_get_sample(mp4, tki->tk, tki->last_sample+1, &di);
 					samp->DTS = 0;
 					e = gf_isom_add_sample(dest, tki->dst_tk, di, samp);
+					if (!e) {
+						e = gf_isom_copy_sample_info(dest, tki->dst_tk, mp4, tki->tk, tki->last_sample+1);
+					}
+
 					gf_isom_sample_del(&samp);
 					tki->last_sample += 1;
 					dts = gf_isom_get_sample_dts(mp4, tki->tk, tki->last_sample+1);
@@ -1177,9 +1224,9 @@
 				t = (Double) (s64) dts;
 				t /= tki->time_scale;
 				if (tki->first_sample_done) {
-					if (t>max_dts) continue;
+					if (!all_av_done && (t>max_dts)) continue;
 				} else {
-					/*here's the trick: only take care of a/v media for deinterleaving, and ad other media
+					/*here's the trick: only take care of a/v media for splitting, and add other media
 					only if thir dts is less than the max AV dts found. Otherwise with some text streams we will end up importing
 					too much video and corrupting the last sync point indication*/
 					if (!tki->can_duplicate && (t>max_dts)) max_dts = t;
@@ -1190,23 +1237,36 @@
 
 				nb_add += 1;
 
-				if (tki->has_non_raps && samp->IsRAP) {
+				is_rap = GF_FALSE;
+				if (samp->IsRAP) {
+					is_rap = GF_TRUE;
+				} else {
+					Bool has_roll;
+					e = gf_isom_get_sample_rap_roll_info(mp4, tki->tk, tki->last_sample+1, &is_rap, &has_roll, NULL);
+				}
+
+
+				if (tki->has_non_raps && is_rap) {
 					GF_ISOSample *next_rap;
 					u32 next_rap_num, sdi;
 					last_rap_sample_time = (Double) (s64) samp->DTS;
 					last_rap_sample_time /= tki->time_scale;
 					e = gf_isom_get_sample_for_media_time(mp4, tki->tk, samp->DTS+tki->firstDTS+2, &sdi, GF_ISOM_SEARCH_SYNC_FORWARD, &next_rap, &next_rap_num);
 					if (e==GF_EOS)
-						is_last = 1;
+						is_last_rap = 1;
 					if (next_rap) {
 						if (!next_rap->IsRAP)
-							is_last = 1;
+							is_last_rap = 1;
 						gf_isom_sample_del(&next_rap);
 					}
 				}
 				tki->lastDTS = samp->DTS;
 				e = gf_isom_add_sample(dest, tki->dst_tk, di, samp);
 				gf_isom_sample_del(&samp);
+
+				if (!e) {
+					e = gf_isom_copy_sample_info(dest, tki->dst_tk, mp4, tki->tk, tki->last_sample+1);
+				}
 				tki->last_sample += 1;
 				gf_set_progress("Splitting", nb_done, nb_samp);
 				nb_done++;
@@ -1240,6 +1300,8 @@
 				tki = &tks[i];
 				if (tki->stop_state) {
 					nb_over++;
+					if (!tki->can_duplicate && (tki->last_sample==tki->sample_count) )
+						nb_av--;
 					continue;
 				}
 				time = (Double) (s64) tki->lastDTS;
@@ -1252,7 +1314,9 @@
 					nb_over++;
 					tki->stop_state = 1;
 					if (tki->last_sample<tki->sample_count)
-						is_last = 0;
+						is_last_rap = 0;
+					else if (tki->first_sample_done)
+						is_last_rap = 0;
 
 					if (rap_split && tki->next_sample_is_rap) {
 						file_split_dur = (Double) ( gf_isom_get_sample_dts(mp4, tki->tk, tki->last_sample+1) - tki->firstDTS);
@@ -1273,6 +1337,9 @@
 					tki->first_sample_done = 0;
 			}
 			if (nb_over==nb_tk) do_add = 0;
+
+			if (!nb_av)
+				all_av_done = GF_TRUE;
 		}
 
 		/*remove samples - first figure out smallest duration*/
@@ -1281,7 +1348,7 @@
 			Double time;
 			tki = &tks[i];
 			/*track done*/
-			if ((tki->stop_state==2) || (!is_last && (tki->sample_count == tki->last_sample)) ) {
+			if ((tki->stop_state==2) || (!is_last_rap && (tki->sample_count == tki->last_sample)) ) {
 				if (tki->has_non_raps) last_rap_sample_time = 0;
 				time = (Double) (s64) ( gf_isom_get_sample_dts(mp4, tki->tk, tki->last_sample+1) - tki->firstDTS);
 				time /= tki->time_scale;
@@ -1306,14 +1373,15 @@
 			if (adjust_split_end) {
 				fprintf(stderr, "Adjusting chunk end time to previous random access at %02.2f sec\n", chunk_start + last_rap_sample_time);
 				file_split_dur = last_rap_sample_time;
-				sprintf(szFile, "%s_%d_%d%s", szName, (u32) chunk_start, (u32) (chunk_start+file_split_dur), ext);
+				if (outName) strcpy(szFile, outName);
+				else sprintf(szFile, "%s_%d_%d%s", szName, (u32) chunk_start, (u32) (chunk_start+file_split_dur), ext);
 				gf_isom_set_final_name(dest, szFile);
 			}
 			else file_split_dur = split_dur;
 		}
 
 		/*don't split if eq to copy...*/
-		if (is_last && !cur_file && !chunk_start) {
+		if (is_last_rap && !cur_file && !chunk_start) {
 			fprintf(stderr, "Cannot split file (Not enough sync samples, duration too large or size too big)\n");
 			goto err_exit;
 		}
@@ -1324,28 +1392,26 @@
 			/*if larger than last RAP, rewind till it*/
 			if (last_rap_sample_time && (last_rap_sample_time<file_split_dur) ) {
 				file_split_dur = last_rap_sample_time;
-				is_last = 0;
+				is_last_rap = 0;
 			}
 		}
 
 		nb_tk_done = 0;
-		if (!is_last || chunk_extraction) {
+		if (!is_last_rap || chunk_extraction) {
 			for (i=0; i<nb_tk; i++) {
 				Double time = 0;
 				u32 last_samp;
 				tki = &tks[i];
 				while (1) {
-					u64 dts;
 					last_samp = gf_isom_get_sample_count(dest, tki->dst_tk);
-					if (last_samp<=1) break;
-
-					dts = gf_isom_get_sample_dts(dest, tki->dst_tk, last_samp);
-					time = (Double) (s64) dts;
-					time /= tki->time_scale;
 
 					time = (Double) (s64) gf_isom_get_media_duration(dest, tki->dst_tk);
+					//time could get slightly higher than requests dur due to rounding precision. We use 1/4 of the last sample dur as safety marge
+					time -= (Double) (s64) gf_isom_get_sample_duration(dest, tki->dst_tk, tki->last_sample) / 4;
 					time /= tki->time_scale;
 
+					if (last_samp<=1) break;
+
 					/*done*/
 					if (tki->last_sample==tki->sample_count) {
 						if (!chunk_extraction && !tki->can_duplicate) {
@@ -1370,10 +1436,18 @@
 					time /= tki->time_scale;
 					/*re-insert prev sample*/
 					if (tki->can_duplicate && (time>file_split_dur) ) {
+						Bool was_insert = GF_FALSE;
 						tki->last_sample--;
 						dts = gf_isom_get_sample_dts(mp4, tki->tk, tki->last_sample+1);
+						if (dts < tki->firstDTS) was_insert = GF_TRUE;
 						tki->firstDTS += (u64) (file_split_dur*tki->time_scale);
-						gf_isom_set_last_sample_duration(dest, tki->dst_tk, (u32) (tki->firstDTS - dts) );
+						//the original, last sample added starts before the first sample in the file: we have re-inserted
+						//a single sample, use split duration as target duration
+						if (was_insert) {
+							gf_isom_set_last_sample_duration(dest, tki->dst_tk, (u32) (file_split_dur*tki->time_scale));
+						} else {
+							gf_isom_set_last_sample_duration(dest, tki->dst_tk, (u32) (tki->firstDTS - dts) );
+						}
 					} else {
 						tki->firstDTS = dts;
 					}
@@ -1404,7 +1478,7 @@
 			if (gf_isom_has_time_offset(mp4, tki->tk)) {
 				gf_isom_set_cts_packing(dest, tki->dst_tk, 0);
 			}
-			if (is_last && tki->can_duplicate) {
+			if (is_last_rap && tki->can_duplicate) {
 				gf_isom_set_last_sample_duration(dest, tki->dst_tk, gf_isom_get_sample_duration(mp4, tki->tk, tki->sample_count));
 			}
 
@@ -1464,7 +1538,7 @@
 		e = gf_isom_close(dest);
 		dest = NULL;
 		if (e) fprintf(stderr, "Error storing file %s\n", gf_error_to_string(e));
-		if (is_last || chunk_extraction) break;
+		if (is_last_rap || chunk_extraction) break;
 		cur_file++;
 	}
 	gf_set_progress("Splitting", nb_samp, nb_samp);
@@ -1911,8 +1985,11 @@
 				gf_isom_sample_del(&s);
 			}
 			gf_isom_sample_del(&samp);
-			if (e)
-				goto err_exit;
+			if (e) goto err_exit;
+
+			e = gf_isom_copy_sample_info(dest, dst_tk, orig, i+1, j+1);
+			if (e) goto err_exit;
+
 			gf_set_progress("Appending", nb_done, nb_samp);
 			nb_done++;
 		}
@@ -2400,9 +2477,9 @@
 			e = gf_bifs_encode_au(bifsenc, sc->ESID, au->commands, &data, &data_len);
 			if (data) {
 				sprintf(szName, "%s%02d.bifs", szRad, j);
-				f = gf_f64_open(szName, "wb");
+				f = gf_fopen(szName, "wb");
 				gf_fwrite(data, data_len, 1, f);
-				fclose(f);
+				gf_fclose(f);
 				gf_free(data);
 			}
 		}
@@ -2503,7 +2580,7 @@
 			if (e) gf_isom_delete(mp4);
 			else gf_isom_close(mp4);
 		}
-		else e = gf_sm_dump(ctx, szF, d_mode);
+		else e = gf_sm_dump(ctx, szF, GF_FALSE, d_mode);
 	}
 
 exit:
@@ -2556,7 +2633,7 @@
 }
 static Bool wgt_enum_dir(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
-	if (!stricmp(file_name, "cvs") || !stricmp(file_name, ".svn")) return 0;
+	if (!stricmp(file_name, "cvs") || !stricmp(file_name, ".svn") || !stricmp(file_name, ".git")) return 0;
 	gf_enum_directory(file_path, 0, wgt_enum_files, cbck, NULL);
 	return gf_enum_directory(file_path, 1, wgt_enum_dir, cbck, NULL);
 }
@@ -2640,7 +2717,7 @@
 		for (i=0; i<count; i++) {
 			char *item = gf_list_get(imports, i);
 
-			FILE *test = gf_f64_open(item, "rb");
+			FILE *test = gf_fopen(item, "rb");
 			if (!test) {
 				gf_list_rem(imports, i);
 				i--;
@@ -2648,7 +2725,7 @@
 				gf_free(item);
 				continue;
 			}
-			fclose(test);
+			gf_fclose(test);
 			if (gf_isom_probe_file(item)) {
 				if (isom_src) {
 					fprintf(stderr, "Cannot package several IsoMedia files together\n");
@@ -2674,7 +2751,7 @@
 	if (e) goto exit;
 	/*add self ref*/
 	if (isom_src) {
-		e = gf_isom_add_meta_item(file, 1, 0, 1, NULL, isom_src, 0, NULL, NULL, NULL, NULL);
+		e = gf_isom_add_meta_item(file, 1, 0, 1, NULL, isom_src, 0, NULL, NULL, NULL, NULL, NULL);
 		if (e) goto exit;
 	}
 	e = gf_isom_set_meta_xml(file, 1, 0, file_name, !ascii);
@@ -2723,7 +2800,7 @@
 			encoding = "binary-gzip";
 		}
 
-		e = gf_isom_add_meta_item(file, 1, 0, 0, item, name, 0, mime, NULL, NULL, NULL);
+		e = gf_isom_add_meta_item(file, 1, 0, 0, item, name, 0, mime, NULL, NULL, NULL, NULL);
 		gf_free(name);
 		if (e) goto exit;
 	}

v0.5.2.tar.gz/applications/mp4box/live.c -> v0.6.1.tar.gz/applications/mp4box/live.c Changed

@@ -73,7 +73,7 @@
 
 static void on_logs(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
-	FILE *logs = cbk;
+	FILE *logs = (FILE*)cbk;
 	vfprintf(logs, fmt, list);
 	fflush(logs);
 }
@@ -89,9 +89,9 @@
 	FILE *logfile=NULL;
 	u16 port = 7000;
 	u32 ttl = 1;
-	Bool loop = 1;
-	Bool mem_track = 0;
-	Bool force_mpeg4 = 0;
+	Bool loop = GF_TRUE;
+	Bool mem_track = GF_FALSE;
+	Bool force_mpeg4 = GF_FALSE;
 	u32 path_mtu = 1450;
 	u32 i;
 
@@ -105,17 +105,17 @@
 			}
 			inName = arg;
 		}
-		else if (!stricmp(arg, "-noloop")) loop = 0;
-		else if (!stricmp(arg, "-mpeg4")) force_mpeg4 = 1;
+		else if (!stricmp(arg, "-noloop")) loop = GF_FALSE;
+		else if (!stricmp(arg, "-mpeg4")) force_mpeg4 = GF_TRUE;
 		else if (!strnicmp(arg, "-port=", 6)) port = atoi(arg+6);
 		else if (!strnicmp(arg, "-mtu=", 5)) path_mtu = atoi(arg+5);
 		else if (!strnicmp(arg, "-dst=", 5)) ip_dest = arg+5;
 		else if (!strnicmp(arg, "-ttl=", 5)) ttl = atoi(arg+5);
 		else if (!strnicmp(arg, "-ifce=", 6)) ifce_addr = arg+6;
 		else if (!strnicmp(arg, "-sdp=", 5)) sdp_file = arg+5;
-		else if (!stricmp(arg, "-mem-track")) mem_track = 1;
+		else if (!stricmp(arg, "-mem-track")) mem_track = GF_TRUE;
 		else if (!strnicmp(arg, "-logs=", 6)) logs = arg+6;
-		else if (!strnicmp(arg, "-lf=", 4)) logfile = gf_f64_open(arg+4, "wt");
+		else if (!strnicmp(arg, "-lf=", 4)) logfile = gf_fopen(arg+4, "wt");
 	}
 
 	gf_sys_init(mem_track);
@@ -129,7 +129,7 @@
 
 	if (!gf_isom_probe_file(inName)) {
 		fprintf(stderr, "File %s is not a valid ISO Media file and cannot be streamed\n", inName);
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		gf_sys_close();
 		return 1;
 	}
@@ -155,7 +155,7 @@
 		}
 		gf_isom_streamer_del(file_streamer);
 	}
-	if (logfile) fclose(logfile);
+	if (logfile) gf_fclose(logfile);
 	gf_sys_close();
 	return 0;
 }
@@ -232,7 +232,7 @@
 	time = (u32) -1;
 	count = gf_list_count(sess->streams);
 	for (i=0; i<count; i++) {
-		RTPChannel *ch = gf_list_get(sess->streams, i);
+		RTPChannel *ch = (RTPChannel*)gf_list_get(sess->streams, i);
 		if (!ch->carousel_period) continue;
 		if (!ch->carousel_size) continue;
 
@@ -262,7 +262,7 @@
 	RTPChannel *rtpch;
 	u32 i=0;
 
-	while ( (rtpch = gf_list_enum(livesess->streams, &i))) {
+	while ( (rtpch = (RTPChannel*)gf_list_enum(livesess->streams, &i))) {
 		if (rtpch->ESID == ESID) {
 
 			/*store carousel data*/
@@ -385,9 +385,9 @@
 		port += 2;
 	}
 	if (sdp) {
-		FILE *out = gf_f64_open(sdp_name, "wt");
+		FILE *out = gf_fopen(sdp_name, "wt");
 		fprintf(out, "%s", sdp);
-		fclose(out);
+		gf_fclose(out);
 		gf_free(sdp);
 	}
 }
@@ -677,13 +677,13 @@
 				fprintf(stderr, "Update file modified - processing\n");
 				last_src_modif = mod_time;
 
-				srcf = gf_f64_open(src_name, "rt");
+				srcf = gf_fopen(src_name, "rt");
 				if (!srcf) continue;
 
 				/*checks if we have a broadcast config*/
 				if (!fgets(flag_buf, 200, srcf))
 					flag_buf[0] = '\0';
-				fclose(srcf);
+				gf_fclose(srcf);
 
 				aggregate_on_stream = (u16) -1;
 				adjust_carousel_time = force_rap = discard_pending = signal_rap = signal_critical = 0;
@@ -850,6 +850,8 @@
 
 #endif /*defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)*/
 
+#ifndef GPAC_DISABLE_MPEG2TS
+
 u32 grab_live_m2ts(const char *grab_m2ts, const char *grab_ifce, const char *outName)
 {
 	char data[0x80000];
@@ -862,13 +864,13 @@
 	GF_RTPReorder *ch = NULL;
 #endif
 	GF_Socket *sock;
-	GF_Err e = gf_m2ts_get_socket(grab_m2ts, grab_ifce, 0x80000, &sock);
+	GF_Err e = gf_m2ts_get_socket(grab_m2ts, grab_ifce, GF_M2TS_UDP_BUFFER_SIZE, &sock);
 
 	if (e) {
 		fprintf(stderr, "Cannot open %s: %s\n", grab_m2ts, gf_error_to_string(e));
 		return 1;
 	}
-	output = gf_f64_open(outName, "wb");
+	output = gf_fopen(outName, "wb");
 	if (!output) {
 		fprintf(stderr, "Cannot open %s: check path and rights\n", outName);
 		gf_sk_del(sock);
@@ -926,10 +928,10 @@
 			fwrite(data, size, 1, output);
 		}
 	}
-	nb_pck = gf_f64_tell(output);
+	nb_pck = gf_ftell(output);
 	nb_pck /= 188;
 	fprintf(stderr, "Captured "LLU" TS packets\n", nb_pck );
-	fclose(output);
+	gf_fclose(output);
 	gf_sk_del(sock);
 
 #ifndef GPAC_DISABLE_STREAMING
@@ -939,5 +941,6 @@
 	return 0;
 }
 
+#endif /* GPAC_DISABLE_MPEG2TS */

v0.5.2.tar.gz/applications/mp4box/main.c -> v0.6.1.tar.gz/applications/mp4box/main.c Changed

@@ -26,6 +26,7 @@
 
 #include <gpac/download.h>
 #include <gpac/network.h>
+#include <gpac/utf.h>
 
 #ifndef GPAC_DISABLE_SMGR
 #include <gpac/scene_manager.h>
@@ -82,41 +83,41 @@
 
 #endif
 
-GF_Err dump_cover_art(GF_ISOFile *file, char *inName);
-GF_Err dump_chapters(GF_ISOFile *file, char *inName, Bool dump_ogg);
-void dump_udta(GF_ISOFile *file, char *inName, u32 dump_udta_type, u32 dump_udta_track);
+GF_Err dump_isom_cover_art(GF_ISOFile *file, char *inName, Bool is_final_name);
+GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, Bool dump_ogg);
+void dump_isom_udta(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_udta_type, u32 dump_udta_track);
 GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array);
 u32 id3_get_genre_tag(const char *name);
 
 /*in filedump.c*/
 #ifndef GPAC_DISABLE_SCENE_DUMP
-GF_Err dump_file_text(char *file, char *inName, GF_SceneDumpFormat dump_mode, Bool do_log);
+GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log);
 //void gf_check_isom_files(char *conf_rules, char *inName);
 #endif
 #ifndef GPAC_DISABLE_SCENE_STATS
-void dump_scene_stats(char *file, char *inName, u32 stat_level);
+void dump_isom_scene_stats(char *file, char *inName, Bool is_final_name, u32 stat_level);
 #endif
 void PrintNode(const char *name, u32 graph_type);
 void PrintBuiltInNodes(u32 graph_type);
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
-void dump_isom_xml(GF_ISOFile *file, char *inName);
+void dump_isom_xml(GF_ISOFile *file, char *inName, Bool is_final_name);
 #endif
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 #ifndef GPAC_DISABLE_ISOM_DUMP
-void dump_file_rtp(GF_ISOFile *file, char *inName);
+void dump_isom_rtp(GF_ISOFile *file, char *inName, Bool is_final_name);
 #endif
-void DumpSDP(GF_ISOFile *file, char *inName);
+void dump_isom_sdp(GF_ISOFile *file, char *inName, Bool is_final_name);
 #endif
 
-void dump_file_timestamps(GF_ISOFile *file, char *inName);
-void dump_file_nal(GF_ISOFile *file, u32 trackID, char *inName);
+void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name);
+void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name);
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
-void dump_file_ismacryp(GF_ISOFile *file, char *inName);
-void dump_timed_text_track(GF_ISOFile *file, u32 trackID, char *inName, Bool is_convert, GF_TextDumpType dump_type);
+void dump_isom_ismacryp(GF_ISOFile *file, char *inName, Bool is_final_name);
+void dump_isom_timed_text(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool is_convert, GF_TextDumpType dump_type);
 #endif /*GPAC_DISABLE_ISOM_DUMP*/
 
 
@@ -201,7 +202,7 @@
 	 " -strict-error exits after the first error is reported\n"
 	 " -inter time_in_ms interleaves file data (track chunks of time_in_ms)\n"
 	 " * Note 1: Interleaving is 0.5s by default\n"
-	 " * Note 2: Performs drift checking accross tracks\n"
+	 " * Note 2: Performs drift checking across tracks\n"
 	 " * Note 3: a value of 0 disables interleaving\n"
 	 " -old-inter time same as -inter but doesn't perform drift checking\n"
 	 " -tight performs tight interleaving (sample based) of the file\n"
@@ -209,11 +210,11 @@
 	 " -flat stores file with all media data first, non-interleaved\n"
 	 " -frag time_in_ms fragments file (track fragments of time_in_ms)\n"
 	 " * Note: Always disables interleaving\n"
-	 " -ffspace size inserts free space before moof in fragmented files\n"
 	 " -out filename specifies output file name\n"
 	 " * Note: By default input (MP4,3GP) file is overwritten\n"
 	 " -tmp dirname specifies directory for temporary file creation\n"
 	 " * Note: Default temp dir is OS-dependent\n"
+	 " -co64 forces usage of 64-bit chunk offsets for ISOBMF files\n"
 	 " -write-buffer SIZE specifies write buffer in bytes for ISOBMF files\n"
 	 " -no-sys removes all MPEG-4 Systems info except IOD (profiles)\n"
 	 " * Note: Set by default whith '-add' and '-cat'\n"
@@ -231,23 +232,24 @@
 	 " -cprt string adds copyright string to movie\n"
 	 " -chap file adds chapter information contained in file\n"
 	 " -set-track-id id1:id2 changes the id of a track from id1 to id2\n"
+	 " -swap-track-id id1:id2 swaps the IDs of the identified tracks\n"
 	 " -rem trackID removes track from file\n"
 	 " -rap trackID removes all non-RAP samples from track\n"
 	 " -enable trackID enables track\n"
 	 " -disable trackID disables track\n"
 	 " -new forces creation of a new destination file\n"
-			" -timescale VAL sets movie timescale to VAL ticks per second (default is 600).\n"
+	 " -timescale VAL sets movie timescale to VAL ticks per second (default is 600)\n"
 	 " -lang [tkID=]LAN sets track language. LAN is the BCP-47 code (eng, en-UK, ...)\n"
-	 " -delay tkID=TIME sets track start delay in ms.\n"
+	 " -delay tkID=TIME sets track start delay in ms\n"
 	 " -par tkID=PAR sets visual track pixel aspect ratio (PAR=N:D or \"none\")\n"
 	 " -name tkID=NAME sets track handler name\n"
 	 " * NAME can indicate a UTF-8 file (\"file://file name\"\n"
-	 " -itags tag1[:tag2] sets iTunes tags to file - more info: MP4Box -tag-list.\n"
+	 " -itags tag1[:tag2] sets iTunes tags to file - more info: MP4Box -tag-list\n"
 	 " -split time_sec splits in files of time_sec max duration\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
 	 " -split-size size splits in files of max filesize kB. same as -splits.\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
-	 " -split-rap splits in files begining at each RAP. same as -splitr.\n"
+	 " -split-rap splits in files beginning at each RAP. same as -splitr.\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
 	 " -split-chunk S:E extracts a new file from Start to End (in seconds). same as -splitx\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
@@ -275,23 +277,34 @@
 	 " -group-single puts all tracks in a single group\n"
 	 " -ref id:XXXX:refID adds a reference of type 4CC from track ID to track refID\n"
 	 " -keep-utc keeps UTC timing in the file after edit\n"
-			" -udta ID:[OPTS] sets udta for given track or movie if ID is 0. OPTS is a colon separated list of:\n"
-			" type=CODE where code is the 4CC code of the UDTA (not needed for box= option)\n"
-			" box=FILE	 where FILE is the location of the udta data, formatted as serialized boxes\n"
-			" box=base64,DATA where DATA is the base64 encoded udta data, formatted as serialized boxes\n"
-			" src=FILE	 where FILE is the location of the udta data (will be stored in a single box of type CODE)\n"
-			" src=base64,DATA where DATA is the base64 encoded udta data (will be stored in a single box of type CODE)\n"
-			"	 If no source is set, UDTA of type CODE will be removed\n"
+	 " -udta ID:[OPTS] sets udta for given track or movie if ID is 0. OPTS is a colon separated list of:\n"
+	 " type=CODE where code is the 4CC code of the UDTA (not needed for box= option)\n"
+	 " box=FILE	 where FILE is the location of the udta data, formatted as serialized boxes\n"
+#ifndef GPAC_DISABLE_CORE_TOOLS
+	 " box=base64,DATA where DATA is the base64 encoded udta data, formatted as serialized boxes\n"
+#endif
+	 " src=FILE	 where FILE is the location of the udta data (will be stored in a single box of type CODE)\n"
+#ifndef GPAC_DISABLE_CORE_TOOLS
+	 " src=base64,DATA where DATA is the base64 encoded udta data (will be stored in a single box of type CODE)\n"
+#endif
+	 "	 If no source is set, UDTA of type CODE will be removed\n"
 	 "\n");
 }
 
 void PrintDASHUsage()
 {
 	fprintf(stderr, "DASH Options:\n"
+	 " -mpd m3u8 converts HLS manifest (local or remote http) to MPD \n"
+	 " Note: not compatible with other DASH options (except -out and -tmp) and does not convert associated segments\n"
 	 " -dash dur enables DASH-ing of the file(s) with a segment duration of DUR ms\n"
 	 " Note: the duration of a fragment (subsegment) is set\n"
-	 "						using the -frag switch.\n"
+	 "	 using the -frag switch.\n"
 	 " Note: for onDemand profile, sets duration of a subsegment\n"
+	 " -dash-strict dur enables DASH-ing of the file(s) with a segment duration of DUR ms (old behaviour)\n"
+	 " Note: the duration will be the closest to \'dur\', and will remain constant\n"
+	 " -dash-live[=F] dur generates a live DASH session using dur segment duration, optionally writing live context to F\n"
+	 " MP4Box will run the live session until \'q\' is pressed or a fatal error occurs.\n"
+	 " -ddbg-live[=F] dur same as -dash-live without time regulation for debug purposes.\n"
 	 " -frag time_in_ms Specifies a fragment duration of time_in_ms.\n"
 	 " * Note: By default, this is the DASH duration\n"
 	 " -out filename specifies output MPD file name.\n"
@@ -299,29 +312,36 @@
 	 " * Note: Default temp dir is OS-dependent\n"
 	 " -profile NAME specifies the target DASH profile: \"onDemand\",\n"
 	 " \"live\", \"main\", \"simple\", \"full\",\n"
-	 " \"dashavc264:live\", \"dashavc264:onDemand\"\n"
+	 " \"hbbtv1.5:live\", \"dashavc264:live\", \"dashavc264:onDemand\"\n"
 	 " * This will set default option values to ensure conformance to the desired profile\n"
 	 " * Default profile is \"full\" in static mode, \"live\" in dynamic mode\n"
+	 " -profile-ext STRING specifies a list of profile extensions, as used by DASH-IF and DVB.\n"
+	 " The string will be colon-concatenated with the profile used\n"
 	 "\n"
 	 "Input media files to dash can use the following modifiers\n"
 	 " \"#trackID=N\" only uses the track ID N from the source file\n"
 	 " \"#video\" only uses the first video track from the source file\n"
 	 " \"#audio\" only uses the first video track from the source file\n"
 	 " \":id=NAME\" sets the representation ID to NAME\n"
+	 " \":dur=VALUE\" processes VALUE seconds from the media\n"
+	 " If VALUE is longer than the media duration, the last media duration is lengthen.\n"
 	 " \":period=NAME\" sets the representation's period to NAME. Multiple periods may be used\n"
 	 " period appear in the MPD in the same order as specified with this option\n"
+	 " \":BaseURL=NAME\" sets the BaseURL. Set multiple times for multiple BaseURLs\n"
 	 " \":bandwidth=VALUE\" sets the representation's bandwidth to a given value\n"
+	 " \":period_duration=VALUE\" increases the duration of this period by the given duration in seconds\n"
+	 " only used when no input media is specified (remote period insertion), eg :period=X:xlink=Z:duration=Y.\n"
 	 " \":xlink=VALUE\" sets the xlink value for the period containing this element\n"
 	 " only the xlink declared on the first rep of a period will be used\n"
 	 " \":role=VALUE\" sets the role of this representation (cf DASH spec).\n"
 	 " media with different roles belong to different adaptation sets.\n"
-	 " \":desc_p=VALUE\" adds a descriptor at the Period level.\n"
-	 " \":desc_as=VALUE\" adds a descriptor at the AdaptationSet level \n"
+	 " \":desc_p=VALUE\" adds a descriptor at the Period level. Value must be a properly formatted XML element.\n"
+	 " \":desc_as=VALUE\" adds a descriptor at the AdaptationSet level. Value must be a properly formatted XML element.\n"
 	 " two input files with different values will be in different AdaptationSet elements.\n"
-	 " \":desc_as_c=VALUE\" adds a descriptor at the AdaptationSet level \n"
-	 " value is ignored to created AdaptationSet elements.\n"
-	 " \":desc_rep=VALUE\" adds a descriptor at the Representation level.\n"
-	 " value is ignored to created AdaptationSet elements.\n"
+	 " \":desc_as_c=VALUE\" adds a descriptor at the AdaptationSet level. Value must be a properly formatted XML element.\n"
+	 " value is ignored while creating AdaptationSet elements.\n"
+	 " \":desc_rep=VALUE\" adds a descriptor at the Representation level. Value must be a properly formatted XML element.\n"
+	 " value is ignored while creating AdaptationSet elements.\n"
 	 "\n"
 	 " -rap segments begin with random access points\n"
 	 " Note: segment duration may not be exactly what asked by\n"
@@ -333,31 +353,31 @@
 	 " If not set (default), segments are concatenated in output file\n"
 	 " except in \"live\" profile where dash_%%s is used\n"
 	 " -segment-ext name sets the segment extension. Default is m4s, \"null\" means no extension\n"
-	 " -segment-timeline Uses SegmentTimeline when generating segments. NOT SUPPORTED BY LIVE/CTX MODE YET.\n"
-	 " -segment-marker MARK Adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
+	 " -segment-timeline uses SegmentTimeline when generating segments.\n"
+	 " -segment-marker MARK adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
+	 " -insert-utc inserts UTC clock at the begining of each ISOBMF segment\n"
 	 " -base-url string sets Base url at MPD level. Can be used several times.\n"
 	 " -mpd-title string sets MPD title.\n"
 	 " -mpd-source string sets MPD source.\n"
 	 " -mpd-info-url string sets MPD info url.\n"
 	 " -cprt string adds copyright string to MPD\n"
-	 " -dash-live[=F] dur generates a live DASH session using dur segment duration, optionnally writing live context to F\n"
-	 " MP4Box will run the live session until \'q\' is pressed or a fatal error occurs.\n"
-	 " -ddbg-live[=F] dur same as -dash-live without time regulation for debug purposes.\n"
 	 " -dash-ctx FILE stores/restore DASH timing from FILE.\n"
 	 " -dynamic uses dynamic MPD type instead of static.\n"
-	 " -mpd-refresh TIME specifies MPD update time in seconds.\n"
+	 " -last-dynamic same as dynamic but closes the period (insert lmsg brand if needed and update duration).\n"
+	 " -mpd-duration DUR sets the duration in second of a live session (0 by default). If 0, you must use -mpd-refresh.\n"
+	 " -mpd-refresh TIME specifies MPD update time in seconds (double can be used).\n"
 	 " -time-shift TIME specifies MPD time shift buffer depth in seconds (default 0). Specify -1 to keep all files\n"
 	 " -subdur DUR specifies maximum duration in ms of the input file to be dashed in LIVE or context mode.\n"
 	 " NOTE: This does not change the segment duration: dashing stops once segments produced exceeded the duration.\n"
 	 " -min-buffer TIME specifies MPD min buffer time in milliseconds\n"
-	 " -ast-offset TIME specifies MPD AvailabilityStartTime offset in seconds. Default is 1 sec delay\n"
+	 " -ast-offset TIME specifies MPD AvailabilityStartTime offset in ms if positive, or availabilityTimeOffset of each representation if negative. Default is 0 sec delay\n"
 	 " -dash-scale SCALE specifies that timing for -dash and -frag are expressed in SCALE units per seconds\n"
 	 " -mem-frags fragments will be produced in memory rather than on disk before flushing to disk\n"
 	 " -pssh-moof stores PSSH boxes in first moof of each segments. By default PSSH are stored in movie box.\n"
 	 " -sample-groups-traf stores sample group descriptions in traf (duplicated for each traf) rather than in moof. By default sample group descriptions are stored in movie box.\n"
 
 	 "\n"
-	 "Advanced Options, should not be needed when using -dash-profile:\n"
+	 "Advanced Options, should not be needed when using -profile:\n"
 	 " -subsegs-per-sidx N sets the number of subsegments to be written in each SIDX box\n"
 	 " If 0, a single SIDX box is used per segment\n"
 	 " If -1, no SIDX box is used\n"
@@ -366,12 +386,17 @@
 	 " -daisy-chain uses daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0.\n"
 	 " -single-segment uses a single segment for the whole file (OnDemand profile). \n"
 	 " -single-file uses a single file for the whole file (default). \n"
-	 " -bs-switching MODE sets bitstream switching to \"inband\" (default), \"merge\", \"no\" or \"single\" to test with single input.\n"
+	 " -bs-switching MODE sets bitstream switching to \"inband\" (default), \"merge\", \"multi\", \"no\" or \"single\" to test with single input.\n"
 	 " -moof-sn N sets sequence number of first moof to N\n"
 	 " -tfdt N sets TFDT of first traf to N in SCALE units (cf -dash-scale)\n"
 	 " -no-frags-default disables default flags in fragments\n"
 	 " -single-traf uses a single track fragment per moof (smooth streaming and derived specs may require this)\n"
 	 " -dash-ts-prog N program_number to be considered in case of an MPTS input file.\n"
+	 " -frag-rt when using fragments in live mode, flush fragments according to their timing (only supported with a single input).\n"
+	 " -cp-location=MODE sets ContentProtection element location. Possible values for mode are:\n"
+	 " as: sets ContentProtection in AdaptationSet element\n"
+	 " rep: sets ContentProtection in Representation element\n"
+	 " both: sets ContentProtection in both elements\n"
 	 "\n");
 }
 
@@ -383,8 +408,8 @@
 	 " MPEG-1-2 Video .m1v .m2v\n"
 	 " MPEG-4 Video .cmp .m4v\n"
 	 " H263 Video .263 .h263\n"
- " AVC/H264 Video .h264 .h26L .264 .26L .x264 .svc\n"
- " HEVC Video .hevc .h265 .265 .hvc .shvc\n"
+	 " AVC/H264 Video .h264 .h26L .264 .26L .x264 .svc\n"
+	 " HEVC Video .hevc .h265 .265 .hvc .shvc\n"
 	 " JPEG Images .jpg .jpeg\n"
 	 " PNG Images .png\n"
 	 " MPEG 1-2 Audio .mp3, .m1a, .m2a\n"
@@ -458,6 +483,9 @@
 	 " \":subsamples\" adds SubSample information for AVC+SVC\n"
 	 " \":forcesync\" forces non IDR samples with I slices to be marked as sync points (AVC GDR)\n"
 	 " !! RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players\n"
+	 " \":xps_inband\" Sets xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)\n"
+	 " \":max_lid=N\" sets HEVC max layer ID to be imported to N. Default imports all.\n"
+	 " \":max_tid=N\" sets HEVC max temporal ID to be imported to N. Default imports all.\n"
 	 " \":negctts\" uses negative CTS-DTS offsets (ISO4 brand)\n"
 	 " \":stype=4CC\" forces the sample description type to a different value\n"
 	 " !! THIS MAY BREAK THE FILE WRITING !!\n"
@@ -503,10 +531,10 @@
 	 " \":swf-same-app\" appearance nodes are reused\n"
 	 " \":swf-flatten=ang\" complementary angle below which 2 lines are merged\n"
 	 " * Note: angle \'0\' means no flattening\n"
-			" \":kind=SCHEMA:type\" sets kind for the track\n"
-			" \":txtflags=flags\" sets display flags (hexa number) of text track\n"
-			" \":txtflags+=flags\" adds display flags (hexa number) to text track\n"
-			" \":txtflags-=flags\" removes display flags (hexa number) from text track\n"
+	 " \":kind=schemeURI:value\" sets kind for the track\n"
+	 " \":txtflags=flags\" sets display flags (hexa number) of text track\n"
+	 " \":txtflags+=flags\" adds display flags (hexa number) to text track\n"
+	 " \":txtflags-=flags\" removes display flags (hexa number) from text track\n"
 	 "\n"
 	 " -add file add file tracks to (new) output file\n"
 	 " -cat file concatenates file samples to (new) output file\n"
@@ -693,7 +721,8 @@
 	 " -dcr ISMACryp samples structure to XML output\n"
 	 " -dump-cover Extracts cover art\n"
 	 " -dump-chap Extracts chapter file\n"
-			" -dump-udta [ID:]4cc Extracts udta for the given 4CC. If ID is given, dumps from UDTA of the given track ID, otherwise moov is used.\n"
+	 " -dump-chap-ogg Extracts chapter file as OGG format\n"
+	 " -dump-udta [ID:]4cc Extracts udta for the given 4CC. If ID is given, dumps from UDTA of the given track ID, otherwise moov is used.\n"
 	 "\n"
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	 " -ttxt Converts input subtitle to GPAC TTXT format\n"
@@ -709,7 +738,9 @@
 	 " -statx generates node/field statistics for scene after each AU\n"
 	 "\n"
 	 " -hash generates SHA-1 Hash of the input file\n"
+#ifndef GPAC_DISABLE_CORE_TOOLS
 	 " -bin converts input XML file using NHML bitstream syntax to binary\n"
+#endif
 	 "\n");
 }
 
@@ -797,6 +828,9 @@
 	 " -noprog disables progress\n"
 	 " -v verbose mode\n"
 	 " -logs set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
+	 " -log-file FILE sets output log file. Also works with -lf FILE\n"
+	 " -log-clock or -lc logs time in micro sec since start time of GPAC before each log line.\n"
+	 " -log-utc or -lu logs UTC time in ms before each log line.\n"
 	 " -version gets build version\n"
 	 " -- INPUT escape option if INPUT starts with - character\n"
 	 "\n"
@@ -1177,6 +1211,7 @@
 	char szPath[GF_MAX_PATH];
 	char szName[1024], mime_type[1024], enc_type[1024];
 	u32 item_id;
+	GF_ImageItemProperties *image_props;
 } MetaAction;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1229,6 +1264,34 @@
 			strcpy(meta->enc_type, szSlot+9);
 			ret = 1;
 		}
+		else if (!strnicmp(szSlot, "image-size=", 11)) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			sscanf(szSlot+11, "%dx%d", &meta->image_props->width, &meta->image_props->height);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "image-pasp=", 11)) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			sscanf(szSlot+11, "%dx%d", &meta->image_props->hSpacing, &meta->image_props->vSpacing);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "image-rloc=", 11)) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			sscanf(szSlot+11, "%dx%d", &meta->image_props->hOffset, &meta->image_props->vOffset);
+			ret = 1;
+		}
+		else if (!strnicmp(szSlot, "image-irot=", 11)) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			meta->image_props->angle = atoi(szSlot+11);
+			ret = 1;
+		}
 		else if (!strnicmp(szSlot, "dref", 4)) {
 			meta->use_dref = 1;
 			ret = 1;
@@ -1246,13 +1309,13 @@
 				break;
 			case META_ACTION_ADD_ITEM:
 			case META_ACTION_SET_XML:
-			case META_ACTION_DUMP_ITEM:
+			case META_ACTION_DUMP_XML:
 				strcpy(meta->szPath, szSlot);
 				ret = 1;
 				break;
 			case META_ACTION_REM_ITEM:
 			case META_ACTION_SET_PRIMARY_ITEM:
-			case META_ACTION_DUMP_XML:
+			case META_ACTION_DUMP_ITEM:
 				meta->item_id = atoi(szSlot);
 				ret = 1;
 				break;
@@ -1359,7 +1422,7 @@
 }
 
 
-#define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); MP4BOX_EXIT_WITH_CODE(1); }
+#define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); return mp4box_cleanup(1); }
 
 typedef enum {
 	TRAC_ACTION_REM_TRACK		= 0,
@@ -1377,6 +1440,7 @@
 	TRAC_ACTION_REM_KIND		= 12,
 	TRAC_ACTION_SET_ID			= 13,
 	TRAC_ACTION_SET_UDTA		= 14,
+	TRAC_ACTION_SWAP_ID			= 15,
 } TrackActionType;
 
 typedef struct
@@ -1405,63 +1469,26 @@
 	GF_ISOM_CONV_TYPE_PSP
 };
 
-#define MP4BOX_EXIT_WITH_CODE(__ret_code)	\
-	if (mpd_base_urls) gf_free(mpd_base_urls);	\
-	if (sdp_lines) gf_free(sdp_lines); \
-	if (metas) gf_free(metas); \
-	if (tracks) { \
-		for (i=0; i<nb_track_act; i++) { \
-			if (tracks[i].out_name) \
-				gf_free(tracks[i].out_name); \
-			if (tracks[i].src_name) \
-				gf_free(tracks[i].src_name); \
-			if (tracks[i].kind_scheme) \
-				gf_free(tracks[i].kind_scheme); \
-			if (tracks[i].kind_value) \
-				gf_free(tracks[i].kind_value); \
-		} \
-		gf_free(tracks); \
-	}\
-	if (tsel_acts) gf_free(tsel_acts); \
-	if (brand_add) gf_free(brand_add); \
-	if (brand_rem) gf_free(brand_rem); \
-	if (dash_inputs) { \
-		u32 input_index; \
-		for (input_index = 0; input_index < dash_inputs->nb_rep_descs; input_index++) { \
-			gf_free(dash_inputs->rep_descs[input_index]); \
-		} \
-		gf_free(dash_inputs->rep_descs); \
-		for (input_index = 0; input_index < dash_inputs->nb_as_descs; input_index++) { \
-			gf_free(dash_inputs->as_descs[input_index]); \
-		} \
-		gf_free(dash_inputs->as_descs); \
-		for (input_index = 0; input_index < dash_inputs->nb_as_c_descs; input_index++) { \
-			gf_free(dash_inputs->as_c_descs[input_index]); \
-		} \
-		gf_free(dash_inputs->as_c_descs); \
-		for (input_index = 0; input_index < dash_inputs->nb_p_descs; input_index++) { \
-			gf_free(dash_inputs->p_descs[input_index]); \
-		} \
-		gf_free(dash_inputs->p_descs); \
-		gf_free(dash_inputs); \
-	} \
-	gf_sys_close();	\
-	if (__ret_code) return __ret_code; \
-	goto exit; \
- 
+
 
 GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
 {
 	GF_DashSegmenterInput *di;
- char *sep;
- // skip ./ and ../, and look for first . to figure out extension
- if ((name[1]=='/') || (name[2]=='/') || (name[1]=='\\') || (name[2]=='\\') ) sep = strchr(name+3, '.');
- else sep = strchr(name, '.');
- 
- //then look for our opt separator :
- sep = strchr(sep ? sep : name, ':');
- 
- if (sep && (sep[1]=='\\')) sep = strchr(sep+1, ':');
+	char *sep;
+	// skip ./ and ../, and look for first . to figure out extension
+	if ((name[1]=='/') || (name[2]=='/') || (name[1]=='\\') || (name[2]=='\\') ) sep = strchr(name+3, '.');
+	else {
+		char *s2 = strchr(name, ':');
+		sep = strchr(name, '.');
+		if (sep && s2 && (s2 - sep) < 0) {
+			sep = name;
+		}
+	}
+
+	//then look for our opt separator :
+	sep = strchr(sep ? sep : name, ':');
+
+	if (sep && (sep[1]=='\\')) sep = strchr(sep+1, ':');
 
 	dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegmenterInput) * (*nb_dash_inputs + 1) );
 	memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegmenterInput) );
@@ -1469,17 +1496,20 @@
 	(*nb_dash_inputs)++;
 
 	if (sep) {
-		char *opts = sep+1;
-		sep[0] = 0;
+		char *opts, *first_opt;
+		opts = first_opt = sep;
 		while (opts) {
 			sep = strchr(opts, ':');
 			while (sep) {
 				/* this is a real separator if it is followed by a keyword we are looking for */
 				if (!strnicmp(sep, ":id=", 4) ||
+				 !strnicmp(sep, ":dur=", 5) ||
 				 !strnicmp(sep, ":period=", 8) ||
+				 !strnicmp(sep, ":BaseURL=", 9) ||
 				 !strnicmp(sep, ":bandwidth=", 11) ||
 				 !strnicmp(sep, ":role=", 6) ||
 				 !strnicmp(sep, ":desc", 5) ||
+				 !strnicmp(sep, ":duration=", 10) || /*legacy*/!strnicmp(sep, ":period_duration=", 10) ||
 				 !strnicmp(sep, ":xlink=", 7)) {
 					break;
 				} else {
@@ -1491,7 +1521,7 @@
 
 			if (!strnicmp(opts, "id=", 3)) {
 				u32 i;
-				strncpy(di->representationID, opts+3, 99);
+				di->representationID = gf_strdup(opts+3);
 				/* check to see if this representation Id has already been assigned */
 				for (i=0; i<(*nb_dash_inputs)-1; i++) {
 					GF_DashSegmenterInput *other_di;
@@ -1500,14 +1530,14 @@
 						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Duplicate Representation ID \"%s\" in command line\n", di->representationID));
 					}
 				}
-			} else if (!strnicmp(opts, "period=", 7)) {
-				if (strlen(opts+7) > 99) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] PeriodID cannot exceed 99 characters in MP4Box, truncating ...\n"));
-				}
-				strncpy(di->periodID, opts+7, 99);
-			}
-			else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
-			else if (!strnicmp(opts, "role=", 5)) strncpy(di->role, opts+5, 99);
+			} else if (!strnicmp(opts, "dur=", 4)) di->media_duration = (Double)atof(opts+4);
+			else if (!strnicmp(opts, "period=", 7)) di->periodID = gf_strdup(opts+7);
+			else if (!strnicmp(opts, "BaseURL=", 8)) {
+				di->baseURL = (char **)gf_realloc(di->baseURL, (di->nb_baseURL+1)*sizeof(char *));
+				di->baseURL[di->nb_baseURL] = gf_strdup(opts+8);
+				di->nb_baseURL++;
+			} else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
+			else if (!strnicmp(opts, "role=", 5)) di->role = gf_strdup(opts+5);
 			else if (!strnicmp(opts, "desc", 4)) {
 				u32 *nb_descs=NULL;
 				char ***descs=NULL;
@@ -1541,20 +1571,25 @@
 				}
 
 			}
-			else if (!strnicmp(opts, "xlink=", 6)) {
-				if (strlen(opts+6) > 99) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] XLink cannot exceed 99 characters in MP4Box, truncating ...\n"));
-				}
-				strncpy(di->xlink, opts+6, 99);
+			else if (!strnicmp(opts, "xlink=", 6)) di->xlink = gf_strdup(opts+6);
+			else if (!strnicmp(opts, "period_duration=", 16)) {
+				di->period_duration = (Double) atof(opts+16);
+			}	else if (!strnicmp(opts, "duration=", 9)) {
+				di->period_duration = (Double) atof(opts+9); /*legacy: use period_duration instead*/
 			}
 
 			if (!sep) break;
 			sep[0] = ':';
 			opts = sep+1;
 		}
+		first_opt[0] = '\0';
 	}
 	di->file_name = name;
-	if (!strlen(di->representationID)) sprintf(di->representationID, "%d", *nb_dash_inputs);
+	if (!di->representationID) {
+		char szRep[100];
+		sprintf(szRep, "%d", *nb_dash_inputs);
+		di->representationID = gf_strdup(szRep);
+	}
 
 	return dash_inputs;
 }
@@ -1610,6 +1645,7 @@
 	return dump_type;
 }
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
 static GF_Err nhml_bs_to_bin(char *inName, char *outName, u32 dump_std)
 {
 	GF_Err e;
@@ -1619,7 +1655,7 @@
 
 	GF_DOMParser *dom = gf_xml_dom_new();
 	e = gf_xml_dom_parse(dom, inName, NULL, NULL);
-	if (e) {	
+	if (e) {
 		gf_xml_dom_del(dom);
 		fprintf(stderr, "Failed to parse XML file: %s\n", gf_error_to_string(e));
 		return e;
@@ -1633,7 +1669,7 @@
 	e = gf_xml_parse_bit_sequence(root, &data, &data_size);
 	gf_xml_dom_del(dom);
 
-	if (e) {	
+	if (e) {
 		fprintf(stderr, "Failed to parse binary sequence: %s\n", gf_error_to_string(e));
 		return e;
 	}
@@ -1649,7 +1685,7 @@
 			strcpy(szFile, inName);
 			strcat(szFile, ".bin");
 		}
-		t = fopen(szFile, "wb");
+		t = gf_fopen(szFile, "wb");
 		if (!t) {
 			fprintf(stderr, "Failed to open file %s\n", szFile);
 			e = GF_IO_ERR;
@@ -1658,13 +1694,13 @@
 				fprintf(stderr, "Failed to write output to file %s\n", szFile);
 				e = GF_IO_ERR;
 			}
-			fclose(t);
+			gf_fclose(t);
 		}
 	}
 	gf_free(data);
 	return e;
 }
-
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
 
 static GF_Err hash_file(char *name, u32 dump_std)
 {
@@ -1677,730 +1713,255 @@
 	} else if (dump_std==1) {
 		for (i=0; i<20; i++) fprintf(stdout, "%02X", hash[i]);
 	}
-	fprintf(stderr, "File %s hash (SHA-1): ", name);
+	fprintf(stderr, "File hash (SHA-1): ");
 	for (i=0; i<20; i++) fprintf(stderr, "%02X", hash[i]);
 	fprintf(stderr, "\n");
 
 	return GF_OK;
 }
 
+Bool log_sys_clock = GF_FALSE;
+Bool log_utc_time = GF_FALSE;
+
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
 	FILE *logs = cbk;
+
+	if (log_sys_clock) {
+		fprintf(logs, "At "LLD" ", gf_sys_clock_high_res() );
+	}
+	if (log_utc_time) {
+		u64 utc_clock = gf_net_get_utc() ;
+		time_t secs = utc_clock/1000;
+		struct tm t;
+		t = *gmtime(&secs);
+		fprintf(logs, "UTC %d-%02d-%02dT%02d:%02d:%02dZ (TS "LLU") - ", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
+	}
+
 	vfprintf(logs, fmt, list);
 	fflush(logs);
 }
 
-int mp4boxMain(int argc, char **argv)
-{
-	char outfile[5000];
-	GF_Err e;
+char outfile[5000];
+GF_Err e;
 #ifndef GPAC_DISABLE_SCENE_ENCODER
-	GF_SMEncodeOptions opts;
+GF_SMEncodeOptions opts;
 #endif
-	SDPLine *sdp_lines = NULL;
-	Double interleaving_time, split_duration, split_start, import_fps, dash_duration, dash_subduration;
-	MetaAction *metas = NULL;
-	TrackAction *tracks = NULL;
-	TSELAction *tsel_acts = NULL;
-	u64 movie_time, initial_tfdt;
-	s32 subsegs_per_sidx;
-	u32 *brand_add = NULL;
-	u32 *brand_rem = NULL;
-	GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-	u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, dash_dynamic, initial_moof_sn, dump_std, import_subtitle;
+SDPLine *sdp_lines = NULL;
+Double interleaving_time, split_duration, split_start, import_fps, dash_duration, dash_subduration;
+Bool dash_duration_strict;
+MetaAction *metas = NULL;
+TrackAction *tracks = NULL;
+TSELAction *tsel_acts = NULL;
+u64 movie_time, initial_tfdt;
+s32 subsegs_per_sidx;
+u32 *brand_add = NULL;
+u32 *brand_rem = NULL;
+GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_DEFAULT;
+u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, initial_moof_sn, dump_std, import_subtitle;
+GF_DashDynamicMode dash_mode=GF_DASH_STATIC;
 #ifndef GPAC_DISABLE_SCENE_DUMP
-	GF_SceneDumpFormat dump_mode;
+GF_SceneDumpFormat dump_mode;
 #endif
-	Bool HintIt, needSave, FullInter, Frag, HintInter, dump_rtp, regular_iod, remove_sys_tracks, remove_hint, force_new, remove_root_od;
-	Bool print_sdp, print_info, open_edit, dump_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, dash_live, no_fragments_defaults, single_traf_per_moof;
-	char *inName, *outName, *arg, *mediaSource, *tmpdir, *input_ctx, *output_ctx, *drm_file, *avi2raw, *cprt, *chap_file, *pes_dump, *itunes_tags, *pack_file, *raw_cat, *seg_name, *dash_ctx_file;
-	u32 track_dump_type;
-	u32 trackID;
-	Double min_buffer = 1.5;
-	u32 ast_shift_sec = 1;
-	u32 dump_chap = 0;
-	u32 dump_udta_type = 0;
-	u32 dump_udta_track = 0;
-	char **mpd_base_urls = NULL;
-	u32 nb_mpd_base_urls=0;
-	u32 dash_scale = 1000;
+Double mpd_live_duration = 0;
+Bool HintIt, needSave, FullInter, Frag, HintInter, dump_rtp, regular_iod, remove_sys_tracks, remove_hint, force_new, remove_root_od;
+Bool print_sdp, print_info, open_edit, dump_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, dash_live, no_fragments_defaults, single_traf_per_moof;
+char *inName, *outName, *arg, *mediaSource, *tmpdir, *input_ctx, *output_ctx, *drm_file, *avi2raw, *cprt, *chap_file, *pes_dump, *itunes_tags, *pack_file, *raw_cat, *seg_name, *dash_ctx_file;
+u32 track_dump_type;
+u32 trackID;
+Double min_buffer = 1.5;
+s32 ast_offset_ms = 0;
+u32 dump_chap = 0;
+u32 dump_udta_type = 0;
+u32 dump_udta_track = 0;
+char **mpd_base_urls = NULL;
+u32 nb_mpd_base_urls = 0;
+u32 dash_scale = 1000;
+Bool insert_utc = GF_FALSE;
 
 #ifndef GPAC_DISABLE_MPD
-	Bool do_mpd = 0;
+Bool do_mpd = GF_FALSE;
 #endif
 #ifndef GPAC_DISABLE_SCENE_ENCODER
-	Bool chunk_mode=0;
+Bool chunk_mode = GF_FALSE;
 #endif
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	Bool HintCopy=0;
-	u32 MTUSize = 1450;
-#endif
-	GF_ISOFile *file;
-	u32 mpd_update_time = 0;
-	Bool stream_rtp=0;
-	Bool live_scene=0;
-	Bool enable_mem_tracker = 0;
-	Bool dump_iod=0;
-	Bool pssh_in_moof=0;
-	Bool samplegroups_in_traf=0;
-	Bool daisy_chain_sidx=0;
-	Bool single_segment=0;
-	Bool single_file=0;
-	Bool segment_timeline=0;
-	u32 segment_marker = 0;
-	GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
-	Bool use_url_template=0;
-	Bool seg_at_rap=0;
-	Bool frag_at_rap=0;
-	Bool adjust_split_end = 0;
-	Bool memory_frags = 1;
-	Bool keep_utc = 0;
-	Bool do_bin_nhml = 0;
-	u32 timescale = 0;
-	const char *do_wget = NULL;
-	GF_DashSegmenterInput *dash_inputs = NULL;
-	u32 nb_dash_inputs = 0;
-	char *gf_logs = NULL;
-	char *seg_ext = NULL;
-	const char *dash_title = NULL;
-	const char *dash_source = NULL;
-	const char *dash_more_info = NULL;
-#if !defined(GPAC_DISABLE_STREAMING)
-	const char *grab_m2ts = NULL;
-	const char *grab_ifce = NULL;
-#endif
-	FILE *logfile = NULL;
-
-	nb_tsel_acts = nb_add = nb_cat = nb_track_act = nb_sdp_ex = max_ptime = raw_sample_num = nb_meta_act = rtp_rate = major_brand = nb_alt_brand_add = nb_alt_brand_rem = car_dur = minor_version = 0;
-	e = GF_OK;
-	split_duration = 0.0;
-	split_start = -1.0;
-	interleaving_time = 0.0;
-	dash_duration = dash_subduration = 0.0;
-	import_fps = 0;
-	import_flags = 0;
-	split_size = 0;
-	movie_time = 0;
-	dump_nal = 0;
-	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = 0;
-#ifndef GPAC_DISABLE_SCENE_DUMP
-	dump_mode = GF_SM_DUMP_NONE;
-#endif
-	Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = 0;
-	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = 0;
-	no_fragments_defaults = 0;
-	single_traf_per_moof = 0,
-	dash_dynamic = 0;
-	/*align cat is the new default behaviour for -cat*/
-	align_cat = 1;
-	subsegs_per_sidx = 0;
-	track_dump_type = 0;
-	crypt = 0;
-	time_shift_depth = 0;
-	file = NULL;
-	itunes_tags = pes_dump = NULL;
-	seg_name = dash_ctx_file = NULL;
-	initial_moof_sn = 0;
-	initial_tfdt = 0;
-
-#ifndef GPAC_DISABLE_SCENE_ENCODER
-	memset(&opts, 0, sizeof(opts));
+Bool HintCopy = 0;
+u32 MTUSize = 1450;
 #endif
-
-	trackID = stat_level = hint_flags = 0;
-	program_number = 0;
-	info_track_id = 0;
-	do_flat = 0;
-	inName = outName = mediaSource = input_ctx = output_ctx = drm_file = avi2raw = cprt = chap_file = pack_file = raw_cat = NULL;
-
-#ifndef GPAC_DISABLE_SWF_IMPORT
-	swf_flags = GF_SM_SWF_SPLIT_TIMELINE;
+#ifndef GPAC_DISABLE_CORE_TOOLS
+Bool do_bin_nhml = GF_FALSE;
 #endif
-	swf_flatten_angle = 0.0f;
-	tmpdir = NULL;
-
-	for (i = 1; i < (u32) argc ; i++) {
-		if (!strcmp(argv[i], "-mem-track")) {
-#ifdef GPAC_MEMORY_TRACKING
-			enable_mem_tracker = 1;
-#else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
-#endif
-			break;
-		}
-	}
-
-	/*init libgpac*/
-	gf_sys_init(enable_mem_tracker);
-	if (argc < 2) {
-		PrintUsage();
-		MP4BOX_EXIT_WITH_CODE(1);
-	}
-
-
-	/*parse our args*/
-	for (i = 1; i < (u32) argc ; i++) {
-		arg = argv[i];
-		/*input file(s)*/
-		if ((arg[0] != '-') || !stricmp(arg, "--")) {
-			char *arg_val = arg;
-			if (!stricmp(arg, "--")) {
-				CHECK_NEXT_ARG
-				arg_val = argv[i+1];
-				i++;
-			}
-			if (argc < 3) {
-				fprintf(stderr, "Error - only one input file found as argument, please check usage\n");
-				MP4BOX_EXIT_WITH_CODE(1);
-			} else if (inName) {
-				if (dash_duration) {
-					if (!nb_dash_inputs) {
-						dash_inputs = set_dash_input(dash_inputs, inName, &nb_dash_inputs);
-					}
-					dash_inputs = set_dash_input(dash_inputs, arg_val, &nb_dash_inputs);
-				} else {
-					fprintf(stderr, "Error - 2 input names specified, please check usage\n");
-					MP4BOX_EXIT_WITH_CODE(1);
-				}
-			} else {
-				inName = arg_val;
-			}
-		}
-		else if (!stricmp(arg, "-?")) {
-			PrintUsage();
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-version")) {
-			PrintVersion();
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-sdp")) print_sdp = 1;
-		else if (!stricmp(arg, "-quiet")) quiet = 2;
-		else if (!strcmp(argv[i], "-mem-track")) continue;
-
-		else if (!stricmp(arg, "-logs")) {
-			CHECK_NEXT_ARG
-			gf_logs = argv[i+1];
-			if (gf_logs)
-				gf_log_set_tools_levels(gf_logs);
-			i++;
-		}
-		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
-			logfile = gf_f64_open(argv[i+1], "wt");
-			gf_log_set_callback(logfile, on_gpac_log);
-			i++;
-		}
-		else if (!stricmp(arg, "-noprog")) quiet = 1;
-		else if (!stricmp(arg, "-info")) {
-			print_info = 1;
-			if ((i+1<(u32) argc) && (sscanf(argv[i+1], "%u", &info_track_id)==1)) {
-				char szTk[20];
-				sprintf(szTk, "%u", info_track_id);
-				if (!strcmp(szTk, argv[i+1])) i++;
-				else info_track_id=0;
-			} else {
-				info_track_id=0;
-			}
-		}
+GF_ISOFile *file;
+Bool frag_real_time = GF_FALSE;
+GF_DASH_ContentLocationMode cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
+Double mpd_update_time = GF_FALSE;
+Bool stream_rtp = GF_FALSE;
+Bool force_co64 = GF_FALSE;
+Bool live_scene = GF_FALSE;
+Bool enable_mem_tracker = GF_FALSE;
+Bool dump_iod = GF_FALSE;
+Bool pssh_in_moof = GF_FALSE;
+Bool samplegroups_in_traf = GF_FALSE;
+Bool daisy_chain_sidx = GF_FALSE;
+Bool single_segment = GF_FALSE;
+Bool single_file = GF_FALSE;
+Bool segment_timeline = GF_FALSE;
+u32 segment_marker = GF_FALSE;
+GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
+const char *dash_profile_extension = NULL;
+Bool use_url_template = GF_FALSE;
+Bool seg_at_rap = GF_FALSE;
+Bool frag_at_rap = GF_FALSE;
+Bool adjust_split_end = GF_FALSE;
+Bool memory_frags = GF_TRUE;
+Bool keep_utc = GF_FALSE;
+u32 timescale = 0;
+const char *do_wget = NULL;
+GF_DashSegmenterInput *dash_inputs = NULL;
+u32 nb_dash_inputs = 0;
+char *gf_logs = NULL;
+char *seg_ext = NULL;
+const char *dash_title = NULL;
+const char *dash_source = NULL;
+const char *dash_more_info = NULL;
 #if !defined(GPAC_DISABLE_STREAMING)
-		else if (!stricmp(arg, "-grab-ts")) {
-			CHECK_NEXT_ARG
-			grab_m2ts = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-ifce")) {
-			CHECK_NEXT_ARG
-			grab_ifce = argv[i+1];
-			i++;
-		}
-
-#endif
-#if !defined(GPAC_DISABLE_CORE_TOOLS)
-		else if (!stricmp(arg, "-wget")) {
-			CHECK_NEXT_ARG
-			do_wget = argv[i+1];
-			i++;
-		}
-#endif
-		/*******************************************************************************/
-		else if (!stricmp(arg, "-dvbhdemux")) {
-			dvbhdemux = 1;
-		}
-		/********************************************************************************/
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
-		else if (!stricmp(arg, "-raw")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NATIVE);
-			i++;
-		}
-		else if (!stricmp(arg, "-raw-layer")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER);
-			i++;
-		}
-		else if (!stricmp(arg, "-qcp")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP);
-			i++;
-		}
-		else if (!stricmp(arg, "-aviraw")) {
-			CHECK_NEXT_ARG
-			if (argv[i+1] && !stricmp(argv[i+1], "video")) trackID = 1;
-			else if (argv[i+1] && !stricmp(argv[i+1], "audio")) {
-				if (strlen(argv[i+1])==5) trackID = 2;
-				else trackID = 1 + atoi(argv[i+1] + 5);
-			}
-			else {
-				fprintf(stderr, "Usage: \"-aviraw video\" or \"-aviraw audio\"\n");
-				MP4BOX_EXIT_WITH_CODE(1);
-			}
-			track_dump_type = GF_EXPORT_AVI_NATIVE;
-			i++;
-		}
-		else if (!stricmp(arg, "-raws")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_RAW_SAMPLES);
-			i++;
-		}
-		else if (!stricmp(arg, "-nhnt")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NHNT);
-			i++;
-		}
-		else if (!stricmp(arg, "-nhml")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NHML);
-			i++;
-		}
-		else if (!stricmp(arg, "-webvtt-raw")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_WEBVTT_META);
-			i++;
-		}
-		else if (!stricmp(arg, "-six")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_SIX);
-			i++;
-		}
-		else if (!stricmp(arg, "-avi")) {
-			CHECK_NEXT_ARG
-			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_AVI);
-			i++;
-		}
-#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-		else if (!stricmp(arg, "-rtp")) {
-			stream_rtp = 1;
-		}
-		else if (!stricmp(arg, "-live")) {
-			live_scene = 1;
-		}
+const char *grab_m2ts = NULL;
+const char *grab_ifce = NULL;
 #endif
-		else if (!stricmp(arg, "-diod")) {
-			dump_iod = 1;
-		}
-#ifndef GPAC_DISABLE_VRML
-		else if (!stricmp(arg, "-node")) {
-			CHECK_NEXT_ARG PrintNode(argv[i+1], 0);
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-xnode")) {
-			CHECK_NEXT_ARG PrintNode(argv[i+1], 1);
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-nodes")) {
-			PrintBuiltInNodes(0);
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-xnodes")) {
-			PrintBuiltInNodes(1);
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-#endif
-#ifndef GPAC_DISABLE_SVG
-		else if (!stricmp(arg, "-snode")) {
-			CHECK_NEXT_ARG PrintNode(argv[i+1], 2);
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-snodes")) {
-			PrintBuiltInNodes(2);
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-#endif
-		else if (!stricmp(arg, "-std")) dump_std = 2;
-		else if (!stricmp(arg, "-stdb")) dump_std = 1;
-
-#if !defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)
-		else if (!stricmp(arg, "-bt")) dump_mode = GF_SM_DUMP_BT;
-		else if (!stricmp(arg, "-xmt")) dump_mode = GF_SM_DUMP_XMTA;
-		else if (!stricmp(arg, "-wrl")) dump_mode = GF_SM_DUMP_VRML;
-		else if (!stricmp(arg, "-x3dv")) dump_mode = GF_SM_DUMP_X3D_VRML;
-		else if (!stricmp(arg, "-x3d")) dump_mode = GF_SM_DUMP_X3D_XML;
-		else if (!stricmp(arg, "-lsr")) dump_mode = GF_SM_DUMP_LASER;
-		else if (!stricmp(arg, "-svg")) dump_mode = GF_SM_DUMP_SVG;
-#endif /*defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)*/
-
-		else if (!stricmp(arg, "-stat")) stat_level = 1;
-		else if (!stricmp(arg, "-stats")) stat_level = 2;
-		else if (!stricmp(arg, "-statx")) stat_level = 3;
-		else if (!stricmp(arg, "-diso")) dump_isom = 1;
-		else if (!stricmp(arg, "-dump-cover")) dump_cart = 1;
-		else if (!stricmp(arg, "-dump-chap")) dump_chap = 1;
-		else if (!stricmp(arg, "-dump-chap-ogg")) dump_chap = 2;
-		else if (!stricmp(arg, "-hash")) do_hash = 1;
-		else if (!stricmp(arg, "-bin")) do_bin_nhml = 1;
-		else if (!stricmp(arg, "-dump-udta")) {
-			char *sep, *code;
-			CHECK_NEXT_ARG 
-			sep = strchr(argv[i+1], ':');
-			if (sep) {
-				sep[0] = 0;
-				dump_udta_track = atoi(argv[i+1]);
-				sep[0] = ':';
-				code = &sep[1];
-			} else {
-				code = argv[i+1];
-			}
-			dump_udta_type = GF_4CC(code[0], code[1], code[2], code[3]);
-			i++;
-		}
+FILE *logfile = NULL;
 
-
-#if 0
-		else if (!stricmp(arg, "-conf")) {
-			if (i+1==(u32)argc) {
-				fprintf(stderr, "Missing arg - please check usage\n");
-				MP4BOX_EXIT_WITH_CODE(1);
-			}
-			if (i+2==(u32)argc) {
-				gf_check_isom_files(NULL, argv[i+1]);
-			} else {
-				gf_check_isom_files(argv[i+1], argv[i+2]);
+u32 mp4box_cleanup(u32 ret_code) {
+	if (mpd_base_urls) {
+		gf_free(mpd_base_urls);
+		mpd_base_urls = NULL;
+	}
+	if (sdp_lines) {
+		gf_free(sdp_lines);
+		sdp_lines = NULL;
+	}
+	if (metas) {
+		gf_free(metas);
+		metas = NULL;
+	}
+	if (tracks) {
+		for (i = 0; i<nb_track_act; i++) {
+			if (tracks[i].out_name)
+				gf_free(tracks[i].out_name);
+			if (tracks[i].src_name)
+				gf_free(tracks[i].src_name);
+			if (tracks[i].kind_scheme)
+				gf_free(tracks[i].kind_scheme);
+			if (tracks[i].kind_value)
+				gf_free(tracks[i].kind_value);
+		}
+		gf_free(tracks);
+		tracks = NULL;
+	}
+	if (tsel_acts) {
+		gf_free(tsel_acts);
+		tsel_acts = NULL;
+	}
+	if (brand_add) {
+		gf_free(brand_add);
+		brand_add = NULL;
+	}
+	if (brand_rem) {
+		gf_free(brand_rem);
+		brand_rem = NULL;
+	}
+	if (dash_inputs) {
+		u32 i, j;
+		for (i = 0; i<nb_dash_inputs; i++) {
+			GF_DashSegmenterInput *di = &dash_inputs[i];
+			if (di->nb_baseURL) {
+				for (j = 0; j<di->nb_baseURL; j++) {
+					gf_free(di->baseURL[j]);
+				}
+				gf_free(di->baseURL);
 			}
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-#endif
-		else if (!stricmp(arg, "-dmp4")) {
-			dump_isom = 1;
-			fprintf(stderr, "WARNING: \"-dmp4\" is deprecated - use \"-diso\" option\n");
-		}
-		else if (!stricmp(arg, "-drtp")) dump_rtp = 1;
-		else if (!stricmp(arg, "-dts")) {
-			dump_timestamps = 1;
-			if ( ((i+1<(u32) argc) && inName) || (i+2<(u32) argc) ) {
-				if (argv[i+1][0] != '-') program_number = atoi(argv[i+1]);
-				i++;
+			if (di->rep_descs) {
+				for (j = 0; j<di->nb_rep_descs; j++) {
+					gf_free(di->rep_descs[j]);
+				}
+				gf_free(di->rep_descs);
 			}
-		} else if (!stricmp(arg, "-dnal")) {
-			CHECK_NEXT_ARG
-			dump_nal = atoi(argv[i+1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-dcr")) dump_cr = 1;
-		else if (!stricmp(arg, "-ttxt") || !stricmp(arg, "-srt")) {
-			if ((i+1<(u32) argc) && (sscanf(argv[i+1], "%u", &trackID)==1)) {
-				char szTk[20];
-				sprintf(szTk, "%d", trackID);
-				if (!strcmp(szTk, argv[i+1])) i++;
-				else trackID=0;
-			} else {
-				trackID = 0;
+			if (di->as_descs) {
+				for (j = 0; j<di->nb_as_descs; j++) {
+					gf_free(di->as_descs[j]);
+				}
+				gf_free(di->as_descs);
 			}
-#ifdef GPAC_DISABLE_ISOM_WRITE
-			if (trackID) {
-				fprintf(stderr, "Error: Read-Only version - subtitle conversion not available\n");
-				MP4BOX_EXIT_WITH_CODE(1);
+			if (di->as_c_descs) {
+				for (j = 0; j<di->nb_as_c_descs; j++) {
+					gf_free(di->as_c_descs[j]);
+				}
+				gf_free(di->as_c_descs);
 			}
-#endif
-			if (!stricmp(arg, "-ttxt")) dump_ttxt = GF_TRUE;
-			else dump_srt = GF_TRUE;
-			import_subtitle = 1;
-		} else if (!stricmp(arg, "-dm2ts")) {
-			dump_m2ts = 1;
-			if ( ((i+1<(u32) argc) && inName) || (i+2<(u32) argc) ) {
-				if (argv[i+1][0] != '-') pes_dump = argv[i+1];
-				i++;
+			if (di->p_descs) {
+				for (j = 0; j<di->nb_p_descs; j++) {
+					gf_free(di->p_descs[j]);
+				}
+				gf_free(di->p_descs);
 			}
+			if (di->representationID) gf_free(di->representationID);
+			if (di->periodID) gf_free(di->periodID);
+			if (di->xlink) gf_free(di->xlink);
+			if (di->role) gf_free(di->role);
 		}
+		gf_free(dash_inputs);
+		dash_inputs = NULL;
+	}
+	gf_sys_close();
+	return ret_code;
+}
 
-#ifndef GPAC_DISABLE_SWF_IMPORT
-		/*SWF importer options*/
-		else if (!stricmp(arg, "-global")) swf_flags |= GF_SM_SWF_STATIC_DICT;
-		else if (!stricmp(arg, "-no-ctrl")) swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE;
-		else if (!stricmp(arg, "-no-text")) swf_flags |= GF_SM_SWF_NO_TEXT;
-		else if (!stricmp(arg, "-no-font")) swf_flags |= GF_SM_SWF_NO_FONT;
-		else if (!stricmp(arg, "-no-line")) swf_flags |= GF_SM_SWF_NO_LINE;
-		else if (!stricmp(arg, "-no-grad")) swf_flags |= GF_SM_SWF_NO_GRADIENT;
-		else if (!stricmp(arg, "-quad")) swf_flags |= GF_SM_SWF_QUAD_CURVE;
-		else if (!stricmp(arg, "-xlp")) swf_flags |= GF_SM_SWF_SCALABLE_LINE;
-		else if (!stricmp(arg, "-ic2d")) swf_flags |= GF_SM_SWF_USE_IC2D;
-		else if (!stricmp(arg, "-same-app")) swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
-		else if (!stricmp(arg, "-flatten")) {
-			CHECK_NEXT_ARG
-			swf_flatten_angle = (Float) atof(argv[i+1]);
-			i++;
-		}
-#endif
-#ifndef GPAC_DISABLE_ISOM_WRITE
-		else if (!stricmp(arg, "-isma")) {
-			conv_type = GF_ISOM_CONV_TYPE_ISMA;
-			open_edit = 1;
-		}
-		else if (!stricmp(arg, "-3gp")) {
-			conv_type = GF_ISOM_CONV_TYPE_3GPP;
-			open_edit = 1;
-		}
-		else if (!stricmp(arg, "-ipod")) {
-			conv_type = GF_ISOM_CONV_TYPE_IPOD;
-			open_edit = 1;
-		}
-		else if (!stricmp(arg, "-psp")) {
-			conv_type = GF_ISOM_CONV_TYPE_PSP;
-			open_edit = 1;
-		}
-		else if (!stricmp(arg, "-ismax")) {
-			conv_type = GF_ISOM_CONV_TYPE_ISMA_EX;
-			open_edit = 1;
-		}
-
-		else if (!stricmp(arg, "-no-sys") || !stricmp(arg, "-nosys")) {
-			remove_sys_tracks = 1;
-			open_edit = 1;
-		}
-		else if (!stricmp(arg, "-no-iod")) {
-			remove_root_od = 1;
-			open_edit = 1;
-		}
-		else if (!stricmp(arg, "-out")) {
-			CHECK_NEXT_ARG outName = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-tmp")) {
-			CHECK_NEXT_ARG tmpdir = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-write-buffer")) {
-			CHECK_NEXT_ARG
-			gf_isom_set_output_buffering(NULL, atoi(argv[i+1]));
-			i++;
-		}
-		else if (!stricmp(arg, "-cprt")) {
-			CHECK_NEXT_ARG cprt = argv[i+1];
-			i++;
-			if (!dash_duration) open_edit = 1;
-		}
-		else if (!stricmp(arg, "-chap")) {
-			CHECK_NEXT_ARG chap_file = argv[i+1];
-			i++;
-			open_edit = 1;
-		}
-		else if (!strcmp(arg, "-strict-error")) {
-			gf_log_set_strict_error(1);
-		} else if (!stricmp(arg, "-inter") || !stricmp(arg, "-old-inter")) {
-			CHECK_NEXT_ARG
-			interleaving_time = atof(argv[i+1]) / 1000;
-			open_edit = 1;
-			needSave = 1;
-			if (!stricmp(arg, "-old-inter")) old_interleave = 1;
-			i++;
-		} else if (!stricmp(arg, "-frag")) {
-			CHECK_NEXT_ARG
-			interleaving_time = atof(argv[i+1]) / 1000;
-			needSave = 1;
-			i++;
-			Frag = 1;
-		} else if (!stricmp(arg, "-dash")) {
-			CHECK_NEXT_ARG
-			dash_duration = atof(argv[i+1]) / 1000;
-			if (dash_duration == 0.0) {
-				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
-			}
-			i++;
-		} else if (!stricmp(arg, "-subdur")) {
-			CHECK_NEXT_ARG
-			dash_subduration = atof(argv[i+1]) / 1000;
-			i++;
-		} else if (!stricmp(arg, "-dash-scale")) {
-			CHECK_NEXT_ARG
-			dash_scale = atoi(argv[i+1]);
-			if (!dash_scale) {
-				fprintf(stderr, "\tERROR: \"-dash-scale\": invalid parameter %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
-			}
-			i++;
-		} else if (!stricmp(arg, "-dash-ts-prog")) {
-			CHECK_NEXT_ARG
-			program_number = atoi(argv[i+1]);
-			i++;
-		} else if (!stricmp(arg, "-subsegs-per-sidx") || !stricmp(arg, "-frags-per-sidx")) {
-			CHECK_NEXT_ARG
-			subsegs_per_sidx = atoi(argv[i+1]);
-			i++;
-		} else if (!stricmp(arg, "-segment-name")) {
-			CHECK_NEXT_ARG
-			seg_name = argv[i+1];
-			i++;
-		} else if (!stricmp(arg, "-segment-ext")) {
-			CHECK_NEXT_ARG
-			seg_ext = argv[i+1];
-			i++;
-		} else if (!stricmp(arg, "-bs-switching")) {
-			CHECK_NEXT_ARG
-			if (!stricmp(argv[i+1], "no") || !stricmp(argv[i+1], "off")) bitstream_switching_mode = GF_DASH_BSMODE_NONE;
-			else if (!stricmp(argv[i+1], "merge")) bitstream_switching_mode = GF_DASH_BSMODE_MERGED;
-			else if (!stricmp(argv[i+1], "single")) bitstream_switching_mode = GF_DASH_BSMODE_SINGLE;
-			else if (!stricmp(argv[i+1], "inband")) bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-			else bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-			i++;
-		}
-		else if (!stricmp(arg, "-dynamic")) {
-			dash_dynamic = 1;
-		}
-		else if (!strnicmp(arg, "-dash-live", 10) || !strnicmp(arg, "-ddbg-live", 10)) {
-			dash_dynamic = !strnicmp(arg, "-ddbg-live", 10) ? 2 : 1;
-			dash_live = 1;
-			if (arg[10]=='=') {
-				dash_ctx_file = arg+11;
-			}
-			CHECK_NEXT_ARG
-			dash_duration = atof(argv[i+1]) / 1000;
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-refresh")) {
-			CHECK_NEXT_ARG mpd_update_time = atoi(argv[i+1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-time-shift")) {
-			CHECK_NEXT_ARG
-			time_shift_depth = (u32) atoi(argv[i+1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-min-buffer")) {
-			CHECK_NEXT_ARG
-			min_buffer = atoi(argv[i+1]);
-			min_buffer /= 1000;
-			i++;
-		}
-		else if (!stricmp(arg, "-ast-offset")) {
-			CHECK_NEXT_ARG
-			ast_shift_sec = (u32) atoi(argv[i+1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-moof-sn")) {
-			CHECK_NEXT_ARG
-			initial_moof_sn = (u32) atoi(argv[i+1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-tfdt")) {
-			CHECK_NEXT_ARG
-			sscanf(argv[i+1], LLU, &initial_tfdt);
-			i++;
-		}
-		else if (!stricmp(arg, "-no-frags-default")) {
-			no_fragments_defaults = 1;
-		}
-		else if (!stricmp(arg, "-single-traf")) {
-			single_traf_per_moof = 1;
-		}
-		else if (!stricmp(arg, "-mpd-title")) {
-			CHECK_NEXT_ARG dash_title = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-source")) {
-			CHECK_NEXT_ARG dash_source = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-mpd-info-url")) {
-			CHECK_NEXT_ARG dash_more_info = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-base-url")) {
-			CHECK_NEXT_ARG
-			dash_more_info = argv[i+1];
-			mpd_base_urls = gf_realloc(mpd_base_urls, (nb_mpd_base_urls+1)*sizeof(char**));
-			mpd_base_urls[nb_mpd_base_urls] = argv[i+1];
-			nb_mpd_base_urls++;
-			i++;
-		}
-		else if (!stricmp(arg, "-dash-ctx")) {
-			CHECK_NEXT_ARG
-			dash_ctx_file = argv[i+1];
-			i++;
-		} else if (!stricmp(arg, "-daisy-chain")) {
-			daisy_chain_sidx = 1;
-		} else if (!stricmp(arg, "-single-segment")) {
-			single_segment = 1;
-		} else if (!stricmp(arg, "-single-file")) {
-			single_file = 1;
-		} else if (!stricmp(arg, "-pssh-moof")) {
-			pssh_in_moof = 1;
-		} else if (!stricmp(arg, "-sample-groups-traf")) {
-			samplegroups_in_traf = 1;
-		} else if (!stricmp(arg, "-dash-profile") || !stricmp(arg, "-profile")) {
-			CHECK_NEXT_ARG
-			if (!stricmp(argv[i+1], "live") || !stricmp(argv[i+1], "simple")) dash_profile = GF_DASH_PROFILE_LIVE;
-			else if (!stricmp(argv[i+1], "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
-			else if (!stricmp(argv[i+1], "dashavc264:live")) {
-				dash_profile = GF_DASH_PROFILE_AVC264_LIVE;
-			} else if (!stricmp(argv[i+1], "dashavc264:onDemand")) {
-				dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
-			} else if (!stricmp(argv[i+1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
-			else dash_profile = GF_DASH_PROFILE_FULL;
-			i++;
-		} else if (!strnicmp(arg, "-url-template", 13)) {
-			use_url_template = 1;
-			if ((arg[13]=='=') && arg[14]) {
-				if (!strcmp( &arg[14], "simulate")) use_url_template = 2;
-			}
-		} else if (!stricmp(arg, "-segment-timeline")) {
-			segment_timeline = 1;
-		} else if (!stricmp(arg, "-mem-frags")) {
-			memory_frags = 1;
-		} else if (!stricmp(arg, "-segment-marker")) {
-			char *m;
+u32 mp4box_parse_args_continue(int argc, char **argv, u32 *current_index)
+{
+	u32 i = *current_index;
+	/*parse our args*/
+	{
+		arg = argv[i];
+		if (!stricmp(arg, "-itags")) {
 			CHECK_NEXT_ARG
-			m = argv[i+1];
-			segment_marker = GF_4CC(m[0], m[1], m[2], m[3]);
-		} else if (!stricmp(arg, "-itags")) {
-			CHECK_NEXT_ARG itunes_tags = argv[i+1];
+			itunes_tags = argv[i + 1];
 			i++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 		}
 #ifndef GPAC_DISABLE_ISOM_HINTING
 		else if (!stricmp(arg, "-hint")) {
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			HintIt = 1;
 		}
 		else if (!stricmp(arg, "-unhint")) {
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			remove_hint = 1;
 		}
 		else if (!stricmp(arg, "-copy")) HintCopy = 1;
 		else if (!stricmp(arg, "-tight")) {
 			FullInter = 1;
-			open_edit = 1;
-			needSave = 1;
-		} else if (!stricmp(arg, "-ocr")) force_ocr = 1;
+			open_edit = GF_TRUE;
+			needSave = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-ocr")) force_ocr = 1;
 		else if (!stricmp(arg, "-latm")) hint_flags |= GP_RTP_PCK_USE_LATM_AAC;
 		else if (!stricmp(arg, "-rap")) {
-			if ((i+1 < (u32)argc) && (argv[i+1][0] != '-')) {
-				if (sscanf(argv[i+1], "%d", &trackID) == 1) {
-					tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-					memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			if ((i + 1 < (u32)argc) && (argv[i + 1][0] != '-')) {
+				if (sscanf(argv[i + 1], "%d", &trackID) == 1) {
+					tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+					memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 					tracks[nb_track_act].act_type = TRAC_ACTION_REM_NON_RAP;
 					tracks[nb_track_act].trackID = trackID;
 					nb_track_act++;
 					i++;
-					open_edit = 1;
+					open_edit = GF_TRUE;
 				}
 			}
 			hint_flags |= GP_RTP_PCK_SIGNAL_RAP;
-			seg_at_rap=1;
+			seg_at_rap = 1;
 		}
 		else if (!stricmp(arg, "-frag-rap")) {
-			frag_at_rap=1;
+			frag_at_rap = 1;
 		}
 		else if (!stricmp(arg, "-ts")) hint_flags |= GP_RTP_PCK_SIGNAL_TS;
 		else if (!stricmp(arg, "-size")) hint_flags |= GP_RTP_PCK_SIGNAL_SIZE;
@@ -2408,11 +1969,11 @@
 		else if (!stricmp(arg, "-static")) hint_flags |= GP_RTP_PCK_USE_STATIC_ID;
 		else if (!stricmp(arg, "-multi")) {
 			hint_flags |= GP_RTP_PCK_USE_MULTI;
-			if ((i+1<(u32) argc) && (sscanf(argv[i+1], "%u", &max_ptime)==1)) {
+			if ((i + 1 < (u32)argc) && (sscanf(argv[i + 1], "%u", &max_ptime) == 1)) {
 				char szPt[20];
 				sprintf(szPt, "%u", max_ptime);
-				if (!strcmp(szPt, argv[i+1])) i++;
-				else max_ptime=0;
+				if (!strcmp(szPt, argv[i + 1])) i++;
+				else max_ptime = 0;
 			}
 		}
 #endif
@@ -2426,39 +1987,44 @@
 		}
 #ifndef GPAC_DISABLE_ISOM_HINTING
 		else if (!stricmp(arg, "-mtu")) {
-			CHECK_NEXT_ARG MTUSize = atoi(argv[i+1]);
+			CHECK_NEXT_ARG
+			MTUSize = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-cardur")) {
-			CHECK_NEXT_ARG car_dur = atoi(argv[i+1]);
+			CHECK_NEXT_ARG
+			car_dur = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-rate")) {
-			CHECK_NEXT_ARG rtp_rate = atoi(argv[i+1]);
+			CHECK_NEXT_ARG
+			rtp_rate = atoi(argv[i + 1]);
 			i++;
 		}
 #ifndef GPAC_DISABLE_SENG
 		else if (!stricmp(arg, "-add-sdp") || !stricmp(arg, "-sdp_ex")) {
 			char *id;
 			CHECK_NEXT_ARG
-			sdp_lines = gf_realloc(sdp_lines, sizeof(SDPLine) * (nb_sdp_ex+1) );
+			sdp_lines = gf_realloc(sdp_lines, sizeof(SDPLine) * (nb_sdp_ex + 1));
 
-			id = strchr(argv[i+1], ':');
+			id = strchr(argv[i + 1], ':');
 			if (id) {
 				id[0] = 0;
-				if (sscanf(argv[i+1], "%u", &sdp_lines[0].trackID)==1) {
+				if (sscanf(argv[i + 1], "%u", &sdp_lines[0].trackID) == 1) {
 					id[0] = ':';
-					sdp_lines[nb_sdp_ex].line = id+1;
-				} else {
+					sdp_lines[nb_sdp_ex].line = id + 1;
+				}
+				else {
 					id[0] = ':';
-					sdp_lines[nb_sdp_ex].line = argv[i+1];
+					sdp_lines[nb_sdp_ex].line = argv[i + 1];
 					sdp_lines[nb_sdp_ex].trackID = 0;
 				}
-			} else {
-				sdp_lines[nb_sdp_ex].line = argv[i+1];
+			}
+			else {
+				sdp_lines[nb_sdp_ex].line = argv[i + 1];
 				sdp_lines[nb_sdp_ex].trackID = 0;
 			}
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_sdp_ex++;
 			i++;
 		}
@@ -2469,30 +2035,33 @@
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_MP4;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 			tracks[nb_track_act].act_type = TRAC_ACTION_RAW_EXTRACT;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
+			tracks[nb_track_act].trackID = atoi(argv[i + 1]);
 			tracks[nb_track_act].dump_type = GF_EXPORT_MP4;
 			nb_track_act++;
 			i++;
 #endif
 		}
 		else if (!stricmp(arg, "-iod")) regular_iod = 1;
-		else if (!stricmp(arg, "-flat")) do_flat = 1;
-		else if (!stricmp(arg, "-keep-utc")) keep_utc = 1;
-		else if (!stricmp(arg, "-new")) force_new = 1;
+		else if (!stricmp(arg, "-flat")) {
+			open_edit = GF_TRUE;
+			do_flat = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-keep-utc")) keep_utc = GF_TRUE;
+		else if (!stricmp(arg, "-new")) force_new = GF_TRUE;
 		else if (!stricmp(arg, "-timescale")) {
 			CHECK_NEXT_ARG
-			timescale = atoi(argv[i+1]);
-			open_edit = 1;
+			timescale = atoi(argv[i + 1]);
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-udta")) {
 			CHECK_NEXT_ARG
-			create_new_track_action(argv[i+1], &tracks, &nb_track_act, 0);
-			tracks[nb_track_act-1].act_type = TRAC_ACTION_SET_UDTA;
-			open_edit = 1;
+			create_new_track_action(argv[i + 1], &tracks, &nb_track_act, 0);
+			tracks[nb_track_act - 1].act_type = TRAC_ACTION_SET_UDTA;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-add") || !stricmp(arg, "-import") || !stricmp(arg, "-convert")) {
@@ -2511,11 +2080,11 @@
 			struct tm time;
 			CHECK_NEXT_ARG
 			memset(&time, 0, sizeof(struct tm));
-			sscanf(argv[i+1], "%d/%d/%d-%d:%d:%d", &time.tm_mday, &time.tm_mon, &time.tm_year, &time.tm_hour, &time.tm_min, &time.tm_sec);
-			time.tm_isdst=0;
+			sscanf(argv[i + 1], "%d/%d/%d-%d:%d:%d", &time.tm_mday, &time.tm_mon, &time.tm_year, &time.tm_hour, &time.tm_min, &time.tm_sec);
+			time.tm_isdst = 0;
 			time.tm_year -= 1900;
 			time.tm_mon -= 1;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			movie_time = 2082758400;
 			movie_time += mktime(&time);
 			i++;
@@ -2525,89 +2094,96 @@
 		else if (!stricmp(arg, "-unalign-cat")) align_cat = 0;
 		else if (!stricmp(arg, "-raw-cat")) {
 			CHECK_NEXT_ARG
-			raw_cat = argv[i+1];
+			raw_cat = argv[i + 1];
 			i++;
 		}
 		else if (!stricmp(arg, "-rem") || !stricmp(arg, "-disable") || !stricmp(arg, "-enable")) {
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 			if (!stricmp(arg, "-enable")) tracks[nb_track_act].act_type = TRAC_ACTION_ENABLE;
 			else if (!stricmp(arg, "-disable")) tracks[nb_track_act].act_type = TRAC_ACTION_DISABLE;
 			else tracks[nb_track_act].act_type = TRAC_ACTION_REM_TRACK;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			open_edit = 1;
+			tracks[nb_track_act].trackID = atoi(argv[i + 1]);
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
-		else if (!stricmp(arg, "-set-track-id")) {
+		else if (!stricmp(arg, "-set-track-id") || !stricmp(arg, "-swap-track-id")) {
 			char *sep;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
-			tracks[nb_track_act].act_type = TRAC_ACTION_SET_ID;
-			sep = strchr(argv[i+1], ':');
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
+			tracks[nb_track_act].act_type = !stricmp(arg, "-set-track-id") ? TRAC_ACTION_SET_ID : TRAC_ACTION_SWAP_ID;
+			sep = strchr(argv[i + 1], ':');
+			if (!sep) {
+				fprintf(stderr, "Bad format for -set-track-id - expecting \"id1:id2\" got \"%s\"\n", argv[i + 1]);
+				return 2;
+			}
 			*sep = 0;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
+			tracks[nb_track_act].trackID = atoi(argv[i + 1]);
 			*sep = ':';
 			sep++;
 			tracks[nb_track_act].newTrackID = atoi(sep);
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-par")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
 			tracks[nb_track_act].act_type = TRAC_ACTION_SET_PAR;
-			assert(strlen(argv[i+1])+1 <= sizeof(szTK));
-			strncpy(szTK, argv[i+1], sizeof(szTK));
+			assert(strlen(argv[i + 1]) + 1 <= sizeof(szTK));
+			strncpy(szTK, argv[i + 1], sizeof(szTK));
 			ext = strchr(szTK, '=');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
+				fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
+				return 2;
 			}
-			if (!stricmp(ext+1, "none")) {
+			if (!stricmp(ext + 1, "none")) {
 				tracks[nb_track_act].par_num = tracks[nb_track_act].par_den = -1;
-			} else {
-				sscanf(ext+1, "%d", &tracks[nb_track_act].par_num);
-				ext = strchr(ext+1, ':');
+			}
+			else {
+				sscanf(ext + 1, "%d", &tracks[nb_track_act].par_num);
+				ext = strchr(ext + 1, ':');
 				if (!ext) {
-					fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i+1]);
-					MP4BOX_EXIT_WITH_CODE(1);
+					fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
+					return 2;
 				}
-				sscanf(ext+1, "%d", &tracks[nb_track_act].par_den);
+				sscanf(ext + 1, "%d", &tracks[nb_track_act].par_den);
 			}
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-lang")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
 			tracks[nb_track_act].act_type = TRAC_ACTION_SET_LANGUAGE;
 			tracks[nb_track_act].trackID = 0;
-			strcpy(szTK, argv[i+1]);
+			strcpy(szTK, argv[i + 1]);
 			ext = strchr(szTK, '=');
-			if (!strnicmp(argv[i+1], "all=", 4)) {
-				tracks[nb_track_act].lang = gf_strdup(argv[i+1]+4);
-			} else if (!ext) {
-				tracks[nb_track_act].lang = gf_strdup(argv[i+1]);
-			} else {
-				tracks[nb_track_act].lang = gf_strdup(ext+1);
+			if (!strnicmp(argv[i + 1], "all=", 4)) {
+				tracks[nb_track_act].lang = gf_strdup(argv[i + 1] + 4);
+			}
+			else if (!ext) {
+				tracks[nb_track_act].lang = gf_strdup(argv[i + 1]);
+			}
+			else {
+				tracks[nb_track_act].lang = gf_strdup(ext + 1);
 				ext[0] = 0;
 				tracks[nb_track_act].trackID = atoi(szTK);
 				ext[0] = '=';
 			}
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
@@ -2616,119 +2192,123 @@
 			char *scheme_start = NULL;
 			Bool has_track_id = GF_FALSE;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
 			if (!stricmp(arg, "-kind")) {
 				tracks[nb_track_act].act_type = TRAC_ACTION_SET_KIND;
-			} else {
+			}
+			else {
 				tracks[nb_track_act].act_type = TRAC_ACTION_REM_KIND;
 			}
 			tracks[nb_track_act].trackID = 0;
-			if (!strnicmp(argv[i+1], "all=", 4)) {
-				scheme_start = argv[i+1]+4;
+			if (!strnicmp(argv[i + 1], "all=", 4)) {
+				scheme_start = argv[i + 1] + 4;
 				has_track_id = GF_TRUE;
 			}
 			if (!scheme_start) {
-				if (strlen(argv[i+1])>200) {
+				if (strlen(argv[i + 1]) > 200) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_ALL, ("Warning: track kind parameter is too long!"));
 				}
-				strncpy(szTK, argv[i+1], 200);
+				strncpy(szTK, argv[i + 1], 200);
 				ext = strchr(szTK, '=');
 				if (ext && !has_track_id) {
 					ext[0] = 0;
 					has_track_id = (sscanf(szTK, "%d", &tracks[nb_track_act].trackID) == 1 ? GF_TRUE : GF_FALSE);
 					if (has_track_id) {
-						scheme_start = ext+1;
-					} else {
+						scheme_start = ext + 1;
+					}
+					else {
 						scheme_start = szTK;
 					}
 					ext[0] = '=';
-				} else {
+				}
+				else {
 					scheme_start = szTK;
 				}
 			}
 			ext = strchr(scheme_start, '=');
 			if (!ext) {
 				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
-			} else {
+			}
+			else {
 				ext[0] = 0;
 				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
 				ext[0] = '=';
-				tracks[nb_track_act].kind_value = gf_strdup(ext+1);
+				tracks[nb_track_act].kind_value = gf_strdup(ext + 1);
 			}
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-delay")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			strcpy(szTK, argv[i+1]);
+			strcpy(szTK, argv[i + 1]);
 			ext = strchr(szTK, '=');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track delay - expecting ID=DLAY got %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
+				fprintf(stderr, "Bad format for track delay - expecting ID=DLAY got %s\n", argv[i + 1]);
+				return 2;
 			}
 			tracks[nb_track_act].act_type = TRAC_ACTION_SET_DELAY;
-			tracks[nb_track_act].delay_ms = atoi(ext+1);
+			tracks[nb_track_act].delay_ms = atoi(ext + 1);
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-ref")) {
 			char *szTK, *ext;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			szTK = argv[i+1];
+			szTK = argv[i + 1];
 			ext = strchr(szTK, ':');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
+				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i + 1]);
+				return 2;
 			}
 			tracks[nb_track_act].act_type = TRAC_ACTION_REFERENCE;
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
 			ext[0] = ':';
-			szTK = ext+1;
+			szTK = ext + 1;
 			ext = strchr(szTK, ':');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
+				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i + 1]);
+				return 2;
 			}
 			ext[0] = 0;
 			tracks[nb_track_act].lang = gf_strdup(szTK);
 			ext[0] = ':';
-			tracks[nb_track_act].delay_ms = (s32) atoi(ext+1);
-			open_edit = 1;
+			tracks[nb_track_act].delay_ms = (s32)atoi(ext + 1);
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-name")) {
 			char szTK[GF_MAX_PATH], *ext;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			strcpy(szTK, argv[i+1]);
+			strcpy(szTK, argv[i + 1]);
 			ext = strchr(szTK, '=');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track name - expecting ID=name got %s\n", argv[i+1]);
-				MP4BOX_EXIT_WITH_CODE(1);
+				fprintf(stderr, "Bad format for track name - expecting ID=name got %s\n", argv[i + 1]);
+				return 2;
 			}
 			tracks[nb_track_act].act_type = TRAC_ACTION_SET_HANDLER_NAME;
-			tracks[nb_track_act].hdl_name = strchr(argv[i+1], '=') + 1;
+			tracks[nb_track_act].hdl_name = strchr(argv[i + 1], '=') + 1;
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
 			ext[0] = '=';
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
@@ -2743,42 +2323,43 @@
 		else if (!stricmp(arg, "-ovsbr")) import_flags |= GF_IMPORT_OVSBR;
 		else if (!stricmp(arg, "-fps")) {
 			CHECK_NEXT_ARG
-			if (!strcmp(argv[i+1], "auto")) import_fps = GF_IMPORT_AUTO_FPS;
-			else if (strchr(argv[i+1], '-')) {
+			if (!strcmp(argv[i + 1], "auto")) import_fps = GF_IMPORT_AUTO_FPS;
+			else if (strchr(argv[i + 1], '-')) {
 				u32 ticks, dts_inc;
-				sscanf(argv[i+1], "%u-%u", &ticks, &dts_inc);
-				if (!dts_inc) dts_inc=1;
+				sscanf(argv[i + 1], "%u-%u", &ticks, &dts_inc);
+				if (!dts_inc) dts_inc = 1;
 				import_fps = ticks;
 				import_fps /= dts_inc;
-			} else import_fps = atof(argv[i+1]);
+			}
+			else import_fps = atof(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-agg")) {
-			CHECK_NEXT_ARG agg_samples = atoi(argv[i+1]);
+			CHECK_NEXT_ARG agg_samples = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-keep-all") || !stricmp(arg, "-keepall")) import_flags |= GF_IMPORT_KEEP_ALL_TRACKS;
 #endif /*!defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_MEDIA_IMPORT*/
 		else if (!stricmp(arg, "-keep-sys") || !stricmp(arg, "-keepsys")) keep_sys_tracks = 1;
 		else if (!stricmp(arg, "-ms")) {
-			CHECK_NEXT_ARG mediaSource = argv[i+1];
+			CHECK_NEXT_ARG mediaSource = argv[i + 1];
 			i++;
 		}
 		else if (!stricmp(arg, "-mp4")) {
-			encode = 1;
-			open_edit = 1;
+			encode = GF_TRUE;
+			open_edit = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-saf")) {
-			do_saf = 1;
+			do_saf = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-log")) {
-			do_log = 1;
+			do_log = GF_TRUE;
 		}
 #ifndef GPAC_DISABLE_MPD
 		else if (!stricmp(arg, "-mpd")) {
-			do_mpd = 1;
+			do_mpd = GF_TRUE;
 			CHECK_NEXT_ARG
-			outName = argv[i+1];
+			inName = argv[i + 1];
 			i++;
 		}
 #endif
@@ -2788,106 +2369,111 @@
 		else if (!stricmp(arg, "-sync")) {
 			CHECK_NEXT_ARG
 			opts.flags |= GF_SM_ENCODE_RAP_INBAND;
-			opts.rap_freq = atoi(argv[i+1]);
+			opts.rap_freq = atoi(argv[i + 1]);
 			i++;
-		} else if (!stricmp(arg, "-shadow")) {
+		}
+		else if (!stricmp(arg, "-shadow")) {
 			CHECK_NEXT_ARG
 			opts.flags &= ~GF_SM_ENCODE_RAP_INBAND;
 			opts.flags |= GF_SM_ENCODE_RAP_SHADOW;
-			opts.rap_freq = atoi(argv[i+1]);
+			opts.rap_freq = atoi(argv[i + 1]);
 			i++;
-		} else if (!stricmp(arg, "-carousel")) {
+		}
+		else if (!stricmp(arg, "-carousel")) {
 			CHECK_NEXT_ARG
 			opts.flags &= ~(GF_SM_ENCODE_RAP_INBAND | GF_SM_ENCODE_RAP_SHADOW);
-			opts.rap_freq = atoi(argv[i+1]);
+			opts.rap_freq = atoi(argv[i + 1]);
 			i++;
 		}
 		/*LASeR options*/
 		else if (!stricmp(arg, "-resolution")) {
 			CHECK_NEXT_ARG
-			opts.resolution = atoi(argv[i+1]);
+			opts.resolution = atoi(argv[i + 1]);
 			i++;
 		}
 #ifndef GPAC_DISABLE_SCENE_STATS
 		else if (!stricmp(arg, "-auto-quant")) {
 			CHECK_NEXT_ARG
-			opts.resolution = atoi(argv[i+1]);
+			opts.resolution = atoi(argv[i + 1]);
 			opts.auto_quant = 1;
 			i++;
 		}
 #endif
 		else if (!stricmp(arg, "-coord-bits")) {
 			CHECK_NEXT_ARG
-			opts.coord_bits = atoi(argv[i+1]);
+			opts.coord_bits = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-scale-bits")) {
 			CHECK_NEXT_ARG
-			opts.scale_bits = atoi(argv[i+1]);
+			opts.scale_bits = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-global-quant")) {
 			CHECK_NEXT_ARG
-			opts.resolution = atoi(argv[i+1]);
+			opts.resolution = atoi(argv[i + 1]);
 			opts.auto_quant = 2;
 			i++;
 		}
 		/*chunk encoding*/
 		else if (!stricmp(arg, "-ctx-out") || !stricmp(arg, "-outctx")) {
-			CHECK_NEXT_ARG output_ctx = argv[i+1];
+			CHECK_NEXT_ARG
+			output_ctx = argv[i + 1];
 			i++;
 		}
 		else if (!stricmp(arg, "-ctx-in") || !stricmp(arg, "-inctx")) {
 			CHECK_NEXT_ARG
-			chunk_mode = 1;
-			input_ctx = argv[i+1];
+			chunk_mode = GF_TRUE;
+			input_ctx = argv[i + 1];
 			i++;
 		}
 #endif /*GPAC_DISABLE_SCENE_ENCODER*/
 		else if (!strcmp(arg, "-crypt")) {
 			CHECK_NEXT_ARG
 			crypt = 1;
-			drm_file = argv[i+1];
-			open_edit = 1;
+			drm_file = argv[i + 1];
+			open_edit = GF_TRUE;
 			i += 1;
 		}
 		else if (!strcmp(arg, "-decrypt")) {
 			CHECK_NEXT_ARG
 			crypt = 2;
-			if (get_file_type_by_ext(argv[i+1])!=1) {
-				drm_file = argv[i+1];
+			if (get_file_type_by_ext(argv[i + 1]) != 1) {
+				drm_file = argv[i + 1];
 				i += 1;
 			}
-			open_edit = 1;
+			open_edit = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-set-kms")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			strncpy(szTK, argv[i+1], 19);
+			strncpy(szTK, argv[i + 1], 19);
 			ext = strchr(szTK, '=');
 			tracks[nb_track_act].act_type = TRAC_ACTION_SET_KMS_URI;
 			tracks[nb_track_act].trackID = 0;
-			if (!strnicmp(argv[i+1], "all=", 4)) {
-				tracks[nb_track_act].kms = argv[i+1] + 4;
-			} else if (!ext) {
-				tracks[nb_track_act].kms = argv[i+1];
-			} else {
-				tracks[nb_track_act].kms = ext+1;
+			if (!strnicmp(argv[i + 1], "all=", 4)) {
+				tracks[nb_track_act].kms = argv[i + 1] + 4;
+			}
+			else if (!ext) {
+				tracks[nb_track_act].kms = argv[i + 1];
+			}
+			else {
+				tracks[nb_track_act].kms = ext + 1;
 				ext[0] = 0;
 				tracks[nb_track_act].trackID = atoi(szTK);
 				ext[0] = '=';
 			}
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-split")) {
 			CHECK_NEXT_ARG
-			split_duration = atof(argv[i+1]);
-			if (split_duration<0) split_duration=0;;
+			split_duration = atof(argv[i + 1]);
+			if (split_duration < 0) split_duration = 0;;
 			i++;
 			split_size = 0;
 		}
@@ -2898,21 +2484,22 @@
 		}
 		else if (!stricmp(arg, "-split-size") || !stricmp(arg, "-splits")) {
 			CHECK_NEXT_ARG
-			split_size = (u32) atoi(argv[i+1]);
+			split_size = (u32)atoi(argv[i + 1]);
 			i++;
 			split_duration = 0;
 		}
 		else if (!stricmp(arg, "-split-chunk") || !stricmp(arg, "-splitx") || !stricmp(arg, "-splitz")) {
 			CHECK_NEXT_ARG
-			if (!strstr(argv[i+1], ":")) {
+			if (!strstr(argv[i + 1], ":")) {
 				fprintf(stderr, "Chunk extraction usage: \"-splitx start:end\" expressed in seconds\n");
-				MP4BOX_EXIT_WITH_CODE(1);
+				return 2;
 			}
-			if (strstr(argv[i+1], "end")) {
-				sscanf(argv[i+1], "%lf:end", &split_start);
+			if (strstr(argv[i + 1], "end")) {
+				sscanf(argv[i + 1], "%lf:end", &split_start);
 				split_duration = -2;
-			} else {
-				sscanf(argv[i+1], "%lf:%lf", &split_start, &split_duration);
+			}
+			else {
+				sscanf(argv[i + 1], "%lf:%lf", &split_start, &split_duration);
 				split_duration -= split_start;
 			}
 			split_size = 0;
@@ -2921,55 +2508,55 @@
 		}
 		/*meta*/
 		else if (!stricmp(arg, "-set-meta")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_TYPE, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_TYPE, argv[i + 1]);
 			nb_meta_act++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-add-item")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_ADD_ITEM, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_ADD_ITEM, argv[i + 1]);
 			nb_meta_act++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-rem-item")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_ITEM, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_ITEM, argv[i + 1]);
 			nb_meta_act++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-set-primary")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_PRIMARY_ITEM, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_PRIMARY_ITEM, argv[i + 1]);
 			nb_meta_act++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-set-xml")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_XML, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_SET_XML, argv[i + 1]);
 			nb_meta_act++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-rem-xml")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			if (parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_XML, argv[i+1])) i++;
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			if (parse_meta_args(&metas[nb_meta_act], META_ACTION_REM_XML, argv[i + 1])) i++;
 			nb_meta_act++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-dump-xml")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_XML, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_XML, argv[i + 1]);
 			nb_meta_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-dump-item")) {
-			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_ITEM, argv[i+1]);
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
+			parse_meta_args(&metas[nb_meta_act], META_ACTION_DUMP_ITEM, argv[i + 1]);
 			nb_meta_act++;
 			i++;
 		}
@@ -2977,127 +2564,814 @@
 			TSELActionType act_type;
 			if (!stricmp(arg, "-group-rem")) {
 				act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP;
-			} else if ( !stricmp(arg, "-group-rem-track")) {
+			}
+			else if (!stricmp(arg, "-group-rem-track")) {
 				act_type = TSEL_ACTION_REMOVE_TSEL;
-			} else {
+			}
+			else {
 				act_type = TSEL_ACTION_SET_PARAM;
 			}
-			if (parse_tsel_args(&tsel_acts, argv[i+1], &nb_tsel_acts, act_type)==0) {
+			if (parse_tsel_args(&tsel_acts, argv[i + 1], &nb_tsel_acts, act_type) == 0) {
 				fprintf(stderr, "Invalid group syntax - check usage\n");
-				MP4BOX_EXIT_WITH_CODE(1);
+				return 2;
 			}
-			open_edit=1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-group-clean")) {
 			tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_FILE;
 			nb_tsel_acts++;
-			open_edit=1;
+			open_edit = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-group-single")) {
 			single_group = 1;
 		}
 		else if (!stricmp(arg, "-package")) {
 			CHECK_NEXT_ARG
-			pack_file = argv[i+1];
+			pack_file = argv[i + 1];
 			i++;
 		}
 		else if (!stricmp(arg, "-mgt")) {
 			CHECK_NEXT_ARG
-			pack_file = argv[i+1];
-			pack_wgt = 1;
+			pack_file = argv[i + 1];
+			pack_wgt = GF_TRUE;
 			i++;
 		}
-
 		else if (!stricmp(arg, "-brand")) {
-			char *b = argv[i+1];
+			char *b = argv[i + 1];
 			CHECK_NEXT_ARG
 			major_brand = GF_4CC(b[0], b[1], b[2], b[3]);
-			open_edit = 1;
-			if (b[4]==':') minor_version = atoi(b+5);
+			open_edit = GF_TRUE;
+			if (b[4] == ':') minor_version = atoi(b + 5);
 			i++;
 		}
 		else if (!stricmp(arg, "-ab")) {
-			char *b = argv[i+1];
+			char *b = argv[i + 1];
 			CHECK_NEXT_ARG
-			brand_add = gf_realloc(brand_add, sizeof(u32) * (nb_alt_brand_add+1));
-
+			brand_add = (u32*)gf_realloc(brand_add, sizeof(u32) * (nb_alt_brand_add + 1));
 			brand_add[nb_alt_brand_add] = GF_4CC(b[0], b[1], b[2], b[3]);
 			nb_alt_brand_add++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 		else if (!stricmp(arg, "-rb")) {
-			char *b = argv[i+1];
+			char *b = argv[i + 1];
 			CHECK_NEXT_ARG
-			brand_rem = gf_realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem+1));
-
+			brand_rem = (u32*)gf_realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem + 1));
 			brand_rem[nb_alt_brand_rem] = GF_4CC(b[0], b[1], b[2], b[3]);
 			nb_alt_brand_rem++;
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			i++;
 		}
 #endif
-		else if (!stricmp(arg, "-languages")) {
-			PrintLanguages();
-			MP4BOX_EXIT_WITH_CODE(0);
-		}
-		else if (!stricmp(arg, "-h")) {
-			if (i+1== (u32) argc) PrintUsage();
-			else if (!strcmp(argv[i+1], "general")) PrintGeneralUsage();
-			else if (!strcmp(argv[i+1], "extract")) PrintExtractUsage();
-			else if (!strcmp(argv[i+1], "dash")) PrintDASHUsage();
-			else if (!strcmp(argv[i+1], "dump")) PrintDumpUsage();
-			else if (!strcmp(argv[i+1], "import")) PrintImportUsage();
-			else if (!strcmp(argv[i+1], "format")) PrintFormats();
-			else if (!strcmp(argv[i+1], "hint")) PrintHintUsage();
-			else if (!strcmp(argv[i+1], "encode")) PrintEncodeUsage();
-			else if (!strcmp(argv[i+1], "crypt")) PrintEncryptUsage();
-			else if (!strcmp(argv[i+1], "meta")) PrintMetaUsage();
-			else if (!strcmp(argv[i+1], "swf")) PrintSWFUsage();
+else if (!stricmp(arg, "-languages")) {
+	PrintLanguages();
+	return 1;
+}
+else if (!stricmp(arg, "-h")) {
+	if (i + 1 == (u32)argc) PrintUsage();
+	else if (!strcmp(argv[i + 1], "general")) PrintGeneralUsage();
+	else if (!strcmp(argv[i + 1], "extract")) PrintExtractUsage();
+	else if (!strcmp(argv[i + 1], "dash")) PrintDASHUsage();
+	else if (!strcmp(argv[i + 1], "dump")) PrintDumpUsage();
+	else if (!strcmp(argv[i + 1], "import")) PrintImportUsage();
+	else if (!strcmp(argv[i + 1], "format")) PrintFormats();
+	else if (!strcmp(argv[i + 1], "hint")) PrintHintUsage();
+	else if (!strcmp(argv[i + 1], "encode")) PrintEncodeUsage();
+	else if (!strcmp(argv[i + 1], "crypt")) PrintEncryptUsage();
+	else if (!strcmp(argv[i + 1], "meta")) PrintMetaUsage();
+	else if (!strcmp(argv[i + 1], "swf")) PrintSWFUsage();
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+	else if (!strcmp(argv[i + 1], "rtp")) PrintStreamerUsage();
+	else if (!strcmp(argv[i + 1], "live")) PrintLiveUsage();
+#endif
+	else if (!strcmp(argv[i + 1], "all")) {
+		PrintGeneralUsage();
+		PrintExtractUsage();
+		PrintDASHUsage();
+		PrintDumpUsage();
+		PrintImportUsage();
+		PrintFormats();
+		PrintHintUsage();
+		PrintEncodeUsage();
+		PrintEncryptUsage();
+		PrintMetaUsage();
+		PrintSWFUsage();
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-			else if (!strcmp(argv[i+1], "rtp")) PrintStreamerUsage();
-			else if (!strcmp(argv[i+1], "live")) PrintLiveUsage	();
+		PrintStreamerUsage();
+		PrintLiveUsage();
+#endif
+	}
+	else PrintUsage();
+	return 1;
+}
+else if (!stricmp(arg, "-v")) verbose++;
+else if (!stricmp(arg, "-tag-list")) {
+	fprintf(stderr, "Supported iTunes tag modifiers:\n");
+	for (i = 0; i < nb_itunes_tags; i++) {
+		fprintf(stderr, "\t%s\t%s\n", itags[i].name, itags[i].comment);
+	}
+	return 1;
+}
+else if (!live_scene && !stream_rtp) {
+	fprintf(stderr, "Option %s unknown. Please check usage\n", arg);
+	return 2;
+}
+}
+*current_index = i;
+return 0;
+}
+
+Bool mp4box_parse_args(int argc, char **argv)
+{
+	u32 i;
+	/*parse our args*/
+	for (i = 1; i < (u32)argc; i++) {
+		arg = argv[i];
+		/*input file(s)*/
+		if ((arg[0] != '-') || !stricmp(arg, "--")) {
+			char *arg_val = arg;
+			if (!stricmp(arg, "--")) {
+				CHECK_NEXT_ARG
+				arg_val = argv[i + 1];
+				i++;
+			}
+			if (argc < 3) {
+				fprintf(stderr, "Error - only one input file found as argument, please check usage\n");
+				return 2;
+			}
+			else if (inName) {
+				if (dash_duration) {
+					if (!nb_dash_inputs) {
+						dash_inputs = set_dash_input(dash_inputs, inName, &nb_dash_inputs);
+					}
+					dash_inputs = set_dash_input(dash_inputs, arg_val, &nb_dash_inputs);
+				}
+				else {
+					fprintf(stderr, "Error - 2 input names specified, please check usage\n");
+					return 2;
+				}
+			}
+			else {
+				inName = arg_val;
+			}
+		}
+		else if (!stricmp(arg, "-?")) {
+			PrintUsage();
+			return 1;
+		}
+		else if (!stricmp(arg, "-version")) {
+			PrintVersion();
+			return 1;
+		}
+		else if (!stricmp(arg, "-sdp")) print_sdp = 1;
+		else if (!stricmp(arg, "-quiet")) quiet = 2;
+		else if (!strcmp(argv[i], "-mem-track")) continue;
+
+		else if (!stricmp(arg, "-logs")) {
+			CHECK_NEXT_ARG
+			gf_logs = argv[i + 1];
+			if (gf_logs)
+				gf_log_set_tools_levels(gf_logs);
+			i++;
+		}
+		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
+			logfile = gf_fopen(argv[i + 1], "wt");
+			gf_log_set_callback(logfile, on_gpac_log);
+			i++;
+		}
+		else if (!strcmp(arg, "-lc") || !strcmp(arg, "-log-clock")) {
+			log_sys_clock = GF_TRUE;
+		}
+		else if (!strcmp(arg, "-lu") || !strcmp(arg, "-log-utc")) {
+			log_utc_time = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-noprog")) quiet = 1;
+		else if (!stricmp(arg, "-info")) {
+			print_info = 1;
+			if ((i + 1<(u32)argc) && (sscanf(argv[i + 1], "%u", &info_track_id) == 1)) {
+				char szTk[20];
+				sprintf(szTk, "%u", info_track_id);
+				if (!strcmp(szTk, argv[i + 1])) i++;
+				else info_track_id = 0;
+			}
+			else {
+				info_track_id = 0;
+			}
+		}
+#if !defined(GPAC_DISABLE_STREAMING)
+		else if (!stricmp(arg, "-grab-ts")) {
+			CHECK_NEXT_ARG
+			grab_m2ts = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-ifce")) {
+			CHECK_NEXT_ARG
+			grab_ifce = argv[i + 1];
+			i++;
+		}
+
 #endif
-			else if (!strcmp(argv[i+1], "all")) {
-				PrintGeneralUsage();
-				PrintExtractUsage();
-				PrintDASHUsage();
-				PrintDumpUsage();
-				PrintImportUsage();
-				PrintFormats();
-				PrintHintUsage();
-				PrintEncodeUsage();
-				PrintEncryptUsage();
-				PrintMetaUsage();
-				PrintSWFUsage();
+#if !defined(GPAC_DISABLE_CORE_TOOLS)
+		else if (!stricmp(arg, "-wget")) {
+			CHECK_NEXT_ARG
+			do_wget = argv[i + 1];
+			i++;
+		}
+#endif
+		/*******************************************************************************/
+		else if (!stricmp(arg, "-dvbhdemux")) {
+			dvbhdemux = GF_TRUE;
+		}
+		/********************************************************************************/
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
+		else if (!stricmp(arg, "-raw")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NATIVE);
+			i++;
+		}
+		else if (!stricmp(arg, "-raw-layer")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER);
+			i++;
+		}
+		else if (!stricmp(arg, "-qcp")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP);
+			i++;
+		}
+		else if (!stricmp(arg, "-aviraw")) {
+			CHECK_NEXT_ARG
+			if (argv[i + 1] && !stricmp(argv[i + 1], "video")) trackID = 1;
+			else if (argv[i + 1] && !stricmp(argv[i + 1], "audio")) {
+				if (strlen(argv[i + 1]) == 5) trackID = 2;
+				else trackID = 1 + atoi(argv[i + 1] + 5);
+			} else {
+				fprintf(stderr, "Usage: \"-aviraw video\" or \"-aviraw audio\"\n");
+				return 2;
+			}
+			track_dump_type = GF_EXPORT_AVI_NATIVE;
+			i++;
+		}
+		else if (!stricmp(arg, "-raws")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_RAW_SAMPLES);
+			i++;
+		}
+		else if (!stricmp(arg, "-nhnt")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NHNT);
+			i++;
+		}
+		else if (!stricmp(arg, "-nhml")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_NHML);
+			i++;
+		}
+		else if (!stricmp(arg, "-webvtt-raw")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_WEBVTT_META);
+			i++;
+		}
+		else if (!stricmp(arg, "-six")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_SIX);
+			i++;
+		}
+		else if (!stricmp(arg, "-avi")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i + 1], &tracks, &nb_track_act, GF_EXPORT_AVI);
+			i++;
+		}
+#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-				PrintStreamerUsage();
-				PrintLiveUsage	();
+		else if (!stricmp(arg, "-rtp")) {
+			stream_rtp = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-live")) {
+			live_scene = GF_TRUE;
+		}
+#endif
+		else if (!stricmp(arg, "-diod")) {
+			dump_iod = GF_TRUE;
+		}
+#ifndef GPAC_DISABLE_VRML
+		else if (!stricmp(arg, "-node")) {
+			CHECK_NEXT_ARG
+			PrintNode(argv[i + 1], 0);
+			return 1;
+		}
+		else if (!stricmp(arg, "-xnode")) {
+			CHECK_NEXT_ARG
+			PrintNode(argv[i + 1], 1);
+			return 1;
+		}
+		else if (!stricmp(arg, "-nodes")) {
+			PrintBuiltInNodes(0);
+			return 1;
+		}
+		else if (!stricmp(arg, "-xnodes")) {
+			PrintBuiltInNodes(1);
+			return 1;
+		}
+#endif
+#ifndef GPAC_DISABLE_SVG
+		else if (!stricmp(arg, "-snode")) {
+			CHECK_NEXT_ARG PrintNode(argv[i + 1], 2);
+			return 1;
+		}
+		else if (!stricmp(arg, "-snodes")) {
+			PrintBuiltInNodes(2);
+			return 1;
+		}
+#endif
+		else if (!stricmp(arg, "-std")) dump_std = 2;
+		else if (!stricmp(arg, "-stdb")) dump_std = 1;
+
+#if !defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)
+		else if (!stricmp(arg, "-bt")) dump_mode = GF_SM_DUMP_BT;
+		else if (!stricmp(arg, "-xmt")) dump_mode = GF_SM_DUMP_XMTA;
+		else if (!stricmp(arg, "-wrl")) dump_mode = GF_SM_DUMP_VRML;
+		else if (!stricmp(arg, "-x3dv")) dump_mode = GF_SM_DUMP_X3D_VRML;
+		else if (!stricmp(arg, "-x3d")) dump_mode = GF_SM_DUMP_X3D_XML;
+		else if (!stricmp(arg, "-lsr")) dump_mode = GF_SM_DUMP_LASER;
+		else if (!stricmp(arg, "-svg")) dump_mode = GF_SM_DUMP_SVG;
+#endif /*defined(GPAC_DISABLE_MEDIA_EXPORT) && !defined(GPAC_DISABLE_SCENE_DUMP)*/
+
+		else if (!stricmp(arg, "-stat")) stat_level = 1;
+		else if (!stricmp(arg, "-stats")) stat_level = 2;
+		else if (!stricmp(arg, "-statx")) stat_level = 3;
+		else if (!stricmp(arg, "-diso")) dump_isom = 1;
+		else if (!stricmp(arg, "-dump-cover")) dump_cart = 1;
+		else if (!stricmp(arg, "-dump-chap")) dump_chap = 1;
+		else if (!stricmp(arg, "-dump-chap-ogg")) dump_chap = 2;
+		else if (!stricmp(arg, "-hash")) do_hash = GF_TRUE;
+#ifndef GPAC_DISABLE_CORE_TOOLS
+		else if (!stricmp(arg, "-bin")) do_bin_nhml = GF_TRUE;
+#endif
+		else if (!stricmp(arg, "-dump-udta")) {
+			char *sep, *code;
+			CHECK_NEXT_ARG
+			sep = strchr(argv[i + 1], ':');
+			if (sep) {
+				sep[0] = 0;
+				dump_udta_track = atoi(argv[i + 1]);
+				sep[0] = ':';
+				code = &sep[1];
+			}
+			else {
+				code = argv[i + 1];
+			}
+			dump_udta_type = GF_4CC(code[0], code[1], code[2], code[3]);
+			i++;
+		}
+		else if (!stricmp(arg, "-dmp4")) {
+			dump_isom = 1;
+			fprintf(stderr, "WARNING: \"-dmp4\" is deprecated - use \"-diso\" option\n");
+		}
+		else if (!stricmp(arg, "-drtp")) dump_rtp = 1;
+		else if (!stricmp(arg, "-dts")) {
+			dump_timestamps = 1;
+			if (((i + 1<(u32)argc) && inName) || (i + 2<(u32)argc)) {
+				if (isdigit(argv[i + 1][0])) {
+					program_number = atoi(argv[i + 1]);
+					i++;
+				}
+			}
+		}
+		else if (!stricmp(arg, "-dnal")) {
+			CHECK_NEXT_ARG
+			dump_nal = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-dcr")) dump_cr = 1;
+		else if (!stricmp(arg, "-ttxt") || !stricmp(arg, "-srt")) {
+			if ((i + 1<(u32)argc) && (sscanf(argv[i + 1], "%u", &trackID) == 1)) {
+				char szTk[20];
+				sprintf(szTk, "%d", trackID);
+				if (!strcmp(szTk, argv[i + 1])) i++;
+				else trackID = 0;
+			}
+			else {
+				trackID = 0;
+			}
+#ifdef GPAC_DISABLE_ISOM_WRITE
+			if (trackID) {
+				fprintf(stderr, "Error: Read-Only version - subtitle conversion not available\n");
+				return 2;
+			}
+#endif
+			if (!stricmp(arg, "-ttxt")) dump_ttxt = GF_TRUE;
+			else dump_srt = GF_TRUE;
+			import_subtitle = 1;
+		}
+		else if (!stricmp(arg, "-dm2ts")) {
+			dump_m2ts = 1;
+			if (((i + 1<(u32)argc) && inName) || (i + 2<(u32)argc)) {
+				if (argv[i + 1][0] != '-') pes_dump = argv[i + 1];
+				i++;
+			}
+		}
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+		/*SWF importer options*/
+		else if (!stricmp(arg, "-global")) swf_flags |= GF_SM_SWF_STATIC_DICT;
+		else if (!stricmp(arg, "-no-ctrl")) swf_flags &= ~GF_SM_SWF_SPLIT_TIMELINE;
+		else if (!stricmp(arg, "-no-text")) swf_flags |= GF_SM_SWF_NO_TEXT;
+		else if (!stricmp(arg, "-no-font")) swf_flags |= GF_SM_SWF_NO_FONT;
+		else if (!stricmp(arg, "-no-line")) swf_flags |= GF_SM_SWF_NO_LINE;
+		else if (!stricmp(arg, "-no-grad")) swf_flags |= GF_SM_SWF_NO_GRADIENT;
+		else if (!stricmp(arg, "-quad")) swf_flags |= GF_SM_SWF_QUAD_CURVE;
+		else if (!stricmp(arg, "-xlp")) swf_flags |= GF_SM_SWF_SCALABLE_LINE;
+		else if (!stricmp(arg, "-ic2d")) swf_flags |= GF_SM_SWF_USE_IC2D;
+		else if (!stricmp(arg, "-same-app")) swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
+		else if (!stricmp(arg, "-flatten")) {
+			CHECK_NEXT_ARG
+			swf_flatten_angle = (Float)atof(argv[i + 1]);
+			i++;
+		}
 #endif
+#ifndef GPAC_DISABLE_ISOM_WRITE
+		else if (!stricmp(arg, "-isma")) {
+			conv_type = GF_ISOM_CONV_TYPE_ISMA;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-3gp")) {
+			conv_type = GF_ISOM_CONV_TYPE_3GPP;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-ipod")) {
+			conv_type = GF_ISOM_CONV_TYPE_IPOD;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-psp")) {
+			conv_type = GF_ISOM_CONV_TYPE_PSP;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-ismax")) {
+			conv_type = GF_ISOM_CONV_TYPE_ISMA_EX;
+			open_edit = GF_TRUE;
+		}
+
+		else if (!stricmp(arg, "-no-sys") || !stricmp(arg, "-nosys")) {
+			remove_sys_tracks = 1;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-no-iod")) {
+			remove_root_od = 1;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-out")) {
+			CHECK_NEXT_ARG outName = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-tmp")) {
+			CHECK_NEXT_ARG tmpdir = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-co64")) {
+			force_co64 = GF_TRUE;
+			open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-write-buffer")) {
+			CHECK_NEXT_ARG
+			gf_isom_set_output_buffering(NULL, atoi(argv[i + 1]));
+			i++;
+		}
+		else if (!stricmp(arg, "-cprt")) {
+			CHECK_NEXT_ARG cprt = argv[i + 1];
+			i++;
+			if (!dash_duration) open_edit = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-chap")) {
+			CHECK_NEXT_ARG chap_file = argv[i + 1];
+			i++;
+			open_edit = GF_TRUE;
+		}
+		else if (!strcmp(arg, "-strict-error")) {
+			gf_log_set_strict_error(1);
+		}
+		else if (!stricmp(arg, "-inter") || !stricmp(arg, "-old-inter")) {
+			CHECK_NEXT_ARG
+			interleaving_time = atof(argv[i + 1]) / 1000;
+			open_edit = GF_TRUE;
+			needSave = GF_TRUE;
+			if (!stricmp(arg, "-old-inter")) old_interleave = 1;
+			i++;
+		}
+		else if (!stricmp(arg, "-frag")) {
+			CHECK_NEXT_ARG
+			interleaving_time = atof(argv[i + 1]) / 1000;
+			needSave = GF_TRUE;
+			i++;
+			Frag = 1;
+		}
+		else if (!stricmp(arg, "-dash")) {
+			CHECK_NEXT_ARG
+			dash_duration = atof(argv[i + 1]) / 1000;
+			if (dash_duration == 0.0) {
+				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i + 1]);
+				return 2;
+			}
+			i++;
+		}
+		else if (!stricmp(arg, "-dash-strict")) {
+			CHECK_NEXT_ARG
+			dash_duration = atof(argv[i + 1]) / 1000;
+			if (dash_duration == 0.0) {
+				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i + 1]);
+				return 2;
+			}
+			dash_duration_strict = GF_TRUE;
+			i++;
+		}
+		else if (!stricmp(arg, "-subdur")) {
+			CHECK_NEXT_ARG
+			dash_subduration = atof(argv[i + 1]) / 1000;
+			i++;
+		}
+		else if (!stricmp(arg, "-dash-scale")) {
+			CHECK_NEXT_ARG
+			dash_scale = atoi(argv[i + 1]);
+			if (!dash_scale) {
+				fprintf(stderr, "\tERROR: \"-dash-scale\": invalid parameter %s\n", argv[i + 1]);
+				return 2;
+			}
+			i++;
+		}
+		else if (!stricmp(arg, "-dash-ts-prog")) {
+			CHECK_NEXT_ARG
+			program_number = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-subsegs-per-sidx") || !stricmp(arg, "-frags-per-sidx")) {
+			CHECK_NEXT_ARG
+			subsegs_per_sidx = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-segment-name")) {
+			CHECK_NEXT_ARG
+			seg_name = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-segment-ext")) {
+			CHECK_NEXT_ARG
+			seg_ext = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-bs-switching")) {
+			CHECK_NEXT_ARG
+			if (!stricmp(argv[i + 1], "no") || !stricmp(argv[i + 1], "off")) bitstream_switching_mode = GF_DASH_BSMODE_NONE;
+			else if (!stricmp(argv[i + 1], "merge")) bitstream_switching_mode = GF_DASH_BSMODE_MERGED;
+			else if (!stricmp(argv[i + 1], "multi")) bitstream_switching_mode = GF_DASH_BSMODE_MULTIPLE_ENTRIES;
+			else if (!stricmp(argv[i + 1], "single")) bitstream_switching_mode = GF_DASH_BSMODE_SINGLE;
+			else if (!stricmp(argv[i + 1], "inband")) bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+			else {
+				fprintf(stderr, "\tWARNING: Unrecognized bitstream switchin mode \"%s\" - please check usage\n", argv[i + 1]);
+				return 2;
+			}
+			i++;
+		}
+		else if (!stricmp(arg, "-dynamic")) {
+			dash_mode = GF_DASH_DYNAMIC;
+		}
+		else if (!stricmp(arg, "-last-dynamic")) {
+			dash_mode = GF_DASH_DYNAMIC_LAST;
+		}
+		else if (!stricmp(arg, "-frag-rt")) {
+			frag_real_time = GF_TRUE;
+		}
+		else if (!strnicmp(arg, "-cp-location=", 13)) {
+			if (strcmp(arg+13, "both")) cp_location_mode = GF_DASH_CPMODE_BOTH;
+			else if (strcmp(arg+13, "as")) cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
+			else if (strcmp(arg+13, "rep")) cp_location_mode = GF_DASH_CPMODE_REPRESENTATION;
+			else {
+				fprintf(stderr, "\tWARNING: Unrecognized ContentProtection loction mode \"%s\" - please check usage\n", argv[i + 13]);
+				return 2;
+			}
+		}
+		else if (!strnicmp(arg, "-dash-live", 10) || !strnicmp(arg, "-ddbg-live", 10)) {
+			dash_mode = !strnicmp(arg, "-ddbg-live", 10) ? GF_DASH_DYNAMIC_DEBUG : GF_DASH_DYNAMIC;
+			dash_live = 1;
+			if (arg[10] == '=') {
+				dash_ctx_file = arg + 11;
+			}
+			CHECK_NEXT_ARG
+			dash_duration = atof(argv[i + 1]) / 1000;
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-duration")) {
+			CHECK_NEXT_ARG mpd_live_duration = atof(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-refresh")) {
+			CHECK_NEXT_ARG mpd_update_time = atof(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-time-shift")) {
+			CHECK_NEXT_ARG
+			time_shift_depth = (u32)atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-min-buffer")) {
+			CHECK_NEXT_ARG
+			min_buffer = atoi(argv[i + 1]);
+			min_buffer /= 1000;
+			i++;
+		}
+		else if (!stricmp(arg, "-ast-offset")) {
+			CHECK_NEXT_ARG
+			ast_offset_ms = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-moof-sn")) {
+			CHECK_NEXT_ARG
+			initial_moof_sn = (u32)atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-tfdt")) {
+			CHECK_NEXT_ARG
+			sscanf(argv[i + 1], LLU, &initial_tfdt);
+			i++;
+		}
+		else if (!stricmp(arg, "-no-frags-default")) {
+			no_fragments_defaults = 1;
+		}
+		else if (!stricmp(arg, "-single-traf")) {
+			single_traf_per_moof = 1;
+		}
+		else if (!stricmp(arg, "-mpd-title")) {
+			CHECK_NEXT_ARG dash_title = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-source")) {
+			CHECK_NEXT_ARG dash_source = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-info-url")) {
+			CHECK_NEXT_ARG dash_more_info = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-base-url")) {
+			CHECK_NEXT_ARG
+			dash_more_info = argv[i + 1];
+			mpd_base_urls = gf_realloc(mpd_base_urls, (nb_mpd_base_urls + 1)*sizeof(char**));
+			mpd_base_urls[nb_mpd_base_urls] = argv[i + 1];
+			nb_mpd_base_urls++;
+			i++;
+		}
+		else if (!stricmp(arg, "-dash-ctx")) {
+			CHECK_NEXT_ARG
+			dash_ctx_file = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-daisy-chain")) {
+			daisy_chain_sidx = 1;
+		}
+		else if (!stricmp(arg, "-single-segment")) {
+			single_segment = 1;
+		}
+		else if (!stricmp(arg, "-single-file")) {
+			single_file = 1;
+		}
+		else if (!stricmp(arg, "-pssh-moof")) {
+			pssh_in_moof = 1;
+		}
+		else if (!stricmp(arg, "-sample-groups-traf")) {
+			samplegroups_in_traf = 1;
+		}
+		else if (!stricmp(arg, "-dash-profile") || !stricmp(arg, "-profile")) {
+			CHECK_NEXT_ARG
+			if (!stricmp(argv[i + 1], "live") || !stricmp(argv[i + 1], "simple")) dash_profile = GF_DASH_PROFILE_LIVE;
+			else if (!stricmp(argv[i + 1], "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
+			else if (!stricmp(argv[i + 1], "hbbtv1.5:live")) {
+				dash_profile = GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE;
 			}
-			else PrintUsage();
-			MP4BOX_EXIT_WITH_CODE(0);
+			else if (!stricmp(argv[i + 1], "dashavc264:live")) {
+				dash_profile = GF_DASH_PROFILE_AVC264_LIVE;
+			}
+			else if (!stricmp(argv[i + 1], "dashavc264:onDemand")) {
+				dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
+			}
+			else if (!stricmp(argv[i + 1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
+			else dash_profile = GF_DASH_PROFILE_FULL;
+			i++;
+		}
+		else if (!stricmp(arg, "-profile-ext")) {
+			CHECK_NEXT_ARG
+			dash_profile_extension = argv[i + 1];
+			i++;
+		}
+		else if (!strnicmp(arg, "-url-template", 13)) {
+			use_url_template = 1;
+			if ((arg[13] == '=') && arg[14]) {
+				if (!strcmp(&arg[14], "simulate")) use_url_template = 2;
+			}
+		}
+		else if (!stricmp(arg, "-segment-timeline")) {
+			segment_timeline = 1;
+		}
+		else if (!stricmp(arg, "-mem-frags")) {
+			memory_frags = 1;
+		}
+		else if (!stricmp(arg, "-segment-marker")) {
+			char *m;
+			CHECK_NEXT_ARG
+			m = argv[i + 1];
+			segment_marker = GF_4CC(m[0], m[1], m[2], m[3]);
+			i++;
+		}
+		else if (!stricmp(arg, "-insert-utc")) {
+			insert_utc = GF_TRUE;
 		}
-		else if (!stricmp(arg, "-v")) verbose++;
-		else if (!stricmp(arg, "-tag-list")) {
-			fprintf(stderr, "Supported iTunes tag modifiers:\n");
-			for (i=0; i<nb_itunes_tags; i++) {
-				fprintf(stderr, "\t%s\t%s\n", itags[i].name, itags[i].comment);
-			}
-			MP4BOX_EXIT_WITH_CODE(0);
-		} else if (!live_scene && !stream_rtp) {
-			fprintf(stderr, "Option %s unknown. Please check usage\n", arg);
-			MP4BOX_EXIT_WITH_CODE(1);
+		else {
+			u32 ret = mp4box_parse_args_continue(argc, argv, &i);
+			if (ret) return ret;
+		}
+	}
+	return 0;
+}
+
+int mp4boxMain(int argc, char **argv)
+{
+	nb_tsel_acts = nb_add = nb_cat = nb_track_act = nb_sdp_ex = max_ptime = raw_sample_num = nb_meta_act = rtp_rate = major_brand = nb_alt_brand_add = nb_alt_brand_rem = car_dur = minor_version = 0;
+	e = GF_OK;
+	split_duration = 0.0;
+	split_start = -1.0;
+	interleaving_time = 0.0;
+	dash_duration = dash_subduration = 0.0;
+	dash_duration_strict = GF_FALSE;
+	import_fps = 0;
+	import_flags = 0;
+	split_size = 0;
+	movie_time = 0;
+	dump_nal = 0;
+	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = GF_FALSE;
+#ifndef GPAC_DISABLE_SCENE_DUMP
+	dump_mode = GF_SM_DUMP_NONE;
+#endif
+	Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = GF_FALSE;
+	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = GF_FALSE;
+	no_fragments_defaults = GF_FALSE;
+	single_traf_per_moof = GF_FALSE,
+	/*align cat is the new default behaviour for -cat*/
+	align_cat = GF_TRUE;
+	subsegs_per_sidx = 0;
+	track_dump_type = 0;
+	crypt = 0;
+	time_shift_depth = 0;
+	file = NULL;
+	itunes_tags = pes_dump = NULL;
+	seg_name = dash_ctx_file = NULL;
+	initial_moof_sn = 0;
+	initial_tfdt = 0;
+
+#ifndef GPAC_DISABLE_SCENE_ENCODER
+	memset(&opts, 0, sizeof(opts));
+#endif
+
+	trackID = stat_level = hint_flags = 0;
+	program_number = 0;
+	info_track_id = 0;
+	do_flat = 0;
+	inName = outName = mediaSource = input_ctx = output_ctx = drm_file = avi2raw = cprt = chap_file = pack_file = raw_cat = NULL;
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+	swf_flags = GF_SM_SWF_SPLIT_TIMELINE;
+#endif
+	swf_flatten_angle = 0.0f;
+	tmpdir = NULL;
+
+	for (i = 1; i < (u32) argc ; i++) {
+		if (!strcmp(argv[i], "-mem-track")) {
+#ifdef GPAC_MEMORY_TRACKING
+			enable_mem_tracker = 1;
+#else
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
+#endif
+			break;
 		}
 	}
 
+	/*init libgpac*/
+	gf_sys_init(enable_mem_tracker);
+	if (argc < 2) {
+		PrintUsage();
+		gf_sys_close();
+		return 1;
+	}
+
+	i = mp4box_parse_args(argc, argv);
+	if (i) {
+		return mp4box_cleanup(i - 1);
+	}
+
 	if (!inName && dump_std)
 		inName = "std";
 
 	if (!inName) {
 		PrintUsage();
-		MP4BOX_EXIT_WITH_CODE(1);
+		return mp4box_cleanup(1);
 	}
 	if (!strcmp(inName, "std")) dump_std = 2;
 	if (!strcmp(inName, "stdb")) {
@@ -3124,18 +3398,18 @@
 #endif
 		{
 			fprintf(stderr, "Fatal error: cannot reopen stdout in binary mode.\n");
-			MP4BOX_EXIT_WITH_CODE(1);
+			return mp4box_cleanup(1);
 		}
 	}
 
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
 	if (live_scene) {
 		int ret = live_session(argc, argv);
-		MP4BOX_EXIT_WITH_CODE(ret);
+		return mp4box_cleanup(ret);
 	}
 	if (stream_rtp) {
 		int ret = stream_file_rtp(argc, argv);
-		MP4BOX_EXIT_WITH_CODE(ret);
+		return mp4box_cleanup(ret);
 	}
 #endif
 
@@ -3143,16 +3417,17 @@
 		char chunk[4096];
 		FILE *fin, *fout;
 		s64 to_copy, done;
-		fin = gf_f64_open(raw_cat, "rb");
-		if (!fin) MP4BOX_EXIT_WITH_CODE(1);
-		fout = gf_f64_open(inName, "a+b");
+		fin = gf_fopen(raw_cat, "rb");
+		if (!fin) return mp4box_cleanup(1);
+
+		fout = gf_fopen(inName, "a+b");
 		if (!fout) {
-			fclose(fin);
-			MP4BOX_EXIT_WITH_CODE(1);
+			gf_fclose(fin);
+			return mp4box_cleanup(1);
 		}
-		gf_f64_seek(fin, 0, SEEK_END);
-		to_copy = gf_f64_tell(fin);
-		gf_f64_seek(fin, 0, SEEK_SET);
+		gf_fseek(fin, 0, SEEK_END);
+		to_copy = gf_ftell(fin);
+		gf_fseek(fin, 0, SEEK_SET);
 		done = 0;
 		while (1) {
 			u32 nb_bytes = (u32) fread(chunk, 1, 4096, fin);
@@ -3161,9 +3436,9 @@
 			fprintf(stderr, "Appending file %s - %02.2f done\r", raw_cat, 100.0*done/to_copy);
 			if (done >= to_copy) break;
 		}
-		fclose(fin);
-		fclose(fout);
-		MP4BOX_EXIT_WITH_CODE(0);
+		gf_fclose(fin);
+		gf_fclose(fout);
+		return mp4box_cleanup(0);
 	}
 #if !defined(GPAC_DISABLE_STREAMING)
 	if (grab_m2ts) {
@@ -3191,48 +3466,80 @@
 		}
 	}
 
-#if !defined(DISABLE_CORE_TOOLS)
+#ifndef GPAC_DISABLE_CORE_TOOLS
 	if (do_wget != NULL) {
-		e = gf_dm_wget(do_wget, inName, 0, 0);
+		e = gf_dm_wget(do_wget, inName, 0, 0, NULL);
 		if (e != GF_OK) {
 			fprintf(stderr, "Cannot retrieve %s: %s\n", do_wget, gf_error_to_string(e) );
 		}
-		MP4BOX_EXIT_WITH_CODE(1);
+		return mp4box_cleanup(1);
 	}
 #endif
 
 #ifndef GPAC_DISABLE_MPD
 	if (do_mpd) {
 		Bool remote = GF_FALSE;
-		char *mpd_base_url = gf_strdup(inName);
-		if (!strnicmp(inName, "http://", 7)) {
+		GF_MPD *mpd;
+		char *mpd_base_url = NULL;
+		if (!strnicmp(inName, "http://", 7) || !strnicmp(inName, "https://", 8)) {
 #if !defined(GPAC_DISABLE_CORE_TOOLS)
-			e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0);
+			e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0, &mpd_base_url);
 			if (e != GF_OK) {
 				fprintf(stderr, "Cannot retrieve M3U8 (%s): %s\n", inName, gf_error_to_string(e));
-				gf_free(mpd_base_url);
-				MP4BOX_EXIT_WITH_CODE(1);
+				if (mpd_base_url) gf_free(mpd_base_url);
+				return mp4box_cleanup(1);
 			}
-			inName = "tmp_main.m3u8";
 			remote = GF_TRUE;
 #else
 			gf_free(mpd_base_url);
 			fprintf(stderr, "HTTP Downloader disabled in this build\n");
-			MP4BOX_EXIT_WITH_CODE(1);
+			return mp4box_cleanup(1);
 #endif
+
+			if (outName)
+				strcpy(outfile, outName);
+			else {
+				const char *sep = strrchr(inName, '/');
+				char *ext = strstr(sep, ".m3u8");
+				if (ext) ext[0] = 0;
+				sprintf(outfile, "%s.mpd", sep+1);
+			}
+		} else {
+			if (outName)
+				strcpy(outfile, outName);
+			else {
+				char *dst = strdup(inName);
+				char *ext = strstr(dst, ".m3u8");
+				if (ext) ext[0] = 0;
+				sprintf(outfile, "%s.mpd", dst);
+				gf_free(dst);
+			}
 		}
-		e = gf_m3u8_to_mpd(inName, mpd_base_url, (outName ? outName : inName), 0, "video/mp2t", GF_TRUE, use_url_template, NULL);
-		gf_free(mpd_base_url);
+
+		mpd = gf_mpd_new();
+		if (!mpd) {
+			e = GF_OUT_OF_MEM;
+			fprintf(stderr, "[DASH] Error: MPD creation problem %s\n", gf_error_to_string(e));
+			mp4box_cleanup(1);
+		}
+		e = gf_m3u8_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd_base_url ? mpd_base_url : inName, outfile, 0, "video/mp2t", GF_TRUE, use_url_template, NULL, mpd, GF_TRUE);
+		if (!e)
+			gf_mpd_write_file(mpd, outfile);
+
+		if (mpd)
+			gf_mpd_del(mpd);
+		if (mpd_base_url)
+			gf_free(mpd_base_url);
 
 		if (remote) {
-			//gf_delete_file("tmp_main.m3u8");
+			gf_delete_file("tmp_main.m3u8");
 		}
 		if (e != GF_OK) {
-			fprintf(stderr, "Error converting M3U8 (%s) to MPD (%s): %s\n", inName, outName, gf_error_to_string(e));
-			MP4BOX_EXIT_WITH_CODE(1);
+			fprintf(stderr, "Error converting M3U8 (%s) to MPD (%s): %s\n", inName, outfile, gf_error_to_string(e));
+			return mp4box_cleanup(1);
 		} else {
-			fprintf(stderr, "Done converting M3U8 (%s) to MPD (%s)\n", inName, outName);
-			MP4BOX_EXIT_WITH_CODE(0);
+			fprintf(stderr, "Done converting M3U8 (%s) to MPD (%s)\n", inName, outfile);
+			return mp4box_cleanup(0);
 		}
 	}
 #endif
@@ -3246,7 +3553,7 @@
 		case GF_FILE_TYPE_BT_WRL_X3DV:
 		case GF_FILE_TYPE_XMT_X3D:
 		case GF_FILE_TYPE_SVG:
-			encode = 1;
+			encode = GF_TRUE;
 			break;
 		case GF_FILE_TYPE_NOT_SUPPORTED:
 		case GF_FILE_TYPE_ISO_MEDIA:
@@ -3282,7 +3589,7 @@
 			fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
 			gf_isom_delete(file);
 			gf_delete_file("ttxt_convert");
-			MP4BOX_EXIT_WITH_CODE(1);
+			return mp4box_cleanup(1);
 		}
 		/* Prepare the export */
 		strcpy(outfile, inName);
@@ -3292,8 +3599,8 @@
 		}
 #ifndef GPAC_DISABLE_ISOM_DUMP
 		/* Start the export of the track #1, in the appropriate dump type, indicating it's a conversion */
-		dump_timed_text_track(file, gf_isom_get_track_id(file, 1),
-		 dump_std ? NULL : outfile,
+		dump_isom_timed_text(file, gf_isom_get_track_id(file, 1),
+							 dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
 		 GF_TRUE,
 		 (import_subtitle==2) ? GF_TEXTDUMPTYPE_SVG : (dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT));
 #endif
@@ -3302,12 +3609,12 @@
 		gf_delete_file("ttxt_convert");
 		if (e) {
 			fprintf(stderr, "Error converting %s: %s\n", inName, gf_error_to_string(e));
-			MP4BOX_EXIT_WITH_CODE(1);
+			return mp4box_cleanup(1);
 		}
-		MP4BOX_EXIT_WITH_CODE(0);
+		return mp4box_cleanup(0);
 #else
 		fprintf(stderr, "Feature not supported\n");
-		MP4BOX_EXIT_WITH_CODE(1);
+		return mp4box_cleanup(1);
 #endif
 	}
 
@@ -3317,12 +3624,12 @@
 		if (force_new) {
 			open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
 		} else {
-			FILE *test = gf_f64_open(inName, "rb");
+			FILE *test = gf_fopen(inName, "rb");
 			if (!test) {
 				open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
 				if (!outName) outName = inName;
 			} else {
-				fclose(test);
+				gf_fclose(test);
 				if (! gf_isom_probe_file(inName) ) {
 					open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
 					if (!outName) outName = inName;
@@ -3330,11 +3637,11 @@
 			}
 		}
 
-		open_edit = 1;
+		open_edit = GF_TRUE;
 		file = gf_isom_open(inName, open_mode, tmpdir);
 		if (!file) {
 			fprintf(stderr, "Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) );
-			MP4BOX_EXIT_WITH_CODE(1);
+			return mp4box_cleanup(1);
 		}
 
 		for (i=0; i<(u32) argc; i++) {
@@ -3345,7 +3652,11 @@
 				if (e) {
 					while (src) {
 						char *sep = strchr(src, '+');
-						if (sep) sep[0] = 0;
+						if (sep) {
+							sep[0] = 0;
+						} else {
+							break;
+						}
 
 						e = import_file(file, src, import_flags, import_fps, agg_samples);
 
@@ -3361,7 +3672,7 @@
 					if (e) {
 						fprintf(stderr, "Error importing %s: %s\n", argv[i+1], gf_error_to_string(e));
 						gf_isom_delete(file);
-						MP4BOX_EXIT_WITH_CODE(1);
+						return mp4box_cleanup(1);
 					}
 				}
 				i++;
@@ -3370,7 +3681,7 @@
 
 		/*unless explicitly asked, remove all systems tracks*/
 		if (!keep_sys_tracks) remove_systems_tracks(file);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 
 	if (nb_cat) {
@@ -3379,19 +3690,19 @@
 			if (force_new) {
 				open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
 			} else {
-				FILE *test = gf_f64_open(inName, "rb");
+				FILE *test = gf_fopen(inName, "rb");
 				if (!test) {
 					open_mode = (do_flat) ? GF_ISOM_OPEN_WRITE : GF_ISOM_WRITE_EDIT;
 					if (!outName) outName = inName;
 				}
-				else fclose(test);
+				else gf_fclose(test);
 			}
 
-			open_edit = 1;
+			open_edit = GF_TRUE;
 			file = gf_isom_open(inName, open_mode, tmpdir);
 			if (!file) {
 				fprintf(stderr, "Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) );
-				MP4BOX_EXIT_WITH_CODE(1);
+				return mp4box_cleanup(1);
 			}
 		}
 		for (i=0; i<(u32)argc; i++) {
@@ -3400,7 +3711,7 @@
 				if (e) {
 					fprintf(stderr, "Error appending %s: %s\n", argv[i+1], gf_error_to_string(e));
 					gf_isom_delete(file);
-					MP4BOX_EXIT_WITH_CODE(1);
+					return mp4box_cleanup(1);
 				}
 				i++;
 			}
@@ -3408,7 +3719,7 @@
 		/*unless explicitly asked, remove all systems tracks*/
 		if (!keep_sys_tracks) remove_systems_tracks(file);
 
-		needSave = 1;
+		needSave = GF_TRUE;
 		if (conv_type && can_convert_to_isma(file)) conv_type = GF_ISOM_CONV_TYPE_ISMA;
 	}
 #endif
@@ -3417,11 +3728,14 @@
 	else if (chunk_mode) {
 		if (!inName) {
 			fprintf(stderr, "chunk encoding syntax: [-outctx outDump] -inctx inScene auFile\n");
-			MP4BOX_EXIT_WITH_CODE(1);
+			return mp4box_cleanup(1);
 		}
 		e = EncodeFileChunk(inName, outName ? outName : inName, input_ctx, output_ctx, tmpdir);
-		if (e) fprintf(stderr, "Error encoding chunk file %s\n", gf_error_to_string(e));
-		MP4BOX_EXIT_WITH_CODE( e ? 1 : 0 );
+		if (e) {
+			fprintf(stderr, "Error encoding chunk file %s\n", gf_error_to_string(e));
+			return mp4box_cleanup(1);
+		}
+		goto exit;
 	}
 #endif
 	else if (encode) {
@@ -3435,7 +3749,7 @@
 				logfile[strlen(logfile)-1] = 0;
 			}
 			strcat(logfile, "_enc.logs");
-			logs = gf_f64_open(logfile, "wt");
+			logs = gf_fopen(logfile, "wt");
 		}
 		strcpy(outfile, outName ? outName : inName);
 		if (strchr(outfile, '.')) {
@@ -3446,12 +3760,12 @@
 		file = gf_isom_open(outfile, GF_ISOM_WRITE_EDIT, tmpdir);
 		opts.mediaSource = mediaSource ? mediaSource : outfile;
 		e = EncodeFile(inName, file, &opts, logs);
-		if (logs) fclose(logs);
+		if (logs) gf_fclose(logs);
 		if (e) goto err_exit;
-		needSave = 1;
+		needSave = GF_TRUE;
 		if (do_saf) {
-			needSave = 0;
-			open_edit = 0;
+			needSave = GF_FALSE;
+			open_edit = GF_FALSE;
 		}
 #endif
 	}
@@ -3467,8 +3781,8 @@
 			file = package_file(pack_file, NULL, tmpdir, pack_wgt);
 		}
 		if (!outName) outName = inName;
-		needSave = 1;
-		open_edit = 1;
+		needSave = GF_TRUE;
+		open_edit = GF_TRUE;
 	}
 #endif
 
@@ -3477,7 +3791,13 @@
 		char szMPD[GF_MAX_PATH], *sep;
 		GF_Config *dash_ctx = NULL;
 		u32 do_abort = 0;
-		gf_log_set_tool_level(GF_LOG_DASH, GF_LOG_INFO);
+		GF_DASHSegmenter *dasher;
+
+		if (crypt) {
+			fprintf(stderr, "MP4Box cannot crypt and DASH on the same pass. Please encrypt your content first.\n");
+			return mp4box_cleanup(1);
+		}
+
 		strcpy(outfile, outName ? outName : gf_url_get_resource_name(inName) );
 		sep = strrchr(outfile, '.');
 		if (sep) sep[0] = 0;
@@ -3485,7 +3805,12 @@
 		strcpy(szMPD, outfile);
 		strcat(szMPD, ".mpd");
 
-		if (dash_dynamic && dash_live)
+		if ((dash_subduration>0) && (dash_duration > dash_subduration)) {
+			fprintf(stderr, "Warning: -subdur parameter (%g s) should be greater than segment duration (%g s), using segment duration instead\n", dash_subduration, dash_duration);
+			dash_subduration = dash_duration;
+		}
+
+		if (dash_mode && dash_live)
 			fprintf(stderr, "Live DASH-ing - press 'q' to quit, 's' to save context and quit\n");
 
 		if (!dash_ctx_file && dash_live) {
@@ -3498,15 +3823,15 @@
 		}
 
 		if (dash_profile==GF_DASH_PROFILE_UNKNOWN)
-			dash_profile = dash_dynamic ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_FULL;
+			dash_profile = dash_mode ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_FULL;
 
-		if (!dash_dynamic) {
+		if (!dash_mode) {
 			time_shift_depth = 0;
 			mpd_update_time = 0;
 		} else if ((dash_profile>=GF_DASH_PROFILE_MAIN) && !use_url_template && !mpd_update_time) {
 			/*use a default MPD update of dash_duration sec*/
-			mpd_update_time = (u32) (dash_subduration ? dash_subduration : dash_duration);
-			fprintf(stderr, "Using default MPD refresh of %d seconds\n", mpd_update_time);
+			mpd_update_time = (Double) (dash_subduration ? dash_subduration : dash_duration);
+			fprintf(stderr, "Using default MPD refresh of %g seconds\n", mpd_update_time);
 		}
 
 		if (file && needSave) {
@@ -3514,15 +3839,64 @@
 			file = NULL;
 			del_file = GF_TRUE;
 		}
-		while (!do_abort) {
 
-			e = gf_dasher_segment_files(szMPD, dash_inputs, nb_dash_inputs, dash_profile, dash_title, dash_source, cprt, dash_more_info,
-			 (const char **) mpd_base_urls, nb_mpd_base_urls,
-			 use_url_template, segment_timeline, single_segment, single_file, bitstream_switching_mode,
-			 seg_at_rap, dash_duration, seg_name, seg_ext, segment_marker,
-			 interleaving_time, subsegs_per_sidx, daisy_chain_sidx, frag_at_rap, tmpdir,
-			 dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_subduration, min_buffer,
-			 ast_shift_sec, dash_scale, memory_frags, initial_moof_sn, initial_tfdt, no_fragments_defaults, pssh_in_moof, samplegroups_in_traf, single_traf_per_moof);
+		/*setup dash*/
+		dasher = gf_dasher_new(szMPD, dash_profile, tmpdir, dash_scale, dash_ctx);
+		if (!dasher) {
+			return mp4box_cleanup(1);
+			return GF_OUT_OF_MEM;
+		}
+		e = gf_dasher_set_info(dasher, dash_title, cprt, dash_more_info, dash_source);
+		if (e) {
+			fprintf(stderr, "DASH Error: %s\n", gf_error_to_string(e));
+			return mp4box_cleanup(1);
+		}
+
+		//e = gf_dasher_set_location(dasher, mpd_source);
+		for (i=0; i < nb_mpd_base_urls; i++) {
+			e = gf_dasher_add_base_url(dasher, mpd_base_urls[i]);
+			if (e) {
+				fprintf(stderr, "DASH Error: %s\n", gf_error_to_string(e));
+				return mp4box_cleanup(1);
+			}
+		}
+		e = gf_dasher_enable_url_template(dasher, (Bool) use_url_template, seg_name, seg_ext);
+		if (!e) e = gf_dasher_enable_segment_timeline(dasher, segment_timeline);
+		if (!e) e = gf_dasher_enable_single_segment(dasher, single_segment);
+		if (!e) e = gf_dasher_enable_single_file(dasher, single_file);
+		if (!e) e = gf_dasher_set_switch_mode(dasher, bitstream_switching_mode);
+		if (!e) e = gf_dasher_set_durations(dasher, dash_duration, dash_duration_strict, interleaving_time);
+		if (!e) e = gf_dasher_enable_rap_splitting(dasher, seg_at_rap, frag_at_rap);
+		if (!e) e = gf_dasher_set_segment_marker(dasher, segment_marker);
+		if (!e) e = gf_dasher_enable_sidx(dasher, (subsegs_per_sidx>=0) ? 1 : 0, (u32) subsegs_per_sidx, daisy_chain_sidx);
+		if (!e) e = gf_dasher_set_dynamic_mode(dasher, dash_mode, mpd_update_time, time_shift_depth, mpd_live_duration);
+		if (!e) e = gf_dasher_set_min_buffer(dasher, min_buffer);
+		if (!e) e = gf_dasher_set_ast_offset(dasher, ast_offset_ms);
+		if (!e) e = gf_dasher_enable_memory_fragmenting(dasher, memory_frags);
+		if (!e) e = gf_dasher_set_initial_isobmf(dasher, initial_moof_sn, initial_tfdt);
+		if (!e) e = gf_dasher_configure_isobmf_default(dasher, no_fragments_defaults, pssh_in_moof, samplegroups_in_traf, single_traf_per_moof);
+		if (!e) e = gf_dasher_enable_utc_ref(dasher, insert_utc);
+		if (!e) e = gf_dasher_enable_real_time(dasher, frag_real_time);
+		if (!e) e = gf_dasher_set_content_protection_location_mode(dasher, cp_location_mode);
+		if (!e) e = gf_dasher_set_profile_extension(dasher, dash_profile_extension);
+
+		for (i=0; i < nb_dash_inputs; i++) {
+			if (!e) e = gf_dasher_add_input(dasher, &dash_inputs[i]);
+		}
+		if (e) {
+			fprintf(stderr, "DASH Setup Error: %s\n", gf_error_to_string(e));
+			return mp4box_cleanup(1);
+		}
+
+		while (1) {
+			if (do_abort>=2) {
+				e = gf_dasher_set_dynamic_mode(dasher, GF_DASH_DYNAMIC_LAST, 0, time_shift_depth, mpd_live_duration);
+			}
+
+			if (!e) e = gf_dasher_process(dasher, dash_subduration);
+
+			if (do_abort)
+				break;
 
 			//this happens when reading file while writing them (local playback of the live session ...)
 			if (dash_live && (e==GF_IO_ERR) ) {
@@ -3533,42 +3907,54 @@
 			if (e) break;
 
 			if (dash_live) {
-				u32 sleep_for = gf_dasher_next_update_time(dash_ctx, mpd_update_time);
-				fprintf(stderr, "sleep for %d ms\n", sleep_for);
+				u32 slept = gf_sys_clock();
+				u32 sleep_for = gf_dasher_next_update_time(dasher);
+				fprintf(stderr, "Next generation scheduled in %d ms\n", sleep_for);
 				while (1) {
 					if (gf_prompt_has_input()) {
 						char c = (char) gf_prompt_get_char();
-						if (c=='q') {
+						if (c=='X') {
 							do_abort = 1;
 							break;
 						}
-						if (c=='s') {
+						if (c=='q') {
 							do_abort = 2;
 							break;
 						}
+						if (c=='s') {
+							do_abort = 3;
+							break;
+						}
 					}
 
-					if (dash_dynamic == 2) {
+					if (dash_mode == GF_DASH_DYNAMIC_DEBUG) {
 						break;
 					}
-					if (sleep_for<100)
-						break;
-					gf_sleep(100);
+					if (!sleep_for) break;
 
-					sleep_for = gf_dasher_next_update_time(dash_ctx, mpd_update_time);
+					gf_sleep(1);
+					sleep_for = gf_dasher_next_update_time(dasher);
+					if (sleep_for<1) {
+						fprintf(stderr, "Slept for %d ms before generation\n", gf_sys_clock() - slept);
+						break;
+					}
 				}
 			} else {
 				break;
 			}
 		}
 
+		gf_dasher_del(dasher);
+
 		if (dash_ctx) {
-			if (do_abort==2) {
-				char szName[1024];
-				fprintf(stderr, "Enter file name to save dash context:\n");
-				if (scanf("%s", szName) == 1) {
-					gf_cfg_set_filename(dash_ctx, szName);
-					gf_cfg_save(dash_ctx);
+			if (do_abort==3) {
+				if (!dash_ctx_file) {
+					char szName[1024];
+					fprintf(stderr, "Enter file name to save dash context:\n");
+					if (scanf("%s", szName) == 1) {
+						gf_cfg_set_filename(dash_ctx, szName);
+						gf_cfg_save(dash_ctx);
+					}
 				}
 			}
 			gf_cfg_del(dash_ctx);
@@ -3578,7 +3964,8 @@
 		if (del_file)
 			gf_delete_file(inName);
 
-		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
+		if (e) return mp4box_cleanup(1);
+		goto exit;
 	}
 
 	else if (!file
@@ -3586,11 +3973,11 @@
 	 && !(track_dump_type & GF_EXPORT_AVI_NATIVE)
 #endif
 	 ) {
-		FILE *st = gf_f64_open(inName, "rb");
+		FILE *st = gf_fopen(inName, "rb");
 		Bool file_exists = 0;
 		if (st) {
 			file_exists = 1;
-			fclose(st);
+			gf_fclose(st);
 		}
 		switch (get_file_type_by_ext(inName)) {
 		case 1:
@@ -3609,7 +3996,7 @@
 
 				if (!file) {
 					fprintf(stderr, "Error opening file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)));
-					MP4BOX_EXIT_WITH_CODE(1);
+					return mp4box_cleanup(1);
 				}
 			}
 			break;
@@ -3653,7 +4040,7 @@
 						fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
 						gf_isom_delete(file);
 						gf_delete_file("ttxt_convert");
-						MP4BOX_EXIT_WITH_CODE(1);
+						return mp4box_cleanup(1);
 					}
 				}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
@@ -3666,8 +4053,10 @@
 #ifndef GPAC_DISABLE_MPEG2TS
 					dump_mpeg2_ts(inName, pes_dump, program_number);
 #endif
+#ifndef GPAC_DISABLE_CORE_TOOLS
 				} else if (do_bin_nhml) {
 					nhml_bs_to_bin(inName, outName, dump_std);
+#endif
 				} else if (do_hash) {
 					hash_file(inName, dump_std);
 				} else {
@@ -3675,7 +4064,7 @@
 					convert_file_info(inName, info_track_id);
 #endif
 				}
-				MP4BOX_EXIT_WITH_CODE(0);
+				goto exit;
 			}
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 			else if (open_edit) {
@@ -3683,10 +4072,10 @@
 				if (!outName && file) outName = inName;
 			} else if (!file_exists) {
 				fprintf(stderr, "Error creating file %s: %s\n", inName, gf_error_to_string(GF_URL_ERROR));
-				MP4BOX_EXIT_WITH_CODE(1);
+				return mp4box_cleanup(1);
 			} else {
 				fprintf(stderr, "Cannot open %s - extension not supported\n", inName);
-				MP4BOX_EXIT_WITH_CODE(1);
+				return mp4box_cleanup(1);
 			}
 		}
 	}
@@ -3733,7 +4122,7 @@
 
 		e = gf_media_export(&mdump);
 		if (e) goto err_exit;
-		MP4BOX_EXIT_WITH_CODE(0);
+		goto exit;
 	}
 	if (!open_edit && !gf_isom_probe_file(inName) && track_dump_type) {
 		GF_MediaExporter mdump;
@@ -3758,24 +4147,24 @@
 			e = gf_media_export(&mdump);
 			if (e) goto err_exit;
 		}
-		MP4BOX_EXIT_WITH_CODE(0);
+		goto exit;
 	}
 
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
 	if (dump_mode != GF_SM_DUMP_NONE) {
-		e = dump_file_text(inName, dump_std ? NULL : outfile, dump_mode, do_log);
+		e = dump_isom_scene(inName, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_mode, do_log);
 		if (e) goto err_exit;
 	}
 #endif
 
 #ifndef GPAC_DISABLE_SCENE_STATS
-	if (stat_level) dump_scene_stats(inName, dump_std ? NULL : outfile, stat_level);
+	if (stat_level) dump_isom_scene_stats(inName, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, stat_level);
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	if (!HintIt && print_sdp) DumpSDP(file, dump_std ? NULL : outfile);
+	if (!HintIt && print_sdp) dump_isom_sdp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 #endif
 	if (print_info) {
 		if (!file) {
@@ -3786,29 +4175,35 @@
 		}
 	}
 #ifndef GPAC_DISABLE_ISOM_DUMP
-	if (dump_isom) dump_isom_xml(file, dump_std ? NULL : outfile);
-	if (dump_cr) dump_file_ismacryp(file, dump_std ? NULL : outfile);
- if ((dump_ttxt || dump_srt) && trackID) dump_timed_text_track(file, trackID, dump_std ? NULL : outfile, 0, dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT);
+	if (dump_isom) dump_isom_xml(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
+	if (dump_cr) dump_isom_ismacryp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
+	if ((dump_ttxt || dump_srt) && trackID)
+		dump_isom_timed_text(file, trackID, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
+							 GF_FALSE, dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT);
+
 #ifndef GPAC_DISABLE_ISOM_HINTING
-	if (dump_rtp) dump_file_rtp(file, dump_std ? NULL : outfile);
+	if (dump_rtp) dump_isom_rtp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 #endif
+
 #endif
 
-	if (dump_timestamps) dump_file_timestamps(file, dump_std ? NULL : outfile);
-	if (dump_nal) dump_file_nal(file, dump_nal, dump_std ? NULL : outfile);
+	if (dump_timestamps) dump_isom_timestamps(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
+	if (dump_nal) dump_isom_nal(file, dump_nal, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 
 	if (do_hash) {
 		e = hash_file(inName, dump_std);
 		if (e) goto err_exit;
 	}
+#ifndef GPAC_DISABLE_CORE_TOOLS
 	if (do_bin_nhml) {
 		e = nhml_bs_to_bin(inName, outName, dump_std);
 		if (e) goto err_exit;
 	}
+#endif
 
-	if (dump_cart) dump_cover_art(file, outfile);
-	if (dump_chap) dump_chapters(file, outfile, (dump_chap==2) ? 1 : 0);
-	if (dump_udta_type) dump_udta(file, outfile, dump_udta_type, dump_udta_track);
+	if (dump_cart) dump_isom_cover_art(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
+	if (dump_chap) dump_isom_chapters(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,(dump_chap==2) ? 1 : 0);
+	if (dump_udta_type) dump_isom_udta(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_udta_type, dump_udta_track);
 
 	if (dump_iod) {
 		GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *)gf_isom_get_root_od(file);
@@ -3820,7 +4215,7 @@
 			GF_BitStream *bs = NULL;
 
 			sprintf(szName, "%s.iod", outfile);
-			iodf = gf_f64_open(szName, "wb");
+			iodf = gf_fopen(szName, "wb");
 			if (!iodf) {
 				fprintf(stderr, "Cannot open destination %s\n", szName);
 			} else {
@@ -3833,18 +4228,18 @@
 				} else {
 					fprintf(stderr, "Error writing IOD %s\n", szName);
 				}
-				fclose(iodf);
+				gf_fclose(iodf);
 			}
 			gf_free(bs);
 		}
 	}
 
-#if !(definedGPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	if (split_duration || split_size) {
 		split_isomedia_file(file, split_duration, split_size, inName, interleaving_time, split_start, adjust_split_end, outName, tmpdir);
 		/*never save file when splitting is desired*/
-		open_edit = 0;
-		needSave = 0;
+		open_edit = GF_FALSE;
+		needSave = GF_FALSE;
 	}
 #endif
 
@@ -3868,6 +4263,7 @@
 			} else {
 				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
 				mdump.out_name = szFile;
+				mdump.flags |= GF_EXPORT_FORCE_EXT;
 			}
 			if (tka->trackID==(u32) -1) {
 				u32 j;
@@ -3875,6 +4271,7 @@
 					mdump.trackID = gf_isom_get_track_id(file, j+1);
 					sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
 					mdump.out_name = szFile;
+					mdump.flags |= GF_EXPORT_FORCE_EXT;
 					e = gf_media_export(&mdump);
 					if (e) goto err_exit;
 				}
@@ -3907,7 +4304,7 @@
 			/*note: we don't handle file brand modification, this is an author stuff and cannot be guessed from meta type*/
 			e = gf_isom_set_meta_type(file, meta->root_meta, tk, meta->meta_4cc);
 			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_ISO2, 1);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case META_ACTION_ADD_ITEM:
 			self_ref = !stricmp(meta->szPath, "NULL") || !stricmp(meta->szPath, "this") || !stricmp(meta->szPath, "self");
@@ -3916,31 +4313,32 @@
 			 meta->item_id,
 			 strlen(meta->mime_type) ? meta->mime_type : NULL,
 			 strlen(meta->enc_type) ? meta->enc_type : NULL,
-			 meta->use_dref ? meta->szPath : NULL, NULL);
-			needSave = 1;
+			 meta->use_dref ? meta->szPath : NULL, NULL,
+			 meta->image_props);
+			needSave = GF_TRUE;
 			break;
 		case META_ACTION_REM_ITEM:
 			e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case META_ACTION_SET_PRIMARY_ITEM:
 			e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case META_ACTION_SET_XML:
 		case META_ACTION_SET_BINARY_XML:
 			e = gf_isom_set_meta_xml(file, meta->root_meta, tk, meta->szPath, (meta->act_type==META_ACTION_SET_BINARY_XML) ? 1 : 0);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case META_ACTION_REM_XML:
 			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
 				e = gf_isom_remove_meta_xml(file, meta->root_meta, tk);
-				needSave = 1;
+				needSave = GF_TRUE;
 			} else {
 				fprintf(stderr, "No meta box in input file\n");
 			}
 			break;
-		case META_ACTION_DUMP_XML:
+		case META_ACTION_DUMP_ITEM:
 			if (gf_isom_get_meta_item_count(file, meta->root_meta, tk)) {
 				e = gf_isom_extract_meta_item(file, meta->root_meta, tk, meta->item_id, strlen(meta->szPath) ? meta->szPath : NULL);
 			} else {
@@ -3948,7 +4346,7 @@
 			}
 			break;
 #endif
-		case META_ACTION_DUMP_ITEM:
+		case META_ACTION_DUMP_XML:
 			if (gf_isom_has_meta_xml(file, meta->root_meta, tk)) {
 				e = gf_isom_extract_meta_xml(file, meta->root_meta, tk, meta->szPath, NULL);
 			} else {
@@ -3962,9 +4360,10 @@
 	}
 	if (!open_edit && !needSave) {
 		if (file) gf_isom_delete(file);
-		MP4BOX_EXIT_WITH_CODE(0);
+		goto exit;
 	}
 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	for (i=0; i<nb_tsel_acts; i++) {
 		switch (tsel_acts[i].act_type) {
@@ -3976,22 +4375,22 @@
 			 &tsel_acts[i].switchGroupID,
 			 tsel_acts[i].criteria, tsel_acts[i].nb_criteria);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TSEL_ACTION_REMOVE_TSEL:
 			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 0);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP:
 			e = gf_isom_reset_track_switch_parameter(file, gf_isom_get_track_by_id(file, tsel_acts[i].trackID), 1);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TSEL_ACTION_REMOVE_ALL_TSEL_IN_FILE:
 			e = gf_isom_reset_switch_parameters(file);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		default:
 			break;
@@ -4002,12 +4401,12 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 		remove_systems_tracks(file);
 #endif
-		needSave = 1;
+		needSave = GF_TRUE;
 		if (conv_type < GF_ISOM_CONV_TYPE_ISMA_EX) conv_type = 0;
 	}
 	if (remove_root_od) {
 		gf_isom_remove_root_od(file);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	if (remove_hint) {
@@ -4019,19 +4418,19 @@
 			}
 		}
 		gf_isom_sdp_clean(file);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 #endif
 
 	if (timescale && (timescale != gf_isom_get_timescale(file))) {
 		gf_isom_set_timescale(file, timescale);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 
 	if (!encode) {
 		if (!file) {
 			fprintf(stderr, "Nothing to do - exiting\n");
-			MP4BOX_EXIT_WITH_CODE(0);
+			goto exit;
 		}
 		if (outName) {
 			strcpy(outfile, outName);
@@ -4058,21 +4457,21 @@
 		if ((conv_type == GF_ISOM_CONV_TYPE_ISMA) || (conv_type == GF_ISOM_CONV_TYPE_ISMA_EX)) {
 			fprintf(stderr, "Converting to ISMA Audio-Video MP4 file...\n");
 			/*keep ESIDs when doing ISMACryp*/
-			e = gf_media_make_isma(file, crypt ? 1 : 0, 0, (conv_type==GF_ISOM_CONV_TYPE_ISMA_EX) ? 1 : 0);
+			e = gf_media_make_isma(file, crypt ? 1 : 0, GF_FALSE, (conv_type==GF_ISOM_CONV_TYPE_ISMA_EX) ? 1 : 0);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 		}
 		if (conv_type == GF_ISOM_CONV_TYPE_3GPP) {
 			fprintf(stderr, "Converting to 3GP file...\n");
 			e = gf_media_make_3gpp(file);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 		}
 		if (conv_type == GF_ISOM_CONV_TYPE_PSP) {
 			fprintf(stderr, "Converting to PSP file...\n");
 			e = gf_media_make_psp(file);
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 		}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 		if (conv_type == GF_ISOM_CONV_TYPE_IPOD) {
@@ -4131,7 +4530,7 @@
 			}
 			gf_isom_set_brand_info(file, major_brand, 1);
 			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_MP42, 1);
-			needSave = 1;
+			needSave = GF_TRUE;
 		}
 
 #ifndef GPAC_DISABLE_MCRYPT
@@ -4141,13 +4540,18 @@
 				e = GF_BAD_PARAM;
 				goto err_exit;
 			}
+			if (get_file_type_by_ext(inName) != GF_FILE_TYPE_ISO_MEDIA) {
+				fprintf(stderr, "MP4Box can crypt only ISOMedia File\n");
+				e = GF_BAD_PARAM;
+				goto err_exit;
+			}
 			if (crypt == 1) {
 				e = gf_crypt_file(file, drm_file);
 			} else if (crypt ==2) {
 				e = gf_decrypt_file(file, drm_file);
 			}
 			if (e) goto err_exit;
-			needSave = 1;
+			needSave = GF_TRUE;
 		}
 #endif /*GPAC_DISABLE_MCRYPT*/
 	} else if (outName) {
@@ -4167,34 +4571,34 @@
 			} else {
 				fprintf(stderr, "Removing track ID %d\n", tka->trackID);
 			}
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_LANGUAGE:
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
 				if (track && (track != i+1)) continue;
 				e = gf_isom_set_media_language(file, i+1, tka->lang);
 				if (e) goto err_exit;
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_KIND:
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
 				if (track && (track != i+1)) continue;
 				e = gf_isom_add_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
 				if (e) goto err_exit;
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_REM_KIND:
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
 				if (track && (track != i+1)) continue;
 				e = gf_isom_remove_track_kind(file, i+1, tka->kind_scheme, tka->kind_value);
 				if (e) goto err_exit;
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_DELAY:
 			if (tka->delay_ms) {
@@ -4203,24 +4607,24 @@
 				gf_isom_remove_edit_segments(file, track);
 				tk_dur = gf_isom_get_track_duration(file, track);
 				if (gf_isom_get_edit_segment_count(file, track))
-					needSave = 1;
+					needSave = GF_TRUE;
 				if (tka->delay_ms>0) {
 					gf_isom_append_edit_segment(file, track, (timescale*tka->delay_ms)/1000, 0, GF_ISOM_EDIT_EMPTY);
 					gf_isom_append_edit_segment(file, track, tk_dur, 0, GF_ISOM_EDIT_NORMAL);
-					needSave = 1;
+					needSave = GF_TRUE;
 				} else {
 					u64 to_skip = (timescale*(-tka->delay_ms))/1000;
 					if (to_skip<tk_dur) {
 						u64 media_time = (-tka->delay_ms)*gf_isom_get_media_timescale(file, track) / 1000;
 						gf_isom_append_edit_segment(file, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
-						needSave = 1;
+						needSave = GF_TRUE;
 					} else {
 						fprintf(stderr, "Warning: request negative delay longer than track duration - ignoring\n");
 					}
 				}
 			} else if (gf_isom_get_edit_segment_count(file, track)) {
 				gf_isom_remove_edit_segments(file, track);
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
 			break;
 		case TRAC_ACTION_SET_KMS_URI:
@@ -4230,7 +4634,7 @@
 				if (!gf_isom_is_ismacryp_media(file, i+1, 1)) continue;
 				e = gf_isom_change_ismacryp_protection(file, i+1, 1, NULL, (char *) tka->kms);
 				if (e) goto err_exit;
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
 			break;
 		case TRAC_ACTION_SET_ID:
@@ -4241,7 +4645,24 @@
 					fprintf(stderr, "Error: Cannot set track id with value %d because a track already exists - ignoring", tka->newTrackID);
 				} else {
 					e = gf_isom_set_track_id(file, track, tka->newTrackID);
-					needSave = 1;
+					needSave = GF_TRUE;
+				}
+			} else {
+				fprintf(stderr, "Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID);
+			}
+			break;
+		case TRAC_ACTION_SWAP_ID:
+			if (track) {
+				u32 tk1, tk2;
+				tk1 = gf_isom_get_track_by_id(file, tka->trackID);
+				tk2 = gf_isom_get_track_by_id(file, tka->newTrackID);
+				if (!tk1 || !tk2) {
+					fprintf(stderr, "Error: Cannot swap track IDs because not existing - ignoring");
+				} else {
+					e = gf_isom_set_track_id(file, tk2, 0);
+					if (!e) e = gf_isom_set_track_id(file, tk1, tka->newTrackID);
+					if (!e) e = gf_isom_set_track_id(file, tk2, tka->trackID);
+					needSave = GF_TRUE;
 				}
 			} else {
 				fprintf(stderr, "Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID);
@@ -4249,36 +4670,36 @@
 			break;
 		case TRAC_ACTION_SET_PAR:
 			e = gf_media_change_par(file, track, tka->par_num, tka->par_den);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_HANDLER_NAME:
 			e = gf_isom_set_handler_name(file, track, tka->hdl_name);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_ENABLE:
 			if (!gf_isom_is_track_enabled(file, track)) {
 				e = gf_isom_set_track_enabled(file, track, 1);
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
 			break;
 		case TRAC_ACTION_DISABLE:
 			if (gf_isom_is_track_enabled(file, track)) {
 				e = gf_isom_set_track_enabled(file, track, 0);
-				needSave = 1;
+				needSave = GF_TRUE;
 			}
 			break;
 		case TRAC_ACTION_REFERENCE:
 			e = gf_isom_set_track_reference(file, track, GF_4CC(tka->lang[0], tka->lang[1], tka->lang[2], tka->lang[3]), (u32) tka->delay_ms);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_REM_NON_RAP:
 			fprintf(stderr, "Removing non-rap samples from track %d\n", tka->trackID);
 			e = gf_media_remove_non_rap(file, track);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_UDTA:
 			set_file_udta(file, track, tka->udta_type, tka->src_name, tka->sample_num ? GF_TRUE : GF_FALSE);
-			needSave = 1;
+			needSave = GF_TRUE;
 			break;
 		default:
 			break;
@@ -4333,13 +4754,13 @@
 			case GF_ISOM_ITUNE_COVER_ART:
 			{
 				char *d, *ext;
-				FILE *t = gf_f64_open(val, "rb");
-				gf_f64_seek(t, 0, SEEK_END);
-				tlen = (u32) gf_f64_tell(t);
-				gf_f64_seek(t, 0, SEEK_SET);
+				FILE *t = gf_fopen(val, "rb");
+				gf_fseek(t, 0, SEEK_END);
+				tlen = (u32) gf_ftell(t);
+				gf_fseek(t, 0, SEEK_SET);
 				d = gf_malloc(sizeof(char) * tlen);
 				tlen = (u32) fread(d, sizeof(char), tlen, t);
-				fclose(t);
+				gf_fclose(t);
 
 				ext = strrchr(val, '.');
 				if (!stricmp(ext, ".png")) tlen |= 0x80000000;
@@ -4396,7 +4817,7 @@
 				gf_isom_apple_set_tag(file, itag, val, tlen);
 				break;
 			}
-			needSave = 1;
+			needSave = GF_TRUE;
 
 			if (sep) {
 				sep[0] = ':';
@@ -4412,7 +4833,7 @@
 		for (i=0; i<gf_isom_get_track_count(file); i++) {
 			gf_isom_set_track_creation_time(file, i+1, movie_time);
 		}
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -4422,12 +4843,13 @@
 		fprintf(stderr, "Fragmenting file (%.3f seconds fragments)\n", interleaving_time);
 		e = gf_media_fragment_file(file, outfile, interleaving_time);
 		if (e) fprintf(stderr, "Error while fragmenting file: %s\n", gf_error_to_string(e));
-		gf_isom_delete(file);
 		if (!e && !outName && !force_new) {
 			if (gf_delete_file(inName)) fprintf(stderr, "Error removing file %s\n", inName);
 			else if (gf_move_file(outfile, inName)) fprintf(stderr, "Error renaming file %s to %s\n", outfile, inName);
 		}
-		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
+		if (e) goto err_exit;
+		gf_isom_delete(file);
+		goto exit;
 	}
 #endif
 
@@ -4438,8 +4860,8 @@
 		MTUSize -= 12;
 		e = HintFile(file, MTUSize, max_ptime, rtp_rate, hint_flags, HintCopy, HintInter, regular_iod, single_group);
 		if (e) goto err_exit;
-		needSave = 1;
-		if (print_sdp) DumpSDP(file, dump_std ? NULL : outfile);
+		needSave = GF_TRUE;
+		if (print_sdp) dump_isom_sdp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 	}
 #endif
 
@@ -4448,14 +4870,17 @@
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_TIGHT);
 	} else if (!interleaving_time) {
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_STREAMABLE);
-		needSave = 1;
+		needSave = GF_TRUE;
 	} else if (do_flat) {
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_FLAT);
-		needSave = 1;
+		needSave = GF_TRUE;
 	} else {
 		e = gf_isom_make_interleave(file, interleaving_time);
-		if (!e && !old_interleave) e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_DRIFT_INTERLEAVED);
+		if (!e && old_interleave) e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_INTERLEAVED);
 	}
+	if (force_co64)
+		gf_isom_force_64bit_chunk_offset(file, GF_TRUE);
+
 	if (e) goto err_exit;
 
 #if !defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)
@@ -4481,23 +4906,23 @@
 				}
 			}
 			gf_isom_sdp_add_track_line(file, track, sdp_lines[i].line);
-			needSave = 1;
+			needSave = GF_TRUE;
 		} else {
 			gf_isom_sdp_add_line(file, sdp_lines[i].line);
-			needSave = 1;
+			needSave = GF_TRUE;
 		}
 	}
 #endif /*!defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)*/
 
 	if (cprt) {
 		e = gf_isom_set_copyright(file, "und", cprt);
-		needSave = 1;
+		needSave = GF_TRUE;
 		if (e) goto err_exit;
 	}
 	if (chap_file) {
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		e = gf_media_import_chapters(file, chap_file, import_fps);
-		needSave = 1;
+		needSave = GF_TRUE;
 #else
 		fprintf(stderr, "Warning: GPAC compiled without Media Import, chapters can't be imported\n");
 		e = GF_NOT_SUPPORTED;
@@ -4507,15 +4932,15 @@
 
 	if (major_brand) {
 		gf_isom_set_brand_info(file, major_brand, minor_version);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 	for (i=0; i<nb_alt_brand_add; i++) {
 		gf_isom_modify_alternate_brand(file, brand_add[i], 1);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 	for (i=0; i<nb_alt_brand_rem; i++) {
 		gf_isom_modify_alternate_brand(file, brand_rem[i], 0);
-		needSave = 1;
+		needSave = GF_TRUE;
 	}
 
 	if (!encode && !force_new) gf_isom_set_final_name(file, outfile);
@@ -4543,34 +4968,70 @@
 		gf_isom_delete(file);
 	}
 
-	if (e) fprintf(stderr, "Error: %s\n", gf_error_to_string(e));
-	MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
+	if (e) {
+		fprintf(stderr, "Error: %s\n", gf_error_to_string(e));
+		goto err_exit;
+	}
+	goto exit;
+
 #else
 	/*close libgpac*/
 	gf_isom_delete(file);
 	fprintf(stderr, "Error: Read-only version of MP4Box.\n");
-	MP4BOX_EXIT_WITH_CODE(1);
+	return mp4box_cleanup(1);
 #endif
+
 err_exit:
 	/*close libgpac*/
 	if (file) gf_isom_delete(file);
 	fprintf(stderr, "\n\tError: %s\n", gf_error_to_string(e));
-	MP4BOX_EXIT_WITH_CODE(1);
+	return mp4box_cleanup(1);
 
 exit:
+	mp4box_cleanup(0);
 
 #ifdef GPAC_MEMORY_TRACKING
-	if (enable_mem_tracker && (gf_memory_size() != 0)) {
- gf_memory_print();
+	if (enable_mem_tracker && (gf_memory_size() || gf_file_handles_count() )) {
+		gf_memory_print();
 		return 2;
 	}
-#endif	
+#endif
 	return 0;
 }
 
-int main( int argc, char** argv )
+#ifdef WIN32
+int wmain( int argc, wchar_t** wargv )
+{
+	int i;
+	int res;
+	size_t len;
+	size_t res_len;
+	char **argv;
+	argv = (char **)malloc(argc*sizeof(wchar_t *));
+	for (i = 0; i < argc; i++) {
+		wchar_t *src_str = wargv[i];
+		len = UTF8_MAX_BYTES_PER_CHAR*gf_utf8_wcslen(wargv[i]);
+		argv[i] = (char *)malloc(len + 1);
+		res_len = gf_utf8_wcstombs(argv[i], len, &src_str);
+		argv[i][res_len] = 0;
+		if (res_len > len) {
+			fprintf(stderr, "Length allocated for conversion of wide char to UTF-8 not sufficient\n");
+			return -1;
+		}
+	}
+	res = mp4boxMain(argc, argv);
+	for (i = 0; i < argc; i++) {
+		free(argv[i]);
+	}
+	free(argv);
+	return res;
+}
+#else
+int main(int argc, char** argv)
 {
 	return mp4boxMain( argc, argv );
 }
+#endif //win32
+
 
 #endif /*GPAC_DISABLE_ISOM*/

v0.5.2.tar.gz/applications/mp4box/wrapper.c -> v0.6.1.tar.gz/applications/mp4box/wrapper.c Changed

v0.5.2.tar.gz/applications/mp4box_android/jni/README.txt -> v0.6.1.tar.gz/applications/mp4box_android/jni/README.txt Changed

v0.5.2.tar.gz/applications/mp4client/Makefile -> v0.6.1.tar.gz/applications/mp4client/Makefile Changed

v0.5.2.tar.gz/applications/mp4client/carbon_events.c -> v0.6.1.tar.gz/applications/mp4client/carbon_events.c Changed

v0.5.2.tar.gz/applications/mp4client/extract.c -> v0.6.1.tar.gz/applications/mp4client/extract.c Changed

@@ -84,6 +84,8 @@
 extern GF_Terminal *term;
 extern u64 Duration;
 extern GF_Err last_error;
+extern Bool no_prog;
+
 
 static GFINLINE u8 colmask(s32 a, s32 n)
 {
@@ -172,7 +174,7 @@
 	if (fb->pixel_format==GF_PIXEL_GREYSCALE) sprintf(str, "%s_%d_depth.bmp", rad_name, img_num);
 	else sprintf(str, "%s_%d.bmp", rad_name, img_num);
 
-	fout = gf_f64_open(str, "wb");
+	fout = gf_fopen(str, "wb");
 	if (!fout) return;
 
 	memset(&fh, 0, sizeof(fh));
@@ -197,7 +199,6 @@
 	gf_fwrite(&fh.bfOffBits, 4, 1, fout);
 
 	gf_fwrite(&fi, 1, 40, fout);
-//#ifndef GPAC_USE_TINYGL
 	for (j=fb->height; j>0; j--) {
 		ptr = fb->video_buffer + (j-1)*fb->pitch_y;
 		for (i=0; i<fb->width; i++) {
@@ -206,19 +207,7 @@
 			ptr += res;
 		}
 	}
-//#else
-#if 0
-	for (j=0; j<fb->height; j++) {
-		ptr = fb->video_buffer + j*fb->pitch;
-		for (i=0; i<fb->width; i++) {
-			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
-			assert(res);
-			ptr += res;
-		}
-	}
-#endif
-
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 #include <gpac/avparse.h>
@@ -247,12 +236,12 @@
 	dst = (char*)gf_malloc(sizeof(char)*dst_size);
 
 
-	fout = gf_f64_open(str, "wb");
+	fout = gf_fopen(str, "wb");
 	if (fout) {
 		GF_Err e = gf_img_png_enc(fb->video_buffer, fb->width, fb->height, fb->pitch_y, fb->pixel_format, dst, &dst_size);
 		if (!e) {
 			gf_fwrite(dst, dst_size, 1, fout);
-			fclose(fout);
+			gf_fclose(fout);
 		}
 	}
 
@@ -272,7 +261,7 @@
 
 	depth = (unsigned char *) fb->video_buffer;
 
-	fout = gf_f64_open("dump_depth", "wb");
+	fout = gf_fopen("dump_depth", "wb");
 	if (!fout) return;
 	for (j=0; j<fb->height; j++) {
 		for (i=0; i<fb->width; i++) {
@@ -285,7 +274,7 @@
 #endif
 		}
 	}
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 void write_texture_file(GF_VideoSurface *fb, char *rad_name, u32 img_num, u32 dump_mode_flags)
@@ -297,8 +286,8 @@
 
 	buf = (unsigned char *) fb->video_buffer;
 
-	if (dump_mode_flags & DUMP_RGB_DEPTH_SHAPE) fout = gf_f64_open("dump_rgbds", "wb");
-	else if (dump_mode_flags & DUMP_RGB_DEPTH) fout = gf_f64_open("dump_rgbd", "wb");
+	if (dump_mode_flags & DUMP_RGB_DEPTH_SHAPE) fout = gf_fopen("dump_rgbds", "wb");
+	else if (dump_mode_flags & DUMP_RGB_DEPTH) fout = gf_fopen("dump_rgbd", "wb");
 	else return;
 
 	if (!fout) return;
@@ -307,7 +296,7 @@
 			fputc(buf[i+j*fb->pitch_y], fout);
 		}
 	}
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 
@@ -327,7 +316,7 @@
 		sprintf(str, "%s_%d.raw", rad_name, img_num);
 	}
 
-	fout = gf_f64_open(str, "wb");
+	fout = gf_fopen(str, "wb");
 	if (!fout) return;
 
 
@@ -339,7 +328,7 @@
 			ptr += res;
 		}
 	}
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 void write_hash(FILE *sha_out, char *buf, u32 size)
@@ -355,6 +344,7 @@
 {
 	GF_Err e;
 	u32 i, k;
+
 	GF_VideoSurface fb;
 	u32 dump_mode = dump_mode_flags & 0x0000FFFF;
 
@@ -426,15 +416,15 @@
 				dst += 3;
 			}
 		}
-		if (avi_out) {
 #ifndef GPAC_DISABLE_AVILIB
+		if (avi_out) {
 			if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
 				fprintf(stderr, "Error writing frame\n");
 		} else
 #endif
-		if (sha_out) {
-			write_hash(sha_out, conv_buf, fb.height*fb.width*3);
-		}
+			if (sha_out) {
+				write_hash(sha_out, conv_buf, fb.height*fb.width*3);
+			}
 
 		/*in -depth -avi mode, do not release it yet*/
 		if (dump_mode_flags & DUMP_DEPTH_ONLY) return;
@@ -588,15 +578,15 @@
 		} else {
 			out_size = fb.height*fb.width*3;
 		}
-		if (avi_out) {
 #ifndef GPAC_DISABLE_AVILIB
+		if (avi_out) {
 			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
 				fprintf(stderr, "Error writing frame\n");
-		} else 
+		} else
 #endif
-		if (sha_out) {
-			write_hash(sha_out, conv_buf, out_size);
-		}
+			if (sha_out) {
+				write_hash(sha_out, conv_buf, out_size);
+			}
 		break;
 	case DUMP_BMP:
 		write_bmp(&fb, rad_name, frameNum);
@@ -618,31 +608,35 @@
 
 #ifndef GPAC_DISABLE_AVILIB
 
-typedef struct 
+typedef struct
 {
 	GF_AudioListener al;
 	GF_Mutex *mx;
 	avi_t *avi;
 	u32 time_scale;
 	u64 max_dur, nb_bytes, audio_time;
-	u32 video_time, video_next_time, video_time_init, audio_time_init, flush_retry, nb_write;
- u32 samplerate, bits_per_sample, nb_channel;
+	u32 next_video_time, audio_time_init, flush_retry, nb_write, audio_clock_at_video_init;
+	u32 samplerate, bits_per_sample, nb_channel;
 } AVI_AudioListener;
 
 void avi_audio_frame(void *udta, char *buffer, u32 buffer_size, u32 time, u32 delay)
 {
 	AVI_AudioListener *avil = (AVI_AudioListener *)udta;
 
+	if (avil->audio_clock_at_video_init > time)
+		return;
+
 	if (avil->audio_time >= avil->audio_time_init + avil->max_dur)
 		return;
 
 	gf_mx_p(avil->mx);
 
- if (!avil->time_scale) {
- AVI_set_audio(avil->avi, avil->nb_channel, avil->samplerate, avil->bits_per_sample, WAVE_FORMAT_PCM, 0);
- avil->time_scale = avil->nb_channel*avil->bits_per_sample*avil->samplerate/8;
- }
- 
+	if (!avil->time_scale) {
+		AVI_set_audio(avil->avi, avil->nb_channel, avil->samplerate, avil->bits_per_sample, WAVE_FORMAT_PCM, 0);
+		avil->time_scale = avil->nb_channel*avil->bits_per_sample*avil->samplerate/8;
+		gf_term_set_option(term, GF_OPT_FORCE_AUDIO_CONFIG, 1);
+	}
+
 	avil->nb_bytes+=buffer_size;
 	avil->flush_retry=0;
 
@@ -654,9 +648,9 @@
 
 	avil->audio_time = 1000*avil->nb_bytes/avil->time_scale;
 
-	//we are behind video dump, force audio flush 
-	if (avil->audio_time < avil->video_next_time) {
-		gf_sc_flush_next_audio(term->compositor);
+	//we are behind video dump, force audio flush
+	if (avil->audio_time < avil->next_video_time) {
+		gf_term_step_clocks(term, 0);
 	}
 	gf_mx_v(avil->mx);
 }
@@ -665,9 +659,9 @@
 {
 	AVI_AudioListener *avil = (AVI_AudioListener *)udta;
 
- avil->nb_channel = nb_channel;
- avil->samplerate = samplerate;
- avil->bits_per_sample = bits_per_sample;
+	avil->nb_channel = nb_channel;
+	avil->samplerate = samplerate;
+	avil->bits_per_sample = bits_per_sample;
 }
 #endif
 
@@ -685,17 +679,21 @@
 #ifndef GPAC_DISABLE_AVILIB
 	avi_t *avi_out = NULL;
 	avi_t *depth_avi_out = NULL;
-	GF_Mutex *avi_mx = NULL;
 	AVI_AudioListener avi_al;
+	char comp[5];
+#else
+	void *avi_out = NULL;
+	void *depth_avi_out = NULL;
 #endif
+	GF_Mutex *avi_mx = NULL;
+
 	FILE *sha_out = NULL;
 	FILE *sha_depth_out = NULL;
 	char szPath_depth[GF_MAX_PATH];
-	char comp[5];
 	u32 cur_time_idx;
 	u32 mode = dump_mode_flags & 0x0000FFFF;
 
- if (!out_url) out_url = url;
+	if (!out_url) out_url = url;
 	prev = strstr(url, "://");
 	if (prev) {
 		prev = strrchr(url, '/');
@@ -717,7 +715,7 @@
 
 
 	fprintf(stderr, "Opening URL %s\n", url);
-	/*connect in pause mode*/
+	/*connect and pause */
 	gf_term_connect_from_time(term, url, 0, 1);
 
 	while (!term->compositor->scene
@@ -783,10 +781,10 @@
 		}
 #endif
 	}
-	
+
 	if (mode==DUMP_SHA1) {
 		strcat(szOutPath, ".sha1");
-		sha_out = fopen(szOutPath, "wb");
+		sha_out = gf_fopen(szOutPath, "wb");
 		if (!sha_out) {
 			fprintf(stderr, "Error creating SHA file %s\n", szOutPath);
 			return 1;
@@ -806,7 +804,7 @@
 		}
 		if (mode==DUMP_SHA1) {
 			strcat(szPath_depth, "_depth.sha1");
-			sha_depth_out = fopen(szPath_depth, "wb");
+			sha_depth_out = gf_fopen(szPath_depth, "wb");
 			if (!sha_depth_out) {
 				fprintf(stderr, "Error creating depgth SHA file %s\n", szPath_depth);
 				return 1;
@@ -834,12 +832,12 @@
 	}
 
 	if (mode==DUMP_AVI) {
+		avi_mx = gf_mx_new("AVIMutex");
+
 #ifndef GPAC_DISABLE_AVILIB
 		comp[0] = comp[1] = comp[2] = comp[3] = comp[4] = 0;
 		AVI_set_video(avi_out, width, height, fps, comp);
 
-		avi_mx = gf_mx_new("AVIMutex");
-		
 		if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
 			memset(&avi_al, 0, sizeof(avi_al));
 			avi_al.al.udta = &avi_al;
@@ -852,27 +850,31 @@
 			gf_sc_add_audio_listener(term->compositor, &avi_al.al);
 		}
 
-		if (dump_mode_flags & DUMP_DEPTH_ONLY) 
+		if (dump_mode_flags & DUMP_DEPTH_ONLY)
 			AVI_set_video(depth_avi_out, width, height, fps, comp);
 #endif
 	}
 
 	if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
-		
-		if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE) ) 
+
+		if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE) )
 			conv_buf = gf_malloc(sizeof(char) * width * height * 4);
 		else
 			conv_buf = gf_malloc(sizeof(char) * width * height * 3);
 	}
 
 	cur_time_idx = 0;
+	init_time = 0;
 	/*step to first frame*/
 	if (prev_time) {
 		gf_term_step_clocks(term, prev_time);
-		init_time = avi_al.audio_time_init = prev_time;
-		avi_al.video_next_time = avi_al.video_time = init_time;
+		init_time = prev_time;
 		prev_time=0;
 	}
+#ifndef GPAC_DISABLE_AVILIB
+	avi_al.audio_time_init = avi_al.next_video_time = init_time;
+	avi_al.audio_clock_at_video_init = gf_term_get_clock(term);
+#endif
 
 	while (time < dump_dur) {
 		while ((gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)) {
@@ -881,7 +883,8 @@
 
 		if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
 
-			fprintf(stderr, "Dumping %02d/100 %% - time %.02f sec\r", (u32) ((100.0*prev_time)/dump_dur), prev_time/1000.0 );
+			if (!no_prog)
+				fprintf(stderr, "Dumping %02d/100 %% - time %.02f sec\r", (u32) ((100.0*prev_time)/dump_dur), prev_time/1000.0 );
 
 			if (avi_mx) gf_mx_p(avi_mx);
 
@@ -912,10 +915,11 @@
 			}
 		}
 
-		avi_al.video_time = init_time + (u32) (nb_frames*1000/fps);
 		nb_frames++;
 		time = (u32) (nb_frames*1000/fps);
-		avi_al.video_next_time = init_time + time;
+#ifndef GPAC_DISABLE_AVILIB
+		avi_al.next_video_time = init_time + time;
+#endif
 		gf_term_step_clocks(term, time - prev_time);
 		prev_time = time;
 
@@ -926,17 +930,17 @@
 		}
 	}
 
+#ifndef GPAC_DISABLE_AVILIB
 	//flush audio dump
 	if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
 		avi_al.flush_retry=0;
 		while ((avi_al.flush_retry <100) && (avi_al.audio_time < dump_dur)) {
-			gf_sc_flush_next_audio(term->compositor);
+			gf_term_step_clocks(term, 0);
 			gf_sleep(1);
 			avi_al.flush_retry++;
 		}
 	}
 
-#ifndef GPAC_DISABLE_AVILIB
 	if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
 		gf_sc_remove_audio_listener(term->compositor, &avi_al.al);
 	}
@@ -945,8 +949,8 @@
 	if (avi_mx) gf_mx_del(avi_mx);
 #endif
 
-	if (sha_out) fclose(sha_out);
-	if (sha_depth_out) fclose(sha_depth_out);
+	if (sha_out) gf_fclose(sha_out);
+	if (sha_depth_out) gf_fclose(sha_depth_out);
 
 	if (conv_buf) {
 		gf_free(conv_buf);

v0.5.2.tar.gz/applications/mp4client/main.c -> v0.6.1.tar.gz/applications/mp4client/main.c Changed

@@ -32,6 +32,8 @@
 #include <gpac/options.h>
 #include <gpac/modules/service.h>
 #include <gpac/avparse.h>
+#include <gpac/network.h>
+#include <gpac/utf.h>
 #include <time.h>
 
 /*ISO 639 languages*/
@@ -60,7 +62,7 @@
 
 /*local prototypes*/
 void PrintWorldInfo(GF_Terminal *term);
-void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number);
+void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *URL);
 void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name);
 
 void ViewODs(GF_Terminal *term, Bool show_timing);
@@ -70,6 +72,9 @@
 
 static Bool restart = GF_FALSE;
 static Bool reload = GF_FALSE;
+
+Bool no_prog = 0;
+
 #if defined(__DARWIN__) || defined(__APPLE__)
 //we keep no decoder thread because of JS_GC deadlocks between threads ...
 static u32 threading_flags = GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_DECODER_THREAD;
@@ -93,7 +98,7 @@
 u64 Duration;
 GF_Err last_error = GF_OK;
 static Bool enable_add_ons = GF_TRUE;
-static Fixed playback_speed = 1.0;
+static Fixed playback_speed = FIX_ONE;
 
 static s32 request_next_playlist_item = GF_FALSE;
 FILE *playlist = NULL;
@@ -140,15 +145,23 @@
 Bool dump_file(char *the_url, char *out_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times);
 
 
+static Bool shell_visible = GF_TRUE;
 void hide_shell(u32 cmd_type)
 {
 #if defined(WIN32) && !defined(_WIN32_WCE)
 	typedef HWND (WINAPI *GetConsoleWindowT)(void);
 	HMODULE hk32 = GetModuleHandle("kernel32.dll");
 	GetConsoleWindowT GetConsoleWindow = (GetConsoleWindowT ) GetProcAddress(hk32,"GetConsoleWindow");
-	if (cmd_type==0) ShowWindow( GetConsoleWindow(), SW_SHOW);
-	else if (cmd_type==1) ShowWindow( GetConsoleWindow(), SW_HIDE);
+	if (cmd_type==0) {
+		ShowWindow( GetConsoleWindow(), SW_SHOW);
+		shell_visible = GF_TRUE;
+	}
+	else if (cmd_type==1) {
+		ShowWindow( GetConsoleWindow(), SW_HIDE);
+		shell_visible = GF_FALSE;
+	}
 	else if (cmd_type==2) PostMessage(GetConsoleWindow(), WM_CLOSE, 0, 0);
+
 #endif
 }
 
@@ -173,7 +186,10 @@
 	 "\t-rtix fileName: same as -rti but driven by GPAC logs\n"
 	 "\t-quiet: removes script message, buffering and downloading status\n"
 	 "\t-strict-error: exit when the player reports its first error\n"
-	 "\t-opt option: Overrides an option in the configuration file. String format is section:key=value\n"
+	 "\t-opt option: Overrides an option in the configuration file. String format is section:key=value. \n"
+	 "\t \"section:key=null\" removes the key\n"
+	 "\t \"section:*=null\" removes the section\n"
+	 "\t-conf option: Same as -opt but does not start player.\n"
 	 "\t-log-file file: sets output log file. Also works with -lf\n"
 	 "\t-logs log_args: sets log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
 	 "\t levelX can be one of:\n"
@@ -221,6 +237,7 @@
 #else
 	 "\t-no-thread: disables thread usage (except for audio)\n"
 #endif
+	 "\t-no-compositor-thread: disables compositor thread (iOS and Android mode)\n"
 	 "\t-no-audio: disables audio \n"
 	 "\t-no-wnd: uses windowless mode (Win32 only)\n"
 	 "\t-no-back: uses transparent background for output window when no background is specified (Win32 only)\n"
@@ -245,17 +262,18 @@
 	 "\t-exit: automatically exits when presentation is over\n"
 	 "\t-run-for TIME: runs for TIME seconds and exits\n"
 	 "\t-service ID: auto-tune to given service ID in a multiplex\n"
- "\t-noprog: disable progress report\n"
- "\t-no-save: disable saving config file on exit\n"
+	 "\t-noprog: disable progress report\n"
+	 "\t-no-save: disable saving config file on exit\n"
 	 "\t-no-addon: disable automatic loading of media addons declared in source URL\n"
 	 "\t-gui: starts in GUI mode. The GUI is indicated in GPAC config, section General, by the key [StartupFile]\n"
+	 "\t-ntp-shift T: shifts NTP clock of T (signed int) milliseconds\n"
 	 "\n"
 	 "Dumper Options (times is a formated as start-end, with start being sec, h:m:s:f/fps or h:m:s:ms):\n"
 	 "\t-bmp [times]: dumps given frames to bmp\n"
 	 "\t-png [times]: dumps given frames to png\n"
 	 "\t-raw [times]: dumps given frames to raw\n"
 	 "\t-avi [times]: dumps given file to raw avi\n"
-			"\t-sha [times]: dumps given file to raw SHA-1 (1 hash per frame)\n"
+	 "\t-sha [times]: dumps given file to raw SHA-1 (1 hash per frame)\n"
 	 "\r-out filename: name of the output file\n"
 	 "\t-rgbds: dumps the RGBDS pixel format texture\n"
 	 "\t with -avi [times]: dumps an rgbds-format .avi\n"
@@ -378,11 +396,11 @@
 		char szMsg[1024];
 
 		if (rti.total_cpu_usage && (bench_mode<2) ) {
-			sprintf(szMsg, "FPS %d CPU %2d (%02d) Mem %d kB",
-			 (u32) gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024));
+			sprintf(szMsg, "FPS %02.02f CPU %2d (%02d) Mem %d kB",
+			 gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024));
 		} else {
-			sprintf(szMsg, "FPS %d CPU %02d Mem %d kB",
-			 (u32) gf_term_get_framerate(term, 0), rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
+			sprintf(szMsg, "FPS %02.02f CPU %02d Mem %d kB",
+			 gf_term_get_framerate(term, 0), rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
 		}
 
 		if (display_rti==2) {
@@ -540,6 +558,16 @@
 	return line;
 }
 
+static void do_set_speed(Fixed desired_speed)
+{
+	if (gf_term_set_speed(term, desired_speed) == GF_OK) {
+		playback_speed = desired_speed;
+		fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
+	} else {
+		fprintf(stderr, "Adjusting speed to %g not supported for this content\n", FIX2FLT(desired_speed));
+	}
+}
+
 Bool GPAC_EventProc(void *ptr, GF_Event *evt)
 {
 	if (!term) return 0;
@@ -547,6 +575,17 @@
 	if (gui_mode==1) {
 		if (evt->type==GF_EVENT_QUIT) {
 			Run = 0;
+		} else if (evt->type==GF_EVENT_KEYDOWN) {
+			switch (evt->key.key_code) {
+			case GF_KEY_C:
+				if (evt->key.flags & (GF_KEY_MOD_CTRL|GF_KEY_MOD_ALT)) {
+					hide_shell(shell_visible ? 1 : 0);
+					if (shell_visible) gui_mode=2;
+				}
+				break;
+			default:
+				break;
+			}
 		}
 		return 0;
 	}
@@ -656,6 +695,12 @@
 		case GF_KEY_ESCAPE:
 			gf_term_set_option(term, GF_OPT_FULLSCREEN, !gf_term_get_option(term, GF_OPT_FULLSCREEN));
 			break;
+		case GF_KEY_C:
+			if (evt->key.flags & (GF_KEY_MOD_CTRL|GF_KEY_MOD_ALT)) {
+				hide_shell(shell_visible ? 1 : 0);
+				if (!shell_visible) gui_mode=1;
+			}
+			break;
 		case GF_KEY_F:
 			if (evt->key.flags & GF_KEY_MOD_CTRL) fprintf(stderr, "Rendering rate: %f FPS\n", gf_term_get_framerate(term, 0));
 			break;
@@ -693,12 +738,12 @@
 			break;
 		case GF_KEY_P:
 			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
-				u32 is_pause = gf_term_get_option(term, GF_OPT_PLAY_STATE) ;
-				fprintf(stderr, "[Status: %s]\n", is_pause ? "Playing" : "Paused");
-				if ((is_pause == GF_STATE_PAUSED) && (evt->key.flags & GF_KEY_MOD_SHIFT)) {
+				u32 pause_state = gf_term_get_option(term, GF_OPT_PLAY_STATE) ;
+				fprintf(stderr, "[Status: %s]\n", pause_state ? "Playing" : "Paused");
+				if ((pause_state == GF_STATE_PAUSED) && (evt->key.flags & GF_KEY_MOD_SHIFT)) {
 					gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAY_LIVE);
 				} else {
-					gf_term_set_option(term, GF_OPT_PLAY_STATE, (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) ? GF_STATE_PLAYING : GF_STATE_PAUSED);
+					gf_term_set_option(term, GF_OPT_PLAY_STATE, (pause_state==GF_STATE_PAUSED) ? GF_STATE_PLAYING : GF_STATE_PAUSED);
 				}
 			}
 			break;
@@ -736,23 +781,17 @@
 			break;
 		case GF_KEY_UP:
 			if (evt->key.flags & VK_MOD && is_connected) {
-				playback_speed *= 2;
-				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
-				gf_term_set_speed(term, playback_speed);
+				do_set_speed(playback_speed * 2);
 			}
 			break;
 		case GF_KEY_DOWN:
 			if (evt->key.flags & VK_MOD && is_connected) {
-				playback_speed /= 2;
-				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
-				gf_term_set_speed(term, playback_speed);
+				do_set_speed(playback_speed / 2);
 			}
 			break;
 		case GF_KEY_LEFT:
 			if (evt->key.flags & VK_MOD && is_connected) {
-				playback_speed = -playback_speed;
-				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
-				gf_term_set_speed(term, playback_speed);
+				do_set_speed(-1 * playback_speed );
 			}
 			break;
 
@@ -766,6 +805,7 @@
 			eos_seen = GF_FALSE;
 			if (playback_speed != FIX_ONE)
 				gf_term_set_speed(term, playback_speed);
+
 		} else if (is_connected) {
 			fprintf(stderr, "Service %s\n", is_connected ? "Disconnected" : "Connection Failed");
 			is_connected = 0;
@@ -804,18 +844,22 @@
 		ResetCaption();
 		break;
 
+	case GF_EVENT_RELOAD:
+		if (is_connected)
+			reload = 1;
+		break;
 	case GF_EVENT_DROPFILE:
 	{
 		u32 i, pos;
 		/*todo - force playlist mode*/
 		if (readonly_playlist) {
-			fclose(playlist);
+			gf_fclose(playlist);
 			playlist = NULL;
 		}
 		readonly_playlist = 0;
 		if (!playlist) {
 			readonly_playlist = 0;
-			playlist = gf_temp_file_new();
+			playlist = gf_temp_file_new(NULL);
 		}
 		pos = ftell(playlist);
 		i=0;
@@ -978,22 +1022,27 @@
 	return 1;
 }
 
+static u64 last_log_time=0;
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
-	FILE *logs = cbk;
+	FILE *logs = cbk ? cbk : stderr;
 
 	if (rti_logs && (lm & GF_LOG_RTI)) {
 		char szMsg[2048];
 		vsprintf(szMsg, fmt, list);
 		UpdateRTInfo(szMsg + 6 /*"[RTI] "*/);
 	} else {
-		if (log_time_start) fprintf(logs, "[At "LLD"]", gf_sys_clock_high_res() - log_time_start);
+		if (log_time_start) {
+			u64 now = gf_sys_clock_high_res();
+			fprintf(logs, "At "LLD" (diff %d) - ", now - log_time_start, (u32) (now - last_log_time) );
+			last_log_time = now;
+		}
 		if (log_utc_time) {
 			u64 utc_clock = gf_net_get_utc() ;
 			time_t secs = utc_clock/1000;
 			struct tm t;
 			t = *gmtime(&secs);
-			fprintf(logs, "[UTC %d-%02d-%02dT%02d:%02d:%02dZ - TS "LLU"]", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
+			fprintf(logs, "UTC %d-%02d-%02dT%02d:%02d:%02dZ (TS "LLU") - ", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
 		}
 		vfprintf(logs, fmt, list);
 		fflush(logs);
@@ -1002,8 +1051,8 @@
 
 static void init_rti_logs(char *rti_file, char *url, Bool use_rtix)
 {
-	if (rti_logs) fclose(rti_logs);
-	rti_logs = gf_f64_open(rti_file, "wt");
+	if (rti_logs) gf_fclose(rti_logs);
+	rti_logs = gf_fopen(rti_file, "wt");
 	if (rti_logs) {
 		fprintf(rti_logs, "!! GPAC RunTime Info ");
 		if (url) fprintf(rti_logs, "for file %s", url);
@@ -1030,20 +1079,36 @@
 		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
 		return;
 	}
-	sep[0] = 0;
-	strcpy(szSec, opt_string);
-	sep[0] = ':';
+	{
+		const size_t sepIdx = sep - opt_string;
+		strncpy(szSec, opt_string, sepIdx);
+		szSec[sepIdx] = 0;
+	}
 	sep ++;
 	sep2 = strchr(sep, '=');
 	if (!sep2) {
 		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
 		return;
 	}
-	sep2[0] = 0;
-	strcpy(szKey, sep);
-	strcpy(szVal, sep2+1);
-	sep2[0] = '=';
-	if (!stricmp(szVal, "null")) szVal[0]=0;
+	{
+		const size_t sepIdx = sep2 - sep;
+		strncpy(szKey, sep, sepIdx);
+		szKey[sepIdx] = 0;
+		strcpy(szVal, sep2+1);
+	}
+
+	if (!stricmp(szKey, "*")) {
+		if (stricmp(szVal, "null")) {
+			fprintf(stderr, "Badly formatted option %s - expected Section:*=null\n", opt_string);
+			return;
+		}
+		gf_cfg_del_section(cfg_file, szSec);
+		return;
+	}
+
+	if (!stricmp(szVal, "null")) {
+		szVal[0]=0;
+	}
 	gf_cfg_set_key(cfg_file, szSec, szKey, szVal[0] ? szVal : NULL);
 }
 
@@ -1053,7 +1118,7 @@
 
 static void progress_quiet(const void *cbck, const char *title, u64 done, u64 total) { }
 
-int main (int argc, char **argv)
+int mp4client_main(int argc, char **argv)
 {
 	char c;
 	const char *str;
@@ -1065,7 +1130,8 @@
 	Bool start_fs = GF_FALSE;
 	Bool use_rtix = GF_FALSE;
 	Bool pause_at_first = GF_FALSE;
-	Bool no_cfg_safe = GF_FALSE;
+	Bool no_cfg_save = GF_FALSE;
+	Bool is_cfg_only = GF_FALSE;
 
 	Double play_from = 0;
 #ifdef GPAC_MEMORY_TRACKING
@@ -1135,6 +1201,11 @@
 		logs_set = GF_TRUE;
 	}
 
+	if (!gui_mode) {
+		str = gf_cfg_get_key(cfg_file, "General", "ForceGUI");
+		if (str && !strcmp(str, "yes")) gui_mode = 1;
+	}
+
 	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
 
@@ -1156,7 +1227,7 @@
 		} else if (!strcmp(arg, "-strict-error")) {
 			gf_log_set_strict_error(1);
 		} else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
-			logfile = gf_f64_open(argv[i+1], "wt");
+			logfile = gf_fopen(argv[i+1], "wt");
 			gf_log_set_callback(logfile, on_gpac_log);
 			i++;
 		} else if (!strcmp(arg, "-logs") ) {
@@ -1175,6 +1246,7 @@
 #else
 		else if (!strcmp(arg, "-no-thread")) threading_flags = GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_WINDOW_NO_THREAD;
 #endif
+		else if (!strcmp(arg, "-no-compositor-thread")) threading_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
 		else if (!strcmp(arg, "-no-audio")) no_audio = 1;
 		else if (!strcmp(arg, "-no-regulation")) no_regulation = 1;
 		else if (!strcmp(arg, "-fs")) start_fs = 1;
@@ -1182,22 +1254,32 @@
 		else if (!strcmp(arg, "-opt")) {
 			set_cfg_option(argv[i+1]);
 			i++;
+		} else if (!strcmp(arg, "-conf")) {
+			set_cfg_option(argv[i+1]);
+			is_cfg_only=GF_TRUE;
+			i++;
 		}
 		else if (!strcmp(arg, "-ifce")) {
 			gf_cfg_set_key(cfg_file, "Network", "DefaultMCastInterface", argv[i+1]);
 			i++;
 		}
- else if (!stricmp(arg, "-help")) {
- PrintUsage();
- return 1;
- }
- else if (!stricmp(arg, "-noprog")) {
- gf_set_progress_callback(NULL, progress_quiet);
- }
- else if (!stricmp(arg, "--no-save")) {
-			no_cfg_safe=1;
- }
-		
+		else if (!stricmp(arg, "-help")) {
+			PrintUsage();
+			return 1;
+		}
+		else if (!stricmp(arg, "-noprog")) {
+			no_prog=1;
+			gf_set_progress_callback(NULL, progress_quiet);
+		}
+		else if (!stricmp(arg, "-no-save") || !stricmp(arg, "--no-save") /*old versions used --n-save ...*/) {
+			no_cfg_save=1;
+		}
+		else if (!stricmp(arg, "-ntp-shift")) {
+			s32 shift = atoi(argv[i+1]);
+			i++;
+			gf_net_set_ntp_shift(shift);
+		}
+
 
 		/*arguments only used in non-gui mode*/
 		else if (!gui_mode) {
@@ -1206,7 +1288,7 @@
 			}
 			else if (!strcmp(arg, "-out")) {
 				out_arg = argv[i+1];
- i++;
+				i++;
 			}
 			else if (!stricmp(arg, "-fps")) {
 				fps = atof(argv[i+1]);
@@ -1268,7 +1350,7 @@
 			} else if (!strcmp(arg, "-show")) {
 				visible = 1;
 			}
-			else if (!strcmp(arg, "-exit")) auto_exit = 1;
+			else if (!strcmp(arg, "-exit")) auto_exit = GF_TRUE;
 			else if (!stricmp(arg, "-views")) {
 				views = argv[i+1];
 				i++;
@@ -1286,43 +1368,62 @@
 			else if (!stricmp(arg, "-service")) {
 				initial_service_id = atoi(argv[i+1]);
 				i++;
+			} else if (!strcmp(arg, "-mem-track")) {
+
 			} else {
 				fprintf(stderr, "Unrecognized option %s - skipping\n", arg);
 			}
 		}
 	}
+	if (is_cfg_only) {
+		gf_cfg_del(cfg_file);
+		fprintf(stderr, "GPAC Config updated\n");
+		return 0;
+	}
 	if (dump_mode && !url_arg ) {
 		fprintf(stderr, "Missing argument for dump\n");
 		PrintUsage();
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		return 1;
 	}
 
-	if (!url_arg && simulation_time_in_ms)
-		simulation_time_in_ms += gf_sys_clock();
-
-	if (!gui_mode) {
-		str = gf_cfg_get_key(cfg_file, "General", "ForceGUI");
-		if (str && !strcmp(str, "yes")) gui_mode = 1;
+	if (!gui_mode && !url_arg && (gf_cfg_get_key(cfg_file, "General", "StartupFile") != NULL)) {
+		gui_mode=1;
 	}
 
-	if (gui_mode) {
-		if (gui_mode==1) {
-			hide_shell(1);
-			//user.init_flags |= GF_TERM_WINDOW_NO_DECORATION;
+#ifdef WIN32
+	if (gui_mode==1) {
+		const char *opt;
+		TCHAR buffer[1024];
+		DWORD res = GetCurrentDirectory(1024, buffer);
+		buffer[res] = 0;
+		opt = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
+		if (strstr(opt, buffer)) {
+			gui_mode=1;
+		} else {
+			gui_mode=2;
 		}
 	}
+#endif
+
+	if (gui_mode==1) {
+		hide_shell(1);
+	}
+
+	if (!url_arg && simulation_time_in_ms)
+		simulation_time_in_ms += gf_sys_clock();
 
 #if defined(__DARWIN__) || defined(__APPLE__)
- carbon_init();
+	carbon_init();
 #endif
- 
+
 
 	if (dump_mode) rti_file = NULL;
 
 	if (!logs_set) {
-		//gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
+		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
 	}
+	gf_log_set_callback(NULL, on_gpac_log);
 
 	if (rti_file) init_rti_logs(rti_file, url_arg, use_rtix);
 
@@ -1338,7 +1439,7 @@
 		user.init_flags |= GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION /*| GF_TERM_INIT_HIDE*/;
 		if (visible || dump_mode==8) user.init_flags |= GF_TERM_INIT_HIDE;
 		gf_cfg_set_key(cfg_file, "Audio", "DriverName", "Raw Audio Output");
-		no_cfg_safe=GF_TRUE;
+		no_cfg_save=GF_TRUE;
 	} else {
 		init_w = forced_width;
 		init_h = forced_height;
@@ -1351,7 +1452,7 @@
 		if (user.modules) gf_modules_del(user.modules);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		return 1;
 	}
 	fprintf(stderr, "Modules Found : %d \n", i);
@@ -1366,10 +1467,12 @@
 
 	if (threading_flags & (GF_TERM_NO_DECODER_THREAD|GF_TERM_NO_COMPOSITOR_THREAD) ) term_step = 1;
 
+	//in dump mode we don't want to rely on system clock but on the number of samples being consumed
+	if (dump_mode) user.init_flags |= GF_TERM_USE_AUDIO_HW_CLOCK;
 
 	if (bench_mode) {
 		gf_cfg_discard_changes(user.config);
-		auto_exit = 1;
+		auto_exit = GF_TRUE;
 		gf_cfg_set_key(user.config, "Audio", "DriverName", "Raw Audio Output");
 		if (bench_mode!=2) {
 			gf_cfg_set_key(user.config, "Video", "DriverName", "Raw Video Output");
@@ -1390,7 +1493,7 @@
 		gf_cfg_discard_changes(cfg_file);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		return 1;
 	}
 	fprintf(stderr, "Terminal Loaded in %d ms\n", gf_sys_clock()-i);
@@ -1465,15 +1568,10 @@
 				}
 			}
 
-			playlist = e ? NULL : gf_f64_open(the_url, "rt");
+			playlist = e ? NULL : gf_fopen(the_url, "rt");
 			readonly_playlist = 1;
 			if (playlist) {
-				if (1 > fscanf(playlist, "%s", the_url))
-					fprintf(stderr, "Cannot read any URL from playlist\n");
-				else {
-					fprintf(stderr, "Opening URL %s\n", the_url);
-					gf_term_connect_with_path(term, the_url, pl_path);
-				}
+				request_next_playlist_item = GF_TRUE;
 			} else {
 				if (e)
 					fprintf(stderr, "Failed to open playlist %s: %s\n", the_url, gf_error_to_string(e) );
@@ -1491,6 +1589,7 @@
 			strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
 			gf_term_connect(term, str);
 			startup_file = 1;
+			is_connected = 1;
 		}
 	}
 	if (gui_mode==2) gui_mode=0;
@@ -1511,7 +1610,7 @@
 	while (Run) {
 
 		/*we don't want getchar to block*/
-		if (gui_mode || !gf_prompt_has_input()) {
+		if ((gui_mode==1) || !gf_prompt_has_input()) {
 			if (reload) {
 				reload = 0;
 				gf_term_disconnect(term);
@@ -1546,14 +1645,14 @@
 				gf_sleep(rti_update_time_ms);
 			}
 			if (auto_exit && eos_seen && gf_term_get_option(term, GF_OPT_IS_OVER)) {
-				Run = 0;
+				Run = GF_FALSE;
 			}
 
 			/*sim time*/
 			if (simulation_time_in_ms
 			 && ( (gf_term_get_time_in_ms(term)>simulation_time_in_ms) || (!url_arg && gf_sys_clock()>simulation_time_in_ms))
 			 ) {
-				Run = 0;
+				Run = GF_FALSE;
 			}
 			continue;
 		}
@@ -1562,14 +1661,14 @@
 force_input:
 		switch (c) {
 		case 'q':
-			{
-				GF_Event evt;
-				memset(&evt, 0, sizeof(GF_Event));
-				evt.type = GF_EVENT_QUIT;
-				gf_term_send_event(term, &evt);
-			}
+		{
+			GF_Event evt;
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_QUIT;
+			gf_term_send_event(term, &evt);
+		}
 //			Run = 0;
-			break;
+		break;
 		case 'X':
 			exit(0);
 			break;
@@ -1593,11 +1692,11 @@
 				fprintf(stderr, "Cannot read the absolute URL, aborting.\n");
 				break;
 			}
-			playlist = gf_f64_open(the_url, "rt");
+			playlist = gf_fopen(the_url, "rt");
 			if (playlist) {
 				if (1 >	fscanf(playlist, "%s", the_url)) {
 					fprintf(stderr, "Cannot read any URL from playlist, aborting.\n");
-					fclose( playlist);
+					gf_fclose( playlist);
 					break;
 				}
 				fprintf(stderr, "Opening URL %s\n", the_url);
@@ -1618,6 +1717,8 @@
 				if (res == EOF) {
 					fprintf(stderr, "No more items - exiting\n");
 					Run = 0;
+				} else if (the_url[0] == '#') {
+					request_next_playlist_item = GF_TRUE;
 				} else {
 					fprintf(stderr, "Opening URL %s\n", the_url);
 					gf_term_connect_with_path(term, the_url, pl_path);
@@ -1734,11 +1835,15 @@
 		case 'i':
 			if (is_connected) {
 				u32 ID;
-				do {
-					fprintf(stderr, "Enter OD ID (0 for main OD): ");
-					fflush(stderr);
-				} while( 1 > scanf("%ud", &ID));
-				ViewOD(term, ID, (u32)-1);
+				fprintf(stderr, "Enter OD ID (0 for main OD): ");
+				fflush(stderr);
+				if (scanf("%ud", &ID) == 1) {
+					ViewOD(term, ID, (u32)-1, NULL);
+				} else {
+					char str_url[GF_MAX_PATH];
+					if (scanf("%s", str_url) == 1)
+						ViewOD(term, 0, (u32)-1, str_url);
+				}
 			}
 			break;
 		case 'j':
@@ -1748,7 +1853,7 @@
 					fprintf(stderr, "Enter OD number (0 for main OD): ");
 					fflush(stderr);
 				} while( 1 > scanf("%ud", &num));
-				ViewOD(term, (u32)-1, num);
+				ViewOD(term, (u32)-1, num, NULL);
 			}
 			break;
 		case 'b':
@@ -2027,13 +2132,13 @@
 						fprintf(stderr, "Error encoding PNG %s\n", gf_error_to_string(e) );
 						nb_pass = 0;
 					} else {
-						FILE *png = gf_f64_open(szFileName, "wb");
+						FILE *png = gf_fopen(szFileName, "wb");
 						if (!png) {
 							fprintf(stderr, "Error writing file %s\n", szFileName);
 							nb_pass = 0;
 						} else {
 							gf_fwrite(dst, dst_size, 1, png);
-							fclose(png);
+							gf_fclose(png);
 							fprintf(stderr, "Dump to %s\n", szFileName);
 						}
 					}
@@ -2096,7 +2201,7 @@
 	if (rti_file) UpdateRTInfo("Disconnected\n");
 
 	fprintf(stderr, "Deleting terminal... ");
-	if (playlist) fclose(playlist);
+	if (playlist) gf_fclose(playlist);
 
 #if defined(__DARWIN__) || defined(__APPLE__)
 	carbon_uninit();
@@ -2108,23 +2213,23 @@
 	fprintf(stderr, "GPAC cleanup ...\n");
 	gf_modules_del(user.modules);
 
-	if (no_cfg_safe)
+	if (no_cfg_save)
 		gf_cfg_discard_changes(cfg_file);
 
 	gf_cfg_del(cfg_file);
 
 	gf_sys_close();
 
-	if (rti_logs) fclose(rti_logs);
-	if (logfile) fclose(logfile);
+	if (rti_logs) gf_fclose(rti_logs);
+	if (logfile) gf_fclose(logfile);
 
 	if (gui_mode) {
 		hide_shell(2);
 	}
 
 #ifdef GPAC_MEMORY_TRACKING
-	if (enable_mem_tracker && (gf_memory_size() != 0)) {
- gf_memory_print();
+	if (enable_mem_tracker && (gf_memory_size() || gf_file_handles_count() )) {
+		gf_memory_print();
 		return 2;
 	}
 #endif
@@ -2132,6 +2237,39 @@
 	return 0;
 }
 
+#ifdef WIN32
+int wmain(int argc, wchar_t** wargv)
+{
+	int i;
+	int res;
+	size_t len;
+	size_t res_len;
+	char **argv;
+	argv = (char **)malloc(argc*sizeof(wchar_t *));
+	for (i = 0; i < argc; i++) {
+		wchar_t *src_str = wargv[i];
+		len = UTF8_MAX_BYTES_PER_CHAR * gf_utf8_wcslen(wargv[i]);
+		argv[i] = (char *)malloc(len + 1);
+		res_len = gf_utf8_wcstombs(argv[i], len, &src_str);
+		argv[i][res_len] = 0;
+		if (res_len > len) {
+			fprintf(stderr, "Length allocated for conversion of wide char to UTF-8 not sufficient\n");
+			return -1;
+		}
+	}
+	res = mp4client_main(argc, argv);
+	for (i = 0; i < argc; i++) {
+		free(argv[i]);
+	}
+	free(argv);
+	return res;
+}
+#else
+int main(int argc, char** argv)
+{
+	return mp4client_main(argc, argv);
+}
+#endif //win32
 static GF_ObjectManager *video_odm = NULL;
 static GF_ObjectManager *audio_odm = NULL;
 static GF_ObjectManager *scene_odm = NULL;
@@ -2223,8 +2361,8 @@
 				if (!dec_run_time) dec_run_time = 1;
 				if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
 				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
-				if (v_odi.nb_droped) {
-					fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_droped);
+				if (v_odi.nb_dropped) {
+					fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
 				}
 				fprintf(stderr, "\n");
 			}
@@ -2236,8 +2374,8 @@
 				if (!dec_run_time) dec_run_time = 1;
 				if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
 				fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
-				if (a_odi.nb_droped) {
-					fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_droped);
+				if (a_odi.nb_dropped) {
+					fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
 				}
 				fprintf(stderr, "\n");
 			}
@@ -2391,7 +2529,7 @@
 	}
 }
 
-void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number)
+void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *szURL)
 {
 	GF_MediaInfo odi;
 	u32 i, j, count, d_enum,id;
@@ -2401,8 +2539,7 @@
 	if (!root_odm) return;
 
 	odm = NULL;
-	if ((!OD_ID && (number == (u32)(-1))) ||
-	 ((OD_ID == (u32)(-1)) && !number)) {
+	if (!szURL && ((!OD_ID && (number == (u32)-1)) || ((OD_ID == (u32)(-1)) && !number))) {
 		odm = root_odm;
 		if ((gf_term_get_object_info(term, odm, &odi) != GF_OK)) odm=NULL;
 	} else {
@@ -2411,6 +2548,7 @@
 			odm = gf_term_get_object(term, root_odm, i);
 			if (!odm) break;
 			if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
+				if (szURL && strstr(odi.service_url, szURL)) break;
 				if ((number == (u32)(-1)) && (odi.od->objectDescriptorID == OD_ID)) break;
 				else if (i == (u32)(number-1)) break;
 			}
@@ -2418,6 +2556,7 @@
 		}
 	}
 	if (!odm) {
+		if (szURL) fprintf(stderr, "cannot find OD for URL %s\n", szURL);
 		if (number == (u32)-1) fprintf(stderr, "cannot find OD with ID %d\n", OD_ID);
 		else fprintf(stderr, "cannot find OD with number %d\n", number);
 		return;
@@ -2765,7 +2904,7 @@
 			ind--;
 		}
 
-		fprintf(stderr, " %d decoded frames - %d dropped frames\n", odi.nb_dec_frames, odi.nb_droped);
+		fprintf(stderr, " %d decoded frames - %d dropped frames\n", odi.nb_dec_frames, odi.nb_dropped);
 
 		ind = indent;
 		while (ind) {

v0.5.2.tar.gz/applications/mp4client/mp4client.rc -> v0.6.1.tar.gz/applications/mp4client/mp4client.rc Changed

@@ -1,72 +1,72 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Français (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON3               ICON                    "..\\..\\doc\\osmo4.ico"
-#endif    // Français (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Français (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON3               ICON                    "..\\..\\doc\\osmo4.ico"
+#endif    // Français (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

v0.5.2.tar.gz/applications/osmo4_android/AndroidManifest.xml -> v0.6.1.tar.gz/applications/osmo4_android/AndroidManifest.xml Changed

v0.5.2.tar.gz/applications/osmo4_android/jni/wrapper.cpp -> v0.6.1.tar.gz/applications/osmo4_android/jni/wrapper.cpp Changed

@@ -122,7 +122,7 @@
 	/* name, signature, funcPtr */
 
 	{	"createInstance",
-		"(Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J",
+		"(Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J",
 		(void*)&Java_com_gpac_Osmo4_GPACInstance_createInstance
 	},
 	{	"gpacdisconnect",
@@ -292,6 +292,8 @@
 	    env->GetMethodID(localRef, "setCaption", "(Ljava/lang/String;)V");
 	envToSet->cbk_showKeyboard =
 	    env->GetMethodID(localRef, "showKeyboard", "(Z)V");
+	envToSet->cbk_setLogFile =
+	    env->GetMethodID(localRef, "setLogFile", "(Ljava/lang/String;)V");
 	env->DeleteLocalRef(localRef);
 }
 
@@ -492,6 +494,21 @@
 		case GF_LOG_MUTEX:
 			tag="GF_LOG_MUTEX";
 			break;
+		case GF_LOG_CONDITION:
+			tag="GF_LOG_CONDITION";
+			break;
+		case GF_LOG_DASH:
+			tag="GF_LOG_DASH";
+			break;
+		case GF_LOG_CONSOLE:
+			tag="GF_LOG_CONSOLE";
+			break;
+		case GF_LOG_APP:
+			tag="GF_LOG_APP";
+			break;
+		case GF_LOG_SCHEDULER:
+			tag="GF_LOG_SCHEDULER";
+			break;
 		default:
 			snprintf(unknTag, 32, "GPAC_UNKNOWN[%d]", lm);
 			tag = unknTag;
@@ -633,6 +650,16 @@
 	gf_mx_p(m_mx);
 	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
 	gf_log_set_callback(this, on_gpac_log);
+	opt = gf_cfg_get_key(m_user.config, "General", "LogFile");
+	if (opt) {
+		JavaEnvTh *env = getEnv();
+		if (env && env->cbk_setLogFile) {
+			env->env->PushLocalFrame(1);
+			jstring js = env->env->NewStringUTF(opt);
+			env->env->CallVoidMethod(env->cbk_obj, env->cbk_setLogFile, js);
+			env->env->PopLocalFrame(NULL);
+		}
+	}
 	gf_mx_v(m_mx);
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Osmo4 logs initialized\n"));
@@ -644,16 +671,20 @@
 }
 //-------------------------------
 // dir should end with /
-int CNativeWrapper::init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * urlToLoad) {
+int CNativeWrapper::init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * gui_dir, const char * urlToLoad) {
 	LOGI("Initializing GPAC with URL=%s...", urlToLoad);
-	strcpy(m_cfg_dir, cfg_dir);
 	strcpy(m_modules_dir, modules_dir);
 	strcpy(m_cache_dir, cache_dir);
 	strcpy(m_font_dir, font_dir);
+	if (cfg_dir)
+		strcpy(m_cfg_dir, cfg_dir);
 
 	char m_cfg_filename[GF_MAX_PATH];
-	strcpy(m_cfg_filename, m_cfg_dir);
-	strcat(m_cfg_filename, "GPAC.cfg");
+	if (m_cfg_dir) {
+		LOGI("GPAC.cfg found in %s, force using it.\n", m_cfg_dir);
+		strcpy(m_cfg_filename, m_cfg_dir);
+		strcat(m_cfg_filename, "GPAC.cfg");
+	}
 
 	int m_Width = width;
 	int m_Height = height;
@@ -675,45 +706,10 @@
 
 	//load config file
 	LOGI("Loading User Config %s...", "GPAC.cfg");
-	m_user.config = gf_cfg_force_new(cfg_dir, "GPAC.cfg");
+	m_user.config = gf_cfg_init(m_cfg_dir ? m_cfg_filename : NULL, NULL);
 	gf_set_progress_callback(this, Osmo4_progress_cbk);
 
 	opt = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-	if (!opt) {
-		FILE * fstart;
-		char msg[256];
-		LOGI("First launch, initializing new Config %s...", "GPAC.cfg");
-		/*hardcode module directory*/
-		gf_cfg_set_key(m_user.config, "Downloader", "CleanCache", "yes");
-		/*startup file*/
-		snprintf(msg, 256, "%sgui/gui.bt", cfg_dir);
-		fstart = fopen(msg, "r");
-		if (fstart) {
-			fclose(fstart);
-			gf_cfg_set_key(m_user.config, "General", "StartupFile", msg);
-		} else {
-			gf_cfg_set_key(m_user.config, "General", "#StartupFile", msg);
-		}
-		gf_cfg_set_key(m_user.config, "GUI", "UnhideControlPlayer", "1");
-		/*setup UDP traffic autodetect*/
-		gf_cfg_set_key(m_user.config, "Network", "AutoReconfigUDP", "yes");
-		gf_cfg_set_key(m_user.config, "Network", "UDPTimeout", "10000");
-		gf_cfg_set_key(m_user.config, "Network", "BufferLength", "3000");
-		gf_cfg_set_key(m_user.config, "Compositor", "TextureTextMode", "Default");
-		//gf_cfg_set_key(m_user.config, "Compositor", "FrameRate", "30");
-		gf_cfg_set_key(m_user.config, "Audio", "ForceConfig", "no");
-		gf_cfg_set_key(m_user.config, "Audio", "NumBuffers", "1");
-		gf_cfg_set_key(m_user.config, "FontEngine", "FontReader", "ft_font");
-	}
-	/* All of this has to be done for every instance */
-	gf_cfg_set_key(m_user.config, "General", "ModulesDirectory", modules_dir ? modules_dir : GPAC_MODULES_DIR);
-	gf_cfg_set_key(m_user.config, "General", "CacheDirectory", cache_dir ? cache_dir : GPAC_CACHE_DIR);
-	gf_cfg_set_key(m_user.config, "General", "LastWorkingDir", cfg_dir);
-	gf_cfg_set_key(m_user.config, "FontEngine", "FontDirectory", GPAC_FONT_DIR);
-	gf_cfg_set_key(m_user.config, "Video", "DriverName", "Android Video Output");
-	gf_cfg_set_key(m_user.config, "Audio", "DriverName", "Android Audio Output");
-
-	opt = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
 	LOGI("loading modules in directory %s...", opt);
 	m_user.modules = gf_modules_new(opt, m_user.config);
 	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
@@ -752,6 +748,9 @@
 		return Quit(KErrGeneral);
 	}
 
+	/*force fullscreen*/
+	gf_term_set_option(m_term, GF_OPT_FULLSCREEN, 1);
+
 	//setAudioEnvironment(javaVM);
 
 	LOGD("Setting term size m_user=%p...", &m_user);
@@ -767,9 +766,9 @@
 		gf_term_connect(m_term, urlToLoad);
 	}
 	debug_log("init end");
-	LOGD("Saving config file %s...\n", m_cfg_filename);
+	LOGD("Saving config file ...\n", m_cfg_filename);
 	gf_cfg_save(m_user.config);
-	LOGI("Initialization complete, config file saved as %s.\n", m_cfg_filename);
+	LOGI("Initialization complete, config file saved.\n", m_cfg_filename);
 
 	return 0;
 }

v0.5.2.tar.gz/applications/osmo4_android/jni/wrapper.h -> v0.6.1.tar.gz/applications/osmo4_android/jni/wrapper.h Changed

v0.5.2.tar.gz/applications/osmo4_android/jni/wrapper_jni.c -> v0.6.1.tar.gz/applications/osmo4_android/jni/wrapper_jni.c Changed

@@ -26,20 +26,23 @@
 /*
  * Class:     com_gpac_Osmo4_GPACInstance
  * Method:    createInstance
- * Signature: (Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+ * Signature: (Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
-JNIEXPORT jlong JNICALL Java_com_gpac_Osmo4_GPACInstance_createInstance(JNIEnv * env, jclass obj, jobject callback, jint width, jint height, jstring cfg_dir, jstring modules_dir, jstring cache_dir, jstring font_dir, jstring url_to_open)
+JNIEXPORT jlong JNICALL Java_com_gpac_Osmo4_GPACInstance_createInstance(JNIEnv * env, jclass obj, jobject callback, jint width, jint height, jstring cfg_dir, jstring modules_dir, jstring cache_dir, jstring font_dir, jstring gui_dir, jstring url_to_open)
 {
 	jboolean isCopy;
-	const char * s1 = env->GetStringUTFChars(cfg_dir, &isCopy);
+	const char * s1 = NULL;
+	if (cfg_dir)
+		s1 = env->GetStringUTFChars(cfg_dir, &isCopy);
 	const char * s2 = env->GetStringUTFChars(modules_dir, &isCopy);
 	const char * s3 = env->GetStringUTFChars(cache_dir, &isCopy);
 	const char * s4 = env->GetStringUTFChars(font_dir, &isCopy);
-	const char * s5 = NULL;
+	const char * s5 = env->GetStringUTFChars(gui_dir, &isCopy);
+	const char * s6 = NULL;
 	if (url_to_open)
-		s5 = env->GetStringUTFChars(url_to_open, &isCopy);
+		s6 = env->GetStringUTFChars(url_to_open, &isCopy);
 	else
-		s5 = NULL;
+		s6 = NULL;
 	CNativeWrapper * gpac_obj = new CNativeWrapper();
 	if (gpac_obj) {
 		int w = width;
@@ -47,7 +50,7 @@
 		jniLOGI("Calling gpac_obj->init()...");
 		if (gpac_obj->init(env, NULL, &callback,
 		                   w, h,
-		                   s1, s2, s3, s4, s5)) {
+		                   s1, s2, s3, s4, s5, s6)) {
 			jniLOGE("FAILED to init(), return code not 0");
 			delete gpac_obj;
 			gpac_obj = NULL;
@@ -56,12 +59,14 @@
 		jniLOGE("FAILED to create new CNativeWrapper() : not enough memory ?");
 	}
 
-	env->ReleaseStringUTFChars(cfg_dir, s1);
+	if (s1)
+		env->ReleaseStringUTFChars(cfg_dir, s1);
 	env->ReleaseStringUTFChars(modules_dir, s2);
 	env->ReleaseStringUTFChars(cache_dir, s3);
 	env->ReleaseStringUTFChars(font_dir, s4);
-	if (s5)
-		env->ReleaseStringUTFChars(font_dir, s5);
+	env->ReleaseStringUTFChars(gui_dir, s5);
+	if (s6)
+		env->ReleaseStringUTFChars(url_to_open, s6);
 	__android_log_print(ANDROID_LOG_VERBOSE, jniTAG, "Returned Handle = %p", gpac_obj);
 	return (jlong) gpac_obj;
 }

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java Changed

@@ -55,7 +55,7 @@
         if (errors != null)
             return errors;
         StringBuilder sb = new StringBuilder();
-        final String[] toLoad = { "GLESv1_CM", "dl", "log",//$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
+        final String[] toLoad = { "GLESv2", "dl", "log",//$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
                                  "jpegdroid", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$ 
                                  "mad", "editline", "ft2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                                  "js_osmo", "openjpeg", "png", "z", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
@@ -86,7 +86,7 @@
 
         if (!exceptions.isEmpty()) {
             try {
-                PrintStream out = new PrintStream(config.getGpacConfigDirectory() + "debug_libs.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
+                PrintStream out = new PrintStream(config.getGpacLogDirectory() + "debug_libs.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
                 out.println("$Revision$"); //$NON-NLS-1$
                 out.println(new Date());
                 out.println("\n*** Configuration\n"); //$NON-NLS-1$
@@ -160,6 +160,7 @@
                                     config.getGpacModulesDirectory(),
                                     config.getGpacCacheDirectory(),
                                     config.getGpacFontDirectory(),
+                                    config.getGpacGuiDirectory(),
                                     urlToOpen);
         } catch (Throwable e) {
             throw new GpacInstanceException("Error while creating instance\n" + sb.toString()); //$NON-NLS-1$
@@ -308,10 +309,11 @@
      * @param modules_dir
      * @param cache_dir
      * @param font_dir
+     * @param gui_dir
      * @return
      */
     private native long createInstance(GpacCallback callback, int width, int height, String cfg_dir,
-            String modules_dir, String cache_dir, String font_dir, String url_to_open);
+            String modules_dir, String cache_dir, String font_dir, String gui_dir, String url_to_open);
 
     /**
      * Disconnects the currently loaded URL

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/GpacCallback.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/GpacCallback.java Changed

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java Changed

@@ -18,6 +18,11 @@
  * @version $Revision$
  * 
  */
+ 
+/**
+ * NOTE FOR DEVELOPERS
+ * Whenever you add or change a path here, you MUST verify also the corresponding path in src/utils/os_config_init.c
+ */
 public class GpacConfig {
 
     private final static String LOG_GPAC_CONFIG = GpacConfig.class.getSimpleName();
@@ -28,19 +33,6 @@
      * @param context
      */
     public GpacConfig(Context context) {
-        File rootCfg = Environment.getExternalStorageDirectory();
-        File osmo = new File(rootCfg, "osmo"); //$NON-NLS-1$
-        gpacConfigDirectory = osmo.getAbsolutePath() + '/';
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacConfigDirectory + " for osmo"); //$NON-NLS-1$ //$NON-NLS-2$
-        // gpacCacheDirectory = Environment.getDownloadCacheDirectory().getAbsolutePath();
-        // if (Build.VERSION.SDK_INT > 7){
-        gpacCacheDirectory = context.getCacheDir().getAbsolutePath();
-        // } else {
-        // gpacCacheDirectory =
-        // }
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacCacheDirectory + " for cache"); //$NON-NLS-1$ //$NON-NLS-2$
-        //
-        //Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacModulesDirectory + " for modules"); //$NON-NLS-1$ //$NON-NLS-2$
         String dataDir;
         try {
             if (context == null || context.getPackageManager() == null) {
@@ -52,9 +44,31 @@
             Log.e(LOG_GPAC_CONFIG, "This is bad, we cannot find ourself : " + context.getPackageName(), e); //$NON-NLS-1$
             throw new RuntimeException("Cannot find package " + context.getPackageName(), e); //$NON-NLS-1$
         }
+        gpacAppDirectory = dataDir + '/';
+        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacAppDirectory + " for osmo"); //$NON-NLS-1$ //$NON-NLS-2$
+        gpacCacheDirectory = context.getCacheDir().getAbsolutePath();
+        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacCacheDirectory + " for cache"); //$NON-NLS-1$ //$NON-NLS-2$
+        //
+        //Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacModulesDirectory + " for modules"); //$NON-NLS-1$ //$NON-NLS-2$
         gpacLibsDirectory = dataDir + "/lib/"; //$NON-NLS-1$
         Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacLibsDirectory + " for libraries"); //$NON-NLS-1$ //$NON-NLS-2$
-
+        
+        gpacGuiDirectory = dataDir + "/gui/";
+        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacGuiDirectory + " for GUI"); //$NON-NLS-1$ //$NON-NLS-2$
+
+        gpacShaderDirectory = dataDir + "/shaders/";
+        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacShaderDirectory + " for shader files"); //$NON-NLS-1$ //$NON-NLS-2$
+        
+        File osmo = new File(Environment.getExternalStorageDirectory(), "osmo"); //$NON-NLS-1$
+        gpacLogDirectory = osmo.getAbsolutePath() + "/log/";
+        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacLogDirectory + " for log files"); //$NON-NLS-1$ //$NON-NLS-2$
+        
+        //check if GPAC.cfg exists in /sdcard/osmo
+        File gpac_cfg = new File(osmo.getAbsolutePath(), "GPAC.cfg");
+        if (gpac_cfg.exists())
+        	gpacConfigDirectory = osmo.getAbsolutePath() + "/";
+        else
+        	gpacConfigDirectory = null;
     }
 
     /**
@@ -63,13 +77,21 @@
      * @return The {@link GpacConfig} instance itself
      */
     public GpacConfig ensureAllDirectoriesExist() {
-        for (String s : new String[] { gpacConfigDirectory, gpacCacheDirectory }) {
+        for (String s : new String[] { gpacAppDirectory, gpacCacheDirectory, gpacShaderDirectory, gpacLogDirectory }) {
             createDirIfNotExist(s);
         }
         return this;
     }
+    
+    /**
+     * Default directory for GPAC configuration directory, ends with /
+     * 
+     * @return the gpacAppDirectory
+     */
+    public String getGpacAppDirectory() {
+        return gpacAppDirectory;
+    }
 
-    private final String gpacConfigDirectory;
 
     /**
      * Default directory for GPAC configuration directory, ends with /
@@ -114,6 +136,37 @@
     public String getGpacCacheDirectory() {
         return gpacCacheDirectory;
     }
+    
+    /**
+     * Default directory for GUI files
+     * 
+     * @return the gpacGuiDirectory
+     */
+    public String getGpacGuiDirectory() {
+        return gpacGuiDirectory;
+    }
+
+    /**
+     * Default directory for shader files
+     *
+     * @return the gpacShaderDirectory
+     */
+    public String getGpacShaderDirectory() {
+        return gpacShaderDirectory;
+    }
+    
+    /**
+     * Default directory for log files
+     *
+     * @return the gpacLogDirectory
+     */
+    public String getGpacLogDirectory() {
+        return gpacLogDirectory;
+    }
+    
+    private final String gpacAppDirectory;
+    
+    private final String gpacConfigDirectory;
 
     private final String gpacFontDirectory = "/system/fonts/"; //$NON-NLS-1$
 
@@ -122,6 +175,12 @@
     private final String gpacLibsDirectory;
 
     private final String gpacCacheDirectory;
+    
+    private final String gpacGuiDirectory;
+
+    private final String gpacShaderDirectory;
+    
+    private final String gpacLogDirectory;
 
     /**
      * Creates a given directory if it does not exist
@@ -166,10 +225,12 @@
      */
     public String getConfigAsText() {
         StringBuilder sb = new StringBuilder();
-        sb.append("GpacConfigDirectory=").append(getGpacConfigDirectory()).append('\n'); //$NON-NLS-1$
+        sb.append("GpacAppDirectory=").append(getGpacAppDirectory()).append('\n'); //$NON-NLS-1$
         sb.append("GpacModulesDirectory=").append(getGpacModulesDirectory()).append('\n'); //$NON-NLS-1$
         sb.append("GpacFontDirectory=").append(getGpacFontDirectory()).append('\n'); //$NON-NLS-1$
         sb.append("GpacCacheDirectory=").append(getGpacCacheDirectory()).append('\n'); //$NON-NLS-1$
+        sb.append("GpacGuiDirectory=").append(getGpacGuiDirectory()).append('\n'); //$NON-NLS-1$
+        sb.append("GpacShaderDirectory=").append(getGpacShaderDirectory()).append('\n'); //$NON-NLS-1$
         return sb.toString();
     }
 }

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java Changed

@@ -12,15 +12,20 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Set;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -60,6 +65,7 @@
 import android.widget.AutoCompleteTextView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
+import android.content.res.AssetManager;
 
 import com.gpac.Osmo4.Osmo4GLSurfaceView;
 import com.gpac.Osmo4.Preview;
@@ -146,7 +152,6 @@
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
 		WindowManager.LayoutParams.FLAG_FULLSCREEN);
- 
 try {
 			Class c = Class.forName("com.lge.real3d.Real3D");
 			final String LGE_3D_DISPLAY = "lge.hardware.real3d.barrier.landscape";
@@ -156,7 +161,6 @@
 catch (ClassNotFoundException e) {
 	m3DLibraryLoaded = false;
 }
-
 		MPEGVSensor.myAct = this;
 MPEGVSensor.initSensorManager((SensorManager) getSystemService(Context.SENSOR_SERVICE));
 		MPEGVSensor.initLocationManager((LocationManager)getSystemService(Context.LOCATION_SERVICE));
@@ -199,7 +203,6 @@
 // OK, it means activity has already been started
 return;
 }
-		
 		Preview.context = this;
 
 setContentView(R.layout.main);
@@ -247,7 +250,7 @@
 
 @Override
 public void run() {
- for (String s : new String[] { gpacConfig.getGpacConfigDirectory(), gpacConfig.getGpacCacheDirectory() }) {
+ for (String s : new String[] { gpacConfig.getGpacAppDirectory(), gpacConfig.getGpacCacheDirectory() }) {
 File noMedia = new File(s, ".nomedia"); //$NON-NLS-1$
 if (!noMedia.exists()) {
 try {
@@ -260,7 +263,141 @@
 }
 });
 
+ //copy GUI elements
+ File guiDir = new File(gpacConfig.getGpacGuiDirectory());
+ if (!guiDir.isDirectory()) {
+ 	// there was a file which have the same name with GUI dir, delete it
+ 	if (guiDir.exists()) {
+ 		if (!guiDir.delete())
+ 			Log.e(LOG_OSMO_TAG, "Failed to delete " + guiDir);
+ 	}
+ 	if (!guiDir.mkdir())
+ 		Log.e(LOG_OSMO_TAG, "Failed to create directory " + guiDir);
+ 	copyAssets(gpacConfig, GUI_ROOT_ASSET_DIR);
+ }
+
+ //copy Shaders
+ File shaderDir = new File(gpacConfig.getGpacShaderDirectory());
+ if (!shaderDir.isDirectory()) {
+ // we do not delete the directory if it already exists, because it might contain custom shaders
+ // TODOk consider behaviour when we want to update the shaders in the apk
+ if (shaderDir.exists()) {
+ Log.v(LOG_OSMO_TAG, "Shader directory already exists at: " + shaderDir);
+ }else if (!shaderDir.mkdir()){
+ Log.e(LOG_OSMO_TAG, "Failed to create directory " + shaderDir);
+ }
+ }
+ copyAssets(gpacConfig, SHADER_ROOT_ASSET_DIR);
 }
+ 
+ /*
+ * Copy GUI elements
+ *
+ * @param config
+ *
+ * Reference: http://stackoverflow.com/questions/4447477/android-how-to-copy-files-from-assets-folder-to-sdcard
+ */
+ private final static String GUI_ROOT_ASSET_DIR = "gui";
+ private final static String SHADER_ROOT_ASSET_DIR = "shaders";
+
+ private void copyAssets(GpacConfig config, String asset_dir) { 
+ 		StringBuilder sb = new StringBuilder();
+ 		HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
+				AssetManager assetManager = getAssets();
+				String[] list = null;
+				Log.d(LOG_OSMO_TAG, "Copy assets of " + asset_dir);
+				try {
+				 list = assetManager.list(asset_dir);
+				} catch (IOException e) {
+				 Log.e(LOG_OSMO_TAG, "Failed to get asset file list.", e);
+				 exceptions.put("Failed to get asset file list", e);
+				}
+				for(String path : list) {
+				 try {
+				 copyFileOrDir(config, asset_dir, path);
+				 } catch(IOException e) {
+				 Log.e(LOG_OSMO_TAG, "Failed to copy: " + path, e);
+				 exceptions.put("Failed to copy " + path, e);
+				 } 
+				}
+				
+				if (!exceptions.isEmpty()) {
+					try {
+ PrintStream out = new PrintStream(config.getGpacLogDirectory() + "debug_assets.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
+	 sb.append("*** Exceptions:\n"); //$NON-NLS-1$
+	 for (Map.Entry<String, Throwable> ex : exceptions.entrySet()) {
+	 sb.append(ex.getKey()).append(": ") //$NON-NLS-1$
+	 .append(ex.getValue().getLocalizedMessage())
+	 .append('(')
+	 .append(ex.getValue().getClass())
+	 .append(")\n"); //$NON-NLS-1$
+	 }
+ out.println(sb.toString());
+ out.flush();
+ out.close();
+ } catch (Exception e) {
+ Log.e(LOG_OSMO_TAG, "Failed to output debug info to debug file", e); //$NON-NLS-1$
+ }
+				}
+		}
+
+		private void copyFileOrDir(GpacConfig config, String root, String path) throws IOException {
+				AssetManager assetManager = getAssets();
+				String assets[] = null;
+				assets = assetManager.list(root + "/" + path);
+				if (assets.length == 0) {
+				 copyFile(config, root, path);
+		 } else {
+ String fullPath = null;
+ if(root == GUI_ROOT_ASSET_DIR){
+ fullPath = config.getGpacGuiDirectory() + path;
+ }else if(root == SHADER_ROOT_ASSET_DIR){
+ fullPath = config.getGpacShaderDirectory() + path;
+ }else{ //Fallback (useless for now)
+ fullPath = path;
+ }
+		 File dir = new File(fullPath);
+		 if (!dir.exists())
+		 dir.mkdir();
+		 for (int i = 0; i < assets.length; ++i) {
+		 copyFileOrDir(config, root, path + "/" + assets[i]);
+		 }
+		 }
+		}
+
+		private void copyFile(GpacConfig config, String root, String filename) throws IOException {
+		// if this file exists, do nothing
+
+ if(root == GUI_ROOT_ASSET_DIR){
+				if ((new File(config.getGpacGuiDirectory() + filename).exists()))
+					return;
+ }
+				AssetManager assetManager = getAssets();
+				InputStream in = null;
+				OutputStream out = null;
+			 in = assetManager.open(root + "/" + filename);
+
+ String newFileName = null;
+ if(root == GUI_ROOT_ASSET_DIR){
+			 newFileName = config.getGpacGuiDirectory() + filename;
+ }else if(root == SHADER_ROOT_ASSET_DIR){
+ newFileName = config.getGpacShaderDirectory() + filename;
+ }else{ //Fallback
+ newFileName = filename;
+ }
+			 out = new FileOutputStream(newFileName);
+
+			 byte[] buffer = new byte[1024];
+			 int read;
+			 while ((read = in.read(buffer)) != -1) {
+			 out.write(buffer, 0, read);
+			 }
+			 in.close();
+			 in = null;
+			 out.flush();
+			 out.close();
+			 out = null;
+		}
 
 // ---------------------------------------
 
@@ -272,7 +409,7 @@
 }
 
 private String getRecentURLsFile() {
- return gpacConfig.getGpacConfigDirectory() + "recentURLs.txt"; //$NON-NLS-1$
+ return gpacConfig.getGpacAppDirectory() + "recentURLs.txt"; //$NON-NLS-1$
 }
 
 private boolean openURL() {
@@ -301,7 +438,6 @@
 AlertDialog.Builder builder = new AlertDialog.Builder(this);
 final AutoCompleteTextView textView = new AutoCompleteTextView(this);
 textView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
-
 builder.setMessage(R.string.pleaseEnterAnURLtoConnectTo)
 .setCancelable(true)
 .setPositiveButton(R.string.open_url, new DialogInterface.OnClickListener() {
@@ -396,7 +532,7 @@
 */
 private boolean openFileDialog() {
 String title = getResources().getString(R.string.pleaseSelectAFile);
- Uri uriDefaultDir = Uri.fromFile(new File(gpacConfig.getGpacConfigDirectory()));
+ Uri uriDefaultDir = Uri.fromFile(new File(gpacConfig.getGpacAppDirectory()));
 Intent intent = new Intent();
 intent.setAction(Intent.ACTION_PICK);
 // Files and directories
@@ -525,7 +661,7 @@
 mGLView.setGpacLogs("all@error"); //$NON-NLS-1$
 } else {
 item.setChecked(true);
- mGLView.setGpacLogs("all@debug"); //$NON-NLS-1$
+ mGLView.setGpacLogs("sync:codec:dash:media@debug:container@warning"); //$NON-NLS-1$
 }
 return true;
 case R.id.setAsStartupFile: {
@@ -1092,4 +1228,10 @@
 }
 });
 }
+ 
+ public void setLogFile(String logfile) {
+	 logger.setEnableLogOnDisk(true);
+	 logger.setLogFile(logfile);
+ 	logger.onCreate();
+ }
 }

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4GLSurfaceView.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4GLSurfaceView.java Changed

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4Renderer.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4Renderer.java Changed

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Preview.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/Preview.java Changed

@@ -54,6 +54,8 @@
     private int width = 0;
 
     private int height = 0;
+    
+    private int bitsPerPixel = 0;
 	
 	public static Activity context = null;
 	
@@ -243,6 +245,7 @@
         // Define buffer size
         PixelFormat pixelinfo = new PixelFormat();
         PixelFormat.getPixelFormatInfo(mPreviewFormat, pixelinfo);
+        bitsPerPixel = pixelinfo.bitsPerPixel;
         mBufferSize = mPreviewSize.width * mPreviewSize.height * pixelinfo.bitsPerPixel / 8;
         Log.d(TAG, "Pixelsize = " + pixelinfo.bitsPerPixel + " Buffersize = " + mBufferSize); //$NON-NLS-1$//$NON-NLS-2$
         nBuffers = 1;
@@ -304,6 +307,15 @@
             return -1;
         return sz.width;
     }
+    
+    /**
+     * Get the bits per pixel
+     * 
+     * @return 0 if not initialized
+     */
+    public int getBitsPerPixel() {
+        return bitsPerPixel;
+    }
 
     /**
      * Stop preview and release the camera. Because the CameraDevice object is not a shared resource, it is very
@@ -367,11 +379,7 @@
             throw new IllegalArgumentException("parameters must not be null"); //$NON-NLS-1$
         // Get preview size
         mPreviewSize = parameters.getPreviewSize();
-		mPreviewSize = getOptimalPreviewSize(parameters.getSupportedPreviewSizes(), 800, 480);
-		
-		parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
-		
-		mPreviewSize = parameters.getPreviewSize();
+				parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
         Log.d(TAG, "PreviewSize: " + mPreviewSize.width + 'x' + mPreviewSize.height); //$NON-NLS-1$
 
         // Get preview format
@@ -385,8 +393,9 @@
             parameters.setPreviewFormat(mPreviewFormat);
         }
 
-        parameters.setPreviewFrameRate(15);
-        parameters.setFocusMode(Parameters.FOCUS_MODE_AUTO);
+				Log.d(TAG, "PreviewFrameRate: " + parameters.getPreviewFrameRate()); //$NON-NLS-1$
+        parameters.setPreviewFrameRate(parameters.getPreviewFrameRate());
+        parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO );
 
         return parameters;
     }

v0.5.2.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/logs/GpacLogger.java -> v0.6.1.tar.gz/applications/osmo4_android/src/com/gpac/Osmo4/logs/GpacLogger.java Changed

@@ -36,7 +36,7 @@
         loggedModules.add(GF_Log_Module.GF_LOG_MEDIA);
         loggedModules.add(GF_Log_Module.GF_LOG_MODULE);
         loggedModules.add(GF_Log_Module.GF_LOG_CORE);
-        logger = new File(gpacConfig.getGpacCacheDirectory(), "gpac.log"); //$NON-NLS-1$
+        logDir = gpacConfig.getGpacLogDirectory(); //$NON-NLS-1$
     }
 
     private boolean enableLogOnDisk = false;
@@ -54,8 +54,15 @@
     public synchronized void setEnableLogOnDisk(boolean enableLogOnDisk) {
         this.enableLogOnDisk = enableLogOnDisk;
     }
-
-    private final File logger;
+    
+    private String logDir;
+    private String logFile;
+    
+    public synchronized void setLogFile(String logFile) {
+    	//reset writer
+	    writer = null;
+    	this.logFile = logDir + logFile;
+    }
 
     /**
      * Called when creating logger
@@ -65,7 +72,7 @@
             return;
         if (writer == null) {
             try {
-                writer = new PrintStream(new BufferedOutputStream(new FileOutputStream(logger), 128), true, "UTF-8"); //$NON-NLS-1$
+                writer = new PrintStream(new BufferedOutputStream(new FileOutputStream(new File(logFile)), 128), true, "UTF-8"); //$NON-NLS-1$
             } catch (Exception e) {
                 Log.e(GpacLogger.class.getSimpleName(), "Failed to create writer", e); //$NON-NLS-1$
             }

v0.5.2.tar.gz/applications/osmo4_ios/extract.c -> v0.6.1.tar.gz/applications/osmo4_ios/extract.c Changed

@@ -177,7 +177,7 @@
 	if (fb->pixel_format==GF_PIXEL_GREYSCALE) sprintf(str, "%s_%d_depth.bmp", rad_name, img_num);
 	else sprintf(str, "%s_%d.bmp", rad_name, img_num);
 
-	fout = gf_f64_open(str, "wb");
+	fout = gf_fopen(str, "wb");
 	if (!fout) return;
 
 	memset(&fh, 0, sizeof(fh));
@@ -223,7 +223,7 @@
 	}
 #endif
 
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 /*writes onto a file the content of the framebuffer in *fb interpreted as the byte depthbuffer */
@@ -237,7 +237,7 @@
 
 	depth = (unsigned char *) fb->video_buffer;
 
-	fout = gf_f64_open("dump_depth", "wb");
+	fout = gf_fopen("dump_depth", "wb");
 	if (!fout) return;
 	for (j=0; j<fb->height; j++) {
 		for (i=0; i<fb->width; i++) {
@@ -250,7 +250,7 @@
 #endif
 		}
 	}
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 void write_texture_file(GF_VideoSurface *fb, char *rad_name, u32 img_num, u32 dump_mode)
@@ -263,8 +263,8 @@
 
 	buf = (unsigned char *) fb->video_buffer;
 
-	if (dump_mode==6) fout = gf_f64_open("dump_rgbds", "wb");
-	else if (dump_mode==9) fout = gf_f64_open("dump_rgbd", "wb");
+	if (dump_mode==6) fout = gf_fopen("dump_rgbds", "wb");
+	else if (dump_mode==9) fout = gf_fopen("dump_rgbd", "wb");
 	else return;
 
 	if (!fout) return;
@@ -273,7 +273,7 @@
 			val = fputc(buf[i+j*fb->pitch_y], fout);
 		}
 	}
-	fclose(fout);
+	gf_fclose(fout);
 }
 
 
@@ -293,7 +293,7 @@
 		sprintf(str, "%s_%d.raw", rad_name, img_num);
 	}
 
-	fout = gf_f64_open(str, "wb");
+	fout = gf_fopen(str, "wb");
 	if (!fout) return;
 
 
@@ -305,7 +305,7 @@
 			ptr += res;
 		}
 	}
-	fclose(fout);
+	gf_fclose(fout);
 }

v0.5.2.tar.gz/applications/osmo4_ios/main.c -> v0.6.1.tar.gz/applications/osmo4_ios/main.c Changed

@@ -29,6 +29,7 @@
 #include <gpac/constants.h>
 #include <gpac/options.h>
 #include <gpac/modules/service.h>
+#include <gpac/internal/terminal_dev.h>
 
 #include <pwd.h>
 #include <unistd.h>
@@ -154,6 +155,10 @@
 }
 #endif
 
+
+static s32 request_next_playlist_item = GF_FALSE;
+FILE *playlist = NULL;
+
 Bool GPAC_EventProc(void *ptr, GF_Event *evt)
 {
 	if (!term) return 0;
@@ -216,6 +221,11 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Navigation destination not supported\nGo to URL: %s\n", evt->navigate.to_url ));
 		}
 		break;
+	case GF_EVENT_DBLCLICK:
+		if (playlist) {
+			request_next_playlist_item=GF_TRUE;
+		}
+		break;
 	}
 	return 0;
 }
@@ -238,8 +248,8 @@
 
 static void init_rti_logs(char *rti_file, char *url, Bool use_rtix)
 {
-	if (rti_logs) fclose(rti_logs);
-	rti_logs = gf_f64_open(rti_file, "wt");
+	if (rti_logs) gf_fclose(rti_logs);
+	rti_logs = gf_fopen(rti_file, "wt");
 	if (rti_logs) {
 		fprintf(rti_logs, "!! GPAC RunTime Info ");
 		if (url) fprintf(rti_logs, "for file %s", url);
@@ -259,6 +269,11 @@
 	}
 }
 
+static void on_progress_null(const void *_ptr, const char *_title, u64 done, u64 total)
+{
+
+}
+
 #ifdef GPAC_IPHONE
 int SDL_main (int argc, char *argv[])
 #else
@@ -266,13 +281,16 @@
 #endif
 {
 	const char *str;
+	char *ext;
 	u32 i;
 	u32 simulation_time = 0;
 	Bool auto_exit = 0;
 	Bool use_rtix = 0;
-	Bool enable_mem_tracker = 0;
+	Bool enable_mem_tracker = GF_FALSE;
 	Bool ret, fill_ar, visible;
+	Bool logs_set = GF_FALSE;
 	char *url_arg, *the_cfg, *rti_file;
+	const char *logs_settings = NULL;
 	GF_SystemRTInfo rti;
 	FILE *logfile = NULL;
 
@@ -284,23 +302,54 @@
 	fill_ar = visible = 0;
 	url_arg = the_cfg = rti_file = NULL;
 
+	for (i=1; i<argc; i++) {
+		char *arg = argv[i];
+		if (arg[0] != '-') {
+			url_arg = arg;
+		}
+		else if (!strcmp(arg, "-logs")) {
+			logs_settings = argv[i+1];
+			i++;
+		}
+		else if (!strcmp(arg, "-lf")) {
+			logfile = gf_fopen(argv[i+1], "wt");
+			gf_log_set_callback(logfile, on_gpac_log);
+			i++;
+		}
+		else if (!strcmp(arg, "-mem-track")) {
+#ifdef GPAC_MEMORY_TRACKING
+			enable_mem_tracker = GF_TRUE;
+#else
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n");
+#endif
+		}
+	}
+
 	gf_sys_init(enable_mem_tracker);
+	gf_set_progress_callback(NULL, on_progress_null);
+
+	if (logs_settings) {
+		if (gf_log_set_tools_levels(logs_settings) != GF_OK) {
+			return 1;
+		}
+		logs_set = GF_TRUE;
+	}
 
 	cfg_file = gf_cfg_init(the_cfg, NULL);
 	if (!cfg_file) {
 		fprintf(stderr, "Error: Configuration File \"GPAC.cfg\" not found\n");
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		return 1;
 	}
+	if (!logs_set)
+		gf_log_set_tools_levels( gf_cfg_get_key(cfg_file, "General", "Logs") );
 
-	gf_log_set_tools_levels( gf_cfg_get_key(cfg_file, "General", "Logs") );
-
-
+	gf_cfg_set_key(cfg_file, "Compositor", "OpenGLMode", "disable");
 
 	if (!logfile) {
 		const char *opt = gf_cfg_get_key(cfg_file, "General", "LogFile");
 		if (opt) {
-			logfile = gf_f64_open(opt, "wt");
+			logfile = gf_fopen(opt, "wt");
 			if (logfile)
 				gf_log_set_callback(logfile, on_gpac_log);
 		}
@@ -313,7 +362,6 @@
 	init_w = forced_width;
 	init_h = forced_height;
 
-
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading modules\n" ));
 	str = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
 
@@ -324,7 +372,7 @@
 		if (user.modules) gf_modules_del(user.modules);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		return 1;
 	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Modules Loaded (%d found in %s)\n", i, str));
@@ -336,8 +384,8 @@
 	if (not_threaded) user.init_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
 	if (no_audio) user.init_flags |= GF_TERM_NO_AUDIO;
 	if (no_regulation) user.init_flags |= GF_TERM_NO_REGULATION;
- user.init_flags |= GF_TERM_NO_DECODER_THREAD;
- 
+	user.init_flags |= GF_TERM_NO_DECODER_THREAD;
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading GPAC Terminal\n"));
 	term = gf_term_new(&user);
 	if (!term) {
@@ -345,7 +393,7 @@
 		gf_modules_del(user.modules);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
-		if (logfile) fclose(logfile);
+		if (logfile) gf_fclose(logfile);
 		return 1;
 	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Terminal Loaded\n"));
@@ -383,15 +431,46 @@
 	Run = 1;
 	ret = 1;
 
-	str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
-	if (str) {
-		strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
-		gf_term_connect(term, str);
-		startup_file = 1;
+
+	ext = url_arg ? strrchr(url_arg, '.') : NULL;
+	if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
+		char pl_path[GF_MAX_PATH];
+		GF_Err e = GF_OK;
+		fprintf(stderr, "Opening Playlist %s\n", url_arg);
+
+		strcpy(pl_path, url_arg);
+		/*this is not clean, we need to have a plugin handle playlist for ourselves*/
+		if (!strncmp("http:", url_arg, 5)) {
+			GF_DownloadSession *sess = gf_dm_sess_new(term->downloader, url_arg, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
+			if (sess) {
+				e = gf_dm_sess_process(sess);
+				if (!e) strcpy(pl_path, gf_dm_sess_get_cache_name(sess));
+				gf_dm_sess_del(sess);
+			}
+		}
+
+		playlist = e ? NULL : gf_fopen(pl_path, "rt");
+		if (playlist) {
+			request_next_playlist_item = GF_TRUE;
+		} else {
+			if (e)
+				fprintf(stderr, "Failed to open playlist %s: %s\n", url_arg, gf_error_to_string(e) );
+
+			fprintf(stderr, "Hit 'h' for help\n\n");
+		}
+	} else if (url_arg) {
+		gf_term_connect(term, url_arg);
+	} else {
+		str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
+		if (str) {
+			strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
+			gf_term_connect(term, str);
+			startup_file = 1;
+		}
 	}
 
 	/*force fullscreen*/
-	//gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
+	gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
 
 	while (Run) {
 		if (restart) {
@@ -399,6 +478,23 @@
 			gf_term_play_from_time(term, 0, 0);
 		}
 
+		if (request_next_playlist_item) {
+			char szPath[GF_MAX_PATH];
+
+			request_next_playlist_item=0;
+			gf_term_disconnect(term);
+
+			if (fscanf(playlist, "%s", szPath) == EOF) {
+				fprintf(stderr, "No more items - exiting\n");
+				Run = 0;
+			} else if (szPath[0] == '#') {
+				request_next_playlist_item = GF_TRUE;
+			} else {
+				fprintf(stderr, "Opening URL %s\n", szPath);
+				gf_term_connect_with_path(term, szPath, url_arg);
+			}
+		}
+
 		if (!use_rtix || display_rti) UpdateRTInfo(NULL);
 		if (not_threaded) {
 			//printf("gf_term_process_step from run loop\n");
@@ -429,14 +525,15 @@
 	gf_cfg_del(cfg_file);
 
 #ifdef GPAC_MEMORY_TRACKING
-	if (enable_mem_tracker) {
+	if (enable_mem_tracker && (gf_memory_size() || gf_file_handles_count() )) {
 		gf_memory_print();
 	}
 #endif
 
 	gf_sys_close();
-	if (rti_logs) fclose(rti_logs);
-	if (logfile) fclose(logfile);
+	if (rti_logs) gf_fclose(rti_logs);
+	if (logfile) gf_fclose(logfile);
+	if (playlist) gf_fclose(playlist);
 
 	return 0;
 }

v0.5.2.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist -> v0.6.1.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist Changed

v0.5.2.tar.gz/applications/osmo4_sym/osmo4_view.cpp -> v0.6.1.tar.gz/applications/osmo4_sym/osmo4_view.cpp Changed

v0.5.2.tar.gz/applications/osmo4_w32/FileProps.cpp -> v0.6.1.tar.gz/applications/osmo4_w32/FileProps.cpp Changed

v0.5.2.tar.gz/applications/osmo4_w32/Osmo4.cpp -> v0.6.1.tar.gz/applications/osmo4_w32/Osmo4.cpp Changed

v0.5.2.tar.gz/applications/osmo4_w32/Osmo4.rc -> v0.6.1.tar.gz/applications/osmo4_w32/Osmo4.rc Changed

@@ -1,885 +1,885 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MAINFRAME MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Open File\tCtrl+O",          ID_OPEN_FILE
-        MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
-        MENUITEM SEPARATOR
-        MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
-        POPUP "Streaming Cache"
-        BEGIN
-            MENUITEM "&Enable",                     ID_REC_ENABLE
-            MENUITEM "&Stop and Save",              ID_REC_STOP
-            MENUITEM "&Abort",                      ID_REC_ABORT
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Copy",                        ID_FILE_COPY
-        MENUITEM "Paste",                       ID_FILE_PASTE
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        ID_FILE_EXIT
-    END
-    POPUP "View"
-    BEGIN
-        POPUP "Viewpoint"
-        BEGIN
-            MENUITEM "",                            ID_VIEWPORT_EMPTY
-        END
-        POPUP "&Navigation"
-        BEGIN
-            MENUITEM "Headlight",                   ID_HEADLIGHT
-            MENUITEM SEPARATOR
-            MENUITEM "&None",                       ID_NAVIGATE_NONE
-            MENUITEM "&Walk",                       ID_NAVIGATE_WALK
-            MENUITEM "&Fly",                        ID_NAVIGATE_FLY
-            MENUITEM "&Examine",                    ID_NAVIGATE_EXAM
-            MENUITEM "&Pan",                        ID_NAVIGATE_PAN
-            MENUITEM "&Slide",                      ID_NAVIGATE_SLIDE
-            MENUITEM "&Orbit",                      ID_NAVIGATE_ORBIT
-            MENUITEM "&VR",                         ID_NAVIGATE_VR
-            MENUITEM "&Game",                       ID_NAVIGATE_GAME
-            MENUITEM SEPARATOR
-            POPUP "Collision"
-            BEGIN
-                MENUITEM "Off",                         ID_COLLIDE_NONE
-                MENUITEM "Regular",                     ID_COLLIDE_REG
-                MENUITEM "Displacement",                ID_COLLIDE_DISP
-            END
-            MENUITEM "Gravity",                     ID_GRAVITY
-            MENUITEM SEPARATOR
-            MENUITEM "&Reset",                      ID_NAV_RESET
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Fullscreen",                 ID_VIEW_FULLSCREEN
-        MENUITEM "Original &Aspect",            ID_VIEW_ORIGINAL
-        POPUP "Aspect &Ratio"
-        BEGIN
-            MENUITEM "&Keep Original",              ID_AR_KEEP
-            MENUITEM "&Fill Screen",                ID_AR_FILL
-            MENUITEM "Ratio 4/3",                   ID_AR_43
-            MENUITEM "Ratio 16/9",                  ID_AR_169
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Resource Usage",              ID_VIEW_CPU
-        MENUITEM SEPARATOR
-        MENUITEM "&Options",                    IDD_CONFIGURE
-    END
-    POPUP "Play"
-    BEGIN
-        POPUP "Stream &Selection"
-        BEGIN
-            POPUP "Audio"
-            BEGIN
-                MENUITEM "",                            ID_AUDIO_EMPTY
-            END
-            POPUP "Video"
-            BEGIN
-                MENUITEM "",                            ID_VIDEO_EMPTY
-            END
-            POPUP "Subtitle"
-            BEGIN
-                MENUITEM "",                            ID_SUBS_EMPTY
-            END
-            MENUITEM SEPARATOR
-            MENUITEM "Add Subtitle",                ID_ADD_SUBTITLE
-        END
-        POPUP "&Chapters"
-        BEGIN
-            MENUITEM "",                            ID_SETCHAP_FIRST
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Playlist\tF3",                ID_VIEW_PL, CHECKED
-        MENUITEM "&Loop Playlist",              ID_PLAYLIST_LOOP
-        MENUITEM SEPARATOR
-        MENUITEM "Play/Pause\tCtrl+P",          ID_FILE_PLAY
-        MENUITEM "Step-by-Step\tCtrl+S",        ID_FILE_STEP
-        MENUITEM "Stop",                        ID_FILE_STOP
-        MENUITEM SEPARATOR
-        MENUITEM "Reload File\tF5",             ID_FILE_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "Clear History",               ID_CLEAR_NAV
-        MENUITEM "Reload Config",               ID_CONFIG_RELOAD
-    END
-    POPUP "?"
-    BEGIN
-        MENUITEM "Shortcut List",               ID_SHORTCUTS
-        MENUITEM "Navigation Keys",             ID_NAV_INFO
-        MENUITEM SEPARATOR
-        MENUITEM "&About ...",                  ID_H_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOGEX 0, 0, 209, 137
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CLIENTEDGE
-CAPTION "Osmo4 / GPAC version X.X.X"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,8,4,20,20
-    CTEXT           "Osmo4 Player - GPAC Multimedia Framework",IDC_STATIC,31,10,150,10,SS_NOPREFIX
-    CTEXT           "(c) 2000-2013 Telecom ParisTech\nAll Rights Reserved",IDC_STATIC,4,64,201,18
-    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",IDC_STATIC,4,26,200,18
-    PUSHBUTTON      "http://gpac.sourceforge.net",IDC_GOGPAC,43,47,121,13,BS_FLAT,WS_EX_STATICEDGE
-    GROUPBOX        "With Many Thanks To:",IDC_STATIC,3,82,203,53
-    CTEXT           "The FreeType Project\nMozilla SpiderMonkey (JavaScript support)\n\nZLIB, the PNG Group, the I.J.G.\nFFMPEG, FAAD, XVID, MAD",IDC_STATIC,9,92,189,41
-END
-
-IDD_PASSWD DIALOG 0, 0, 134, 71
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enter user name and password"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,4,56,50,12
-    PUSHBUTTON      "Cancel",IDCANCEL,80,56,50,12
-    LTEXT           "Static__________________________",IDC_TXT_SITE,25,4,105,8
-    LTEXT           "Login",IDC_STATIC,7,21,18,8
-    LTEXT           "Password",IDC_STATIC,7,37,32,8
-    EDITTEXT        IDC_EDIT_USER,47,18,55,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,47,34,55,14,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "Site",IDC_STATIC,7,4,13,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Osmo4-GPAC"
-            VALUE "FileVersion", "0.5.1-DEV"
-            VALUE "InternalName", "Osmo4"
-            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012"
-            VALUE "OriginalFilename", "Osmo4.EXE"
-            VALUE "ProductName", "Osmo4-GPAC"
-            VALUE "ProductVersion", "0.5.1-DEV"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 136
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_MAINTOOLS TOOLBAR 16, 15
-BEGIN
-    BUTTON      ID_OPEN_FILE
-    BUTTON      ID_NAV_PREV
-    BUTTON      ID_NAV_NEXT
-    BUTTON      ID_FILE_PLAY
-    BUTTON      ID_FILE_PLAY
-    BUTTON      ID_FILE_STEP
-    BUTTON      ID_FILE_STOP
-    BUTTON      ID_FILE_PROPS
-    BUTTON      IDD_CONFIGURE
-    BUTTON      ID_SWITCH_RENDER
-    BUTTON      ID_SWITCH_RENDER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINTOOLS           BITMAP                  "res\\maintool.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDR_MAINFRAME           "Osmo4"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_APP_TITLE       "Osmo4"
-    AFX_IDS_IDLEMESSAGE     "Ready"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_EXIT            "Quit the application; prompts to save documents\nExit"
-    ID_H_ABOUT              "Display program information, version number and copyright\nAbout"
-    ID_PLAYLIST_LOOP        "Restarts playlist from begining when playlist is over"
-    ID_OPEN_FILE             "Opens local file"
-    ID_VIEW_ORIGINAL        "restore Original Aspect of presentation"
-END
-
-STRINGTABLE
-BEGIN
-    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_SCSIZE          "Change the window size"
-    AFX_IDS_SCMOVE          "Change the window position"
-    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
-    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
-    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
-    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_SCRESTORE       "Restore the window to normal size"
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_STOP            "Stops current presentation"
-    ID_SWITCH_RENDER        "Switch between 2D and 3D renderers"
-    ID_COLLIDE_NONE         "Turns collision detection off"
-    ID_COLLIDE_REG          "Turns collision detection on"
-    ID_COLLIDE_DISP         "Collision with camera displacement"
-    ID_HEADLIGHT            "Turns headlight on/off"
-END
-
-STRINGTABLE
-BEGIN
-    ID_CLEAR_NAV            "Clears navigation history"
-    ID_TIMER                " "
-    ID_FPS                  " "
-    ID_VIEW_PL              "View navigation history as a playlist"
-END
-
-STRINGTABLE
-BEGIN
-    ID_VIEW_FULLSCREEN      "Move to Full Screen mode (Esc to exit)"
-    ID_AR_KEEP              "Keep Aspect Ratio of presentation"
-    ID_SHORTCUTS            "List of available shortcuts"
-    ID_FILE_PROP            "Show presentation properties"
-    ID_FILE_STEP            "Step one frame into presentation"
-    IDD_CONFIGURE           "Configure Player"
-    ID_VIEW_SCALABLE        "Uses vectorial zooming when resizing the window"
-    ID_OPEN_URL             "Open remote presentation"
-    ID_FILE_RELOAD          "Reload current presentation"
-    ID_FILE_PLAY            "Play/Pause presentation"
-    ID_NAVIGATE_NONE        "Disable navigation"
-END
-
-STRINGTABLE
-BEGIN
-    ID_NAVIGATE_WALK        "Turn walk navigation on"
-    ID_AR_FILL              "Ignores Aspect Ratio and always fill screen"
-    ID_AR_43                "Forces Aspect Ratio of 4/3"
-    ID_AR_169               "Forces Aspect Ratio of 16/9"
-    ID_NAV_RESET            "Restore last viewpoint"
-END
-
-STRINGTABLE
-BEGIN
-    ID_NAVIGATE_VR          "QT-VR like navigation"
-    ID_REC_ENABLE           "Enable recording of streaming data"
-    ID_REC_STOP             "Stops recording and save to file"
-    ID_REC_ABORT            "Stops recording and discard data"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_COPY            "Copy selected text to clipboard"
-    ID_FILE_PASTE           "Paste clipboard"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_OPENFILE DIALOG 0, 0, 301, 23
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select Location"
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_COMBOURL,3,5,273,67,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDC_BUTGO,279,5,19,13
-END
-
-IDD_OPTIONS DIALOG 0, 0, 174, 106
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Osmo4 Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Apply",IDC_SAVEOPT,147,2,26,12
-    COMBOBOX        IDC_SELECT,42,2,99,173,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Category",IDC_STATIC,7,4,29,8
-END
-
-IDD_OPT_GEN DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Loop At End",IDC_LOOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,4,55,10
-    CONTROL         "Look for subtitles",IDC_LOOKFORSUB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,69,10
-    CONTROL         "Disable console messages",IDC_NO_CONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,17,99,10
-    CONTROL         "View Graph in XMT-A format",IDC_DUMP_XMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,30,105,10
-    CONTROL         "Single Instance",IDC_SINGLE_INSTANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,54,65,10
-END
-
-IDD_OPT_RENDER DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Rendering Frame Rate",IDC_STATIC,5,4,72,8
-    COMBOBOX        IDC_BIFS_RATE,81,2,84,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,49,64,10
-    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,49,72,10
-    LTEXT           "Anti-Aliasing Level",IDC_STATIC,7,20,58,8
-    COMBOBOX        IDC_AA_LIST,81,17,84,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Use 3D Renderer",IDC_USE_RENDER3D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,71,10
-    LTEXT           "2D Rasterizer",IDC_STATIC,7,35,44,8
-    COMBOBOX        IDC_GD_LIST,81,33,84,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_DRAW_BOUNDS,109,60,56,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Bounds",IDC_STATIC,82,64,25,8
-END
-
-IDD_OPT_AUDIO DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_THICKFRAME
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,27,15,11,14
-    EDITTEXT        IDC_EDIT_AUDIO,5,15,19,14,ES_READONLY | ES_NUMBER
-    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,3,73,10
-    LTEXT           "buffers",IDC_STATIC,43,18,23,8
-    CONTROL         "Spin1",IDC_SPIN_FPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,104,15,11,14
-    EDITTEXT        IDC_AUDIO_FPS,77,15,24,14,ES_NUMBER
-    LTEXT           "Audio Driver",IDC_STATIC,7,63,40,8
-    CONTROL         "No Resynchronization",IDC_AUDIO_RESYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,46,82,10
-    COMBOBOX        IDC_DRIVER_LIST,63,60,103,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Disable Notifications",IDC_AUDIO_NOTIFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,47,79,10
-    CONTROL         "Disable Multichannel",IDC_AUDIO_MULTICH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,34,81,10
-    LTEXT           "ms total length",IDC_STATIC,118,18,49,8
-END
-
-IDD_OPT_VIDEO DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Video Driver",IDC_STATIC,6,7,40,8
-    COMBOBOX        IDC_VIDEO_LIST,55,5,111,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Change video resolution in fullscreen",IDC_SWITCH_RES,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,29,131,10
-    CONTROL         "Use Hardware Video Memory in 2D mode",IDC_HWMEMORY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,44,143,10
-END
-
-IDD_OPT_HTTP DIALOGEX 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    PUSHBUTTON      "...",IDC_BROWSE_CACHE,57,4,109,12
-    CONTROL         "Clean cache at exit",IDC_CLEAN_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,23,77,10
-    CONTROL         "Disable Cache",IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,22,62,10
-    LTEXT           "Cache Directory",IDC_STATIC,5,5,52,8
-    CONTROL         "XML progressive load",IDC_SAX_PROGRESSIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,42,84,10
-    EDITTEXT        IDC_SAX_DELAY,142,41,22,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "TimeSlice (ms)",IDC_STATIC,91,43,46,8
-    EDITTEXT        IDC_HTTP_PROXY,54,58,111,12,ES_AUTOHSCROLL
-    CONTROL         "Use proxy",IDC_HTTP_USE_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,59,47,10
-END
-
-IDD_OPT_FONT DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Font Engine",IDC_STATIC,6,11,39,8
-    COMBOBOX        IDC_FONT_LIST,60,8,105,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_BROWSE_FONT,2,40,164,12
-    LTEXT           "System Font Directory",IDC_STATIC,46,29,70,8
-    COMBOBOX        IDC_TEXTURE_MODE,101,58,64,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Text Texturing Mode",IDC_STATIC,7,60,69,8
-END
-
-IDD_OPT_SYSTEMS DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_LANG,75,4,92,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,3,61,17
-    LTEXT           "Decoder Threading",IDC_STATIC,4,28,62,8
-    COMBOBOX        IDC_DEC_THREAD,75,25,92,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,109,10
-    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,58,83,10
-END
-
-IDD_OPT_STREAM DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Default Port",IDC_STATIC,6,6,40,8
-    COMBOBOX        IDC_PORT,52,3,113,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,19,68,10
-    CONTROL         "use RTP reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,19,76,10
-    LTEXT           "milliseconds before control timeout",IDC_STATIC,38,34,108,8
-    EDITTEXT        IDC_TIMEOUT,3,32,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "milliseconds of Media Buffering ",IDC_STATIC,38,48,100,8
-    EDITTEXT        IDC_BUFFER,3,47,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_REBUFFER_LEN,83,60,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,63,79,10
-    LTEXT           "milliseconds",IDC_STATIC,117,63,41,8
-END
-
-IDD_PROPERTIES DIALOGEX 0, 0, 338, 150
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Presentation Properties"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,2,2,120,114
-    EDITTEXT        IDC_ODINFO,123,17,213,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE
-    PUSHBUTTON      "Get World Info",IDC_WORLD,2,118,119,13
-    PUSHBUTTON      "View Scene Graph",IDC_VIEWSG,2,134,119,13
-    CONTROL         "Tab1",IDC_VIEWSEL,"SysTabControl32",TCS_BUTTONS,124,2,208,14
-END
-
-IDD_OPT_DECODER DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Prefered Audio Module",-1,46,5,69,8
-    COMBOBOX        IDC_AUDEC_LIST,26,17,111,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Prefered Video Module",-1,48,40,69,8
-    COMBOBOX        IDC_VIDEC_LIST,25,52,113,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_RENDER2D DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Disable YUV Hardware",IDC_YUV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,54,89,10
-    LTEXT           "Static",IDC_FORMAT_YUV,97,57,67,8
-    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,32,72,10
-    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,77,10
-END
-
-IDD_OPT_RENDER3D DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Use OpenGL Outlines",IDC_RASTER_OUTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,2,84,10
-    CONTROL         "Emulate power-of-two textures for video",IDC_EMUL_POW2,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,45,140,10
-    CONTROL         "Polygon Anti-Aliasing",IDC_DISABLE_POLY_AA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,90,2,78,10
-    CONTROL         "Disable rectangular texture extensions",IDC_DISABLE_TX_RECT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,55,135,10
-    CONTROL         "Bitmap node uses direct pixel copy",IDC_BITMAP_USE_PIXEL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,65,125,10
-    LTEXT           "Draw Normals",IDC_STATIC,4,17,45,8
-    COMBOBOX        IDC_DRAW_NORMALS,4,25,48,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Backface Cull",IDC_STATIC,57,17,55,8
-    COMBOBOX        IDC_BACK_CULL,57,25,47,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Draw Mode",IDC_STATIC,113,17,55,8
-    COMBOBOX        IDC_DRAW_MODE,111,25,53,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_SLIDERS DIALOGEX 0, 0, 218, 18
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS,0,3,185,12
-    CONTROL         "Slider1",ID_AUDIO_VOL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_BORDER | WS_TABSTOP,187,3,30,13
-END
-
-IDD_NAVBAR DIALOGEX 0, 0, 279, 15
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    COMBOBOX        IDC_ADDRESS,29,1,130,196,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
-    LTEXT           "Address",IDC_DUMTXT,1,4,26,8
-END
-
-IDD_PLAYLIST DIALOGEX 0, 0, 186, 54
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Osmo4 Playlist"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "List4",IDC_FILELIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,1,0,182,51
-END
-
-IDD_OPT_MCACHE DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "...",IDC_BROWSE_MCACHE,41,2,126,12
-    CONTROL         "Overwrite existing files",IDC_MCACHE_OVERWRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,18,85,10
-    CONTROL         "Use filename",IDC_MCACHE_USENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,31,57,10
-    LTEXT           "Record To",IDC_STATIC,4,4,35,8
-    EDITTEXT        IDC_BASEPRES,81,31,82,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-END
-
-IDD_OPT_FILETYPES DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_FILELIST,59,6,108,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Supported Files",IDC_STATIC,6,8,50,8
-    LTEXT           "Extension",IDC_FILES_EXT,7,25,154,8
-    LTEXT           "Mime Type",IDC_FILES_MIMES,7,37,156,8
-    CONTROL         "Associate with Osmo4",IDC_ASSOCIATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,84,10
-    LTEXT           "Plugin",IDC_FILES_PLUG,8,49,154,8
-END
-
-IDD_OPT_LOGS DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Level",IDC_STATIC,6,7,18,8
-    COMBOBOX        IDC_LOG_LEVEL,30,4,64,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "core",IDC_TOOL_CORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,23,30,10
-    CONTROL         "coding",IDC_TOOL_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,33,37,10
-    CONTROL         "container",IDC_TOOL_CONTAINER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,45,10
-    CONTROL         "network",IDC_TOOL_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,53,41,10
-    CONTROL         "rtp",IDC_TOOL_RTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,63,24,10
-    CONTROL         "author",IDC_TOOL_AUTHOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,24,36,10
-    CONTROL         "sync",IDC_TOOL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,34,31,10
-    CONTROL         "codec",IDC_TOOL_CODEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,44,36,10
-    CONTROL         "parser",IDC_TOOL_PARSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,54,35,10
-    CONTROL         "media",IDC_TOOL_MEDIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,64,35,10
-    CONTROL         "scene",IDC_TOOL_SCENE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,24,35,10
-    CONTROL         "script",IDC_TOOL_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,34,33,10
-    CONTROL         "compose",IDC_TOOL_COMPOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,44,45,10
-    CONTROL         "render",IDC_TOOL_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,54,36,10
-    CONTROL         "mmio",IDC_TOOL_MMIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,64,32,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_OPT_VIDEO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_FONT, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 168
-        BOTTOMMARGIN, 74
-    END
-
-    IDD_OPT_SYSTEMS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 167
-        TOPMARGIN, 1
-        BOTTOMMARGIN, 75
-    END
-
-    IDD_OPT_STREAM, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 167
-        TOPMARGIN, 1
-    END
-
-    IDD_PROPERTIES, DIALOG
-    BEGIN
-        RIGHTMARGIN, 335
-        TOPMARGIN, 1
-    END
-
-    IDD_OPT_DECODER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_RENDER3D, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_NAVBAR, DIALOG
-    BEGIN
-        RIGHTMARGIN, 167
-    END
-
-    IDD_OPT_FILETYPES, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_LOGS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_PLAYLIST TOOLBAR 16, 15
-BEGIN
-    BUTTON      ID_PL_OPEN
-    BUTTON      ID_PL_SAVE
-    BUTTON      ID_PL_ADD_FILE
-    BUTTON      ID_PL_REM_FILE
-    BUTTON      ID_PL_UP
-    BUTTON      ID_PL_DOWN
-    BUTTON      ID_PL_SORT_FILE
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_PLAYLIST            BITMAP                  "res\\playlist.bmp"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\Osmo4.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "..\\..\\doc\\osmo4.ico"
-IDI_PLAY                ICON                    "res\\play.ico"
-IDI_STOP                ICON                    "res\\stop.ico"
-IDI_PAUSE               ICON                    "res\\pause.ico"
-IDI_MESSAGE             ICON                    "res\\message.ico"
-IDI_ERR                 ICON                    "res\\error.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_OPT_RENDER DLGINIT
-BEGIN
-    IDC_BIFS_RATE, 0x403, 4, 0
-0x2e35, 0x0030, 
-    IDC_BIFS_RATE, 0x403, 4, 0
-0x2e37, 0x0035, 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3031, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3231, 0x352e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3531, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3432, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3532, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3033, 0x302e, "\000" 
-    0
-END
-
-IDD_OPT_SYSTEMS DLGINIT
-BEGIN
-    IDC_LANG, 0x403, 8, 0
-0x6e45, 0x6c67, 0x7369, 0x0068, 
-    IDC_LANG, 0x403, 7, 0
-0x7246, 0x6e65, 0x6863, "\000" 
-    IDC_LANG, 0x403, 7, 0
-0x6547, 0x6d72, 0x6e61, "\000" 
-    IDC_LANG, 0x403, 8, 0
-0x7449, 0x6c61, 0x6169, 0x006e, 
-    IDC_LANG, 0x403, 8, 0
-0x7053, 0x6e61, 0x7369, 0x0068, 
-    IDC_LANG, 0x403, 9, 0
-0x6843, 0x6e69, 0x6565, 0x6573, "\000" 
-    IDC_LANG, 0x403, 10, 0
-0x614a, 0x6170, 0x656e, 0x7365, 0x0065, 
-    IDC_DEC_THREAD, 0x403, 14, 0
-0x6953, 0x676e, 0x656c, 0x5420, 0x7268, 0x6165, 0x0064, 
-    IDC_DEC_THREAD, 0x403, 13, 0
-0x754d, 0x6c74, 0x2069, 0x6854, 0x6572, 0x6461, "\000" 
-    IDC_DEC_THREAD, 0x403, 5, 0
-0x7246, 0x6565, "\000" 
-    0
-END
-
-IDD_OPT_LOGS DLGINIT
-BEGIN
-    IDC_LOG_LEVEL, 0x403, 9, 0
-0x6944, 0x6173, 0x6c62, 0x6465, "\000" 
-    IDC_LOG_LEVEL, 0x403, 6, 0
-0x7245, 0x6f72, 0x0072, 
-    IDC_LOG_LEVEL, 0x403, 8, 0
-0x6157, 0x6e72, 0x6e69, 0x0067, 
-    IDC_LOG_LEVEL, 0x403, 5, 0
-0x6e49, 0x6f66, "\000" 
-    IDC_LOG_LEVEL, 0x403, 6, 0
-0x6544, 0x7562, 0x0067, 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINACCEL ACCELERATORS
-BEGIN
-    "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
-    "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
-    VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
-    "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
-    "^O",           ID_OPEN_FILE,            ASCII,  NOINVERT
-    "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
-    VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\Osmo4.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MAINFRAME MENU
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "&Open File\tCtrl+O",          ID_OPEN_FILE
+        MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
+        MENUITEM SEPARATOR
+        MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
+        POPUP "Streaming Cache"
+        BEGIN
+            MENUITEM "&Enable",                     ID_REC_ENABLE
+            MENUITEM "&Stop and Save",              ID_REC_STOP
+            MENUITEM "&Abort",                      ID_REC_ABORT
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Copy",                        ID_FILE_COPY
+        MENUITEM "Paste",                       ID_FILE_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Exit",                        ID_FILE_EXIT
+    END
+    POPUP "View"
+    BEGIN
+        POPUP "Viewpoint"
+        BEGIN
+            MENUITEM "",                            ID_VIEWPORT_EMPTY
+        END
+        POPUP "&Navigation"
+        BEGIN
+            MENUITEM "Headlight",                   ID_HEADLIGHT
+            MENUITEM SEPARATOR
+            MENUITEM "&None",                       ID_NAVIGATE_NONE
+            MENUITEM "&Walk",                       ID_NAVIGATE_WALK
+            MENUITEM "&Fly",                        ID_NAVIGATE_FLY
+            MENUITEM "&Examine",                    ID_NAVIGATE_EXAM
+            MENUITEM "&Pan",                        ID_NAVIGATE_PAN
+            MENUITEM "&Slide",                      ID_NAVIGATE_SLIDE
+            MENUITEM "&Orbit",                      ID_NAVIGATE_ORBIT
+            MENUITEM "&VR",                         ID_NAVIGATE_VR
+            MENUITEM "&Game",                       ID_NAVIGATE_GAME
+            MENUITEM SEPARATOR
+            POPUP "Collision"
+            BEGIN
+                MENUITEM "Off",                         ID_COLLIDE_NONE
+                MENUITEM "Regular",                     ID_COLLIDE_REG
+                MENUITEM "Displacement",                ID_COLLIDE_DISP
+            END
+            MENUITEM "Gravity",                     ID_GRAVITY
+            MENUITEM SEPARATOR
+            MENUITEM "&Reset",                      ID_NAV_RESET
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "&Fullscreen",                 ID_VIEW_FULLSCREEN
+        MENUITEM "Original &Aspect",            ID_VIEW_ORIGINAL
+        POPUP "Aspect &Ratio"
+        BEGIN
+            MENUITEM "&Keep Original",              ID_AR_KEEP
+            MENUITEM "&Fill Screen",                ID_AR_FILL
+            MENUITEM "Ratio 4/3",                   ID_AR_43
+            MENUITEM "Ratio 16/9",                  ID_AR_169
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Resource Usage",              ID_VIEW_CPU
+        MENUITEM SEPARATOR
+        MENUITEM "&Options",                    IDD_CONFIGURE
+    END
+    POPUP "Play"
+    BEGIN
+        POPUP "Stream &Selection"
+        BEGIN
+            POPUP "Audio"
+            BEGIN
+                MENUITEM "",                            ID_AUDIO_EMPTY
+            END
+            POPUP "Video"
+            BEGIN
+                MENUITEM "",                            ID_VIDEO_EMPTY
+            END
+            POPUP "Subtitle"
+            BEGIN
+                MENUITEM "",                            ID_SUBS_EMPTY
+            END
+            MENUITEM SEPARATOR
+            MENUITEM "Add Subtitle",                ID_ADD_SUBTITLE
+        END
+        POPUP "&Chapters"
+        BEGIN
+            MENUITEM "",                            ID_SETCHAP_FIRST
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Playlist\tF3",                ID_VIEW_PL, CHECKED
+        MENUITEM "&Loop Playlist",              ID_PLAYLIST_LOOP
+        MENUITEM SEPARATOR
+        MENUITEM "Play/Pause\tCtrl+P",          ID_FILE_PLAY
+        MENUITEM "Step-by-Step\tCtrl+S",        ID_FILE_STEP
+        MENUITEM "Stop",                        ID_FILE_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Reload File\tF5",             ID_FILE_RELOAD
+        MENUITEM SEPARATOR
+        MENUITEM "Clear History",               ID_CLEAR_NAV
+        MENUITEM "Reload Config",               ID_CONFIG_RELOAD
+    END
+    POPUP "?"
+    BEGIN
+        MENUITEM "Shortcut List",               ID_SHORTCUTS
+        MENUITEM "Navigation Keys",             ID_NAV_INFO
+        MENUITEM SEPARATOR
+        MENUITEM "&About ...",                  ID_H_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 209, 137
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CLIENTEDGE
+CAPTION "Osmo4 / GPAC version X.X.X"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,8,4,20,20
+    CTEXT           "Osmo4 Player - GPAC Multimedia Framework",IDC_STATIC,31,10,150,10,SS_NOPREFIX
+    CTEXT           "(c) 2000-2013 Telecom ParisTech\nAll Rights Reserved",IDC_STATIC,4,64,201,18
+    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",IDC_STATIC,4,26,200,18
+    PUSHBUTTON      "http://gpac.sourceforge.net",IDC_GOGPAC,43,47,121,13,BS_FLAT,WS_EX_STATICEDGE
+    GROUPBOX        "With Many Thanks To:",IDC_STATIC,3,82,203,53
+    CTEXT           "The FreeType Project\nMozilla SpiderMonkey (JavaScript support)\n\nZLIB, the PNG Group, the I.J.G.\nFFMPEG, FAAD, XVID, MAD",IDC_STATIC,9,92,189,41
+END
+
+IDD_PASSWD DIALOG 0, 0, 134, 71
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Enter user name and password"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,4,56,50,12
+    PUSHBUTTON      "Cancel",IDCANCEL,80,56,50,12
+    LTEXT           "Static__________________________",IDC_TXT_SITE,25,4,105,8
+    LTEXT           "Login",IDC_STATIC,7,21,18,8
+    LTEXT           "Password",IDC_STATIC,7,37,32,8
+    EDITTEXT        IDC_EDIT_USER,47,18,55,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PASSWORD,47,34,55,14,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Site",IDC_STATIC,7,4,13,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Osmo4-GPAC"
+		VALUE "FileVersion", "0.6.1"
+            VALUE "InternalName", "Osmo4"
+            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012"
+            VALUE "OriginalFilename", "Osmo4.EXE"
+            VALUE "ProductName", "Osmo4-GPAC"
+		VALUE "ProductVersion", "0.6.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_ABOUTBOX, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 136
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar
+//
+
+IDR_MAINTOOLS TOOLBAR 16, 15
+BEGIN
+    BUTTON      ID_OPEN_FILE
+    BUTTON      ID_NAV_PREV
+    BUTTON      ID_NAV_NEXT
+    BUTTON      ID_FILE_PLAY
+    BUTTON      ID_FILE_PLAY
+    BUTTON      ID_FILE_STEP
+    BUTTON      ID_FILE_STOP
+    BUTTON      ID_FILE_PROPS
+    BUTTON      IDD_CONFIGURE
+    BUTTON      ID_SWITCH_RENDER
+    BUTTON      ID_SWITCH_RENDER
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDR_MAINTOOLS           BITMAP                  "res\\maintool.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDR_MAINFRAME           "Osmo4"
+END
+
+STRINGTABLE
+BEGIN
+    AFX_IDS_APP_TITLE       "Osmo4"
+    AFX_IDS_IDLEMESSAGE     "Ready"
+END
+
+STRINGTABLE
+BEGIN
+    ID_FILE_EXIT            "Quit the application; prompts to save documents\nExit"
+    ID_H_ABOUT              "Display program information, version number and copyright\nAbout"
+    ID_PLAYLIST_LOOP        "Restarts playlist from beginning when playlist is over"
+    ID_OPEN_FILE             "Opens local file"
+    ID_VIEW_ORIGINAL        "restore Original Aspect of presentation"
+END
+
+STRINGTABLE
+BEGIN
+    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
+END
+
+STRINGTABLE
+BEGIN
+    AFX_IDS_SCSIZE          "Change the window size"
+    AFX_IDS_SCMOVE          "Change the window position"
+    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
+    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
+    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
+    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
+    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
+END
+
+STRINGTABLE
+BEGIN
+    AFX_IDS_SCRESTORE       "Restore the window to normal size"
+    AFX_IDS_SCTASKLIST      "Activate Task List"
+END
+
+STRINGTABLE
+BEGIN
+    ID_FILE_STOP            "Stops current presentation"
+    ID_SWITCH_RENDER        "Switch between 2D and 3D renderers"
+    ID_COLLIDE_NONE         "Turns collision detection off"
+    ID_COLLIDE_REG          "Turns collision detection on"
+    ID_COLLIDE_DISP         "Collision with camera displacement"
+    ID_HEADLIGHT            "Turns headlight on/off"
+END
+
+STRINGTABLE
+BEGIN
+    ID_CLEAR_NAV            "Clears navigation history"
+    ID_TIMER                " "
+    ID_FPS                  " "
+    ID_VIEW_PL              "View navigation history as a playlist"
+END
+
+STRINGTABLE
+BEGIN
+    ID_VIEW_FULLSCREEN      "Move to Full Screen mode (Esc to exit)"
+    ID_AR_KEEP              "Keep Aspect Ratio of presentation"
+    ID_SHORTCUTS            "List of available shortcuts"
+    ID_FILE_PROP            "Show presentation properties"
+    ID_FILE_STEP            "Step one frame into presentation"
+    IDD_CONFIGURE           "Configure Player"
+    ID_VIEW_SCALABLE        "Uses vectorial zooming when resizing the window"
+    ID_OPEN_URL             "Open remote presentation"
+    ID_FILE_RELOAD          "Reload current presentation"
+    ID_FILE_PLAY            "Play/Pause presentation"
+    ID_NAVIGATE_NONE        "Disable navigation"
+END
+
+STRINGTABLE
+BEGIN
+    ID_NAVIGATE_WALK        "Turn walk navigation on"
+    ID_AR_FILL              "Ignores Aspect Ratio and always fill screen"
+    ID_AR_43                "Forces Aspect Ratio of 4/3"
+    ID_AR_169               "Forces Aspect Ratio of 16/9"
+    ID_NAV_RESET            "Restore last viewpoint"
+END
+
+STRINGTABLE
+BEGIN
+    ID_NAVIGATE_VR          "QT-VR like navigation"
+    ID_REC_ENABLE           "Enable recording of streaming data"
+    ID_REC_STOP             "Stops recording and save to file"
+    ID_REC_ABORT            "Stops recording and discard data"
+END
+
+STRINGTABLE
+BEGIN
+    ID_FILE_COPY            "Copy selected text to clipboard"
+    ID_FILE_PASTE           "Paste clipboard"
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_OPENFILE DIALOG 0, 0, 301, 23
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Select Location"
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_COMBOURL,3,5,273,67,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDC_BUTGO,279,5,19,13
+END
+
+IDD_OPTIONS DIALOG 0, 0, 174, 106
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Osmo4 Options"
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "Apply",IDC_SAVEOPT,147,2,26,12
+    COMBOBOX        IDC_SELECT,42,2,99,173,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Category",IDC_STATIC,7,4,29,8
+END
+
+IDD_OPT_GEN DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Loop At End",IDC_LOOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,4,55,10
+    CONTROL         "Look for subtitles",IDC_LOOKFORSUB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,69,10
+    CONTROL         "Disable console messages",IDC_NO_CONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,17,99,10
+    CONTROL         "View Graph in XMT-A format",IDC_DUMP_XMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,30,105,10
+    CONTROL         "Single Instance",IDC_SINGLE_INSTANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,54,65,10
+END
+
+IDD_OPT_RENDER DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Rendering Frame Rate",IDC_STATIC,5,4,72,8
+    COMBOBOX        IDC_BIFS_RATE,81,2,84,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,49,64,10
+    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,49,72,10
+    LTEXT           "Anti-Aliasing Level",IDC_STATIC,7,20,58,8
+    COMBOBOX        IDC_AA_LIST,81,17,84,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Use 3D Renderer",IDC_USE_RENDER3D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,71,10
+    LTEXT           "2D Rasterizer",IDC_STATIC,7,35,44,8
+    COMBOBOX        IDC_GD_LIST,81,33,84,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_DRAW_BOUNDS,109,60,56,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Bounds",IDC_STATIC,82,64,25,8
+END
+
+IDD_OPT_AUDIO DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_THICKFRAME
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,27,15,11,14
+    EDITTEXT        IDC_EDIT_AUDIO,5,15,19,14,ES_READONLY | ES_NUMBER
+    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,3,73,10
+    LTEXT           "buffers",IDC_STATIC,43,18,23,8
+    CONTROL         "Spin1",IDC_SPIN_FPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,104,15,11,14
+    EDITTEXT        IDC_AUDIO_FPS,77,15,24,14,ES_NUMBER
+    LTEXT           "Audio Driver",IDC_STATIC,7,63,40,8
+    CONTROL         "No Resynchronization",IDC_AUDIO_RESYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,46,82,10
+    COMBOBOX        IDC_DRIVER_LIST,63,60,103,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Disable Notifications",IDC_AUDIO_NOTIFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,47,79,10
+    CONTROL         "Disable Multichannel",IDC_AUDIO_MULTICH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,34,81,10
+    LTEXT           "ms total length",IDC_STATIC,118,18,49,8
+END
+
+IDD_OPT_VIDEO DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Video Driver",IDC_STATIC,6,7,40,8
+    COMBOBOX        IDC_VIDEO_LIST,55,5,111,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Change video resolution in fullscreen",IDC_SWITCH_RES,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,29,131,10
+    CONTROL         "Use Hardware Video Memory in 2D mode",IDC_HWMEMORY,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,44,143,10
+END
+
+IDD_OPT_HTTP DIALOGEX 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    PUSHBUTTON      "...",IDC_BROWSE_CACHE,57,4,109,12
+    CONTROL         "Clean cache at exit",IDC_CLEAN_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,23,77,10
+    CONTROL         "Disable Cache",IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,22,62,10
+    LTEXT           "Cache Directory",IDC_STATIC,5,5,52,8
+    CONTROL         "XML progressive load",IDC_SAX_PROGRESSIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,42,84,10
+    EDITTEXT        IDC_SAX_DELAY,142,41,22,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "TimeSlice (ms)",IDC_STATIC,91,43,46,8
+    EDITTEXT        IDC_HTTP_PROXY,54,58,111,12,ES_AUTOHSCROLL
+    CONTROL         "Use proxy",IDC_HTTP_USE_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,59,47,10
+END
+
+IDD_OPT_FONT DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Font Engine",IDC_STATIC,6,11,39,8
+    COMBOBOX        IDC_FONT_LIST,60,8,105,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_BROWSE_FONT,2,40,164,12
+    LTEXT           "System Font Directory",IDC_STATIC,46,29,70,8
+    COMBOBOX        IDC_TEXTURE_MODE,101,58,64,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Text Texturing Mode",IDC_STATIC,7,60,69,8
+END
+
+IDD_OPT_SYSTEMS DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_LANG,75,4,92,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,3,61,17
+    LTEXT           "Decoder Threading",IDC_STATIC,4,28,62,8
+    COMBOBOX        IDC_DEC_THREAD,75,25,92,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,109,10
+    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,58,83,10
+END
+
+IDD_OPT_STREAM DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Default Port",IDC_STATIC,6,6,40,8
+    COMBOBOX        IDC_PORT,52,3,113,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,19,68,10
+    CONTROL         "use RTP reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,19,76,10
+    LTEXT           "milliseconds before control timeout",IDC_STATIC,38,34,108,8
+    EDITTEXT        IDC_TIMEOUT,3,32,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "milliseconds of Media Buffering ",IDC_STATIC,38,48,100,8
+    EDITTEXT        IDC_BUFFER,3,47,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_REBUFFER_LEN,83,60,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,63,79,10
+    LTEXT           "milliseconds",IDC_STATIC,117,63,41,8
+END
+
+IDD_PROPERTIES DIALOGEX 0, 0, 338, 150
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Presentation Properties"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,2,2,120,114
+    EDITTEXT        IDC_ODINFO,123,17,213,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE
+    PUSHBUTTON      "Get World Info",IDC_WORLD,2,118,119,13
+    PUSHBUTTON      "View Scene Graph",IDC_VIEWSG,2,134,119,13
+    CONTROL         "Tab1",IDC_VIEWSEL,"SysTabControl32",TCS_BUTTONS,124,2,208,14
+END
+
+IDD_OPT_DECODER DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Prefered Audio Module",-1,46,5,69,8
+    COMBOBOX        IDC_AUDEC_LIST,26,17,111,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Prefered Video Module",-1,48,40,69,8
+    COMBOBOX        IDC_VIDEC_LIST,25,52,113,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_OPT_RENDER2D DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Disable YUV Hardware",IDC_YUV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,54,89,10
+    LTEXT           "Static",IDC_FORMAT_YUV,97,57,67,8
+    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,32,72,10
+    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,77,10
+END
+
+IDD_OPT_RENDER3D DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Use OpenGL Outlines",IDC_RASTER_OUTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,2,84,10
+    CONTROL         "Emulate power-of-two textures for video",IDC_EMUL_POW2,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,45,140,10
+    CONTROL         "Polygon Anti-Aliasing",IDC_DISABLE_POLY_AA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,90,2,78,10
+    CONTROL         "Disable rectangular texture extensions",IDC_DISABLE_TX_RECT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,55,135,10
+    CONTROL         "Bitmap node uses direct pixel copy",IDC_BITMAP_USE_PIXEL,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,65,125,10
+    LTEXT           "Draw Normals",IDC_STATIC,4,17,45,8
+    COMBOBOX        IDC_DRAW_NORMALS,4,25,48,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Backface Cull",IDC_STATIC,57,17,55,8
+    COMBOBOX        IDC_BACK_CULL,57,25,47,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Draw Mode",IDC_STATIC,113,17,55,8
+    COMBOBOX        IDC_DRAW_MODE,111,25,53,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_SLIDERS DIALOGEX 0, 0, 218, 18
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS,0,3,185,12
+    CONTROL         "Slider1",ID_AUDIO_VOL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_BORDER | WS_TABSTOP,187,3,30,13
+END
+
+IDD_NAVBAR DIALOGEX 0, 0, 279, 15
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    COMBOBOX        IDC_ADDRESS,29,1,130,196,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
+    LTEXT           "Address",IDC_DUMTXT,1,4,26,8
+END
+
+IDD_PLAYLIST DIALOGEX 0, 0, 186, 54
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION "Osmo4 Playlist"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "List4",IDC_FILELIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,1,0,182,51
+END
+
+IDD_OPT_MCACHE DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "...",IDC_BROWSE_MCACHE,41,2,126,12
+    CONTROL         "Overwrite existing files",IDC_MCACHE_OVERWRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,18,85,10
+    CONTROL         "Use filename",IDC_MCACHE_USENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,31,57,10
+    LTEXT           "Record To",IDC_STATIC,4,4,35,8
+    EDITTEXT        IDC_BASEPRES,81,31,82,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+END
+
+IDD_OPT_FILETYPES DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_FILELIST,59,6,108,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Supported Files",IDC_STATIC,6,8,50,8
+    LTEXT           "Extension",IDC_FILES_EXT,7,25,154,8
+    LTEXT           "Mime Type",IDC_FILES_MIMES,7,37,156,8
+    CONTROL         "Associate with Osmo4",IDC_ASSOCIATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,84,10
+    LTEXT           "Plugin",IDC_FILES_PLUG,8,49,154,8
+END
+
+IDD_OPT_LOGS DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Level",IDC_STATIC,6,7,18,8
+    COMBOBOX        IDC_LOG_LEVEL,30,4,64,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "core",IDC_TOOL_CORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,23,30,10
+    CONTROL         "coding",IDC_TOOL_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,33,37,10
+    CONTROL         "container",IDC_TOOL_CONTAINER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,45,10
+    CONTROL         "network",IDC_TOOL_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,53,41,10
+    CONTROL         "rtp",IDC_TOOL_RTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,63,24,10
+    CONTROL         "author",IDC_TOOL_AUTHOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,24,36,10
+    CONTROL         "sync",IDC_TOOL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,34,31,10
+    CONTROL         "codec",IDC_TOOL_CODEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,44,36,10
+    CONTROL         "parser",IDC_TOOL_PARSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,54,35,10
+    CONTROL         "media",IDC_TOOL_MEDIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,64,35,10
+    CONTROL         "scene",IDC_TOOL_SCENE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,24,35,10
+    CONTROL         "script",IDC_TOOL_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,34,33,10
+    CONTROL         "compose",IDC_TOOL_COMPOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,44,45,10
+    CONTROL         "render",IDC_TOOL_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,54,36,10
+    CONTROL         "mmio",IDC_TOOL_MMIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,64,32,10
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_OPT_VIDEO, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_OPT_FONT, DIALOG
+    BEGIN
+        LEFTMARGIN, 1
+        RIGHTMARGIN, 168
+        BOTTOMMARGIN, 74
+    END
+
+    IDD_OPT_SYSTEMS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 167
+        TOPMARGIN, 1
+        BOTTOMMARGIN, 75
+    END
+
+    IDD_OPT_STREAM, DIALOG
+    BEGIN
+        LEFTMARGIN, 1
+        RIGHTMARGIN, 167
+        TOPMARGIN, 1
+    END
+
+    IDD_PROPERTIES, DIALOG
+    BEGIN
+        RIGHTMARGIN, 335
+        TOPMARGIN, 1
+    END
+
+    IDD_OPT_DECODER, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_OPT_RENDER3D, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_NAVBAR, DIALOG
+    BEGIN
+        RIGHTMARGIN, 167
+    END
+
+    IDD_OPT_FILETYPES, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_OPT_LOGS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar
+//
+
+IDR_PLAYLIST TOOLBAR 16, 15
+BEGIN
+    BUTTON      ID_PL_OPEN
+    BUTTON      ID_PL_SAVE
+    BUTTON      ID_PL_ADD_FILE
+    BUTTON      ID_PL_REM_FILE
+    BUTTON      ID_PL_UP
+    BUTTON      ID_PL_DOWN
+    BUTTON      ID_PL_SORT_FILE
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDR_PLAYLIST            BITMAP                  "res\\playlist.bmp"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+    "#define _AFX_NO_OLE_RESOURCES\r\n"
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+    "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE 9, 1\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#endif //_WIN32\r\n"
+    "#include ""res\\Osmo4.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#endif\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME           ICON                    "..\\..\\doc\\osmo4.ico"
+IDI_PLAY                ICON                    "res\\play.ico"
+IDI_STOP                ICON                    "res\\stop.ico"
+IDI_PAUSE               ICON                    "res\\pause.ico"
+IDI_MESSAGE             ICON                    "res\\message.ico"
+IDI_ERR                 ICON                    "res\\error.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_OPT_RENDER DLGINIT
+BEGIN
+    IDC_BIFS_RATE, 0x403, 4, 0
+0x2e35, 0x0030, 
+    IDC_BIFS_RATE, 0x403, 4, 0
+0x2e37, 0x0035, 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3031, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3231, 0x352e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3531, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3432, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3532, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3033, 0x302e, "\000" 
+    0
+END
+
+IDD_OPT_SYSTEMS DLGINIT
+BEGIN
+    IDC_LANG, 0x403, 8, 0
+0x6e45, 0x6c67, 0x7369, 0x0068, 
+    IDC_LANG, 0x403, 7, 0
+0x7246, 0x6e65, 0x6863, "\000" 
+    IDC_LANG, 0x403, 7, 0
+0x6547, 0x6d72, 0x6e61, "\000" 
+    IDC_LANG, 0x403, 8, 0
+0x7449, 0x6c61, 0x6169, 0x006e, 
+    IDC_LANG, 0x403, 8, 0
+0x7053, 0x6e61, 0x7369, 0x0068, 
+    IDC_LANG, 0x403, 9, 0
+0x6843, 0x6e69, 0x6565, 0x6573, "\000" 
+    IDC_LANG, 0x403, 10, 0
+0x614a, 0x6170, 0x656e, 0x7365, 0x0065, 
+    IDC_DEC_THREAD, 0x403, 14, 0
+0x6953, 0x676e, 0x656c, 0x5420, 0x7268, 0x6165, 0x0064, 
+    IDC_DEC_THREAD, 0x403, 13, 0
+0x754d, 0x6c74, 0x2069, 0x6854, 0x6572, 0x6461, "\000" 
+    IDC_DEC_THREAD, 0x403, 5, 0
+0x7246, 0x6565, "\000" 
+    0
+END
+
+IDD_OPT_LOGS DLGINIT
+BEGIN
+    IDC_LOG_LEVEL, 0x403, 9, 0
+0x6944, 0x6173, 0x6c62, 0x6465, "\000" 
+    IDC_LOG_LEVEL, 0x403, 6, 0
+0x7245, 0x6f72, 0x0072, 
+    IDC_LOG_LEVEL, 0x403, 8, 0
+0x6157, 0x6e72, 0x6e69, 0x0067, 
+    IDC_LOG_LEVEL, 0x403, 5, 0
+0x6e49, 0x6f66, "\000" 
+    IDC_LOG_LEVEL, 0x403, 6, 0
+0x6544, 0x7562, 0x0067, 
+    0
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_MAINACCEL ACCELERATORS
+BEGIN
+    "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
+    "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
+    VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
+    "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
+    "^O",           ID_OPEN_FILE,            ASCII,  NOINVERT
+    "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
+    VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif //_WIN32
+#include "res\Osmo4.rc2"  // non-Microsoft Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

v0.5.2.tar.gz/applications/osmo4_w32/Playlist.cpp -> v0.6.1.tar.gz/applications/osmo4_w32/Playlist.cpp Changed

v0.5.2.tar.gz/applications/osmo4_wce/Osmo4.cpp -> v0.6.1.tar.gz/applications/osmo4_wce/Osmo4.cpp Changed

v0.5.2.tar.gz/applications/osmo4_wx/Darwin.Info.plist -> v0.6.1.tar.gz/applications/osmo4_wx/Darwin.Info.plist Changed

v0.5.2.tar.gz/applications/osmo4_wx/Playlist.cpp -> v0.6.1.tar.gz/applications/osmo4_wx/Playlist.cpp Changed

v0.5.2.tar.gz/applications/osmo4_wx/wxOsmo4.cpp -> v0.6.1.tar.gz/applications/osmo4_wx/wxOsmo4.cpp Changed

v0.5.2.tar.gz/applications/osmophone/main.cpp -> v0.6.1.tar.gz/applications/osmophone/main.cpp Changed

@@ -236,7 +236,7 @@
 
 static void setup_logs()
 {
-	if (log_file) fclose(log_file);
+	if (log_file) gf_fclose(log_file);
 	log_file = NULL;
 
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
@@ -248,7 +248,7 @@
 			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
 			filename = "\\gpac_logs.txt";
 		}
-		log_file = gf_f64_open(filename, "a+t");
+		log_file = gf_fopen(filename, "a+t");
 
 		fprintf(log_file, "!! GPAC RunTime Info for file %s !!\n", the_url);
 		fprintf(log_file, "SysTime(ms)\tSceneTime(ms)\tCPU\tFPS\tMemory(kB)\tObservation\n");
@@ -268,7 +268,7 @@
 		if (logs) {
 			if (gf_log_set_tools_levels( logs ) != GF_OK) {
 			} else {
-				if (log_file = gf_f64_open(filename, "a+t")) {
+				if (log_file = gf_fopen(filename, "a+t")) {
 					gf_log_set_callback(log_file, on_gpac_log);
 				}
 			}
@@ -1046,7 +1046,7 @@
 		break;
 	case ID_LOGS_RESET:
 		if (log_file) {
-			fclose(log_file);
+			gf_fclose(log_file);
 			log_file = NULL;
 		}
 		{
@@ -1491,6 +1491,6 @@
 	if (backlight_off) set_backlight_state(GF_FALSE);
 
 	gf_sys_close();
-	if (log_file) fclose(log_file);
+	if (log_file) gf_fclose(log_file);
 	return 0;
 }

v0.5.2.tar.gz/applications/osmozilla/Makefile -> v0.6.1.tar.gz/applications/osmozilla/Makefile Changed

v0.5.2.tar.gz/applications/osmozilla/osmo_npapi.cpp -> v0.6.1.tar.gz/applications/osmozilla/osmo_npapi.cpp Changed

@@ -1,854 +1,854 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-* This file is part of GPAC / Osmozilla NPAPI plugin
-*
-* GPAC 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, or (at your option)
-* any later version.
-*
-* GPAC 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 this library; see the file COPYING. If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
-
-
-////////////////////////////////////////////////////////////
-//
-// Implementation of Netscape entry points (NPN_*)
-//
-#include "osmo_npapi.h"
-#include "osmozilla.h"
-
-#if defined(XP_UNIX) && !defined(XP_MACOS)
-#include <malloc.h>
-#include <string.h>
-#endif
-
-NPNetscapeFuncs *sBrowserFunctions = NULL;
-
-NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target)
-{
-	if (!sBrowserFunctions) return NPERR_INVALID_FUNCTABLE_ERROR;
-	return sBrowserFunctions->geturl(instance, url, target);
-}
-
-void Osmozilla_SetStatus(NPP instance, const char *message)
-{
-	if (!sBrowserFunctions) return;
-	sBrowserFunctions->status(instance, message);
-}
-
-#ifndef GECKO_XPCOM
-void Osmozilla_InitScripting(Osmozilla *osmo);
-#endif
-
-NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
-{
-	Osmozilla *osmo;
-	NPError rv = NPERR_NO_ERROR;
-	if (instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmo = (Osmozilla *) malloc(sizeof(Osmozilla));
-	memset(osmo, 0, sizeof(Osmozilla));
-
-	osmo->np_instance = instance;
-	// associate the plugin instance object with NPP instance
-	instance->pdata = (void *)osmo;
-
-	osmo->supports_xembed = 0;
-	sBrowserFunctions->getvalue(NULL, NPNVSupportsXEmbedBool, (void *)&osmo->supports_xembed);
-
-	Osmozilla_Initialize(osmo, argc, argn, argv);
-
-#ifndef GECKO_XPCOM
-	Osmozilla_InitScripting(osmo);
-#endif
-
-	return rv;
-}
-
-// here is the place to clean up and destroy the nsPluginInstance object
-NPError NPOsmozilla_Destroy (NPP instance, NPSavedData** save)
-{
-	NPError rv = NPERR_NO_ERROR;
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla*)instance->pdata;
-	if (osmozilla != NULL) {
-		Osmozilla_Shutdown(osmozilla);
-#ifdef GECKO_XPCOM
-		NPOsmozilla_ShutdownScript(osmozilla);
-#else
-		if (osmozilla->script_obj) sBrowserFunctions->releaseobject(osmozilla->script_obj);
-		osmozilla->script_obj = NULL;
-#endif
-
-		free(osmozilla);
-	}
-	instance->pdata = NULL;
-	return rv;
-}
-
-// during this call we know when the plugin window is ready or
-// is about to be destroyed so we can do some gui specific
-// initialization and shutdown
-NPError NPOsmozilla_SetWindow (NPP instance, NPWindow* pNPWindow)
-{
-	Osmozilla *osmozilla;
-	void *os_wnd_handle, *os_wnd_display;
-	NPError rv = NPERR_NO_ERROR;
-
-	if (!instance || !instance->pdata) return NPERR_INVALID_INSTANCE_ERROR;
-	if (pNPWindow == NULL) return NPERR_GENERIC_ERROR;
-	osmozilla = (Osmozilla *)instance->pdata;
-
-	// window just created
-	if (!osmozilla->window_set) {
-		if (pNPWindow->window == NULL) return NPERR_GENERIC_ERROR;
-
-#ifdef XP_WIN
-		os_wnd_handle = pNPWindow->window;
-		os_wnd_display = NULL;
-#elif defined(XP_MAXOS)
-		os_wnd_handle = pNPWindow->window;
-		os_wnd_display = NULL;
-#elif defined(XP_UNIX)
-		os_wnd_handle = pNPWindow->window;
-		/*HACK - although we don't use the display in the X11 plugin, this is used to signal that
-		the user is mozilla and prevent some X11 calls crashing the browser in file playing mode
-		(eg, "firefox myfile.mp4" )*/
-		os_wnd_display =((NPSetWindowCallbackStruct *)pNPWindow->ws_info)->display;
-#endif
-
-		if (! Osmozilla_SetWindow(osmozilla, os_wnd_handle, os_wnd_display, pNPWindow->width, pNPWindow->height) ) {
-			return NPERR_MODULE_LOAD_FAILED_ERROR;
-		}
-
-	}
-
-#if 0
-	// window goes away
-	if((pNPWindow->window == NULL) && plugin->isInitialized())
-		return plugin->SetWindow(pNPWindow);
-
-	// window resized?
-	if(plugin->isInitialized() && (pNPWindow->window != NULL))
-		return plugin->SetWindow(pNPWindow);
-
-	// this should not happen, nothing to do
-	if((pNPWindow->window == NULL) && !plugin->isInitialized())
-		return plugin->SetWindow(pNPWindow);
-#endif
-
-	return rv;
-}
-
-NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t *stype)
-{
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL)
-		return NPERR_GENERIC_ERROR;
-
-	Osmozilla_ConnectTo(osmozilla, stream->url);
-	*stype = NP_SEEK;
-	return NPERR_NO_ERROR;
-}
-
-NPINT32 NPOsmozilla_WriteReady (NPP instance, NPStream *stream)
-{
-	return 0x0fffffff;
-}
-
-NPINT32 NPOsmozilla_Write (NPP instance, NPStream *stream, NPINT32 offset, NPINT32 len, void *buffer)
-{
-	return len;
-}
-
-NPError NPOsmozilla_DestroyStream (NPP instance, NPStream *stream, NPError reason)
-{
-	return NPERR_NO_ERROR;
-}
-
-void NPOsmozilla_StreamAsFile (NPP instance, NPStream* stream, const char* fname)
-{
-}
-
-void NPOsmozilla_Print (NPP instance, NPPrint* printInfo)
-{
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL)
-		return;
-
-	Osmozilla_Print(osmozilla, (printInfo->mode == NP_EMBED) ? 1 : 0, printInfo->print.embedPrint.platformPrint,
-	 printInfo->print.embedPrint.window.x, printInfo->print.embedPrint.window.y,
-	 printInfo->print.embedPrint.window.width, printInfo->print.embedPrint.window.height);
-}
-
-void NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
-{
-	return;
-}
-
-NPError	NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *value)
-{
-	NPError rv = NPERR_NO_ERROR;
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL) return NPERR_GENERIC_ERROR;
-
-	switch (variable) {
-#ifdef GECKO_XPCOM
-	case NPPVpluginScriptableInstance:
-		rv = NPOsmozilla_GetPeer(osmozilla, value);
-		break;
-
-	case NPPVpluginScriptableIID:
-		rv = NPOsmozilla_GetPeerIID(osmozilla, value);
-		break;
-#else
-
-	case NPPVpluginScriptableNPObject:
-		sBrowserFunctions->retainobject(osmozilla->script_obj);
-		* (void **)value = osmozilla->script_obj;
-		break;
-
-#endif
-	case NPPVpluginNeedsXEmbed:
-		*((int *)value) = 1;
-		break;
-	case NPPVpluginNameString :
-		*(const char**)value = "Osmozilla/GPAC plugin for NPAPI";
-		break;
-	default:
-		break;
-	}
-
-	return rv;
-}
-
-
-
-NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value)
-{
-	return NPERR_NO_ERROR;
-}
-
-int16_t	NPOsmozilla_HandleEvent(NPP instance, void* event)
-{
-	/*we hacked the proc*/
-	return 0;
-}
-
-
-NPError OSCALL NP_Shutdown()
-{
-#ifdef GECKO_XPCOM
-	NPOsmozilla_ReleaseServiceManager();
-#endif
-	return NPERR_NO_ERROR;
-}
-
-static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
-{
-	if(aNPPFuncs == NULL)
-		return NPERR_INVALID_FUNCTABLE_ERROR;
-
-	// Set up the plugin function table that Netscape will use to
-	// call us. Netscape needs to know about our version and size
-	// and have a UniversalProcPointer for every function we implement.
-
-	aNPPFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-	aNPPFuncs->newp = NPOsmozilla_New;
-	aNPPFuncs->destroy = NPOsmozilla_Destroy;
-	aNPPFuncs->setwindow = NPOsmozilla_SetWindow;
-	aNPPFuncs->newstream = NPOsmozilla_NewStream;
-	aNPPFuncs->destroystream = NPOsmozilla_DestroyStream;
-	aNPPFuncs->asfile = NPOsmozilla_StreamAsFile;
-	aNPPFuncs->writeready = NPOsmozilla_WriteReady;
-	aNPPFuncs->write = NPOsmozilla_Write;
-	aNPPFuncs->print = NPOsmozilla_Print;
-	aNPPFuncs->event = NPOsmozilla_HandleEvent;
-	aNPPFuncs->urlnotify = NPOsmozilla_URLNotify;
-	aNPPFuncs->getvalue = NPOsmozilla_GetValue;
-	aNPPFuncs->setvalue = NPOsmozilla_SetValue;
-	return NPERR_NO_ERROR;
-}
-
-
-static NPError NS_PluginInitialize()
-{
-#ifdef GECKO_XPCOM
-	NPOsmozilla_GetServiceManager();
-#endif
-	return NPERR_NO_ERROR;
-}
-
-// get values per plugin
-NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
-{
-	NPError err = NPERR_NO_ERROR;
-	switch (aVariable) {
-	case NPPVpluginNameString:
-		*((char **)aValue) = (char *) "Osmozilla";
-		break;
-	case NPPVpluginDescriptionString:
-		*((char **)aValue) = Osmozilla_GetVersion();
-		break;
-	default:
-		err = NPERR_INVALID_PARAM;
-		break;
-	}
-	return err;
-}
-
-
-
-
-#define GPAC_PLUGIN_MIMETYPES \
-	"audio/mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
-	"audio/x-mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
-	"audio/amr:amr,awb:AMR Audio;" \
-	"audio/mp4:mp4,mpg4,mpeg4,m4a:MPEG-4 Audio;" \
-	"audio/aac:aac:MPEG-4 AAC Music;" \
-	"audio/aacp:aac:MPEG-4 AACPlus Music;" \
-	"audio/basic:snd,au:Basic Audio;"	\
-	"audio/x-wav:wav:WAV Audio;"	\
-	"audio/3gpp:3gp,3gpp:3GPP/MMS Music;"	\
-	"audio/3gpp2:3g2,3gp2:3GPP2/MMS Music;"	\
-	"video/mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
-	"video/x-mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
-	"video/mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
-	"video/x-mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
-	"video/avi:avi:AVI Video;" \
-	"video/quicktime:mov,qt:QuickTime Movies;" \
-	"video/x-ms-asf:asf,asx:Windows Media Video;" \
-	"video/x-ms-wmv:wmv:Windows Media;" \
-	"video/mp4:mp4,mpg4:MPEG-4 Video;" \
-	"video/3gpp:3gp,3gpp:3GPP/MMS Video;" \
-	"video/3gpp2:3g2,3gp2:3GPP2/MMS Video;" \
-	"image/jpeg:jpeg,jpg:JPEG Images;"	\
-	"image/png:png:PNG Images;"	\
-	"image/bmp:bmp:MS Bitmap Images;"	\
-	"image/svg+xml:svg,svg.gz,svgz:SVG Document;"	\
-	"image/x-svgm:svgm:SVGM Document;"	\
-	"x-subtitle/srt:srt:SRT SubTitles;"	\
-	"x-subtitle/sub:sub:SUB SubTitles;"	\
-	"x-subtitle/ttxt:ttxt:GPAC 3GPP TimedText;"	\
-	"model/vrml:wrl,wrl.gz:VRML World;"	\
-	"model/x3d+vrml:x3dv,x3dv.gz,x3dvz:X3D/VRML World;"	\
-	"model/x3d+xml:x3d,x3d.gz,x3dz:X3D/XML World;" \
-	"application/ogg:ogg:Ogg Media;" \
-	"application/x-ogg:ogg:Ogg Media;" \
-	"application/x-bt:bt,bt.gz,btz:MPEG-4 Text (BT);"	\
-	"application/x-xmt:xmt,xmt.gz,xmtz:MPEG-4 Text (XMT);"	\
-	"application/mp4:mp4,mpg4:MPEG-4 Movies;" \
-	"application/sdp:sdp:Streaming Media Session;" \
-	/* explicit plugin call */ \
-	"application/x-gpac::GPAC plugin;" \
- 
-char * NP_GetMIMEDescription(void)
-{
-	return (char *) GPAC_PLUGIN_MIMETYPES;
-}
-
-
-NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
-{
-	return NS_PluginGetValue(aVariable, aValue);
-}
-
-
-#if defined(XP_WIN) || defined(XP_MACOS)
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
-{
-	sBrowserFunctions = aNPNFuncs;
-
-	return NS_PluginInitialize();
-}
-
-NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
-{
-	return fillPluginFunctionTable(aNPPFuncs);
-}
-
-
-#elif defined(XP_UNIX)
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
-{
-	NPError rv;
-	sBrowserFunctions = aNPNFuncs;
-	rv = fillPluginFunctionTable(aNPPFuncs);
-	if(rv != NPERR_NO_ERROR)
-		return rv;
-
-	return NS_PluginInitialize();
-}
-#endif
-
-
-#ifdef GECKO_XPCOM
-
-
-#include <nsIServiceManager.h>
-#include <nsIMemory.h>
-#include <nsISupportsUtils.h>
-#include <nsISupports.h>
-#include <nsMemory.h>
-
-#include "nsIOsmozilla.h"
-
-#include "osmozilla.h"
-
-
-nsIServiceManager *gServiceManager = NULL;
-
-
-// We must implement nsIClassInfo because it signals the
-// Mozilla Security Manager to allow calls from JavaScript.
-// helper class to implement all necessary nsIClassInfo method stubs
-// and to set flags used by the security system
-
-class nsClassInfoMixin : public nsIClassInfo
-{
-	// These flags are used by the DOM and security systems to signal that
-	// JavaScript callers are allowed to call this object's scritable methods.
-	NS_IMETHOD GetFlags(PRUint32 *aFlags)
-	{	*aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT;
-		return NS_OK;
-	}
-
-	NS_IMETHOD GetImplementationLanguage(PRUint32 *aImplementationLanguage)
-	{	*aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
-		return NS_OK;
-	}
-
-	// The rest of the methods can safely return error codes...
-	NS_IMETHOD GetInterfaces(PRUint32 *count, nsIID ***array)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetContractID(char **aContractID)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetClassDescription(char **aClassDescription)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetClassID(nsCID **aClassID)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-};
-
-
-class nsOsmozillaPeer : public nsIOsmozilla , public nsClassInfoMixin
-{
-public:
-	nsOsmozillaPeer(Osmozilla *osmo);
-	virtual ~nsOsmozillaPeer();
-
-	// methods from nsISupports
-	NS_IMETHOD QueryInterface(const nsIID & aIID, void **aInstancePtr);
-	NS_IMETHOD_(nsrefcnt) AddRef();
-	NS_IMETHOD_(nsrefcnt) Release();
-
-public:
-	NS_DECL_NSIOSMOZILLA
-	void SetInstance(Osmozilla *osmo);
-
-protected:
-	nsrefcnt mRefCnt;
-	Osmozilla *mPlugin;
-};
-
-
-static NS_DEFINE_IID(kIZillaPluginIID, NS_IOSMOZILLA_IID);
-static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsOsmozillaPeer::nsOsmozillaPeer(Osmozilla *osmo)
-{
-	mPlugin=osmo;
-	mRefCnt = 0;
-}
-
-nsOsmozillaPeer::~nsOsmozillaPeer()
-{
-}
-// Notice that we expose our claim to implement nsIClassInfo.
-//NS_IMPL_ISUPPORTS2(nsOsmozillaPeer, nsITestPlugin, nsIClassInfo)
-
-// the following method will be callable from JavaScript
-NS_IMETHODIMP nsOsmozillaPeer::Pause() {
-	Osmozilla_Pause(mPlugin);
-	return NS_OK;
-}
-NS_IMETHODIMP nsOsmozillaPeer::Play() {
-	Osmozilla_Play(mPlugin);
-	return NS_OK;
-}
-NS_IMETHODIMP nsOsmozillaPeer::Stop() {
-	Osmozilla_Stop(mPlugin);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands)
-{
-	Osmozilla_Update(mPlugin, type, commands);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up)
-{
-	Osmozilla_QualitySwitch(mPlugin, switch_up);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url)
-{
-	Osmozilla_SetURL(mPlugin, url);
-	return NS_OK;
-}
-
-void nsOsmozillaPeer::SetInstance(Osmozilla *osmo)
-{
-	mPlugin = osmo;
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::AddRef()
-{
-	++mRefCnt;
-	return mRefCnt;
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::Release()
-{
-	--mRefCnt;
-	if (mRefCnt == 0) {
-		delete this;
-		return 0;
-	}
-	return mRefCnt;
-}
-
-// here nsOsmozillaPeer should return three interfaces it can be asked for by their iid's
-// static casts are necessary to ensure that correct pointer is returned
-NS_IMETHODIMP nsOsmozillaPeer::QueryInterface(const nsIID & aIID,
- void **aInstancePtr)
-{
-	if (!aInstancePtr)
-		return NS_ERROR_NULL_POINTER;
-
-	if (aIID.Equals(kIZillaPluginIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kIClassInfoIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kISupportsIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
-		AddRef();
-		return NS_OK;
-	}
-	return NS_NOINTERFACE;
-}
-
-extern NPNetscapeFuncs *sBrowserFunctions;
-
-void NPOsmozilla_GetServiceManager()
-{
-	// this is probably a good place to get the service manager
-	// note that Mozilla will add reference, so do not forget to release
-	nsISupports *sm = NULL;
-
-	if (!sBrowserFunctions) return;
-	sBrowserFunctions->getvalue(NULL, NPNVserviceManager, &sm);
-
-	// Mozilla returns nsIServiceManager so we can use it directly; doing QI on
-	// nsISupports here can still be more appropriate in case something is changed
-	// in the future so we don't need to do casting of any sort.
-	if (sm) {
-		sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) &gServiceManager);
-		NS_RELEASE(sm);
-	}
-}
-
-void NPOsmozilla_ReleaseServiceManager()
-{
-#ifdef GECKO_XPCOM
-	// we should release the service manager
-	NS_IF_RELEASE(gServiceManager);
-	gServiceManager = NULL;
-#endif
-}
-
-void NPOsmozilla_ShutdownScript(Osmozilla *osmo)
-{
-	nsOsmozillaPeer *peer = (nsOsmozillaPeer *) osmo->scriptable_peer;
-	if (peer != NULL) {
-		peer->SetInstance(NULL);
-		NS_IF_RELEASE(peer);
-	}
-}
-
-
-NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value)
-{
-	if (!osmo->scriptable_peer) {
-		osmo->scriptable_peer = new nsOsmozillaPeer(osmo);
-		if (!osmo->scriptable_peer) return NPERR_OUT_OF_MEMORY_ERROR;
-		NS_ADDREF( (nsOsmozillaPeer *) osmo->scriptable_peer);
-	}
-
-	NS_ADDREF( (nsOsmozillaPeer *)osmo->scriptable_peer);
-	*(nsISupports **) value = (nsISupports *) osmo->scriptable_peer;
-	return NPERR_NO_ERROR;
-}
-
-NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value)
-{
-	static nsIID scriptableIID = NS_IOSMOZILLA_IID;
-	if (!sBrowserFunctions) return NPERR_OUT_OF_MEMORY_ERROR;
-
-	nsIID *ptr = (nsIID *) sBrowserFunctions->memalloc( sizeof(nsIID) );
-	if (! ptr) return NPERR_OUT_OF_MEMORY_ERROR;
-
-	*ptr = scriptableIID;
-	*(nsIID **) value = ptr;
-	return NPERR_NO_ERROR;
-}
-
-#else
-
-enum
-{
-	kOSMOZILLA_ID_METHOD_PLAY = 0,
-	kOSMOZILLA_ID_METHOD_PAUSE,
-	kOSMOZILLA_ID_METHOD_STOP,
-	kOSMOZILLA_ID_METHOD_UPDATE,
-	kOSMOZILLA_ID_METHOD_QUALITY_SWITCH,
-	kOSMOZILLA_ID_METHOD_SET_URL,
-
-	kOSMOZILLA_NUM_METHODS
-};
-
-NPIdentifier v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_NUM_METHODS];
-const NPUTF8 * v_OSMOZILLA_MethodNames[kOSMOZILLA_NUM_METHODS] = {
-	"Play",
-	"Pause",
-	"Stop",
-	"Update",
-	"QualitySwitch",
-	"SetURL",
-};
-
-NPClass osmozilla_script_class;
-
-typedef struct {
-	NPClass *_class;
-	uint32_t referenceCount;
-	Osmozilla *osmo;
-} OsmozillaObject;
-
-NPObject *OSMOZILLA_Allocate(NPP npp, NPClass *theClass)
-{
-	OsmozillaObject *obj = NULL;
-
-	sBrowserFunctions->getstringidentifiers(v_OSMOZILLA_MethodNames, kOSMOZILLA_NUM_METHODS, v_OSMOZILLA_MethodIdentifiers);
-	obj = (OsmozillaObject *)malloc(sizeof(OsmozillaObject));
-	obj->osmo = (Osmozilla *) npp->pdata;
-	return (NPObject *)obj;
-}
-
-void OSMOZILLA_Deallocate(NPObject* obj)
-{
-	free(obj);
-	return;
-}
-
-void OSMOZILLA_Invalidate(NPObject* obj)
-{
-	return;
-}
-
-bool OSMOZILLA_HasMethod(NPObject* obj, NPIdentifier name)
-{
-	int i = 0;
-	while (i < kOSMOZILLA_NUM_METHODS) {
-		if ( name == v_OSMOZILLA_MethodIdentifiers[i] ) {
-			return 1;
-		}
-		i++;
-	}
-	return 0;
-}
-
-bool OSMOZILLA_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-	OsmozillaObject *npo = (OsmozillaObject *)obj;
-	if (!npo->osmo) return 0;
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PLAY]) {
-		Osmozilla_Play(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PAUSE]) {
-		Osmozilla_Pause(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_STOP]) {
-		Osmozilla_Stop(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_UPDATE]) {
-		const char *mime = NULL;
-		const char *update = NULL;
-		if (argCount==2) {
-			mime = (args[0].type==NPVariantType_String) ? args[0].value.stringValue.UTF8Characters : NULL;
-			update = (args[1].type==NPVariantType_String) ? args[1].value.stringValue.UTF8Characters : NULL;
-		}
-		if (!update) return 0;
-		Osmozilla_Update(npo->osmo, mime, update);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_QUALITY_SWITCH]) {
-		int up = 1;
-		if (argCount==1) {
-			if (args[0].type==NPVariantType_Bool) up = args[0].value.boolValue ? 1 : 0;
-			else if (args[0].type==NPVariantType_Int32) up = args[0].value.intValue ? 1 : 0;
-		}
-		Osmozilla_QualitySwitch(npo->osmo, up);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_SET_URL]) {
-		const char *url = "";
-		if (argCount>=1) {
-			if (args[0].type==NPVariantType_String)
-				url = args[0].value.stringValue.UTF8Characters;
-		}
-		Osmozilla_SetURL(npo->osmo, url);
-		return 1;
-	}
-	return 0;
-}
-
-bool OSMOZILLA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-	return 1;
-}
-
-bool OSMOZILLA_HasProperty(NPObject* obj, NPIdentifier name)
-{
-	bool result = 0;
-	if ( sBrowserFunctions->identifierisstring(name) )
-	{
-		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
-
-		if ( !strcmp(val, "DownloadProgress") )
-		{
-			result = 1;
-		}
-
-		sBrowserFunctions->memfree(val);
-	}
-	/*nothing exposed yet*/
-	return result;
-}
-
-bool OSMOZILLA_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-	OsmozillaObject *npo = (OsmozillaObject *)obj;
-	if (!npo->osmo) return 0;
-	if ( sBrowserFunctions->identifierisstring(name) )
-	{
-		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
-
-		if ( !strcmp(val, "DownloadProgress") )
-		{
-			int val = Osmozilla_GetDownloadProgress(npo->osmo);
-			INT32_TO_NPVARIANT(val, *result);
-		}
-
-		sBrowserFunctions->memfree(val);
-	}
-	return 1;
-}
-
-bool OSMOZILLA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-	return 1;
-}
-
-bool OSMOZILLA_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-	return 1;
-}
-
-bool OSMOZILLA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-	return 1;
-}
-
-void Osmozilla_InitScripting(Osmozilla *osmo)
-{
-	osmozilla_script_class.allocate = OSMOZILLA_Allocate;
-	osmozilla_script_class.deallocate = OSMOZILLA_Deallocate;
-	osmozilla_script_class.invalidate = OSMOZILLA_Invalidate;
-	osmozilla_script_class.hasMethod = OSMOZILLA_HasMethod;
-	osmozilla_script_class.invoke = OSMOZILLA_Invoke;
-	osmozilla_script_class.invokeDefault = OSMOZILLA_InvokeDefault;
-	osmozilla_script_class.hasProperty = OSMOZILLA_HasProperty;
-	osmozilla_script_class.getProperty = OSMOZILLA_GetProperty;
-	osmozilla_script_class.setProperty = OSMOZILLA_SetProperty;
-	osmozilla_script_class.removeProperty = OSMOZILLA_RemoveProperty;
-	osmozilla_script_class.enumerate = OSMOZILLA_Enumerate;
-
-	/*create script object*/
-	osmo->script_obj = sBrowserFunctions->createobject(osmo->np_instance, &osmozilla_script_class);
-
-}
-
-#endif //GECKO_XPCOM
-
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+*					All rights reserved
+*
+* This file is part of GPAC / Osmozilla NPAPI plugin
+*
+* GPAC 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, or (at your option)
+* any later version.
+*
+* GPAC 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 this library; see the file COPYING. If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+
+////////////////////////////////////////////////////////////
+//
+// Implementation of Netscape entry points (NPN_*)
+//
+#include "osmo_npapi.h"
+#include "osmozilla.h"
+
+#if defined(XP_UNIX) && !defined(XP_MACOS)
+#include <malloc.h>
+#include <string.h>
+#endif
+
+NPNetscapeFuncs *sBrowserFunctions = NULL;
+
+NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target)
+{
+	if (!sBrowserFunctions) return NPERR_INVALID_FUNCTABLE_ERROR;
+	return sBrowserFunctions->geturl(instance, url, target);
+}
+
+void Osmozilla_SetStatus(NPP instance, const char *message)
+{
+	if (!sBrowserFunctions) return;
+	sBrowserFunctions->status(instance, message);
+}
+
+#ifndef GECKO_XPCOM
+void Osmozilla_InitScripting(Osmozilla *osmo);
+#endif
+
+NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
+{
+	Osmozilla *osmo;
+	NPError rv = NPERR_NO_ERROR;
+	if (instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmo = (Osmozilla *) malloc(sizeof(Osmozilla));
+	memset(osmo, 0, sizeof(Osmozilla));
+
+	osmo->np_instance = instance;
+	// associate the plugin instance object with NPP instance
+	instance->pdata = (void *)osmo;
+
+	osmo->supports_xembed = 0;
+	sBrowserFunctions->getvalue(NULL, NPNVSupportsXEmbedBool, (void *)&osmo->supports_xembed);
+
+	Osmozilla_Initialize(osmo, argc, argn, argv);
+
+#ifndef GECKO_XPCOM
+	Osmozilla_InitScripting(osmo);
+#endif
+
+	return rv;
+}
+
+// here is the place to clean up and destroy the nsPluginInstance object
+NPError NPOsmozilla_Destroy (NPP instance, NPSavedData** save)
+{
+	NPError rv = NPERR_NO_ERROR;
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmozilla = (Osmozilla*)instance->pdata;
+	if (osmozilla != NULL) {
+		Osmozilla_Shutdown(osmozilla);
+#ifdef GECKO_XPCOM
+		NPOsmozilla_ShutdownScript(osmozilla);
+#else
+		if (osmozilla->script_obj) sBrowserFunctions->releaseobject(osmozilla->script_obj);
+		osmozilla->script_obj = NULL;
+#endif
+
+		free(osmozilla);
+	}
+	instance->pdata = NULL;
+	return rv;
+}
+
+// during this call we know when the plugin window is ready or
+// is about to be destroyed so we can do some gui specific
+// initialization and shutdown
+NPError NPOsmozilla_SetWindow (NPP instance, NPWindow* pNPWindow)
+{
+	Osmozilla *osmozilla;
+	void *os_wnd_handle, *os_wnd_display;
+	NPError rv = NPERR_NO_ERROR;
+
+	if (!instance || !instance->pdata) return NPERR_INVALID_INSTANCE_ERROR;
+	if (pNPWindow == NULL) return NPERR_GENERIC_ERROR;
+	osmozilla = (Osmozilla *)instance->pdata;
+
+	// window just created
+	if (!osmozilla->window_set) {
+		if (pNPWindow->window == NULL) return NPERR_GENERIC_ERROR;
+
+#ifdef XP_WIN
+		os_wnd_handle = pNPWindow->window;
+		os_wnd_display = NULL;
+#elif defined(XP_MAXOS)
+		os_wnd_handle = pNPWindow->window;
+		os_wnd_display = NULL;
+#elif defined(XP_UNIX)
+		os_wnd_handle = pNPWindow->window;
+		/*HACK - although we don't use the display in the X11 plugin, this is used to signal that
+		the user is mozilla and prevent some X11 calls crashing the browser in file playing mode
+		(eg, "firefox myfile.mp4" )*/
+		os_wnd_display =((NPSetWindowCallbackStruct *)pNPWindow->ws_info)->display;
+#endif
+
+		if (! Osmozilla_SetWindow(osmozilla, os_wnd_handle, os_wnd_display, pNPWindow->width, pNPWindow->height) ) {
+			return NPERR_MODULE_LOAD_FAILED_ERROR;
+		}
+
+	}
+
+#if 0
+	// window goes away
+	if((pNPWindow->window == NULL) && plugin->isInitialized())
+		return plugin->SetWindow(pNPWindow);
+
+	// window resized?
+	if(plugin->isInitialized() && (pNPWindow->window != NULL))
+		return plugin->SetWindow(pNPWindow);
+
+	// this should not happen, nothing to do
+	if((pNPWindow->window == NULL) && !plugin->isInitialized())
+		return plugin->SetWindow(pNPWindow);
+#endif
+
+	return rv;
+}
+
+NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t *stype)
+{
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmozilla = (Osmozilla *)instance->pdata;
+	if(osmozilla== NULL)
+		return NPERR_GENERIC_ERROR;
+
+	Osmozilla_ConnectTo(osmozilla, stream->url);
+	*stype = NP_SEEK;
+	return NPERR_NO_ERROR;
+}
+
+NPINT32 NPOsmozilla_WriteReady (NPP instance, NPStream *stream)
+{
+	return 0x0fffffff;
+}
+
+NPINT32 NPOsmozilla_Write (NPP instance, NPStream *stream, NPINT32 offset, NPINT32 len, void *buffer)
+{
+	return len;
+}
+
+NPError NPOsmozilla_DestroyStream (NPP instance, NPStream *stream, NPError reason)
+{
+	return NPERR_NO_ERROR;
+}
+
+void NPOsmozilla_StreamAsFile (NPP instance, NPStream* stream, const char* fname)
+{
+}
+
+void NPOsmozilla_Print (NPP instance, NPPrint* printInfo)
+{
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return;
+
+	osmozilla = (Osmozilla *)instance->pdata;
+	if(osmozilla== NULL)
+		return;
+
+	Osmozilla_Print(osmozilla, (printInfo->mode == NP_EMBED) ? 1 : 0, printInfo->print.embedPrint.platformPrint,
+	 printInfo->print.embedPrint.window.x, printInfo->print.embedPrint.window.y,
+	 printInfo->print.embedPrint.window.width, printInfo->print.embedPrint.window.height);
+}
+
+void NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
+{
+	return;
+}
+
+NPError	NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *value)
+{
+	NPError rv = NPERR_NO_ERROR;
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmozilla = (Osmozilla *)instance->pdata;
+	if(osmozilla== NULL) return NPERR_GENERIC_ERROR;
+
+	switch (variable) {
+#ifdef GECKO_XPCOM
+	case NPPVpluginScriptableInstance:
+		rv = NPOsmozilla_GetPeer(osmozilla, value);
+		break;
+
+	case NPPVpluginScriptableIID:
+		rv = NPOsmozilla_GetPeerIID(osmozilla, value);
+		break;
+#else
+
+	case NPPVpluginScriptableNPObject:
+		sBrowserFunctions->retainobject(osmozilla->script_obj);
+		* (void **)value = osmozilla->script_obj;
+		break;
+
+#endif
+	case NPPVpluginNeedsXEmbed:
+		*((int *)value) = 1;
+		break;
+	case NPPVpluginNameString :
+		*(const char**)value = "Osmozilla/GPAC plugin for NPAPI";
+		break;
+	default:
+		break;
+	}
+
+	return rv;
+}
+
+
+
+NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value)
+{
+	return NPERR_NO_ERROR;
+}
+
+int16_t	NPOsmozilla_HandleEvent(NPP instance, void* event)
+{
+	/*we hacked the proc*/
+	return 0;
+}
+
+
+NPError OSCALL NP_Shutdown()
+{
+#ifdef GECKO_XPCOM
+	NPOsmozilla_ReleaseServiceManager();
+#endif
+	return NPERR_NO_ERROR;
+}
+
+static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
+{
+	if(aNPPFuncs == NULL)
+		return NPERR_INVALID_FUNCTABLE_ERROR;
+
+	// Set up the plugin function table that Netscape will use to
+	// call us. Netscape needs to know about our version and size
+	// and have a UniversalProcPointer for every function we implement.
+
+	aNPPFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
+	aNPPFuncs->newp = NPOsmozilla_New;
+	aNPPFuncs->destroy = NPOsmozilla_Destroy;
+	aNPPFuncs->setwindow = NPOsmozilla_SetWindow;
+	aNPPFuncs->newstream = NPOsmozilla_NewStream;
+	aNPPFuncs->destroystream = NPOsmozilla_DestroyStream;
+	aNPPFuncs->asfile = NPOsmozilla_StreamAsFile;
+	aNPPFuncs->writeready = NPOsmozilla_WriteReady;
+	aNPPFuncs->write = NPOsmozilla_Write;
+	aNPPFuncs->print = NPOsmozilla_Print;
+	aNPPFuncs->event = NPOsmozilla_HandleEvent;
+	aNPPFuncs->urlnotify = NPOsmozilla_URLNotify;
+	aNPPFuncs->getvalue = NPOsmozilla_GetValue;
+	aNPPFuncs->setvalue = NPOsmozilla_SetValue;
+	return NPERR_NO_ERROR;
+}
+
+
+static NPError NS_PluginInitialize()
+{
+#ifdef GECKO_XPCOM
+	NPOsmozilla_GetServiceManager();
+#endif
+	return NPERR_NO_ERROR;
+}
+
+// get values per plugin
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
+{
+	NPError err = NPERR_NO_ERROR;
+	switch (aVariable) {
+	case NPPVpluginNameString:
+		*((char **)aValue) = (char *) "Osmozilla";
+		break;
+	case NPPVpluginDescriptionString:
+		*((char **)aValue) = Osmozilla_GetVersion();
+		break;
+	default:
+		err = NPERR_INVALID_PARAM;
+		break;
+	}
+	return err;
+}
+
+
+
+
+#define GPAC_PLUGIN_MIMETYPES \
+	"audio/mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
+	"audio/x-mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
+	"audio/amr:amr,awb:AMR Audio;" \
+	"audio/mp4:mp4,mpg4,mpeg4,m4a:MPEG-4 Audio;" \
+	"audio/aac:aac:MPEG-4 AAC Music;" \
+	"audio/aacp:aac:MPEG-4 AACPlus Music;" \
+	"audio/basic:snd,au:Basic Audio;"	\
+	"audio/x-wav:wav:WAV Audio;"	\
+	"audio/3gpp:3gp,3gpp:3GPP/MMS Music;"	\
+	"audio/3gpp2:3g2,3gp2:3GPP2/MMS Music;"	\
+	"video/mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
+	"video/x-mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
+	"video/mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
+	"video/x-mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
+	"video/avi:avi:AVI Video;" \
+	"video/quicktime:mov,qt:QuickTime Movies;" \
+	"video/x-ms-asf:asf,asx:Windows Media Video;" \
+	"video/x-ms-wmv:wmv:Windows Media;" \
+	"video/mp4:mp4,mpg4:MPEG-4 Video;" \
+	"video/3gpp:3gp,3gpp:3GPP/MMS Video;" \
+	"video/3gpp2:3g2,3gp2:3GPP2/MMS Video;" \
+	"image/jpeg:jpeg,jpg:JPEG Images;"	\
+	"image/png:png:PNG Images;"	\
+	"image/bmp:bmp:MS Bitmap Images;"	\
+	"image/svg+xml:svg,svg.gz,svgz:SVG Document;"	\
+	"image/x-svgm:svgm:SVGM Document;"	\
+	"x-subtitle/srt:srt:SRT SubTitles;"	\
+	"x-subtitle/sub:sub:SUB SubTitles;"	\
+	"x-subtitle/ttxt:ttxt:GPAC 3GPP TimedText;"	\
+	"model/vrml:wrl,wrl.gz:VRML World;"	\
+	"model/x3d+vrml:x3dv,x3dv.gz,x3dvz:X3D/VRML World;"	\
+	"model/x3d+xml:x3d,x3d.gz,x3dz:X3D/XML World;" \
+	"application/ogg:ogg:Ogg Media;" \
+	"application/x-ogg:ogg:Ogg Media;" \
+	"application/x-bt:bt,bt.gz,btz:MPEG-4 Text (BT);"	\
+	"application/x-xmt:xmt,xmt.gz,xmtz:MPEG-4 Text (XMT);"	\
+	"application/mp4:mp4,mpg4:MPEG-4 Movies;" \
+	"application/sdp:sdp:Streaming Media Session;" \
+	/* explicit plugin call */ \
+	"application/x-gpac::GPAC plugin;" \
+ 
+char * NP_GetMIMEDescription(void)
+{
+	return (char *) GPAC_PLUGIN_MIMETYPES;
+}
+
+
+NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
+{
+	return NS_PluginGetValue(aVariable, aValue);
+}
+
+
+#if defined(XP_WIN) || defined(XP_MACOS)
+
+NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
+{
+	sBrowserFunctions = aNPNFuncs;
+
+	return NS_PluginInitialize();
+}
+
+NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
+{
+	return fillPluginFunctionTable(aNPPFuncs);
+}
+
+
+#elif defined(XP_UNIX)
+
+NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
+{
+	NPError rv;
+	sBrowserFunctions = aNPNFuncs;
+	rv = fillPluginFunctionTable(aNPPFuncs);
+	if(rv != NPERR_NO_ERROR)
+		return rv;
+
+	return NS_PluginInitialize();
+}
+#endif
+
+
+#ifdef GECKO_XPCOM
+
+
+#include <nsIServiceManager.h>
+#include <nsIMemory.h>
+#include <nsISupportsUtils.h>
+#include <nsISupports.h>
+#include <nsMemory.h>
+
+#include "nsIOsmozilla.h"
+
+#include "osmozilla.h"
+
+
+nsIServiceManager *gServiceManager = NULL;
+
+
+// We must implement nsIClassInfo because it signals the
+// Mozilla Security Manager to allow calls from JavaScript.
+// helper class to implement all necessary nsIClassInfo method stubs
+// and to set flags used by the security system
+
+class nsClassInfoMixin : public nsIClassInfo
+{
+	// These flags are used by the DOM and security systems to signal that
+	// JavaScript callers are allowed to call this object's scritable methods.
+	NS_IMETHOD GetFlags(PRUint32 *aFlags)
+	{	*aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT;
+		return NS_OK;
+	}
+
+	NS_IMETHOD GetImplementationLanguage(PRUint32 *aImplementationLanguage)
+	{	*aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
+		return NS_OK;
+	}
+
+	// The rest of the methods can safely return error codes...
+	NS_IMETHOD GetInterfaces(PRUint32 *count, nsIID ***array)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetContractID(char **aContractID)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetClassDescription(char **aClassDescription)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetClassID(nsCID **aClassID)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+	NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
+	{
+		return NS_ERROR_NOT_IMPLEMENTED;
+	}
+};
+
+
+class nsOsmozillaPeer : public nsIOsmozilla , public nsClassInfoMixin
+{
+public:
+	nsOsmozillaPeer(Osmozilla *osmo);
+	virtual ~nsOsmozillaPeer();
+
+	// methods from nsISupports
+	NS_IMETHOD QueryInterface(const nsIID & aIID, void **aInstancePtr);
+	NS_IMETHOD_(nsrefcnt) AddRef();
+	NS_IMETHOD_(nsrefcnt) Release();
+
+public:
+	NS_DECL_NSIOSMOZILLA
+	void SetInstance(Osmozilla *osmo);
+
+protected:
+	nsrefcnt mRefCnt;
+	Osmozilla *mPlugin;
+};
+
+
+static NS_DEFINE_IID(kIZillaPluginIID, NS_IOSMOZILLA_IID);
+static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+nsOsmozillaPeer::nsOsmozillaPeer(Osmozilla *osmo)
+{
+	mPlugin=osmo;
+	mRefCnt = 0;
+}
+
+nsOsmozillaPeer::~nsOsmozillaPeer()
+{
+}
+// Notice that we expose our claim to implement nsIClassInfo.
+//NS_IMPL_ISUPPORTS2(nsOsmozillaPeer, nsITestPlugin, nsIClassInfo)
+
+// the following method will be callable from JavaScript
+NS_IMETHODIMP nsOsmozillaPeer::Pause() {
+	Osmozilla_Pause(mPlugin);
+	return NS_OK;
+}
+NS_IMETHODIMP nsOsmozillaPeer::Play() {
+	Osmozilla_Play(mPlugin);
+	return NS_OK;
+}
+NS_IMETHODIMP nsOsmozillaPeer::Stop() {
+	Osmozilla_Stop(mPlugin);
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands)
+{
+	Osmozilla_Update(mPlugin, type, commands);
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up)
+{
+	Osmozilla_QualitySwitch(mPlugin, switch_up);
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url)
+{
+	Osmozilla_SetURL(mPlugin, url);
+	return NS_OK;
+}
+
+void nsOsmozillaPeer::SetInstance(Osmozilla *osmo)
+{
+	mPlugin = osmo;
+}
+
+NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::AddRef()
+{
+	++mRefCnt;
+	return mRefCnt;
+}
+
+NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::Release()
+{
+	--mRefCnt;
+	if (mRefCnt == 0) {
+		delete this;
+		return 0;
+	}
+	return mRefCnt;
+}
+
+// here nsOsmozillaPeer should return three interfaces it can be asked for by their iid's
+// static casts are necessary to ensure that correct pointer is returned
+NS_IMETHODIMP nsOsmozillaPeer::QueryInterface(const nsIID & aIID,
+ void **aInstancePtr)
+{
+	if (!aInstancePtr)
+		return NS_ERROR_NULL_POINTER;
+
+	if (aIID.Equals(kIZillaPluginIID)) {
+		*aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
+		AddRef();
+		return NS_OK;
+	}
+
+	if (aIID.Equals(kIClassInfoIID)) {
+		*aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
+		AddRef();
+		return NS_OK;
+	}
+
+	if (aIID.Equals(kISupportsIID)) {
+		*aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
+		AddRef();
+		return NS_OK;
+	}
+	return NS_NOINTERFACE;
+}
+
+extern NPNetscapeFuncs *sBrowserFunctions;
+
+void NPOsmozilla_GetServiceManager()
+{
+	// this is probably a good place to get the service manager
+	// note that Mozilla will add reference, so do not forget to release
+	nsISupports *sm = NULL;
+
+	if (!sBrowserFunctions) return;
+	sBrowserFunctions->getvalue(NULL, NPNVserviceManager, &sm);
+
+	// Mozilla returns nsIServiceManager so we can use it directly; doing QI on
+	// nsISupports here can still be more appropriate in case something is changed
+	// in the future so we don't need to do casting of any sort.
+	if (sm) {
+		sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) &gServiceManager);
+		NS_RELEASE(sm);
+	}
+}
+
+void NPOsmozilla_ReleaseServiceManager()
+{
+#ifdef GECKO_XPCOM
+	// we should release the service manager
+	NS_IF_RELEASE(gServiceManager);
+	gServiceManager = NULL;
+#endif
+}
+
+void NPOsmozilla_ShutdownScript(Osmozilla *osmo)
+{
+	nsOsmozillaPeer *peer = (nsOsmozillaPeer *) osmo->scriptable_peer;
+	if (peer != NULL) {
+		peer->SetInstance(NULL);
+		NS_IF_RELEASE(peer);
+	}
+}
+
+
+NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value)
+{
+	if (!osmo->scriptable_peer) {
+		osmo->scriptable_peer = new nsOsmozillaPeer(osmo);
+		if (!osmo->scriptable_peer) return NPERR_OUT_OF_MEMORY_ERROR;
+		NS_ADDREF( (nsOsmozillaPeer *) osmo->scriptable_peer);
+	}
+
+	NS_ADDREF( (nsOsmozillaPeer *)osmo->scriptable_peer);
+	*(nsISupports **) value = (nsISupports *) osmo->scriptable_peer;
+	return NPERR_NO_ERROR;
+}
+
+NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value)
+{
+	static nsIID scriptableIID = NS_IOSMOZILLA_IID;
+	if (!sBrowserFunctions) return NPERR_OUT_OF_MEMORY_ERROR;
+
+	nsIID *ptr = (nsIID *) sBrowserFunctions->memalloc( sizeof(nsIID) );
+	if (! ptr) return NPERR_OUT_OF_MEMORY_ERROR;
+
+	*ptr = scriptableIID;
+	*(nsIID **) value = ptr;
+	return NPERR_NO_ERROR;
+}
+
+#else
+
+enum
+{
+	kOSMOZILLA_ID_METHOD_PLAY = 0,
+	kOSMOZILLA_ID_METHOD_PAUSE,
+	kOSMOZILLA_ID_METHOD_STOP,
+	kOSMOZILLA_ID_METHOD_UPDATE,
+	kOSMOZILLA_ID_METHOD_QUALITY_SWITCH,
+	kOSMOZILLA_ID_METHOD_SET_URL,
+
+	kOSMOZILLA_NUM_METHODS
+};
+
+NPIdentifier v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_NUM_METHODS];
+const NPUTF8 * v_OSMOZILLA_MethodNames[kOSMOZILLA_NUM_METHODS] = {
+	"Play",
+	"Pause",
+	"Stop",
+	"Update",
+	"QualitySwitch",
+	"SetURL",
+};
+
+NPClass osmozilla_script_class;
+
+typedef struct {
+	NPClass *_class;
+	uint32_t referenceCount;
+	Osmozilla *osmo;
+} OsmozillaObject;
+
+NPObject *OSMOZILLA_Allocate(NPP npp, NPClass *theClass)
+{
+	OsmozillaObject *obj = NULL;
+
+	sBrowserFunctions->getstringidentifiers(v_OSMOZILLA_MethodNames, kOSMOZILLA_NUM_METHODS, v_OSMOZILLA_MethodIdentifiers);
+	obj = (OsmozillaObject *)malloc(sizeof(OsmozillaObject));
+	obj->osmo = (Osmozilla *) npp->pdata;
+	return (NPObject *)obj;
+}
+
+void OSMOZILLA_Deallocate(NPObject* obj)
+{
+	free(obj);
+	return;
+}
+
+void OSMOZILLA_Invalidate(NPObject* obj)
+{
+	return;
+}
+
+bool OSMOZILLA_HasMethod(NPObject* obj, NPIdentifier name)
+{
+	int i = 0;
+	while (i < kOSMOZILLA_NUM_METHODS) {
+		if ( name == v_OSMOZILLA_MethodIdentifiers[i] ) {
+			return 1;
+		}
+		i++;
+	}
+	return 0;
+}
+
+bool OSMOZILLA_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
+{
+	OsmozillaObject *npo = (OsmozillaObject *)obj;
+	if (!npo->osmo) return 0;
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PLAY]) {
+		Osmozilla_Play(npo->osmo);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PAUSE]) {
+		Osmozilla_Pause(npo->osmo);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_STOP]) {
+		Osmozilla_Stop(npo->osmo);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_UPDATE]) {
+		const char *mime = NULL;
+		const char *update = NULL;
+		if (argCount==2) {
+			mime = (args[0].type==NPVariantType_String) ? args[0].value.stringValue.UTF8Characters : NULL;
+			update = (args[1].type==NPVariantType_String) ? args[1].value.stringValue.UTF8Characters : NULL;
+		}
+		if (!update) return 0;
+		Osmozilla_Update(npo->osmo, mime, update);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_QUALITY_SWITCH]) {
+		int up = 1;
+		if (argCount==1) {
+			if (args[0].type==NPVariantType_Bool) up = args[0].value.boolValue ? 1 : 0;
+			else if (args[0].type==NPVariantType_Int32) up = args[0].value.intValue ? 1 : 0;
+		}
+		Osmozilla_QualitySwitch(npo->osmo, up);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_SET_URL]) {
+		const char *url = "";
+		if (argCount>=1) {
+			if (args[0].type==NPVariantType_String)
+				url = args[0].value.stringValue.UTF8Characters;
+		}
+		Osmozilla_SetURL(npo->osmo, url);
+		return 1;
+	}
+	return 0;
+}
+
+bool OSMOZILLA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
+{
+	return 1;
+}
+
+bool OSMOZILLA_HasProperty(NPObject* obj, NPIdentifier name)
+{
+	bool result = 0;
+	if ( sBrowserFunctions->identifierisstring(name) )
+	{
+		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
+
+		if ( !strcmp(val, "DownloadProgress") )
+		{
+			result = 1;
+		}
+
+		sBrowserFunctions->memfree(val);
+	}
+	/*nothing exposed yet*/
+	return result;
+}
+
+bool OSMOZILLA_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
+{
+	OsmozillaObject *npo = (OsmozillaObject *)obj;
+	if (!npo->osmo) return 0;
+	if ( sBrowserFunctions->identifierisstring(name) )
+	{
+		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
+
+		if ( !strcmp(val, "DownloadProgress") )
+		{
+			int val = Osmozilla_GetDownloadProgress(npo->osmo);
+			INT32_TO_NPVARIANT(val, *result);
+		}
+
+		sBrowserFunctions->memfree(val);
+	}
+	return 1;
+}
+
+bool OSMOZILLA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
+{
+	return 1;
+}
+
+bool OSMOZILLA_RemoveProperty(NPObject *npobj, NPIdentifier name)
+{
+	return 1;
+}
+
+bool OSMOZILLA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
+{
+	return 1;
+}
+
+void Osmozilla_InitScripting(Osmozilla *osmo)
+{
+	osmozilla_script_class.allocate = OSMOZILLA_Allocate;
+	osmozilla_script_class.deallocate = OSMOZILLA_Deallocate;
+	osmozilla_script_class.invalidate = OSMOZILLA_Invalidate;
+	osmozilla_script_class.hasMethod = OSMOZILLA_HasMethod;
+	osmozilla_script_class.invoke = OSMOZILLA_Invoke;
+	osmozilla_script_class.invokeDefault = OSMOZILLA_InvokeDefault;
+	osmozilla_script_class.hasProperty = OSMOZILLA_HasProperty;
+	osmozilla_script_class.getProperty = OSMOZILLA_GetProperty;
+	osmozilla_script_class.setProperty = OSMOZILLA_SetProperty;
+	osmozilla_script_class.removeProperty = OSMOZILLA_RemoveProperty;
+	osmozilla_script_class.enumerate = OSMOZILLA_Enumerate;
+
+	/*create script object*/
+	osmo->script_obj = sBrowserFunctions->createobject(osmo->np_instance, &osmozilla_script_class);
+
+}
+
+#endif //GECKO_XPCOM
+

v0.5.2.tar.gz/applications/osmozilla/osmozilla.cpp -> v0.6.1.tar.gz/applications/osmozilla/osmozilla.cpp Changed

v0.5.2.tar.gz/applications/osmozilla/osmozilla.rc -> v0.6.1.tar.gz/applications/osmozilla/osmozilla.rc Changed

v0.5.2.tar.gz/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters -> v0.6.1.tar.gz/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters Changed

@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_base.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_funcs.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\data_map.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\drm_sample.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_intern.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_read.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_store.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_write.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\media.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\media_odf.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\meta.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\sample_descs.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\stbl_read.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\stbl_write.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\track.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\tx3g.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\bitstream.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\error.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\list.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\desc_private.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\descriptors.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_code.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_codec.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_command.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_parse.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\media_tools\webvtt.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="main.c" />
- <ClCompile Include="..\..\..\src\utils\url.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\slc.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\alloc.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\configfile.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_divers.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_thread.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\ttml.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_file.c">
- <Filter>others</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="isoff">
- <UniqueIdentifier>{c9a8f639-328c-4505-be50-4859357c2c00}</UniqueIdentifier>
- </Filter>
- <Filter Include="others">
- <UniqueIdentifier>{e5ca7285-ca00-49d8-ac81-dff3d494be9a}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_base.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_funcs.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\data_map.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\drm_sample.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_intern.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_read.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_store.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_write.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\media.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\media_odf.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\meta.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\sample_descs.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\stbl_read.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\stbl_write.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\track.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\tx3g.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\bitstream.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\error.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\list.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\desc_private.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\descriptors.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_code.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_codec.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_command.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_parse.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\media_tools\webvtt.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="main.c" />
+ <ClCompile Include="..\..\..\src\utils\url.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\slc.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\alloc.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\configfile.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_divers.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_thread.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\ttml.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_file.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="isoff">
+ <UniqueIdentifier>{c9a8f639-328c-4505-be50-4859357c2c00}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="others">
+ <UniqueIdentifier>{e5ca7285-ca00-49d8-ac81-dff3d494be9a}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
 </Project>
\ No newline at end of file

v0.5.2.tar.gz/applications/testapps/broadcaster/broadcaster.c -> v0.6.1.tar.gz/applications/testapps/broadcaster/broadcaster.c Changed

v0.5.2.tar.gz/applications/testapps/broadcaster/sdp_generator.c -> v0.6.1.tar.gz/applications/testapps/broadcaster/sdp_generator.c Changed

v0.5.2.tar.gz/applications/testapps/dmbrs/main.c -> v0.6.1.tar.gz/applications/testapps/dmbrs/main.c Changed

@@ -26,15 +26,15 @@
 
 void save_ts(char *filename, unsigned char *data)
 {
-	FILE *ts_out = fopen(filename,"a+b");
+	FILE *ts_out = gf_fopen(filename,"a+b");
 	gf_fwrite(data, 1, 188, ts_out);
-	fclose(ts_out);
+	gf_fclose(ts_out);
 }
 void save_rs_0(char *filename, unsigned char *data)
 {
-	FILE *rs_out = fopen(filename,"a+b");
+	FILE *rs_out = gf_fopen(filename,"a+b");
 	gf_fwrite(data, 1, 204, rs_out);
-	fclose(rs_out);
+	gf_fclose(rs_out);
 }
 
 void RS_Interleaver(GF_BitStream *bs, char *out_name)
@@ -209,7 +209,7 @@
 
 	/* generation d'un TS aléatoire */
 	/*
-		if ((in=fopen(argv[1], "wb")) == NULL) {
+		if ((in=gf_fopen(argv[1], "wb")) == NULL) {
 			printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
 		}
 		{
@@ -223,8 +223,8 @@
 				gf_fwrite(buffer, 1, 188, in);
 			}
 		}
-		fclose(in);
-		if ((in=fopen(argv[1], "rb")) == NULL) {
+		gf_fclose(in);
+		if ((in=gf_fopen(argv[1], "rb")) == NULL) {
 			printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
 		}
 
@@ -232,12 +232,12 @@
 		if (bs == NULL) return;
 
 		RS_Interleaver(bs, argv[2]);
-		fclose(in);
+		gf_fclose(in);
 		gf_bs_del(bs);
 	*/
 
 
-	if ((in=fopen(argv[1], "rb")) == NULL) {
+	if ((in=gf_fopen(argv[1], "rb")) == NULL) {
 		printf( "Impossible d'ouvrir %s en lecture.\n", argv[1]);
 	}
 
@@ -245,7 +245,7 @@
 	if (bs == NULL) return;
 
 	RS_Deinterleaver(bs, argv[2]);
-	fclose(in);
+	gf_fclose(in);
 	gf_bs_del(bs);
 
 }
\ No newline at end of file

v0.5.2.tar.gz/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters -> v0.6.1.tar.gz/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters Changed

@@ -1,140 +1,140 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_base.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\box_funcs.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\data_map.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\drm_sample.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_intern.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_read.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_store.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\isom_write.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\media.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\media_odf.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\meta.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\sample_descs.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\stbl_read.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\stbl_write.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\track.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\tx3g.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\bitstream.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\error.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\list.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\desc_private.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\descriptors.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_code.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_codec.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_command.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\odf_parse.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\media_tools\webvtt.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="main.c" />
- <ClCompile Include="..\..\..\src\utils\url.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\odf\slc.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\alloc.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\configfile.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_config_init.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_thread.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_divers.c">
- <Filter>others</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\isomedia\ttml.c">
- <Filter>isoff</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\utils\os_file.c">
- <Filter>others</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="isoff">
- <UniqueIdentifier>{c9a8f639-328c-4505-be50-4859357c2c00}</UniqueIdentifier>
- </Filter>
- <Filter Include="others">
- <UniqueIdentifier>{e5ca7285-ca00-49d8-ac81-dff3d494be9a}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_base.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\box_funcs.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\data_map.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\drm_sample.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_intern.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_read.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_store.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\isom_write.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\media.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\media_odf.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\meta.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\sample_descs.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\stbl_read.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\stbl_write.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\track.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\tx3g.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\bitstream.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\error.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\list.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\desc_private.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\descriptors.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_code.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_codec.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_command.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\odf_parse.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\media_tools\webvtt.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="main.c" />
+ <ClCompile Include="..\..\..\src\utils\url.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\odf\slc.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\alloc.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\configfile.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_config_init.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_thread.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_divers.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\isomedia\ttml.c">
+ <Filter>isoff</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\utils\os_file.c">
+ <Filter>others</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="isoff">
+ <UniqueIdentifier>{c9a8f639-328c-4505-be50-4859357c2c00}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="others">
+ <UniqueIdentifier>{e5ca7285-ca00-49d8-ac81-dff3d494be9a}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
 </Project>
\ No newline at end of file

v0.5.2.tar.gz/applications/testapps/fmp4demux/main.c -> v0.6.1.tar.gz/applications/testapps/fmp4demux/main.c Changed

v0.6.1.tar.gz/applications/testapps/hevcbench/Makefile Added

v0.5.2.tar.gz/applications/testapps/hevcbench/defbench.h -> v0.6.1.tar.gz/applications/testapps/hevcbench/defbench.h Changed

@@ -1,111 +1,123 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2012
- *					All rights reserved
- *
- * This file is part of GPAC - sample DASH library usage
- *
- */
-
-#ifndef __DEF_BENCH_H__
-#define __DEF_BENCH_H__
-
-#include <gpac/isomedia.h>
-#include <openHevcWrapper.h>
-#include <windows.h>
-#define SDL_MAIN_HANDLED
-#include <SDL.h>
-#include <gpac/maths.h>
-
-#define GL_GLEXT_PROTOTYPES
-
-#include <GL/GL.h>
-#include <gpac/isomedia.h>
-
-
-
-
-#define GL_CHECK_ERR {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
-
-/*macros for GL proto and fun declaration*/
-#ifdef _WIN32_WCE
-#define GLAPICAST *
-#elif defined(WIN32)
-#include <windows.h>
-#define GLAPICAST APIENTRY *
-#else
-#define GLAPICAST *
-#endif
-
-#define GLDECL(ret, funname, args)	\
-typedef ret (GLAPICAST proc_ ## funname)args;	\
-extern proc_ ## funname funname;	\
- 
-#define GLDECL_STATIC(funname) proc_ ## funname funname = NULL
-
-#if defined GPAC_USE_TINYGL
-//no extensions with TinyGL
-#elif defined (GPAC_USE_OGL_ES)
-//no extensions with OpenGL ES
-#elif defined(WIN32) || defined (GPAC_CONFIG_WIN32)
-#define LOAD_GL_FUNCS
-#define GET_GLFUN(funname) funname = (proc_ ## funname) wglGetProcAddress(#funname)
-#elif defined(CONFIG_DARWIN_GL)
-extern void (*glutGetProcAddress(const GLubyte *procname))( void );
-#define GET_GLFUN(funname) funname = (proc_ ## funname) glutGetProcAddress(#funname)
-#else
-#define LOAD_GL_FUNCS
-extern void (*glXGetProcAddress(const GLubyte *procname))( void );
-#define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname)
-#endif
-
-
-
-#define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
-#define DEL_PROGRAM(_a) if (_a) { glDeleteProgram(_a); _a = 0; }
-
-
-GLDECL(GLuint, glCreateProgram, (void) )
-GLDECL(void, glDeleteProgram, (GLuint ) )
-GLDECL(void, glLinkProgram, (GLuint program) )
-GLDECL(void, glUseProgram, (GLuint program) )
-GLDECL(GLuint, glCreateShader, (GLenum shaderType) )
-GLDECL(void, glDeleteShader, (GLuint shader) )
-GLDECL(void, glShaderSource, (GLuint shader, GLsizei count, const char **string, const GLint *length) )
-GLDECL(void, glCompileShader, (GLuint shader) )
-GLDECL(void, glAttachShader, (GLuint program, GLuint shader) )
-GLDECL(void, glDetachShader, (GLuint program, GLuint shader) )
-GLDECL(void, glGetShaderiv, (GLuint shader, GLenum type, GLint *res) )
-GLDECL(void, glGetInfoLogARB, (GLuint shader, GLint size, GLsizei *rsize, const char *logs) )
-GLDECL(GLint, glGetUniformLocation, (GLuint prog, const char *name) )
-GLDECL(void, glUniform1f, (GLint location, GLfloat v0) )
-GLDECL(void, glUniform1i, (GLint location, GLint v0) )
-GLDECL(void, glActiveTexture, (GLenum texture) )
-GLDECL(void, glClientActiveTexture, (GLenum texture) )
-GLDECL(void, glGenBuffers, (GLsizei , GLuint *) )
-GLDECL(void, glDeleteBuffers, (GLsizei , GLuint *) )
-GLDECL(void, glBindBuffer, (GLenum, GLuint ) )
-GLDECL(void, glBufferData, (GLenum, int, void *, GLenum) )
-GLDECL(void, glBufferSubData, (GLenum, int, int, void *) )
-GLDECL(void *, glMapBuffer, (GLenum, GLenum) )
-GLDECL(void *, glUnmapBuffer, (GLenum) )
-
-
-#define GL_TEXTURE_RECTANGLE_EXT 0x84F5
-
-#define GL_INFO_LOG_LENGTH 0x8B84
-#define GL_FRAGMENT_SHADER 0x8B30
-#define GL_VERTEX_SHADER 0x8B31
-#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC
-#define GL_STREAM_DRAW_ARB 0x88E0
-#define GL_WRITE_ONLY_ARB 0x88B9
-#define GL_DYNAMIC_DRAW_ARB 0x88E8
-
-#define 	GL_TEXTURE0 0x84C0
-#define 	GL_TEXTURE1 0x84C1
-#define 	GL_TEXTURE2 0x84C2
-
-
-#endif
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2012
+ *					All rights reserved
+ *
+ * This file is part of GPAC - sample DASH library usage
+ *
+ */
+
+#ifndef __DEF_BENCH_H__
+#define __DEF_BENCH_H__
+
+#include <gpac/isomedia.h>
+#include <openHevcWrapper.h>
+
+#ifdef WIN32
+
+#include <windows.h>
+#endif
+
+
+#define SDL_MAIN_HANDLED
+#include <SDL.h>
+#include <gpac/maths.h>
+
+#define GL_GLEXT_PROTOTYPES
+
+#if defined (CONFIG_DARWIN_GL)
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+
+#include <gpac/color.h>
+
+
+
+
+#define GL_CHECK_ERR {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
+
+/*macros for GL proto and fun declaration*/
+#ifdef _WIN32_WCE
+#define GLAPICAST *
+#elif defined(WIN32)
+#include <windows.h>
+#define GLAPICAST APIENTRY *
+#else
+#define GLAPICAST *
+#endif
+
+#define GLDECL(ret, funname, args)	\
+typedef ret (GLAPICAST proc_ ## funname)args;	\
+extern proc_ ## funname funname;	\
+ 
+#define GLDECL_STATIC(funname) proc_ ## funname funname = NULL
+
+#if defined GPAC_USE_TINYGL
+//no extensions with TinyGL
+#elif defined (GPAC_USE_GLES1X)
+//no extensions with OpenGL ES
+#elif defined(WIN32) || defined (GPAC_CONFIG_WIN32)
+#define LOAD_GL_FUNCS
+#define GET_GLFUN(funname) funname = (proc_ ## funname) wglGetProcAddress(#funname)
+#elif defined(CONFIG_DARWIN_GL)
+extern void (*glutGetProcAddress(const GLubyte *procname))( void );
+#define GET_GLFUN(funname) funname = (proc_ ## funname) glutGetProcAddress(#funname)
+#else
+#define LOAD_GL_FUNCS
+extern void (*glXGetProcAddress(const GLubyte *procname))( void );
+#define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname)
+#endif
+
+
+
+#define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
+#define DEL_PROGRAM(_a) if (_a) { glDeleteProgram(_a); _a = 0; }
+
+
+#ifdef WIN32
+GLDECL(GLuint, glCreateProgram, (void) )
+GLDECL(void, glDeleteProgram, (GLuint ) )
+GLDECL(void, glLinkProgram, (GLuint program) )
+GLDECL(void, glUseProgram, (GLuint program) )
+GLDECL(GLuint, glCreateShader, (GLenum shaderType) )
+GLDECL(void, glDeleteShader, (GLuint shader) )
+GLDECL(void, glShaderSource, (GLuint shader, GLsizei count, const char **string, const GLint *length) )
+GLDECL(void, glCompileShader, (GLuint shader) )
+GLDECL(void, glAttachShader, (GLuint program, GLuint shader) )
+GLDECL(void, glDetachShader, (GLuint program, GLuint shader) )
+GLDECL(void, glGetShaderiv, (GLuint shader, GLenum type, GLint *res) )
+GLDECL(void, glGetInfoLogARB, (GLuint shader, GLint size, GLsizei *rsize, const char *logs) )
+GLDECL(GLint, glGetUniformLocation, (GLuint prog, const char *name) )
+GLDECL(void, glUniform1f, (GLint location, GLfloat v0) )
+GLDECL(void, glUniform1i, (GLint location, GLint v0) )
+GLDECL(void, glActiveTexture, (GLenum texture) )
+GLDECL(void, glClientActiveTexture, (GLenum texture) )
+GLDECL(void, glGenBuffers, (GLsizei , GLuint *) )
+GLDECL(void, glDeleteBuffers, (GLsizei , GLuint *) )
+GLDECL(void, glBindBuffer, (GLenum, GLuint ) )
+GLDECL(void, glBufferData, (GLenum, int, void *, GLenum) )
+GLDECL(void, glBufferSubData, (GLenum, int, int, void *) )
+GLDECL(void *, glMapBuffer, (GLenum, GLenum) )
+GLDECL(void *, glUnmapBuffer, (GLenum) )
+#endif
+
+#define GL_TEXTURE_RECTANGLE_EXT 0x84F5
+
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC
+#define GL_STREAM_DRAW_ARB 0x88E0
+#define GL_WRITE_ONLY_ARB 0x88B9
+#define GL_DYNAMIC_DRAW_ARB 0x88E8
+
+#define 	GL_TEXTURE0 0x84C0
+#define 	GL_TEXTURE1 0x84C1
+#define 	GL_TEXTURE2 0x84C2
+
+
+#endif

v0.5.2.tar.gz/applications/testapps/hevcbench/hevcbench.vcxproj -> v0.6.1.tar.gz/applications/testapps/hevcbench/hevcbench.vcxproj Changed

v0.5.2.tar.gz/applications/testapps/hevcbench/main.c -> v0.6.1.tar.gz/applications/testapps/hevcbench/main.c Changed

@@ -1,858 +1,938 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2012
- *					All rights reserved
- *
- * This file is part of GPAC - sample DASH library usage
- *
- */
-
-#include "defbench.h"
-
-
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
-# pragma comment(lib, "libLibOpenHevcWrapper")
-#pragma comment(lib, "SDL2")
-//#pragma comment(lib, "SDL2main")
-#pragma comment(lib, "opengl32")
-#endif
-
-//0: memcpy - 1: memmove - 2: u32 * cast and for loop copy of u32* - 3: memset 0 - 4: not touching the mapped buffer: 5: full memcpy, rely on stride in pixelstorei
-#define COPY_TYPE 0
-//set to 1 to disable final gltexImage in PBO mode
-#define NO_TEX	0
-
-
-SDL_Window *window = NULL;
-SDL_GLContext *glctx= NULL;
-SDL_Renderer *render= NULL;
-GLint txid[3];
-u8 *pY = NULL;
-u8 *pU = NULL;
-u8 *pV = NULL;
-u32 width = 0;
-u32 height = 0;
-u32 size=0;
-u32 bpp=8;
-u32 Bpp=1;
-GLint memory_format=GL_UNSIGNED_BYTE;
-GLint pixel_format=GL_LUMINANCE;
-GLint texture_type=GL_TEXTURE_RECTANGLE_EXT;
-u32 gl_nb_frames = 1;
-u64 gl_upload_time = 0;
-u64 gl_draw_time = 0;
-Bool pbo_mode = GF_TRUE;
-Bool first_tx_load = GF_FALSE;
-Bool use_vsync=0;
-
-GLint glsl_program;
-GLint vertex_shader;
-GLint fragment_shader;
-
-GLint pbo_Y=0;
-GLint pbo_U=0;
-GLint pbo_V=0;
-
-GLDECL_STATIC(glActiveTexture);
-GLDECL_STATIC(glClientActiveTexture);
-GLDECL_STATIC(glCreateProgram);
-GLDECL_STATIC(glDeleteProgram);
-GLDECL_STATIC(glLinkProgram);
-GLDECL_STATIC(glUseProgram);
-GLDECL_STATIC(glCreateShader);
-GLDECL_STATIC(glDeleteShader);
-GLDECL_STATIC(glShaderSource);
-GLDECL_STATIC(glCompileShader);
-GLDECL_STATIC(glAttachShader);
-GLDECL_STATIC(glDetachShader);
-GLDECL_STATIC(glGetShaderiv);
-GLDECL_STATIC(glGetInfoLogARB);
-GLDECL_STATIC(glGetUniformLocation);
-GLDECL_STATIC(glUniform1f);
-GLDECL_STATIC(glUniform1i);
-GLDECL_STATIC(glGenBuffers);
-GLDECL_STATIC(glDeleteBuffers);
-GLDECL_STATIC(glBindBuffer);
-GLDECL_STATIC(glBufferData);
-GLDECL_STATIC(glBufferSubData);
-GLDECL_STATIC(glMapBuffer);
-GLDECL_STATIC(glUnmapBuffer);
-
-
-static char *glsl_yuv_shader = "\
-	#version 140\n\
-	#extension GL_ARB_texture_rectangle : enable\n\
-	uniform sampler2DRect y_plane;\
-	uniform sampler2DRect u_plane;\
-	uniform sampler2DRect v_plane;\
-	uniform float width;\
-	uniform float height;\
-	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\
-	const vec3 R_mul = vec3(1.164, 0.000, 1.596);\
-	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\
-	const vec3 B_mul = vec3(1.164, 2.018, 0.000);\
-	out vec4 FragColor;\
-	void main(void) \
-	{\
-		vec2 texc;\
-		vec3 yuv, rgb;\
-		texc = gl_TexCoord[0].st;\
-		texc.y = 1.0 - texc.y;\
-		texc.x *= width;\
-		texc.y *= height;\
-		yuv.x = texture2DRect(y_plane, texc).r; \
-		texc.x /= 2.0;\
-		texc.y /= 2.0;\
-		yuv.y = texture2DRect(u_plane, texc).r; \
-		yuv.z = texture2DRect(v_plane, texc).r; \
-		yuv += offset; \
-	 rgb.r = dot(yuv, R_mul); \
-	 rgb.g = dot(yuv, G_mul); \
-	 rgb.b = dot(yuv, B_mul); \
-		FragColor = vec4(rgb, 1.0);\
-	}";
-
-static char *default_glsl_vertex = "\
-	varying vec3 gfNormal;\
-	varying vec3 gfView;\
-	void main(void)\
-	{\
-		gfView = vec3(gl_ModelViewMatrix * gl_Vertex);\
-		gfNormal = normalize(gl_NormalMatrix * gl_Normal);\
-		gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\
-		gl_TexCoord[0] = gl_MultiTexCoord0;\
-	}";
-
-
-
-Bool sdl_compile_shader(u32 shader_id, const char *name, const char *source)
-{
-	GLint blen = 0;
-	GLsizei slen = 0;
-	u32 len;
-	if (!source || !shader_id) return 0;
-	len = (u32) strlen(source);
-	glShaderSource(shader_id, 1, &source, &len);
-	glCompileShader(shader_id);
-
-	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
-	if (blen > 1) {
-		char* compiler_log = (char*) gf_malloc(blen);
-#ifdef CONFIG_DARWIN_GL
-		glGetInfoLogARB((GLhandleARB) shader_id, blen, &slen, compiler_log);
-#else
-		glGetInfoLogARB(shader_id, blen, &slen, compiler_log);
-#endif
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile shader %s: %s\n", name, compiler_log));
-		gf_free (compiler_log);
-		return 0;
-	}
-	return 1;
-}
-
-void sdl_init(u32 _width, u32 _height, u32 _bpp, u32 stride, Bool use_pbo)
-{
-	u32 i, flags;
-	Float hw, hh;
-	GLint loc;
-	GF_Matrix mx;
-	width = _width;
-	height = _height;
-	bpp = _bpp;
-
-
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
-	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
-	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-
-	flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_BORDERLESS | SDL_WINDOW_MAXIMIZED;
-	if (use_vsync) flags |= SDL_RENDERER_PRESENTVSYNC;
-	window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags);
-	glctx = SDL_GL_CreateContext(window);
-	SDL_GL_MakeCurrent(window, glctx);
-
-	render = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
-
-
-#if (COPY_TYPE==5)
-	size = stride*height;
-#else
-	size = width*height;
-#endif
-	if (bpp>8) {
-		size *= 2;
-		Bpp = 2;
-	}
-	pY = gf_malloc(size*sizeof(u8));
-	memset(pY, 0x80, size*sizeof(u8));
-	pU = gf_malloc(size/4*sizeof(u8));
-	memset(pU, 0, size/4*sizeof(u8));
-	pV = gf_malloc(size/4*sizeof(u8));
-	memset(pV, 0, size/4*sizeof(u8));
-
-	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-	glViewport(0, 0, width, height);
-
-	gf_mx_init(mx);
-	hw = ((Float)width)/2;
-	hh = ((Float)height)/2;
-	gf_mx_ortho(&mx, -hw, hw, -hh, hh, 50, -50);
-	glMatrixMode(GL_PROJECTION);
-	glLoadMatrixf(mx.m);
-
-
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
-
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-
-	glClear(GL_DEPTH_BUFFER_BIT);
-	glDisable(GL_NORMALIZE);
-	glDisable(GL_DEPTH_TEST);
-	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_LIGHTING);
-	glDisable(GL_BLEND);
-	glDisable(GL_TEXTURE_2D);
-	glDisable(GL_CULL_FACE);
-
-
-	GET_GLFUN(glActiveTexture);
-	GET_GLFUN(glClientActiveTexture);
-	GET_GLFUN(glCreateProgram);
-	GET_GLFUN(glDeleteProgram);
-	GET_GLFUN(glLinkProgram);
-	GET_GLFUN(glUseProgram);
-	GET_GLFUN(glCreateShader);
-	GET_GLFUN(glDeleteShader);
-	GET_GLFUN(glShaderSource);
-	GET_GLFUN(glCompileShader);
-	GET_GLFUN(glAttachShader);
-	GET_GLFUN(glDetachShader);
-	GET_GLFUN(glGetShaderiv);
-	GET_GLFUN(glGetInfoLogARB);
-	GET_GLFUN(glGetUniformLocation);
-	GET_GLFUN(glUniform1f);
-	GET_GLFUN(glUniform1i);
-	GET_GLFUN(glGenBuffers);
-	GET_GLFUN(glDeleteBuffers);
-	GET_GLFUN(glBindBuffer);
-	GET_GLFUN(glBufferData);
-	GET_GLFUN(glBufferSubData);
-	GET_GLFUN(glMapBuffer);
-	GET_GLFUN(glUnmapBuffer);
-
-	glsl_program = glCreateProgram();
-	vertex_shader = glCreateShader(GL_VERTEX_SHADER);
-	sdl_compile_shader(vertex_shader, "vertex", default_glsl_vertex);
-
-	fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
-	sdl_compile_shader(fragment_shader, "fragment", glsl_yuv_shader);
-
-	glAttachShader(glsl_program, vertex_shader);
-	glAttachShader(glsl_program, fragment_shader);
-	glLinkProgram(glsl_program);
-
-	glGenTextures(3, txid);
-	for (i=0; i<3; i++) {
-
-		glEnable(texture_type);
-		glBindTexture(texture_type, txid[i] );
-		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-		if (bpp>8) {
-			glPixelTransferi(GL_RED_SCALE, 64);
-			memory_format=GL_UNSIGNED_SHORT;
-		}
-		glTexParameteri(texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP);
-		glTexParameteri(texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP);
-		glTexParameteri(texture_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexParameteri(texture_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-		if (bpp>8) {
-			glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
-		} else {
-			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-		}
-		glDisable(texture_type);
-	}
-
-	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
-	glUseProgram(glsl_program);
-	for (i=0; i<3; i++) {
-		const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
-		loc = glGetUniformLocation(glsl_program, txname);
-		if (loc == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
-			continue;
-		}
-		glUniform1i(loc, i);
-	}
-	loc = glGetUniformLocation(glsl_program, "width");
-	if (loc>= 0) {
-		Float w = (Float) width;
-		glUniform1f(loc, w);
-	}
-	loc = glGetUniformLocation(glsl_program, "height");
-	if (loc>= 0) {
-		Float h = (Float) height;
-		glUniform1f(loc, h);
-	}
-
-	glUseProgram(0);
-
-
-	if (glMapBuffer==NULL) use_pbo = GF_FALSE;
-
-
-	pbo_mode = use_pbo;
-	first_tx_load = use_pbo ? GF_FALSE : GF_TRUE;
-	if (use_pbo) {
-		glGenBuffers(1, &pbo_Y);
-		glGenBuffers(1, &pbo_U);
-		glGenBuffers(1, &pbo_V);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
-		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
-		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
-		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-	}
-}
-
-void sdl_close()
-{
-	DEL_SHADER(vertex_shader);
-	DEL_SHADER(fragment_shader);
-	DEL_PROGRAM(glsl_program );
-
-	if (pbo_mode && pbo_Y) {
-		glDeleteBuffers(1, &pbo_Y);
-		glDeleteBuffers(1, &pbo_U);
-		glDeleteBuffers(1, &pbo_V);
-	}
-
-	if (pY) gf_free(pY);
-	if (pU) gf_free(pU);
-	if (pV) gf_free(pV);
-
-	if (glctx) SDL_GL_DeleteContext(glctx);
-	if (render) SDL_DestroyRenderer(render);
-	if (window) SDL_DestroyWindow(window);
-}
-
-void sdl_draw_quad()
-{
-	Float w = ((Float)width)/2;
-	Float h = ((Float)height)/2;
-
-	glBegin(GL_QUADS);
-
-	glVertex3f(w, h, 0);
-	glTexCoord2f(1, 0);
-
-	glVertex3f(w, -h, 0);
-	glTexCoord2f(0, 0);
-
-	glVertex3f(-w, -h, 0);
-	glTexCoord2f(0, 1);
-
-	glVertex3f(-w, h, 0);
-	glTexCoord2f(1, 1);
-
-	glEnd();
-}
-
-
-void sdl_draw_frame(u8 *pY, u8 *pU, u8 *pV, u32 w, u32 h, u32 bit_depth, u32 stride)
-{
-	u32 needs_stride = 0;
-	u64 now, end;
-
-	if (stride != w) {
-		if (bit_depth==10) {
-			if (stride != 2*w) {
-				needs_stride = stride / 2;
-			}
-		} else {
-			needs_stride = stride;
-		}
-	}
-
-	glEnable(texture_type);
-
-	now = gf_sys_clock_high_res();
-
-
-	if (first_tx_load) {
-		glBindTexture(texture_type, txid[0] );
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
-		glTexImage2D(texture_type, 0, 1, w, h, 0, pixel_format, memory_format, pY);
-
-		glBindTexture(texture_type, txid[1] );
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
-		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, pU);
-
-		glBindTexture(texture_type, txid[2] );
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
-		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, pV);
-
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-		first_tx_load = GF_FALSE;
-	} else if (pbo_mode) {
-		u32 i, linesize, count, p_stride;
-		u8 *ptr;
-#if (COPY_TYPE==2)
-		u32 *s, *d;
-		u32 j, c2;
-#endif
-
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
-		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
-#if (COPY_TYPE==5)
-		memcpy(ptr, pY, size);
-#elif (COPY_TYPE==3)
-		memset(ptr, 0x80, size);
-#elif (COPY_TYPE==4)
-#else
-		linesize = width*Bpp;
-		p_stride = stride;
-		count = h;
-#if (COPY_TYPE==2)
-		c2 = linesize/4;
-		s = (u32 *)pY;
-		d = (u32 *)ptr;
-#endif
-		for (i=0; i<count; i++) {
-#if (COPY_TYPE==0) || (COPY_TYPE==1)
-#if (COPY_TYPE==0)
-			memcpy(ptr, pY, linesize);
-#else
-			memmove(ptr, pY, linesize);
-#endif
-			pY+= p_stride;
-			ptr += linesize;
-#else
-			for (j=0; j<linesize/4; j++) {
-				*d++ = *s++;;
-			}
-			s+= (p_stride-linesize)/4;
-#endif
-		}
-#endif
-		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
-		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
-#if (COPY_TYPE==5)
-		memcpy(ptr, pU, size/4);
-#elif (COPY_TYPE==3)
-		memset(ptr, 0x80, size/4);
-#elif (COPY_TYPE==4)
-#else
-		linesize = width*Bpp/2;
-		p_stride = stride/2;
-		count/=2;
-#if (COPY_TYPE==2)
-		c2 /= 2;
-		s = (u32 *)pU;
-		d = (u32 *)ptr;
-#endif
-		for (i=0; i<count; i++) {
-#if (COPY_TYPE==0) || (COPY_TYPE==1)
-#if (COPY_TYPE==0)
-			memcpy(ptr, pU, linesize);
-#else
-			memmove(ptr, pU, linesize);
-#endif
-			pU+= p_stride;
-			ptr += linesize;
-#else
-			for (j=0; j<linesize/4; j++) {
-				*d++ = *s++;;
-			}
-			s+= (p_stride-linesize)/4;
-#endif
-		}
-#endif
-		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
-		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
-#if (COPY_TYPE==5)
-		memcpy(ptr, pV, size/4);
-#elif (COPY_TYPE==3)
-		memset(ptr, 0x80, size/4);
-#elif (COPY_TYPE==4)
-#else
-#if (COPY_TYPE==2)
-		s = (u32 *)pV;
-		d = (u32 *)ptr;
-#endif
-		for (i=0; i<count; i++) {
-#if (COPY_TYPE==0) || (COPY_TYPE==1)
-#if (COPY_TYPE==0)
-			memcpy(ptr, pV, linesize);
-#else
-			memmove(ptr, pV, linesize);
-#endif
-			pV+= p_stride;
-			ptr += linesize;
-#else
-			for (j=0; j<linesize/4; j++) {
-				*d++ = *s++;;
-			}
-			s+= (p_stride-linesize)/4;
-#endif
-		}
-#endif
-		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
-
-#if (COPY_TYPE!=5)
-		needs_stride=0;
-#endif
-
-
-#if (NO_TEX==0)
-		glBindTexture(texture_type, txid[0] );
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
-		glTexImage2D(texture_type, 0, 1, w, h, 0, pixel_format, memory_format, NULL);
-		//glTexSubImage2D crashes with PBO and 2-bytes luminance on my FirePro W5000 ...
-//		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
-
-		glBindTexture(texture_type, txid[1] );
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
-		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, NULL);
-//		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pU);
-
-		glBindTexture(texture_type, txid[2] );
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
-		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, NULL);
-//		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pV);
-#endif
-
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	} else {
-		glBindTexture(texture_type, txid[0] );
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
-		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
-		glBindTexture(texture_type, 0);
-
-		glBindTexture(texture_type, txid[1] );
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
-		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pU);
-		glBindTexture(texture_type, 0);
-
-		glBindTexture(texture_type, txid[2] );
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
-		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pV);
-		glBindTexture(texture_type, 0);
-
-		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	}
-	end = gf_sys_clock_high_res() - now;
-
-	if (!first_tx_load) {
-		gl_nb_frames ++;
-		gl_upload_time += end;
-	}
-
-	glUseProgram(glsl_program);
-
-	glActiveTexture(GL_TEXTURE2);
-	glBindTexture(texture_type, txid[2]);
-
-	glActiveTexture(GL_TEXTURE1);
-	glBindTexture(texture_type, txid[1]);
-
-	glActiveTexture(GL_TEXTURE0 );
-	glBindTexture(texture_type, txid[0]);
-
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-	glClientActiveTexture(GL_TEXTURE0);
-
-	sdl_draw_quad();
-
-	glDisable(texture_type);
-	glUseProgram(0);
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(texture_type, 0);
-
-	SDL_GL_SwapWindow(window);
-
-	gl_draw_time += gf_sys_clock_high_res() - now;
-	return;
-}
-
-
-void sdl_bench()
-{
-	Double rate;
-	u32 i, count;
-	u64 start = gf_sys_clock_high_res();
-
-	count = 600;
-	for (i=0; i<count; i++) {
-		sdl_draw_frame(pY, pU, pV, width, height, bpp, width);
-	}
-
-	start = gf_sys_clock_high_res() - start;
-	rate = 3*size/2;
-	rate *= count*1000;
-	rate /= start; //in ms
-	rate /= 1000; //==*1000 (in s) / 1000 * 1000 in MB /s
-	fprintf(stdout, "gltext pushed %d frames in %d ms - FPS %g - data rate %g MB/s\n", count, start/1000, 1000000.0*count/start, rate);
-}
-
-void PrintUsage()
-{
-	fprintf(stderr, "USAGE: [OPTS] file.mp4\n"
-	 "\n"
-	 "Options:\n"
-	 "-bench-yuv: only bench YUV upload rate\n"
-	 "-bench-yuv10: only bench YUV10 upload rate\n"
-	 "-sys-mem: uses copy from decoder mem to system mem before upload (removes stride)\n"
-	 "-use-pbo: uses PixelBufferObject for texture transfer\n"
-	 "-no-display: disables video output\n"
-	 "-nb-threads=N: sets number of frame to N (default N=6)\n"
-	 "-mode=[frame|wpp|frame+wpp] : sets threading type (default is frame)\n"
-	 );
-}
-
-
-
-int main(int argc, char **argv)
-{
-	Bool sdl_bench_yuv = GF_FALSE;
-	Bool no_display = GF_FALSE;
-	u64 start, now;
-	u32 check_prompt;
-	Bool sdl_is_init=GF_FALSE, run;
-	Bool paused = GF_FALSE;
-	u64 pause_time = 0;
-	GF_ISOFile *isom;
-	u32 i, count, track = 0;
-	u32 nb_frames_at_start = 0;
-	GF_ESD *esd;
-	u32 nb_threads = 6;
-	u32 mode = 1;
-	Bool use_raw_memory = GF_TRUE;
-	OpenHevc_Handle ohevc;
-	Bool use_pbo = GF_FALSE;
-	Bool enable_mem_tracker = GF_FALSE;
-	const char *src = NULL;
-
-	if (argc<2) {
-		PrintUsage();
-		return 0;
-	}
-
-	for (i=0; i<(u32)argc; i++) {
-		char *arg = argv[i];
-		if (arg[0]!='-') {
-			src = arg;
-			continue;
-		}
-		if (!strcmp(arg, "-bench-yuv")) sdl_bench_yuv=1;
-		else if (!strcmp(arg, "-bench-yuv10")) sdl_bench_yuv=2;
-		else if (!strcmp(arg, "-sys-mem")) use_raw_memory = 0;
-		else if (!strcmp(arg, "-vsync")) use_vsync = 1;
-		else if (!strcmp(arg, "-use-pbo")) use_pbo = 1;
-		else if (!strcmp(arg, "-no-display")) no_display = 1;
-		else if (!strcmp(arg, "-mem-track")) enable_mem_tracker = GF_TRUE;
-		else if (!strncmp(arg, "-nb-threads=", 12)) nb_threads = atoi(arg+12);
-		else if (!strncmp(arg, "-mode=", 6)) {
-			if (!strcmp(arg+6, "wpp")) mode = 2;
-			else if (!strcmp(arg+6, "frame+wpp")) mode = 3;
-			else mode = 1;
-		}
-
-		else if (!strcmp(arg, "-h")) {
-			PrintUsage();
-			return 0;
-		}
-	}
-
-
-
-	/*****************/
-	/* gpac init */
-	/*****************/
-#ifdef GPAC_MEMORY_TRACKING
-	gf_sys_init(enable_mem_tracker);
-#else
-	gf_sys_init(GF_FALSE);
-#endif
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-
-	if (sdl_bench_yuv) {
-		sdl_init(3840, 2160, (sdl_bench_yuv==2) ? 10 : 8, 3840, use_pbo);
-		sdl_bench();
-		sdl_close();
-		gf_sys_close();
-		return 0;
-	}
-	if (!src) {
-		PrintUsage();
-		gf_sys_close();
-		return 0;
-	}
-
-
-	isom = gf_isom_open(src, GF_ISOM_OPEN_READ, NULL);
-	if (!isom) {
-		sdl_close();
-		gf_sys_close();
-		return 0;
-	}
-
-	for (i=0; i<gf_isom_get_track_count(isom); i++) {
-		if (gf_isom_get_hevc_shvc_type(isom, i+1, 1)>=GF_ISOM_HEVCTYPE_HEVC_ONLY) {
-			track = i+1;
-			break;
-		}
-	}
-
-	if (!track) {
-		gf_isom_close(isom);
-		sdl_close();
-		gf_sys_close();
-		return 0;
-	}
-
-	count = gf_isom_get_sample_count(isom, track);
-	start = gf_sys_clock_high_res();
-
-	esd = gf_isom_get_esd(isom, track, 1);
-	ohevc = libOpenHevcInit(nb_threads, mode);
-	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		libOpenHevcCopyExtraData(ohevc, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength+8);
-	}
-
-	libOpenHevcSetActiveDecoders(ohevc, 1);
-	libOpenHevcSetViewLayers(ohevc, 1);
-
-	libOpenHevcStartDecoder(ohevc);
-	gf_odf_desc_del((GF_Descriptor *)esd);
-	gf_isom_set_sample_padding(isom, track, 8);
-
-	run=1;
-	check_prompt=0;
-	for (i=0; i<count && run; i++) {
-		u32 di;
-		if (!paused) {
-			GF_ISOSample *sample = gf_isom_get_sample(isom, track, i+1, &di);
-
-			if ( libOpenHevcDecode(ohevc, sample->data, sample->dataLength, sample->DTS+sample->CTS_Offset) ) {
-				if (no_display) {
-					OpenHevc_Frame HVCFrame_ptr;
-					libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
-				} else if (use_raw_memory) {
-					OpenHevc_Frame HVCFrame_ptr;
-					libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
-
-
-					if (!sdl_is_init && !no_display) {
-						sdl_init(HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, HVCFrame_ptr.frameInfo.nBitDepth, HVCFrame_ptr.frameInfo.nYPitch, use_pbo);
-						sdl_is_init=1;
-						start = gf_sys_clock_high_res();
-						nb_frames_at_start = i+1;
-					}
-
-					sdl_draw_frame((u8 *) HVCFrame_ptr.pvY, (u8 *) HVCFrame_ptr.pvU, (u8 *) HVCFrame_ptr.pvV, HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, HVCFrame_ptr.frameInfo.nBitDepth, HVCFrame_ptr.frameInfo.nYPitch);
-				} else {
-					OpenHevc_Frame_cpy HVCFrame;
-					memset(&HVCFrame, 0, sizeof(OpenHevc_Frame_cpy) );
-
-					libOpenHevcGetPictureInfoCpy(ohevc, &HVCFrame.frameInfo);
-
-					if (!sdl_is_init && !no_display) {
-						sdl_init(HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch, use_pbo);
-						sdl_is_init=1;
-						start = gf_sys_clock_high_res();
-						nb_frames_at_start = i+1;
-					}
-
-					HVCFrame.pvY = (void*) pY;
-					HVCFrame.pvU = (void*) pU;
-					HVCFrame.pvV = (void*) pV;
-
-					libOpenHevcGetOutputCpy(ohevc, 1, &HVCFrame);
-
-					sdl_draw_frame(pY, pU, pV, HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch);
-				}
-			}
-
-			gf_isom_sample_del(&sample);
-
-			now = gf_sys_clock_high_res();
-			fprintf(stderr, "%d %% %d frames in %d ms - FPS %03.2f - push time "LLD" ms - draw "LLD" ms\r", 100*(i+1-nb_frames_at_start)/count, i+1-nb_frames_at_start, (now-start)/1000, 1000000.0 * (i+1-nb_frames_at_start) / (now-start), gl_upload_time / gl_nb_frames/1000 , (gl_draw_time - gl_upload_time) / gl_nb_frames/1000 );
-		} else {
-			gf_sleep(10);
-			i--;
-		}
-		check_prompt++;
-		if (check_prompt==50) {
-			if (gf_prompt_has_input()) {
-				switch (gf_prompt_get_char()) {
-				case 'q':
-					run = 0;
-					break;
-				case 'm':
-					use_raw_memory = !use_raw_memory;
-					break;
-				case 'p':
-					if (paused) {
-						paused=0;
-						start += gf_sys_clock_high_res()-pause_time;
-					} else {
-						paused = 1;
-						pause_time=gf_sys_clock_high_res();
-					}
-					break;
-				case 'r':
-					start = gf_sys_clock_high_res();
-					nb_frames_at_start = i+1;
-					gl_upload_time = gl_draw_time = 0;
-					gl_nb_frames=1;
-					break;
-
-				}
-			}
-			check_prompt=0;
-		}
-	}
-	now = gf_sys_clock_high_res();
-	fprintf(stderr, "\nDecoded %d frames in %d ms - FPS %g\n", i+1, (now-start)/1000, 1000000.0 * (i+1) / (now-start) );
-
-	libOpenHevcClose(ohevc);
-	gf_isom_close(isom);
-
-	if (!no_display)
-		sdl_close();
-
-	gf_sys_close();
-	return 1;
-}
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2012
+ *					All rights reserved
+ *
+ * This file is part of GPAC - sample DASH library usage
+ *
+ */
+
+#include "defbench.h"
+
+
+
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
+# pragma comment(lib, "libLibOpenHevcWrapper")
+#pragma comment(lib, "SDL2")
+//#pragma comment(lib, "SDL2main")
+#pragma comment(lib, "opengl32")
+#endif
+
+#if defined( _LP64 ) && defined(CONFIG_DARWIN_GL)
+#define GF_SHADERID u64
+#else
+#define GF_SHADERID u32
+#endif
+
+
+//0: memcpy - 1: memmove - 2: u32 * cast and for loop copy of u32* - 3: memset 0 - 4: not touching the mapped buffer: 5: full memcpy, rely on stride in pixelstorei
+#define COPY_TYPE 0
+//set to 1 to disable final gltexImage in PBO mode
+#define NO_TEX	0
+
+
+SDL_Window *window = NULL;
+SDL_GLContext *glctx= NULL;
+SDL_Renderer *render= NULL;
+GLint txid[3];
+u8 *pY = NULL;
+u8 *pU = NULL;
+u8 *pV = NULL;
+u32 width = 0;
+u32 height = 0;
+u32 size=0;
+u32 bpp=8;
+u32 Bpp=1;
+GLint memory_format=GL_UNSIGNED_BYTE;
+GLint pixel_format=GL_LUMINANCE;
+GLint texture_type=GL_TEXTURE_RECTANGLE_EXT;
+u32 gl_nb_frames = 1;
+u64 gl_upload_time = 0;
+u64 gl_draw_time = 0;
+u64 gl_upload_time_frame = 0;
+u64 gl_draw_time_frame = 0;
+Bool pbo_mode = GF_TRUE;
+Bool first_tx_load = GF_FALSE;
+Bool use_vsync=0;
+
+GLint glsl_program;
+GF_SHADERID vertex_shader;
+GF_SHADERID fragment_shader;
+
+GLint pbo_Y=0;
+GLint pbo_U=0;
+GLint pbo_V=0;
+
+#ifdef WIN32
+GLDECL_STATIC(glActiveTexture);
+GLDECL_STATIC(glClientActiveTexture);
+GLDECL_STATIC(glCreateProgram);
+GLDECL_STATIC(glDeleteProgram);
+GLDECL_STATIC(glLinkProgram);
+GLDECL_STATIC(glUseProgram);
+GLDECL_STATIC(glCreateShader);
+GLDECL_STATIC(glDeleteShader);
+GLDECL_STATIC(glShaderSource);
+GLDECL_STATIC(glCompileShader);
+GLDECL_STATIC(glAttachShader);
+GLDECL_STATIC(glDetachShader);
+GLDECL_STATIC(glGetShaderiv);
+GLDECL_STATIC(glGetInfoLogARB);
+GLDECL_STATIC(glGetUniformLocation);
+GLDECL_STATIC(glUniform1f);
+GLDECL_STATIC(glUniform1i);
+GLDECL_STATIC(glGenBuffers);
+GLDECL_STATIC(glDeleteBuffers);
+GLDECL_STATIC(glBindBuffer);
+GLDECL_STATIC(glBufferData);
+GLDECL_STATIC(glBufferSubData);
+GLDECL_STATIC(glMapBuffer);
+GLDECL_STATIC(glUnmapBuffer);
+#endif
+
+
+static char *glsl_yuv_shader = "\
+	#version 140\n\
+	#extension GL_ARB_texture_rectangle : enable\n\
+	uniform sampler2DRect y_plane;\
+	uniform sampler2DRect u_plane;\
+	uniform sampler2DRect v_plane;\
+	uniform float width;\
+	uniform float height;\
+	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\
+	const vec3 R_mul = vec3(1.164, 0.000, 1.596);\
+	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\
+	const vec3 B_mul = vec3(1.164, 2.018, 0.000);\
+	out vec4 FragColor;\
+	void main(void) \
+	{\
+		vec2 texc;\
+		vec3 yuv, rgb;\
+		texc = gl_TexCoord[0].st;\
+		texc.y = 1.0 - texc.y;\
+		texc.x *= width;\
+		texc.y *= height;\
+		yuv.x = texture2DRect(y_plane, texc).r; \
+		texc.x /= 2.0;\
+		texc.y /= 2.0;\
+		yuv.y = texture2DRect(u_plane, texc).r; \
+		yuv.z = texture2DRect(v_plane, texc).r; \
+		yuv += offset; \
+	 rgb.r = dot(yuv, R_mul); \
+	 rgb.g = dot(yuv, G_mul); \
+	 rgb.b = dot(yuv, B_mul); \
+		FragColor = vec4(rgb, 1.0);\
+	}";
+
+static char *default_glsl_vertex = "\
+	varying vec3 gfNormal;\
+	varying vec3 gfView;\
+	void main(void)\
+	{\
+		gfView = vec3(gl_ModelViewMatrix * gl_Vertex);\
+		gfNormal = normalize(gl_NormalMatrix * gl_Normal);\
+		gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\
+		gl_TexCoord[0] = gl_MultiTexCoord0;\
+	}";
+
+
+
+Bool sdl_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
+{
+	GLint blen = 0;
+	GLsizei slen = 0;
+	u32 len;
+	if (!source || !shader_id) return 0;
+	len = (u32) strlen(source);
+	glShaderSource(shader_id, 1, &source, &len);
+	glCompileShader(shader_id);
+
+	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
+	if (blen > 1) {
+		char* compiler_log = (char*) gf_malloc(blen);
+#ifdef CONFIG_DARWIN_GL
+		glGetInfoLogARB((GLhandleARB) shader_id, blen, &slen, compiler_log);
+#else
+		glGetInfoLogARB(shader_id, blen, &slen, compiler_log);
+#endif
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile shader %s: %s\n", name, compiler_log));
+		gf_free (compiler_log);
+		return 0;
+	}
+	return 1;
+}
+
+void sdl_init(u32 _width, u32 _height, u32 _bpp, u32 stride, Bool use_pbo)
+{
+	u32 i, flags;
+	Float hw, hh;
+	GLint loc;
+	GF_Matrix mx;
+	width = _width;
+	height = _height;
+	bpp = _bpp;
+
+
+	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
+	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+
+	flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_BORDERLESS;
+	if (height==2160) flags |= SDL_WINDOW_MAXIMIZED;
+
+	if (use_vsync) flags |= SDL_RENDERER_PRESENTVSYNC;
+	window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags);
+	glctx = SDL_GL_CreateContext(window);
+	SDL_GL_MakeCurrent(window, glctx);
+
+	render = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+
+
+#if (COPY_TYPE==5)
+	size = stride*height;
+#else
+	size = width*height;
+#endif
+	if (bpp>8) {
+		size *= 2;
+		Bpp = 2;
+	}
+	pY = gf_malloc(size*sizeof(u8));
+	memset(pY, 0x80, size*sizeof(u8));
+	pU = gf_malloc(size/4*sizeof(u8));
+	memset(pU, 0, size/4*sizeof(u8));
+	pV = gf_malloc(size/4*sizeof(u8));
+	memset(pV, 0, size/4*sizeof(u8));
+
+	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+	glViewport(0, 0, width, height);
+
+	gf_mx_init(mx);
+	hw = ((Float)width)/2;
+	hh = ((Float)height)/2;
+	gf_mx_ortho(&mx, -hw, hw, -hh, hh, 50, -50);
+	glMatrixMode(GL_PROJECTION);
+	glLoadMatrixf(mx.m);
+
+
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glClear(GL_DEPTH_BUFFER_BIT);
+	glDisable(GL_NORMALIZE);
+	glDisable(GL_DEPTH_TEST);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable(GL_LINE_SMOOTH);
+	glDisable(GL_LINE_SMOOTH);
+	glDisable(GL_LIGHTING);
+	glDisable(GL_BLEND);
+	glDisable(GL_TEXTURE_2D);
+	glDisable(GL_CULL_FACE);
+
+#ifdef WIN32
+
+	GET_GLFUN(glActiveTexture);
+	GET_GLFUN(glClientActiveTexture);
+	GET_GLFUN(glCreateProgram);
+	GET_GLFUN(glDeleteProgram);
+	GET_GLFUN(glLinkProgram);
+	GET_GLFUN(glUseProgram);
+	GET_GLFUN(glCreateShader);
+	GET_GLFUN(glDeleteShader);
+	GET_GLFUN(glShaderSource);
+	GET_GLFUN(glCompileShader);
+	GET_GLFUN(glAttachShader);
+	GET_GLFUN(glDetachShader);
+	GET_GLFUN(glGetShaderiv);
+	GET_GLFUN(glGetInfoLogARB);
+	GET_GLFUN(glGetUniformLocation);
+	GET_GLFUN(glUniform1f);
+	GET_GLFUN(glUniform1i);
+	GET_GLFUN(glGenBuffers);
+	GET_GLFUN(glDeleteBuffers);
+	GET_GLFUN(glBindBuffer);
+	GET_GLFUN(glBufferData);
+	GET_GLFUN(glBufferSubData);
+	GET_GLFUN(glMapBuffer);
+	GET_GLFUN(glUnmapBuffer);
+#endif
+
+	glsl_program = glCreateProgram();
+	vertex_shader = glCreateShader(GL_VERTEX_SHADER);
+	sdl_compile_shader(vertex_shader, "vertex", default_glsl_vertex);
+
+	fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
+	sdl_compile_shader(fragment_shader, "fragment", glsl_yuv_shader);
+
+	glAttachShader(glsl_program, vertex_shader);
+	glAttachShader(glsl_program, fragment_shader);
+	glLinkProgram(glsl_program);
+
+	glGenTextures(3, txid);
+	for (i=0; i<3; i++) {
+
+		glEnable(texture_type);
+		glBindTexture(texture_type, txid[i] );
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		if (bpp>8) {
+			glPixelTransferi(GL_RED_SCALE, 64);
+			memory_format=GL_UNSIGNED_SHORT;
+		}
+		glTexParameteri(texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP);
+		glTexParameteri(texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP);
+		glTexParameteri(texture_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(texture_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+
+		if (bpp>8) {
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+		} else {
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		}
+		glDisable(texture_type);
+	}
+
+	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
+	glUseProgram(glsl_program);
+	for (i=0; i<3; i++) {
+		const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
+		loc = glGetUniformLocation(glsl_program, txname);
+		if (loc == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
+			continue;
+		}
+		glUniform1i(loc, i);
+	}
+	loc = glGetUniformLocation(glsl_program, "width");
+	if (loc>= 0) {
+		Float w = (Float) width;
+		glUniform1f(loc, w);
+	}
+	loc = glGetUniformLocation(glsl_program, "height");
+	if (loc>= 0) {
+		Float h = (Float) height;
+		glUniform1f(loc, h);
+	}
+
+	glUseProgram(0);
+
+
+	if (glMapBuffer==NULL) use_pbo = GF_FALSE;
+
+
+	pbo_mode = use_pbo;
+	first_tx_load = use_pbo ? GF_FALSE : GF_TRUE;
+	if (use_pbo) {
+		glGenBuffers(1, &pbo_Y);
+		glGenBuffers(1, &pbo_U);
+		glGenBuffers(1, &pbo_V);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+	}
+}
+
+void sdl_close()
+{
+	DEL_SHADER(vertex_shader);
+	DEL_SHADER(fragment_shader);
+	DEL_PROGRAM(glsl_program );
+
+	if (pbo_mode && pbo_Y) {
+		glDeleteBuffers(1, &pbo_Y);
+		glDeleteBuffers(1, &pbo_U);
+		glDeleteBuffers(1, &pbo_V);
+	}
+
+	if (pY) gf_free(pY);
+	if (pU) gf_free(pU);
+	if (pV) gf_free(pV);
+
+	if (glctx) SDL_GL_DeleteContext(glctx);
+	if (render) SDL_DestroyRenderer(render);
+	if (window) SDL_DestroyWindow(window);
+}
+
+void sdl_draw_quad()
+{
+	Float w = ((Float)width)/2;
+	Float h = ((Float)height)/2;
+
+	glBegin(GL_QUADS);
+
+	glVertex3f(w, h, 0);
+	glTexCoord2f(1, 0);
+
+	glVertex3f(w, -h, 0);
+	glTexCoord2f(0, 0);
+
+	glVertex3f(-w, -h, 0);
+	glTexCoord2f(0, 1);
+
+	glVertex3f(-w, h, 0);
+	glTexCoord2f(1, 1);
+
+	glEnd();
+}
+
+
+void sdl_draw_frame(u8 *pY, u8 *pU, u8 *pV, u32 w, u32 h, u32 bit_depth, u32 stride)
+{
+	u32 needs_stride = 0;
+	u64 draw_start, end;
+
+	if (stride != w) {
+		if (bit_depth==10) {
+			if (stride != 2*w) {
+				needs_stride = stride / 2;
+			}
+		} else {
+			needs_stride = stride;
+		}
+	}
+
+	glEnable(texture_type);
+
+	draw_start = gf_sys_clock_high_res();
+
+
+	if (first_tx_load) {
+		glBindTexture(texture_type, txid[0] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+		glTexImage2D(texture_type, 0, 1, w, h, 0, pixel_format, memory_format, pY);
+
+		glBindTexture(texture_type, txid[1] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, pU);
+
+		glBindTexture(texture_type, txid[2] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, pV);
+
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+		first_tx_load = GF_FALSE;
+	} else if (pbo_mode) {
+		u32 i, linesize, count, p_stride;
+		u8 *ptr;
+#if (COPY_TYPE==2)
+		u32 *s, *d;
+		u32 j, c2;
+#endif
+
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+#if (COPY_TYPE==5)
+		memcpy(ptr, pY, size);
+#elif (COPY_TYPE==3)
+		memset(ptr, 0x80, size);
+#elif (COPY_TYPE==4)
+#else
+		linesize = width*Bpp;
+		p_stride = stride;
+		count = h;
+#if (COPY_TYPE==2)
+		c2 = linesize/4;
+		s = (u32 *)pY;
+		d = (u32 *)ptr;
+#endif
+		for (i=0; i<count; i++) {
+#if (COPY_TYPE==0) || (COPY_TYPE==1)
+#if (COPY_TYPE==0)
+			memcpy(ptr, pY, linesize);
+#else
+			memmove(ptr, pY, linesize);
+#endif
+			pY+= p_stride;
+			ptr += linesize;
+#else
+			for (j=0; j<linesize/4; j++) {
+				*d++ = *s++;;
+			}
+			s+= (p_stride-linesize)/4;
+#endif
+		}
+#endif
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+#if (COPY_TYPE==5)
+		memcpy(ptr, pU, size/4);
+#elif (COPY_TYPE==3)
+		memset(ptr, 0x80, size/4);
+#elif (COPY_TYPE==4)
+#else
+		linesize = width*Bpp/2;
+		p_stride = stride/2;
+		count/=2;
+#if (COPY_TYPE==2)
+		c2 /= 2;
+		s = (u32 *)pU;
+		d = (u32 *)ptr;
+#endif
+		for (i=0; i<count; i++) {
+#if (COPY_TYPE==0) || (COPY_TYPE==1)
+#if (COPY_TYPE==0)
+			memcpy(ptr, pU, linesize);
+#else
+			memmove(ptr, pU, linesize);
+#endif
+			pU+= p_stride;
+			ptr += linesize;
+#else
+			for (j=0; j<linesize/4; j++) {
+				*d++ = *s++;;
+			}
+			s+= (p_stride-linesize)/4;
+#endif
+		}
+#endif
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+#if (COPY_TYPE==5)
+		memcpy(ptr, pV, size/4);
+#elif (COPY_TYPE==3)
+		memset(ptr, 0x80, size/4);
+#elif (COPY_TYPE==4)
+#else
+#if (COPY_TYPE==2)
+		s = (u32 *)pV;
+		d = (u32 *)ptr;
+#endif
+		for (i=0; i<count; i++) {
+#if (COPY_TYPE==0) || (COPY_TYPE==1)
+#if (COPY_TYPE==0)
+			memcpy(ptr, pV, linesize);
+#else
+			memmove(ptr, pV, linesize);
+#endif
+			pV+= p_stride;
+			ptr += linesize;
+#else
+			for (j=0; j<linesize/4; j++) {
+				*d++ = *s++;;
+			}
+			s+= (p_stride-linesize)/4;
+#endif
+		}
+#endif
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+#if (COPY_TYPE!=5)
+		needs_stride=0;
+#endif
+
+
+#if (NO_TEX==0)
+		glBindTexture(texture_type, txid[0] );
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+		glTexImage2D(texture_type, 0, 1, w, h, 0, pixel_format, memory_format, NULL);
+		//glTexSubImage2D crashes with PBO and 2-bytes luminance on my FirePro W5000 ...
+//		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
+
+		glBindTexture(texture_type, txid[1] );
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, NULL);
+//		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pU);
+
+		glBindTexture(texture_type, txid[2] );
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, NULL);
+//		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pV);
+#endif
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+	} else {
+		glBindTexture(texture_type, txid[0] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
+		glBindTexture(texture_type, 0);
+
+		glBindTexture(texture_type, txid[1] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pU);
+		glBindTexture(texture_type, 0);
+
+		glBindTexture(texture_type, txid[2] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pV);
+		glBindTexture(texture_type, 0);
+
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+	}
+	end = gf_sys_clock_high_res() - draw_start;
+
+	if (!first_tx_load) {
+		gl_nb_frames ++;
+		gl_upload_time += end;
+	}
+	gl_upload_time_frame = end;
+
+	glUseProgram(glsl_program);
+
+	glActiveTexture(GL_TEXTURE2);
+	glBindTexture(texture_type, txid[2]);
+
+	glActiveTexture(GL_TEXTURE1);
+	glBindTexture(texture_type, txid[1]);
+
+	glActiveTexture(GL_TEXTURE0 );
+	glBindTexture(texture_type, txid[0]);
+
+	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+	glClientActiveTexture(GL_TEXTURE0);
+
+	sdl_draw_quad();
+
+	glDisable(texture_type);
+	glUseProgram(0);
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(texture_type, 0);
+
+	SDL_GL_SwapWindow(window);
+
+	gl_draw_time_frame = gf_sys_clock_high_res() - draw_start;
+	gl_draw_time += gl_draw_time_frame;
+	return;
+}
+
+
+void sdl_bench()
+{
+	Double rate;
+	u32 i, count;
+	u64 start = gf_sys_clock_high_res();
+
+	count = 600;
+	for (i=0; i<count; i++) {
+		sdl_draw_frame(pY, pU, pV, width, height, bpp, width);
+	}
+
+	start = gf_sys_clock_high_res() - start;
+	rate = 3*size/2;
+	rate *= count*1000;
+	rate /= start; //in ms
+	rate /= 1000; //==*1000 (in s) / 1000 * 1000 in MB /s
+	fprintf(stdout, "gltext pushed %d frames in %d ms - FPS %g - data rate %g MB/s\n", count, (u32) (start/1000), 1000000.0*count/start, rate);
+}
+
+void PrintUsage()
+{
+	fprintf(stderr, "USAGE: [OPTS] file.mp4\n"
+	 "\n"
+	 "Options:\n"
+	 "-bench-yuv: only bench YUV upload rate\n"
+	 "-bench-yuv10: only bench YUV10 upload rate\n"
+	 "-sys-mem: uses copy from decoder mem to system mem before upload (removes stride)\n"
+	 "-use-pbo: uses PixelBufferObject for texture transfer\n"
+	 "-output-8b: forces CPU conversion to 8 bit before display (only available when -sys-mem is used)\n"
+	 "-no-display: disables video output\n"
+	 "-nb-threads=N: sets number of frame to N (default N=nb virtual cores)\n"
+	 "-logs=logfile: outputs numbers in CSV format to logfile\n"
+	 "-mode=[frame|wpp|frame+wpp] : sets threading type (default is frame)\n"
+	 );
+}
+
+
+
+int main(int argc, char **argv)
+{
+	u32 sdl_bench_yuv = 0;
+	Bool no_display = GF_FALSE;
+	u64 start, now;
+	u32 check_prompt, nb_frames_at_start;
+	Bool sdl_is_init=GF_FALSE, run;
+	Bool paused = GF_FALSE;
+	u64 pause_time = 0;
+	u64 max_time_spent = 0;
+	GF_ISOFile *isom;
+	u32 i, count, track = 0;
+	GF_ESD *esd;
+	u32 nb_threads = 0;
+	u32 mode = 1;
+	Bool use_raw_memory = GF_TRUE;
+	OpenHevc_Handle ohevc;
+	Bool use_pbo = GF_FALSE;
+	Bool enable_mem_tracker = GF_FALSE;
+	Bool output_8bit = GF_FALSE;
+	GF_SystemRTInfo rti;
+	const char *src = NULL;
+	FILE *csv_logs = NULL;
+
+	if (argc<2) {
+		PrintUsage();
+		return 0;
+	}
+
+	for (i=0; i<(u32)argc; i++) {
+		char *arg = argv[i];
+		if (arg[0]!='-') {
+			src = arg;
+			continue;
+		}
+		if (!strcmp(arg, "-bench-yuv")) sdl_bench_yuv=1;
+		else if (!strcmp(arg, "-bench-yuv10")) sdl_bench_yuv=2;
+		else if (!strcmp(arg, "-sys-mem")) use_raw_memory = 0;
+		else if (!strcmp(arg, "-vsync")) use_vsync = 1;
+		else if (!strcmp(arg, "-use-pbo")) use_pbo = 1;
+		else if (!strcmp(arg, "-no-display")) no_display = 1;
+		else if (!strcmp(arg, "-output-8b")) output_8bit = GF_TRUE;
+		else if (!strcmp(arg, "-mem-track")) enable_mem_tracker = GF_TRUE;
+		else if (!strncmp(arg, "-nb-threads=", 12)) nb_threads = atoi(arg+12);
+		else if (!strncmp(arg, "-mode=", 6)) {
+			if (!strcmp(arg+6, "wpp")) mode = 2;
+			else if (!strcmp(arg+6, "frame+wpp")) mode = 4;
+			else mode = 1;
+		}
+		else if (!strncmp(arg, "-logs=", 6)) {
+			csv_logs = fopen(arg+6, "wt");
+		}
+		else if (!strcmp(arg, "-h")) {
+			PrintUsage();
+			return 0;
+		}
+	}
+
+
+
+	/*****************/
+	/* gpac init */
+	/*****************/
+#ifdef GPAC_MEMORY_TRACKING
+	gf_sys_init(enable_mem_tracker);
+#else
+	gf_sys_init(GF_FALSE);
+#endif
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+
+	if (sdl_bench_yuv) {
+		sdl_init(3840, 2160, (sdl_bench_yuv==2) ? 10 : 8, 3840, use_pbo);
+		sdl_bench();
+		sdl_close();
+		gf_sys_close();
+		return 0;
+	}
+	if (!src) {
+		PrintUsage();
+		gf_sys_close();
+		return 0;
+	}
+
+
+	isom = gf_isom_open(src, GF_ISOM_OPEN_READ, NULL);
+	if (!isom) {
+		sdl_close();
+		gf_sys_close();
+		return 0;
+	}
+
+	for (i=0; i<gf_isom_get_track_count(isom); i++) {
+		if (gf_isom_get_hevc_shvc_type(isom, i+1, 1)>=GF_ISOM_HEVCTYPE_HEVC_ONLY) {
+			track = i+1;
+			break;
+		}
+	}
+
+	if (!track) {
+		gf_isom_close(isom);
+		sdl_close();
+		gf_sys_close();
+		return 0;
+	}
+
+	gf_sys_get_rti(10, &rti, 0);
+	if (!nb_threads) nb_threads = rti.nb_cores;
+
+	nb_frames_at_start = 0;
+	count = gf_isom_get_sample_count(isom, track);
+	start = gf_sys_clock_high_res();
+
+	esd = gf_isom_get_esd(isom, track, 1);
+	ohevc = libOpenHevcInit(nb_threads, mode);
+	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+		libOpenHevcCopyExtraData(ohevc, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength+8);
+	}
+
+	libOpenHevcSetActiveDecoders(ohevc, 1);
+	libOpenHevcSetViewLayers(ohevc, 1);
+
+	libOpenHevcStartDecoder(ohevc);
+	gf_odf_desc_del((GF_Descriptor *)esd);
+	gf_isom_set_sample_padding(isom, track, 8);
+
+
+	if (csv_logs) {
+		fprintf(csv_logs, "Time,FrameDecode,Frame GPU Upload,Frame GPU Draw,CPU %%,RAP type\n");
+	}
+
+	run=1;
+	check_prompt=0;
+	for (i=0; i<count && run; i++) {
+		u32 di;
+		if (!paused) {
+			u64 time_spent = gf_sys_clock_high_res();
+			GF_ISOSample *sample = gf_isom_get_sample(isom, track, i+1, &di);
+
+			if ( libOpenHevcDecode(ohevc, sample->data, sample->dataLength, sample->DTS+sample->CTS_Offset) ) {
+				if (no_display) {
+					OpenHevc_Frame HVCFrame_ptr;
+					libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
+					time_spent = gf_sys_clock_high_res() - time_spent;
+				} else if (use_raw_memory) {
+					OpenHevc_Frame HVCFrame_ptr;
+					libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
+					time_spent = gf_sys_clock_high_res() - time_spent;
+
+
+					if (!sdl_is_init && !no_display) {
+						u64 sdl_init_time = gf_sys_clock_high_res();
+						sdl_init(HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, HVCFrame_ptr.frameInfo.nBitDepth, HVCFrame_ptr.frameInfo.nYPitch, use_pbo);
+						sdl_is_init=1;
+						start += gf_sys_clock_high_res() - sdl_init_time;
+					}
+
+					sdl_draw_frame((u8 *) HVCFrame_ptr.pvY, (u8 *) HVCFrame_ptr.pvU, (u8 *) HVCFrame_ptr.pvV, HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, HVCFrame_ptr.frameInfo.nBitDepth, HVCFrame_ptr.frameInfo.nYPitch);
+				} else {
+					OpenHevc_Frame_cpy HVCFrame;
+					memset(&HVCFrame, 0, sizeof(OpenHevc_Frame_cpy) );
+
+					libOpenHevcGetPictureInfoCpy(ohevc, &HVCFrame.frameInfo);
+					time_spent = gf_sys_clock_high_res() - time_spent;
+
+					if (!sdl_is_init && !no_display) {
+						u64 sdl_init_time = gf_sys_clock_high_res();
+						u32 stride = HVCFrame.frameInfo.nYPitch;
+						u32 bpp = HVCFrame.frameInfo.nBitDepth;
+						if ((bpp==10) && output_8bit) {
+							bpp = 8;
+							stride = HVCFrame.frameInfo.nYPitch/2;
+						}
+
+						sdl_init(HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, bpp, stride, use_pbo);
+						sdl_is_init=1;
+						start += gf_sys_clock_high_res() - sdl_init_time;
+					}
+
+					if ((HVCFrame.frameInfo.nBitDepth==10) && output_8bit) {
+						OpenHevc_Frame HVCFrame_ptr;
+						GF_VideoSurface dst;
+						memset(&dst, 0, sizeof(GF_VideoSurface));
+						dst.width = HVCFrame.frameInfo.nWidth;
+						dst.height = HVCFrame.frameInfo.nHeight;
+						dst.pitch_y = HVCFrame.frameInfo.nWidth;
+						dst.video_buffer = pY;
+						dst.u_ptr = pU;
+						dst.v_ptr = pV;
+						dst.pixel_format = GF_PIXEL_YV12;
+
+						libOpenHevcGetOutput(ohevc, 1, &HVCFrame_ptr);
+
+						gf_color_write_yv12_10_to_yuv(&dst, (u8 *) HVCFrame_ptr.pvY, (u8 *) HVCFrame_ptr.pvU, (u8 *) HVCFrame_ptr.pvV, HVCFrame_ptr.frameInfo.nYPitch, HVCFrame_ptr.frameInfo.nWidth, HVCFrame_ptr.frameInfo.nHeight, NULL, GF_FALSE);
+
+						HVCFrame.frameInfo.nBitDepth = 8;
+						HVCFrame.frameInfo.nYPitch = HVCFrame.frameInfo.nWidth;
+					} else {
+						HVCFrame.pvY = (void*) pY;
+						HVCFrame.pvU = (void*) pU;
+						HVCFrame.pvV = (void*) pV;
+
+						libOpenHevcGetOutputCpy(ohevc, 1, &HVCFrame);
+					}
+
+					sdl_draw_frame(pY, pU, pV, HVCFrame.frameInfo.nWidth, HVCFrame.frameInfo.nHeight, HVCFrame.frameInfo.nBitDepth, HVCFrame.frameInfo.nYPitch);
+				}
+			}
+			//ignore first frame
+			if (!max_time_spent) {
+				max_time_spent = 1;
+			} else if (max_time_spent<time_spent) {
+				max_time_spent = time_spent;
+			}
+
+			gf_sys_get_rti(10, &rti, 0);
+			now = gf_sys_clock_high_res();
+			fprintf(stderr, "%d %% %d frames in "LLD" us - FPS %03.2f - push "LLD" us - draw "LLD" us - CPU %03d\r", 100*(i+1-nb_frames_at_start)/count, i+1-nb_frames_at_start, (now-start)/1000, 1000000.0 * (i+1-nb_frames_at_start) / (now-start), gl_upload_time / gl_nb_frames/1000 , (gl_draw_time - gl_upload_time) / gl_nb_frames/1000, rti.process_cpu_usage);
+
+			if (csv_logs) {
+				fprintf(csv_logs, LLD","LLD","LLD","LLD",%d,%d\n", now-start, time_spent, gl_upload_time_frame, gl_draw_time_frame, rti.process_cpu_usage, sample->IsRAP);
+			}
+
+			gf_isom_sample_del(&sample);
+
+
+		} else {
+			gf_sleep(10);
+			i--;
+		}
+		check_prompt++;
+		if (check_prompt==50) {
+			if (gf_prompt_has_input()) {
+				switch (gf_prompt_get_char()) {
+				case 'q':
+					run = 0;
+					break;
+				case 'm':
+					use_raw_memory = !use_raw_memory;
+					break;
+				case 'p':
+					if (paused) {
+						paused=0;
+						start += gf_sys_clock_high_res()-pause_time;
+					} else {
+						paused = 1;
+						pause_time=gf_sys_clock_high_res();
+					}
+					break;
+				case 'r':
+					start = gf_sys_clock_high_res();
+					nb_frames_at_start = i+1;
+					gl_upload_time = gl_draw_time = 0;
+					gl_nb_frames=1;
+					break;
+
+				}
+			}
+			check_prompt=0;
+		}
+	}
+	now = gf_sys_clock_high_res();
+	fprintf(stderr, "\nDecoded %d frames in %d ms - FPS %g - max frame decode "LLD" us\n", i+1, (u32) ((now-start)/1000), 1000000.0 * (i+1) / (now-start), max_time_spent);
+
+	libOpenHevcClose(ohevc);
+	gf_isom_close(isom);
+
+	if (csv_logs) fclose(csv_logs);
+
+	if (!no_display)
+		sdl_close();
+
+	gf_sys_close();
+	return 1;
+}
+

v0.5.2.tar.gz/applications/testapps/loadcompare/loadcompare.c -> v0.6.1.tar.gz/applications/testapps/loadcompare/loadcompare.c Changed

@@ -382,14 +382,14 @@
 
 	*size = 0;
 
-	file = fopen(item_path, "rt");
+	file = gf_fopen(item_path, "rt");
 	if (!file) {
 		if (lc->verbose) fprintf(stdout, "Could not open file %s\n", item_path);
 		e = GF_IO_ERR;
 	} else {
 		fseek(file, 0, SEEK_END);
 		*size = (u32)ftell(file);
-		fclose(file);
+		gf_fclose(file);
 		if (*size == 0) {
 			if (lc->verbose) fprintf(stdout, "File %s has a size of 0\n", item_path);
 			e = GF_IO_ERR;
@@ -436,19 +436,19 @@
 	strcpy(gz_path, item_name);
 	strcat(gz_path, "z");
 	gz = gzopen(gz_path, "wb");
-	file = fopen(item_path, "rt");
+	file = gf_fopen(item_path, "rt");
 
 	if (!gz || !file) {
 		if (lc->verbose) fprintf(stdout, "Could not open file %s or %s\n", item_path, gz_path);
 		e = GF_IO_ERR;
 	} else {
 		while ((read = fread(buffer, 1, 100, file))) gzwrite(gz, buffer, read);
-		fclose(file);
+		gf_fclose(file);
 		gzclose(gz);
-		file = fopen(gz_path, "rb");
+		file = gf_fopen(gz_path, "rb");
 		fseek(file, 0, SEEK_END);
 		*size = (u32)ftell(file);
-		fclose(file);
+		gf_fclose(file);
 		if (*size == 0) {
 			if (lc->verbose) fprintf(stdout, "File %s has a size of 0\n", gz_path);
 			e = GF_IO_ERR;
@@ -645,7 +645,7 @@
 	}
 
 	gf_sys_init();
-	if (out) lc.out = fopen(out, "wt");
+	if (out) lc.out = gf_fopen(out, "wt");
 	if (!lc.out) {
 		fprintf(stderr, "Cannot open output file %s\n", out);
 		return -1;
@@ -691,7 +691,7 @@
 	}
 	gf_list_del(lc.data);
 
-	if (lc.out) fclose(lc.out);
+	if (lc.out) gf_fclose(lc.out);
 	gf_sys_close();
 	return 0;
 }

v0.5.2.tar.gz/applications/testapps/mpedemux/main.c -> v0.6.1.tar.gz/applications/testapps/mpedemux/main.c Changed

v0.5.2.tar.gz/applications/testapps/mpeg2ts/main.c -> v0.6.1.tar.gz/applications/testapps/mpeg2ts/main.c Changed

v0.6.1.tar.gz/applications/testapps/player_api Added

v0.6.1.tar.gz/applications/testapps/player_api/main.c Added

@@ -0,0 +1,112 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2015
+ *					All rights reserved
+ *
+ * This file is part of GPAC - sample GPAC player API usage
+ *
+ */
+
+#include <stdio.h>
+#include <gpac/terminal.h>
+#include <gpac/options.h> //for GF_OPT_* and GF_STATE_*
+
+volatile Bool connected = GF_FALSE;
+
+static Bool play_pause_seek_gettime(GF_Terminal *term, const char *fn)
+{
+	u32 time;
+	const u32 target_time_in_ms = 10000;
+
+	//play
+	connected = GF_FALSE;
+	gf_term_connect_from_time(term, fn, 0, GF_FALSE);
+	while (!connected) gf_sleep(1);
+
+	//seek to target_time_in_ms
+	gf_term_play_from_time(term, target_time_in_ms, GF_FALSE);
+	gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
+	time = gf_term_get_time_in_ms(term);
+	assert(time == target_time_in_ms);
+
+	//seek to 0
+	connected = GF_FALSE;
+	gf_term_play_from_time(term, 0, GF_FALSE);
+	while (!connected) gf_sleep(1);
+	time = gf_term_get_time_in_ms(term);
+	assert(time == 0);
+
+	return GF_TRUE;
+}
+
+Bool GPAC_EventProc(void *ptr, GF_Event *evt)
+{
+	switch (evt->type) {
+	case GF_EVENT_CONNECT:
+		connected = GF_TRUE;
+		break;
+	default:
+		break;
+	}
+
+	return GF_FALSE;
+}
+
+static Bool player_foreach(int argc, char **argv)
+{
+	int i;
+	GF_User user;
+	GF_Terminal *term;
+	GF_Config *cfg_file;
+	cfg_file = gf_cfg_init("GPAC.cfg", NULL);
+	user.modules = gf_modules_new(NULL, cfg_file);
+	user.config = cfg_file;
+	user.EventProc = GPAC_EventProc;
+	term = gf_term_new(&user);
+	if (!term)
+		return GF_FALSE;
+
+	for (i=0; i<argc; ++i) {
+		Bool res = play_pause_seek_gettime(term, argv[i]);
+		if (res == GF_FALSE) {
+			fprintf(stderr, "Failure with input %d: \"%s\"\n", i, argv[i]);
+			return GF_FALSE;
+		}
+	}
+
+	gf_term_disconnect(term);
+	gf_term_del(term);
+	gf_modules_del(user.modules);
+	gf_cfg_del(cfg_file);
+
+	return GF_TRUE;
+}
+
+int main(int argc, char **argv)
+{
+	int ret = 0;
+
+	if (argc < 2) {
+		fprintf(stderr, "USAGE: %s file1 [file2 ... filen]\n", argv[0]);
+		ret = 1;
+		goto exit;
+	}
+
+#ifdef GPAC_MEMORY_TRACKING
+	gf_sys_init(GF_TRUE);
+#else
+	gf_sys_init(GF_FALSE);
+#endif
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+
+	if (!player_foreach(argc, argv)) {
+		ret = 1;
+		goto exit;
+	}
+
+exit:
+	gf_sys_close();
+	return ret;
+}

v0.5.2.tar.gz/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters -> v0.6.1.tar.gz/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters Changed

v0.5.2.tar.gz/applications/ts2hds/f4m.c -> v0.6.1.tar.gz/applications/ts2hds/f4m.c Changed

@@ -70,7 +70,7 @@
 	am->base_url = "http://localhost/hds/tmp";
 	am->id = id;
 	sprintf(filename, "%s.f4m", am->id);
-	am->f = fopen(filename, "wt");
+	am->f = gf_fopen(filename, "wt");
 	if (!am->f) {
 		fprintf(stderr, "Couldn't create Adobe multirate manifest file: %s\n", filename);
 		assert(0);
@@ -85,7 +85,7 @@
 		as->id = "HD";
 		as->bitrate = 100;
 		sprintf(filename, "%s_%s_%d.f4m", am->id, as->id, as->bitrate);
-		as->f = fopen(filename, "wt");
+		as->f = gf_fopen(filename, "wt");
 		if (!as->f) {
 			fprintf(stderr, "Couldn't create Adobe stream manifest file: %s\n", filename);
 			assert(0);
@@ -105,13 +105,13 @@
 	u32 i;
 
 	if (am->f)
-		fclose(am->f);
+		gf_fclose(am->f);
 
 	for (i=0; i<gf_list_count(am->streams); i++) {
 		AdobeStream *as = gf_list_get(am->streams, i);
 		assert(as);
 		if (as->f)
-			fclose(as->f);
+			gf_fclose(as->f);
 		//TODO: base_url and id may be stored as gf_strdup in the future
 		gf_list_rem(am->streams, i);
 		gf_free(as);
@@ -154,9 +154,9 @@
 			char filename[GF_MAX_PATH];
 			FILE *bstfile;
 			sprintf(filename, "%s_%d.bootstrap", as->id, as->bitrate);
-			bstfile = fopen(filename, "wb");
+			bstfile = gf_fopen(filename, "wb");
 			gf_fwrite(bootstrap, bootstrap_size, 1, bstfile);
-			fclose(bstfile);
+			gf_fclose(bstfile);
 		}
 #endif
 		e = adobe_gen_stream_manifest(as);

v0.5.2.tar.gz/applications/ts2hds/main.c -> v0.6.1.tar.gz/applications/ts2hds/main.c Changed

@@ -159,16 +159,16 @@
 		u32 metamoov64_len;
 		unsigned char metamoov[GF_MAX_PATH];
 		u32 metamoov_len=GF_MAX_PATH;
-		FILE *f = fopen("metamoov64"/*input*/, "rt");
-		gf_f64_seek(f, 0, SEEK_END);
-		metamoov64_len = (u32)gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
+		FILE *f = gf_fopen("metamoov64"/*input*/, "rt");
+		gf_fseek(f, 0, SEEK_END);
+		metamoov64_len = (u32)gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
 		fread(metamoov64, metamoov64_len, 1, f);
 		metamoov_len = gf_base64_decode(metamoov64, metamoov64_len, metamoov, metamoov_len);
-		fclose(f);
-		f = fopen("metamoov", "wb");
+		gf_fclose(f);
+		f = gf_fopen("metamoov", "wb");
 		fwrite(metamoov, metamoov_len, 1, f);
-		fclose(f);
+		gf_fclose(f);
 		return 0;
 	}
 #endif
@@ -182,17 +182,17 @@
 		GF_AdobeBootstrapInfoBox *abst = (GF_AdobeBootstrapInfoBox *)abst_New();
 		GF_BitStream *bs;
 #if 1 //64
-		FILE *f = fopen("bootstrap64"/*input*/, "rt");
-		gf_f64_seek(f, 0, SEEK_END);
-		bootstrap64_len = (u32)gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
+		FILE *f = gf_fopen("bootstrap64"/*input*/, "rt");
+		gf_fseek(f, 0, SEEK_END);
+		bootstrap64_len = (u32)gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
 		fread(bootstrap64, bootstrap64_len, 1, f);
 		bootstrap_len = gf_base64_decode(bootstrap64, bootstrap64_len, bootstrap, bootstrap_len);
 #else //binary bootstrap
-		FILE *f = fopen("bootstrap.bin"/*input*/, "rb");
-		gf_f64_seek(f, 0, SEEK_END);
-		bootstrap_len = (u32)gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
+		FILE *f = gf_fopen("bootstrap.bin"/*input*/, "rb");
+		gf_fseek(f, 0, SEEK_END);
+		bootstrap_len = (u32)gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
 		fread(bootstrap, bootstrap_len, 1, f);
 #endif
 		bs = gf_bs_new(bootstrap+8, bootstrap_len-8, GF_BITSTREAM_READ);
@@ -206,13 +206,13 @@
 		abst_Write((GF_Box*)abst, bs);
 		bootstrap_len = (u32)gf_bs_get_position(bs);
 		gf_bs_del(bs);
-		fclose(f);
-		f = fopen("bootstrap", "wt");
+		gf_fclose(f);
+		f = gf_fopen("bootstrap", "wt");
 		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_len, bootstrap64, GF_MAX_PATH);
 		fwrite(bootstrap64, bootstrap64_len, 1, f);
 		fprintf(f, "\n\n");
 		abst_dump((GF_Box*)abst, f);
-		fclose(f);
+		gf_fclose(f);
 		abst_del((GF_Box*)abst);
 		return 0;
 	}

v0.5.2.tar.gz/applications/udptsseg/main.c -> v0.6.1.tar.gz/applications/udptsseg/main.c Changed

@@ -47,7 +47,7 @@
 		sprintf(manifest_name, "%s", manifest);
 	}
 
-	manifest_fp = fopen(tmp_manifest, "w");
+	manifest_fp = gf_fopen(tmp_manifest, "w");
 	if (!manifest_fp) {
 		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
 		return GF_BAD_PARAM;
@@ -62,7 +62,7 @@
 	if (end) {
 		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
 	}
-	fclose(manifest_fp);
+	gf_fclose(manifest_fp);
 
 	if (!rename(tmp_manifest, manifest_name)) {
 		return GF_OK;
@@ -213,7 +213,7 @@
 		}
 		//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
 	}
-	ts_output_file = fopen(ts_out, "wb");
+	ts_output_file = gf_fopen(ts_out, "wb");
 	if (!ts_output_file) {
 		fprintf(stderr, "Error opening %s\n", ts_out);
 		goto exit;
@@ -265,7 +265,7 @@
 				}
 				if ((now - last_segment_time) > segment_duration*1000) {
 					last_segment_time = now;
-					fclose(ts_output_file);
+					gf_fclose(ts_output_file);
 					fprintf(stderr, "Closing segment %s (%d bytes)\n", segment_name, last_segment_size);
 					last_segment_size = 0;
 					segment_index++;
@@ -278,7 +278,7 @@
 					} else {
 						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
 					}
-					ts_output_file = fopen(segment_name, "wb");
+					ts_output_file = gf_fopen(segment_name, "wb");
 					if (!ts_output_file) {
 						fprintf(stderr, "Error opening segment %s\n", segment_name);
 						goto exit;

v0.5.2.tar.gz/bin/smartphone 2003 (armv4)/release/install/archive.bat -> v0.6.1.tar.gz/bin/smartphone 2003 (armv4)/release/install/archive.bat Changed

v0.5.2.tar.gz/bin/smartphone 2003 (armv4)/release/install/build_installer.bat -> v0.6.1.tar.gz/bin/smartphone 2003 (armv4)/release/install/build_installer.bat Changed

v0.5.2.tar.gz/bin/smartphone 2003 (armv4)/release/install/readme.txt -> v0.6.1.tar.gz/bin/smartphone 2003 (armv4)/release/install/readme.txt Changed

v0.5.2.tar.gz/build/android/README -> v0.6.1.tar.gz/build/android/README Changed

@@ -4,11 +4,15 @@
 
 To compile GPAC for Android, please execute the following steps:
 
-1) Check out the GPAC SVN repository (but if you read this you probably already checkouted the GPAC SVN repository):
+1) Check out the GPAC GIT repository (but if you read this you probably already checkouted the GPAC repository):
 
-	svn co https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/ 
+	git clone https://githib.com/gpac/gpac
 	This directory will be reminded as <GPAC_DIR>
 
+Get the extra lib packages from https://sourceforge.net/p/gpac/code/HEAD/tree/trunk/gpac_extra_libs/ and unzip the archive.
+This directory will be reminded as <GPAC_EXTRA_DIR>
+
+
 2) Get the Android softwares:
 
 	A. Download the Android SDK at http://developer.android.com/sdk/index.html and unzip it at a place of your choice (referenced as <ANDROID_SDK_DIR>).
@@ -33,20 +37,18 @@
 
 	A. Build all extra-libs
 	
-		Go to <GPAC_DIR>/trunk/gpac_extra_libs. Unzip the zipped package : 
-			unzip gpac_extra_libs.zip
-		Go to <GPAC_DIR>/trunk/gpac_extra_libs/build/android. Give you the right to execute the script gpac_build_all_extra_libs (e.g. chmod u+x gpac_build_all_extra_libs ).
+		Go to <GPAC_EXTRA_DIR>/build/android. Set the right to execute the script gpac_build_all_extra_libs (e.g. chmod u+x gpac_build_all_extra_libs ).
 		Run the script as follow : ./gpac_build_all_extra_libs <ANDROID_NDK_DIR>
 	
 	B. Copy all the compiled extra lib to the right folder
 	
-		Go back to <GPAC_DIR>/trunk/gpac_extra_libs/ .
-		Copy the just compiled libs into <GPAC_DIR>/trunk/gpac/extra_lib/lib/android by entering this command : 
-		cp -r lib/android/* ../gpac/extra_lib/lib/android/
+		Go back to <GPAC_EXTRA_DIR>
+		Copy the just compiled libs into <GPAC_DIR>/extra_lib/lib/android by entering this command : 
+		cp -r lib/android/* <GPAC_DIR>/extra_lib/lib/android/
 
 4) Building GPAC for Android
 
-	(optionnal) Links the Android SDK and NDK directories
+	(optional) Links the Android SDK and NDK directories
 
 		* cd /opt/
 		* sudo ln -s /home/xxx/xxx/<Android SDK> android_sdk /* /opt/android_sdk will then become your new <ANDROID_SDK_DIR> */
@@ -56,10 +58,10 @@
 
 		(optionnal)Create a link to the ANT directory 
 			* cd /opt/
-			* sudo ln -s /home/xxx/xxx/ANT_DIR ant /* /opt/ant will then cecome your new <ANT_DIR>
+			* sudo ln -s /home/xxx/xxx/ANT_DIR ant /* /opt/ant will then become your new <ANT_DIR>
 
 		Then go to GPAC_DIR/build/android/jni and launch the script 
-		./gpac_build_android <ANDROID_NDK_DIR> <ANDROID_SDK_DIR> <ANT_DIR>
+		./gpac_build_android -ndk=<ANDROID_NDK_DIR> -sdk=<ANDROID_SDK_DIR> -ant=<ANT_DIR>
 		It will generate the package Osmo4.apk.
 		You can find the Osmo4.apk in GPAC_DIR/applications/osmo4_android/bin

v0.5.2.tar.gz/build/android/jni/Application.mk -> v0.6.1.tar.gz/build/android/jni/Application.mk Changed

v0.5.2.tar.gz/build/android/jni/gpac_build_android -> v0.6.1.tar.gz/build/android/jni/gpac_build_android Changed

@@ -71,16 +71,12 @@
 cd $BUILDPATH
 export BUILDPATH=$(pwd)
 echo "Current Dir = $BUILDPATH"
-version=$(svnversion ../../..)
-echo "*** Build path is $BUILDPATH, setting revision number $version"
-if grep "$version" ../../../include/gpac/revision.h >/dev/null 2>&1 ; then
-  echo "Version $version already set"
-else
-  echo "#define GPAC_SVN_REVISION \"$version\"" > ../../../include/gpac/revision.h
-fi
+
 echo "Building lib gpac ..."
 cd ../../../
 BASEPATH=$(pwd)
+#check revision.h is here
+./check_revision.sh
 
 #rm -rf $BUILDPATH/../obj/*
 
@@ -138,7 +134,7 @@
 mkdir -p $LIBS_DIR
 cd "$BASEPATH/extra_lib/lib/android"
 echo "Copying all extra libs to $LIBS_DIR ..."
-for i in $(find . -name '*.so')
+for i in $(find . $ -name '*.so' $ -a $ ! -name "*_stagefright.so" $ )
 do
 	echo " Copy $i"
 	TMP_DIR=$(dirname $i)
@@ -161,23 +157,62 @@
 done
 echo "[OK] success extra lib MP4box."
 
-if [ $ANT -eq 1 ]
-then
-echo "\nSelf-updating project"
-android update project -p "$BASEPATH/applications/osmo4_android/" --target android-18
+ASSETS_DIR="$BASEPATH/applications/osmo4_android/assets/"
+mkdir -p $ASSETS_DIR
 
-echo -e "\nBuiding Osmo4.apk" 
-cd $BASEPATH/applications/osmo4_android/
-ant release
+echo "Copying gui folder to $ASSETS_DIR ..."
+cp -R "$BASEPATH/gui" $ASSETS_DIR
+echo "[OK] success GUI for Osmo4."
 
-if [ -f $BASEPATH/Osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-r$version.apk ]
-then
-echo -e "\nOld Osmo4.apk found. Removing it ..." 
-rm $BASEPATH/Osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-r$version.apk
-fi  
+echo "Copying shaders folder to $ASSETS_DIR ..."
+cp -R "$BASEPATH/shaders" $ASSETS_DIR
+echo "[OK] success Shader Folder for Osmo4."
 
-zipalign -v 4 bin/Osmo4-release-unaligned.apk $BASEPATH/Osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-r$version.apk
-rm bin/Osmo4-*
-echo -e "\n[OK] success."
+if [ $ANT -eq 1 ]
+then
+	echo "\nSelf-updating project"
+	android update project -p "$BASEPATH/applications/osmo4_android/" --target android-18
+
+	echo -e "\nBuiding Osmo4.apk (without libstagefright)" 
+	cd $BASEPATH/applications/osmo4_android/
+	ant release
+
+	if [ -f $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version.apk ]
+	then
+	echo -e "\nOld Osmo4.apk found. Removing it ..." 
+	rm $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version.apk
+	fi  
+
+	zipalign -v 4 bin/Osmo4-release-unaligned.apk $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version.apk
+	rm bin/Osmo4-*
+	echo -e "\n[OK] success."
+	
+	echo -e "\nBuiding Osmo4.apk (support libstagefright)" 
+	cd "$BASEPATH/extra_lib/lib/android"
+	echo "Copying libstagefright supported libs to $LIBS_DIR ..."
+	LIBS_DIR="$BASEPATH/applications/osmo4_android/libs"
+	for i in $(find . -name '*_stagefright.so')
+	do
+		echo " Copy $i"
+		TMP_DIR=$(dirname $i)
+		dest_file=$(echo $i | sed "s/$_stagefright$//g")
+		mkdir -p "$LIBS_DIR/$TMP_DIR"
+		echo "dest $LIBS_DIR/$dest_file"
+		cp "$i" "$LIBS_DIR/$dest_file"
+	done
+	echo "[OK] success extra lib for Osmo4."
+
+	cd $BASEPATH/applications/osmo4_android/
+	ant release
+
+	if [ -f $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version-stagefright.apk ]
+	then
+	echo -e "\nOld Osmo4.apk found. Removing it ..." 
+	rm $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version-stagefright.apk
+	fi  
+
+	zipalign -v 4 bin/Osmo4-release-unaligned.apk $BASEPATH/osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-rev$version-stagefright.apk
+	rm bin/Osmo4-*
+	echo -e "\n[OK] success."
 fi

v0.5.2.tar.gz/build/android/jni/libgpac/Android.mk -> v0.6.1.tar.gz/build/android/jni/libgpac/Android.mk Changed

@@ -1,5 +1,5 @@
 LOCAL_PATH:= $(call my-dir)
-APP_ABI          := armeabi armeabi-v7a
+APP_ABI          := armeabi armeabi-v7a x86
 
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/../common.mk
@@ -19,7 +19,7 @@
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../modules
 
 LOCAL_LDLIBS    += -L$(LOCAL_PATH)/../../../../extra_lib/lib/android/$(TARGET_ARCH_ABI)
-LOCAL_LDLIBS    += -lGLESv1_CM -ldl
+LOCAL_LDLIBS    += -lGLESv2 -ldl
 LOCAL_LDLIBS    += -ljs_osmo -leditline -lft2 -ljpegdroid -lopenjpeg -lpng -lz
 #LOCAL_EXPORT_LDLIBS= -ljs_osmo -leditline -lft2 -ljpeg -lopenjpeg -lpng -lz
 
@@ -157,6 +157,7 @@
 	../../../../src/utils/color.c \
 	../../../../src/utils/token.c \
 	../../../../src/utils/configfile.c \
+	../../../../src/utils/os_config_init.c \
 	../../../../src/utils/utf.c \
 	../../../../src/utils/os_thread.c \
 	../../../../src/utils/cache.c \
@@ -205,6 +206,7 @@
 	../../../../src/isomedia/isom_intern.c \
 	../../../../src/isomedia/isom_write.c \
 	../../../../src/isomedia/drm_sample.c \
+	../../../../src/isomedia/iff.c \
 	../../../../src/isomedia/ttml.c \
 	../../../../src/isomedia/tx3g.c \
 	../../../../src/isomedia/hint_track.c \

v0.5.2.tar.gz/build/android/jni/libgpac/config.h -> v0.6.1.tar.gz/build/android/jni/libgpac/config.h Changed

v0.5.2.tar.gz/build/android/jni/modules/gm_droid_out.mk -> v0.6.1.tar.gz/build/android/jni/modules/gm_droid_out.mk Changed

v0.5.2.tar.gz/build/android/jni/mp4box/Android.mk -> v0.6.1.tar.gz/build/android/jni/mp4box/Android.mk Changed

v0.5.2.tar.gz/build/android/jni/mp4box/Application.mk -> v0.6.1.tar.gz/build/android/jni/mp4box/Application.mk Changed

v0.5.2.tar.gz/build/msvc10/dx_hw.vcxproj -> v0.6.1.tar.gz/build/msvc10/dx_hw.vcxproj Changed

@@ -81,6 +81,8 @@
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;C:\Imagination\PowerVR_Graphics\PowerVR_SDK\SDK_3.4\Builds\Include\</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;C:\Imagination\PowerVR_Graphics\PowerVR_SDK\SDK_3.4\Builds\Windows\x86_64\Lib</LibraryPath>
 </PropertyGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
@@ -140,7 +142,7 @@
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,7 +158,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -227,7 +229,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
@@ -243,7 +245,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

v0.5.2.tar.gz/build/msvc10/gpac.sln -> v0.6.1.tar.gz/build/msvc10/gpac.sln Changed

@@ -111,403 +111,620 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
+		Debug - MP4Box_only|x64 = Debug - MP4Box_only|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release - MP4Box_only|Win32 = Release - MP4Box_only|Win32
+		Release - MP4Box_only|x64 = Release - MP4Box_only|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.ActiveCfg = Debug|x64
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.Build.0 = Debug|x64
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.ActiveCfg = Release|x64
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.Build.0 = Release|x64
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|x64.ActiveCfg = Debug|x64
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|x64.ActiveCfg = Release|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.Build.0 = Release|x64
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.ActiveCfg = Debug|x64
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.Build.0 = Debug|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.ActiveCfg = Release|x64
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.Build.0 = Release|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.ActiveCfg = Debug|x64
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.Build.0 = Debug|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.ActiveCfg = Release|x64
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.Build.0 = Release|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.Build.0 = Debug|Win32
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.ActiveCfg = Debug|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.Build.0 = Debug|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.ActiveCfg = Release|Win32
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.ActiveCfg = Release|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.Build.0 = Release|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.ActiveCfg = Debug|x64
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.Build.0 = Debug|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.ActiveCfg = Release|x64
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.Build.0 = Release|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.ActiveCfg = Debug|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.Build.0 = Debug|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.ActiveCfg = Release|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.Build.0 = Release|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.ActiveCfg = Debug|x64
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.Build.0 = Debug|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.ActiveCfg = Release|x64
 		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.Build.0 = Release|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.ActiveCfg = Debug|x64
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.Build.0 = Debug|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.ActiveCfg = Release|x64
 		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.Build.0 = Release|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.ActiveCfg = Debug|x64
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.Build.0 = Debug|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.ActiveCfg = Release|x64
 		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.Build.0 = Release|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.ActiveCfg = Debug|x64
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.Build.0 = Debug|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.ActiveCfg = Release|x64
 		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.Build.0 = Release|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.ActiveCfg = Debug|x64
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.Build.0 = Debug|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.ActiveCfg = Release|x64
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.Build.0 = Release|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.Build.0 = Debug|Win32
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.ActiveCfg = Debug|x64
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.Build.0 = Debug|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.ActiveCfg = Release|Win32
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.ActiveCfg = Release|x64
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.Build.0 = Release|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.ActiveCfg = Debug|x64
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.Build.0 = Debug|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.ActiveCfg = Release|x64
 		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.Build.0 = Release|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.ActiveCfg = Debug|x64
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.Build.0 = Debug|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.ActiveCfg = Release|x64
 		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.Build.0 = Release|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.ActiveCfg = Debug|x64
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.Build.0 = Debug|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.ActiveCfg = Release|x64
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.Build.0 = Release|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.ActiveCfg = Debug|x64
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.Build.0 = Debug|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.ActiveCfg = Release|x64
 		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.Build.0 = Release|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.ActiveCfg = Debug|x64
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.Build.0 = Debug|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.ActiveCfg = Release|x64
 		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.Build.0 = Release|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.ActiveCfg = Debug|x64
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.Build.0 = Debug|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.ActiveCfg = Release|x64
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.Build.0 = Release|x64
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.Build.0 = Debug|Win32
 		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|x64.ActiveCfg = Debug|x64
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
 		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
 		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|x64.ActiveCfg = Release|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.ActiveCfg = Debug|x64
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.Build.0 = Debug|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.ActiveCfg = Release|x64
 		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.Build.0 = Release|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.ActiveCfg = Debug|x64
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.Build.0 = Debug|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.ActiveCfg = Release|x64
 		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.Build.0 = Release|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.ActiveCfg = Debug|x64
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.Build.0 = Debug|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.ActiveCfg = Release|x64
 		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.Build.0 = Release|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.Build.0 = Debug|Win32
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.ActiveCfg = Debug|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.Build.0 = Debug|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.ActiveCfg = Release|Win32
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.ActiveCfg = Release|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.Build.0 = Release|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.ActiveCfg = Debug|x64
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.Build.0 = Debug|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.ActiveCfg = Release|x64
 		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.Build.0 = Release|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
 		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
 		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.ActiveCfg = Debug|x64
 		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.Build.0 = Debug|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
 		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
 		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.ActiveCfg = Release|x64
 		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.Build.0 = Release|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.ActiveCfg = Debug|x64
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.Build.0 = Debug|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.ActiveCfg = Release|x64
 		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.Build.0 = Release|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.Build.0 = Debug|Win32
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.ActiveCfg = Debug|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.Build.0 = Debug|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.ActiveCfg = Release|Win32
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.ActiveCfg = Release|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.Build.0 = Release|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.ActiveCfg = Debug|x64
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.Build.0 = Debug|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.ActiveCfg = Release|x64
 		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.Build.0 = Release|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.ActiveCfg = Debug|x64
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.Build.0 = Debug|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.ActiveCfg = Release|x64
 		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.Build.0 = Release|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.ActiveCfg = Debug|x64
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.Build.0 = Debug|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|x64.Build.0 = Release|x64
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.ActiveCfg = Release|x64
 		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.Build.0 = Release|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.ActiveCfg = Debug|x64
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.Build.0 = Debug|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.ActiveCfg = Release|x64
 		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.Build.0 = Release|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.ActiveCfg = Debug|x64
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.Build.0 = Debug|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|x64.Build.0 = Release|x64
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.ActiveCfg = Release|x64
 		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.Build.0 = Release|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.ActiveCfg = Debug|x64
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.Build.0 = Debug|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.ActiveCfg = Release|x64
 		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.Build.0 = Release|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.ActiveCfg = Debug|x64
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.Build.0 = Debug|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.ActiveCfg = Release|x64
 		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.Build.0 = Release|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.Build.0 = Release|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.ActiveCfg = Debug|x64
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.Build.0 = Debug|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.ActiveCfg = Release|x64
 		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.Build.0 = Release|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.Build.0 = Debug|Win32
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.ActiveCfg = Debug|x64
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.Build.0 = Debug|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|x64.Build.0 = Release|x64
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.ActiveCfg = Release|Win32
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.Build.0 = Release|Win32
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.ActiveCfg = Release|x64
 		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.Build.0 = Release|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.Build.0 = Debug|Win32
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.ActiveCfg = Debug|x64
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.Build.0 = Debug|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|x64.Build.0 = Release|x64
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.ActiveCfg = Release|Win32
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.Build.0 = Release|Win32
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.ActiveCfg = Release|x64
 		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.Build.0 = Release|x64
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.Build.0 = Debug|Win32
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|x64.ActiveCfg = Debug|x64
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|x64.Build.0 = Debug|x64
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|x64.ActiveCfg = Release|x64
 		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|x64.Build.0 = Release|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.Build.0 = Debug|Win32
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.ActiveCfg = Debug|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.Build.0 = Debug|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.ActiveCfg = Release|Win32
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.ActiveCfg = Release|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.Build.0 = Release|x64
+		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.ActiveCfg = Debug|Win32
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.Build.0 = Debug|Win32
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|x64.ActiveCfg = Debug|x64
+		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.ActiveCfg = Release|Win32
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.Build.0 = Release|Win32
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|x64.ActiveCfg = Release|x64
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|x64.Build.0 = Release|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.Build.0 = Debug|Win32
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.ActiveCfg = Debug|x64
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.Build.0 = Debug|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.ActiveCfg = Release|Win32
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.Build.0 = Release|Win32
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.ActiveCfg = Release|x64
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.Build.0 = Debug|Win32
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.ActiveCfg = Debug|x64
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.Build.0 = Debug|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.ActiveCfg = Release|Win32
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.Build.0 = Release|Win32
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.ActiveCfg = Release|x64
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.Build.0 = Release|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.Build.0 = Debug|Win32
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.ActiveCfg = Debug|x64
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.Build.0 = Debug|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.ActiveCfg = Release|Win32
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64

v0.5.2.tar.gz/build/msvc10/gpac_js.vcxproj -> v0.6.1.tar.gz/build/msvc10/gpac_js.vcxproj Changed

@@ -140,7 +140,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
@@ -229,7 +229,7 @@
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>

v0.6.1.tar.gz/build/msvc10/gpac_mp4box_mini.sln Added

@@ -0,0 +1,35 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcxproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
+		Debug - MP4Box_only|x64 = Debug - MP4Box_only|x64
+		Release - MP4Box_only|Win32 = Release - MP4Box_only|Win32
+		Release - MP4Box_only|x64 = Release - MP4Box_only|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

v0.5.2.tar.gz/build/msvc10/libgpac.vcxproj -> v0.6.1.tar.gz/build/msvc10/libgpac.vcxproj Changed

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug - MP4Box_only|x64">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
 <ProjectConfiguration Include="Debug|Win32">
 <Configuration>Debug</Configuration>
 <Platform>Win32</Platform>
@@ -9,6 +17,14 @@
 <Configuration>Debug</Configuration>
 <Platform>x64</Platform>
 </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|Win32">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|x64">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
 <ProjectConfiguration Include="Release|Win32">
 <Configuration>Release</Configuration>
 <Platform>Win32</Platform>
@@ -235,6 +251,7 @@
 <ClCompile Include="..\..\src\isomedia\box_funcs.c" />
 <ClCompile Include="..\..\src\isomedia\data_map.c" />
 <ClCompile Include="..\..\src\isomedia\drm_sample.c" />
+ <ClCompile Include="..\..\src\isomedia\iff.c" />
 <ClCompile Include="..\..\src\isomedia\ttml.c" />
 <ClCompile Include="..\..\src\isomedia\hinting.c" />
 <ClCompile Include="..\..\src\isomedia\hint_track.c" />
@@ -404,51 +421,99 @@
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 <ConfigurationType>StaticLibrary</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 <ConfigurationType>StaticLibrary</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 <ConfigurationType>StaticLibrary</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 <ImportGroup Label="ExtensionSettings">
 </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <PropertyGroup Label="UserMacros" />
 <PropertyGroup>
 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">libgpac_static</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">libgpac_static</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">libgpac_static</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">libgpac_static</TargetName>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
 </PropertyGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 <PreBuildEvent>
@@ -489,7 +554,7 @@
 <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
 </Bscmake>
 </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
 <PreBuildEvent>
 <Command>
 </Command>
@@ -499,6 +564,44 @@
 <Optimization>Disabled</Optimization>
 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <MinimalRebuild>false</MinimalRebuild>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -529,6 +632,45 @@
 <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
 </Bscmake>
 </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <PreBuildEvent>
 <Command>"$(ProjectDir)..\..\version.bat"</Command>
@@ -563,6 +705,40 @@
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
 </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <PreBuildEvent>
 <Command>"$(ProjectDir)..\..\version.bat"</Command>
@@ -598,6 +774,41 @@
 <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
 </Bscmake>
 </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 <ImportGroup Label="ExtensionTargets">
 </ImportGroup>

v0.5.2.tar.gz/build/msvc10/libgpac.vcxproj.filters -> v0.6.1.tar.gz/build/msvc10/libgpac.vcxproj.filters Changed

@@ -1,1173 +1,1176 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="include">
- <UniqueIdentifier>{9c50150f-31ba-4b6f-bba4-b2f2f1e972aa}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\win32">
- <UniqueIdentifier>{d20c79df-20bb-445b-91b7-6de78ef3b82c}</UniqueIdentifier>
- </Filter>
- <Filter Include="odf">
- <UniqueIdentifier>{7c7bc9e6-374b-45c9-934a-f1841d1c4d2e}</UniqueIdentifier>
- </Filter>
- <Filter Include="bifs">
- <UniqueIdentifier>{506a5423-55ca-4581-b831-b6adb2edc535}</UniqueIdentifier>
- </Filter>
- <Filter Include="compositor">
- <UniqueIdentifier>{a4e561b7-d3a9-4c50-a2a6-f9d889760097}</UniqueIdentifier>
- </Filter>
- <Filter Include="ietf">
- <UniqueIdentifier>{c746f384-2eed-462e-b157-5fc20e961290}</UniqueIdentifier>
- </Filter>
- <Filter Include="isomedia">
- <UniqueIdentifier>{596013ef-0275-41af-94e6-7f641b353d79}</UniqueIdentifier>
- </Filter>
- <Filter Include="laser">
- <UniqueIdentifier>{3073cf49-9ebb-48cf-aea8-35a44d810e10}</UniqueIdentifier>
- </Filter>
- <Filter Include="mcrypt">
- <UniqueIdentifier>{34d7c2c7-ecca-42a1-b891-dab22082820c}</UniqueIdentifier>
- </Filter>
- <Filter Include="media_tools">
- <UniqueIdentifier>{744a30ee-387a-43c8-a9a5-83f5fc6f646f}</UniqueIdentifier>
- </Filter>
- <Filter Include="utils">
- <UniqueIdentifier>{8bbc563e-abf0-404a-9661-85d8795b63e1}</UniqueIdentifier>
- </Filter>
- <Filter Include="terminal">
- <UniqueIdentifier>{a7234dfd-5749-46dc-8ee2-586084f8d11d}</UniqueIdentifier>
- </Filter>
- <Filter Include="scenegraph">
- <UniqueIdentifier>{ceeb1cac-c751-485b-b5f3-abec90144298}</UniqueIdentifier>
- </Filter>
- <Filter Include="scene_manager">
- <UniqueIdentifier>{3a82bed0-adaa-40e6-8e51-9753fc7018d2}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\internal">
- <UniqueIdentifier>{3e56cf00-c2cb-44f6-b1dc-17c64b2bb822}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\modules">
- <UniqueIdentifier>{d451e478-a766-4a33-a371-db9e1292017f}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\include\win32\inttypes.h">
- <Filter>include\win32</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\win32\stdint.h">
- <Filter>include\win32</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\audio_out.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\codec.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\font.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\hardcoded_proto.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\ipmp.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\js_usr.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\raster2d.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\service.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\term_ext.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\modules\video_out.h">
- <Filter>include\modules</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\avilib.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\camera.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\laser_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\m3u8.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\media_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\mesh.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\mpd.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\odf_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\odf_parse_common.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\ogg.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\smjs_api.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\swf_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\internal\vobsub.h">
- <Filter>include\internal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\bifs\quant.h">
- <Filter>bifs</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\bifs\script.h">
- <Filter>bifs</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\drawable.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\gl_inc.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\mpeg4_grouping.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\nodes_stacks.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\offscreen_cache.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\texturing.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\visual_manager.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\visual_manager_2d.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\compositor\visual_manager_3d.h">
- <Filter>compositor</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h">
- <Filter>media_tools</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\terminal\input_sensor.h">
- <Filter>terminal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\terminal\media_control.h">
- <Filter>terminal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\terminal\media_memory.h">
- <Filter>terminal</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\utils\module_wrap.h">
- <Filter>utils</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\xml.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\ait.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\avparse.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\base_coding.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\bifs.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\bitstream.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\cache.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\color.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\compositor.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\config_file.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\configuration.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\constants.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\crypt.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\dash.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\download.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\dsmcc.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\dvb_mpe.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\esi.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\events.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\events_constants.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\filestreamer.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\html5_media.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\html5_mse.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\ietf.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\ismacryp.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\iso639.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\isomedia.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\laser.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\list.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\map.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\math.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\media_tools.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\mediaobject.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\module.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\mpeg4_odf.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\mpegts.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\network.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\nodes_svg.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\nodes_x3d.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\nodes_xbl.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\options.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\path2d.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\revision.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\ringbuffer.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\rtp_streamer.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\scene_engine.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\scene_manager.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\scenegraph.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\scenegraph_svg.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\scenegraph_vrml.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\setup.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\svg_types.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\sync_layer.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\term_info.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\terminal.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\thread.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\token.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\tools.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\unicode.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\user.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\utf.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\version.h">
- <Filter>include</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\gpac\webvtt.h">
- <Filter>include</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\bifs\arith_decoder.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\bifs_codec.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\bifs_node_tables.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\com_dec.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\com_enc.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\conditional.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\field_decode.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\field_encode.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\memory_decoder.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\predictive_mffield.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\quantize.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\script_dec.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\script_enc.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\bifs\unquantize.c">
- <Filter>bifs</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\audio_input.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\audio_mixer.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\audio_render.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\bindable.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\camera.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\compositor.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\compositor_2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\compositor_3d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\compositor_node_init.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\drawable.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\events.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\font_engine.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\hardcoded_protos.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\hc_flash_shape.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mesh.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mesh_collide.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mesh_tesselate.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_animstream.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_audio.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_background.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_background2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_bitmap.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_composite.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_form.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_3d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ifs2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ils2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_gradients.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_layout.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_sound.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_text.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_textures.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\navigate.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\offscreen_cache.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_base.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_filters.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_font.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_geometry.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_grouping.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_media.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_paint_servers.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\svg_text.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\texturing.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\texturing_gl.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\visual_manager.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\visual_manager_2d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\visual_manager_2d_draw.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\visual_manager_3d.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\visual_manager_3d_gl.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\compositor\x3d_geometry.c">
- <Filter>compositor</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtcp.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp_packetizer.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtp_streamer.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtsp_command.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtsp_common.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtsp_response.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\rtsp_session.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\ietf\sdp.c">
- <Filter>ietf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\avc_ext.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_code_adobe.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_code_apple.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_code_base.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_code_drm.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_code_meta.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_dump.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\box_funcs.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\data_map.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\drm_sample.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\hint_track.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\hinting.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\isom_intern.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\isom_read.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\isom_store.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\isom_write.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\media.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\media_odf.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\meta.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\movie_fragments.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\sample_descs.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\stbl_read.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\stbl_write.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\track.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\tx3g.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\laser\lsr_dec.c">
- <Filter>laser</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\laser\lsr_enc.c">
- <Filter>laser</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\laser\lsr_tables.c">
- <Filter>laser</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\cbc.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\cfb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ctr.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\des.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ecb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\g_crypt.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ncfb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\nofb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ofb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-128.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-192.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-256.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\stream.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\tripledes.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\ait.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\av_parsers.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\avilib.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\dash_client.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\dash_segmenter.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\dsmcc.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\dvb_mpe.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\filestreamer.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\gpac_ogg.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\html5_media.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\html5_mse.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\img.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\ismacryp.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\isom_hinter.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\isom_tools.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\m2ts_mux.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\m3u8.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\media_export.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\media_import.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\mpd.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\mpegts.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\reedsolomon.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\saf.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\text_import.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\vobsub.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\media_tools\webvtt.c">
- <Filter>media_tools</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\desc_private.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\descriptors.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\ipmpx_code.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\ipmpx_dump.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\ipmpx_parse.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\oci_codec.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\odf_code.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\odf_codec.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\odf_command.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\odf_dump.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\odf_parse.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\qos.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\odf\slc.c">
- <Filter>odf</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\encode_isom.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\loader_bt.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\loader_isom.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\loader_qt.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\loader_svg.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\loader_xmt.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\scene_dump.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\scene_engine.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\scene_manager.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\scene_stats.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\swf_bifs.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\swf_parse.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\swf_svg.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c">
- <Filter>scene_manager</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\commands.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\dom_events.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\dom_smjs.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\smil_anim.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\smil_timing.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\svg_attributes.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\svg_properties.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\svg_smjs.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\svg_types.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\vrml_proto.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\vrml_route.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\vrml_script.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\vrml_tools.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\xbl_process.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\xml_ns.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\channel.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\clock.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\decoder.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\input_sensor.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\media_control.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\media_manager.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\media_memory.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\media_object.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\media_sensor.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\mpeg4_inline.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\network_service.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\object_browser.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\object_manager.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\scene.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\svg_external.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\term_node_init.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\terminal\terminal.c">
- <Filter>terminal</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\alloc.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\base_encoding.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\bitstream.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\cache.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\color.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\configfile.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\dlmalloc.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\downloader.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\error.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\list.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\map.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\math.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\module.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\os_config_init.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\os_divers.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\os_module.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\os_net.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\os_thread.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\path2d.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\path2d_stroker.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\ringbuffer.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\sha1.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\token.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\uni_bidi.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\unicode.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\url.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\utf.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\xml_parser.c">
- <Filter>utils</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c">
- <Filter>scenegraph</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\isomedia\ttml.c">
- <Filter>isomedia</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utils\os_file.c">
- <Filter>utils</Filter>
- </ClCompile>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="include">
+ <UniqueIdentifier>{9c50150f-31ba-4b6f-bba4-b2f2f1e972aa}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="include\win32">
+ <UniqueIdentifier>{d20c79df-20bb-445b-91b7-6de78ef3b82c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="odf">
+ <UniqueIdentifier>{7c7bc9e6-374b-45c9-934a-f1841d1c4d2e}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="bifs">
+ <UniqueIdentifier>{506a5423-55ca-4581-b831-b6adb2edc535}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="compositor">
+ <UniqueIdentifier>{a4e561b7-d3a9-4c50-a2a6-f9d889760097}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="ietf">
+ <UniqueIdentifier>{c746f384-2eed-462e-b157-5fc20e961290}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="isomedia">
+ <UniqueIdentifier>{596013ef-0275-41af-94e6-7f641b353d79}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="laser">
+ <UniqueIdentifier>{3073cf49-9ebb-48cf-aea8-35a44d810e10}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="mcrypt">
+ <UniqueIdentifier>{34d7c2c7-ecca-42a1-b891-dab22082820c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="media_tools">
+ <UniqueIdentifier>{744a30ee-387a-43c8-a9a5-83f5fc6f646f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="utils">
+ <UniqueIdentifier>{8bbc563e-abf0-404a-9661-85d8795b63e1}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="terminal">
+ <UniqueIdentifier>{a7234dfd-5749-46dc-8ee2-586084f8d11d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="scenegraph">
+ <UniqueIdentifier>{ceeb1cac-c751-485b-b5f3-abec90144298}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="scene_manager">
+ <UniqueIdentifier>{3a82bed0-adaa-40e6-8e51-9753fc7018d2}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="include\internal">
+ <UniqueIdentifier>{3e56cf00-c2cb-44f6-b1dc-17c64b2bb822}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="include\modules">
+ <UniqueIdentifier>{d451e478-a766-4a33-a371-db9e1292017f}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\win32\inttypes.h">
+ <Filter>include\win32</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\win32\stdint.h">
+ <Filter>include\win32</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\audio_out.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\codec.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\font.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\hardcoded_proto.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\ipmp.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\js_usr.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\raster2d.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\service.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\term_ext.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\modules\video_out.h">
+ <Filter>include\modules</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\avilib.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\camera.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\laser_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\m3u8.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\media_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\mesh.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\mpd.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\odf_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\odf_parse_common.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\ogg.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\smjs_api.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\swf_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\internal\vobsub.h">
+ <Filter>include\internal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\bifs\quant.h">
+ <Filter>bifs</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\bifs\script.h">
+ <Filter>bifs</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\drawable.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\gl_inc.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\mpeg4_grouping.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\nodes_stacks.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\offscreen_cache.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\texturing.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\visual_manager.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\visual_manager_2d.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\compositor\visual_manager_3d.h">
+ <Filter>compositor</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h">
+ <Filter>media_tools</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\terminal\input_sensor.h">
+ <Filter>terminal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\terminal\media_control.h">
+ <Filter>terminal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\terminal\media_memory.h">
+ <Filter>terminal</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\utils\module_wrap.h">
+ <Filter>utils</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\xml.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\ait.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\avparse.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\base_coding.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\bifs.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\bitstream.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\cache.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\color.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\compositor.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\config_file.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\configuration.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\constants.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\crypt.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\dash.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\download.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\dsmcc.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\dvb_mpe.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\esi.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\events.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\events_constants.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\filestreamer.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\html5_media.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\html5_mse.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\ietf.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\ismacryp.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\iso639.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\isomedia.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\laser.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\list.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\map.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\math.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\media_tools.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\mediaobject.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\module.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\mpeg4_odf.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\mpegts.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\network.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\nodes_svg.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\nodes_x3d.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\nodes_xbl.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\options.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\path2d.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\revision.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\ringbuffer.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\rtp_streamer.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\scene_engine.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\scene_manager.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\scenegraph.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\scenegraph_svg.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\scenegraph_vrml.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\setup.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\svg_types.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\sync_layer.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\term_info.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\terminal.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\thread.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\token.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\tools.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\unicode.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\user.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\utf.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\version.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\gpac\webvtt.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\bifs\arith_decoder.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\bifs_codec.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\bifs_node_tables.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\com_dec.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\com_enc.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\conditional.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\field_decode.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\field_encode.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\memory_decoder.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\predictive_mffield.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\quantize.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\script_dec.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\script_enc.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\bifs\unquantize.c">
+ <Filter>bifs</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\audio_input.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\audio_mixer.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\audio_render.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\bindable.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\camera.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\compositor.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\compositor_2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\compositor_3d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\compositor_node_init.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\drawable.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\events.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\font_engine.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\hardcoded_protos.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\hc_flash_shape.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mesh.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mesh_collide.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mesh_tesselate.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_animstream.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_audio.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_background.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_background2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_bitmap.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_composite.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_form.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_3d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ifs2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ils2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_gradients.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_layout.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_sound.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_text.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_textures.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\navigate.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\offscreen_cache.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_base.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_filters.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_font.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_geometry.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_grouping.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_media.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_paint_servers.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\svg_text.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\texturing.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\texturing_gl.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\visual_manager.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\visual_manager_2d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\visual_manager_2d_draw.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\visual_manager_3d.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\visual_manager_3d_gl.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\compositor\x3d_geometry.c">
+ <Filter>compositor</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtcp.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp_packetizer.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtp_streamer.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtsp_command.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtsp_common.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtsp_response.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\rtsp_session.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\ietf\sdp.c">
+ <Filter>ietf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\avc_ext.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_code_adobe.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_code_apple.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_code_base.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_code_drm.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_code_meta.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_dump.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\box_funcs.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\data_map.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\drm_sample.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\hint_track.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\hinting.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\isom_intern.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\isom_read.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\isom_store.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\isom_write.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\media.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\media_odf.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\meta.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\movie_fragments.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\sample_descs.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\stbl_read.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\stbl_write.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\track.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\tx3g.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\laser\lsr_dec.c">
+ <Filter>laser</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\laser\lsr_enc.c">
+ <Filter>laser</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\laser\lsr_tables.c">
+ <Filter>laser</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\cbc.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\cfb.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\ctr.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\des.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\ecb.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\g_crypt.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\ncfb.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\nofb.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\ofb.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\rijndael-128.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\rijndael-192.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\rijndael-256.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\stream.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\mcrypt\tripledes.c">
+ <Filter>mcrypt</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\ait.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\av_parsers.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\avilib.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\dash_client.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\dash_segmenter.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\dsmcc.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\dvb_mpe.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\filestreamer.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\gpac_ogg.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\html5_media.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\html5_mse.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\img.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\ismacryp.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\isom_hinter.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\isom_tools.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\m2ts_mux.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\m3u8.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\media_export.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\media_import.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\mpd.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\mpegts.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\reedsolomon.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\saf.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\text_import.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\vobsub.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\webvtt.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\desc_private.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\descriptors.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\ipmpx_code.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\ipmpx_dump.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\ipmpx_parse.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\oci_codec.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\odf_code.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\odf_codec.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\odf_command.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\odf_dump.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\odf_parse.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\qos.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\odf\slc.c">
+ <Filter>odf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\encode_isom.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\loader_bt.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\loader_isom.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\loader_qt.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\loader_svg.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\loader_xmt.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\scene_dump.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\scene_engine.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\scene_manager.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\scene_stats.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\swf_bifs.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\swf_parse.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\swf_svg.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c">
+ <Filter>scene_manager</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\commands.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\dom_events.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\dom_smjs.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\smil_anim.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\smil_timing.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\svg_attributes.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\svg_properties.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\svg_smjs.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\svg_types.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\vrml_proto.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\vrml_route.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\vrml_script.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\vrml_tools.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\xbl_process.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\xml_ns.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\channel.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\clock.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\decoder.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\input_sensor.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\media_control.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\media_manager.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\media_memory.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\media_object.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\media_sensor.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\mpeg4_inline.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\network_service.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\object_browser.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\object_manager.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\scene.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\svg_external.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\term_node_init.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\terminal\terminal.c">
+ <Filter>terminal</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\alloc.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\base_encoding.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\bitstream.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\cache.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\color.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\configfile.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\dlmalloc.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\downloader.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\error.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\list.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\map.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\math.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\module.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\os_config_init.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\os_divers.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\os_module.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\os_net.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\os_thread.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\path2d.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\path2d_stroker.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\ringbuffer.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\sha1.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\token.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\uni_bidi.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\unicode.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\url.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\utf.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\xml_parser.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c">
+ <Filter>scenegraph</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\ttml.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\utils\os_file.c">
+ <Filter>utils</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\isomedia\iff.c">
+ <Filter>isomedia</Filter>
+ </ClCompile>
+ </ItemGroup>
 </Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc10/libgpac_dll.vcxproj -> v0.6.1.tar.gz/build/msvc10/libgpac_dll.vcxproj Changed

v0.5.2.tar.gz/build/msvc10/mp3_in.vcxproj -> v0.6.1.tar.gz/build/msvc10/mp3_in.vcxproj Changed

@@ -139,7 +139,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
@@ -227,7 +227,7 @@
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>

v0.5.2.tar.gz/build/msvc10/mp4box.vcxproj -> v0.6.1.tar.gz/build/msvc10/mp4box.vcxproj Changed

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug - MP4Box_only|x64">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
 <ProjectConfiguration Include="Debug|Win32">
 <Configuration>Debug</Configuration>
 <Platform>Win32</Platform>
@@ -9,6 +17,14 @@
 <Configuration>Debug</Configuration>
 <Platform>x64</Platform>
 </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|Win32">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|x64">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
 <ProjectConfiguration Include="Release|Win32">
 <Configuration>Release</Configuration>
 <Platform>Win32</Platform>
@@ -28,57 +44,107 @@
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 <ImportGroup Label="ExtensionSettings">
 </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
 <PropertyGroup Label="UserMacros" />
 <PropertyGroup>
 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</LinkIncremental>
 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</LinkIncremental>
 <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</GenerateManifest>
 <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</GenerateManifest>
 <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</EmbedManifest>
 <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</EmbedManifest>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">false</LinkIncremental>
 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">false</LinkIncremental>
 <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">true</GenerateManifest>
 <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">true</GenerateManifest>
 </PropertyGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 <Midl>
@@ -125,6 +191,51 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
 </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 <Midl>
 <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
@@ -168,6 +279,49 @@
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </Bscmake>
 </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 <Midl>
 <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
@@ -211,6 +365,49 @@
 </Command>
 </PostBuildEvent>
 </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 <Midl>
 <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
@@ -237,7 +434,49 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -256,40 +495,51 @@
 <ItemGroup>
 <ClCompile Include="..\..\applications\mp4box\filedump.c">
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ClCompile>
 <ClCompile Include="..\..\applications\mp4box\fileimport.c">
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ClCompile>
 <ClCompile Include="..\..\applications\mp4box\live.c" />
 <ClCompile Include="..\..\applications\mp4box\main.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">Disabled</Optimization>
 </ClCompile>
 </ItemGroup>
 <ItemGroup>
- <ProjectReference Include="libgpac_dll.vcxproj">
- <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="libgpac.vcxproj">
+ <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
 </ProjectReference>
 </ItemGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

v0.5.2.tar.gz/build/msvc10/openhevc.vcxproj -> v0.6.1.tar.gz/build/msvc10/openhevc.vcxproj Changed

@@ -139,7 +139,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
@@ -225,7 +225,7 @@
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>

v0.5.2.tar.gz/build/msvc10/platinum.vcxproj -> v0.6.1.tar.gz/build/msvc10/platinum.vcxproj Changed

@@ -145,7 +145,7 @@
 <Optimization>Full</Optimization>
 <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <MinimalRebuild>false</MinimalRebuild>
 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -237,7 +237,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>

v0.6.1.tar.gz/build/msvc10/player_api.vcxproj Added

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{0ABBC240-2951-43A9-9831-307C71CFEF1C}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>player_api</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\testapps\player_api\main.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/msvc10/sdl_out.vcxproj -> v0.6.1.tar.gz/build/msvc10/sdl_out.vcxproj Changed

@@ -85,6 +85,10 @@
 <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;;C:\devtools\lib\x64</LibraryPath>
 <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\include;$(IncludePath)</IncludePath>
 <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\lib\x64;$(LibraryPath)</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\DEVTOOLS\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\DEVTOOLS\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\devtools\lib\x86</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\devtools\lib\x86</LibraryPath>
 </PropertyGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 <Midl>

v0.5.2.tar.gz/build/msvc10/widgetman.vcxproj -> v0.6.1.tar.gz/build/msvc10/widgetman.vcxproj Changed

@@ -140,7 +140,7 @@
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -228,7 +228,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>

v0.6.1.tar.gz/build/msvc14 Added

v0.6.1.tar.gz/build/msvc14/GPAX.vcxproj Added

@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{72486240-A124-496E-A67A-E76FEC7E99BE}</ProjectGuid>
+ <RootNamespace>GPAX</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <CustomBuildStep>
+ <Message>
+ </Message>
+ <Command>
+ </Command>
+ <Outputs>
+ </Outputs>
+ </CustomBuildStep>
+ <Midl>
+ <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <CustomBuildStep>
+ <Message>
+ </Message>
+ <Command>
+ </Command>
+ <Outputs>
+ </Outputs>
+ </CustomBuildStep>
+ <Midl>
+ <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <CustomBuildStep>
+ <Message>
+ </Message>
+ <Command>
+ </Command>
+ <Outputs>
+ </Outputs>
+ </CustomBuildStep>
+ <Midl>
+ <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
+ <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <CustomBuildStep>
+ <Message>
+ </Message>
+ <Command>
+ </Command>
+ <Outputs>
+ </Outputs>
+ </CustomBuildStep>
+ <Midl>
+ <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
+ <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <None Include="..\..\applications\GPAX\gpax.bmp" />
+ <None Include="..\..\applications\GPAX\GPAX.def" />
+ <None Include="..\..\applications\GPAX\GPAX.rgs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\GPAX\GPAX.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\GPAX\GPAXPlugin.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\GPAX\StdAfx.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\applications\GPAX\GPAX.h" />
+ <ClInclude Include="..\..\applications\GPAX\GPAXPlugin.h" />
+ <ClInclude Include="..\..\applications\GPAX\resource.h" />
+ <ClInclude Include="..\..\applications\GPAX\StdAfx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="..\..\applications\GPAX\GPAX.idl">
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GPAX.tlb</TypeLibraryName>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GPAX.tlb</TypeLibraryName>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GPAX.tlb</TypeLibraryName>
+ <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GPAX.tlb</TypeLibraryName>
+ </Midl>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\applications\GPAX\GPAX.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/Osmo4.vcxproj Added

@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{C79C2D73-06E9-4622-92CE-F166B1B51792}</ProjectGuid>
+ <RootNamespace>Osmo4</RootNamespace>
+ <Keyword>MFCProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <StackReserveSize>8388608</StackReserveSize>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <StackReserveSize>8388608</StackReserveSize>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\osmo4_w32\AddressBar.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\FileProps.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\MainFrm.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\OpenUrl.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\Options.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\Osmo4.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\Playlist.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\Sliders.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmo4_w32\StdAfx.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\applications\osmo4_w32\Osmo4.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\applications\osmo4_w32\AddressBar.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\FileProps.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\MainFrm.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\OpenUrl.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\Options.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\Osmo4.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\Playlist.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\Resource.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\Sliders.h" />
+ <ClInclude Include="..\..\applications\osmo4_w32\StdAfx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\applications\osmo4_w32\res\error.ico" />
+ <None Include="..\..\applications\osmo4_w32\res\maintool.bmp" />
+ <None Include="..\..\applications\osmo4_w32\res\message.ico" />
+ <None Include="..\..\applications\osmo4_w32\res\osmo4.ico" />
+ <None Include="..\..\applications\osmo4_w32\res\pause.ico" />
+ <None Include="..\..\applications\osmo4_w32\res\play.ico" />
+ <None Include="..\..\applications\osmo4_w32\res\playlist.bmp" />
+ <None Include="..\..\applications\osmo4_w32\res\stop.ico" />
+ <None Include="..\..\doc\osmo4.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/aac_in.vcxproj Added

@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
+ <RootNamespace>aac_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/aac_in_deb/aac_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/aac_in_deb/aac_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/aac_in_rel/aac_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/aac_in_rel/aac_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\aac_in\aac_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\aac_in\faad_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ac3_in.vcxproj Added

@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}</ProjectGuid>
+ <RootNamespace>ac3_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/ac3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ </Manifest>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\Debug/ac3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Manifest>
+ <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ </Manifest>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/ac3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\Release/ac3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\ac3_in\ac3_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\ac3_in\liba52_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/amr_dec.vcxproj Added

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{5ED5A1C8-DB34-4089-8E53-EFB225754D02}</ProjectGuid>
+ <RootNamespace>amr_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <StackReserveSize>8388608</StackReserveSize>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <StackReserveSize>8388608</StackReserveSize>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\amr_dec\amr_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/amr_float_dec.vcxproj Added

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{5D3983BF-143F-49C3-9284-89778282AEFE}</ProjectGuid>
+ <RootNamespace>amr_float_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\amr_float_dec\amr_float_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/audio_filter.vcxproj Added

@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{C993119B-29B1-49C8-8EA3-A9ABF633164E}</ProjectGuid>
+ <RootNamespace>audio_filter</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\audio_filter\audio_filter.c" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/avcap.vcxproj Added

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{109C4F31-781F-4C9E-B160-E788A83F9387}</ProjectGuid>
+ <RootNamespace>avcap</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/avcap.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CallingConvention>Cdecl</CallingConvention>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/avcap.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CallingConvention>Cdecl</CallingConvention>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_rel/avcap.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_rel/avcap.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\avcap\avcap.cpp" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/bifs_dec.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}</ProjectGuid>
+ <RootNamespace>bifs_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\bifs_dec\bifs_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ctx_load.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}</ProjectGuid>
+ <RootNamespace>ctx_load</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\ctx_load\ctx_load.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/dashcast.vcxproj Added

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
+ <RootNamespace>dashcast</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\dashcast\audio_data.c" />
+ <ClCompile Include="..\..\applications\dashcast\audio_decoder.c" />
+ <ClCompile Include="..\..\applications\dashcast\audio_encoder.c" />
+ <ClCompile Include="..\..\applications\dashcast\audio_muxer.c" />
+ <ClCompile Include="..\..\applications\dashcast\circular_buffer.c" />
+ <ClCompile Include="..\..\applications\dashcast\cmd_data.c" />
+ <ClCompile Include="..\..\applications\dashcast\controler.c" />
+ <ClCompile Include="..\..\applications\dashcast\dashcast.c" />
+ <ClCompile Include="..\..\applications\dashcast\message_queue.c" />
+ <ClCompile Include="..\..\applications\dashcast\register.c" />
+ <ClCompile Include="..\..\applications\dashcast\task.c" />
+ <ClCompile Include="..\..\applications\dashcast\video_data.c" />
+ <ClCompile Include="..\..\applications\dashcast\video_decoder.c" />
+ <ClCompile Include="..\..\applications\dashcast\video_encoder.c" />
+ <ClCompile Include="..\..\applications\dashcast\video_muxer.c" />
+ <ClCompile Include="..\..\applications\dashcast\video_scaler.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\applications\dashcast\audio_data.h" />
+ <ClInclude Include="..\..\applications\dashcast\audio_decoder.h" />
+ <ClInclude Include="..\..\applications\dashcast\audio_encoder.h" />
+ <ClInclude Include="..\..\applications\dashcast\audio_muxer.h" />
+ <ClInclude Include="..\..\applications\dashcast\circular_buffer.h" />
+ <ClInclude Include="..\..\applications\dashcast\cmd_data.h" />
+ <ClInclude Include="..\..\applications\dashcast\controler.h" />
+ <ClInclude Include="..\..\applications\dashcast\libav_compat.h" />
+ <ClInclude Include="..\..\applications\dashcast\message_queue.h" />
+ <ClInclude Include="..\..\applications\dashcast\register.h" />
+ <ClInclude Include="..\..\applications\dashcast\task.h" />
+ <ClInclude Include="..\..\applications\dashcast\video_data.h" />
+ <ClInclude Include="..\..\applications\dashcast\video_decoder.h" />
+ <ClInclude Include="..\..\applications\dashcast\video_encoder.h" />
+ <ClInclude Include="..\..\applications\dashcast\video_muxer.h" />
+ <ClInclude Include="..\..\applications\dashcast\video_scaler.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/dektec_out.vcxproj Added

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{CAC981C2-5665-4E90-80D3-604C1A785D91}</ProjectGuid>
+ <RootNamespace>dektec_out</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dektec_out_deb/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dektec_out_deb/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
+ <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/dummy_in.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{073E2381-4FDE-4C4D-A117-C489EB17C48B}</ProjectGuid>
+ <RootNamespace>dummy_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\dummy_in\dummy_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/dx_hw.vcxproj Added

@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{B64736BD-9245-4F40-961D-EB9822265764}</ProjectGuid>
+ <RootNamespace>dx_hw</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <None Include="..\..\modules\dx_hw\collide.cur" />
+ <None Include="..\..\modules\dx_hw\hand.cur" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\dx_hw\dx_2d.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\dx_hw\dx_audio.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\dx_hw\dx_video.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\dx_hw\dx_window.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\dx_hw\dx_hw.h" />
+ <ClInclude Include="..\..\modules\dx_hw\resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\modules\dx_hw\dx_hw.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ffmpeg_in.vcxproj Added

@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9FECAB79-BC70-4EEA-A23B-B64159F904B3}</ProjectGuid>
+ <RootNamespace>ffmpeg_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_decode.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_demux.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_load.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\ffmpeg_in\ffmpeg_in.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ft_font.vcxproj Added

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{042D3628-67F3-4B5C-8BC0-CD9AFA416974}</ProjectGuid>
+ <RootNamespace>ft_font</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ft_font_deb/ft_font.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ </Manifest>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ft_font_deb/ft_font.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Manifest>
+ <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+ </Manifest>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ft_font_rel/ft_font.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ft_font_rel/ft_font.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\ft_font\ft_font.c" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\ft_font\ft_font.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/gdip_raster.vcxproj Added

@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{CAA5A551-006A-4119-8115-FB14692E719F}</ProjectGuid>
+ <RootNamespace>gdip_raster</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\gdip_raster\gdip_font.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\gdip_raster\gdip_grad.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\gdip_raster\gdip_rend.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\gdip_raster\gdip_texture.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\gdip_raster\gdip_priv.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/gpac.sln Added

@@ -0,0 +1,748 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcxproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcxproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcxproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcxproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcxproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_in", "dummy_in.vcxproj", "{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcxproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcxproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcxproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdip_raster", "gdip_raster.vcxproj", "{CAA5A551-006A-4119-8115-FB14692E719F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "img_in", "img_in.vcxproj", "{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isom_in", "isom_in.vcxproj", "{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laser_dec", "laser_dec.vcxproj", "{879E26B2-48DB-47B3-B82F-893696286E6F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcxproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_dll", "libgpac_dll.vcxproj", "{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcxproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcxproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcxproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odf_dec", "odf_dec.vcxproj", "{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcxproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcxproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtp_in", "rtp_in.vcxproj", "{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saf_in", "saf_in.vcxproj", "{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl_out", "sdl_out.vcxproj", "{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soft_raster", "soft_raster.vcxproj", "{71071F01-C813-4384-BE38-0F4020BCC0EE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svg_in", "svg_in.vcxproj", "{402A8794-B724-44A3-B608-84B600ECA387}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timedtext", "timedtext.vcxproj", "{464697D2-BA44-446F-8223-1EB3969ED1A8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wav_out", "wav_out.vcxproj", "{01183543-B182-4E32-9FD6-FC15C847316C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvid_dec", "xvid_dec.vcxproj", "{4258687D-4905-46A6-9407-08F4F8A81CC0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ismacryp", "ismacryp.vcxproj", "{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcxproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac_js", "gpac_js.vcxproj", "{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_filter", "audio_filter.vcxproj", "{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platinum", "platinum.vcxproj", "{694C765F-DFD6-467E-A813-B3F887E822D4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "widgetman", "widgetman.vcxproj", "{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redirect_av", "redirect_av.vcxproj", "{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_rec", "ui_rec.vcxproj", "{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensvc_dec", "opensvc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpd_in", "mpd_in.vcxproj", "{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_dec", "amr_dec.vcxproj", "{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_float_dec", "amr_float_dec.vcxproj", "{5D3983BF-143F-49C3-9284-89778282AEFE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "validator.vcxproj", "{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse_in", "mse_in.vcxproj", "{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{6274F5D2-A9CB-4DF9-BF9E-818416ACD347}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openhevc_dec", "openhevc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashcast", "dashcast.vcxproj", "{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
+		Debug - MP4Box_only|x64 = Debug - MP4Box_only|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release - MP4Box_only|Win32 = Release - MP4Box_only|Win32
+		Release - MP4Box_only|x64 = Release - MP4Box_only|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.ActiveCfg = Debug|x64
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.Build.0 = Debug|x64
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.ActiveCfg = Release|x64
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.Build.0 = Release|x64
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|x64.ActiveCfg = Debug|x64
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|x64.ActiveCfg = Release|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.Build.0 = Release|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.ActiveCfg = Debug|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.Build.0 = Debug|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.ActiveCfg = Release|x64
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.Build.0 = Release|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.ActiveCfg = Debug|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.Build.0 = Debug|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.ActiveCfg = Release|x64
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.Build.0 = Release|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.Build.0 = Debug|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.ActiveCfg = Debug|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.Build.0 = Debug|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.ActiveCfg = Release|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.ActiveCfg = Release|x64
+		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.Build.0 = Release|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.ActiveCfg = Debug|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.Build.0 = Debug|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.ActiveCfg = Release|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.Build.0 = Release|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.ActiveCfg = Debug|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.Build.0 = Debug|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.ActiveCfg = Release|x64
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.Build.0 = Release|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.ActiveCfg = Debug|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.Build.0 = Debug|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.ActiveCfg = Release|x64
+		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.Build.0 = Release|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.ActiveCfg = Debug|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.Build.0 = Debug|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.ActiveCfg = Release|x64
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.Build.0 = Release|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.ActiveCfg = Debug|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.Build.0 = Debug|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.ActiveCfg = Release|x64
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.Build.0 = Release|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.ActiveCfg = Debug|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.Build.0 = Debug|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.ActiveCfg = Release|x64
+		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.Build.0 = Release|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.ActiveCfg = Debug|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.Build.0 = Debug|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.ActiveCfg = Release|x64
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.Build.0 = Release|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.Build.0 = Debug|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.ActiveCfg = Debug|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.Build.0 = Debug|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.ActiveCfg = Release|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.ActiveCfg = Release|x64
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.Build.0 = Release|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.ActiveCfg = Debug|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.Build.0 = Debug|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.ActiveCfg = Release|x64
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.Build.0 = Release|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.ActiveCfg = Debug|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.Build.0 = Debug|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.ActiveCfg = Release|x64
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.Build.0 = Release|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.ActiveCfg = Debug|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.Build.0 = Debug|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.ActiveCfg = Release|x64
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.Build.0 = Release|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.ActiveCfg = Debug|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.Build.0 = Debug|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.ActiveCfg = Release|x64
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.Build.0 = Release|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.ActiveCfg = Debug|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.Build.0 = Debug|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.ActiveCfg = Release|x64
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.Build.0 = Release|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.ActiveCfg = Debug|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.Build.0 = Debug|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.ActiveCfg = Release|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.Build.0 = Release|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.ActiveCfg = Debug|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.Build.0 = Debug|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.ActiveCfg = Release|x64
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.Build.0 = Release|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.ActiveCfg = Debug|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.Build.0 = Debug|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.ActiveCfg = Release|x64
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.Build.0 = Release|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.ActiveCfg = Debug|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.Build.0 = Debug|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.ActiveCfg = Release|x64
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.Build.0 = Release|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.Build.0 = Debug|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.ActiveCfg = Debug|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.Build.0 = Debug|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.ActiveCfg = Release|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.ActiveCfg = Release|x64
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.Build.0 = Release|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.ActiveCfg = Debug|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.Build.0 = Debug|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.ActiveCfg = Release|x64
+		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.Build.0 = Release|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.ActiveCfg = Debug|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.Build.0 = Debug|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.ActiveCfg = Release|x64
+		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.Build.0 = Release|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.ActiveCfg = Debug|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.Build.0 = Debug|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.ActiveCfg = Release|x64
+		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.Build.0 = Release|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.Build.0 = Debug|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.ActiveCfg = Debug|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.Build.0 = Debug|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.ActiveCfg = Release|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.ActiveCfg = Release|x64
+		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.Build.0 = Release|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.ActiveCfg = Debug|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.Build.0 = Debug|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.ActiveCfg = Release|x64
+		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.Build.0 = Release|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.ActiveCfg = Debug|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.Build.0 = Debug|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.ActiveCfg = Release|x64
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.Build.0 = Release|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.ActiveCfg = Debug|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.Build.0 = Debug|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|x64.Build.0 = Release|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.ActiveCfg = Release|x64
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.Build.0 = Release|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.ActiveCfg = Debug|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.Build.0 = Debug|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.ActiveCfg = Release|x64
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.Build.0 = Release|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.ActiveCfg = Debug|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.Build.0 = Debug|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|x64.Build.0 = Release|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.ActiveCfg = Release|x64
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.Build.0 = Release|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.ActiveCfg = Debug|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.Build.0 = Debug|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.ActiveCfg = Release|x64
+		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.Build.0 = Release|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.ActiveCfg = Debug|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.Build.0 = Debug|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.ActiveCfg = Release|x64
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.Build.0 = Release|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.Build.0 = Release|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.ActiveCfg = Debug|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.Build.0 = Debug|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.ActiveCfg = Release|x64
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.Build.0 = Release|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.Build.0 = Debug|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.ActiveCfg = Debug|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.Build.0 = Debug|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|x64.Build.0 = Release|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.ActiveCfg = Release|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.Build.0 = Release|Win32
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.ActiveCfg = Release|x64
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.Build.0 = Release|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.Build.0 = Debug|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.ActiveCfg = Debug|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.Build.0 = Debug|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|x64.Build.0 = Release|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.ActiveCfg = Release|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.Build.0 = Release|Win32
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.ActiveCfg = Release|x64
+		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.Build.0 = Release|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.Build.0 = Debug|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.ActiveCfg = Debug|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.Build.0 = Debug|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.ActiveCfg = Release|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.ActiveCfg = Release|x64
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.Build.0 = Release|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.Build.0 = Debug|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.ActiveCfg = Debug|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.Build.0 = Debug|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.ActiveCfg = Release|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.Build.0 = Release|Win32
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.ActiveCfg = Release|x64
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.Build.0 = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.Build.0 = Debug|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.ActiveCfg = Debug|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.Build.0 = Debug|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.ActiveCfg = Release|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.Build.0 = Release|Win32
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.ActiveCfg = Release|x64
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.Build.0 = Release|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.Build.0 = Debug|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.ActiveCfg = Debug|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.Build.0 = Debug|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.ActiveCfg = Release|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{C79C2D73-06E9-4622-92CE-F166B1B51792} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2381-4FDE-4C4D-A117-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{B64736BD-9245-4F40-961D-EB9822265764} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{042D3628-67F3-4B5C-8BC0-CD9AFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{CAA5A551-006A-4119-8115-FB14692E719F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{FC8F1F56-078E-470D-B252-68EDDE88AA9D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{879E26B2-48DB-47B3-B82F-893696286E6F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{233014D5-F6E5-419D-8757-FA9CE7337088} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
+		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{B38E812D-9823-48E7-BE5F-BF09B0AD4165} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{A86E6EF8-3683-4AD0-8878-7A0D51326088} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{E2DBD151-9523-4E1A-9478-F3F825668F6E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{F346A9A7-CF8D-4409-8776-1D4244F96EF8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{71071F01-C813-4384-BE38-0F4020BCC0EE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{402A8794-B724-44A3-B608-84B600ECA387} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{464697D2-BA44-446F-8223-1EB3969ED1A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{01183543-B182-4E32-9FD6-FC15C847316C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{4258687D-4905-46A6-9407-08F4F8A81CC0} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{C993119B-29B1-49C8-8EA3-A9ABF633164E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{694C765F-DFD6-467E-A813-B3F887E822D4} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2381-4FDE-4C4D-A117-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2381-4FDE-4C4D-B217-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{5ED5A1C8-DB34-4089-8E53-EFB225754D02} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{5D3983BF-143F-49C3-9284-89778282AEFE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+	EndGlobalSection
+EndGlobal

v0.6.1.tar.gz/build/msvc14/gpac.suo Added

v0.6.1.tar.gz/build/msvc14/gpac_js.vcxproj Added

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}</ProjectGuid>
+ <RootNamespace>gpac_js</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\gpac_js\gpac_js.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/gpac_mp4box_mini.sln Added

v0.6.1.tar.gz/build/msvc14/hyb_in.vcxproj Added

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}</ProjectGuid>
+ <RootNamespace>hyb_in</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\hyb_in\fm_fake_pull.c" />
+ <ClCompile Include="..\..\modules\hyb_in\fm_fake_push.c" />
+ <ClCompile Include="..\..\modules\hyb_in\fm_mmbtools.c" />
+ <ClCompile Include="..\..\modules\hyb_in\hyb_in.c" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\hyb_in\hyb_in.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/img_in.vcxproj Added

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}</ProjectGuid>
+ <RootNamespace>img_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/img_in_deb/img_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/img_in_deb/img_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\img_in\bmp_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\img_in\img_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\img_in\img_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\img_in\jp2_dec.c" />
+ <ClCompile Include="..\..\modules\img_in\jpeg_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\img_in\png_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\img_in\img_in.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ismacryp.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}</ProjectGuid>
+ <RootNamespace>ismacryp</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\ismacryp\isma_ea.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/isom_in.vcxproj Added

@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{FC8F1F56-078E-470D-B252-68EDDE88AA9D}</ProjectGuid>
+ <RootNamespace>isom_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/isom_in_deb/isom_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/isom_in_deb/isom_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\isom_in\isom_cache.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\isom_in\load.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\isom_in\read.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\isom_in\read_ch.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\isom_in\isom_in.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/laser_dec.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{879E26B2-48DB-47B3-B82F-893696286E6F}</ProjectGuid>
+ <RootNamespace>laser_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\laser_dec\laser_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/libgpac.vcxproj Added

@@ -0,0 +1,838 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug - MP4Box_only|x64">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|Win32">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|x64">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\gpac\ait.h" />
+ <ClInclude Include="..\..\include\gpac\avparse.h" />
+ <ClInclude Include="..\..\include\gpac\base_coding.h" />
+ <ClInclude Include="..\..\include\gpac\bifs.h" />
+ <ClInclude Include="..\..\include\gpac\bitstream.h" />
+ <ClInclude Include="..\..\include\gpac\cache.h" />
+ <ClInclude Include="..\..\include\gpac\color.h" />
+ <ClInclude Include="..\..\include\gpac\compositor.h" />
+ <ClInclude Include="..\..\include\gpac\configuration.h" />
+ <ClInclude Include="..\..\include\gpac\config_file.h" />
+ <ClInclude Include="..\..\include\gpac\constants.h" />
+ <ClInclude Include="..\..\include\gpac\crypt.h" />
+ <ClInclude Include="..\..\include\gpac\dash.h" />
+ <ClInclude Include="..\..\include\gpac\download.h" />
+ <ClInclude Include="..\..\include\gpac\dsmcc.h" />
+ <ClInclude Include="..\..\include\gpac\dvb_mpe.h" />
+ <ClInclude Include="..\..\include\gpac\esi.h" />
+ <ClInclude Include="..\..\include\gpac\events.h" />
+ <ClInclude Include="..\..\include\gpac\events_constants.h" />
+ <ClInclude Include="..\..\include\gpac\filestreamer.h" />
+ <ClInclude Include="..\..\include\gpac\html5_media.h" />
+ <ClInclude Include="..\..\include\gpac\html5_mse.h" />
+ <ClInclude Include="..\..\include\gpac\ietf.h" />
+ <ClInclude Include="..\..\include\gpac\internal\avilib.h" />
+ <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h" />
+ <ClInclude Include="..\..\include\gpac\internal\camera.h" />
+ <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\laser_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\m3u8.h" />
+ <ClInclude Include="..\..\include\gpac\internal\media_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\mesh.h" />
+ <ClInclude Include="..\..\include\gpac\internal\mpd.h" />
+ <ClInclude Include="..\..\include\gpac\internal\odf_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\odf_parse_common.h" />
+ <ClInclude Include="..\..\include\gpac\internal\ogg.h" />
+ <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h" />
+ <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\smjs_api.h" />
+ <ClInclude Include="..\..\include\gpac\internal\swf_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h" />
+ <ClInclude Include="..\..\include\gpac\internal\vobsub.h" />
+ <ClInclude Include="..\..\include\gpac\ismacryp.h" />
+ <ClInclude Include="..\..\include\gpac\iso639.h" />
+ <ClInclude Include="..\..\include\gpac\isomedia.h" />
+ <ClInclude Include="..\..\include\gpac\laser.h" />
+ <ClInclude Include="..\..\include\gpac\list.h" />
+ <ClInclude Include="..\..\include\gpac\map.h" />
+ <ClInclude Include="..\..\include\gpac\math.h" />
+ <ClInclude Include="..\..\include\gpac\mediaobject.h" />
+ <ClInclude Include="..\..\include\gpac\media_tools.h" />
+ <ClInclude Include="..\..\include\gpac\module.h" />
+ <ClInclude Include="..\..\include\gpac\modules\audio_out.h" />
+ <ClInclude Include="..\..\include\gpac\modules\codec.h" />
+ <ClInclude Include="..\..\include\gpac\modules\font.h" />
+ <ClInclude Include="..\..\include\gpac\modules\hardcoded_proto.h" />
+ <ClInclude Include="..\..\include\gpac\modules\ipmp.h" />
+ <ClInclude Include="..\..\include\gpac\modules\js_usr.h" />
+ <ClInclude Include="..\..\include\gpac\modules\raster2d.h" />
+ <ClInclude Include="..\..\include\gpac\modules\service.h" />
+ <ClInclude Include="..\..\include\gpac\modules\term_ext.h" />
+ <ClInclude Include="..\..\include\gpac\modules\video_out.h" />
+ <ClInclude Include="..\..\include\gpac\mpeg4_odf.h" />
+ <ClInclude Include="..\..\include\gpac\mpegts.h" />
+ <ClInclude Include="..\..\include\gpac\network.h" />
+ <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h" />
+ <ClInclude Include="..\..\include\gpac\nodes_svg.h" />
+ <ClInclude Include="..\..\include\gpac\nodes_x3d.h" />
+ <ClInclude Include="..\..\include\gpac\nodes_xbl.h" />
+ <ClInclude Include="..\..\include\gpac\options.h" />
+ <ClInclude Include="..\..\include\gpac\path2d.h" />
+ <ClInclude Include="..\..\include\gpac\revision.h" />
+ <ClInclude Include="..\..\include\gpac\ringbuffer.h" />
+ <ClInclude Include="..\..\include\gpac\rtp_streamer.h" />
+ <ClInclude Include="..\..\include\gpac\scenegraph.h" />
+ <ClInclude Include="..\..\include\gpac\scenegraph_svg.h" />
+ <ClInclude Include="..\..\include\gpac\scenegraph_vrml.h" />
+ <ClInclude Include="..\..\include\gpac\scene_engine.h" />
+ <ClInclude Include="..\..\include\gpac\scene_manager.h" />
+ <ClInclude Include="..\..\include\gpac\setup.h" />
+ <ClInclude Include="..\..\include\gpac\svg_types.h" />
+ <ClInclude Include="..\..\include\gpac\sync_layer.h" />
+ <ClInclude Include="..\..\include\gpac\terminal.h" />
+ <ClInclude Include="..\..\include\gpac\term_info.h" />
+ <ClInclude Include="..\..\include\gpac\thread.h" />
+ <ClInclude Include="..\..\include\gpac\token.h" />
+ <ClInclude Include="..\..\include\gpac\tools.h" />
+ <ClInclude Include="..\..\include\gpac\unicode.h" />
+ <ClInclude Include="..\..\include\gpac\user.h" />
+ <ClInclude Include="..\..\include\gpac\utf.h" />
+ <ClInclude Include="..\..\include\gpac\version.h" />
+ <ClInclude Include="..\..\include\gpac\webvtt.h" />
+ <ClInclude Include="..\..\include\gpac\xml.h" />
+ <ClInclude Include="..\..\include\win32\inttypes.h" />
+ <ClInclude Include="..\..\include\win32\stdint.h" />
+ <ClInclude Include="..\..\src\bifs\quant.h" />
+ <ClInclude Include="..\..\src\bifs\script.h" />
+ <ClInclude Include="..\..\src\compositor\drawable.h" />
+ <ClInclude Include="..\..\src\compositor\gl_inc.h" />
+ <ClInclude Include="..\..\src\compositor\mpeg4_grouping.h" />
+ <ClInclude Include="..\..\src\compositor\nodes_stacks.h" />
+ <ClInclude Include="..\..\src\compositor\offscreen_cache.h" />
+ <ClInclude Include="..\..\src\compositor\texturing.h" />
+ <ClInclude Include="..\..\src\compositor\visual_manager.h" />
+ <ClInclude Include="..\..\src\compositor\visual_manager_2d.h" />
+ <ClInclude Include="..\..\src\compositor\visual_manager_3d.h" />
+ <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h" />
+ <ClInclude Include="..\..\src\terminal\input_sensor.h" />
+ <ClInclude Include="..\..\src\terminal\media_control.h" />
+ <ClInclude Include="..\..\src\terminal\media_memory.h" />
+ <ClInclude Include="..\..\src\utils\module_wrap.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\bifs\arith_decoder.c" />
+ <ClCompile Include="..\..\src\bifs\bifs_codec.c" />
+ <ClCompile Include="..\..\src\bifs\bifs_node_tables.c" />
+ <ClCompile Include="..\..\src\bifs\com_dec.c" />
+ <ClCompile Include="..\..\src\bifs\com_enc.c" />
+ <ClCompile Include="..\..\src\bifs\conditional.c" />
+ <ClCompile Include="..\..\src\bifs\field_decode.c" />
+ <ClCompile Include="..\..\src\bifs\field_encode.c" />
+ <ClCompile Include="..\..\src\bifs\memory_decoder.c" />
+ <ClCompile Include="..\..\src\bifs\predictive_mffield.c" />
+ <ClCompile Include="..\..\src\bifs\quantize.c" />
+ <ClCompile Include="..\..\src\bifs\script_dec.c" />
+ <ClCompile Include="..\..\src\bifs\script_enc.c" />
+ <ClCompile Include="..\..\src\bifs\unquantize.c" />
+ <ClCompile Include="..\..\src\compositor\audio_input.c" />
+ <ClCompile Include="..\..\src\compositor\audio_mixer.c" />
+ <ClCompile Include="..\..\src\compositor\audio_render.c" />
+ <ClCompile Include="..\..\src\compositor\bindable.c" />
+ <ClCompile Include="..\..\src\compositor\camera.c" />
+ <ClCompile Include="..\..\src\compositor\compositor.c" />
+ <ClCompile Include="..\..\src\compositor\compositor_2d.c" />
+ <ClCompile Include="..\..\src\compositor\compositor_3d.c" />
+ <ClCompile Include="..\..\src\compositor\compositor_node_init.c" />
+ <ClCompile Include="..\..\src\compositor\drawable.c" />
+ <ClCompile Include="..\..\src\compositor\events.c" />
+ <ClCompile Include="..\..\src\compositor\font_engine.c" />
+ <ClCompile Include="..\..\src\compositor\hardcoded_protos.c" />
+ <ClCompile Include="..\..\src\compositor\hc_flash_shape.c" />
+ <ClCompile Include="..\..\src\compositor\mesh.c" />
+ <ClCompile Include="..\..\src\compositor\mesh_collide.c" />
+ <ClCompile Include="..\..\src\compositor\mesh_tesselate.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_animstream.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_audio.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_background.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_background2d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_bitmap.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_composite.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_form.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_2d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_3d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ifs2d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ils2d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_gradients.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_layout.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_sound.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_text.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_textures.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c" />
+ <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c" />
+ <ClCompile Include="..\..\src\compositor\navigate.c" />
+ <ClCompile Include="..\..\src\compositor\offscreen_cache.c" />
+ <ClCompile Include="..\..\src\compositor\svg_base.c" />
+ <ClCompile Include="..\..\src\compositor\svg_filters.c" />
+ <ClCompile Include="..\..\src\compositor\svg_font.c" />
+ <ClCompile Include="..\..\src\compositor\svg_geometry.c" />
+ <ClCompile Include="..\..\src\compositor\svg_grouping.c" />
+ <ClCompile Include="..\..\src\compositor\svg_media.c" />
+ <ClCompile Include="..\..\src\compositor\svg_paint_servers.c" />
+ <ClCompile Include="..\..\src\compositor\svg_text.c" />
+ <ClCompile Include="..\..\src\compositor\texturing.c" />
+ <ClCompile Include="..\..\src\compositor\texturing_gl.c" />
+ <ClCompile Include="..\..\src\compositor\visual_manager.c" />
+ <ClCompile Include="..\..\src\compositor\visual_manager_2d.c" />
+ <ClCompile Include="..\..\src\compositor\visual_manager_2d_draw.c" />
+ <ClCompile Include="..\..\src\compositor\visual_manager_3d.c" />
+ <ClCompile Include="..\..\src\compositor\visual_manager_3d_gl.c" />
+ <ClCompile Include="..\..\src\compositor\x3d_geometry.c" />
+ <ClCompile Include="..\..\src\ietf\rtcp.c" />
+ <ClCompile Include="..\..\src\ietf\rtp.c" />
+ <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c" />
+ <ClCompile Include="..\..\src\ietf\rtp_packetizer.c" />
+ <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c" />
+ <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c" />
+ <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c" />
+ <ClCompile Include="..\..\src\ietf\rtp_streamer.c" />
+ <ClCompile Include="..\..\src\ietf\rtsp_command.c" />
+ <ClCompile Include="..\..\src\ietf\rtsp_common.c" />
+ <ClCompile Include="..\..\src\ietf\rtsp_response.c" />
+ <ClCompile Include="..\..\src\ietf\rtsp_session.c" />
+ <ClCompile Include="..\..\src\ietf\sdp.c" />
+ <ClCompile Include="..\..\src\isomedia\avc_ext.c" />
+ <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c" />
+ <ClCompile Include="..\..\src\isomedia\box_code_adobe.c" />
+ <ClCompile Include="..\..\src\isomedia\box_code_apple.c" />
+ <ClCompile Include="..\..\src\isomedia\box_code_base.c" />
+ <ClCompile Include="..\..\src\isomedia\box_code_drm.c" />
+ <ClCompile Include="..\..\src\isomedia\box_code_meta.c" />
+ <ClCompile Include="..\..\src\isomedia\box_dump.c" />
+ <ClCompile Include="..\..\src\isomedia\box_funcs.c" />
+ <ClCompile Include="..\..\src\isomedia\data_map.c" />
+ <ClCompile Include="..\..\src\isomedia\drm_sample.c" />
+ <ClCompile Include="..\..\src\isomedia\iff.c" />
+ <ClCompile Include="..\..\src\isomedia\ttml.c" />
+ <ClCompile Include="..\..\src\isomedia\hinting.c" />
+ <ClCompile Include="..\..\src\isomedia\hint_track.c" />
+ <ClCompile Include="..\..\src\isomedia\isom_intern.c" />
+ <ClCompile Include="..\..\src\isomedia\isom_read.c" />
+ <ClCompile Include="..\..\src\isomedia\isom_store.c" />
+ <ClCompile Include="..\..\src\isomedia\isom_write.c" />
+ <ClCompile Include="..\..\src\isomedia\media.c" />
+ <ClCompile Include="..\..\src\isomedia\media_odf.c" />
+ <ClCompile Include="..\..\src\isomedia\meta.c" />
+ <ClCompile Include="..\..\src\isomedia\movie_fragments.c" />
+ <ClCompile Include="..\..\src\isomedia\sample_descs.c" />
+ <ClCompile Include="..\..\src\isomedia\stbl_read.c" />
+ <ClCompile Include="..\..\src\isomedia\stbl_write.c" />
+ <ClCompile Include="..\..\src\isomedia\track.c" />
+ <ClCompile Include="..\..\src\isomedia\tx3g.c" />
+ <ClCompile Include="..\..\src\laser\lsr_dec.c" />
+ <ClCompile Include="..\..\src\laser\lsr_enc.c" />
+ <ClCompile Include="..\..\src\laser\lsr_tables.c" />
+ <ClCompile Include="..\..\src\mcrypt\cbc.c" />
+ <ClCompile Include="..\..\src\mcrypt\cfb.c" />
+ <ClCompile Include="..\..\src\mcrypt\ctr.c" />
+ <ClCompile Include="..\..\src\mcrypt\des.c" />
+ <ClCompile Include="..\..\src\mcrypt\ecb.c" />
+ <ClCompile Include="..\..\src\mcrypt\g_crypt.c" />
+ <ClCompile Include="..\..\src\mcrypt\ncfb.c" />
+ <ClCompile Include="..\..\src\mcrypt\nofb.c" />
+ <ClCompile Include="..\..\src\mcrypt\ofb.c" />
+ <ClCompile Include="..\..\src\mcrypt\rijndael-128.c" />
+ <ClCompile Include="..\..\src\mcrypt\rijndael-192.c" />
+ <ClCompile Include="..\..\src\mcrypt\rijndael-256.c" />
+ <ClCompile Include="..\..\src\mcrypt\stream.c" />
+ <ClCompile Include="..\..\src\mcrypt\tripledes.c" />
+ <ClCompile Include="..\..\src\media_tools\ait.c" />
+ <ClCompile Include="..\..\src\media_tools\avilib.c" />
+ <ClCompile Include="..\..\src\media_tools\av_parsers.c" />
+ <ClCompile Include="..\..\src\media_tools\dash_client.c" />
+ <ClCompile Include="..\..\src\media_tools\dash_segmenter.c" />
+ <ClCompile Include="..\..\src\media_tools\dsmcc.c" />
+ <ClCompile Include="..\..\src\media_tools\dvb_mpe.c" />
+ <ClCompile Include="..\..\src\media_tools\filestreamer.c" />
+ <ClCompile Include="..\..\src\media_tools\gpac_ogg.c" />
+ <ClCompile Include="..\..\src\media_tools\html5_media.c" />
+ <ClCompile Include="..\..\src\media_tools\html5_mse.c" />
+ <ClCompile Include="..\..\src\media_tools\img.c" />
+ <ClCompile Include="..\..\src\media_tools\ismacryp.c" />
+ <ClCompile Include="..\..\src\media_tools\isom_hinter.c" />
+ <ClCompile Include="..\..\src\media_tools\isom_tools.c" />
+ <ClCompile Include="..\..\src\media_tools\m2ts_mux.c" />
+ <ClCompile Include="..\..\src\media_tools\m3u8.c" />
+ <ClCompile Include="..\..\src\media_tools\media_export.c" />
+ <ClCompile Include="..\..\src\media_tools\media_import.c" />
+ <ClCompile Include="..\..\src\media_tools\mpd.c" />
+ <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c" />
+ <ClCompile Include="..\..\src\media_tools\mpegts.c" />
+ <ClCompile Include="..\..\src\media_tools\reedsolomon.c" />
+ <ClCompile Include="..\..\src\media_tools\saf.c" />
+ <ClCompile Include="..\..\src\media_tools\text_import.c" />
+ <ClCompile Include="..\..\src\media_tools\vobsub.c" />
+ <ClCompile Include="..\..\src\media_tools\webvtt.c" />
+ <ClCompile Include="..\..\src\odf\descriptors.c" />
+ <ClCompile Include="..\..\src\odf\desc_private.c" />
+ <ClCompile Include="..\..\src\odf\ipmpx_code.c" />
+ <ClCompile Include="..\..\src\odf\ipmpx_dump.c" />
+ <ClCompile Include="..\..\src\odf\ipmpx_parse.c" />
+ <ClCompile Include="..\..\src\odf\oci_codec.c" />
+ <ClCompile Include="..\..\src\odf\odf_code.c" />
+ <ClCompile Include="..\..\src\odf\odf_codec.c" />
+ <ClCompile Include="..\..\src\odf\odf_command.c" />
+ <ClCompile Include="..\..\src\odf\odf_dump.c" />
+ <ClCompile Include="..\..\src\odf\odf_parse.c" />
+ <ClCompile Include="..\..\src\odf\qos.c" />
+ <ClCompile Include="..\..\src\odf\slc.c" />
+ <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c" />
+ <ClCompile Include="..\..\src\scenegraph\commands.c" />
+ <ClCompile Include="..\..\src\scenegraph\dom_events.c" />
+ <ClCompile Include="..\..\src\scenegraph\dom_smjs.c" />
+ <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c" />
+ <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c" />
+ <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c" />
+ <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c" />
+ <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c" />
+ <ClCompile Include="..\..\src\scenegraph\smil_anim.c" />
+ <ClCompile Include="..\..\src\scenegraph\smil_timing.c" />
+ <ClCompile Include="..\..\src\scenegraph\svg_attributes.c" />
+ <ClCompile Include="..\..\src\scenegraph\svg_properties.c" />
+ <ClCompile Include="..\..\src\scenegraph\svg_smjs.c" />
+ <ClCompile Include="..\..\src\scenegraph\svg_types.c" />
+ <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c" />
+ <ClCompile Include="..\..\src\scenegraph\vrml_proto.c" />
+ <ClCompile Include="..\..\src\scenegraph\vrml_route.c" />
+ <ClCompile Include="..\..\src\scenegraph\vrml_script.c" />
+ <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c" />
+ <ClCompile Include="..\..\src\scenegraph\vrml_tools.c" />
+ <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c" />
+ <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c" />
+ <ClCompile Include="..\..\src\scenegraph\xbl_process.c" />
+ <ClCompile Include="..\..\src\scenegraph\xml_ns.c" />
+ <ClCompile Include="..\..\src\scene_manager\encode_isom.c" />
+ <ClCompile Include="..\..\src\scene_manager\loader_bt.c" />
+ <ClCompile Include="..\..\src\scene_manager\loader_isom.c" />
+ <ClCompile Include="..\..\src\scene_manager\loader_qt.c" />
+ <ClCompile Include="..\..\src\scene_manager\loader_svg.c" />
+ <ClCompile Include="..\..\src\scene_manager\loader_xmt.c" />
+ <ClCompile Include="..\..\src\scene_manager\scene_dump.c" />
+ <ClCompile Include="..\..\src\scene_manager\scene_engine.c" />
+ <ClCompile Include="..\..\src\scene_manager\scene_manager.c" />
+ <ClCompile Include="..\..\src\scene_manager\scene_stats.c" />
+ <ClCompile Include="..\..\src\scene_manager\swf_bifs.c" />
+ <ClCompile Include="..\..\src\scene_manager\swf_parse.c" />
+ <ClCompile Include="..\..\src\scene_manager\swf_svg.c" />
+ <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c" />
+ <ClCompile Include="..\..\src\terminal\channel.c" />
+ <ClCompile Include="..\..\src\terminal\clock.c" />
+ <ClCompile Include="..\..\src\terminal\decoder.c" />
+ <ClCompile Include="..\..\src\terminal\input_sensor.c" />
+ <ClCompile Include="..\..\src\terminal\media_control.c" />
+ <ClCompile Include="..\..\src\terminal\media_manager.c" />
+ <ClCompile Include="..\..\src\terminal\media_memory.c" />
+ <ClCompile Include="..\..\src\terminal\media_object.c" />
+ <ClCompile Include="..\..\src\terminal\media_sensor.c" />
+ <ClCompile Include="..\..\src\terminal\mpeg4_inline.c" />
+ <ClCompile Include="..\..\src\terminal\network_service.c" />
+ <ClCompile Include="..\..\src\terminal\object_browser.c" />
+ <ClCompile Include="..\..\src\terminal\object_manager.c" />
+ <ClCompile Include="..\..\src\terminal\scene.c" />
+ <ClCompile Include="..\..\src\terminal\svg_external.c" />
+ <ClCompile Include="..\..\src\terminal\terminal.c" />
+ <ClCompile Include="..\..\src\terminal\term_node_init.c" />
+ <ClCompile Include="..\..\src\utils\alloc.c" />
+ <ClCompile Include="..\..\src\utils\base_encoding.c" />
+ <ClCompile Include="..\..\src\utils\bitstream.c" />
+ <ClCompile Include="..\..\src\utils\cache.c" />
+ <ClCompile Include="..\..\src\utils\color.c" />
+ <ClCompile Include="..\..\src\utils\configfile.c" />
+ <ClCompile Include="..\..\src\utils\dlmalloc.c" />
+ <ClCompile Include="..\..\src\utils\downloader.c" />
+ <ClCompile Include="..\..\src\utils\error.c" />
+ <ClCompile Include="..\..\src\utils\list.c" />
+ <ClCompile Include="..\..\src\utils\map.c" />
+ <ClCompile Include="..\..\src\utils\math.c" />
+ <ClCompile Include="..\..\src\utils\module.c" />
+ <ClCompile Include="..\..\src\utils\os_config_init.c" />
+ <ClCompile Include="..\..\src\utils\os_divers.c" />
+ <ClCompile Include="..\..\src\utils\os_file.c" />
+ <ClCompile Include="..\..\src\utils\os_module.c" />
+ <ClCompile Include="..\..\src\utils\os_net.c" />
+ <ClCompile Include="..\..\src\utils\os_thread.c" />
+ <ClCompile Include="..\..\src\utils\path2d.c" />
+ <ClCompile Include="..\..\src\utils\path2d_stroker.c" />
+ <ClCompile Include="..\..\src\utils\ringbuffer.c" />
+ <ClCompile Include="..\..\src\utils\sha1.c" />
+ <ClCompile Include="..\..\src\utils\token.c" />
+ <ClCompile Include="..\..\src\utils\unicode.c" />
+ <ClCompile Include="..\..\src\utils\uni_bidi.c" />
+ <ClCompile Include="..\..\src\utils\url.c" />
+ <ClCompile Include="..\..\src\utils\utf.c" />
+ <ClCompile Include="..\..\src\utils\xml_parser.c" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{233014D5-F6E5-419D-8757-FA9CE7337088}</ProjectGuid>
+ <RootNamespace>libgpac</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">libgpac_static</TargetName>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
+ <PreBuildEvent>
+ <Command>"$(ProjectDir)..\..\version.bat"</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/libgpac_dll.vcxproj Added

@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{D3540754-E0CF-4604-AC11-82DE9BD4D814}</ProjectGuid>
+ <RootNamespace>libgpac_dll</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <ProjectReference>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Link>
+ <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\w32_deb;../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
+ <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <ProjectReference>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
+ <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac.vcxproj">
+ <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mp3_in.vcxproj Added

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}</ProjectGuid>
+ <RootNamespace>mp3_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/mp3_in_deb/mp3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/mp3_in_deb/mp3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\mp3_in\mad_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\mp3_in\mp3_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mp42ts.vcxproj Added

@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MinimalRebuild>false</MinimalRebuild>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\mp42ts\main.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <Private>true</Private>
+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mp4box.vcxproj Added

@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug - MP4Box_only|x64">
+ <Configuration>Debug - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|Win32">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release - MP4Box_only|x64">
+ <Configuration>Release - MP4Box_only</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{48E2C7C6-52EB-46FB-8722-00A62F46F497}</ProjectGuid>
+ <RootNamespace>mp4box</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">true</GenerateManifest>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <RegisterOutput>false</RegisterOutput>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\mp4box\filedump.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\mp4box\fileimport.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\mp4box\live.c" />
+ <ClCompile Include="..\..\applications\mp4box\main.c">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">Disabled</Optimization>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac.vcxproj">
+ <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mp4client.vcxproj Added

@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A35D99BF-D72D-4F56-99A1-97249B22BCE2}</ProjectGuid>
+ <RootNamespace>mp4client</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
+ <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4client_deb/mp4client.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>User32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4client_deb/mp4client.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4client_rel/mp4client.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TypeLibraryName>.\obj/mp4client_rel/mp4client.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\mp4client\extract.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\mp4client\main.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\applications\mp4client\mp4client.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\applications\mp4client\resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mpd_in.vcxproj Added

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}</ProjectGuid>
+ <RootNamespace>dash</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\mpd_in\mpd_in.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mpegts_in.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{B38E812D-9823-48E7-BE5F-BF09B0AD4165}</ProjectGuid>
+ <RootNamespace>mpegts_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\mpegts_in\mpegts_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/mse_in.vcxproj Added

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}</ProjectGuid>
+ <RootNamespace>dash</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\mse_in\mse_in.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/odf_dec.vcxproj Added

@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A86E6EF8-3683-4AD0-8878-7A0D51326088}</ProjectGuid>
+ <RootNamespace>odf_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\odf_dec\odf_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ogg.vcxproj Added

@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}</ProjectGuid>
+ <RootNamespace>ogg</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ogg_rel/ogg.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ogg_rel/ogg.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ogg_deb/ogg.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ogg_deb/ogg.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\ogg\ogg_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\ogg\ogg_load.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\ogg\theora_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\ogg\vorbis_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\ogg\ogg_in.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/openhevc.vcxproj Added

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>openhevc_dec</ProjectName>
+ <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EF17C48B}</ProjectGuid>
+ <RootNamespace>openhevc_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\openhevc_dec\openhevc_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/opensvc.vcxproj Added

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>opensvc_dec</ProjectName>
+ <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EB17C48B}</ProjectGuid>
+ <RootNamespace>opensvc_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/opensvc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/opensvc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\opensvc_dec\opensvc_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/osmophone.vcxproj Added

@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}</ProjectGuid>
+ <RootNamespace>osmophone</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
+ <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
+ <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreSpecificDefaultLibraries>
+ </IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <StackReserveSize>65536</StackReserveSize>
+ <StackCommitSize>4096</StackCommitSize>
+ <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
+ <BaseAddress>0x00010000</BaseAddress>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
+ <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
+ <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreSpecificDefaultLibraries>
+ </IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <StackReserveSize>65536</StackReserveSize>
+ <StackCommitSize>4096</StackCommitSize>
+ <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
+ <BaseAddress>0x00010000</BaseAddress>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreSpecificDefaultLibraries>
+ </IgnoreSpecificDefaultLibraries>
+ <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <StackReserveSize>65536</StackReserveSize>
+ <StackCommitSize>4096</StackCommitSize>
+ <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <AdditionalOptions>/r %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <IgnoreSpecificDefaultLibraries>
+ </IgnoreSpecificDefaultLibraries>
+ <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <StackReserveSize>65536</StackReserveSize>
+ <StackCommitSize>4096</StackCommitSize>
+ <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\osmophone\main.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ </PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ </PrecompiledHeader>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ </PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\..\applications\osmophone\openfile.cpp">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ </PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ </PrecompiledHeader>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ </PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\applications\osmophone\osmophone.rc">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
+ <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0809</Culture>
+ <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">0x0809</Culture>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
+ <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0809</Culture>
+ <Culture Condition="'$(Configuration)|$(Platform)'=='Release|x64'">0x0809</Culture>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\applications\osmophone\newres.h" />
+ <ClInclude Include="..\..\applications\osmophone\resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\doc\osmo4.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/osmozilla.vcxproj Added

@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A0288B75-0D95-4106-A3A7-779A891E8FEF}</ProjectGuid>
+ <RootNamespace>osmozilla</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nposmozilla</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nposmozilla</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nposmozilla</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nposmozilla</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CallingConvention>Cdecl</CallingConvention>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CallingConvention>Cdecl</CallingConvention>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
+ <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
+ <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
+ <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_WIN64;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
+ <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
+ <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
+ <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\applications\osmozilla\osmo_npapi.cpp" />
+ <ClCompile Include="..\..\applications\osmozilla\osmozilla.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\applications\osmozilla\osmozilla.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\applications\osmozilla\nsIOsmozilla.h" />
+ <ClInclude Include="..\..\applications\osmozilla\osmo_npapi.h" />
+ <ClInclude Include="..\..\applications\osmozilla\osmozilla.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/platinum.vcxproj Added

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{694C765F-DFD6-467E-A813-B3F887E822D4}</ProjectGuid>
+ <RootNamespace>platinum</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>
+ </DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>
+ </DebugInformationFormat>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>platinum.lib;neptune.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>platinum.lib;neptune.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\platinum\GenericDevice.cpp" />
+ <ClCompile Include="..\..\modules\platinum\GPACFileMediaServer.cpp" />
+ <ClCompile Include="..\..\modules\platinum\GPACMediaController.cpp" />
+ <ClCompile Include="..\..\modules\platinum\GPACMediaRenderer.cpp" />
+ <ClCompile Include="..\..\modules\platinum\GPACPlatinum.cpp" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\platinum\GenericDevice.h" />
+ <ClInclude Include="..\..\modules\platinum\GPACFileMediaServer.h" />
+ <ClInclude Include="..\..\modules\platinum\GPACMediaController.h" />
+ <ClInclude Include="..\..\modules\platinum\GPACMediaRenderer.h" />
+ <ClInclude Include="..\..\modules\platinum\GPACPlatinum.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/player_api.vcxproj Added

v0.6.1.tar.gz/build/msvc14/raw_out.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}</ProjectGuid>
+ <RootNamespace>raw_out</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\raw_out\raw_video.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/redirect_av.vcxproj Added

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{073E2281-4FDE-4C4D-A217-C489DB17C48C}</ProjectGuid>
+ <RootNamespace>redirect_av</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level2</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\redirect_av\redirect_av.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/rtp_in.vcxproj Added

@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{E2DBD151-9523-4E1A-9478-F3F825668F6E}</ProjectGuid>
+ <RootNamespace>rtp_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\rtp_in\rtp_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\rtp_in\rtp_session.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\rtp_in\rtp_signaling.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\rtp_in\rtp_stream.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\rtp_in\sdp_fetch.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\rtp_in\sdp_load.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\rtp_in\rtp_in.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/rvc_dec.vcxproj Added

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Template|Win32">
+ <Configuration>Template</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Template|x64">
+ <Configuration>Template</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{073E2381-4FDE-4D4D-B227-C489EB17C48B}</ProjectGuid>
+ <RootNamespace>rvc_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/rvc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/rvc_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\rvc_dec\rvc_dec.c" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/saf_in.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}</ProjectGuid>
+ <RootNamespace>saf_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\saf_in\saf_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/sdl_out.vcxproj Added

@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{F346A9A7-CF8D-4409-8776-1D4244F96EF8}</ProjectGuid>
+ <RootNamespace>sdl_out</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\DEVTOOLS\include;$(IncludePath)</IncludePath>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;;C:\devtools\lib\x64</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\include;$(IncludePath)</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\lib\x64;$(LibraryPath)</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\DEVTOOLS\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\DEVTOOLS\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\devtools\lib\x86</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\devtools\lib\x86</LibraryPath>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\sdl_out\audio.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\sdl_out\cursors.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\sdl_out\sdl_out.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\sdl_out\video.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\sdl_out\sdl_out.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/soft_raster.vcxproj Added

@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{71071F01-C813-4384-BE38-0F4020BCC0EE}</ProjectGuid>
+ <RootNamespace>soft_raster</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\soft_raster\ftgrays.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\soft_raster\raster_565.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\soft_raster\raster_argb.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\soft_raster\raster_load.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\soft_raster\raster_rgb.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\soft_raster\stencil.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\soft_raster\surface.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\soft_raster\rast_soft.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/svg_in.vcxproj Added

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{402A8794-B724-44A3-B608-84B600ECA387}</ProjectGuid>
+ <RootNamespace>svg_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\svg_in\svg_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/timedtext.vcxproj Added

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{464697D2-BA44-446F-8223-1EB3969ED1A8}</ProjectGuid>
+ <RootNamespace>timedtext</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\timedtext\timedtext_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\timedtext\timedtext_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/ui_rec.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{073E2381-4FDE-4C4D-A117-C489DB17C48C}</ProjectGuid>
+ <RootNamespace>ui_rec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\ui_rec\ui_rec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/validator.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}</ProjectGuid>
+ <RootNamespace>validator</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/validator_deb/validator.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/validator_deb/validator.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\validator\validator.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/vtt_in.vcxproj Added

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{E578716F-6663-4D83-AC79-57EA00D2F406}</ProjectGuid>
+ <RootNamespace>vtt_in</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\vtt_in\vtt_in.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\vtt_in\vtt_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/wav_out.vcxproj Added

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{01183543-B182-4E32-9FD6-FC15C847316C}</ProjectGuid>
+ <RootNamespace>wav_out</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\wav_out\wav_out.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/widgetman.vcxproj Added

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}</ProjectGuid>
+ <RootNamespace>widgetman</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\widgetman\unzip.c" />
+ <ClCompile Include="..\..\modules\widgetman\wgt_load.c" />
+ <ClCompile Include="..\..\modules\widgetman\widget.c" />
+ <ClCompile Include="..\..\modules\widgetman\widgetman.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\widgetman\unzip.h" />
+ <ClInclude Include="..\..\modules\widgetman\widgetman.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.6.1.tar.gz/build/msvc14/xvid_dec.vcxproj Added

@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{4258687D-4905-46A6-9407-08F4F8A81CC0}</ProjectGuid>
+ <RootNamespace>xvid_dec</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\decoder.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\font.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\gmc.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\idct.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\image.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\reduced.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\xvid.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_dec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\modules\xvid_dec\xvid_dec_wce.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\bitstream.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\decoder.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\global.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\gmc.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\image.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_align.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\portab.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\reduced.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\Rules.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\xvid.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\qpel.inl">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </CustomBuildStep>
+ </ItemGroup>
+ <ItemGroup>
+ <MASM Include="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </MASM>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+ </ImportGroup>
+</Project>
\ No newline at end of file

v0.5.2.tar.gz/build/osxdmg/Osmo4.app/Contents/Info.plist -> v0.6.1.tar.gz/build/osxdmg/Osmo4.app/Contents/Info.plist Changed

v0.5.2.tar.gz/build/symbian/epoc_hw.mmp -> v0.6.1.tar.gz/build/symbian/epoc_hw.mmp Changed

v0.5.2.tar.gz/build/symbian/libgpac.mmp -> v0.6.1.tar.gz/build/symbian/libgpac.mmp Changed

v0.5.2.tar.gz/build/symbian/libgpac_symbianU.def -> v0.6.1.tar.gz/build/symbian/libgpac_symbianU.def Changed

v0.5.2.tar.gz/build/xcode/README_IOS.txt -> v0.6.1.tar.gz/build/xcode/README_IOS.txt Changed

@@ -6,11 +6,13 @@
 
 To compile GPAC in command-line mode, please execute the following steps:
 
-1) Check out the GPAC SVN repository:
-   "svn co https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/"
+1) Check out the GPAC git repository:
+   "git clone https://github.com/gpac/gpac"
 
-2) Unzip the "gpac_extra_libs/gpac_extra_libs.zip" file in its current directory (ie not a subfolder).
-   You should have the following directory tree:
+2) Get the "gpac_extra_libs.zip" file from:
+https://sourceforge.net/p/gpac/code/HEAD/tree/trunk/gpac_extra_libs/
+
+Unzip it in its current directory (ie not a subfolder) so that you have the following directory tree:
    trunk/
       gpac/
          ...
@@ -21,16 +23,18 @@
 
 3) Compile gpac dependencies (zlib, faad, libpng etc):
    execute "gpac_extra_libs/build/xcode_ios/generate_extra_libs.sh" script.
+   execute "gpac_extra_libs/SDL_iOS/generate_SDL.sh	
   
 4) Check all gpac dependencies have been successfully compiled:
    $> ls gpac_extra_libs/lib/iOS
-      libSDL.a libfaad.a libfreetype.a libjpeg.a libjs.a libmad.a libpng.a
+      libSDL2.a libglue.a libfaad.a libfreetype.a libjpeg.a libjs.a libmad.a libpng.a
 
 5) Copy the extra_libs to the right place:
    if you checked out as mentionned in 1), execute the "gpac_extra_libs/CopyLibs2Public4iOS.sh" script.
    Otherwise copy manually the libs to the gpac/extra_lib/lib/ios directory.
 
 6) Compile GPAC:
+   execute /gpac/configure to generate include/gpac/revision.h
    execute the "gpac/build/xcode/generate_ios.sh" script.
    The script checks that all files have been compiled, print an error message if needed.
    Otherwise it generats a .tar.gz archive into the gpac/bin/iOS directory.

v0.5.2.tar.gz/build/xcode/generate_ios.sh -> v0.6.1.tar.gz/build/xcode/generate_ios.sh Changed

@@ -4,10 +4,12 @@
 
 echo "*** Set version within Info.plist application file ***"
 version=`grep '#define GPAC_VERSION ' ../../include/gpac/version.h | cut -d '"' -f 2`
-rev=`LANG=en_US svn info | grep Revision | tr -d 'Revision: '`
+TAG=$(git describe --tags --abbrev=0 2> /dev/null)
+REVISION=$(echo `git describe --tags --long 2> /dev/null || echo "UNKNOWN"` | sed "s/^$TAG-//")
+BRANCH=$(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
+rev="$REVISION-$BRANCH"
 if [ "$rev" != "" ]
 then
-#	svn revert ../../applications/osmo4_ios/osmo4ios-Info.plist
 	sed 's/<string>.*<\/string>/<string>'"$version"'<\/string>/' ../../applications/osmo4_ios/osmo4ios-Info.plist > ../../applications/osmo4_ios/osmo4ios-Info.plist.new
 	sed 's/<string>.*<\/string>/<string>'"$rev"'<\/string>/' ../../applications/osmo4_ios/osmo4ios-Info.plist.new > ../../applications/osmo4_ios/osmo4ios-Info.plist
 	rm ../../applications/osmo4_ios/osmo4ios-Info.plist.new
@@ -29,6 +31,7 @@
 fi
 
 echo "*** Copy the generated libs (arm only) ***"
+mkdir -p ../../bin/iOS/osmo4ios.app/
 cp build/Release-iphoneos/osmo4ios.app/osmo4ios ../../bin/iOS/osmo4ios.app/
 cp build/Release-iphoneos/osmo4ios.app/PkgInfo ../../bin/iOS/osmo4ios.app/
 cp build/Release-iphoneos/osmo4ios.app/Info.plist ../../bin/iOS/osmo4ios.app/
@@ -45,9 +48,9 @@
 cd ../..
 if [ "$rev" != "" ]
 then
-	full_version="$version-r$rev"
+	full_version="$version-rev$rev"
 else
-	#if no revision can be extracted from SVN, use date
+	#if no revision can be extracted, use date
 	full_version="$version-$(date +%Y%m%d)"
 fi
 
@@ -63,10 +66,10 @@
 cp ../../gui/mpegu-core.js osmo4ios.app/gui/
 cp -r ../../gui/icons osmo4ios.app/gui/
 cp -r ../../gui/extensions osmo4ios.app/gui/
-find osmo4ios.app | fgrep .svn | fgrep -v svn/ | xargs rm -rf 
-tar -czf "osmo4ios-$full_version.tar.gz" osmo4ios.app/
+find osmo4ios.app | fgrep .git | fgrep -v git/ | xargs rm -rf
+tar -czf "osmo4-$full_version-ios.tar.gz" osmo4ios.app/
 rm -rf osmo4ios.app
-svn up -r $rev
+git pull
 cd ../../build/xcode/
 
 echo "*** GPAC generation for iOS completed ($full_version)! ***"

v0.5.2.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj -> v0.6.1.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		2839E2821A162C48002D73E1 /* opensvc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */; };
 		2839E2831A162CC9002D73E1 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		2839E28D1A1635F7002D73E1 /* DashCast.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2839E28C1A1635F7002D73E1 /* DashCast.1 */; };
 		2839E2B21A16363E002D73E1 /* audio_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2921A16363E002D73E1 /* audio_data.c */; };
 		2839E2B31A16363E002D73E1 /* audio_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2941A16363E002D73E1 /* audio_decoder.c */; };
 		2839E2B41A16363E002D73E1 /* audio_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2961A16363E002D73E1 /* audio_encoder.c */; };
@@ -313,6 +312,7 @@
 		9225733218D7269700D6FD98 /* theora_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732D18D7269700D6FD98 /* theora_dec.c */; };
 		9225733318D7269700D6FD98 /* vorbis_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732E18D7269700D6FD98 /* vorbis_dec.c */; };
 		9225733418D726D800D6FD98 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		924FEE821BA6C63A003F77A6 /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 924FEE811BA6C63A003F77A6 /* iff.c */; };
 		92AAF0E418D6DB8600E2FF12 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0D818D6DB5500E2FF12 /* audio.c */; };
 		92AAF0E518D6DB8600E2FF12 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */; };
 		92AAF0E618D6DB8600E2FF12 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */; };
@@ -390,6 +390,103 @@
 		92AAF1C618D70BAE00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92AAF1D918D710A000E2FF12 /* vtt_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D518D7109A00E2FF12 /* vtt_dec.c */; };
 		92AAF1DA18D710A000E2FF12 /* vtt_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D618D7109A00E2FF12 /* vtt_in.c */; };
+		92BBFCAB1A7122AD006A7735 /* ait.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC481A7122AD006A7735 /* ait.h */; };
+		92BBFCAC1A7122AD006A7735 /* avparse.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC491A7122AD006A7735 /* avparse.h */; };
+		92BBFCAD1A7122AD006A7735 /* base_coding.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4A1A7122AD006A7735 /* base_coding.h */; };
+		92BBFCAE1A7122AD006A7735 /* bifs.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4B1A7122AD006A7735 /* bifs.h */; };
+		92BBFCAF1A7122AD006A7735 /* bitstream.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4C1A7122AD006A7735 /* bitstream.h */; };
+		92BBFCB01A7122AD006A7735 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4D1A7122AD006A7735 /* cache.h */; };
+		92BBFCB11A7122AD006A7735 /* color.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4E1A7122AD006A7735 /* color.h */; };
+		92BBFCB21A7122AD006A7735 /* compositor.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4F1A7122AD006A7735 /* compositor.h */; };
+		92BBFCB31A7122AD006A7735 /* config_file.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC501A7122AD006A7735 /* config_file.h */; };
+		92BBFCB41A7122AD006A7735 /* configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC511A7122AD006A7735 /* configuration.h */; };
+		92BBFCB51A7122AD006A7735 /* constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC521A7122AD006A7735 /* constants.h */; };
+		92BBFCB61A7122AD006A7735 /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC531A7122AD006A7735 /* crypt.h */; };
+		92BBFCB71A7122AD006A7735 /* dash.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC541A7122AD006A7735 /* dash.h */; };
+		92BBFCB81A7122AD006A7735 /* download.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC551A7122AD006A7735 /* download.h */; };
+		92BBFCB91A7122AD006A7735 /* dsmcc.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC561A7122AD006A7735 /* dsmcc.h */; };
+		92BBFCBA1A7122AD006A7735 /* dvb_mpe.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC571A7122AD006A7735 /* dvb_mpe.h */; };
+		92BBFCBB1A7122AD006A7735 /* esi.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC581A7122AD006A7735 /* esi.h */; };
+		92BBFCBC1A7122AD006A7735 /* events_constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC591A7122AD006A7735 /* events_constants.h */; };
+		92BBFCBD1A7122AD006A7735 /* events.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5A1A7122AD006A7735 /* events.h */; };
+		92BBFCBE1A7122AD006A7735 /* filestreamer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5B1A7122AD006A7735 /* filestreamer.h */; };
+		92BBFCBF1A7122AD006A7735 /* html5_media.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5C1A7122AD006A7735 /* html5_media.h */; };
+		92BBFCC01A7122AD006A7735 /* html5_mse.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5D1A7122AD006A7735 /* html5_mse.h */; };
+		92BBFCC11A7122AD006A7735 /* ietf.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5E1A7122AD006A7735 /* ietf.h */; };
+		92BBFCC21A7122AD006A7735 /* avilib.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC601A7122AD006A7735 /* avilib.h */; };
+		92BBFCC31A7122AD006A7735 /* bifs_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC611A7122AD006A7735 /* bifs_dev.h */; };
+		92BBFCC41A7122AD006A7735 /* bifs_tables.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC621A7122AD006A7735 /* bifs_tables.h */; };
+		92BBFCC51A7122AD006A7735 /* camera.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC631A7122AD006A7735 /* camera.h */; };
+		92BBFCC61A7122AD006A7735 /* compositor_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC641A7122AD006A7735 /* compositor_dev.h */; };
+		92BBFCC71A7122AD006A7735 /* crypt_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC651A7122AD006A7735 /* crypt_dev.h */; };
+		92BBFCC81A7122AD006A7735 /* dvb_mpe_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC661A7122AD006A7735 /* dvb_mpe_dev.h */; };
+		92BBFCC91A7122AD006A7735 /* ietf_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC671A7122AD006A7735 /* ietf_dev.h */; };
+		92BBFCCA1A7122AD006A7735 /* isomedia_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC681A7122AD006A7735 /* isomedia_dev.h */; };
+		92BBFCCB1A7122AD006A7735 /* laser_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC691A7122AD006A7735 /* laser_dev.h */; };
+		92BBFCCC1A7122AD006A7735 /* m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6A1A7122AD006A7735 /* m3u8.h */; };
+		92BBFCCD1A7122AD006A7735 /* media_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6B1A7122AD006A7735 /* media_dev.h */; };
+		92BBFCCE1A7122AD006A7735 /* mesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6C1A7122AD006A7735 /* mesh.h */; };
+		92BBFCCF1A7122AD006A7735 /* mpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6D1A7122AD006A7735 /* mpd.h */; };
+		92BBFCD01A7122AD006A7735 /* odf_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6E1A7122AD006A7735 /* odf_dev.h */; };
+		92BBFCD11A7122AD006A7735 /* odf_parse_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC6F1A7122AD006A7735 /* odf_parse_common.h */; };
+		92BBFCD21A7122AD006A7735 /* ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC701A7122AD006A7735 /* ogg.h */; };
+		92BBFCD31A7122AD006A7735 /* reedsolomon.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC711A7122AD006A7735 /* reedsolomon.h */; };
+		92BBFCD41A7122AD006A7735 /* scenegraph_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC721A7122AD006A7735 /* scenegraph_dev.h */; };
+		92BBFCD51A7122AD006A7735 /* smjs_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC731A7122AD006A7735 /* smjs_api.h */; };
+		92BBFCD61A7122AD006A7735 /* swf_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC741A7122AD006A7735 /* swf_dev.h */; };
+		92BBFCD71A7122AD006A7735 /* terminal_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC751A7122AD006A7735 /* terminal_dev.h */; };
+		92BBFCD81A7122AD006A7735 /* vobsub.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC761A7122AD006A7735 /* vobsub.h */; };
+		92BBFCD91A7122AD006A7735 /* ismacryp.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC771A7122AD006A7735 /* ismacryp.h */; };
+		92BBFCDA1A7122AD006A7735 /* iso639.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC781A7122AD006A7735 /* iso639.h */; };
+		92BBFCDB1A7122AD006A7735 /* isomedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC791A7122AD006A7735 /* isomedia.h */; };
+		92BBFCDC1A7122AD006A7735 /* laser.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7A1A7122AD006A7735 /* laser.h */; };
+		92BBFCDD1A7122AD006A7735 /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7B1A7122AD006A7735 /* list.h */; };
+		92BBFCDE1A7122AD006A7735 /* map.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7C1A7122AD006A7735 /* map.h */; };
+		92BBFCDF1A7122AD006A7735 /* maths.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7D1A7122AD006A7735 /* maths.h */; };
+		92BBFCE01A7122AD006A7735 /* media_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7E1A7122AD006A7735 /* media_tools.h */; };
+		92BBFCE11A7122AD006A7735 /* mediaobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7F1A7122AD006A7735 /* mediaobject.h */; };
+		92BBFCE21A7122AD006A7735 /* module.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC801A7122AD006A7735 /* module.h */; };
+		92BBFCE31A7122AD006A7735 /* audio_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC821A7122AD006A7735 /* audio_out.h */; };
+		92BBFCE41A7122AD006A7735 /* codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC831A7122AD006A7735 /* codec.h */; };
+		92BBFCE51A7122AD006A7735 /* font.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC841A7122AD006A7735 /* font.h */; };
+		92BBFCE61A7122AD006A7735 /* hardcoded_proto.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC851A7122AD006A7735 /* hardcoded_proto.h */; };
+		92BBFCE71A7122AD006A7735 /* ipmp.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC861A7122AD006A7735 /* ipmp.h */; };
+		92BBFCE81A7122AD006A7735 /* js_usr.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC871A7122AD006A7735 /* js_usr.h */; };
+		92BBFCE91A7122AD006A7735 /* raster2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC881A7122AD006A7735 /* raster2d.h */; };
+		92BBFCEA1A7122AD006A7735 /* service.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC891A7122AD006A7735 /* service.h */; };
+		92BBFCEB1A7122AD006A7735 /* term_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8A1A7122AD006A7735 /* term_ext.h */; };
+		92BBFCEC1A7122AD006A7735 /* video_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8B1A7122AD006A7735 /* video_out.h */; };
+		92BBFCED1A7122AD006A7735 /* mpeg4_odf.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8C1A7122AD006A7735 /* mpeg4_odf.h */; };
+		92BBFCEE1A7122AD006A7735 /* mpegts.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8D1A7122AD006A7735 /* mpegts.h */; };
+		92BBFCEF1A7122AD006A7735 /* network.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8E1A7122AD006A7735 /* network.h */; };
+		92BBFCF01A7122AD006A7735 /* nodes_mpeg4.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8F1A7122AD006A7735 /* nodes_mpeg4.h */; };
+		92BBFCF11A7122AD006A7735 /* nodes_svg.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC901A7122AD006A7735 /* nodes_svg.h */; };
+		92BBFCF21A7122AD006A7735 /* nodes_x3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC911A7122AD006A7735 /* nodes_x3d.h */; };
+		92BBFCF31A7122AD006A7735 /* nodes_xbl.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC921A7122AD006A7735 /* nodes_xbl.h */; };
+		92BBFCF41A7122AD006A7735 /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC931A7122AD006A7735 /* options.h */; };
+		92BBFCF51A7122AD006A7735 /* path2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC941A7122AD006A7735 /* path2d.h */; };
+		92BBFCF61A7122AD006A7735 /* revision.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC951A7122AD006A7735 /* revision.h */; };
+		92BBFCF71A7122AD006A7735 /* ringbuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC961A7122AD006A7735 /* ringbuffer.h */; };
+		92BBFCF81A7122AD006A7735 /* rtp_streamer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC971A7122AD006A7735 /* rtp_streamer.h */; };
+		92BBFCF91A7122AD006A7735 /* scene_engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC981A7122AD006A7735 /* scene_engine.h */; };
+		92BBFCFA1A7122AD006A7735 /* scene_manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC991A7122AD006A7735 /* scene_manager.h */; };
+		92BBFCFB1A7122AD006A7735 /* scenegraph_svg.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC9A1A7122AD006A7735 /* scenegraph_svg.h */; };
+		92BBFCFC1A7122AD006A7735 /* scenegraph_vrml.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC9B1A7122AD006A7735 /* scenegraph_vrml.h */; };
+		92BBFCFD1A7122AD006A7735 /* scenegraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC9C1A7122AD006A7735 /* scenegraph.h */; };
+		92BBFCFE1A7122AD006A7735 /* setup.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC9D1A7122AD006A7735 /* setup.h */; };
+		92BBFCFF1A7122AD006A7735 /* svg_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC9E1A7122AD006A7735 /* svg_types.h */; };
+		92BBFD001A7122AD006A7735 /* sync_layer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC9F1A7122AD006A7735 /* sync_layer.h */; };
+		92BBFD011A7122AD006A7735 /* term_info.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA01A7122AD006A7735 /* term_info.h */; };
+		92BBFD021A7122AD006A7735 /* terminal.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA11A7122AD006A7735 /* terminal.h */; };
+		92BBFD031A7122AD006A7735 /* thread.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA21A7122AD006A7735 /* thread.h */; };
+		92BBFD041A7122AD006A7735 /* token.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA31A7122AD006A7735 /* token.h */; };
+		92BBFD051A7122AD006A7735 /* tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA41A7122AD006A7735 /* tools.h */; };
+		92BBFD061A7122AD006A7735 /* unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA51A7122AD006A7735 /* unicode.h */; };
+		92BBFD071A7122AD006A7735 /* user.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA61A7122AD006A7735 /* user.h */; };
+		92BBFD081A7122AD006A7735 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA71A7122AD006A7735 /* utf.h */; };
+		92BBFD091A7122AD006A7735 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA81A7122AD006A7735 /* version.h */; };
+		92BBFD0A1A7122AD006A7735 /* webvtt.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA91A7122AD006A7735 /* webvtt.h */; };
+		92BBFD0B1A7122AD006A7735 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCAA1A7122AD006A7735 /* xml.h */; };
 		92BE50A318D632DA00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92BE50A818D6348A00AA59D8 /* filedump.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A418D6348A00AA59D8 /* filedump.c */; };
 		92BE50A918D6348A00AA59D8 /* fileimport.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A518D6348A00AA59D8 /* fileimport.c */; };
@@ -483,7 +580,6 @@
 			dstPath = /usr/share/man/man1/;
 			dstSubfolderSpec = 0;
 			files = (
-				2839E28D1A1635F7002D73E1 /* DashCast.1 in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
@@ -519,8 +615,6 @@
 /* Begin PBXFileReference section */
 		2839E27E1A162C24002D73E1 /* libopensvc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopensvc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		2839E2881A1635F7002D73E1 /* DashCast */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DashCast; sourceTree = BUILT_PRODUCTS_DIR; };
-		2839E28A1A1635F7002D73E1 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-		2839E28C1A1635F7002D73E1 /* DashCast.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = DashCast.1; sourceTree = "<group>"; };
 		2839E2921A16363E002D73E1 /* audio_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_data.c; path = ../../applications/dashcast/audio_data.c; sourceTree = "<group>"; };
 		2839E2931A16363E002D73E1 /* audio_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_data.h; path = ../../applications/dashcast/audio_data.h; sourceTree = "<group>"; };
 		2839E2941A16363E002D73E1 /* audio_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_decoder.c; path = ../../applications/dashcast/audio_decoder.c; sourceTree = "<group>"; };
@@ -1104,6 +1198,7 @@
 		9225732D18D7269700D6FD98 /* theora_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = theora_dec.c; path = ../../modules/ogg/theora_dec.c; sourceTree = "<group>"; };
 		9225732E18D7269700D6FD98 /* vorbis_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vorbis_dec.c; path = ../../modules/ogg/vorbis_dec.c; sourceTree = "<group>"; };
 		922B48781A5ADAB3006CBBBA /* os_module.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
+		924FEE811BA6C63A003F77A6 /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = "<group>"; };
 		92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_sdl_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92AAF0D818D6DB5500E2FF12 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio.c; path = ../../modules/sdl_out/audio.c; sourceTree = "<group>"; };
 		92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdl_out.c; path = ../../modules/sdl_out/sdl_out.c; sourceTree = "<group>"; };
@@ -1173,6 +1268,103 @@
 		92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = opensvc_dec.c; path = ../../modules/opensvc_dec/opensvc_dec.c; sourceTree = "<group>"; };
 		92AAF1D518D7109A00E2FF12 /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
 		92AAF1D618D7109A00E2FF12 /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
+		92BBFC481A7122AD006A7735 /* ait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ait.h; path = ../include/gpac/ait.h; sourceTree = "<group>"; };
+		92BBFC491A7122AD006A7735 /* avparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avparse.h; path = ../include/gpac/avparse.h; sourceTree = "<group>"; };
+		92BBFC4A1A7122AD006A7735 /* base_coding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base_coding.h; path = ../include/gpac/base_coding.h; sourceTree = "<group>"; };
+		92BBFC4B1A7122AD006A7735 /* bifs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bifs.h; path = ../include/gpac/bifs.h; sourceTree = "<group>"; };
+		92BBFC4C1A7122AD006A7735 /* bitstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitstream.h; path = ../include/gpac/bitstream.h; sourceTree = "<group>"; };
+		92BBFC4D1A7122AD006A7735 /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache.h; path = ../include/gpac/cache.h; sourceTree = "<group>"; };
+		92BBFC4E1A7122AD006A7735 /* color.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = color.h; path = ../include/gpac/color.h; sourceTree = "<group>"; };
+		92BBFC4F1A7122AD006A7735 /* compositor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = compositor.h; path = ../include/gpac/compositor.h; sourceTree = "<group>"; };
+		92BBFC501A7122AD006A7735 /* config_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config_file.h; path = ../include/gpac/config_file.h; sourceTree = "<group>"; };
+		92BBFC511A7122AD006A7735 /* configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configuration.h; path = ../include/gpac/configuration.h; sourceTree = "<group>"; };
+		92BBFC521A7122AD006A7735 /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ../include/gpac/constants.h; sourceTree = "<group>"; };
+		92BBFC531A7122AD006A7735 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = ../include/gpac/crypt.h; sourceTree = "<group>"; };
+		92BBFC541A7122AD006A7735 /* dash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dash.h; path = ../include/gpac/dash.h; sourceTree = "<group>"; };
+		92BBFC551A7122AD006A7735 /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = download.h; path = ../include/gpac/download.h; sourceTree = "<group>"; };
+		92BBFC561A7122AD006A7735 /* dsmcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsmcc.h; path = ../include/gpac/dsmcc.h; sourceTree = "<group>"; };
+		92BBFC571A7122AD006A7735 /* dvb_mpe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dvb_mpe.h; path = ../include/gpac/dvb_mpe.h; sourceTree = "<group>"; };
+		92BBFC581A7122AD006A7735 /* esi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = esi.h; path = ../include/gpac/esi.h; sourceTree = "<group>"; };
+		92BBFC591A7122AD006A7735 /* events_constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = events_constants.h; path = ../include/gpac/events_constants.h; sourceTree = "<group>"; };
+		92BBFC5A1A7122AD006A7735 /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = events.h; path = ../include/gpac/events.h; sourceTree = "<group>"; };
+		92BBFC5B1A7122AD006A7735 /* filestreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filestreamer.h; path = ../include/gpac/filestreamer.h; sourceTree = "<group>"; };
+		92BBFC5C1A7122AD006A7735 /* html5_media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = html5_media.h; path = ../include/gpac/html5_media.h; sourceTree = "<group>"; };
+		92BBFC5D1A7122AD006A7735 /* html5_mse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = html5_mse.h; path = ../include/gpac/html5_mse.h; sourceTree = "<group>"; };
+		92BBFC5E1A7122AD006A7735 /* ietf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ietf.h; path = ../include/gpac/ietf.h; sourceTree = "<group>"; };
+		92BBFC601A7122AD006A7735 /* avilib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avilib.h; sourceTree = "<group>"; };
+		92BBFC611A7122AD006A7735 /* bifs_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bifs_dev.h; sourceTree = "<group>"; };
+		92BBFC621A7122AD006A7735 /* bifs_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bifs_tables.h; sourceTree = "<group>"; };
+		92BBFC631A7122AD006A7735 /* camera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = camera.h; sourceTree = "<group>"; };
+		92BBFC641A7122AD006A7735 /* compositor_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compositor_dev.h; sourceTree = "<group>"; };
+		92BBFC651A7122AD006A7735 /* crypt_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt_dev.h; sourceTree = "<group>"; };
+		92BBFC661A7122AD006A7735 /* dvb_mpe_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dvb_mpe_dev.h; sourceTree = "<group>"; };
+		92BBFC671A7122AD006A7735 /* ietf_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ietf_dev.h; sourceTree = "<group>"; };
+		92BBFC681A7122AD006A7735 /* isomedia_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isomedia_dev.h; sourceTree = "<group>"; };
+		92BBFC691A7122AD006A7735 /* laser_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = laser_dev.h; sourceTree = "<group>"; };
+		92BBFC6A1A7122AD006A7735 /* m3u8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m3u8.h; sourceTree = "<group>"; };
+		92BBFC6B1A7122AD006A7735 /* media_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_dev.h; sourceTree = "<group>"; };
+		92BBFC6C1A7122AD006A7735 /* mesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mesh.h; sourceTree = "<group>"; };
+		92BBFC6D1A7122AD006A7735 /* mpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpd.h; sourceTree = "<group>"; };
+		92BBFC6E1A7122AD006A7735 /* odf_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = odf_dev.h; sourceTree = "<group>"; };
+		92BBFC6F1A7122AD006A7735 /* odf_parse_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = odf_parse_common.h; sourceTree = "<group>"; };
+		92BBFC701A7122AD006A7735 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = "<group>"; };
+		92BBFC711A7122AD006A7735 /* reedsolomon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reedsolomon.h; sourceTree = "<group>"; };
+		92BBFC721A7122AD006A7735 /* scenegraph_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scenegraph_dev.h; sourceTree = "<group>"; };
+		92BBFC731A7122AD006A7735 /* smjs_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smjs_api.h; sourceTree = "<group>"; };
+		92BBFC741A7122AD006A7735 /* swf_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swf_dev.h; sourceTree = "<group>"; };
+		92BBFC751A7122AD006A7735 /* terminal_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terminal_dev.h; sourceTree = "<group>"; };
+		92BBFC761A7122AD006A7735 /* vobsub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vobsub.h; sourceTree = "<group>"; };
+		92BBFC771A7122AD006A7735 /* ismacryp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ismacryp.h; path = ../include/gpac/ismacryp.h; sourceTree = "<group>"; };
+		92BBFC781A7122AD006A7735 /* iso639.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iso639.h; path = ../include/gpac/iso639.h; sourceTree = "<group>"; };
+		92BBFC791A7122AD006A7735 /* isomedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isomedia.h; path = ../include/gpac/isomedia.h; sourceTree = "<group>"; };
+		92BBFC7A1A7122AD006A7735 /* laser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = laser.h; path = ../include/gpac/laser.h; sourceTree = "<group>"; };
+		92BBFC7B1A7122AD006A7735 /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = list.h; path = ../include/gpac/list.h; sourceTree = "<group>"; };
+		92BBFC7C1A7122AD006A7735 /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = map.h; path = ../include/gpac/map.h; sourceTree = "<group>"; };
+		92BBFC7D1A7122AD006A7735 /* maths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maths.h; path = ../include/gpac/maths.h; sourceTree = "<group>"; };
+		92BBFC7E1A7122AD006A7735 /* media_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_tools.h; path = ../include/gpac/media_tools.h; sourceTree = "<group>"; };
+		92BBFC7F1A7122AD006A7735 /* mediaobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mediaobject.h; path = ../include/gpac/mediaobject.h; sourceTree = "<group>"; };
+		92BBFC801A7122AD006A7735 /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = module.h; path = ../include/gpac/module.h; sourceTree = "<group>"; };
+		92BBFC821A7122AD006A7735 /* audio_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_out.h; sourceTree = "<group>"; };
+		92BBFC831A7122AD006A7735 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
+		92BBFC841A7122AD006A7735 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
+		92BBFC851A7122AD006A7735 /* hardcoded_proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hardcoded_proto.h; sourceTree = "<group>"; };
+		92BBFC861A7122AD006A7735 /* ipmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipmp.h; sourceTree = "<group>"; };
+		92BBFC871A7122AD006A7735 /* js_usr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_usr.h; sourceTree = "<group>"; };
+		92BBFC881A7122AD006A7735 /* raster2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = raster2d.h; sourceTree = "<group>"; };
+		92BBFC891A7122AD006A7735 /* service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = service.h; sourceTree = "<group>"; };
+		92BBFC8A1A7122AD006A7735 /* term_ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = term_ext.h; sourceTree = "<group>"; };
+		92BBFC8B1A7122AD006A7735 /* video_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video_out.h; sourceTree = "<group>"; };
+		92BBFC8C1A7122AD006A7735 /* mpeg4_odf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpeg4_odf.h; path = ../include/gpac/mpeg4_odf.h; sourceTree = "<group>"; };
+		92BBFC8D1A7122AD006A7735 /* mpegts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpegts.h; path = ../include/gpac/mpegts.h; sourceTree = "<group>"; };
+		92BBFC8E1A7122AD006A7735 /* network.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network.h; path = ../include/gpac/network.h; sourceTree = "<group>"; };
+		92BBFC8F1A7122AD006A7735 /* nodes_mpeg4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_mpeg4.h; path = ../include/gpac/nodes_mpeg4.h; sourceTree = "<group>"; };
+		92BBFC901A7122AD006A7735 /* nodes_svg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_svg.h; path = ../include/gpac/nodes_svg.h; sourceTree = "<group>"; };
+		92BBFC911A7122AD006A7735 /* nodes_x3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_x3d.h; path = ../include/gpac/nodes_x3d.h; sourceTree = "<group>"; };
+		92BBFC921A7122AD006A7735 /* nodes_xbl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nodes_xbl.h; path = ../include/gpac/nodes_xbl.h; sourceTree = "<group>"; };
+		92BBFC931A7122AD006A7735 /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = options.h; path = ../include/gpac/options.h; sourceTree = "<group>"; };
+		92BBFC941A7122AD006A7735 /* path2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = path2d.h; path = ../include/gpac/path2d.h; sourceTree = "<group>"; };
+		92BBFC951A7122AD006A7735 /* revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = revision.h; path = ../include/gpac/revision.h; sourceTree = "<group>"; };
+		92BBFC961A7122AD006A7735 /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ringbuffer.h; path = ../include/gpac/ringbuffer.h; sourceTree = "<group>"; };
+		92BBFC971A7122AD006A7735 /* rtp_streamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtp_streamer.h; path = ../include/gpac/rtp_streamer.h; sourceTree = "<group>"; };
+		92BBFC981A7122AD006A7735 /* scene_engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scene_engine.h; path = ../include/gpac/scene_engine.h; sourceTree = "<group>"; };
+		92BBFC991A7122AD006A7735 /* scene_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scene_manager.h; path = ../include/gpac/scene_manager.h; sourceTree = "<group>"; };
+		92BBFC9A1A7122AD006A7735 /* scenegraph_svg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scenegraph_svg.h; path = ../include/gpac/scenegraph_svg.h; sourceTree = "<group>"; };
+		92BBFC9B1A7122AD006A7735 /* scenegraph_vrml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scenegraph_vrml.h; path = ../include/gpac/scenegraph_vrml.h; sourceTree = "<group>"; };
+		92BBFC9C1A7122AD006A7735 /* scenegraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scenegraph.h; path = ../include/gpac/scenegraph.h; sourceTree = "<group>"; };
+		92BBFC9D1A7122AD006A7735 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = setup.h; path = ../include/gpac/setup.h; sourceTree = "<group>"; };
+		92BBFC9E1A7122AD006A7735 /* svg_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = svg_types.h; path = ../include/gpac/svg_types.h; sourceTree = "<group>"; };
+		92BBFC9F1A7122AD006A7735 /* sync_layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_layer.h; path = ../include/gpac/sync_layer.h; sourceTree = "<group>"; };
+		92BBFCA01A7122AD006A7735 /* term_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = term_info.h; path = ../include/gpac/term_info.h; sourceTree = "<group>"; };
+		92BBFCA11A7122AD006A7735 /* terminal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = terminal.h; path = ../include/gpac/terminal.h; sourceTree = "<group>"; };
+		92BBFCA21A7122AD006A7735 /* thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = thread.h; path = ../include/gpac/thread.h; sourceTree = "<group>"; };
+		92BBFCA31A7122AD006A7735 /* token.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = token.h; path = ../include/gpac/token.h; sourceTree = "<group>"; };
+		92BBFCA41A7122AD006A7735 /* tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tools.h; path = ../include/gpac/tools.h; sourceTree = "<group>"; };
+		92BBFCA51A7122AD006A7735 /* unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unicode.h; path = ../include/gpac/unicode.h; sourceTree = "<group>"; };
+		92BBFCA61A7122AD006A7735 /* user.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = user.h; path = ../include/gpac/user.h; sourceTree = "<group>"; };
+		92BBFCA71A7122AD006A7735 /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utf.h; path = ../include/gpac/utf.h; sourceTree = "<group>"; };
+		92BBFCA81A7122AD006A7735 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../include/gpac/version.h; sourceTree = "<group>"; };
+		92BBFCA91A7122AD006A7735 /* webvtt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = webvtt.h; path = ../include/gpac/webvtt.h; sourceTree = "<group>"; };
+		92BBFCAA1A7122AD006A7735 /* xml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xml.h; path = ../include/gpac/xml.h; sourceTree = "<group>"; };
 		92BE509018D6325E00AA59D8 /* MP4Box */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Box; sourceTree = BUILT_PRODUCTS_DIR; };
 		92BE50A418D6348A00AA59D8 /* filedump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filedump.c; path = ../../applications/mp4box/filedump.c; sourceTree = SOURCE_ROOT; };
 		92BE50A518D6348A00AA59D8 /* fileimport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileimport.c; path = ../../applications/mp4box/fileimport.c; sourceTree = SOURCE_ROOT; };
@@ -1322,15 +1514,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		2839E2891A1635F7002D73E1 /* DashCast */ = {
-			isa = PBXGroup;
-			children = (
-				2839E28A1A1635F7002D73E1 /* main.c */,
-				2839E28C1A1635F7002D73E1 /* DashCast.1 */,
-			);
-			path = DashCast;
-			sourceTree = "<group>";
-		};
 		2839E2911A1635FE002D73E1 /* DashCast */ = {
 			isa = PBXGroup;
 			children = (
@@ -1600,7 +1783,6 @@
 				92BE50AC18D6375100AA59D8 /* applications */,
 				92BE50AD18D6376A00AA59D8 /* modules */,
 				9201FE7E18D5A444003D1ACA /* libgpac */,
-				2839E2891A1635F7002D73E1 /* DashCast */,
 			);
 			sourceTree = "<group>";
 		};
@@ -1628,6 +1810,7 @@
 		9201FE7E18D5A444003D1ACA /* libgpac */ = {
 			isa = PBXGroup;
 			children = (
+				92BBFC471A71228A006A7735 /* include */,
 				9201FE8018D5A444003D1ACA /* .deps */,
 				9201FF8918D5A444003D1ACA /* bifs */,
 				9201FF9A18D5A444003D1ACA /* compositor */,
@@ -2124,6 +2307,7 @@
 		9201FFF118D5A444003D1ACA /* isomedia */ = {
 			isa = PBXGroup;
 			children = (
+				924FEE811BA6C63A003F77A6 /* iff.c */,
 				9201FFF218D5A444003D1ACA /* avc_ext.c */,
 				9201FFF318D5A444003D1ACA /* box_code_3gpp.c */,
 				9201FFF418D5A444003D1ACA /* box_code_adobe.c */,
@@ -2463,6 +2647,128 @@
 			name = vtt_in;
 			sourceTree = "<group>";
 		};
+		92BBFC471A71228A006A7735 /* include */ = {
+			isa = PBXGroup;
+			children = (
+				92BBFC481A7122AD006A7735 /* ait.h */,
+				92BBFC491A7122AD006A7735 /* avparse.h */,
+				92BBFC4A1A7122AD006A7735 /* base_coding.h */,
+				92BBFC4B1A7122AD006A7735 /* bifs.h */,
+				92BBFC4C1A7122AD006A7735 /* bitstream.h */,
+				92BBFC4D1A7122AD006A7735 /* cache.h */,
+				92BBFC4E1A7122AD006A7735 /* color.h */,
+				92BBFC4F1A7122AD006A7735 /* compositor.h */,
+				92BBFC501A7122AD006A7735 /* config_file.h */,
+				92BBFC511A7122AD006A7735 /* configuration.h */,
+				92BBFC521A7122AD006A7735 /* constants.h */,
+				92BBFC531A7122AD006A7735 /* crypt.h */,
+				92BBFC541A7122AD006A7735 /* dash.h */,
+				92BBFC551A7122AD006A7735 /* download.h */,
+				92BBFC561A7122AD006A7735 /* dsmcc.h */,
+				92BBFC571A7122AD006A7735 /* dvb_mpe.h */,
+				92BBFC581A7122AD006A7735 /* esi.h */,
+				92BBFC591A7122AD006A7735 /* events_constants.h */,
+				92BBFC5A1A7122AD006A7735 /* events.h */,
+				92BBFC5B1A7122AD006A7735 /* filestreamer.h */,
+				92BBFC5C1A7122AD006A7735 /* html5_media.h */,
+				92BBFC5D1A7122AD006A7735 /* html5_mse.h */,
+				92BBFC5E1A7122AD006A7735 /* ietf.h */,
+				92BBFC5F1A7122AD006A7735 /* internal */,
+				92BBFC771A7122AD006A7735 /* ismacryp.h */,
+				92BBFC781A7122AD006A7735 /* iso639.h */,
+				92BBFC791A7122AD006A7735 /* isomedia.h */,
+				92BBFC7A1A7122AD006A7735 /* laser.h */,
+				92BBFC7B1A7122AD006A7735 /* list.h */,
+				92BBFC7C1A7122AD006A7735 /* map.h */,
+				92BBFC7D1A7122AD006A7735 /* maths.h */,
+				92BBFC7E1A7122AD006A7735 /* media_tools.h */,
+				92BBFC7F1A7122AD006A7735 /* mediaobject.h */,
+				92BBFC801A7122AD006A7735 /* module.h */,
+				92BBFC811A7122AD006A7735 /* modules */,
+				92BBFC8C1A7122AD006A7735 /* mpeg4_odf.h */,
+				92BBFC8D1A7122AD006A7735 /* mpegts.h */,
+				92BBFC8E1A7122AD006A7735 /* network.h */,
+				92BBFC8F1A7122AD006A7735 /* nodes_mpeg4.h */,
+				92BBFC901A7122AD006A7735 /* nodes_svg.h */,
+				92BBFC911A7122AD006A7735 /* nodes_x3d.h */,
+				92BBFC921A7122AD006A7735 /* nodes_xbl.h */,
+				92BBFC931A7122AD006A7735 /* options.h */,
+				92BBFC941A7122AD006A7735 /* path2d.h */,
+				92BBFC951A7122AD006A7735 /* revision.h */,
+				92BBFC961A7122AD006A7735 /* ringbuffer.h */,
+				92BBFC971A7122AD006A7735 /* rtp_streamer.h */,
+				92BBFC981A7122AD006A7735 /* scene_engine.h */,
+				92BBFC991A7122AD006A7735 /* scene_manager.h */,
+				92BBFC9A1A7122AD006A7735 /* scenegraph_svg.h */,
+				92BBFC9B1A7122AD006A7735 /* scenegraph_vrml.h */,
+				92BBFC9C1A7122AD006A7735 /* scenegraph.h */,
+				92BBFC9D1A7122AD006A7735 /* setup.h */,
+				92BBFC9E1A7122AD006A7735 /* svg_types.h */,
+				92BBFC9F1A7122AD006A7735 /* sync_layer.h */,
+				92BBFCA01A7122AD006A7735 /* term_info.h */,
+				92BBFCA11A7122AD006A7735 /* terminal.h */,
+				92BBFCA21A7122AD006A7735 /* thread.h */,
+				92BBFCA31A7122AD006A7735 /* token.h */,
+				92BBFCA41A7122AD006A7735 /* tools.h */,
+				92BBFCA51A7122AD006A7735 /* unicode.h */,
+				92BBFCA61A7122AD006A7735 /* user.h */,
+				92BBFCA71A7122AD006A7735 /* utf.h */,
+				92BBFCA81A7122AD006A7735 /* version.h */,
+				92BBFCA91A7122AD006A7735 /* webvtt.h */,
+				92BBFCAA1A7122AD006A7735 /* xml.h */,
+			);
+			name = include;
+			sourceTree = "<group>";
+		};
+		92BBFC5F1A7122AD006A7735 /* internal */ = {
+			isa = PBXGroup;
+			children = (
+				92BBFC601A7122AD006A7735 /* avilib.h */,
+				92BBFC611A7122AD006A7735 /* bifs_dev.h */,
+				92BBFC621A7122AD006A7735 /* bifs_tables.h */,
+				92BBFC631A7122AD006A7735 /* camera.h */,
+				92BBFC641A7122AD006A7735 /* compositor_dev.h */,
+				92BBFC651A7122AD006A7735 /* crypt_dev.h */,
+				92BBFC661A7122AD006A7735 /* dvb_mpe_dev.h */,
+				92BBFC671A7122AD006A7735 /* ietf_dev.h */,
+				92BBFC681A7122AD006A7735 /* isomedia_dev.h */,
+				92BBFC691A7122AD006A7735 /* laser_dev.h */,
+				92BBFC6A1A7122AD006A7735 /* m3u8.h */,
+				92BBFC6B1A7122AD006A7735 /* media_dev.h */,
+				92BBFC6C1A7122AD006A7735 /* mesh.h */,
+				92BBFC6D1A7122AD006A7735 /* mpd.h */,
+				92BBFC6E1A7122AD006A7735 /* odf_dev.h */,
+				92BBFC6F1A7122AD006A7735 /* odf_parse_common.h */,
+				92BBFC701A7122AD006A7735 /* ogg.h */,
+				92BBFC711A7122AD006A7735 /* reedsolomon.h */,
+				92BBFC721A7122AD006A7735 /* scenegraph_dev.h */,
+				92BBFC731A7122AD006A7735 /* smjs_api.h */,
+				92BBFC741A7122AD006A7735 /* swf_dev.h */,
+				92BBFC751A7122AD006A7735 /* terminal_dev.h */,
+				92BBFC761A7122AD006A7735 /* vobsub.h */,
+			);
+			name = internal;
+			path = ../include/gpac/internal;
+			sourceTree = "<group>";
+		};
+		92BBFC811A7122AD006A7735 /* modules */ = {
+			isa = PBXGroup;
+			children = (
+				92BBFC821A7122AD006A7735 /* audio_out.h */,
+				92BBFC831A7122AD006A7735 /* codec.h */,
+				92BBFC841A7122AD006A7735 /* font.h */,
+				92BBFC851A7122AD006A7735 /* hardcoded_proto.h */,
+				92BBFC861A7122AD006A7735 /* ipmp.h */,
+				92BBFC871A7122AD006A7735 /* js_usr.h */,
+				92BBFC881A7122AD006A7735 /* raster2d.h */,
+				92BBFC891A7122AD006A7735 /* service.h */,
+				92BBFC8A1A7122AD006A7735 /* term_ext.h */,
+				92BBFC8B1A7122AD006A7735 /* video_out.h */,
+			);
+			name = modules;
+			path = ../include/gpac/modules;
+			sourceTree = "<group>";
+		};
 		92BE509218D6325E00AA59D8 /* MP4Box */ = {
 			isa = PBXGroup;
 			children = (
@@ -2566,28 +2872,125 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92BBFD0B1A7122AD006A7735 /* xml.h in Headers */,
+				92BBFD061A7122AD006A7735 /* unicode.h in Headers */,
+				92BBFCAE1A7122AD006A7735 /* bifs.h in Headers */,
+				92BBFCED1A7122AD006A7735 /* mpeg4_odf.h in Headers */,
+				92BBFCBC1A7122AD006A7735 /* events_constants.h in Headers */,
+				92BBFCF61A7122AD006A7735 /* revision.h in Headers */,
+				92BBFCE31A7122AD006A7735 /* audio_out.h in Headers */,
+				92BBFCF51A7122AD006A7735 /* path2d.h in Headers */,
 				920100BA18D5A444003D1ACA /* quant.h in Headers */,
+				92BBFCE61A7122AD006A7735 /* hardcoded_proto.h in Headers */,
+				92BBFD021A7122AD006A7735 /* terminal.h in Headers */,
+				92BBFCD81A7122AD006A7735 /* vobsub.h in Headers */,
+				92BBFCB31A7122AD006A7735 /* config_file.h in Headers */,
+				92BBFCBB1A7122AD006A7735 /* esi.h in Headers */,
+				92BBFCC61A7122AD006A7735 /* compositor_dev.h in Headers */,
+				92BBFCF21A7122AD006A7735 /* nodes_x3d.h in Headers */,
+				92BBFCF11A7122AD006A7735 /* nodes_svg.h in Headers */,
+				92BBFCF71A7122AD006A7735 /* ringbuffer.h in Headers */,
+				92BBFCC21A7122AD006A7735 /* avilib.h in Headers */,
+				92BBFCC51A7122AD006A7735 /* camera.h in Headers */,
+				92BBFCDB1A7122AD006A7735 /* isomedia.h in Headers */,
+				92BBFCC11A7122AD006A7735 /* ietf.h in Headers */,
+				92BBFCB61A7122AD006A7735 /* crypt.h in Headers */,
+				92BBFCAC1A7122AD006A7735 /* avparse.h in Headers */,
+				92BBFCEE1A7122AD006A7735 /* mpegts.h in Headers */,
+				92BBFCDE1A7122AD006A7735 /* map.h in Headers */,
+				92BBFCCB1A7122AD006A7735 /* laser_dev.h in Headers */,
+				92BBFCCA1A7122AD006A7735 /* isomedia_dev.h in Headers */,
+				92BBFCE71A7122AD006A7735 /* ipmp.h in Headers */,
 				920100BC18D5A444003D1ACA /* script.h in Headers */,
 				920100CA18D5A444003D1ACA /* drawable.h in Headers */,
+				92BBFCB01A7122AD006A7735 /* cache.h in Headers */,
 				920100CD18D5A444003D1ACA /* gl_inc.h in Headers */,
+				92BBFCFE1A7122AD006A7735 /* setup.h in Headers */,
+				92BBFCFB1A7122AD006A7735 /* scenegraph_svg.h in Headers */,
+				92BBFCC01A7122AD006A7735 /* html5_mse.h in Headers */,
+				92BBFCE11A7122AD006A7735 /* mediaobject.h in Headers */,
+				92BBFCDF1A7122AD006A7735 /* maths.h in Headers */,
+				92BBFCD31A7122AD006A7735 /* reedsolomon.h in Headers */,
+				92BBFD081A7122AD006A7735 /* utf.h in Headers */,
+				92BBFCD11A7122AD006A7735 /* odf_parse_common.h in Headers */,
+				92BBFD091A7122AD006A7735 /* version.h in Headers */,
+				92BBFCE81A7122AD006A7735 /* js_usr.h in Headers */,
+				92BBFCB21A7122AD006A7735 /* compositor.h in Headers */,
+				92BBFCE41A7122AD006A7735 /* codec.h in Headers */,
+				92BBFCAB1A7122AD006A7735 /* ait.h in Headers */,
+				92BBFCC81A7122AD006A7735 /* dvb_mpe_dev.h in Headers */,
 				920100E018D5A444003D1ACA /* mpeg4_grouping.h in Headers */,
 				920100EF18D5A444003D1ACA /* nodes_stacks.h in Headers */,
+				92BBFCB51A7122AD006A7735 /* constants.h in Headers */,
+				92BBFD041A7122AD006A7735 /* token.h in Headers */,
 				920100F118D5A444003D1ACA /* offscreen_cache.h in Headers */,
+				92BBFCB11A7122AD006A7735 /* color.h in Headers */,
+				92BBFCD51A7122AD006A7735 /* smjs_api.h in Headers */,
+				92BBFCF41A7122AD006A7735 /* options.h in Headers */,
 				920100FB18D5A444003D1ACA /* texturing.h in Headers */,
+				92BBFCAD1A7122AD006A7735 /* base_coding.h in Headers */,
+				92BBFCE51A7122AD006A7735 /* font.h in Headers */,
+				92BBFCD61A7122AD006A7735 /* swf_dev.h in Headers */,
+				92BBFCC31A7122AD006A7735 /* bifs_dev.h in Headers */,
+				92BBFCF81A7122AD006A7735 /* rtp_streamer.h in Headers */,
 				920100FE18D5A444003D1ACA /* visual_manager.h in Headers */,
+				92BBFCD71A7122AD006A7735 /* terminal_dev.h in Headers */,
+				92BBFD071A7122AD006A7735 /* user.h in Headers */,
+				92BBFCFA1A7122AD006A7735 /* scene_manager.h in Headers */,
+				92BBFCD91A7122AD006A7735 /* ismacryp.h in Headers */,
 				9201010018D5A444003D1ACA /* visual_manager_2d.h in Headers */,
+				92BBFCB71A7122AD006A7735 /* dash.h in Headers */,
 				9201010318D5A444003D1ACA /* visual_manager_3d.h in Headers */,
+				92BBFD0A1A7122AD006A7735 /* webvtt.h in Headers */,
 				9201015718D5A445003D1ACA /* mpeg2_ps.h in Headers */,
+				92BBFCD41A7122AD006A7735 /* scenegraph_dev.h in Headers */,
+				92BBFCFC1A7122AD006A7735 /* scenegraph_vrml.h in Headers */,
 				9201019618D5A445003D1ACA /* input_sensor.h in Headers */,
 				9201019818D5A445003D1ACA /* media_control.h in Headers */,
+				92BBFCE91A7122AD006A7735 /* raster2d.h in Headers */,
+				92BBFD031A7122AD006A7735 /* thread.h in Headers */,
+				92BBFD051A7122AD006A7735 /* tools.h in Headers */,
+				92BBFCB91A7122AD006A7735 /* dsmcc.h in Headers */,
+				92BBFCBF1A7122AD006A7735 /* html5_media.h in Headers */,
+				92BBFCC41A7122AD006A7735 /* bifs_tables.h in Headers */,
+				92BBFCFD1A7122AD006A7735 /* scenegraph.h in Headers */,
+				92BBFCBA1A7122AD006A7735 /* dvb_mpe.h in Headers */,
+				92BBFCE21A7122AD006A7735 /* module.h in Headers */,
 				9201019B18D5A445003D1ACA /* media_memory.h in Headers */,
+				92BBFCCC1A7122AD006A7735 /* m3u8.h in Headers */,
+				92BBFCC71A7122AD006A7735 /* crypt_dev.h in Headers */,
+				92BBFCCE1A7122AD006A7735 /* mesh.h in Headers */,
+				92BBFCF91A7122AD006A7735 /* scene_engine.h in Headers */,
+				92BBFCE01A7122AD006A7735 /* media_tools.h in Headers */,
+				92BBFCAF1A7122AD006A7735 /* bitstream.h in Headers */,
+				92BBFCC91A7122AD006A7735 /* ietf_dev.h in Headers */,
 				920101B418D5A445003D1ACA /* module_wrap.h in Headers */,
+				92BBFD001A7122AD006A7735 /* sync_layer.h in Headers */,
 				92AAF0EC18D6E5AA00E2FF12 /* rast_soft.h in Headers */,
 				92AAF10D18D6E69500E2FF12 /* img_in.h in Headers */,
+				92BBFD011A7122AD006A7735 /* term_info.h in Headers */,
+				92BBFCF01A7122AD006A7735 /* nodes_mpeg4.h in Headers */,
+				92BBFCDA1A7122AD006A7735 /* iso639.h in Headers */,
+				92BBFCBD1A7122AD006A7735 /* events.h in Headers */,
+				92BBFCDC1A7122AD006A7735 /* laser.h in Headers */,
+				92BBFCFF1A7122AD006A7735 /* svg_types.h in Headers */,
 				92AAF11B18D6E6D300E2FF12 /* isom_in.h in Headers */,
+				92BBFCD21A7122AD006A7735 /* ogg.h in Headers */,
 				92AAF13A18D6E7BC00E2FF12 /* rtp_in.h in Headers */,
+				92BBFCF31A7122AD006A7735 /* nodes_xbl.h in Headers */,
+				92BBFCDD1A7122AD006A7735 /* list.h in Headers */,
+				92BBFCB81A7122AD006A7735 /* download.h in Headers */,
+				92BBFCEA1A7122AD006A7735 /* service.h in Headers */,
+				92BBFCEB1A7122AD006A7735 /* term_ext.h in Headers */,
+				92BBFCB41A7122AD006A7735 /* configuration.h in Headers */,
+				92BBFCEF1A7122AD006A7735 /* network.h in Headers */,
 				92AAF15618D6E87500E2FF12 /* unzip.h in Headers */,
+				92BBFCCF1A7122AD006A7735 /* mpd.h in Headers */,
 				92AAF15A18D6E87500E2FF12 /* widgetman.h in Headers */,
+				92BBFCBE1A7122AD006A7735 /* filestreamer.h in Headers */,
+				92BBFCD01A7122AD006A7735 /* odf_dev.h in Headers */,
+				92BBFCCD1A7122AD006A7735 /* media_dev.h in Headers */,
+				92BBFCEC1A7122AD006A7735 /* video_out.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2692,6 +3095,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 9201F93B18D5A38A003D1ACA /* Build configuration list for PBXNativeTarget "libgpac" */;
 			buildPhases = (
+				92E2EF8E1C89BBEA00639C91 /* ShellScript */,
 				9201F93318D5A38A003D1ACA /* Sources */,
 				9201F93418D5A38A003D1ACA /* Frameworks */,
 				9201F93518D5A38A003D1ACA /* Headers */,
@@ -2907,7 +3311,7 @@
 		9201F92918D5A359003D1ACA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Telecom ParisTech";
 			};
 			buildConfigurationList = 9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */;
@@ -2940,6 +3344,22 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		92E2EF8E1C89BBEA00639C91 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd ../..\n./check_revision.sh\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		2839E27A1A162C24002D73E1 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -3067,6 +3487,7 @@
 				9201011118D5A444003D1ACA /* rtsp_response.c in Sources */,
 				9201011218D5A444003D1ACA /* rtsp_session.c in Sources */,
 				9201011318D5A444003D1ACA /* sdp.c in Sources */,
+				924FEE821BA6C63A003F77A6 /* iff.c in Sources */,
 				9201011418D5A444003D1ACA /* avc_ext.c in Sources */,
 				9201011518D5A444003D1ACA /* box_code_3gpp.c in Sources */,
 				9201011618D5A444003D1ACA /* box_code_adobe.c in Sources */,
@@ -3447,6 +3868,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3488,6 +3910,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -3566,6 +3989,8 @@
 					CoreFoundation,
 					"-weak_framework",
 					QuartzCore,
+					"-weak_framework",
+					CoreGraphics,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3625,6 +4050,8 @@
 					CoreFoundation,
 					"-weak_framework",
 					QuartzCore,
+					"-weak_framework",
+					CoreGraphics,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3634,6 +4061,7 @@
 		9201F92E18D5A359003D1ACA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = GPAC_CONFIG_DARWIN;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -3666,6 +4094,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3720,6 +4149,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = lib;
@@ -3770,6 +4200,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3802,6 +4233,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3827,6 +4259,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3869,6 +4302,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3904,6 +4338,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3939,6 +4374,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3967,6 +4403,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3976,6 +4413,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					GPAC_HAS_FAAD,
+					GPAC_CONFIG_DARWIN,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -4001,12 +4439,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = GPAC_HAS_FAAD;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_HAS_FAAD,
+					GPAC_CONFIG_DARWIN,
+				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
@@ -4029,6 +4471,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4063,6 +4506,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -4090,6 +4534,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4145,6 +4590,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -4193,6 +4639,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4228,12 +4675,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = GPAC_HAS_MAD;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_HAS_MAD,
+					GPAC_CONFIG_DARWIN,
+				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
@@ -4256,6 +4707,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4295,6 +4747,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;

v0.5.2.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> v0.6.1.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -272,7 +272,6 @@
 		71CCF3341277045100339E12 /* math.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2331277045100339E12 /* math.c */; };
 		71CCF3351277045100339E12 /* module.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2341277045100339E12 /* module.c */; };
 		71CCF3361277045100339E12 /* module_wrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF2351277045100339E12 /* module_wrap.h */; };
-		71CCF3371277045100339E12 /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2361277045100339E12 /* os_file.c */; };
 		71CCF3381277045100339E12 /* os_module.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2371277045100339E12 /* os_module.c */; };
 		71CCF3391277045100339E12 /* os_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2381277045100339E12 /* os_net.c */; };
 		71CCF33A1277045100339E12 /* os_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2391277045100339E12 /* os_thread.c */; };
@@ -325,7 +324,6 @@
 		71CCF3D612770A8C00339E12 /* isomedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38612770A8C00339E12 /* isomedia.h */; };
 		71CCF3D712770A8C00339E12 /* laser.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38712770A8C00339E12 /* laser.h */; };
 		71CCF3D812770A8C00339E12 /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38812770A8C00339E12 /* list.h */; };
-		71CCF3D912770A8C00339E12 /* math.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38912770A8C00339E12 /* math.h */; };
 		71CCF3DA12770A8C00339E12 /* media_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38A12770A8C00339E12 /* media_tools.h */; };
 		71CCF3DB12770A8C00339E12 /* mediaobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38B12770A8C00339E12 /* mediaobject.h */; };
 		71CCF3DC12770A8C00339E12 /* module.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38C12770A8C00339E12 /* module.h */; };
@@ -365,14 +363,27 @@
 		71CCF3FE12770A8C00339E12 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3AF12770A8C00339E12 /* utf.h */; };
 		71CCF3FF12770A8C00339E12 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3B012770A8C00339E12 /* xml.h */; };
 		71EC88E11396273B004DCB6A /* osmo.icns in Resources */ = {isa = PBXBuildFile; fileRef = 71EC88E01396273B004DCB6A /* osmo.icns */; };
+		9201D1111BD3FE11005E326A /* bifs_tests in Resources */ = {isa = PBXBuildFile; fileRef = 9201D1101BD3FE11005E326A /* bifs_tests */; };
+		922EB5801AAE13C500DF46D0 /* dash.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB5781AAE13C500DF46D0 /* dash.h */; };
+		922EB5811AAE13C500DF46D0 /* html5_media.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB5791AAE13C500DF46D0 /* html5_media.h */; };
+		922EB5821AAE13C500DF46D0 /* html5_mse.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57A1AAE13C500DF46D0 /* html5_mse.h */; };
+		922EB5831AAE13C500DF46D0 /* map.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57B1AAE13C500DF46D0 /* map.h */; };
+		922EB5841AAE13C500DF46D0 /* maths.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57C1AAE13C500DF46D0 /* maths.h */; };
+		922EB5851AAE13C500DF46D0 /* revision.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57D1AAE13C500DF46D0 /* revision.h */; };
+		922EB5861AAE13C500DF46D0 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57E1AAE13C500DF46D0 /* version.h */; };
+		922EB5871AAE13C500DF46D0 /* webvtt.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57F1AAE13C500DF46D0 /* webvtt.h */; };
 		925730A21A0916D20057FF04 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 925730A11A0916D20057FF04 /* libiconv.dylib */; };
 		925730A41A0916DB0057FF04 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 925730A31A0916DB0057FF04 /* libbz2.dylib */; };
+		925FF2A51ABC53F30085B04C /* odf_parse_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 925FF2A31ABC53F30085B04C /* odf_parse_common.h */; };
+		925FF2A61ABC53F30085B04C /* smjs_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 925FF2A41ABC53F30085B04C /* smjs_api.h */; };
+		925FF2A71ABC55030085B04C /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2361277045100339E12 /* os_file.c */; };
+		928B2D131BE11BC100CAC65D /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928B2D111BE11BC100CAC65D /* libcrypto.a */; };
+		928B2D141BE11BC100CAC65D /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928B2D121BE11BC100CAC65D /* libssl.a */; };
 		929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929616EF8BC200B7C64F /* Default-568h@2x.png */; };
 		929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929716EF8BC200B7C64F /* icon_ipad_retina.png */; };
 		929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929816EF8BC200B7C64F /* icon_ipad.png */; };
 		929A929F16EF8BC200B7C64F /* icon_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929916EF8BC200B7C64F /* icon_retina.png */; };
 		929A92A016EF8BC200B7C64F /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929A16EF8BC200B7C64F /* icon.png */; };
-		92A3A03E16F0C10C004EE581 /* extract.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A3A03D16F0C10C004EE581 /* extract.c */; };
 		92B039F716F2050100B2568F /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92B039F616F2050100B2568F /* libSDL2.a */; };
 		92B32CA41A08ABBF0065F44A /* webvtt_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */; };
 		92B32CA91A08AC130065F44A /* vtt_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B32CA71A08AC130065F44A /* vtt_dec.c */; };
@@ -430,6 +441,9 @@
 		92BC213A16EF8E7A000E0620 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998D1278777A00ACFF58 /* widget.c */; };
 		92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998E1278777A00ACFF58 /* widgetman.c */; };
 		92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998F1278777A00ACFF58 /* widgetman.h */; };
+		92C7F19A1AA8B48E00BA5B4C /* gui in Resources */ = {isa = PBXBuildFile; fileRef = 92C7F1991AA8B48E00BA5B4C /* gui */; };
+		92D127FE1BBADC7F00DA003B /* shaders in Resources */ = {isa = PBXBuildFile; fileRef = 92D127FD1BBADC7F00DA003B /* shaders */; };
+		92DF5CA61BA6C6F80058A7BA /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DF5CA51BA6C6F80058A7BA /* iff.c */; };
 		92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826116F254F50002629E /* timedtext_dec.c */; };
 		92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826216F254F50002629E /* timedtext_in.c */; };
 		92E8C78D1A0CD57A00E0436D /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825F16F254DA0002629E /* isma_ea.c */; };
@@ -854,7 +868,6 @@
 		71CCF38612770A8C00339E12 /* isomedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isomedia.h; sourceTree = "<group>"; };
 		71CCF38712770A8C00339E12 /* laser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = laser.h; sourceTree = "<group>"; };
 		71CCF38812770A8C00339E12 /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
-		71CCF38912770A8C00339E12 /* math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; };
 		71CCF38A12770A8C00339E12 /* media_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_tools.h; sourceTree = "<group>"; };
 		71CCF38B12770A8C00339E12 /* mediaobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediaobject.h; sourceTree = "<group>"; };
 		71CCF38C12770A8C00339E12 /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module.h; sourceTree = "<group>"; };
@@ -900,14 +913,26 @@
 		71F2A45412830B1400C384DE /* libjs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs.a; path = ../../extra_lib/lib/iOS/libjs.a; sourceTree = SOURCE_ROOT; };
 		71F2A45512830B1400C384DE /* libmad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmad.a; path = ../../extra_lib/lib/iOS/libmad.a; sourceTree = SOURCE_ROOT; };
 		71F2A45612830B1400C384DE /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../extra_lib/lib/iOS/libpng.a; sourceTree = SOURCE_ROOT; };
+		9201D1101BD3FE11005E326A /* bifs_tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bifs_tests; sourceTree = "<group>"; };
+		922EB5781AAE13C500DF46D0 /* dash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dash.h; sourceTree = "<group>"; };
+		922EB5791AAE13C500DF46D0 /* html5_media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html5_media.h; sourceTree = "<group>"; };
+		922EB57A1AAE13C500DF46D0 /* html5_mse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html5_mse.h; sourceTree = "<group>"; };
+		922EB57B1AAE13C500DF46D0 /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = map.h; sourceTree = "<group>"; };
+		922EB57C1AAE13C500DF46D0 /* maths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maths.h; sourceTree = "<group>"; };
+		922EB57D1AAE13C500DF46D0 /* revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = revision.h; sourceTree = "<group>"; };
+		922EB57E1AAE13C500DF46D0 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
+		922EB57F1AAE13C500DF46D0 /* webvtt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = webvtt.h; sourceTree = "<group>"; };
 		925730A11A0916D20057FF04 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
 		925730A31A0916DB0057FF04 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
+		925FF2A31ABC53F30085B04C /* odf_parse_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = odf_parse_common.h; sourceTree = "<group>"; };
+		925FF2A41ABC53F30085B04C /* smjs_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smjs_api.h; sourceTree = "<group>"; };
+		928B2D111BE11BC100CAC65D /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../../extra_lib/lib/iOS/libcrypto.a; sourceTree = "<group>"; };
+		928B2D121BE11BC100CAC65D /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../extra_lib/lib/iOS/libssl.a; sourceTree = "<group>"; };
 		929A929616EF8BC200B7C64F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../applications/osmo4_ios/Resources/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
 		929A929716EF8BC200B7C64F /* icon_ipad_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad_retina.png; path = ../../applications/osmo4_ios/Resources/icon_ipad_retina.png; sourceTree = SOURCE_ROOT; };
 		929A929816EF8BC200B7C64F /* icon_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad.png; path = ../../applications/osmo4_ios/Resources/icon_ipad.png; sourceTree = SOURCE_ROOT; };
 		929A929916EF8BC200B7C64F /* icon_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_retina.png; path = ../../applications/osmo4_ios/Resources/icon_retina.png; sourceTree = SOURCE_ROOT; };
 		929A929A16EF8BC200B7C64F /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../../applications/osmo4_ios/Resources/icon.png; sourceTree = SOURCE_ROOT; };
-		92A3A03D16F0C10C004EE581 /* extract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extract.c; path = ../../applications/osmo4_ios/extract.c; sourceTree = SOURCE_ROOT; };
 		92B039F616F2050100B2568F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = ../../extra_lib/lib/iOS/libSDL2.a; sourceTree = SOURCE_ROOT; };
 		92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt_smjs.c; sourceTree = "<group>"; };
 		92B32CA71A08AC130065F44A /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
@@ -985,6 +1010,9 @@
 		92B69DFE1A091CFC004E74AA /* world.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = world.svg; sourceTree = "<group>"; };
 		92B69E011A091CFC004E74AA /* mpegu-core.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "mpegu-core.js"; sourceTree = "<group>"; };
 		92B69EB61A091CFC004E74AA /* webvtt-renderer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "webvtt-renderer.js"; sourceTree = "<group>"; };
+		92C7F1991AA8B48E00BA5B4C /* gui */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gui; path = ../../gui; sourceTree = "<group>"; };
+		92D127FD1BBADC7F00DA003B /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders; path = ../../shaders; sourceTree = "<group>"; };
+		92DF5CA51BA6C6F80058A7BA /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = "<group>"; };
 		92F930841A5ADC1A0072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
 		92F930851A5ADC1A0072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
 		92FA825916F2549D0002629E /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../../modules/validator/validator.c; sourceTree = SOURCE_ROOT; };
@@ -1035,6 +1063,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				928B2D131BE11BC100CAC65D /* libcrypto.a in Frameworks */,
+				928B2D141BE11BC100CAC65D /* libssl.a in Frameworks */,
 				2897039C1A13C4050063E9C0 /* libswresample.a in Frameworks */,
 				925730A41A0916DB0057FF04 /* libbz2.dylib in Frameworks */,
 				925730A21A0916D20057FF04 /* libiconv.dylib in Frameworks */,
@@ -1089,6 +1119,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				92C7F1991AA8B48E00BA5B4C /* gui */,
 				71CCF1381277041D00339E12 /* libgpac */,
 				929A929516EF8A7500B7C64F /* modules */,
 				71A19B1412796AC700ACFF58 /* osmo4iOS */,
@@ -1101,6 +1132,8 @@
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				928B2D111BE11BC100CAC65D /* libcrypto.a */,
+				928B2D121BE11BC100CAC65D /* libssl.a */,
 				2897039B1A13C4050063E9C0 /* libswresample.a */,
 				925730A31A0916DB0057FF04 /* libbz2.dylib */,
 				925730A11A0916D20057FF04 /* libiconv.dylib */,
@@ -1221,6 +1254,7 @@
 		71A19B1412796AC700ACFF58 /* osmo4iOS */ = {
 			isa = PBXGroup;
 			children = (
+				92D127FD1BBADC7F00DA003B /* shaders */,
 				92B69DB01A091CFC004E74AA /* gui */,
 				929A929616EF8BC200B7C64F /* Default-568h@2x.png */,
 				929A929716EF8BC200B7C64F /* icon_ipad_retina.png */,
@@ -1228,7 +1262,6 @@
 				929A929916EF8BC200B7C64F /* icon_retina.png */,
 				929A929A16EF8BC200B7C64F /* icon.png */,
 				71EC88E01396273B004DCB6A /* osmo.icns */,
-				92A3A03D16F0C10C004EE581 /* extract.c */,
 				71A19B2012796B6F00ACFF58 /* main.c */,
 				71A19B1C12796B5700ACFF58 /* osmo4ios-Info.plist */,
 			);
@@ -1390,6 +1423,7 @@
 		71CCF19F1277045100339E12 /* isomedia */ = {
 			isa = PBXGroup;
 			children = (
+				92DF5CA51BA6C6F80058A7BA /* iff.c */,
 				97A8DDC31896AFF300F4680F /* ttml.c */,
 				97116F201646E38D00BD1AD0 /* box_code_adobe.c */,
 				71CCF1A01277045100339E12 /* avc_ext.c */,
@@ -1646,6 +1680,14 @@
 		71CCF35F12770A8C00339E12 /* gpac */ = {
 			isa = PBXGroup;
 			children = (
+				922EB5781AAE13C500DF46D0 /* dash.h */,
+				922EB5791AAE13C500DF46D0 /* html5_media.h */,
+				922EB57A1AAE13C500DF46D0 /* html5_mse.h */,
+				922EB57B1AAE13C500DF46D0 /* map.h */,
+				922EB57C1AAE13C500DF46D0 /* maths.h */,
+				922EB57D1AAE13C500DF46D0 /* revision.h */,
+				922EB57E1AAE13C500DF46D0 /* version.h */,
+				922EB57F1AAE13C500DF46D0 /* webvtt.h */,
 				9747B6EC14864C6400280D95 /* ait.h */,
 				9747B6ED14864C6400280D95 /* dsmcc.h */,
 				9747B6EE14864C6400280D95 /* events_constants.h */,
@@ -1674,7 +1716,6 @@
 				71CCF38612770A8C00339E12 /* isomedia.h */,
 				71CCF38712770A8C00339E12 /* laser.h */,
 				71CCF38812770A8C00339E12 /* list.h */,
-				71CCF38912770A8C00339E12 /* math.h */,
 				71CCF38A12770A8C00339E12 /* media_tools.h */,
 				71CCF38B12770A8C00339E12 /* mediaobject.h */,
 				71CCF38C12770A8C00339E12 /* module.h */,
@@ -1712,6 +1753,8 @@
 		71CCF37012770A8C00339E12 /* internal */ = {
 			isa = PBXGroup;
 			children = (
+				925FF2A31ABC53F30085B04C /* odf_parse_common.h */,
+				925FF2A41ABC53F30085B04C /* smjs_api.h */,
 				970A26CB13434D780007362C /* m3u8.h */,
 				970A26CC13434D780007362C /* mpd.h */,
 				71CCF37112770A8C00339E12 /* avilib.h */,
@@ -1821,6 +1864,7 @@
 		92B69DB11A091CFC004E74AA /* extensions */ = {
 			isa = PBXGroup;
 			children = (
+				9201D1101BD3FE11005E326A /* bifs_tests */,
 				92B69DB21A091CFC004E74AA /* H2B2VS */,
 				92B69DB61A091CFC004E74AA /* player */,
 				92B69DBD1A091CFC004E74AA /* widget_manager */,
@@ -1936,6 +1980,7 @@
 				92BC211616EF8E7A000E0620 /* isom_in.h in Headers */,
 				92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */,
 				92BC212F16EF8E7A000E0620 /* sdl_out.h in Headers */,
+				922EB5851AAE13C500DF46D0 /* revision.h in Headers */,
 				92BC213616EF8E7A000E0620 /* unzip.h in Headers */,
 				92BC212A16EF8E7A000E0620 /* rtp_in.h in Headers */,
 				92BC212216EF8E7A000E0620 /* rast_soft.h in Headers */,
@@ -1950,7 +1995,9 @@
 				71CCF2941277045100339E12 /* visual_manager.h in Headers */,
 				71CCF2961277045100339E12 /* visual_manager_2d.h in Headers */,
 				71CCF2991277045100339E12 /* visual_manager_3d.h in Headers */,
+				925FF2A61ABC53F30085B04C /* smjs_api.h in Headers */,
 				71CCF2E11277045100339E12 /* mpeg2_ps.h in Headers */,
+				922EB5861AAE13C500DF46D0 /* version.h in Headers */,
 				71CCF31B1277045100339E12 /* input_sensor.h in Headers */,
 				71CCF31D1277045100339E12 /* media_control.h in Headers */,
 				71CCF3201277045100339E12 /* media_memory.h in Headers */,
@@ -1965,6 +2012,7 @@
 				71CCF3B712770A8C00339E12 /* config_file.h in Headers */,
 				71CCF3B812770A8C00339E12 /* configuration.h in Headers */,
 				71CCF3B912770A8C00339E12 /* constants.h in Headers */,
+				922EB5811AAE13C500DF46D0 /* html5_media.h in Headers */,
 				71CCF3BA12770A8C00339E12 /* crypt.h in Headers */,
 				71CCF3BB12770A8C00339E12 /* download.h in Headers */,
 				71CCF3BC12770A8C00339E12 /* dvb_mpe.h in Headers */,
@@ -1976,6 +2024,7 @@
 				71CCF3C212770A8C00339E12 /* bifs_dev.h in Headers */,
 				71CCF3C312770A8C00339E12 /* bifs_tables.h in Headers */,
 				71CCF3C412770A8C00339E12 /* camera.h in Headers */,
+				922EB5801AAE13C500DF46D0 /* dash.h in Headers */,
 				71CCF3C512770A8C00339E12 /* compositor_dev.h in Headers */,
 				71CCF3C612770A8C00339E12 /* crypt_dev.h in Headers */,
 				71CCF3C712770A8C00339E12 /* dvb_mpe_dev.h in Headers */,
@@ -1991,12 +2040,12 @@
 				71CCF3D112770A8C00339E12 /* swf_dev.h in Headers */,
 				71CCF3D212770A8C00339E12 /* terminal_dev.h in Headers */,
 				71CCF3D312770A8C00339E12 /* vobsub.h in Headers */,
+				925FF2A51ABC53F30085B04C /* odf_parse_common.h in Headers */,
 				71CCF3D412770A8C00339E12 /* ismacryp.h in Headers */,
 				71CCF3D512770A8C00339E12 /* iso639.h in Headers */,
 				71CCF3D612770A8C00339E12 /* isomedia.h in Headers */,
 				71CCF3D712770A8C00339E12 /* laser.h in Headers */,
 				71CCF3D812770A8C00339E12 /* list.h in Headers */,
-				71CCF3D912770A8C00339E12 /* math.h in Headers */,
 				71CCF3DA12770A8C00339E12 /* media_tools.h in Headers */,
 				71CCF3DB12770A8C00339E12 /* mediaobject.h in Headers */,
 				71CCF3DC12770A8C00339E12 /* module.h in Headers */,
@@ -2035,13 +2084,17 @@
 				71CCF3FD12770A8C00339E12 /* user.h in Headers */,
 				71CCF3FE12770A8C00339E12 /* utf.h in Headers */,
 				71CCF3FF12770A8C00339E12 /* xml.h in Headers */,
+				922EB5831AAE13C500DF46D0 /* map.h in Headers */,
 				970A26CD13434D780007362C /* m3u8.h in Headers */,
 				970A26CE13434D780007362C /* mpd.h in Headers */,
+				922EB5821AAE13C500DF46D0 /* html5_mse.h in Headers */,
 				970A26D213434D960007362C /* cache.h in Headers */,
 				970A26D313434D960007362C /* ringbuffer.h in Headers */,
 				970A26D413434D960007362C /* unicode.h in Headers */,
+				922EB5871AAE13C500DF46D0 /* webvtt.h in Headers */,
 				9747B6EF14864C6400280D95 /* ait.h in Headers */,
 				9747B6F014864C6400280D95 /* dsmcc.h in Headers */,
+				922EB5841AAE13C500DF46D0 /* maths.h in Headers */,
 				9747B6F114864C6400280D95 /* events_constants.h in Headers */,
 				285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */,
 			);
@@ -2072,6 +2125,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 71CCF1351277037B00339E12 /* Build configuration list for PBXNativeTarget "libgpac_static" */;
 			buildPhases = (
+				92B2C7281C89BEB7001430F0 /* Run Script */,
 				71CCF12D1277037A00339E12 /* Headers */,
 				71CCF12E1277037A00339E12 /* Sources */,
 				71CCF12F1277037A00339E12 /* Frameworks */,
@@ -2091,7 +2145,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				TargetAttributes = {
 					71A19B1912796B5600ACFF58 = {
 						DevelopmentTeam = Q46G522WGV;
@@ -2124,6 +2178,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9201D1111BD3FE11005E326A /* bifs_tests in Resources */,
+				92C7F19A1AA8B48E00BA5B4C /* gui in Resources */,
+				92D127FE1BBADC7F00DA003B /* shaders in Resources */,
 				71EC88E11396273B004DCB6A /* osmo.icns in Resources */,
 				929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */,
 				929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */,
@@ -2135,13 +2192,29 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		92B2C7281C89BEB7001430F0 /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd ../..\n./check_revision.sh";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		71A19B1712796B5600ACFF58 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				71A19B2112796B6F00ACFF58 /* main.c in Sources */,
-				92A3A03E16F0C10C004EE581 /* extract.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2150,7 +2223,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				92F930861A5ADC1A0072A85C /* os_divers.c in Sources */,
-				71CCF3371277045100339E12 /* os_file.c in Sources */,
+				925FF2A71ABC55030085B04C /* os_file.c in Sources */,
 				92E8C7901A0CD58300E0436D /* validator.c in Sources */,
 				92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */,
 				92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */,
@@ -2170,6 +2243,7 @@
 				92BC213516EF8E7A000E0620 /* unzip.c in Sources */,
 				92BC213916EF8E7A000E0620 /* wgt_load.c in Sources */,
 				92BC213A16EF8E7A000E0620 /* widget.c in Sources */,
+				92DF5CA61BA6C6F80058A7BA /* iff.c in Sources */,
 				92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */,
 				92BC213716EF8E7A000E0620 /* video.c in Sources */,
 				92BC212916EF8E7A000E0620 /* rtp_in.c in Sources */,
@@ -2424,7 +2498,6 @@
 				71CCF3331277045100339E12 /* list.c in Sources */,
 				71CCF3341277045100339E12 /* math.c in Sources */,
 				71CCF3351277045100339E12 /* module.c in Sources */,
-				71CCF3371277045100339E12 /* os_file.c in Sources */,
 				71CCF3381277045100339E12 /* os_module.c in Sources */,
 				71CCF3391277045100339E12 /* os_net.c in Sources */,
 				71CCF33A1277045100339E12 /* os_thread.c in Sources */,
@@ -2485,12 +2558,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
 				DEPLOYMENT_LOCATION = YES;
+				ENABLE_BITCODE = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -2499,6 +2572,7 @@
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
+					../../extra_lib/include/ios/SDL2/,
 					../../include,
 					../../extra_lib/include,
 				);
@@ -2513,6 +2587,7 @@
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "";
 				OTHER_LDFLAGS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.telecom-paristech.gpac";
 				PRODUCT_NAME = osmo4ios;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -2525,16 +2600,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEPLOYMENT_LOCATION = YES;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
+					../../extra_lib/include/ios/SDL2/,
 					../../include,
 					../../extra_lib/include,
 				);
@@ -2550,6 +2626,7 @@
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.telecom-paristech.gpac";
 				PRODUCT_NAME = osmo4ios;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -2563,6 +2640,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_BITCODE = NO;
 				EXECUTABLE_PREFIX = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -2575,15 +2653,14 @@
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
-					../..,
 					../../extra_lib/include/ios/,
+					../../extra_lib/include/ios/SDL2,
 					../../extra_lib/include/png,
 					../../extra_lib/include/jpeg,
 					../../extra_lib/include/js,
 					../../extra_lib/include/zlib,
 					../../extra_lib/include/SDL2,
 					../../extra_lib/include/freetype,
-					../../extra_lib/include,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = ../../extra_lib/lib/iOS;
@@ -2602,6 +2679,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
+				ENABLE_BITCODE = NO;
 				EXECUTABLE_PREFIX = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					GPAC_CONFIG_DARWIN,
@@ -2612,15 +2690,14 @@
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
-					../..,
 					../../extra_lib/include/ios/,
+					../../extra_lib/include/ios/SDL2,
 					../../extra_lib/include/png,
 					../../extra_lib/include/jpeg,
 					../../extra_lib/include/js,
 					../../extra_lib/include/zlib,
 					../../extra_lib/include/SDL2,
 					../../extra_lib/include/freetype,
-					../../extra_lib/include,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = ../../extra_lib/lib/iOS;
@@ -2643,6 +2720,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEPLOYMENT_LOCATION = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;

v0.6.1.tar.gz/change_version.sh Added

@@ -0,0 +1,79 @@
+#!/bin/sh
+
+
+version="`grep '#define GPAC_VERSION ' \"./include/gpac/version.h\" | cut -d '"' -f 2`"
+#version_major=`grep '#define GPAC_VERSION_MAJOR ' ./include/gpac/version.h | sed 's/[^0-9]*//g'`
+#version_minor=`grep '#define GPAC_VERSION_MINOR ' ./include/gpac/version.h | sed 's/[^0-9]*//g'`
+#version_micro=`grep '#define GPAC_VERSION_MICRO ' ./include/gpac/version.h | sed 's/[^0-9]*//g'`
+
+echo "Version is $version"
+
+#patch README.md
+source="README.md"
+sed -e "s/README for GPAC version.*/README for GPAC version $version/;" $source > ftmp
+rm $source
+mv ftmp $source
+
+#patch doc/configuration.html
+source="doc/configuration.html"
+sed -e "s/GPAC Version.*/GPAC Version $version/;" $source > ftmp
+rm $source
+mv ftmp $source
+
+#patch doc/man/gpac.1
+source="doc/man/gpac.1"
+sed -e "s/GPAC framework version.*/GPAC framework version $version./;" $source > ftmp
+rm $source
+mv ftmp $source
+
+
+#patch applications/osmo4_ios/osmo4ios-Info.plist 
+
+source="applications/osmo4_ios/osmo4ios-Info.plist"
+sed -e "/CFBundleShortVersionString/{n;s/.*/	<string>$version<\/string>/;}" $source > ftmp
+rm $source
+mv ftmp $source
+
+# patch applications/osmo4_w32/Osmo4.rc
+
+source="applications/osmo4_w32/Osmo4.rc"
+sed -e "/\"FileDescription\", \"Osmo4-GPAC\"/{n;s/.*/		VALUE \"FileVersion\", \"$version\"/;}" $source | sed -e "/\"ProductName\", \"Osmo4-GPAC\"/{n;s/.*/		VALUE \"ProductVersion\", \"$version\"/;}" > ftmp
+rm $source
+mv ftmp $source
+
+# patch bin/smartphone 2003 (armv4)/release/install/archive.bat
+source="bin/smartphone 2003 (armv4)/release/install/archive.bat"
+sed -e "s/set gpac_version=.*/set gpac_version=\"$version-r%gpac_revision%/;" "$source" > ftmp
+rm "$source"
+mv ftmp "$source"
+
+
+# patch bin/smartphone 2003 (armv4)/release/install/build_installer.bat
+source="bin/smartphone 2003 (armv4)/release/install/build_installer.bat"
+sed -e "s/set gpac_version=.*/set gpac_version=\"$version-r%gpac_revision%/;" "$source" > ftmp
+rm "$source"
+mv ftmp "$source"
+
+# patch file gpac.pc
+source="gpac.pc"
+sed -e "s/Version:.*/Version:$version/;" $source > ftmp
+rm $source
+mv ftmp $source
+
+# patch file gpac.spec
+source="gpac.spec"
+sed -e "s/Version:.*/Version: $version/;" $source | sed -e "s/Release:.*/Release: $version/;" | sed -e "s/Source0:.*/Source0: gpac-$version.tar.gz%{?_with_amr:Source1:http:\/\/www.3gpp.org\/ftp\/Specs\/archive\/26_series\/26.073\/26073-700.zip}/;" > ftmp
+rm $source
+mv ftmp $source
+
+# patch file debian/changelog
+source="debian/changelog"
+sed -e "s/gpac (.*/gpac ($version) stable; urgency=low/;" $source | sed -e "s/Check https.*/Check https:\/\/github.com\/gpac\/gpac\/releases\/tag\/v$version/;" > ftmp
+rm $source
+mv ftmp $source
+
+# patch packagers/win32_64/nsis/gpac_installer.nsi
+source="packagers/win32_64/nsis/gpac_installer.nsi"
+sed -e "s/\!define GPAC_VERSION.*/\!define GPAC_VERSION $version/;" $source > ftmp
+rm $source
+mv ftmp $source

v0.6.1.tar.gz/check_revision.sh Added

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+version="`grep '#define GPAC_VERSION ' \"./include/gpac/version.h\" | cut -d '"' -f 2`"
+
+#check for .git - if so use nb commits till last tag for rev + commit id
+if [ -d ".git" ]; then
+TAG=$(git describe --tags --abbrev=0 2>>gtmp)
+VERSION=$(echo `git describe --tags --long 2>>gtmp || echo "UNKNOWN"` | sed "s/^$TAG-//")
+BRANCH=$(git rev-parse --abbrev-ref HEAD 2>>gtmp || echo "UNKNOWN")
+revision="$VERSION-$BRANCH"
+
+rm gtmp
+
+echo "#define GPAC_GIT_REVISION	\"$revision\"" > htmp
+
+if ! diff htmp ./include/gpac/revision.h > /dev/null ; then
+echo "revision has changed"
+rm ./include/gpac/revision.h
+mv htmp ./include/gpac/revision.h
+else
+rm htmp
+fi
+
+else
+#otherwise, check id -DEV is in the version name. If not consider this a release
+
+if [ ! -e ".include/gpac/revision.h" ]; then
+
+if [[ "$version" != *"-DEV"* ]]; then
+echo "#define GPAC_GIT_REVISION \"release\"" > ./include/gpac/revision.h
+else
+echo "#define GPAC_GIT_REVISION \"UNKNOWN_REV\"" > ./include/gpac/revision.h
+fi
+
+fi
+
+fi

v0.5.2.tar.gz/configure -> v0.6.1.tar.gz/configure Changed

@@ -26,6 +26,7 @@
 TMPE="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}"
 TMPO="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.o"
 TMPS="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.S"
+TMPL="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.LOG"
 
 
 #default parameters
@@ -90,7 +91,6 @@
 no_gcc_opt="no"
 use_fixed_point="no"
 use_memory_tracking="no"
-use_std_alloc="no"
 has_opengl="no"
 has_tinygl="no"
 enable_tinygl="no"
@@ -179,7 +179,7 @@
 CFLAGS=""
 CXXFLAGS=""
 GPAC_SH_FLAGS=-lpthread
-DYN_LIB_SUFFIX="so"
+DYN_LIB_SUFFIX=".so"
 X11_PATH="/usr/X11R6"
 OSS_CFLAGS=""
 OSS_LDFLAGS=""
@@ -187,6 +187,9 @@
 is_64="no"
 ffmpeg_extra_ldflags=""
 
+logs="config.log"
+echo "Logs for GPAC configure $GPAC_CONFIGURATION" > $logs
+
 
 #configure usage
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
@@ -225,8 +228,8 @@
 --enable-pic enable Position Independant Code for shared objects
 --strip enable strip
 --std-allocator uses standard lib memory allocator
- --static-modules uses static modules whenever possible
- --track-memory enable tracking of all memory allocated by gpac
+ --static-modules includes static modules in libgpac whenever possible
+ --enable-mem-track enable tracking of all memory allocated by gpac
 --disable-opt disable GCC optimizations
 --disable-ipv6 disable IPV6 support
 --disable-wx disable wxWidgets support
@@ -237,6 +240,7 @@
 --disable-jack disable Jack audio
 --enable-pulseaudio enable Pulse audio
 --disable-pulseaudio disable Pulse audio
+ --disable-x11 disable X11
 --disable-x11-shm disable X11 shared memory support
 --disable-x11-xv disable X11 Xvideo support
 --enable-fixed-point enable fixed-point math
@@ -247,8 +251,8 @@
 --enable-amr-nb enable AMR NB library
 --enable-amr-wb enable AMR WB library
 --enable-amr enable both AMR NB and WB libraries
- --enable-static-bin GPAC static build
- --static-mp4box configure for static linking of MP4Box.
+ --enable-static-bin link statically against libgpac
+ --static-mp4box configure for static linking of MP4Box only.
 --enable-depth enables depth handling in the compositor
 
 Configuration options for libgpac - all options can be enabled with --enable-optname
@@ -326,9 +330,9 @@
 ;;
 --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
 ;;
- --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2` && echo "\ncross-prefix detected: $cross_prefix"
+ --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2` && echo "cross-prefix detected: $cross_prefix"
 ;;
- --target-os=*) targetos=`echo $opt | cut -d '=' -f 2` && echo "\ntarget-os detected: $targetos"
+ --target-os=*) targetos=`echo $opt | cut -d '=' -f 2` && echo "target-os detected: $targetos"
 ;;
 --cc=*) cc_orig=`echo $opt | cut -d '=' -f 2`
 ;;
@@ -390,7 +394,7 @@
 if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
 cpu="x86_64"
 want_pic="yes"
-	 is_64="yes"
+ is_64="yes"
 fi
 fi
 ;;
@@ -430,21 +434,15 @@
 CFLAGS=""
 fi
 
-#if test "$win32" = "yes" ; then
-# cross_prefix=""
-#fi
-
-#if test "$mingw32" = "yes" ; then
-# cross_prefix=""
-#fi
-
 
 cc="${cross_prefix}${cc}"
 #for ccache
 cc="${cc}"
 cxx="${cross_prefix}${cxx}"
 ar="${cross_prefix}${ar}"
-ranlib="${cross_prefix}${ranlib}"
+if [ -e "${cross_prefix}${ranlib}" ] ; then
+ ranlib="${cross_prefix}${ranlib}"
+fi
 strip="${cross_prefix}${strip}"
 pkg_config="${pkg_config}"
 windres="${cross_prefix}${windres}"
@@ -452,8 +450,8 @@
 
 #check pkg_config
 if test "$cross_prefix" = "" ; then
- if ! $pkg_config --version >/dev/null 2>&1 ; then
-		pkg_config="no"
+ if ! $pkg_config --version >/dev/null 2>>$logs ; then
+ pkg_config="no"
 fi
 fi
 
@@ -464,8 +462,10 @@
 if test -z "$source_path" -o "$source_path" = "." ; then
 source_path="`pwd`"
 source_path_used="no"
+ build_path=$source_path
 else
 source_path="`cd \"$source_path\"; pwd`"
+ build_path="`pwd`"
 fi
 
 
@@ -480,7 +480,7 @@
 prefix="/boot/home/config"
 CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer"
 # 3 gcc releases known for BeOS, each with ugly bugs
- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
+ gcc_version="$($cc -v 2>>$logs | grep version | cut -d ' ' -f3-)"
 case "$gcc_version" in
 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
 ;;
@@ -510,9 +510,8 @@
 #include <stdio.h>
 int main( void ) { return 0; }
 EOF
-
 CFLAGS_NO_LTO=$(echo ${CFLAGS} | sed -e 's/\ -flto[-A-Za-z0-9=]*//g')
- $cc ${CFLAGS_NO_LTO} -o $TMPO $TMPC 2>/dev/null && $($readelf -h $TMPO | grep "Class:.*ELF64$" >/dev/null 2>&1)
+ $cc ${CFLAGS_NO_LTO} -o $TMPO $TMPC 2>>$logs && $($readelf -h $TMPO | grep "Class:.*ELF64$" >/dev/null 2>>$logs)
 if test $? -eq 0; then
 is_64="yes"
 fi
@@ -545,19 +544,20 @@
 Darwin)
 js_flags=-DXP_MAC
 xul_flags=-DXP_MAC
+ CFLAGS_DIR="-I$prefix/include"
+ LDFLAGS="-L$prefix/lib"
 if test -d /sw/bin ; then
 alt_macosx_dir="/sw"
- CFLAGS_DIR="-I/sw/include"
+ CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
 LDFLAGS="-L/sw/lib $LDFLAGS"
 elif test -d /opt/local/bin ; then
 alt_macosx_dir="/opt/local"
- CFLAGS_DIR="-I/opt/local/include"
+ CFLAGS_DIR="-I/opt/local/include $CFLAGS_DIR"
 LDFLAGS="-L/opt/local/lib $LDFLAGS"
 fi
- cc="cc"
 Mac_Applications="/Applications"
 SHFLAGS="-dynamiclib"
- DYN_LIB_SUFFIX="dylib"
+ DYN_LIB_SUFFIX=".dylib"
 extralibs=""
 GPAC_SH_FLAGS=""
 strip="strip -x"
@@ -565,7 +565,7 @@
 LDFLAGS="$LDFLAGS"
 fi
 darwin="yes"
- gcc_version=`$cc -v 2>&1 | grep version | cut -d ' ' -f3`
+ gcc_version=`$cc -v 2>>$logs | grep version | cut -d ' ' -f3`
 case "$gcc_version" in
 *2.95*) 
 CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
@@ -579,36 +579,47 @@
 esac
 ;;
 
- MINGW32*)
+ MINGW32*|mingw32|MINGW64*|mingw64)
 js_flags="-DXP_PC -D_declspec=__declspec"
 mingw32="yes"
 win32="yes"
- extralibs="$extralibs -lws2_32 -lwinmm"
+ want_pic="no"
+ extralibs="$extralibs -lws2_32 -lwinmm -limagehlp"
 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 if test "$cross_prefix" != "" ; then
 GPAC_SH_FLAGS=""
 fi
 ;;
 
- CYGWIN*)
+ CYGWIN*|cygwin*)
 js_flags=-DXP_PC 
 extralibs="$extralibs -lws2_32 -lwinmm"
 cygwin="yes"
 win32="yes"
 ;;
 
- Linux)
+ Linux|linux|android)
 js_flags="-DXP_UNIX -I/usr/include/js"
 LDFLAGS="$LDFLAGS -Wl,--warn-common -Wl,-z,defs"
- #OSS_LDFLAGS="-laoss"
 linux="yes"
 case "$cpu" in
 sh4)
 CFLAGS="$CFLAGS -isystem \"$prefix/include\""
- #LDFLAGS="$LDFLAGS -L$prefix/lib"
 ;;
 esac
- ;;
+		cat > $TMPC << EOF
+#include <sys/cdefs.h>
+#if !defined (__BIONIC__)
+#error
+#endif
+EOF
+		if $cc -c $CFLAGS $TMPC 0>/dev/null 2>$TMPL ; then
+			#bionic libc (android)
+			CFLAGS="$CFLAGS -DPTHREAD_HAS_NO_CANCEL"
+			GPAC_SH_FLAGS=""
+		fi
+		;;
+
 *) ;;
 esac
 
@@ -616,7 +627,7 @@
 #defines directory for binaries and libs (ex. for TinyGL)
 target_bin_dir="" 
 if test "$cross_prefix" = "" ; then
- target_bin_dir=`${cc} -v 2>&1 | sed -n '2p' | awk ' {print $2}'`-${cc_orig}
+ target_bin_dir=`${cc} -v 2>>$logs | sed -n '2p' | awk ' {print $2}'`-${cc_orig}
 else
 target_bin_dir=${cross_prefix}${cc_orig}
 fi
@@ -634,17 +645,45 @@
 local_lib=extra_lib/lib/gcc
 
 
+dolog() {
+ rv=$?
+ if [ $rv -eq 0 ] ; then
+ return 0;
+ fi
+
+ echo "*** CC/CXX Test Failed (args $@) : ">>$logs
+ echo "">>$logs
+ cat $TMPL >> $logs
+ echo "">>$logs
+ echo "Source was: ">>$logs
+ cat $TMPC >> $logs
+ echo "">>$logs
+ echo "">>$logs
+ return 1;
+}
+
+docc() {
+ $cc -o $TMPO $TMPC $@ 0>/dev/null 2>$TMPL
+ dolog $@
+}
+
+
+docxx() {
+ $cc -o $TMPO $TMPC $@ 0>/dev/null 2>$TMPL
+ dolog $@
+}
+
 #check GCC flags support
 cat > $TMPC << EOF
 #include <stdio.h>
 int main( void ) { return 0; }
 EOF
 CFLAGS="$CFLAGS -Wall"
-if $cc -o $TMPO $TMPC -fno-strict-aliasing 2> /dev/null ; then
+if docc -fno-strict-aliasing ; then
 CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
 CXXFLAGS="$CFLAGS"
-if $cc -o $TMPO $TMPC -lz -Wno-pointer-sign 2> /dev/null ; then
+if docc -lz -Wno-pointer-sign ; then
 CFLAGS="$CFLAGS -Wno-pointer-sign"
 fi
 
@@ -681,27 +720,27 @@
 #look for zlib
 cat > $TMPC << EOF
 #include <emmintrin.h>
-int main( void ) { }
+int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPC -msse2 $LDFLAGS 2> /dev/null ; then
+if docc -msse2 $LDFLAGS ; then
 CFLAGS="$CFLAGS -msse2"
 fi
 
 
 #look for zlib
 cat > $TMPC << EOF
+#include <string.h>
+#include <stdio.h>
 #include <zlib.h>
 int main( void ) { if (strcmp(zlibVersion(), ZLIB_VERSION)) { puts("zlib version differs !!!"); return 1; } return 0; }
 EOF
 has_zlib="no"
-#if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC -lz $LDFLAGS 2> /dev/null ; then
- has_zlib="system"
- fi
-#fi
+if docc -lz $LDFLAGS ; then
+ has_zlib="system"
+fi
 if test "$has_zlib" = "no" ; then
- if $cc -o $TMPO $TMPC -I"$local_inc/zlib" -L$local_lib -lz 2> /dev/null ; then
+ if docc -I"$local_inc/zlib" -L$local_lib -lz ; then
 has_zlib="local"
 fi
 fi
@@ -709,12 +748,12 @@
 #check dlopen
 cat > $TMPC << EOF
 #include <dlfcn.h>
-int main( void ) { return (int) dlopen("foo", 0); }
+int main( void ) { dlopen("foo", 0); return 0; }
 EOF
 
-if $cc -o $TMPE $TMPC > /dev/null 2>&1 ; then
+if docc ; then
 dlopen="yes"
-elif $cc -o $TMPE $TMPC $LDFLAGS -ldl > /dev/null 2>&1 ; then
+elif docc $LDFLAGS -ldl ; then
 GPAC_SH_FLAGS="$GPAC_SH_FLAGS -ldl"
 fi
 
@@ -723,69 +762,68 @@
 #look for spidermonkey JS support
 mozjs_pkgcfg="no"
 
-
 #spidermonkey test for new API
 if test "$has_js" = "no" ; then
 
 cat > $TMPC << EOF
 #include <jsapi.h>
-int main( void ) { JSContext *cx; jsval *rp; return JS_AddValueRoot(cx, rp); }
+int main( void ) { JSContext *cx=NULL; jsval rp; return JS_AddValueRoot(cx, &rp); }
 EOF
 
 #try local
 js_inc="$local_inc/js"
 js_flags="-DXP_UNIX -I$local_inc/js"
- if $cc -o $TMPO $TMPC $js_flags -L$local_lib -ljs -lpthread 2> /dev/null ; then
- has_js="local"
- #dc added
- elif test "$pkg_config" != "no"; then
+ if test "$pkg_config" != "no"; then
 #try pkg-config
- if $pkg_config --exists mozilla-js 2> /dev/null ; then
+ if $pkg_config --exists mozilla-js ; then
 mozjs_pkgcfg="mozilla-js"
- elif $pkg_config --exists mozjs 2> /dev/null ; then
+ elif $pkg_config --exists mozjs ; then
 mozjs_pkgcfg="mozjs"
- elif $pkg_config --exists mozjs185 2> /dev/null ; then
+ elif $pkg_config --exists mozjs185 ; then
 mozjs_pkgcfg="mozjs185"
-	fi
+ elif docc $js_flags -L$local_lib -ljs -lpthread ; then
+ has_js="local"
+ #dc added
+ fi
 
- if test $mozjs_pkgcfg != "no" ; then
- js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
- js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
- if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null ; then
- has_js="system"
- js_lib=`$pkg_config --libs $mozjs_pkgcfg`
- fi
- #try firefox folders (starting at ubuntu 11.10, no pkg-config)
- elif ls -d /usr/lib/firefox* > /dev/null 2>&1 ; then
+ if test $mozjs_pkgcfg != "no" ; then
+ js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
+ js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
+ if docc $js_flags $js_lib_pkg $LDFLAGS -lpthread ; then
+ has_js="system"
+ js_lib=`$pkg_config --libs $mozjs_pkgcfg`
+ fi
+ #try firefox folders (starting at ubuntu 11.10, no pkg-config)
+ elif ls -d /usr/lib/firefox* > /dev/null 2>>$logs ; then
 firefox_version=`cd /usr/lib ; ls -d firefox* | grep -v addons | grep -v devel ; cd - > /dev/null`
 for i in $firefox_version ; do
 if test "$has_js" = "no" ; then
 js_inc="/usr/include/$i"
 js_flags="-DXP_UNIX -I$js_inc"
 js_lib="-L/usr/lib/$i/ -lxul -lmozsqlite3 -lmozalloc -lnssutil3 -lnss3 -lnspr4 -lsmime3"
- if $cc -o $TMPO $TMPC $js_flags $js_lib 2> /dev/null ; then
+ if docc $js_flags $js_lib ; then
 has_js="$i"
- elif $cc -o $TMPO $TMPC $js_flags -lnssutil3 $js_lib -lssl3 2> /dev/null ; then
+ elif docc $js_flags -lnssutil3 $js_lib -lssl3 ; then
 #firefox 11 compatibility
 has_js="$i"
 js_lib="-lnssutil3 $js_lib -lssl3"
 fi
 fi
 done
- fi
+ fi
 
 if test "$has_js" = "no" ; then
 #try prefix (DC)
 js_inc="$prefix/include/js"
 js_flags="-DXP_UNIX -I$prefix/include/js"
- if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs -lpthread 2> /dev/null ; then
+ if docc $js_flags -L$prefix/lib -ljs -lpthread ; then
 has_js="prefix"
 #dc added end
 else
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -ljs -lpthread 2> /dev/null ; then
+ if docc $js_flags $LDFLAGS -ljs -lpthread ; then
 js_inc="/usr/include"
 has_js="system"
- elif $cc -o $TMPO $TMPC -DXP_UNIX -I$alt_macosx_dir/include/js -L$alt_macosx_dir/lib $LDFLAGS -ljs -lpthread 2> /dev/null ; then
+ elif docc -DXP_UNIX -I$alt_macosx_dir/include/js -L$alt_macosx_dir/lib $LDFLAGS -ljs -lpthread 2>>$logs ; then
 has_js="system"
 js_flags="-DXP_UNIX -I$alt_macosx_dir/include/js"
 js_lib="-L$alt_macosx_dir/lib -ljs"
@@ -794,14 +832,14 @@
 #debian spidermonkey (smjs)
 js_flags="-DXP_UNIX -I/usr/include/smjs"
 js_inc="/usr/include/smjs"
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -lsmjs -lpthread 2> /dev/null ; then
+ if docc $js_flags $LDFLAGS -lsmjs -lpthread ; then
 has_js="system"
 js_lib="-lsmjs"
 else
 #debian spidermonkey (mozjs)
 js_flags="-DXP_UNIX -I/usr/include/mozjs"
 js_inc="/usr/include/mozjs"
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -lmozjs -lpthread 2> /dev/null ; then
+ if docc $js_flags $LDFLAGS -lmozjs -lpthread ; then
 has_js="system"
 js_lib="-lmozjs"
 fi
@@ -821,7 +859,7 @@
 #spidermonkey test for regular API
 if test "$has_js" = "no" ; then
 
- cat > $TMPC << EOF
+cat > $TMPC << EOF
 #include <jsapi.h>
 int main( void ) { return 0; }
 EOF
@@ -832,40 +870,39 @@
 if test "$cpu" = "sh4" ; then
 lm_lib="-lm"
 fi
- if $cc -o $TMPO $TMPC $js_flags $lm_lib -L$local_lib -ljs 2> /dev/null ; then
+ if docc $js_flags $lm_lib -L$local_lib -ljs ; then
 has_js="local"
 #dc added
 else
-
 #try prefix (DC)
 js_inc="$prefix/include/js"
 js_flags="-DXP_UNIX -I$prefix/include/js"
- if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs 2> /dev/null ; then
+ if docc $js_flags -L$prefix/lib -ljs ; then
 has_js="prefix"
 #dc added end
 elif test "$pkg_config" != "no"; then
- if $pkg_config --exists mozilla-js 2> /dev/null ; then
-				mozjs_pkgcfg="mozilla-js"
- elif $pkg_config --exists mozjs 2> /dev/null ; then
-				mozjs_pkgcfg="mozjs"
- elif $pkg_config --exists mozjs185 2> /dev/null ; then
-				mozjs_pkgcfg="mozjs185"
-	 fi
-
-	 if test $mozjs_pkgcfg != "no" ; then
+ if $pkg_config --exists mozilla-js ; then
+ mozjs_pkgcfg="mozilla-js"
+ elif $pkg_config --exists mozjs ; then
+ mozjs_pkgcfg="mozjs"
+ elif $pkg_config --exists mozjs185 ; then
+ mozjs_pkgcfg="mozjs185"
+ fi
+
+ if test $mozjs_pkgcfg != "no" ; then
 js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
 js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
- if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null ; then
+ if docc $js_flags $js_lib_pkg $LDFLAGS -lpthread ; then
 has_js="system"
 js_lib=`$pkg_config --libs $mozjs_pkgcfg`
 fi
 fi
 fi
-	 if test "$has_js" = "no" ; then
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -ljs 2> /dev/null ; then
+ if test "$has_js" = "no" ; then
+ if docc $js_flags $LDFLAGS -ljs ; then
 js_inc="/usr/include"
 has_js="system"
- elif $cc -o $TMPO $TMPC -DXP_UNIX -I$alt_macosx_dir/include/js -L$alt_macosx_dir/lib $LDFLAGS -ljs 2> /dev/null ; then
+ elif docc -DXP_UNIX -I$alt_macosx_dir/include/js -L$alt_macosx_dir/lib $LDFLAGS -ljs 2>>$logs ; then
 has_js="system"
 js_flags="-DXP_UNIX -I$alt_macosx_dir/include/js"
 js_lib="-L$alt_macosx_dir/lib -ljs"
@@ -874,14 +911,14 @@
 #debian spidermonkey (smjs)
 js_flags="-DXP_UNIX -I/usr/include/smjs"
 js_inc="/usr/include/smjs"
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -lsmjs 2> /dev/null ; then
+ if docc $js_flags $LDFLAGS -lsmjs ; then
 has_js="system"
 js_lib="-lsmjs"
 else
 #debian spidermonkey (mozjs)
 js_flags="-DXP_UNIX -I/usr/include/mozjs"
 js_inc="/usr/include/mozjs"
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -lmozjs 2> /dev/null ; then
+ if docc $js_flags $LDFLAGS -lmozjs ; then
 has_js="system"
 js_lib="-lmozjs"
 fi
@@ -898,35 +935,36 @@
 #if the lib has been compiled with or without the macro. We currently just decide that if the macro is present
 #in the header, it was enabled in the build
 if test "$new_js_api" = "no" ; then
- if grep MOZILLA_1_8_BRANCH $js_inc/jsapi.h > /dev/null 2>&1 ; then
+ if grep MOZILLA_1_8_BRANCH $js_inc/jsapi.h > /dev/null 2>>$logs ; then
 js_flags="-DMOZILLA_1_8_BRANCH $js_flags"
 echo "WARNING: Turning on MOZILLA_1_8_BRANCH SpiderMonkey macro"
 echo "If you have troubles with scripts in GPAC, disable this macro and recompile"
 fi
 else
+
 cat > $TMPC << EOF
 #include <jsapi.h>
-int main( void ) { JSObject *obj; JS_GetPrivate(obj); }
+int main( void ) { JSObject *obj; JS_GetPrivate(obj); return 0; }
 EOF
- if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null ; then
+ if docc $js_flags $LDFLAGS $js_lib ; then
 
 cat > $TMPC << EOF
 #include <jsapi.h>
-int main( void ) { jsval *vp; JSObject *obj = JS_NewObjectForConstructor(c, vp); }
+int main( void ) { jsval vp; JSContext *cx=NULL; JSObject *obj = JS_NewObjectForConstructor(cx, &vp); return 0; }
 EOF
-	 if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null ; then
-	 js_flags="-DUSE_FFDEV_12 $js_flags"
-	 elif grep JSMutableHandleValue $js_inc/jsapi.h | grep JSHasInstanceOp > /dev/null 2>&1 ; then
-	 	js_flags="-DUSE_FFDEV_18 $js_flags"
-	 elif grep JSMutableHandleValue $js_inc/jsapi.h > /dev/null 2>&1 ; then
-	 	js_flags="-DUSE_FFDEV_18 $js_flags"
-	 elif ! grep JS_ConstructObject $js_inc/jsapi.h > /dev/null 2>&1 ; then
-	 	js_flags="-DUSE_FFDEV_16 $js_flags"
-	 elif grep JSHandleObject $js_inc/jsapi.h > /dev/null 2>&1 ; then
-	 	js_flags="-DUSE_FFDEV_15 $js_flags"
+ if docc $js_flags $LDFLAGS $js_lib ; then
+ js_flags="-DUSE_FFDEV_12 $js_flags"
+ elif grep JSMutableHandleValue $js_inc/jsapi.h | grep JSHasInstanceOp > /dev/null 2>>$logs ; then
+ js_flags="-DUSE_FFDEV_18 $js_flags"
+ elif grep JSMutableHandleValue $js_inc/jsapi.h > /dev/null 2>>$logs ; then
+ js_flags="-DUSE_FFDEV_18 $js_flags"
+ elif ! grep JS_ConstructObject $js_inc/jsapi.h > /dev/null 2>>$logs ; then
+ js_flags="-DUSE_FFDEV_16 $js_flags"
+ elif grep JSHandleObject $js_inc/jsapi.h > /dev/null 2>>$logs ; then
+ js_flags="-DUSE_FFDEV_15 $js_flags"
 else
-				js_flags="-DUSE_FFDEV_14 $js_flags"
- 		fi
+ js_flags="-DUSE_FFDEV_14 $js_flags"
+ fi
 fi
 fi
 fi
@@ -937,15 +975,14 @@
 
 if test "$has_js" != "no" ; then
 cat > $TMPC << EOF
-cat > $TMPC << EOF
 #include <jsapi.h>
-int main( void ) { JSContext *cx; JS_SetRuntimeThread(cx); }
+int main( void ) { JSContext *cx=NULL; JS_SetRuntimeThread(cx); return 0;}
 EOF
-	if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null ; then
-		js_flags="$js_flags"
-	else
-		js_flags="-DNO_JS_RUNTIMETHREAD $js_flags"
-	fi
+ if docc $js_flags $LDFLAGS $js_lib ; then
+ js_flags="$js_flags"
+ else
+ js_flags="-DNO_JS_RUNTIMETHREAD $js_flags"
+ fi
 fi
 
 
@@ -958,7 +995,7 @@
 #include <Platinum.h>
 int main( void ) { return 0; }
 EOF
-if $cxx -o $TMPO $TMPC -I$local_inc/platinum $LDFLAGS -L$local_lib -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread 2> /dev/null ; then
+if docxx -o $TMPO $TMPC -I$local_inc/platinum $LDFLAGS -L$local_lib -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread ; then
 has_platinum="yes"
 fi
 
@@ -980,7 +1017,7 @@
 return 0; 
 }
 EOF
-if $cxx -o $TMPO $TMPC $LDFLAGS $avcap_cflags $avcap_ldflags 2> /dev/null ; then
+if docxx -o $TMPO $TMPC $LDFLAGS $avcap_cflags $avcap_ldflags ; then
 has_avcap="yes"
 else
 if test "$darwin" = "yes" ; then
@@ -990,7 +1027,7 @@
 avcap_cflags="-I$local_inc -I$local_inc/avcap/linux"
 avcap_ldflags="-lavcap -lpthread"
 fi
- if $cxx -o $TMPO $TMPC $avcap_cflags $LDFLAGS -L$local_lib $avcap_ldflags 2> /dev/null ; then
+ if docxx -o $TMPO $TMPC $avcap_cflags $LDFLAGS -L$local_lib $avcap_ldflags ; then
 has_avcap="yes"
 avcap_ldflags="-L../../$local_lib $avcap_ldflags"
 fi
@@ -1000,24 +1037,24 @@
 #look for opensvc support
 
 if test "$darwin" = "yes" ; then
-osvc_cflags="-I/usr/include -I/usr/local/include"
-osvc_ldflags="-L/usr/lib -L/usr/local/lib -lOpenSVCDec"
+ osvc_cflags="-I/usr/include -I/usr/local/include"
+ osvc_ldflags="-L/usr/lib -L/usr/local/lib -lOpenSVCDec"
 else
-osvc_cflags=""
-osvc_ldflags="-lOpenSVCDec"
+ osvc_cflags=""
+ osvc_ldflags="-lOpenSVCDec"
 fi
 
 cat > $TMPC << EOF
 #include <OpenSVCDecoder/SVCDecoder_ietr_api.h>
 int main( void ) { return 0; }
 EOF
-if $cxx -o $TMPO $TMPC $osvc_cflags $LDFLAGS $osvc_ldflags 2> /dev/null ; then
+if docc $osvc_cflags $LDFLAGS $osvc_ldflags ; then
 has_opensvc="yes"
 else
 osvc_cflags="-I$local_inc"
 osvc_ldflags="-lOpenSVCDec"
 
-if $cxx -o $TMPO $TMPC $osvc_cflags $LDFLAGS -L$local_lib $osvc_ldflags 2> /dev/null ; then
+if docc $osvc_cflags $LDFLAGS -L$local_lib $osvc_ldflags ; then
 has_opensvc="yes"
 osvc_ldflags="-L../../$local_lib $osvc_ldflags"
 fi
@@ -1027,14 +1064,14 @@
 #look for openhevc support
 
 if test "$darwin" = "yes" ; then
-ohevc_cflags="-I/usr/include -I/usr/local/include"
-ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lm -lpthread "
+ ohevc_cflags="-I/usr/include -I/usr/local/include"
+ ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lm -lpthread "
 elif test "$cross_prefix" = "" ; then
-ohevc_cflags=""
-ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
+ ohevc_cflags=""
+ ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
 else
-ohevc_cflags="-I${prefix}include"
-ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
+ ohevc_cflags="-I${prefix}include"
+ ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
 fi
 
 cat > $TMPC << EOF
@@ -1042,12 +1079,12 @@
 #include <openHevcWrapper.h>
 int main( void ) { libOpenHevcInit(1, 1); return 0; }
 EOF
-if $cc -o $TMPO $TMPC $ohevc_cflags $ohevc_ldflags $LDFLAGS 2> /dev/null ; then
+if docc $ohevc_cflags $ohevc_ldflags $LDFLAGS ; then
 has_openhevc="yes"
 else
 ohevc_cflags="-I$local_inc"
 ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
- if $cc -o $TMPO $TMPC $ohevc_cflags $ohevc_ldflags $LDFLAGS -L$local_lib 2> /dev/null ; then
+ if docc $ohevc_cflags $ohevc_ldflags $LDFLAGS -L$local_lib ; then
 has_openhevc="yes"
 ohevc_ldflags="-L../../$local_lib $ohevc_ldflags"
 fi
@@ -1062,24 +1099,25 @@
 #include FT_OUTLINE_H
 int main( void ) { return 0; }
 EOF
+ft_cflags="-I$prefix/include "
+ft_lflags="-L$prefix/lib -lfreetype"
+if docc $CFLAGS_DIR $ft_cflags $ft_lflags $LDFLAGS ; then
+ has_ft="system"
+fi
 if test "$cross_prefix" = "" ; then
- ft_cflags="-I$prefix/include "
- ft_lflags="-L$prefix/lib -lfreetype"
- if $cc $CFLAGS_DIR -o $TMPO $TMPC $ft_cflags $ft_lflags $LDFLAGS 2> /dev/null ; then
- has_ft="system"
- else
- ft_cflags="`freetype-config --cflags 2> /dev/null`"
- ft_lflags="`freetype-config --libs 2> /dev/null`"
- if $cc -o $TMPO $TMPC $ft_cflags $ft_lflags $LDFLAGS 2> /dev/null ; then
+ if test "$has_ft" = "no" ; then
+ ft_cflags="`freetype-config --cflags 2>>$logs`"
+ ft_lflags="`freetype-config --libs 2>>$logs`"
+ if docc $ft_cflags $ft_lflags $LDFLAGS ; then
 has_ft="system"
 fi
 fi
 fi
 if test "$has_ft" = "no" ; then
- if test "`which freetype-config 2> /dev/null`" != ""; then
+ if test "`which freetype-config 2>>$logs`" != ""; then
 ft_cflags="-I$local_inc/freetype"
 ft_lflags="-L$local_lib -lfreetype"
- if $cc -o $TMPO $TMPC $ft_cflags $ft_lflags 2> /dev/null ; then
+ if docc $ft_cflags $ft_lflags ; then
 has_ft="local"
 fi
 fi
@@ -1103,7 +1141,7 @@
 LINK_SSL="-lssl -lcrypto"
 fi
 
-if $cc -o $TMPO $TMPC $LINK_SSL $LDFLAGS 2> /dev/null ; then
+if docc $LINK_SSL $LDFLAGS ; then
 has_ssl="yes"
 fi
 
@@ -1116,31 +1154,34 @@
 int main( void ) { return 0; }
 EOF
 
+if docc $LDFLAGS -ljpeg ; then
+	has_jpeg="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC $LDFLAGS -ljpeg 2> /dev/null ; then
- has_jpeg="system"
- elif test "$alt_macosx_dir" != "" ; then
- if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ljpeg 2> /dev/null ; then
- has_jpeg="system"
- fi
- elif test "`which $prefix/bin/jpeg-config 2> /dev/null`" != ""; then
- jpeg_cflags="`$prefix/bin/jpeg-config --cflags`"
- jpeg_lflags="`$prefix/bin/jpeg-config --libs`"
- if $cc -o $TMPO $TMPC $jpeg_cflags $jpeg_lflags $LDFLAGS 2> /dev/null ; then
- has_jpeg="system"
- fi
- else
- jpeg_cflags="-I$prefix/include"
- jpeg_lflags="-L$prefix/lib -ljpeg"
- if $cc -o $TMPO $TMPC $jpeg_cflags $jpeg_lflags $LDFLAGS 2> /dev/null ; then
- has_jpeg="system"
+ if test "$has_jpeg" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ljpeg 2>>$logs ; then
+ has_jpeg="system"
+ fi
+ elif test "`which $prefix/bin/jpeg-config 2>>$logs`" != ""; then
+ jpeg_cflags="`$prefix/bin/jpeg-config --cflags`"
+ jpeg_lflags="`$prefix/bin/jpeg-config --libs`"
+ if docc $jpeg_cflags $jpeg_lflags $LDFLAGS ; then
+ has_jpeg="system"
+ fi
+ else
+ jpeg_cflags="-I$prefix/include"
+ jpeg_lflags="-L$prefix/lib -ljpeg"
+ if docc $jpeg_cflags $jpeg_lflags $LDFLAGS ; then
+ has_jpeg="system"
+ fi
 fi
 fi
 fi
 if test "$has_jpeg" = "no" ; then
 jpeg_cflags="-I$local_inc/jpeg"
 jpeg_lflags="-L$local_lib -ljpeg"
- if $cc -o $TMPO $TMPC $jpeg_cflags $jpeg_lflags 2> /dev/null ; then
+ if docc $jpeg_cflags $jpeg_lflags ; then
 has_jpeg="local"
 fi
 fi
@@ -1154,18 +1195,21 @@
 int main( void ) { return 0; }
 EOF
 
+if docc $LDFLAGS -lopenjpeg ; then
+ has_openjpeg="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC $LDFLAGS -lopenjpeg 2> /dev/null ; then
- has_openjpeg="system"
- elif test "$alt_macosx_dir" != "" ; then
- if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ljpeg 2> /dev/null ; then
- has_openjpeg="system"
+ if test "$has_openjpeg" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ljpeg 2>>$logs ; then
+ has_openjpeg="system"
+ fi
 fi
 fi
 fi
 
 if test "$has_openjpeg" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg 2> /dev/null ; then
+ if docc -I$local_inc/openjpeg -L$local_lib -lopenjpeg ; then
 has_openjpeg="local"
 fi
 fi
@@ -1178,23 +1222,24 @@
 int main( void ) { return 0; }
 EOF
 
+png_cflags="-I$prefix/include"
+png_lflags="-L$prefix/lib -lpng -lz"
+if docc $png_cflags $png_lflags $LDFLAGS ; then
+ has_png="system"
+elif docc $LDFLAGS -lpng -lz ; then
+ has_png="system"
+fi
 if test "$cross_prefix" = "" ; then
- png_cflags="-I$prefix/include"
- png_lflags="-L$prefix/lib -lpng -lz"
- #-nostdlib prevents from searching standard compiler libraries
- #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null ; then
- if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null ; then
- has_png="system"
- elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null ; then
- has_png="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
- has_png="system"
+ if test "$has_png" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2>>$logs ; then
+ has_png="system"
+ fi
 fi
 fi
 fi
 if test "$has_png" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null ; then
+ if docc -I$local_inc/png -L$local_lib -lpng ; then
 has_png="local"
 fi
 fi
@@ -1207,17 +1252,20 @@
 int main( void ) { return 0; }
 EOF
 
+if docc $LDFLAGS -lmad ; then
+ has_mad="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC $LDFLAGS -lmad 2> /dev/null ; then
- has_mad="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lmad 2> /dev/null ; then
- has_mad="system"
+ if test "$has_mad" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lmad 2>>$logs ; then
+ has_mad="system"
+ fi
 fi
 fi
 fi
 if test "$has_mad" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc/mad -L$local_lib -lmad 2> /dev/null ; then
+ if docc -I$local_inc/mad -L$local_lib -lmad ; then
 has_mad="local"
 fi
 fi
@@ -1226,6 +1274,7 @@
 
 #look for A52DEC support
 cat > $TMPC << EOF
+#include <inttypes.h>
 #define uint32_t unsigned int
 #define uint8_t unsigned char
 #include <a52dec/mm_accel.h>
@@ -1233,17 +1282,20 @@
 int main( void ) { return 0; }
 EOF
 
+if docc $LDFLAGS -la52 ; then
+ has_a52="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC $LDFLAGS -la52 2> /dev/null ; then
- has_a52="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -la52 2> /dev/null ; then
- has_a52="system"
+ if test "$has_a52" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -la52 2>>$logs ; then
+ has_a52="system"
+ fi
 fi
 fi
 fi
 if test "$has_a52" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -la52 2> /dev/null ; then
+ if docc -I$local_inc -L$local_lib -la52 ; then
 has_a52="local"
 fi
 fi
@@ -1256,19 +1308,22 @@
 int main( void ) { return 0; }
 EOF
 
+if docc -I$prefix/include -L$prefix/lib $LDFLAGS -lxvidcore -lpthread ; then
+ has_xvid="system"
+elif docc $LDFLAGS -lxvidcore -lpthread ; then
+ has_xvid="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib $LDFLAGS -lxvidcore -lpthread 2> /dev/null ; then
- has_xvid="system"
- elif $cc -o $TMPO $TMPC $LDFLAGS -lxvidcore -lpthread 2> /dev/null ; then
- has_xvid="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lxvidcore -lpthread 2> /dev/null ; then
- has_xvid="system"
+ if test "$has_xvid" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lxvidcore -lpthread 2>>$logs ; then
+ has_xvid="system"
+ fi
 fi
 fi
 fi
 if test "$has_xvid" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc/xvid -L$local_lib -lxvidcore -lpthread 2> /dev/null ; then
+ if docc -I$local_inc/xvid -L$local_lib -lxvidcore -lpthread ; then
 has_xvid="local"
 fi
 fi
@@ -1281,17 +1336,20 @@
 int main( void ) { return 0; }
 EOF
 
+if docc $LDFLAGS -lfaad -lm ; then
+ has_faad="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC $LDFLAGS -lfaad -lm 2> /dev/null ; then
- has_faad="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lfaad 2> /dev/null ; then
- has_faad="system"
+ if test "$has_faad" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lfaad 2>>$logs ; then
+ has_faad="system"
+ fi
 fi
 fi
 fi
 if test "$has_faad" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc/faad -L$local_lib -lfaad -lm 2> /dev/null ; then
+ if docc -I$local_inc/faad -L$local_lib -lfaad -lm ; then
 has_faad="local"
 fi
 fi
@@ -1304,7 +1362,7 @@
 ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale -lavdevice $ffmpeg_extra_ldflags"
 
 if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
- if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil 2> /dev/null ; then
+ if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil ; then
 ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil libavdevice`
 ffmpeg_lflags=`$pkg_config --libs libavcodec libavformat libswscale libavutil libavdevice`
 has_ffmpeg="system"
@@ -1318,17 +1376,18 @@
 }
 EOF
 
-if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags $LDFLAGS 2> /dev/null ; then
+if docc $ffmpeg_cflags $ffmpeg_lflags $LDFLAGS ; then
 old_ffmpeg_inc="no"
 else
 old_ffmpeg_inc="yes"
 
 cat > $TMPC << EOF
 #include <ffmpeg/avcodec.h>
+#include <stdio.h>
 int main(void) {
 AVFrame *f1, *f2;
+ printf("ID %d", AV_CODEC_ID_H264);
 f2 = av_frame_clone(f1);
- AV_CODEC_ID_H264;
 return 0;
 }
 EOF
@@ -1337,29 +1396,37 @@
 
 cat > $TMPC << EOF
 #include <libavcodec/avcodec.h>
+#include <stdio.h>
 int main(void) {
- CODEC_ID_H264;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0 )
+ printf("ID %d", AV_CODEC_ID_H264);
+#else
+ printf("ID %d", CODEC_ID_H264);
+#endif
 return 0;
 }
 EOF
 
-if test "$cross_prefix" = "" ; then 
- if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib $ffmpeg_lflags $LDFLAGS 2> /dev/null ; then
- has_ffmpeg="system"
- ffmpeg_cflags="-I$prefix/include"
- ffmpeg_lflags="-L$prefix/lib $ffmpeg_lflags"
- elif $cc -o $TMPO $TMPC $ffmpeg_lflags $LDFLAGS 2> /dev/null ; then
- has_ffmpeg="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $ffmpeg_lflags $LDFLAGS 2> /dev/null ; then
- has_ffmpeg="system"
- ffmpeg_cflags="-I$alt_macosx_dir/include"
- ffmpeg_lflags="-L$alt_macosx_dir/lib $ffmpeg_lflags"
+if docc -I$prefix/include -L$prefix/lib $ffmpeg_lflags $LDFLAGS ; then
+ has_ffmpeg="system"
+ ffmpeg_cflags="-I$prefix/include"
+ ffmpeg_lflags="-L$prefix/lib $ffmpeg_lflags"
+elif docc $ffmpeg_lflags $LDFLAGS ; then
+ has_ffmpeg="system"
+fi
+if test "$cross_prefix" = "" ; then
+ if test "$has_ffmpeg" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $ffmpeg_lflags $LDFLAGS 2>>$logs ; then
+ has_ffmpeg="system"
+ ffmpeg_cflags="-I$alt_macosx_dir/include"
+ ffmpeg_lflags="-L$alt_macosx_dir/lib $ffmpeg_lflags"
+ fi
 fi
 fi
 fi
 if test "$has_ffmpeg" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib $ffmpeg_lflags 2> /dev/null ; then
+ if docc -I$local_inc -L$local_lib $ffmpeg_lflags ; then
 has_ffmpeg="local"
 ffmpeg_cflags="-I$local_inc"
 ffmpeg_lflags="-L$local_lib $ffmpeg_lflags"
@@ -1369,24 +1436,29 @@
 cat > $TMPC << EOF
 #include <libavutil/frame.h>
 #include <libavcodec/avcodec.h>
+#include <stdio.h>
 int main(void) {
- CODEC_ID_H264;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0 )
+ printf("ID %d", AV_CODEC_ID_H264);
+#else
+ printf("ID %d", CODEC_ID_H264);
+#endif
 return 0;
 }
 EOF
-if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then
+if docc $ffmpeg_cflags $ffmpeg_lflags ; then
 is_libav="no"
 else
 
 cat > $TMPC << EOF
 #include <libavcodec/avcodec.h>
 int main(void) {
- CODEC_ID_H264;
+ printf("ID %d", CODEC_ID_H264);
 return 0;
 }
 EOF
 
- if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then
+ if docc $ffmpeg_cflags $ffmpeg_lflags ; then
 is_libav="yes"
 else
 is_libav="new"
@@ -1398,11 +1470,12 @@
 #include "libavresample/avresample.h"
 int main(void) {
 AVAudioResampleContext *aresampler = avresample_alloc_context();
+ free(aresampler);
 return 0;
 }
 EOF
 
-if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags -lavresample 2> /dev/null ; then
+if docc $ffmpeg_cflags $ffmpeg_lflags -lavresample ; then
 has_libavresample="yes"
 else
 has_libavresample="no"
@@ -1414,7 +1487,7 @@
 freenect_ld="-lfreenect"
 has_freenect="no"
 if test "$pkg_config" != "no"; then
- if $pkg_config --exists libfreenect 2> /dev/null ; then
+ if $pkg_config --exists libfreenect ; then
 freenect_flags=`$pkg_config --cflags libfreenect`
 freenect_libs=`$pkg_config --libs libfreenect`
 has_freenect="system"
@@ -1429,19 +1502,22 @@
 int main( void ) { return 0; }
 EOF
 
+if docc $LDFLAGS -lfreenect ; then
+ has_freenect="system"
+fi
 if test "$cross_prefix" = "" ; then
- if $cc -o $TMPO $TMPC $LDFLAGS -lfreenect 2> /dev/null ; then
- has_freenect="system"
- elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lfreenect 2> /dev/null ; then
- has_freenect="system"
- freenect_flags=-I$alt_macosx_dir/include
- freenect_ld=-L$alt_macosx_dir/lib -lfreenect
+ if test "$has_freenect" = "no" ; then
+ if test "$alt_macosx_dir" != "" ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lfreenect 2>>$logs ; then
+ has_freenect="system"
+ freenect_flags=-I$alt_macosx_dir/include
+ freenect_ld=-L$alt_macosx_dir/lib -lfreenect
+ fi
 fi
 fi
 fi
 if test "$has_freenect" = "no" ; then
- if $cc -o $TMPO $TMPC -I$local_inc/freenect -L$local_lib -lfreenect 2> /dev/null ; then
+ if docc -I$local_inc/freenect -L$local_lib -lfreenect ; then
 has_freenect="local"
 freenect_flags=-I$local_inc/freenect
 freenect_ld=-L$local_lib -lfreenect
@@ -1457,13 +1533,13 @@
 int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPC $LDFLAGS -lvorbis 2> /dev/null ; then
+if docc $LDFLAGS -lvorbis ; then
 has_vorbis="system"
 elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lvorbis 2> /dev/null ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lvorbis 2>>$logs ; then
 has_vorbis="system"
 fi
-elif $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lvorbis -lm 2> /dev/null ; then
+elif docc -I$local_inc -L$local_lib -lvorbis -lm ; then
 has_vorbis="local"
 fi
 
@@ -1475,13 +1551,13 @@
 int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPC $LDFLAGS -ltheora 2> /dev/null ; then
+if docc $LDFLAGS -ltheora ; then
 has_theora="system"
 elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ltheora -logg 2> /dev/null ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ltheora -logg 2>>$logs ; then
 has_theora="system"
 fi
-elif $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -ltheora -logg -lm 2> /dev/null ; then
+elif docc -I$local_inc -L$local_lib -ltheora -logg -lm ; then
 has_theora="local"
 fi
 
@@ -1493,13 +1569,13 @@
 int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPC $LDFLAGS -logg 2> /dev/null ; then
+if docc $LDFLAGS -logg ; then
 has_ogg="system"
 elif test "$alt_macosx_dir" != "" ; then
- if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -logg 2> /dev/null ; then
+ if docc -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -logg 2>>$logs ; then
 has_ogg="system"
 fi
-elif $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -logg -lm 2> /dev/null ; then
+elif docc -I$local_inc -L$local_lib -logg -lm ; then
 has_ogg="local"
 else
 has_vorbis=no
@@ -1516,7 +1592,7 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc -o $TMPO $TMPC -DLIBOSS_INTERNAL -I$alt_macosx_dir/include/ -I$alt_macosx_dir/include/liboss -L$alt_macosx_dir/lib -loss $LDFLAGS 2> /dev/null ; then
+ if docc -DLIBOSS_INTERNAL -I$alt_macosx_dir/include/ -I$alt_macosx_dir/include/liboss -L$alt_macosx_dir/lib -loss $LDFLAGS 2>>$logs ; then
 has_oss_audio="yes"
 OSS_CFLAGS="-DLIBOSS_INTERNAL -I$alt_macosx_dir/include/ -I$alt_macosx_dir/include/liboss"
 OSS_LDFLAGS="-L$alt_macosx_dir/lib -loss"
@@ -1532,7 +1608,7 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc -o $TMPO $TMPC 2> /dev/null ; then
+ if docc ; then
 has_oss_audio="yes"
 else
 cat > $TMPC << EOF
@@ -1543,7 +1619,7 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc -o $TMPO $TMPC $LDFLAGS 2> /dev/null ; then
+ if docc $LDFLAGS ; then
 has_oss_audio="yes"
 fi
 fi
@@ -1557,7 +1633,7 @@
 wx_too_old="no"
 
 if test "$cross_prefix" = "" ; then
- if type wx-config >/dev/null 2>&1; then
+ if type wx-config >/dev/null 2>>$logs; then
 
 wx_version=`wx-config --version | sed 's/[^0-9]//g'`
 
@@ -1585,7 +1661,7 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc $wx_cflags -o $TMPO $TMPCXX $wx_lflags > /dev/null 2>&1 ; then
+ if $cc $wx_cflags -o $TMPO $TMPCXX $wx_lflags > /dev/null 2>>$logs ; then
 wx_version=`wx-config --version | sed 's/[^0-9]//g'`
 if test "$wx_version" -lt 254 ; then
 wx_too_old="yes"
@@ -1599,6 +1675,7 @@
 
 #look for IPv6
 cat > $TMPC << EOF
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -1608,11 +1685,14 @@
 struct ipv6_mreq mreq6;
 getaddrinfo(0,0,0,0);
 getnameinfo(0,0,0,0,0,0,0);
+memset(&saddr, 0, sizeof(saddr));
+memset(&mreq6, 0, sizeof(mreq6));
 IN6_IS_ADDR_MULTICAST( (struct in6_addr *) 0);
+return 0;
 }
 EOF
 
-if $cc -o $TMPE $TMPC $LDFLAGS $extralibs > /dev/null 2>&1 ; then
+if docc $LDFLAGS $extralibs ; then
 has_ipv6="yes"
 fi
 
@@ -1626,7 +1706,7 @@
 }
 EOF
 
-if $cc -o $TMPE $TMPC $LDFLAGS > /dev/null 2>&1 ; then
+if docc $LDFLAGS ; then
 has_dvb4linux="yes"
 fi
 
@@ -1638,10 +1718,11 @@
 #include <xmlrpc-c/server.h>
 #include <xmlrpc-c/server_abyss.h>
 int main( void ) {
+return 0;
 }
 EOF
 
-if $cc -o $TMPE $TMPC $LDFLAGS > /dev/null 2>&1 ; then
+if docc $LDFLAGS ; then
 has_xmlrpc="yes"
 fi
 
@@ -1651,10 +1732,11 @@
 cat > $TMPC << EOF
 #include <alsa/asoundlib.h>
 int main( void ) {
+return 0;
 }
 EOF
 
-if $cc -o $TMPE $TMPC $LDFLAGS > /dev/null 2>&1 ; then
+if docc $LDFLAGS ; then
 has_alsa="yes"
 fi
 
@@ -1664,10 +1746,11 @@
 cat > $TMPC << EOF
 #include <pulse/pulseaudio.h>
 int main( void ) {
+return 0;
 }
 EOF
 
-if $cc -o $TMPE $TMPC $LDFLAGS > /dev/null 2>&1 ; then
+if docc $LDFLAGS ; then
 has_pulseaudio="yes"
 fi
 
@@ -1677,9 +1760,10 @@
 cat > $TMPC << EOF
 #include <jack/jack.h>
 int main( void ) {
+return 0;
 }
 EOF
-if $cc -o $TMPE $TMPC $LDFLAGS > /dev/null 2>&1 ; then
+if docc $LDFLAGS ; then
 has_jack="yes"
 fi
 
@@ -1692,7 +1776,7 @@
 EOF
 directfb_inc="/usr/include/directfb"
 directfb_lib="-ldirectfb -lfusion -ldirect"
-if $cc -o $TMPO $TMPC -I$directfb_inc -L$directfb_lib $LDFLAGS 2> /dev/null ; then
+if docc -I$directfb_inc -L$directfb_lib $LDFLAGS ; then
 has_directfb="yes"
 fi
 
@@ -1704,7 +1788,7 @@
 int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS 2> /dev/null ; then
+if docc -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS ; then
 has_x11="yes"
 
 #look for X11 shared memory support
@@ -1716,7 +1800,7 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS 2> /dev/null ; then
+ if docc -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS ; then
 has_x11_shm="yes"
 fi
 
@@ -1728,7 +1812,7 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS 2> /dev/null ; then
+ if docc -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS ; then
 has_x11_xv="yes"
 fi
 
@@ -1783,6 +1867,8 @@
 ;;
 --disable-oss-audio) has_oss_audio="no"
 ;;
+ --disable-x11) has_x11="no"
+ ;;
 --disable-x11-shm) has_x11_shm="no"
 ;;
 --disable-x11-xv) has_x11_xv="no"
@@ -1791,9 +1877,7 @@
 ;;
 --strip) INSTFLAGS="-s $INSTFLAGS"
 ;;
- --std-allocator) use_std_alloc="yes"
- ;;
- --track-memory) use_memory_tracking="yes"
+ --enable-mem-track) use_memory_tracking="yes"
 ;;
 --enable-tinygl) enable_tinygl="yes"
 ;;
@@ -1850,12 +1934,12 @@
 echo 
 fi
 fi
-				has_zlib=$tmp_has_zlib
-			elif test "$tmp_has_zlib" = "no" ; then
-				echo 
-				echo "WARNING!! : you have forced not to use ZLIB. This will disable some core functionalities of GPAC."
-				echo 
-				has_zlib="force-no"
+ has_zlib=$tmp_has_zlib
+ elif test "$tmp_has_zlib" = "no" ; then
+ echo 
+ echo "WARNING!! : you have forced not to use ZLIB. This will disable some core functionalities of GPAC."
+ echo 
+ has_zlib="force-no"
 fi
 ;;
 --use-ogg=*) has_ogg=${opt#--use-ogg=}
@@ -2067,6 +2151,10 @@
 esac
 done
 
+#always force static modules when static build is used, we cannot have one exe with libgpac_static using a module with libgpac dynamic, this would cause bugs with gf_sys_init()
+if test "$static_build" = "yes"; then
+static_modules="yes"
+fi
 
 
 if test "$disable_core_tools" = "no"; then
@@ -2119,9 +2207,9 @@
 else
 LINK3D="-lGL -lGLU -lX11"
 fi
- if $cc -o $TMPO $TMPC $LINK3D $LDFLAGS 2> /dev/null ; then
+ if docc $LINK3D $LDFLAGS ; then
 has_opengl="yes"
- elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS 2> /dev/null ; then
+ elif docc -I$X11_PATH/include -L$X11_PATH/lib $LDFLAGS ; then
 has_opengl="yes"
 INCL3D="-I$X11_PATH/include"
 LINK3D="-L$X11_PATH/lib $LINK3D"
@@ -2133,11 +2221,11 @@
 
 cat > $TMPC << EOF
 #include <GL/gl.h>
-int main( void ) { int a ; a = TINYGL ; }
+int main( void ) { int a ; a = TINYGL ; return 0;}
 EOF
 
 if test "$enable_tinygl" = "yes" ;then
- if $cc -o $TMPO $TMPC $LDFLAGS -lTinyGL 2> /dev/null ; then
+ if docc $LDFLAGS -lTinyGL ; then
 has_tinygl="yes"
 has_opengl="yes"
 LINK3D="-lTinyGL"
@@ -2152,15 +2240,15 @@
 int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPCXX -I$xulsdk_path $LDFLAGS 2> /dev/null ; then
+if docxx -I$xulsdk_path $LDFLAGS ; then
 has_xul="system"
 xul_flags="-I$xulsdk_path $xul_flags"
 fi
 
 if test "$pkg_config" != "no"; then
 if test "$has_xul" = "no" ; then
- if $pkg_config --exists libxul 2> /dev/null ; then
- if $cxx -o $TMPO $TMPCXX `$pkg_config --cflags libxul` `$pkg_config --libs libxul` ; then
+ if $pkg_config --exists libxul 2>>$logs ; then
+ if docxx -o $TMPO $TMPCXX `$pkg_config --cflags libxul` `$pkg_config --libs libxul` ; then
 has_xul="system"
 xul_flags="`$pkg_config --cflags libxul` `$pkg_config --libs libxul`" 
 fi
@@ -2169,13 +2257,13 @@
 fi
 
 if test "$has_xul" = "no" ; then
- if $cc -o $TMPO $TMPCXX $xul_flags -I$local_inc/gecko-sdk/include $LDFLAGS 2> /dev/null ; then
+ if docxx $xul_flags -I$local_inc/gecko-sdk/include $LDFLAGS ; then
 has_xul="local"
 xul_flags="-I$local_inc/gecko-sdk/include $xul_flags"
 else
 #xulrunner directories are sometimes included through js/xul/ff packages
 if test ! "$has_js" = "no" -a ! "$has_js" = "local" ; then
- if $cc -o $TMPO $TMPCXX $js_flags $js_lib_pkg $LDFLAGS 2> /dev/null ; then
+ if docxx $js_flags $js_lib_pkg $LDFLAGS ; then
 if test "$mozjs_pkgcfg" != "no" ; then
 xul_flags=`$pkg_config --cflags $mozjs_pkgcfg`
 has_xul="$has_js"
@@ -2193,7 +2281,7 @@
 int main( void ) { return 0; }
 EOF
 if test "$enable_joystick" = "yes" ;then
- if $cc -o $TMPO $TMPC $LDFLAGS 2> /dev/null ; then
+ if docc $LDFLAGS ; then
 has_joystick="yes"
 fi
 fi
@@ -2210,11 +2298,11 @@
 int main( void ) { return 0; }
 EOF
 
- if $cc -o $TMPO $TMPC $LDFLAGS 2> /dev/null ; then
+ if docc $LDFLAGS ; then
 has_mingw_directx="yes"
 else
 dx_path="$dxsdk_path"
- if $cc -o $TMPO $TMPC -I$dxsdk_path/include -L$dxsdk_path/lib -lddraw 2> /dev/null ; then
+ if docc -I$dxsdk_path/include -L$dxsdk_path/lib -lddraw ; then
 has_mingw_directx="yes"
 fi
 fi
@@ -2235,7 +2323,7 @@
 
 
 #if test "$cross_prefix" = "" ; then
- if type $sdl_config >/dev/null 2>&1; then
+ if type $sdl_config >/dev/null 2>>$logs; then
 
 cat > $TMPC << EOF
 #include <SDL.h>
@@ -2250,7 +2338,7 @@
 fi
 sdl_cflags=`$sdl_config --cflags`
 
- if $cc -o $TMPO $sdl_cflags $TMPC $LDFLAGS $sdl_lib_flags > /dev/null 2>&1 ; then
+ if docc $sdl_cflags $LDFLAGS $sdl_lib_flags ; then
 _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
 if test "$_sdlversion" -lt 121 ; then
 sdl_too_old=yes
@@ -2270,7 +2358,7 @@
 fi
 
 if test "$cross_prefix" = "" ; then
- if type $sdl_config >/dev/null 2>&1; then
+ if type $sdl_config >/dev/null 2>>$logs; then
 
 cat > $TMPC << EOF
 #include <SDL.h>
@@ -2285,7 +2373,7 @@
 fi
 sdl_cflags=`$sdl_config --cflags`
 
- if $cc -o $TMPO $sdl_cflags $TMPC $LDFLAGS $sdl_lib_flags > /dev/null 2>&1 ; then
+ if docc $sdl_cflags $LDFLAGS $sdl_lib_flags ; then
 _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
 if test "$_sdlversion" -lt 121 ; then
 sdl_too_old=yes
@@ -2312,7 +2400,7 @@
 }
 EOF
 
- if $cc -o $TMPO $TMPC $LDFLAGS 2>/dev/null ; then
+ if docc $LDFLAGS 2>>$logs ; then
 $TMPO && bigendian="yes"
 else
 echo big/little endian test failed
@@ -2327,7 +2415,9 @@
 
 fi
 
-
+if test "$debuginfo" = "no"; then
+ CFLAGS="$CFLAGS -DNDEBUG"
+fi
 
 #man dir
 if test x"$mandir" = x""; then
@@ -2355,7 +2445,7 @@
 has_openhevc="no"
 has_freenect="no"
 has_platinum="no"
- disable_player="yes"
+ static_build="yes"
 fi
 
 if test "$cpu" = "sh4"; then
@@ -2367,45 +2457,45 @@
 fi
 
 if test "$disable_player" = "yes" ; then
-disable_scenegraph="yes"
+ disable_scenegraph="yes"
 fi
 
 if test "$disable_scenegraph" = "yes" ; then
-disable_3d="yes"
-disable_svg="yes"
-disable_vrml="yes"
-disable_x3d="yes"
-disable_bifs="yes"
-disable_bifs_enc="yes"
-disable_laser="yes"
-disable_seng="yes"
-disable_qtvr="yes"
-disable_swf="yes"
-disable_scene_stats="yes"
-disable_scene_dump="yes"
-disable_scene_encode="yes"
-disable_loader_isoff="yes"
-disable_loader_bt="yes"
-disable_loader_xmt="yes"
-disable_streaming="yes"
-disable_player="yes"
-disable_smgr="yes"
-has_js="no"
+ disable_3d="yes"
+ disable_svg="yes"
+ disable_vrml="yes"
+ disable_x3d="yes"
+ disable_bifs="yes"
+ disable_bifs_enc="yes"
+ disable_laser="yes"
+ disable_seng="yes"
+ disable_qtvr="yes"
+ disable_swf="yes"
+ disable_scene_stats="yes"
+ disable_scene_dump="yes"
+ disable_scene_encode="yes"
+ disable_loader_isoff="yes"
+ disable_loader_bt="yes"
+ disable_loader_xmt="yes"
+ disable_streaming="yes"
+ disable_player="yes"
+ disable_smgr="yes"
+ has_js="no"
 fi
 
 if test "$disable_mpd" = "yes"; then
-disable_dash="yes"
+ disable_dash="yes"
 fi
 
 if test "$disable_od_parse" = "yes" ; then
-disable_loader_isoff="yes"
-disable_loader_bt="yes"
-disable_loader_xmt="yes"
+ disable_loader_isoff="yes"
+ disable_loader_bt="yes"
+ disable_loader_xmt="yes"
 fi
 
 if test "$disable_parsers" = "yes" ; then
-has_jpeg="no"
-has_png="no"
+ has_jpeg="no"
+ has_png="no"
 fi
 
 #prepare for config.h writing
@@ -2416,24 +2506,15 @@
 echo "#define GPAC_CONFIGURATION \"$GPAC_CONFIGURATION\"" >> $TMPH
 
 version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/version.h\" | cut -d '"' -f 2`"
-version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/version.h | sed -e 's/.*$[0-9]$\+$/\1/'`
-version_minor=`grep '#define GPAC_VERSION_MINOR ' $source_path/include/gpac/version.h | sed -e 's/.*$[0-9]$\+$/\1/'`
-version_micro=`grep '#define GPAC_VERSION_MICRO ' $source_path/include/gpac/version.h | sed -e 's/.*$[0-9]$\+$/\1/'`
+version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/version.h | sed 's/[^0-9]*//g'`
+version_minor=`grep '#define GPAC_VERSION_MINOR ' $source_path/include/gpac/version.h | sed 's/[^0-9]*//g'`
+version_micro=`grep '#define GPAC_VERSION_MICRO ' $source_path/include/gpac/version.h | sed 's/[^0-9]*//g'`
 soname_version="${version_major}.${version_minor}.${version_micro}"
 
-if [ -d ".svn" ]; then
- if which svnversion 2> /dev/null
- then
- revision="`svnversion \"$source_path\"`"
- echo "#define GPAC_SVN_REVISION	\"$revision\"" > $source_path/include/gpac/revision.h
- else
- echo "Cannot find SVN revision"
- fi
-else
- if [ ! -e "$source_path/include/gpac/revision.h" ]; then
- echo "#define GPAC_SVN_REVISION	\"4065\"" > $source_path/include/gpac/revision.h
- fi
-fi
+#check revision.h
+cd $source_path
+./check_revision.sh
+cd $build_path
 
 echo ""
 echo "** System Configuration"
@@ -2453,7 +2534,6 @@
 echo "GProf enabled: $gprof_build"
 echo "Static build enabled: $static_build"
 echo "Memory tracking enabled: $use_memory_tracking"
-echo "Use standard memory allocator: $use_std_alloc"
 echo "Fixed-Point Version: $use_fixed_point"
 echo "IPV6 Support: $has_ipv6"
 echo "Static Modules: $static_modules"
@@ -2677,10 +2757,12 @@
 echo "Jack Audio: $has_jack"
 echo "PulseAudio Audio: $has_pulseaudio"
 echo "DirectFB support: $has_directfb"
- echo "X11 Shared Memory support: $has_x11_shm (path: $X11_PATH)"
- echo "X11 XVideo support: $has_x11_xv"
-fi
 
+ if test "$has_x11" != "no" ; then
+ echo "X11 Shared Memory support: $has_x11_shm (path: $X11_PATH)"
+ echo "X11 XVideo support: $has_x11_xv"
+ fi
+fi
 echo "SDL Support: $has_sdl"
 if test "$sdl_too_old" = "yes" ; then
 echo "SDL Version too old - please upgrade for SDL support"
@@ -2772,12 +2854,6 @@
 fi
 
 echo ""
-if test "$use_memory_tracking" = "yes"; then
- echo "!! WARNING: GPAC Memory tracking is enabled !!"
- echo "!! This may corrupt third-party tools using libgpac !!"
- echo "!! Use at your own risk, and only for GPAC benchmarking !!"
- echo ""
-fi
 
 #needs gmon for win32 gprof
 if test "$gprof_build" = "yes"; then
@@ -2870,9 +2946,10 @@
 fi
 
 if test "$use_memory_tracking" = "yes"; then
- echo "#define GPAC_MEMORY_TRACKING" >> $TMPH
-elif test "$use_std_alloc" = "yes"; then 
- echo "#define GPAC_STD_ALLOCATOR" >> $TMPH
+ echo "#define GPAC_MEMORY_TRACKING" >> $TMPHz
+ if test "$cygwin" = "yes" ; then
+		echo "#define GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE" >> $TMPHz
+ fi
 fi
 
 
@@ -2911,9 +2988,11 @@
 
 if test "$win32" = "no" ; then
 echo "GPAC_SH_FLAGS=$GPAC_SH_FLAGS" >> config.mak
+ echo "EXE_SUFFIX=" >> config.mak
 echo "DYN_LIB_SUFFIX=$DYN_LIB_SUFFIX" >> config.mak
 else
- echo "DYN_LIB_SUFFIX=dll" >> config.mak
+ echo "EXE_SUFFIX=.exe" >> config.mak
+ echo "DYN_LIB_SUFFIX=.dll" >> config.mak
 fi
 
 
@@ -3016,6 +3095,7 @@
 echo "DISABLE_OD_PARSE=$disable_od_parse" >> config.mak
 echo "MINIMAL_OD=$disable_od" >> config.mak
 echo "DISABLE_ISOM_ADOBE=$disable_isoff_hds" >> config.mak
+echo "DISABLE_VRML=$disable_vrml" >> config.mak
 
 if test "$disable_parsers" = "yes" ; then
 disable_m2ts_mux="yes"
@@ -3063,6 +3143,7 @@
 echo "CONFIG_AMR_WB_FT=$has_amr_wb" >> config.mak
 echo "DEBUGBUILD=$debuginfo" >> config.mak
 echo "GPROFBUILD=$gprof_build" >> config.mak
+echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
 echo "STATICBUILD=$static_build" >> config.mak
 
 echo "CONFIG_IPV6=$has_ipv6" >> config.mak
@@ -3152,8 +3233,6 @@
 fi
 echo "X11_INC_PATH=$X11_PATH/include" >> config.mak
 
-echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
-
 echo "RENOIR_ENABLE=$enable_renoir" >> config.mak
 
 GPAC_ENST_INC=no
@@ -3166,10 +3245,11 @@
 cat > $TMPC << EOF
 #include <iconv.h>
 int main( void ) {
+return 0;
 }
 EOF
 
- if $cc -o $TMPE $TMPC -L$local_lib -liconv > /dev/null 2>&1 ; then
+ if docc -L$local_lib -liconv ; then
 GPAC_ENST=yes
 echo "LIBGPAC_ENST=`cd src; ls enst/*.c | sed -e 's/\.c/.o/' | tr -s '\r\n' ' ' ; cd ..`" >> config.mak
 else
@@ -3194,6 +3274,7 @@
 mkdir -p "$dir"
 done
 ln -sf "$source_path/Makefile" Makefile
+ ln -sf "$source_path/static.mak" static.mak
 ln -sf "$source_path/src/Makefile" src/Makefile
 
 mkdir -p applications
@@ -3215,7 +3296,7 @@
 ln -sf "$source_path/modules/Makefile" modules/Makefile
 
 for dir in $MOD_DIRS ; do
- if ls "$source_path/$dir/Makefile" > /dev/null 2>&1; then
+ if [ -f "$source_path/$dir/Makefile" ]; then
 mkdir -p "$dir"
 ln -sf "$source_path/$dir/Makefile" "$dir/Makefile"
 fi
@@ -3233,6 +3314,7 @@
 fi
 
 echo "SRC_PATH=$source_path" >> config.mak
+echo "BUILD_PATH=$build_path" >> config.mak
 echo "LOCAL_INC_PATH=$local_inc" >> config.mak
 
 
@@ -3247,6 +3329,7 @@
 echo "config.h is unchanged"
 fi
 
+echo "Check config.log for detection failures"
 
 rm -f $TMPO $TMPC $TMPE $TMPS $TMPCXX $TMPH

v0.5.2.tar.gz/debian/changelog -> v0.6.1.tar.gz/debian/changelog Changed

v0.5.2.tar.gz/debian/docs -> v0.6.1.tar.gz/debian/docs Changed

v0.5.2.tar.gz/debian/gpac.install -> v0.6.1.tar.gz/debian/gpac.install Changed

v0.5.2.tar.gz/debian/rules -> v0.6.1.tar.gz/debian/rules Changed

v0.5.2.tar.gz/doc/configuration.html -> v0.6.1.tar.gz/doc/configuration.html Changed

@@ -1,896 +1,962 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<title>GPAC Configuration documentation </title>
-</head>
-
-
- 
-GPAC Configuration file documentation Version 0.5.0
- 
-Last Modified $LastChangedDate$
-
-
- 
-
-<a name="Overview"></a>Overview
-
-Some applications in the GPAC framework use a configuration file shared among modules and reloadable at run time. Modules may use the configuration file as well (to avoid multiple config files). This doc attempts to provide explanations for the different options.
- 
-The config file is based on the win32 .ini file model, thus is ordered by sections and keys.
- A section is declared as SectionName. Defined sections are:
- 
-<a href="#General" style="text-decoration: underline;">General</a>
-<a href="#RecentFiles" style="text-decoration: underline;">RecentFiles</a>
-<a href="#Systems" style="text-decoration: underline;">Systems</a>
-<a href="#Compositor" style="text-decoration: underline;">Compositor</a>
-<a href="#Audio" style="text-decoration: underline;">Audio</a>
-<a href="#Video" style="text-decoration: underline;">Video</a>
-<a href="#Network" style="text-decoration: underline;">Network</a>
-<a href="#FontEngine" style="text-decoration: underline;">FontEngine</a>
-<a href="#Downloader" style="text-decoration: underline;">Downloader</a>
-<a href="#HTTPProxy" style="text-decoration: underline;">HTTPProxy</a>
-<a href="#Streaming" style="text-decoration: underline;">Streaming</a>
-<a href="#MimeTypes" style="text-decoration: underline;">MimeTypes</a>
-<a href="#StreamingCache" style="text-decoration: underline;">StreamingCache</a>
-<a href="#SAXLoader" style="text-decoration: underline;">SAXLoader</a>
-<a href="#XviD" style="text-decoration: underline;">XviD</a>
-<a href="#FFMPEG" style="text-decoration: underline;">FFMPEG</a>
-<a href="#ISOReader" style="text-decoration: underline;">ISOReader</a>
-<a href="#DVB" style="text-decoration: underline;">DVB</a>
-<a href="#DASH" style="text-decoration: underline;">DASH</a>
-<a href="#ALSA" style="text-decoration: underline;">ALSA</a>
-<a href="#SHORTCUTS" style="text-decoration: underline;">Shortcuts</a>
-<a href="#DSMCC" style="text-decoration: underline;">DSMCC</a>
-<a href="#OpenHEVC" style="text-decoration: underline;">OpenHEVC</a>
-<a href="#DirectFB" style="text-decoration: underline;">DirectFB</a>
-<a href="#DektecVideo" style="text-decoration: underline;">DektecVideo</a>
-
-
- 
-A key is declared as keyName=value. The key value is not interpreted and always handled as ASCII text.
- 
-<ul>
-<li>
-On Windows plateforms, this config file is called "GPAC.cfg" and is usually located in C:\\Program Files\\GPAC. Note that Osmo4 will always create a config file in its own directory when none is found.
- 
-</li>
-<li>
-On Windows CE plateform, this config file is called "GPAC.cfg" and is usually located in \\Program Files\\GPAC. Note that Osmo4 / CE will always create a config file in its own directory when none is found.
- 
-</li>
-<li>
-On GNU/Linux plateforms, this config file is called ".gpacrc" and is always located at the root of the user home directory (for ex, /home/jean/.gpacrc).
- 
-</li>
-</ul>
- 
-
- Note on module names:
- Module names as given in the config file are names exported by each interface and not name of the physical library file (.dll, .so, ...). The physical file name can however be used to identify a module - it will then be replaced by the module name.
-
- 
- 
-
-<a name="General"></a>
-Section "General" <a href="#Overview">Back to top</a>
-
-The General section of the config file holds player specific options.
-
-ModulesDirectory [value: path to directory]
-
-Specifies the path to modules directory. The MPEG-4 Systems engine cannot be loaded without modules. This option is used by GPAC clients on all platforms.
-
-CacheDirectory [value: path to storage directory]
-
-Specifies location of temp files. The user must have write access to this location. Although not used by applications, this is used by several modules.
-
-StartupFile [value: filename]
-
-Specifies file to load upon startup of most clients (Osmo4/MP4Client). If not specified, no file is loaded.
-
-
-LogFile [value: filename]
-
-Specifies where to output GPAC's log. By default, the logs are written to stdout. Note that GPAC may be compiled without log support. This is not used by MP4Client.
-
-Logs [value: tool[:tool]@level:tool[:tool]@level]
-
-Specifies log level for each tool. By default, only errors are logged. Available levels are:
-<ul>
-<li>quiet : no logging is performed on the tool</li>
-<li>error : only errors are logged</li>
-<li>warning : warnings are also logged.</li>
-<li>info : information messages are also logged</li>
-<li>debug : debug messages are also logged</li>
-</ul>
- 
-Available tools are:
-<ul>
-<li>core : libgpac core</li>
-<li>coding : bitstream formats (audio, video, scene)</li>
-<li>container : container formats (ISO File, MPEG-2 TS, AVI, ...)</li>
-<li>network : network data exept RTP trafic</li>
-<li>rtp : rtp, rtcp and rtsp trafic</li>
-<li>author : authoring tools (hint, import, export)</li>
-<li>sync : terminal sync layer</li>
-<li>codec : terminal codec messages</li>
-<li>parser : scene parsers (svg, xmt, bt) and other</li>
-<li>media : terminal media object management</li>
-<li>scene : scene graph and scene manager</li>
-<li>script : scripting engine messages</li>
-<li>interact : user interaction messages</li>
-<li>compose : composition engine (events, etc)</li>
-<li>cache : HTTP cache</li>
-<li>mmio : Audio/Video HW I/O management</li>
-<li>rti : Run-time info (CPU, mem, ...)</li>
-<li>smil : SMIL timing and animation</li>
-<li>memory : GPAC memory tracker</li>
-<li>audio : Audio renderer and mixers</li>
-<li>module : used by some modules</li>
-<li>mutex : mutex information</li>
-<li>console : console messages, such as script alert() and error notifications</li>
-</ul>
-
-
-
- 
-
-
-Options defined for Osmo4 (Windows version and wxWidgets version): 
-Loop [value: "yes" "no"]
-
-Specifies whether the presentation has to be restarted when done playing.
-
-ConsoleOff [value: "yes" "no"]
-
-Specifies whether application messages (script, buffering, download progress) are displayed in the console or not.
-
-SingleInstance [value: "yes", "no"]
-
-Specifies if the player should be a single instance application or not (Osmo4-Win32 only).
-
-LookForSubtitles [value: "yes" "no"]
-
-Specifies if Osmo4 shall look for subtitle files when opening a presentation.
-
-ViewXMT [value: "yes" "no"]
-
-Specifies if scene dumping shall be done in XML (XMT, X3D) or in VRML-like syntax (BT, WRL).
-
-ConfigPanel [value: positive integer]
-
-Specifies the latest config panel selected by user.
-
-NoMIMETypeFetch [value: "yes", "no"]
-
-Specifies if the player has to check for mime type when following hyperlinks, or only follow links of known extensions.
-
-Loop [value: "yes", "no"]
-
-Specifies if the playlist shall be restarted when playback is over.
-
-PLEntry [value: positive integer]
-
-Indicates active playlist entry when player was last closed. Playlist backup is:
-
-<ul>
-<li>"gpac_pl.m3u" on win32 platforms, stored in same directory as application</li>
-<li>".gpac_pl.m3u" on other platforms, stored in user home directory</li>
-</ul>
-FillScreen [value: "yes", "no"]
-
-Specifies if the display area shall fill all available space on screen. WindowsMobile/Symbian only
-
-DisableBackLight [value: "yes", "no"]
-
-Specifies if the screen backlighting shall be disabled while playing. WindowsMobile/Symbian only
-
-LastWorkingDir [value: "yes", "no"]
-
-Specifies the directory of the last local file opened. Smartphone Windows only
-
-Browser [value: string]
-
-Specifies prefered browser for WWW anchors and scene graph viewing - Only used by Osmo4/wxWidgets.
-
-
-<a name="RecentFiles"></a>
-Section "RecentFiles" <a href="#Overview">Back to top</a>
-
-The "RecentFiles" section of the config file holds last accessed files (hardcoded to no more than 20) in the last access order. The keys are
-the file names and no value is used. This section is only used by GUI clients (osmo4/wxOsmo4)
-
-
-<a name="Systems"></a>
-Section "Systems" <a href="#Overview">Back to top</a>
-
-The "Systems" section of the config file holds all configuration options for the MPEG-4 Systems engine.
-
-LanguageName [value: string]
-
-Specifies the user prefered language in readable english. This is used to select streams in case of alternate content in an audio object.
-
-Language3CC [value: 3-char code from ISO 639-2]
-
-Specifies the user prefered language as expressed in ISO 639-2. This is used to select streams in case of alternate content in an audio object.
-
-Language2CC [value: 2-char code from ISO 639-1]
-
-Specifies the user prefered language as expressed in ISO 639-1. This is used to select streams in case of alternate content in an audio object.
-
-DrawLateFrames [value: "yes" "no"]
-
-If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) untill the decoder output is back in sync. This is by default on to keep better testing heavy content or slow renderers, but should be set to off when needing a better sync or monitoring skipped frames.
-
-ForceSingleClock [value: "yes" "no"]
-
-One big problem with MP4 files is that the notion of "duration" has been unclear for a long time, and most content available (audio-video files) specifiy a 
-wrong BIFS duration. In such a case the movie cannot be controled/seeked into. Another problem with ISMA streaming is that BIFS/OD don't use the same clock as 
-audio/video, thus seeking the main timeline does not seek AV media. Setting the ForceSingleClock will handle both cases by using a single timeline for all media 
-streams and setting the duration to the one of the longest stream.
-
-ThreadingPolicy [value: "Free" "Single" "Multi"]
-
-Specifies how media decoders are to be threaded. "Free" lets decoders decide of their threading, "Single" means that all decoders are managed in a single thread performing scheduling and priority
-handling and "Multi" means that each decoder runs in its own thread.
-
-Priority [value: "low" "normal" "high" "real-time"]
-
-Specifies the priority of the decoders (priority is applied to decoder thread(s) regardless of threading mode).
-
-TimeSlice [value: unsigned integer]
-
-Specifies the target maximum time (in ms) of one cycle of the media manager (the media manager will attempts to call all the active decoders within this time. Depending on the threading mode this option can be ignored;
-
-ModuleUnload [value: "yes" "no"]
-
-Specifies whether modules should be unloaded if not used or not. Default: "yes".
-
-ResyncLateClock [value: unsigned integer]
-
-Specifies the threshold after which late clocks are resynchronized to timestamps for OCR streams. By default, no threashold (0) is used and clocks are never resynchronized. This allows to 
-resync clocks to the media owning the clock when the decoding is really too slow, and should only be used for debugging purposes.
-
-NoVisualThread [value: "yes" "no"]
-
-Specifies whether the visual rendering is done in the main codec manager or in a dedicated thread.
-
-DefAudioDec , DefVideoDec and DefImageDec [value: string]
-
-Specifies which module to use by default for audio/video/image decoding. The string is the name of the module to be used (same considerations as other modules, cf introduction).
-
-codec_XX_XX [value: string]
-
-Allows to specify default media module (audio/video) per stream type and object type. This is usefull if you have more than one decoder for a given type (ex, XviD and FFMPEG for MPEG-4 visual SP). The syntax is:
- codec_AA_BB=modulename 
-where AA is the hexadecimal MPEG-4 streamType value for the codec (04=visual, 05=audio) and BB is the hexadecimal MPEG-4 objectTypeIndication of the media (0x20 = MPEG-4 video, 0x40=MPEG-4 Audio, ...).
-The string is the name of the module to be used (same considerations as other modules, cf introduction).
-
-
-<a name="Compositor"></a>
-Section "Compositor" <a href="#Overview">Back to top</a>
-
-The "Compositor" section of the config file holds all configuration options for the compositor (logical rendering engine).
-
-Raster2D [value: string]
-
-Specifies the 2D rasterizer to use for vectorial drawing. Same as above, this module cannot be reloaded during a presentation.
-FrameRate [value: float]
-
-Specifies the simulation frame-rate of the presentation - this value is also used by the MPEG-4 Systems engine to determine when a BIFS frame is mature for decoding.
-AntiAlias [value: "None" "All" "Text"]
-
-Specifies antialiasing settings - whether the setting is applied or not depends on the graphics module / graphic card.
-
-<ul>
-<li>"None": no anti-aliasing</li>
-<li>"Text": anti-aliasing for text only</li>
-<li>"All": complete anti-aliasing</li>
-</ul>
-HighSpeed [value: "yes" "no"]
-
-Specifies whether rendering should target speed or quality - whether the setting is applied or not depends on the renderer, graphics module / graphic card.
-ForceSceneSize [value: "yes" "no"]
-
-Forces the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration.
-StressMode [value: "yes" "no"]
-
-Specifies that the renderer runs in worst case scenario, recomputing display lists and reloading textures (sending them to graphics card) at each frame even when no change has occured.
-BoundingVolume [value: "None" "Box" "AABB"]
-
-Specifies whether the bounding volume of an object shall be drawn or not. Note that the 2D renderer only uses rectangles as bounding volumes. The "AABB" value is used by the 
-3D renderer only, and specifies the object bounding-box tree shall be drawn.
-ColorKey [value: unsigned hexadecimal integer, formated as AARRGGBB]
-
-Specifies the color key to use for windowless rendering. GPAC currently doesn't support true alpha blitting to desktop due to limitations in most windowing toolkit, it therefore uses color keying mechanism. The alpha part of the key is used for global transparency of GPAC's output, if supported.
-
-BackColor [value: unsigned hexadecimal integer, formated as AARRGGBB]
-
-Specifies the background color to use when displaying transparent images or video with no scene compoistion instructions.
-
-DrawMode [value: "immediate" "defer" "defer-debug"]
-
-Specifies whether immediate drawing should be used or not. In immediate mode, the screen is completely redrawn at each frame. In defer mode
-object positioning is tracked from frame to frame and dirty rectangles info is collected in order to redraw the minimal amount of the screen buffer. Whether 
-the setting is applied or not depends on the graphics module (currently all modules handle both mode). Defer Debug mode only renders changed areas.
-ScalableZoom [value: "yes" "no"]
-
-Specifies whether scalable zoom should be used or not. When scalable zoom is enabled, resizing the output window will also recompute all vectorial objects. Otherwise only the final buffer is stretched.
-DisableYUV [value: "yes" "no"]
-
-Disables YUV hardware support (YUV hardware support may not be available for the current video output module).
-TextureFromDecoderMemory [value: "yes" "no"]
-
-Allows video textures to be build directly from video decoder internal buffers. This may increase performances on some systems. Default is no.
-
-
-
-ForceOpenGL [value: "always", "disable", "hybrid", "raster"]
-
-Specifies that 2D rendering will be performed by OpenGL rather than raster 2D. This will involve polygon tesselation which may not be supported on all platforms, and 2D graphics will not loo as nice as 2D mode. The hybrid mode performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all textures. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation) (slow, mainly for test purposes).
-DefaultNavigationMode [value: "Walk", "Fly", "Examine"]
-
-Overrides the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine).
-RasterOutlines [value: "yes" "no"]
-
-Specifies that outlining shall be done through OpenGL pen width rather than vectorial outlining.
-PolygonAA [value: "yes" "no"]
-
-Specifies whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used.
-DisableBackFaceCulling [value: "yes" "no"]
-
-Specifies whether backface culling shall be disable or not. If not set, backface culling is performed.
-Wireframe [value: "WireNone" "WireOnly" "WireOnSolid"]
-
-Specifies wireframe drawing options:
-<ul>
-<li>"WireNone": objects are drawn as solid</li>
-<li>"WireOnly": objects are drawn as wireframe only</li>
-<li>"WireOnSolid": objects are drawn as solid and wireframe is then drawn</li>
-</ul>
-DisableRectExt [value: "yes" "no"]
-
-Specifies whether OpenGL rectangular texture extension (GL_EXT_texture_rectangle or GL_NV_texture_rectangle) shall be used or not.
-<ul>
-<li>"yes": textures whose dimensions are not power of two are rescaled except if hardware support non-power-of-two textures (GL_ARB_texture_non_power_of_two) natively.</li>
-<li>"no": if extension is available, textures are used without rescaling. Note that in this case texture transformations are disabled.</li>
-</ul>
-EmulatePOW2 [value: "yes" "no"]
-
-Enables power of 2 emulation. Ignored if openGL rectangular texture extension is enabled.
-<ul>
-<li>"yes": video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations.</li>
-<li>"no": video is resized to a power of 2 texture when mapping to a shape.</li>
-</ul>
-DisableGLUScale [value: "yes" "no"]
-
-Disables usage of gluScaleImage, which may be slower but nicer than GPAC's software stretch routines.
-TextureTextMode (value: "Default", "Never", "Always"]
-
-Specifies whether text shall be drawn to a texture and then rendered or directly rendered. Using textured text can improve text rendering in 3D and also improve text-on-video like content. Default value will use texturing for OpenGL rendering. 
-OpenGLExtensions [value: string]
-
-Read-only option listing the OpenGL extensions supported by the GL driver. Only valid after the 3D renderer has been used.
-
-StereoType [value: "None", "SideBySide", "TopToBottom", "Anaglyph", "Columns", "Rows", "SPV19", "Custom"]
-
-Specifies the stereo output type (default "None"). If your graphic card does not support OpenGL shaders, only SideBySide and TopToBottom modes will be available.
-<ul>
-<li>"SideBySide": images are displayed side by side from left to right.</li>
-<li>"TopToBottom": images are displayed from top (laft view) to bottom (right view).</li>
-<li>"Anaglyph": Standard color anaglyph (red for left view, green and blue for right view) is used.</li>
-<li>"Columns": images are interleaved by columns, left view on even columns and left view on odd columns.</li>
-<li>"Rows": images are interleaved by columns, left view on even rows and left view on odd rows.</li>
-<li>"SPV19": images are interleaved by for SpatialView 19'' 5 views display, fullscreen mode.</li>
-<li>"Custom": images are interleaved according to the shader specified by InterleaverShader
-</ul>
-
-NumViews [value: unsigned integer]
-
-Specifies the number of views to use in stereo mode. If mode is "Anaglyph", "Columns" or "Rows", the number of views is forced to 2.
-
-InterleaverShader [value: path to fragment shader file]
-
-Specifies the fragment shader file to use for view interleaving. Each view is rendered in its own texture. The shader is exposed each view as uniform sampler2D gfViewX, where X is the view number starting from the left (gfView1).
-
-ReverseViews [value: "yes", "no"]
-
-Specifies if the view order should be reversed (from right to left) or not.
-EyeSeparation [value: float]
-
-Specifies the eye separation in cm (distance between the cameras). Default: 6.3 cm.
-CameraLayout [value: "OffAxis", Linear", "Circular"]
-
-Specifies the camera layout. The default value is OffAxis in (auto-)stereo modes, ignored in mono mode.
-ViewDistance [value: integer]
-
-Specifies the distance in cm between the camera and the zero-disparity plane. There is currently no automatic calibration of depth in GPAC.
-
-
- 
-
-<a name="Audio"></a>
-Section "Audio" <a href="#Overview">Back to top</a>
-The "Audio" section of the config file holds all configuration options for the audio rendering engine and hardware.
-DriverName [value: string]
-
-Specifies the driver to use for audio rendering. This driver cannot be reloaded at run-time, the complete system must be restarted.
-ForceConfig [value: "yes" "no"]
-
-Forces a given sound card configuration to be used. If not set the sound card will be setup to use 2 audio buffers of 1024 samples each. 
-This may not work properly on some audio cards due to hardware latency, therefore forcing the config may be very usefull.
-NumBuffers [value: positive integer, 0 forbidden]
-
-When config is forced, specifies the number of audio buffers to allocate (audio buffers are played in ring).
-TotalDuration [value: positive integer, 0 forbidden]
-
-When config is forced, specifies the total audio buffer size in milliseconds. Be aware that the longer the audio buffer is, the longer the audio latency will be when pausing an 
-audio object. The quality of fast forward audio playback will also be degradated when using large audio buffers.
-NoResync [value: "yes" "no"]
-
-Disables audio resynchronization: audio data is never dropped but may get out of sync.
-DisableMultiChannel [value: "yes" "no"]
-
-Disables audio multichannel output and always downmix to stereo. This may be usefull if the multichannel output behaves weirdly.
-DisableNotification [value: "yes" "no"]
-
-Disables usage of audio buffer notifications when supported (currently only DirectSound supports it). If DirectSound audio sounds weird try without notifications.
-Volume [value: integer (0-100)]
-
-Default audio volume used when launching GPAC.
-Pan [value: integer (0-100)]
-
-Default audio stereo balance used when launching GPAC - 0 for full left, 100 for full right, 50 for balanced.
-Filter [value: string]
-
-Defines a set of audio filters. Audio filters are declared as a list of strings separated with ";;". The exact syntax of the string is filter specific.
-
- 
-
-<a name="Video"></a>
-Section "Video" <a href="#Overview">Back to top</a>
-The "Video" section of the config file holds all configuration options for the video renderer and hardware.
-DriverName [value: string]
-
-Specifies the driver to use for video memory access. This driver cannot be reloaded at run-time, the complete system must be restarted.
-SwitchResolution [value: "yes" "no"]
-
-Specifies fullscreen resolution mode. If enabled, selects smallest video resolution larger than scene size, otherwise use current video resolution.
-HardwareMemory [value: "Auto" "Always" "Never"]
-
-Only valid for 2D renderer. Specifies if main video backbuffer is always on hardware, always on system memory or selected by GPAC (default mode). Depending on the scene type, this may drastically change the playback speed.
-DisableColorKeying [value: "yes" "no"]
-
-Only valid for 2D renderer. Specifies if partial overlays should be disabled. If not disabled, hardware color keying for overlays is tested and used if present. Otherwise, only the top-most video with no overlapping objects will be drawn using overlays. Default value is "no".
-UseGLDoubleBuffering [value: "yes" "no"]
-
-Specifies if OpenGL double buffering shall be used. Default is "no".
-GLNbBitsPerComponent [value: positive integer]
-
-Specifies the number of bits per color component. Default is 5.
-GLNbBitsDepth [value: positive integer]
-
-Specifies the number of bits for the depth buffer. Default is 16.
-X113DOffscreenMode [value: "Window" "VisibleWindow" "Pixmap"]
-
-Specifies the type of OpenGL offscreen rendering in X11. Default mode is "Pixmap".
-<ul>
-<li>"Window": A hidden window is used to perform offscreen rendering. Depending on your video driver and X11 configuration, this may not work.</li>
-<li>"VisibleWindow": A visible window is used to perform offscreen rendering. This can be usefull while debugging.</li>
-<li>"Pixmap": An X11 Pixmap is used to perform offscreen rendering. Depending on your video driver and X11 configuration, this may not work and can even crash the player.</li>
-</ul>
-
-
- 
-<a name="Network"></a>
-Section "Network" <a href="#Overview">Back to top</a>
-The "Network" section of the config file holds all configuration options for the network used by modules and systems engine.
-AutoReconfigUDP [value: "yes" "no"]
-
-Specifies if network manager shall reconnect a scene if UDP is not present.
-DataTimeout [value: positive integer]
-
-Specifies timeout in ms befor initial media buffering aborts. Default terminal value is 20000 (20 seconds).
-UDPNotAvailable [value: "yes" "no"]
-
-Specifies if UDP traffic is not available. This is automatically set by GPAC if AutoReconfigUDP is set.
-UDPTimeout [value: positive integer]
-
-Specifies timeout in ms for initial UDP detection. Once a UDP packet is recieved the timeout is ignored.
-BufferLength [value: positive integer]
-
-Specifies the length of the decoding buffer in milliseconds. The client will wait for the buffer to be filled before starting decoding. A module may decide to use a different value based on protocol and network jitters. 
-RebufferLength [value: positive integer]
-
-Specifies rebuffering length of the decoding buffer in milliseconds. Whenever the decoding buffer fullness is less than this value, the object clock is paused and 
-the stream rebuffered till BufferLength. Therefore a value of 0 means no rebuffering. A module may decide to use a different value based on protocol and network jitters.
-
-MobileIP [value: IP Address]
-
-Specifies a Mobile IP interface overriding the default IP. If set, all sockets will be locally bound to this IP address.
-
-DefaultMCastInterface [value: IP Address]
-
-Specifies a default IP interface for Multicast overriding the default IP.If not set, the multicast will be setup using the default IP. 
-
-HTTPRebuffer [value: positive integer]
-
-Specifies the default HTTP rebuffer time in ms. When playback position reaches download position, playback will be paused if this integer is not zero. Playback will resume once the HTTPRebuffer ms of playback are available. Default value is 5000 ms.
-
-HTTPAutoRebuffer [value: "yes", "no"]
-
-Specifies whether auto rebuffering is used. When auto-rebuffering is used, playback only resumes when estimated time to download the rest of the movie is less than remaining time of the playback. Default value is no.
-
-
-
- 
-<a name="FontEngine"></a>
-Section "FontEngine" <a href="#Overview">Back to top</a>
-The "FontEngine" section of the config file holds all configuration options for the font handling. The GPAC rendering module handles text through vectorial outline, allowing graphics module development without having to 
-integrate text rendering which is always heavy work.
-FontReader [value: string]
-
-Specifies the module to use for font handling. This module cannot be reloaded at run-time, GPAC must be restarted.
-WaitForFontLoad [value: "yes" "no"]
-
-Forces to wait for SVG fonts to be loaded before displaying frames - default is "no".
-FontDirectory (value: path to TrueType (*.ttf, *.ttc) font directory]
-
-Specifies the directory where fonts are located - currently only one directory can be specified (however nothing stops a font module from using a private directory).
- Note:
-The freetype module will scan the entire sub-directories for fonts.
-
-FontSerif [value: string]}: specifies default SERIF font. 
-FontSans [value: string]}: specifies default SANS font. 
-FontFixed [value: string]}: specifies default fixed font. 
- 
-Note: 
-The FreeType module uses this section to cache familly names to font file name associations.
-
-
- 
-<a name="Downloader"></a>
-Section "Downloader" <a href="#Overview">Back to top</a>
-The "Downloader" section of the config file holds all configuration options for file downloading and caching.
-CleanCache [value: "yes" "no"]
-
-Specifies whether downloaded files shall be removed once used.
-DisableCache [value: "yes" "no"]
-
-Specifies whether HTTP caching instructions are disabled or not.
-MaxRate [value: positive integer]
-
-Specifies a maximum data rate in kilo bits per seconds for file downloading. This is used for simulation purposes. A value of 0 means no rate restriction.
-UserAgent [value: string]
-
-Specifies an alternate user agent (default one is "GPAC $VERSION").
-HTTPHeadTimeout [value: positive integer]
-
-Specifies timeout in milliseconds before considering HEAD request failed. 0 means no HEAD request is issued, only GET.
-
- 
-<a name="HTTPProxy"></a>
-Section "HTTPProxy" <a href="#Overview">Back to top</a>
-The "HTTPProxy" section of the config file holds configuration option for HTTP proxy adressing. Currently only one proxy can be enabled, and no URI selection is done.
-Enabled [value: "yes" "no"]
-
-Specifies whether the proxy should be used or not when downloading files.
-Name [value: string]
-
-Specifies the proxy name (IP address or resolved name) without protocol identifier (eg, no "http://"). If not present, the proxy is disabled.
-Port [value: positive integer]
-
-Specifies the port to use with the proxy. If no port is specified, the default HTTP port (80) is used.
-
- 
-<a name="Streaming"></a>
-Section "Streaming" <a href="#Overview">Back to top</a>
-The "Streaming" section of the config file holds all configuration options for real-time streaming using IETF SDP/RTSP/RTP/RTCP protocols.
-DefaultPort [value: unsigned short]
-
-Specifies the default port to use when connecting to a server (ignored if a port is specified in the url) if the port is 80 or 8080 (HTTP), the client will connect to the 
-RTSP server through an HTTP tunnel, and transport will take place on the RTSP connection.
-ReorderSize [value: positive integer]
-
-Size of the RTP reordering buffer - 0 means no reordering. Ignored when transport takes place on the RTSP connection. The bigger this value, the longer the reordering delay will be.
-RTPoverRTSP [value: "yes" "no" "OnlyCritical"]
-
-Specifies whether RTP packets should be carried on the RTSP connection (TCP or UDP), or carried on UDP. If the connection port is an HTTP port, this value is assumed to be true. If set to OnlyCritical, transport will take place on TCP only if a critical media (eg, neither audio nor video) is found in the session.
-RTSPTimeout [value: positive integer]
-
-Specifies connection timeout with the server: an RTSP request is considered as failed when the timeout expires.
-ForceFirstPort [value: positive integer]
-
-Specifies first port for RTP channels. If not set, the default first port used by GPAC is 7040.
-NATKeepAlive [value: positive integer]
-
-Specifies the maximum inactivity period in milliseconds for RTP sockets. If no data is received after this period, an empty RTP packet will be sent in order to keep any NAT alive. If 0 (default), disables NAT keep-alive packets.
-ForceMulticastIP [value: IP4 or IP6 address]
-
-Forces the specified multicast address to be used instead of the regular unicast. Note that some servers may not support multicast initiation by the client.
-ForceMulticastTTL [value: Positive integer]
-
-Indicates the TTL to use when the client initiates the multicast. Default value is 127.
-FirstPacketDrop [value: positive integer]
-
-Specifies the sequence number of the first RTP packet to be droped - 0 means no packet drop. Used for packet drop simulation tests.
-PacketDropFrequency [value: positive integer]
-
-Specifies the frequency at which SL packets are droped. If value is 20, one packet every 20 recieved packets will be droped. Used for packet drop simulation tests.
-
- 
-
-<a name="MimeTypes"></a>
-Section "MimeTypes" <a href="#Overview">Back to top</a>
-This section is used to keep MIME types and file associations for GPAC modules.
- The format of the key is:
- mimeType="fileExt1 filexExt2 .. filexExtN" "MimeType description" ModuleName 
- 
-The description is used for GUI purposes (open file dialogs). You may modify the file extension list to support your own extensions. 
-MIME Type is always checked when processing a remote ressource (eg http file) in order to load the appropriated modules. 
-If MIME type is not available, provided extensions are first checked, then all input modules are queried.
-
-
- 
-
-<a name="StreamingCache"></a>
-Section "StreamingCache" <a href="#Overview">Back to top</a>
-The "StreamingCache" section of the config file holds all configuration options for the streaming cache. Streaming cache allows for recording of 
-live sources such as RTP/RTSP sessions and internet radios. This is currently just an experimental feature in GPAC.
-RecordDirectory [value: path]
-
-Specifies path for recorded files. Cached data is written directly to disk (no re-interleaving or similar processes).
-If not specified, the default cache directory (cf <a href="#General">General</a>) is used.
-BaseFileName [value: string]
-
-Specifies the base name for recorded files. If not present in configuration file, the service name (URL) is used.
-KeepExistingFiles [value: "yes" "no"]
-
-Specifies if cached files with same name should be kept or not. If not, an integer number is added to the cached file name, the higest number for the latest file.
-	
- 
-
-<a name="SAXLoader"></a>
-Section "SAXLoader" <a href="#Overview">Back to top</a>
-The "SAXLoader" section of the config file holds all configuration options for XML SAX parsing of SVG, XMT and X3D files.
-Progressive [value: "yes" "no" "DOM"]
-Specifies XML parsing mode used by different file loaders using the SAX parser.
-<ul>
-<li>"yes": SAX parsing is used with progressive loading of the document.</li>
-<li>"no": SAX parsing is used, document will first be completely downloaded.</li>
-<li>"DOM": DOM parsing is used, document will first be completely downloaded. Only supported by libXML2 plugin, otherwise handled as "no".</li>
-</ul>
-MaxDuration [value positive integer]
-
-Specifies the maximum amount of time the SAX parser should spent loading a portion of the document. Only used with SAX Progressive mode
-	
- 
-
-<a name="XviD"></a>
-Section "XviD" <a href="#Overview">Back to top</a>
-The "XviD" section of the config file holds all configuration options for the XviD codec.
-PostProc [value: "FilmEffect" "Deblock_Y" "Deblock_UV"]
-
-Specifies filters to apply when decoding video. The string is a list of filters separated with a space character.
-<ul>
-<li>"FilmEffect": xvid 1.0.0 filmEffect.</li>
-<li>"Deblock_Y": Y plane deblocking filter.</li>
-<li>"Deblock_UV": UV plane deblocking filter.</li>
-</ul>
-Threaded [value "yes" "no"]
-Specifies whether the decoder should run in its own thread or not.
-	
- 
-
-<a name="FFMPEG"></a>
-Section "FFMPEG" <a href="#Overview">Back to top</a>
-The "FFMPEG" section of the config file holds all configuration options for the FFMPEG demuxer and decoder.
-DataBufferMS [value: positive integer]
-
-Specifies the amount of video/audio data (in milliseconds) to be bufferer before starting decoding. For developpers only.
-IOBufferSize [value: positive integer]
-
-Specifies the size (in bytes) of the buffer used to fecth data from network (http playback only). Default size is 8192 bytes.
-
- 
-
-<a name="ISOReader"></a>
-Section "ISOReader" <a href="#Overview">Back to top</a>
-The "ISOReader" section of the config file holds all configuration options for the ISO Media File demuxer.
-IgnoreMPEG-4ForBrands [value: Full 4CC or 4CC pattern (abc* ab*)]
-
-Ignores all MPEG-4 systems tracks and IOD for files showing the listed brands in their compatible brand list.
-
- 
-
-<a name="DVB"></a>
-Section "DVB" <a href="#Overview">Back to top</a>
-The "DVB" section of the config file holds all configuration options for DVB playback on GNU/Linux systems.
-ChannelsFile [value: Absolute file path]
-
-Specifies the DVB channels configuration file as produced by dvbtools' scan util.
-
- 
-
-<a name="DASH"></a>
-Section "DASH" <a href="#Overview">Back to top</a>
-The "DASH" section of the config file holds all configuration options for DASH or HLS/M3U8 playback.
-KeepFiles [value: yes, no]
-
-Specifies whether downloaded files should not be deleted.
-AutoSwitchCount [value: positive integer]
-
-For debug purposes, instructs the player to switch representation every N segments. If 0 (default), switching is disabled.
-BufferMode [value: segments, minBuffer, none]
-
-Selects buffer mode:
-<ul> 
-<li>segments: buffers complete segments as indicated in MPD before handing them to the player.</li>
-<li>minBuffer: asks the player to buffer media for the time indicated in the MPD (default mode), but segments are not pre-buffered.</li> 
-<li>none: uses the player settings for buffering.</li> 
-</ul>
-
-DisableSwitching [value: yes, no]
-
-Disables automatic adaptation logic. Default is no
-MemoryStorage [value: yes, no]
-
-Files are only stored in memory and destroyed after playback, no disk IO is used. Default is yes
-UseMaxResolution [value: yes, no]
-
-Forces the player to set the output video resolution to the max resolution available instead of resizing the window. Default is yes
-UseScreenResolution [value: yes, no]
-
-Disables all resolutions that are higher than the screen resolution. Default is yes
-StartRepresentation [value: minBandwidth, maxBandwidth, minQuality, maxQuality]
-
-Instructs the DASH client to start playing the indicated representation before doing any switching. Default is minBandwidth.
-InitialTimeshift [value: positive integer ]
-
-If between 0 and 100, indicates the percentage of the timeshift buffer when starting playback. 
-If more than 100, indicates the number of milliseconds to rewind in the timeshift buffer when starting playback. 
-Default is 0 to tune to the live point.
-LowLatency [value: always, chunk, no]
-
-Sets low-latency mode enabled. In low-latency mode, media data is parsed as soon as possible while segment is being downloaded. Default is no.
-If chunk is selected, media data is re-parsed at each HTTP 1.1 chunk end. If always is selected, media data is re-parsed as soon as HTTP data is received. 
-AllowAbort [value: yes, no]
-
-Enables aborts of HTTP transfer when rate gets too low. This may result in a packet drops. Default is no.
-UseServerUTC [value: yes, no]
-
-Enables using Server-UTC HTTP header to compensate any drift between client and server. Default is yes.
-DebugAdaptationSet [value: integer]
-
-Plays only the adaptation set indicated by its index in the MPD. If index is negative, all sets are used (default mode).
-
-SwitchProbeCount [value: unsigned integer]
-
-Sets how many segments the client shall wait before switching up bandwidth. If 0, switch will happen as soon as the bandwidth is enough, but this is more prone to network variations. 
-Default value is 1.
-
-
-
-
- 
-
-<a name="ALSA"></a>
-Section "ALSA" <a href="#Overview">Back to top</a>
-The "ALSA" section of the config file holds all configuration options of the ALSA audio output module on GNU/Linux systems.
-DeviceName [value: string]
-
-Specifies the ALSA device to use. Default device is "hw:0,0".
-
- 
-
-<a name="StreamingText"></a>
-Section "StreamingText" <a href="#Overview">Back to top</a>
-The "StreamingText" section of the config file holds all configuration options for the 3GPP/MPEG-4 Streaming Text decoder.
-UseTexturing [value: "yes" "no"]
-
-Specifies whether the text shall be drawn using an intermediate texture or not.<OutlineText [value: "yes" "no"]
-
-Specifies whether the text shall be drawn with a black thin outline or not.
-
-
- 
-
-<a name="SHORTCUTS"></a>
-Section "Shortcuts" <a href="#Overview">Back to top</a>
-The "Shortcuts" section of the config file holds all shortcuts in GPAC. You can define a shorcut for an action as: 
-'action'='keyname' or 'action'='ctrl+keyname' or 'action'='alt+keyname' or "='action'='ctrl+alt+keyname' 
-Shift is not supported as a key modifier, and case is insensitive. 
-Currently defined actions are as follows:
-Play or Pause 
-Stop 
-Step 
-Exit 
-Mute 
-VolumeUp 
-VolumeDown 
-JumpForward 
-JumpBackward 
-JumpStart 
-JumpEnd 
-FastForward 
-FineForward 
-SlowForward 
-FastRewind 
-FineRewind 
-SlowRewind 
-Next 
-Previous 
-
- 
-
-<a name="DSMCC"></a>
-Section "DSMCC" <a href="#Overview">Back to top</a>
-
-The "DSMCC" section of the config file holds the configuration option for the processing of DSMCC data.
-
-Activated [value: "true" "false"]
-
-Specifies if the DSMCC data will be processed (true). It implies creations of directories and files in the temp directory.
-
-
- 
-
-<a name="OpenHEVC"></a>
-Section "OpenHEVC" <a href="#Overview">Back to top</a>
-
-The openHEVC section of the config file holds the configuration option for the OpenHEVC decoder.
-
-NumThreads [value: unsigned integer]
-
-Specifies the number of threads to allocate to the OpenHEVC decoder. Default is the number of detected cores minus one, or one if core detection fails.
-ThreadingType [value: frame , wpp , frame+wpp ]
-
-Specifies the threading type for the openHEVC decoder. Default is frame (wpp disabled).
-CBUnits [value: unsigned integer ]
-
-Specifies the number of decoded frames in memory before display. Default value is 4.
-PackHFR [value: yes, no ]
-
-Packs 4 consecutive frames in a single 4x frame.
-
-
- 
-
-<a name="DirectFB"></a>
-Section "DirectFB" <a href="#Overview">Back to top</a>
-
-The "DirectFB" section of the config file holds the configuration options for the DirectFB output module. You may also want to check the <a href="http://directfb.org/wiki/index.php/Configuring_DirectFB">official documentation</a>.
-
-DisableAcceleration [value: "yes" "no"]
-
-Forces to disable hardware acceleration.
-DisableDisplay [value: "yes" "no"]
-
-Specifies the DisableDisplay parameter value.
-FlipSyncMode [value: "waitsync" "wait" "sync" "swap"]
-
-Specifies the flip sync mode.
-DisableBlit [value: "yes" "no"]
-
-Forces to disable hardware blitting.
-WindowMode [value: "X11" "SDL"]
-
-Specifies the underlying windowing library.
-
-
- 
-
-<a name="DektecVideo"></a>
-Section "DektecVideo" <a href="#Overview">Back to top</a>
-
-The "DektecVideo" section of the config file holds the configuration options for the Dektec SDI video output module.</a>
-
-SDIOutput [value: unsigned integer]
-
-Specifies the output port of the card. Default value is 1.
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>GPAC Configuration documentation </title>
+</head>
+
+
+ 
+GPAC Configuration file documentation
+ 
+GPAC Version 0.6.1
+
+ 
+
+
+ 
+
+<a name="Overview"></a>Overview
+
+Some applications in the GPAC framework use a configuration file shared among modules and reloadable at run time. Modules may use the configuration file as well (to avoid multiple config files). This doc attempts to provide explanations for the different options.
+ 
+The config file is ordered by sections and keys.
+ A section is declared as SectionName. Defined sections are:
+ 
+<a href="#General" style="text-decoration: underline;">General</a>
+<a href="#RecentFiles" style="text-decoration: underline;">RecentFiles</a>
+<a href="#Systems" style="text-decoration: underline;">Systems</a>
+<a href="#Compositor" style="text-decoration: underline;">Compositor</a>
+<a href="#Audio" style="text-decoration: underline;">Audio</a>
+<a href="#Video" style="text-decoration: underline;">Video</a>
+<a href="#Network" style="text-decoration: underline;">Network</a>
+<a href="#FontEngine" style="text-decoration: underline;">FontEngine</a>
+<a href="#Downloader" style="text-decoration: underline;">Downloader</a>
+<a href="#HTTPProxy" style="text-decoration: underline;">HTTPProxy</a>
+<a href="#Streaming" style="text-decoration: underline;">Streaming</a>
+<a href="#MimeTypes" style="text-decoration: underline;">MimeTypes</a>
+<a href="#StreamingCache" style="text-decoration: underline;">StreamingCache</a>
+<a href="#SAXLoader" style="text-decoration: underline;">SAXLoader</a>
+<a href="#XviD" style="text-decoration: underline;">XviD</a>
+<a href="#FFMPEG" style="text-decoration: underline;">FFMPEG</a>
+<a href="#ISOReader" style="text-decoration: underline;">ISOReader</a>
+<a href="#DVB" style="text-decoration: underline;">DVB</a>
+<a href="#DASH" style="text-decoration: underline;">DASH</a>
+<a href="#ALSA" style="text-decoration: underline;">ALSA</a>
+<a href="#SHORTCUTS" style="text-decoration: underline;">Shortcuts</a>
+<a href="#DSMCC" style="text-decoration: underline;">DSMCC</a>
+<a href="#OpenHEVC" style="text-decoration: underline;">OpenHEVC</a>
+<a href="#DirectFB" style="text-decoration: underline;">DirectFB</a>
+<a href="#DektecVideo" style="text-decoration: underline;">DektecVideo</a>
+<a href="#M2TS" style="text-decoration: underline;">M2TS</a>
+
+
+ 
+A key is declared as keyName=value. The key value is not interpreted and always handled as ASCII text.
+ 
+<ul>
+<li>
+On Windows plateforms, this config file is called "GPAC.cfg" and is usually located in C:\\Program Files\\GPAC. Note that Osmo4 will always create a config file in its own directory when none is found.
+ 
+</li>
+<li>
+On Windows CE plateform, this config file is called "GPAC.cfg" and is usually located in \\Program Files\\GPAC. Note that Osmo4 / CE will always create a config file in its own directory when none is found.
+ 
+</li>
+<li>
+On GNU/Linux plateforms, this config file is called ".gpacrc" and is always located at the root of the user home directory (for ex, /home/jean/.gpacrc).
+ 
+</li>
+</ul>
+ 
+
+ Note on module names:
+ Module names as given in the config file are names exported by each interface and not name of the physical library file (.dll, .so, ...). The physical file name can however be used to identify a module - it will then be replaced by the module name.
+
+ 
+ 
+
+<a name="General"></a>
+Section "General" <a href="#Overview">Back to top</a>
+
+The General section of the config file holds player specific options.
+
+ModulesDirectory [value: path to directory]
+
+Specifies the path to modules directory. The MPEG-4 Systems engine cannot be loaded without modules. This option is used by GPAC clients on all platforms.
+
+CacheDirectory [value: path to storage directory]
+
+Specifies location of temp files. The user must have write access to this location. Although not used by applications, this is used by several modules.
+
+StartupFile [value: filename]
+
+Specifies file to load upon startup of most clients (Osmo4/MP4Client). If not specified, no file is loaded.
+
+
+LogFile [value: filename]
+
+Specifies where to output GPAC's log. By default, the logs are written to stdout. Note that GPAC may be compiled without log support. This is not used by MP4Client.
+
+Logs [value: tool[:tool]@level:tool[:tool]@level]
+
+Specifies log level for each tool. By default, only errors are logged. Available levels are:
+<ul>
+<li>quiet : no logging is performed on the tool</li>
+<li>error : only errors are logged</li>
+<li>warning : warnings are also logged.</li>
+<li>info : information messages are also logged</li>
+<li>debug : debug messages are also logged</li>
+</ul>
+ 
+Available tools are:
+<ul>
+<li>core : libgpac core</li>
+<li>coding : bitstream formats (audio, video, scene)</li>
+<li>container : container formats (ISO File, MPEG-2 TS, AVI, ...)</li>
+<li>network : network data exept RTP trafic</li>
+<li>rtp : rtp, rtcp and rtsp trafic</li>
+<li>author : authoring tools (hint, import, export)</li>
+<li>sync : terminal sync layer</li>
+<li>codec : terminal codec messages</li>
+<li>parser : scene parsers (svg, xmt, bt) and other</li>
+<li>media : terminal media object management</li>
+<li>scene : scene graph and scene manager</li>
+<li>script : scripting engine messages</li>
+<li>interact : user interaction messages</li>
+<li>compose : composition engine (events, etc)</li>
+<li>cache : HTTP cache</li>
+<li>mmio : Audio/Video HW I/O management</li>
+<li>rti : Run-time info (CPU, mem, ...)</li>
+<li>smil : SMIL timing and animation</li>
+<li>memory : GPAC memory tracker</li>
+<li>audio : Audio renderer and mixers</li>
+<li>module : used by some modules</li>
+<li>mutex : mutex information</li>
+<li>console : console messages, such as script alert() and error notifications</li>
+</ul>
+
+
+
+ 
+
+
+Options defined for Osmo4 (Windows version and wxWidgets version): 
+Loop [value: "yes" "no"]
+
+Specifies whether the presentation has to be restarted when done playing.
+
+ConsoleOff [value: "yes" "no"]
+
+Specifies whether application messages (script, buffering, download progress) are displayed in the console or not.
+
+SingleInstance [value: "yes", "no"]
+
+Specifies if the player should be a single instance application or not (Osmo4-Win32 only).
+
+LookForSubtitles [value: "yes" "no"]
+
+Specifies if Osmo4 shall look for subtitle files when opening a presentation.
+
+ViewXMT [value: "yes" "no"]
+
+Specifies if scene dumping shall be done in XML (XMT, X3D) or in VRML-like syntax (BT, WRL).
+
+ConfigPanel [value: positive integer]
+
+Specifies the latest config panel selected by user.
+
+NoMIMETypeFetch [value: "yes", "no"]
+
+Specifies if the player has to check for mime type when following hyperlinks, or only follow links of known extensions.
+
+Loop [value: "yes", "no"]
+
+Specifies if the playlist shall be restarted when playback is over.
+
+PLEntry [value: positive integer]
+
+Indicates active playlist entry when player was last closed. Playlist backup is:
+
+<ul>
+<li>"gpac_pl.m3u" on win32 platforms, stored in same directory as application</li>
+<li>".gpac_pl.m3u" on other platforms, stored in user home directory</li>
+</ul>
+FillScreen [value: "yes", "no"]
+
+Specifies if the display area shall fill all available space on screen. WindowsMobile/Symbian only
+
+DisableBackLight [value: "yes", "no"]
+
+Specifies if the screen backlighting shall be disabled while playing. WindowsMobile/Symbian only
+
+LastWorkingDir [value: "yes", "no"]
+
+Specifies the directory of the last local file opened. Smartphone Windows only
+
+Browser [value: string]
+
+Specifies prefered browser for WWW anchors and scene graph viewing - Only used by Osmo4/wxWidgets.
+
+
+<a name="RecentFiles"></a>
+Section "RecentFiles" <a href="#Overview">Back to top</a>
+
+The "RecentFiles" section of the config file holds last accessed files (hardcoded to no more than 20) in the last access order. The keys are
+the file names and no value is used. This section is only used by GUI clients (osmo4/wxOsmo4)
+
+
+<a name="Systems"></a>
+Section "Systems" <a href="#Overview">Back to top</a>
+
+The "Systems" section of the config file holds all configuration options for the MPEG-4 Systems engine.
+
+LanguageName [value: string]
+
+Specifies the user prefered language in readable english. This is used to select streams in case of alternate content in an audio object.
+
+Language3CC [value: 3-char code from ISO 639-2]
+
+Specifies the user prefered language as expressed in ISO 639-2. This is used to select streams in case of alternate content in an audio object.
+
+Language2CC [value: 2-char code from ISO 639-1]
+
+Specifies the user prefered language as expressed in ISO 639-1. This is used to select streams in case of alternate content in an audio object.
+
+DrawLateFrames [value: "yes" "no"]
+
+If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) untill the decoder output is back in sync. This is by default on to keep better testing heavy content or slow renderers, but should be set to off when needing a better sync or monitoring skipped frames.
+
+ForceSingleClock [value: "yes" "no"]
+
+One big problem with MP4 files is that the notion of "duration" has been unclear for a long time, and most content available (audio-video files) specifiy a 
+wrong BIFS duration. In such a case the movie cannot be controled/seeked into. Another problem with ISMA streaming is that BIFS/OD don't use the same clock as 
+audio/video, thus seeking the main timeline does not seek AV media. Setting the ForceSingleClock will handle both cases by using a single timeline for all media 
+streams and setting the duration to the one of the longest stream.
+
+ThreadingPolicy [value: "Free" "Single" "Multi"]
+
+Specifies how media decoders are to be threaded. "Free" lets decoders decide of their threading, "Single" means that all decoders are managed in a single thread performing scheduling and priority
+handling and "Multi" means that each decoder runs in its own thread.
+
+Priority [value: "low" "normal" "high" "real-time"]
+
+Specifies the priority of the decoders (priority is applied to decoder thread(s) regardless of threading mode).
+
+TimeSlice [value: unsigned integer]
+
+Specifies the target maximum time (in ms) of one cycle of the media manager (the media manager will attempts to call all the active decoders within this time. Depending on the threading mode this option can be ignored;
+
+ModuleUnload [value: "yes" "no"]
+
+Specifies whether modules should be unloaded if not used or not. Default: "yes".
+
+ResyncLateClock [value: unsigned integer]
+
+Specifies the threshold after which late clocks are resynchronized to timestamps for OCR streams. By default, no threashold (0) is used and clocks are never resynchronized. This allows to 
+resync clocks to the media owning the clock when the decoding is really too slow, and should only be used for debugging purposes.
+
+NoVisualThread [value: "yes" "no"]
+
+Specifies whether the visual rendering is done in the main codec manager or in a dedicated thread.
+
+DefAudioDec , DefVideoDec and DefImageDec [value: string]
+
+Specifies which module to use by default for audio/video/image decoding. The string is the name of the module to be used (same considerations as other modules, cf introduction).
+
+codec_XX_XX [value: string]
+
+Allows to specify default media module (audio/video) per stream type and object type. This is usefull if you have more than one decoder for a given type (ex, XviD and FFMPEG for MPEG-4 visual SP). The syntax is:
+ codec_AA_BB=modulename 
+where AA is the hexadecimal MPEG-4 streamType value for the codec (04=visual, 05=audio) and BB is the hexadecimal MPEG-4 objectTypeIndication of the media (0x20 = MPEG-4 video, 0x40=MPEG-4 Audio, ...).
+The string is the name of the module to be used (same considerations as other modules, cf introduction).
+
+
+<a name="Compositor"></a>
+Section "Compositor" <a href="#Overview">Back to top</a>
+
+The "Compositor" section of the config file holds all configuration options for the compositor (logical rendering engine).
+
+Raster2D [value: string]
+
+Specifies the 2D rasterizer to use for vectorial drawing. Same as above, this module cannot be reloaded during a presentation.
+FrameRate [value: float]
+
+Specifies the simulation frame-rate of the presentation - this value is also used by the MPEG-4 Systems engine to determine when a BIFS frame is mature for decoding.
+AntiAlias [value: "None" "All" "Text"]
+
+Specifies antialiasing settings - whether the setting is applied or not depends on the graphics module / graphic card.
+
+<ul>
+<li>"None": no anti-aliasing</li>
+<li>"Text": anti-aliasing for text only</li>
+<li>"All": complete anti-aliasing</li>
+</ul>
+HighSpeed [value: "yes" "no"]
+
+Specifies whether rendering should target speed or quality - whether the setting is applied or not depends on the renderer, graphics module / graphic card.
+ForceSceneSize [value: "yes" "no"]
+
+Forces the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration.
+StressMode [value: "yes" "no"]
+
+Specifies that the renderer runs in worst case scenario, recomputing display lists and reloading textures (sending them to graphics card) at each frame even when no change has occured.
+BoundingVolume [value: "None" "Box" "AABB"]
+
+Specifies whether the bounding volume of an object shall be drawn or not. Note that the 2D renderer only uses rectangles as bounding volumes. The "AABB" value is used by the 
+3D renderer only, and specifies the object bounding-box tree shall be drawn.
+ColorKey [value: unsigned hexadecimal integer, formated as AARRGGBB]
+
+Specifies the color key to use for windowless rendering. GPAC currently doesn't support true alpha blitting to desktop due to limitations in most windowing toolkit, it therefore uses color keying mechanism. The alpha part of the key is used for global transparency of GPAC's output, if supported.
+
+BackColor [value: unsigned hexadecimal integer, formated as AARRGGBB]
+
+Specifies the background color to use when displaying transparent images or video with no scene compoistion instructions.
+
+DrawMode [value: "immediate" "defer" "defer-debug"]
+
+Specifies whether immediate drawing should be used or not. In immediate mode, the screen is completely redrawn at each frame. In defer mode
+object positioning is tracked from frame to frame and dirty rectangles info is collected in order to redraw the minimal amount of the screen buffer. Whether 
+the setting is applied or not depends on the graphics module (currently all modules handle both mode). Defer Debug mode only renders changed areas.
+ScalableZoom [value: "yes" "no"]
+
+Specifies whether scalable zoom should be used or not. When scalable zoom is enabled, resizing the output window will also recompute all vectorial objects. Otherwise only the final buffer is stretched.
+DisableYUV [value: "yes" "no"]
+
+Disables YUV hardware support (YUV hardware support may not be available for the current video output module).
+TextureFromDecoderMemory [value: "yes" "no"]
+
+Allows video textures to be build directly from video decoder internal buffers. This may increase performances on some systems. Default is no.
+ForceOpenGL [value: "always", "disable", "hybrid", "raster"]
+
+Specifies that 2D rendering will be performed by OpenGL rather than raster 2D. This will involve polygon tesselation which may not be supported on all platforms, and 2D graphics will not loo as nice as 2D mode. The hybrid mode performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all textures. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation) (slow, mainly for test purposes).
+EnablePBO [value: "yes", "no"]
+
+Uses PixelBufferObjects to push YUV textures to GPU in OpenGL Mode.. This may slightly increase the performances of the playback.
+DefaultNavigationMode [value: "Walk", "Fly", "Examine"]
+
+Overrides the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine).
+RasterOutlines [value: "yes" "no"]
+
+Specifies that outlining shall be done through OpenGL pen width rather than vectorial outlining.
+PolygonAA [value: "yes" "no"]
+
+Specifies whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used.
+DisableBackFaceCulling [value: "yes" "no"]
+
+Specifies whether backface culling shall be disable or not. If not set, backface culling is performed.
+Wireframe [value: "WireNone" "WireOnly" "WireOnSolid"]
+
+Specifies wireframe drawing options:
+<ul>
+<li>"WireNone": objects are drawn as solid</li>
+<li>"WireOnly": objects are drawn as wireframe only</li>
+<li>"WireOnSolid": objects are drawn as solid and wireframe is then drawn</li>
+</ul>
+DisableRectExt [value: "yes" "no"]
+
+Specifies whether OpenGL rectangular texture extension (GL_EXT_texture_rectangle or GL_NV_texture_rectangle) shall be used or not.
+<ul>
+<li>"yes": textures whose dimensions are not power of two are rescaled except if hardware support non-power-of-two textures (GL_ARB_texture_non_power_of_two) natively.</li>
+<li>"no": if extension is available, textures are used without rescaling. Note that in this case texture transformations are disabled.</li>
+</ul>
+EmulatePOW2 [value: "yes" "no"]
+
+Enables power of 2 emulation. Ignored if openGL rectangular texture extension is enabled.
+<ul>
+<li>"yes": video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations.</li>
+<li>"no": video is resized to a power of 2 texture when mapping to a shape.</li>
+</ul>
+DisableGLUScale [value: "yes" "no"]
+
+Disables usage of gluScaleImage, which may be slower but nicer than GPAC's software stretch routines.
+TextureTextMode (value: "Default", "Never", "Always"]
+
+Specifies whether text shall be drawn to a texture and then rendered or directly rendered. Using textured text can improve text rendering in 3D and also improve text-on-video like content. Default value will use texturing for OpenGL rendering. 
+OpenGLExtensions [value: string]
+
+Read-only option listing the OpenGL extensions supported by the GL driver. Only valid after the 3D renderer has been used.
+
+StereoType [value: "None", "SideBySide", "StereoHeadset", "TopToBottom", "Anaglyph", "Columns", "Rows", "SPV19", "Custom"]
+
+Specifies the stereo output type (default "None"). If your graphic card does not support OpenGL shaders, only SideBySide and TopToBottom modes will be available.
+<ul>
+<li>"SideBySide": images are displayed side by side from left to right.</li>
+<li>"TopToBottom": images are displayed from top (laft view) to bottom (right view).</li>
+<li>"StereoHeadset": same as SideBySide except that view aspect ratio is not changed.</li>
+<li>"Anaglyph": Standard color anaglyph (red for left view, green and blue for right view) is used.</li>
+<li>"Columns": images are interleaved by columns, left view on even columns and left view on odd columns.</li>
+<li>"Rows": images are interleaved by columns, left view on even rows and left view on odd rows.</li>
+<li>"SPV19": images are interleaved by for SpatialView 19'' 5 views display, fullscreen mode.</li>
+<li>"Custom": images are interleaved according to the shader specified by InterleaverShader
+</ul>
+
+NumViews [value: unsigned integer]
+
+Specifies the number of views to use in stereo mode. If mode is "Anaglyph", "Columns" or "Rows", the number of views is forced to 2.
+
+InterleaverShader [value: path to fragment shader file]
+
+Specifies the fragment shader file to use for view interleaving. Each view is rendered in its own texture. The shader is exposed each view as uniform sampler2D gfViewX, where X is the view number starting from the left (gfView1).
+
+ReverseViews [value: "yes", "no"]
+
+Specifies if the view order should be reversed (from right to left) or not.
+EyeSeparation [value: float]
+
+Specifies the eye separation in cm (distance between the cameras). Default: 6.3 cm.
+CameraLayout [value: "OffAxis", Linear", "Circular"]
+
+Specifies the camera layout. The default value is OffAxis in (auto-)stereo modes, ignored in mono mode.
+ViewDistance [value: integer]
+
+Specifies the distance in cm between the camera and the zero-disparity plane. There is currently no automatic calibration of depth in GPAC.
+
+
+ 
+
+<a name="Audio"></a>
+Section "Audio" <a href="#Overview">Back to top</a>
+The "Audio" section of the config file holds all configuration options for the audio rendering engine and hardware.
+DriverName [value: string]
+
+Specifies the driver to use for audio rendering. This driver cannot be reloaded at run-time, the complete system must be restarted.
+ForceConfig [value: "yes" "no"]
+
+Forces a given sound card configuration to be used. If not set the sound card will be setup to use 2 audio buffers of 1024 samples each. 
+This may not work properly on some audio cards due to hardware latency, therefore forcing the config may be very usefull.
+NumBuffers [value: positive integer, 0 forbidden]
+
+When config is forced, specifies the number of audio buffers to allocate (audio buffers are played in ring).
+TotalDuration [value: positive integer, 0 forbidden]
+
+When config is forced, specifies the total audio buffer size in milliseconds. Be aware that the longer the audio buffer is, the longer the audio latency will be when pausing an 
+audio object. The quality of fast forward audio playback will also be degradated when using large audio buffers.
+NoResync [value: "yes" "no"]
+
+Disables audio resynchronization: audio data is never dropped but may get out of sync.
+DisableMultiChannel [value: "yes" "no"]
+
+Disables audio multichannel output and always downmix to stereo. This may be usefull if the multichannel output behaves weirdly.
+DisableNotification [value: "yes" "no"]
+
+Disables usage of audio buffer notifications when supported (currently only DirectSound supports it). If DirectSound audio sounds weird try without notifications.
+Volume [value: integer (0-100)]
+
+Default audio volume used when launching GPAC.
+Pan [value: integer (0-100)]
+
+Default audio stereo balance used when launching GPAC - 0 for full left, 100 for full right, 50 for balanced.
+Filter [value: string]
+
+Defines a set of audio filters. Audio filters are declared as a list of strings separated with ";;". The exact syntax of the string is filter specific.
+
+ 
+
+<a name="Video"></a>
+Section "Video" <a href="#Overview">Back to top</a>
+The "Video" section of the config file holds all configuration options for the video renderer and hardware.
+DriverName [value: string]
+
+Specifies the driver to use for video memory access. This driver cannot be reloaded at run-time, the complete system must be restarted.
+SwitchResolution [value: "yes" "no"]
+
+Specifies fullscreen resolution mode. If enabled, selects smallest video resolution larger than scene size, otherwise use current video resolution.
+HardwareMemory [value: "Auto" "Always" "Never"]
+
+Only valid for 2D renderer. Specifies if main video backbuffer is always on hardware, always on system memory or selected by GPAC (default mode). Depending on the scene type, this may drastically change the playback speed.
+DisableColorKeying [value: "yes" "no"]
+
+Only valid for 2D renderer. Specifies if partial overlays should be disabled. If not disabled, hardware color keying for overlays is tested and used if present. Otherwise, only the top-most video with no overlapping objects will be drawn using overlays. Default value is "no".
+UseGLDoubleBuffering [value: "yes" "no"]
+
+Specifies if OpenGL double buffering shall be used. Default is "no".
+GLNbBitsPerComponent [value: positive integer]
+
+Specifies the number of bits per color component. Default is 5.
+GLNbBitsDepth [value: positive integer]
+
+Specifies the number of bits for the depth buffer. Default is 16.
+X113DOffscreenMode [value: "Window" "VisibleWindow" "Pixmap"]
+
+Specifies the type of OpenGL offscreen rendering in X11. Default mode is "Pixmap".
+<ul>
+<li>"Window": A hidden window is used to perform offscreen rendering. Depending on your video driver and X11 configuration, this may not work.</li>
+<li>"VisibleWindow": A visible window is used to perform offscreen rendering. This can be usefull while debugging.</li>
+<li>"Pixmap": An X11 Pixmap is used to perform offscreen rendering. Depending on your video driver and X11 configuration, this may not work and can even crash the player.</li>
+</ul>
+
+
+ 
+<a name="Network"></a>
+Section "Network" <a href="#Overview">Back to top</a>
+The "Network" section of the config file holds all configuration options for the network used by modules and systems engine.
+AutoReconfigUDP [value: "yes" "no"]
+
+Specifies if network manager shall reconnect a scene if UDP is not present.
+DataTimeout [value: positive integer]
+
+Specifies timeout in ms befor initial media buffering aborts. Default terminal value is 20000 (20 seconds).
+UDPNotAvailable [value: "yes" "no"]
+
+Specifies if UDP traffic is not available. This is automatically set by GPAC if AutoReconfigUDP is set.
+UDPTimeout [value: positive integer]
+
+Specifies timeout in ms for initial UDP detection. Once a UDP packet is recieved the timeout is ignored.
+BufferLength [value: positive integer]
+
+Specifies the length of the decoding buffer in milliseconds. The client will wait for the buffer to be filled before starting decoding. A module may decide to use a different value based on protocol and network jitters. 
+RebufferLength [value: positive integer]
+
+Specifies rebuffering length of the decoding buffer in milliseconds. Whenever the decoding buffer fullness is less than this value, the object clock is paused and 
+the stream rebuffered till BufferLength. Therefore a value of 0 means no rebuffering. A module may decide to use a different value based on protocol and network jitters.
+
+LowLatencyBufferMax [value: positive integer]
+
+Specifies the maximum buffer level for low latency mode, in ms. If media buffer max is above this value, full buffering will be done (clock resume at first frame displayed). Default value is 500 ms.
+
+MobileIP [value: IP Address]
+
+Specifies a Mobile IP interface overriding the default IP. If set, all sockets will be locally bound to this IP address.
+
+DefaultMCastInterface [value: IP Address]
+
+Specifies a default IP interface for Multicast overriding the default IP.If not set, the multicast will be setup using the default IP. 
+
+HTTPRebuffer [value: positive integer]
+
+Specifies the default HTTP rebuffer time in ms. When playback position reaches download position, playback will be paused if this integer is not zero. Playback will resume once the HTTPRebuffer ms of playback are available. Default value is 5000 ms.
+
+HTTPAutoRebuffer [value: "yes", "no"]
+
+Specifies whether auto rebuffering is used. When auto-rebuffering is used, playback only resumes when estimated time to download the rest of the movie is less than remaining time of the playback. Default value is no.
+
+
+
+
+ 
+<a name="FontEngine"></a>
+Section "FontEngine" <a href="#Overview">Back to top</a>
+The "FontEngine" section of the config file holds all configuration options for the font handling. The GPAC rendering module handles text through vectorial outline, allowing graphics module development without having to 
+integrate text rendering which is always heavy work.
+FontReader [value: string]
+
+Specifies the module to use for font handling. This module cannot be reloaded at run-time, GPAC must be restarted.
+WaitForFontLoad [value: "yes" "no"]
+
+Forces to wait for SVG fonts to be loaded before displaying frames - default is "no".
+FontDirectory (value: path to TrueType (*.ttf, *.ttc) font directory]
+
+Specifies the directory where fonts are located - currently only one directory can be specified (however nothing stops a font module from using a private directory).
+ Note:
+The freetype module will scan the entire sub-directories for fonts.
+
+FontSerif [value: string]}: specifies default SERIF font. 
+FontSans [value: string]}: specifies default SANS font. 
+FontFixed [value: string]}: specifies default fixed font. 
+ 
+Note: 
+The FreeType module uses this section to cache familly names to font file name associations.
+
+
+ 
+<a name="Downloader"></a>
+Section "Downloader" <a href="#Overview">Back to top</a>
+The "Downloader" section of the config file holds all configuration options for file downloading and caching.
+CleanCache [value: "yes" "no"]
+
+Specifies whether downloaded files shall be removed once used.
+DisableCache [value: "yes" "no"]
+
+Specifies whether HTTP caching instructions are disabled or not.
+AllowOfflineCache [value: "yes" "no"]
+
+When enabled, allows HTTP request to use cached file if any when network is not available.
+MaxRate [value: positive integer]
+
+Specifies a maximum data rate in kilo bits per seconds for file downloading. This is used for simulation purposes. A value of 0 means no rate restriction.
+UserAgent [value: string]
+
+Specifies an alternate user agent (default one is "GPAC $VERSION").
+HTTPHeadTimeout [value: positive integer]
+
+Specifies timeout in milliseconds before considering HEAD request failed. 0 means no HEAD request is issued, only GET.
+
+ 
+<a name="HTTPProxy"></a>
+Section "HTTPProxy" <a href="#Overview">Back to top</a>
+The "HTTPProxy" section of the config file holds configuration option for HTTP proxy adressing. Currently only one proxy can be enabled, and no URI selection is done.
+Enabled [value: "yes" "no"]
+
+Specifies whether the proxy should be used or not when downloading files.
+Name [value: string]
+
+Specifies the proxy name (IP address or resolved name) without protocol identifier (eg, no "http://"). If not present, the proxy is disabled.
+Port [value: positive integer]
+
+Specifies the port to use with the proxy. If no port is specified, the default HTTP port (80) is used.
+
+ 
+<a name="Streaming"></a>
+Section "Streaming" <a href="#Overview">Back to top</a>
+The "Streaming" section of the config file holds all configuration options for real-time streaming using IETF SDP/RTSP/RTP/RTCP protocols.
+DefaultPort [value: unsigned short]
+
+Specifies the default port to use when connecting to a server (ignored if a port is specified in the url) if the port is 80 or 8080 (HTTP), the client will connect to the 
+RTSP server through an HTTP tunnel, and transport will take place on the RTSP connection.
+ReorderSize [value: positive integer]
+
+Size of the RTP reordering buffer - 0 means no reordering. Ignored when transport takes place on the RTSP connection. The bigger this value, the longer the reordering delay will be.
+RTPoverRTSP [value: "yes" "no" "OnlyCritical"]
+
+Specifies whether RTP packets should be carried on the RTSP connection (TCP or UDP), or carried on UDP. If the connection port is an HTTP port, this value is assumed to be true. If set to OnlyCritical, transport will take place on TCP only if a critical media (eg, neither audio nor video) is found in the session.
+RTSPTimeout [value: positive integer]
+
+Specifies connection timeout with the server: an RTSP request is considered as failed when the timeout expires.
+ForceFirstPort [value: positive integer]
+
+Specifies first port for RTP channels. If not set, the default first port used by GPAC is 7040.
+NATKeepAlive [value: positive integer]
+
+Specifies the maximum inactivity period in milliseconds for RTP sockets. If no data is received after this period, an empty RTP packet will be sent in order to keep any NAT alive. If 0 (default), disables NAT keep-alive packets.
+ForceMulticastIP [value: IP4 or IP6 address]
+
+Forces the specified multicast address to be used instead of the regular unicast. Note that some servers may not support multicast initiation by the client.
+ForceMulticastTTL [value: Positive integer]
+
+Indicates the TTL to use when the client initiates the multicast. Default value is 127.
+FirstPacketDrop [value: positive integer]
+
+Specifies the sequence number of the first RTP packet to be droped - 0 means no packet drop. Used for packet drop simulation tests.
+PacketDropFrequency [value: positive integer]
+
+Specifies the frequency at which SL packets are droped. If value is 20, one packet every 20 recieved packets will be droped. Used for packet drop simulation tests.
+
+ 
+
+<a name="MimeTypes"></a>
+Section "MimeTypes" <a href="#Overview">Back to top</a>
+This section is used to keep MIME types and file associations for GPAC modules.
+ The format of the key is:
+ mimeType="fileExt1 filexExt2 .. filexExtN" "MimeType description" ModuleName 
+ 
+The description is used for GUI purposes (open file dialogs). You may modify the file extension list to support your own extensions. 
+MIME Type is always checked when processing a remote ressource (eg http file) in order to load the appropriated modules. 
+If MIME type is not available, provided extensions are first checked, then all input modules are queried.
+
+
+ 
+
+<a name="StreamingCache"></a>
+Section "StreamingCache" <a href="#Overview">Back to top</a>
+The "StreamingCache" section of the config file holds all configuration options for the streaming cache. Streaming cache allows for recording of 
+live sources such as RTP/RTSP sessions and internet radios. This is currently just an experimental feature in GPAC.
+RecordDirectory [value: path]
+
+Specifies path for recorded files. Cached data is written directly to disk (no re-interleaving or similar processes).
+If not specified, the default cache directory (cf <a href="#General">General</a>) is used.
+BaseFileName [value: string]
+
+Specifies the base name for recorded files. If not present in configuration file, the service name (URL) is used.
+KeepExistingFiles [value: "yes" "no"]
+
+Specifies if cached files with same name should be kept or not. If not, an integer number is added to the cached file name, the higest number for the latest file.
+	
+ 
+
+<a name="SAXLoader"></a>
+Section "SAXLoader" <a href="#Overview">Back to top</a>
+The "SAXLoader" section of the config file holds all configuration options for XML SAX parsing of SVG, XMT and X3D files.
+Progressive [value: "yes" "no" "DOM"]
+Specifies XML parsing mode used by different file loaders using the SAX parser.
+<ul>
+<li>"yes": SAX parsing is used with progressive loading of the document.</li>
+<li>"no": SAX parsing is used, document will first be completely downloaded.</li>
+<li>"DOM": DOM parsing is used, document will first be completely downloaded. Only supported by libXML2 plugin, otherwise handled as "no".</li>
+</ul>
+MaxDuration [value positive integer]
+
+Specifies the maximum amount of time the SAX parser should spent loading a portion of the document. Only used with SAX Progressive mode
+	
+ 
+
+<a name="XviD"></a>
+Section "XviD" <a href="#Overview">Back to top</a>
+The "XviD" section of the config file holds all configuration options for the XviD codec.
+PostProc [value: "FilmEffect" "Deblock_Y" "Deblock_UV"]
+
+Specifies filters to apply when decoding video. The string is a list of filters separated with a space character.
+<ul>
+<li>"FilmEffect": xvid 1.0.0 filmEffect.</li>
+<li>"Deblock_Y": Y plane deblocking filter.</li>
+<li>"Deblock_UV": UV plane deblocking filter.</li>
+</ul>
+Threaded [value "yes" "no"]
+Specifies whether the decoder should run in its own thread or not.
+	
+ 
+
+<a name="FFMPEG"></a>
+Section "FFMPEG" <a href="#Overview">Back to top</a>
+The "FFMPEG" section of the config file holds all configuration options for the FFMPEG demuxer and decoder.
+DataBufferMS [value: positive integer]
+
+Specifies the amount of video/audio data (in milliseconds) to be bufferer before starting decoding. For developpers only.
+IOBufferSize [value: positive integer]
+
+Specifies the size (in bytes) of the buffer used to fecth data from network (http playback only). Default size is 8192 bytes.
+
+ 
+
+<a name="ISOReader"></a>
+Section "ISOReader" <a href="#Overview">Back to top</a>
+The "ISOReader" section of the config file holds all configuration options for the ISO Media File demuxer.
+IgnoreMPEG-4ForBrands [value: Full 4CC or 4CC pattern (abc* ab*)]
+
+Ignores all MPEG-4 systems tracks and IOD for files showing the listed brands in their compatible brand list.
+
+ 
+
+<a name="DVB"></a>
+Section "DVB" <a href="#Overview">Back to top</a>
+The "DVB" section of the config file holds all configuration options for DVB playback on GNU/Linux systems.
+ChannelsFile [value: Absolute file path]
+
+Specifies the DVB channels configuration file as produced by dvbtools' scan util.
+
+ 
+
+<a name="DASH"></a>
+Section "DASH" <a href="#Overview">Back to top</a>
+The "DASH" section of the config file holds all configuration options for DASH or HLS/M3U8 playback.
+KeepFiles [value: yes, no]
+
+Specifies whether downloaded files should not be deleted.
+AutoSwitchCount [value: positive integer]
+
+For debug purposes, instructs the player to switch representation every N segments. If 0 (default), switching is disabled.
+BufferingMode [value: segments, minBuffer, none]
+
+Selects buffer mode:
+<ul> 
+<li>segments: buffers complete segments as indicated in MPD before handing them to the player.</li>
+<li>minBuffer: asks the player to buffer media for the time indicated in the MPD, but segments are not pre-buffered. Default mode.</li> 
+<li>none: uses the player settings for buffering.</li> 
+</ul>
+
+NetworkAdaptation [value: disabled, bandwidth, buffer]
+
+Sets automatic adaptation logic mode:
+<ul>
+<li>disabled: no adaptation to network condition is used.</li>
+<li>bandwidth: network adaptation is based only on available download rate.</li> 
+<li>buffer: network adaptation is based on available download rate for quality increase and buffer levels for quality drops. Default mode.</li> 
+</ul>
+
+
+MemoryStorage [value: yes, no]
+
+Files are only stored in memory and destroyed after playback, no disk IO is used. Default is yes
+UseMaxResolution [value: yes, no]
+
+Forces the player to set the output video resolution to the max resolution available instead of resizing the window. Default is yes
+UseScreenResolution [value: yes, no]
+
+Disables all resolutions that are higher than the screen resolution. Default is yes
+StartRepresentation [value: minBandwidth, maxBandwidth, maxBandwidthTiles, minQuality, maxQuality]
+
+Instructs the DASH client to start playing the indicated representation before doing any switching. Default is minBandwidth.
+maxBandwidthTiles selects the highest bandwidth for tiles with high priority and lowest for other tiles, whereas maxBandwidth selects the highest bandwidth for tiles with high priority and closest lower bandwidth for other tiles.
+
+InitialTimeshift [value: positive integer ]
+
+If between 0 and 100, indicates the percentage of the timeshift buffer when starting playback. 
+If more than 100, indicates the number of milliseconds to rewind in the timeshift buffer when starting playback. 
+Default is 0 to tune to the live point.
+LowLatency [value: always, chunk, no]
+
+Sets low-latency mode enabled. In low-latency mode, media data is parsed as soon as possible while segment is being downloaded. Default is no.
+If chunk is selected, media data is re-parsed at each HTTP 1.1 chunk end. If always is selected, media data is re-parsed as soon as HTTP data is received. 
+AllowAbort [value: yes, no]
+
+Enables aborts of HTTP transfer when rate gets too low. This imply data loss and may also result in a connection loss. Default is no.
+UseServerUTC [value: yes, no]
+
+Enables using Server-UTC HTTP header to compensate any drift between client and server. Default is yes.
+DebugAdaptationSet [value: integer]
+
+Plays only the adaptation set indicated by its index in the MPD. If index is negative, all sets are used (default mode).
+
+TimeBetween404 [value: unsigned integer]
+
+Sets how many millisconds to wait between two 404 on the same segment. Default is 500. 
+
+SegmentExpirationThreshold [value: unsigned integer]
+
+Sets how many millisconds to wait after the segment AvailabilityEndDate before considering the segment lost. Default is 100. 
+
+SpeedAdaptation [value: yes no]
+
+Enables adaptation based on playback speed. Default is no. 
+
+SwitchProbeCount [value: unsigned integer]
+
+Sets how many segments the client shall wait before switching up bandwidth. If 0, switch will happen as soon as the bandwidth is enough, but this is more prone to network variations. 
+Default value is 1.
+
+TileAdaptation [value: none, rows, reverseRows, middleRows, columns, reverseColumns, middleColumns, center]
+
+Selects how bitrate is shared across tiles of a video:
+<ul> 
+<li>none: bitrate is shared equaly accross all tiles (default).</li>
+<li>rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row.</li> 
+<li>reverseRows: bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row.</li> 
+<li>middleRows: bitrate decreased for top and bottom rows only, same rate for each tile on the row.</li> 
+<li>columns: bitrate decreases for each columns of tiles starting from the left, same rate for each tile on the columns.</li> 
+<li>reverseColumns: bitrate decreases for each columns of tiles starting from the right, same rate for each tile on the columns.</li> 
+<li>middleColumns: bitrate decreased for left and right columns only, same rate for each tile on the columns.</li> 
+<li>center: bitrate decreased for all tiles on the edge of the picture.</li> 
+<li>edges: bitrate decreased for all tiles on the center of the picture.</li> 
+</ul>
+
+TileRateDecrease [value: percentage]
+
+Indicates the amount of bandwidth to use at each quality level. The rate is recursively applied at each level, e.g. if 50%, Level1 gets 50%, level2 gets 25%, ... If 100, automatic rate allocation will be done by maximizing the quality in order of priority. 
+If 0, bitstream will not be smoothed across tiles/qualities, and concurrency may happen between different media.
+Default is 100.
+
+
+ 
+
+<a name="ALSA"></a>
+Section "ALSA" <a href="#Overview">Back to top</a>
+The "ALSA" section of the config file holds all configuration options of the ALSA audio output module on GNU/Linux systems.
+DeviceName [value: string]
+
+Specifies the ALSA device to use. Default device is "hw:0,0".
+
+ 
+
+<a name="StreamingText"></a>
+Section "StreamingText" <a href="#Overview">Back to top</a>
+The "StreamingText" section of the config file holds all configuration options for the 3GPP/MPEG-4 Streaming Text decoder.
+UseTexturing [value: "yes" "no"]
+
+Specifies whether the text shall be drawn using an intermediate texture or not.<OutlineText [value: "yes" "no"]
+
+Specifies whether the text shall be drawn with a black thin outline or not.
+
+
+ 
+
+<a name="SHORTCUTS"></a>
+Section "Shortcuts" <a href="#Overview">Back to top</a>
+The "Shortcuts" section of the config file holds all shortcuts in GPAC. You can define a shorcut for an action as: 
+'action'='keyname' or 'action'='ctrl+keyname' or 'action'='alt+keyname' or "='action'='ctrl+alt+keyname' 
+Shift is not supported as a key modifier, and case is insensitive. 
+Currently defined actions are as follows:
+Play or Pause 
+Stop 
+Step 
+Exit 
+Mute 
+VolumeUp 
+VolumeDown 
+JumpForward 
+JumpBackward 
+JumpStart 
+JumpEnd 
+FastForward 
+FineForward 
+SlowForward 
+FastRewind 
+FineRewind 
+SlowRewind 
+Next 
+Previous 
+
+ 
+
+<a name="DSMCC"></a>
+Section "DSMCC" <a href="#Overview">Back to top</a>
+
+The "DSMCC" section of the config file holds the configuration option for the processing of DSMCC data.
+
+Activated [value: "true" "false"]
+
+Specifies if the DSMCC data will be processed (true). It implies creations of directories and files in the temp directory.
+
+
+ 
+
+<a name="OpenHEVC"></a>
+Section "OpenHEVC" <a href="#Overview">Back to top</a>
+
+The openHEVC section of the config file holds the configuration option for the OpenHEVC decoder.
+
+NumThreads [value: unsigned integer]
+
+Specifies the number of threads to allocate to the OpenHEVC decoder. Default is the number of detected cores minus one, or one if core detection fails.
+ThreadingType [value: frame , wpp , frame+wpp ]
+
+Specifies the threading type for the openHEVC decoder. Default is frame (wpp disabled).
+CBUnits [value: unsigned integer ]
+
+Specifies the number of decoded frames in memory before display. Default value is 4.
+PackHFR [value: yes, no ]
+
+Packs 4 consecutive frames in a single 4x frame.
+
+
+ 
+
+<a name="DirectFB"></a>
+Section "DirectFB" <a href="#Overview">Back to top</a>
+
+The "DirectFB" section of the config file holds the configuration options for the DirectFB output module. You may also want to check the <a href="http://directfb.org/wiki/index.php/Configuring_DirectFB">official documentation</a>.
+
+DisableAcceleration [value: "yes" "no"]
+
+Forces to disable hardware acceleration.
+DisableDisplay [value: "yes" "no"]
+
+Specifies the DisableDisplay parameter value.
+FlipSyncMode [value: "waitsync" "wait" "sync" "swap"]
+
+Specifies the flip sync mode.
+DisableBlit [value: "yes" "no"]
+
+Forces to disable hardware blitting.
+WindowMode [value: "X11" "SDL"]
+
+Specifies the underlying windowing library.
+
+
+ 
+
+<a name="DektecVideo"></a>
+Section "DektecVideo" <a href="#Overview">Back to top</a>
+
+The "DektecVideo" section of the config file holds the configuration options for the Dektec SDI video output module.</a>
+
+SDIOutput [value: unsigned integer]
+
+Specifies the output port of the card. Default value is 1.
+
+ 
+
+<a name="M2TS"></a>
+Section "M2TS" <a href="#Overview">Back to top</a>
+
+The "M2TS" section of the config file holds configuration options for MPEG-2 TS demultiplexer module.</a>
+
+ForceTEMILocation [value: URL string]
+
+Overrides the URL in TEMI location descriptor with the specified value.
+RecordTo [value: file path]
+
+Records the TS content to the specified file.
+
+</body>
+</html>

v0.6.1.tar.gz/doc/man/dashcast.1 Added

@@ -0,0 +1,161 @@
+.TH DASHCAST "1" "July 2015" "DashCast" "GPAC"
+
+.SH NAME
+DashCast - MPEG-4 Systems Framework and Software Development Kit
+
+.SH SYNOPSIS
+.B DashCast
+.RI [options]
+
+.SH OPTIONS
+.SS "General options"
+.TP
+\fB\-log-file \fRfilename
+set output log file. Also works with -lf
+.TP
+\fB\-logs \fRLOGS
+set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX
+.TP
+\fB\-conf \fRfilename
+set the configuration file name (default: dashcast.conf)
+.TP
+\fB\-switch-source \fRfilename
+set the configuration file name for source switching
+
+.SS "Live options"
+.TP
+\fB\-live
+system is live and input is a camera
+.TP
+\fB\-live-media
+system is live and input is a media file
+.TP
+\fB\-no-loop
+system does not loop on the input media file when live
+.TP
+\fB\-dynamic-ast
+changes segment availability start time at each MPD generation (old behaviour but not allowed in most profiles)
+.TP
+\fB\-insert-utc
+inserts UTC clock at the start of each segment
+
+.SS "Source options"
+.TP
+\fB\-npts
+use frame counting for timestamps (not error-free) instead of source timing (default)
+.TP
+\fB\-av \fRstring
+set the source name for a multiplexed audio and video input.
+If this option is present, neither '-a' nor '-v' shall be present.
+.TP
+\fB\-v \fRstring
+set the source name for a video input.
+If input is from a webcam, use "/dev/video[x]" where x is the video device number.
+If input is the screen video, use ":0.0+[x],[y]" which captures from upper-left at x,y.
+If input is from stdin, use "pipe:".
+.TP
+\fB\-vf \fRstring
+set the input video format.
+To capture from a webcam, set video4linux2.
+To capture the screen, set x11grab.
+.TP
+\fB\-v4l2f \fRinv4l2f
+inv4l2f is the input format for webcam acquisition.
+It can be mjpeg, yuyv422, etc.
+.TP
+\fB\-pixf \fRFMT
+set the input pixel format
+.TP
+\fB\-vfr \fRN
+force the input video framerate
+.TP
+\fB\-vres \fRWxH
+force the video resolution (e.g. 640x480)
+.TP
+\fB\-vcrop \fRXxY
+crop the source video from X pixels left and Y pixels top. Must be used with -vres.
+.TP
+\fB\-a \fRstring
+set the source name for an audio input.
+If input is from microphone, use "plughw:[x],[y]" where x is the card number and y is the device number
+.TP
+\fB\-af \fRstring
+set the input audio format
+
+.SS "Output options"
+.TP
+\fB\-vcodec \fRstring
+set the output video codec (default: h264)
+.TP
+\fB\-vcustom \fRstring
+send custom parameters directly to the video encoder
+.TP
+\fB\-gdr
+use Gradual Decoder Refresh feature for video encoding (h264 codec only)
+.TP
+\fB\-gop
+specify GOP size in frames - default is framerate (1 sec gop)
+.TP
+\fB\-low-delay
+specify that low delay settings should be used (no B-frames, fast encoding)
+.TP
+\fB\-acodec \fRstring
+set the output audio codec (default: aac)
+.TP
+\fB\-acustom \fRstring
+send custom parameters directly to the audio encoder
+
+.SS "DASH options"
+.TP
+\fB\-seg-dur \fRdur:int
+set the segment duration in millisecond (default value: 1000)
+.TP
+\fB\-frag \fRdur:int
+set the fragment duration in millisecond (default value: 1000) (same as -frag-dur)
+.TP
+\fB\-seg-marker \fRmarker:4cc
+add a marker box named marker at the end of DASH segment
+.TP
+\fB\-out \fRoutdir:str
+outdir is the output data directory (default: output)
+.TP
+\fB\-mpd \fRmpdname:str
+mpdname is the MPD file name (default: dashcast.mpd)
+.TP
+\fB\-ast-offset \fRdur:int
+dur is the MPD availabilityStartTime shift in milliseconds (default value: 0)
+.TP
+\fB\-mpd-refresh \fRdur:int
+dur is the MPD minimumUpdatePeriod in seconds
+.TP
+\fB\-time-shift \fRdur:int
+dur is the MPD TimeShiftBufferDepth in seconds.
+The default value is 10. Specify -1 to keep all files.
+.TP
+\fB\-min-buffer \fRdur:float
+dur is the MPD minBufferTime in seconds (default value: 1.0)
+.TP
+\fB\-base-url \fRbaseurl:str
+baseurl is the MPD BaseURL
+
+.SH EXAMPLES
+DashCast -av test.avi -live-media
+.PP
+DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media
+.PP
+DashCast -vf video4linux2 -vres 1280x720 -vfr 24 -v4l2f mjpeg -v /dev/video0 -af alsa -a plughw:1,0 -live
+.PP
+DashCast -vf x11grab -vres 800x600 -vfr 25 -v :0.0 -live
+
+.SH BUGS and OTHER HELP
+For bug reports, more information on BT or XMT-A formats or GPAC TTXT files or ISMACryp,
+MPEG-4 Systems usage and more help on DashCast please visit the GPAC web site http://www.gpac.io
+
+.SH "AUTHORS"
+Arash Shafiei.
+Copyright \(co Telecom ParisTech 2000-2013.
+
+.SH "SEE ALSO"
+.BR GPAC (1),
+.BR MP4Box (1),
+.BR MP4Client (1)

v0.5.2.tar.gz/doc/man/gpac.1 -> v0.6.1.tar.gz/doc/man/gpac.1 Changed

v0.6.1.tar.gz/doc/man/mp42ts.1 Added

@@ -0,0 +1,172 @@
+.TH MP42TS "1" "July 2015" "MP42TS" "GPAC"
+
+.SH NAME
+MP42TS - MPEG-4 Systems Framework and Software Development Kit
+
+.SH SYNOPSIS
+.B MP42TS
+.RI <inputs> <destinations> [options]
+
+.SH OPTIONS
+.SS "Inputs"
+.TP
+\fB\-src \fRfilename[:OPTS]
+specifies an input file used for a TS service:
+.br
+ * currently only supports ISO files and SDP files
+.br
+ * can be used several times, once for each program
+.br
+By default each source is a program in a TS. 
+Source options are colon-separated list of options, as follows:
+.br
+ 
+.br
+\fBID\fR=\fBN \fRspecifies the program ID for this source.
+All sources with the same ID will be added to the same program
+.br
+\fBname\fR=\fBSTR \fRprogram name, as used in DVB service description table
+.br
+\fBprovider\fR=\fBSTR \fRprovider name, as used in DVB service description table
+
+.TP
+\fB\-prog filename
+same as "-src filename"
+
+.SS "Destinations"
+Several destinations may be specified as follows, at least one is mandatory:
+.TP
+\fB\-dst-udp \fRUDP_address:port (multicast or unicast)
+.TP
+\fB\-dst-rtp \fRRTP_address:port
+.TP
+\fB\-dst-file \fRfilename
+
+The following parameters may be specified when -dst-file is used:
+.TP
+\fB\-segment-dir \fRdir
+server local directory to store segments (ends with a '/')
+.TP
+\fB\-segment-duration \fRdur
+segment duration in seconds
+.TP
+\fB\-segment-manifest \fRfile
+m3u8 file basename
+.TP
+\fB\-segment-http-prefix \fRp
+client address for accessing server segments
+.TP
+\fB\-segment-number \fRn
+number of segments to list in the manifest
+
+.SS "Basic options"
+.TP
+\fB\-rate \fRR
+specifies target rate in kbps of the multiplex (optional)
+.TP
+\fB\-real-time
+specifies the muxer will work in real-time mode
+.br
+ * if not specified, the muxer will generate the TS as quickly as possible
+.br
+ * automatically set for SDP or BT input
+.TP
+\fB\-pcr-init \fRV
+sets initial value V for PCR - if not set, random value is used
+.TP
+\fB\-pcr-offset \fRV
+offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media.
+.TP
+\fB\-psi-rate \fRV
+sets PSI refresh rate V in ms (default 100ms).
+.br
+ * If 0, PSI data is only send once at the beginning or before each IDR when -rap option is set.
+.br
+ * This should be set to 0 for DASH streams.
+.TP
+\fB\-time \fRn
+request the muxer to stop after n ms
+.TP
+\fB\-single-au
+forces 1 PES = 1 AU (disabled by default)
+.TP
+\fB\-rap
+forces RAP/IDR to be aligned with PES start for video streams (disabled by default).
+In this mode, PAT, PMT and PCR will be inserted before the first TS packet of the RAP PES.
+.TP
+\fB\-flush-rap
+same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT
+.TP
+\fB\-nb-pack \fRN
+specifies to pack up to N TS packets together before sending on network or writing to file
+.TP
+\fB\-pcr-ms \fRN
+sets max interval in ms between 2 PCR. Default is 100 ms
+.TP
+\fB\-ttl \fRN
+specifies Time-To-Live for multicast. Default is 1.
+.TP
+\fB\-ifce \fRIPIFCE
+specifies default IP interface to use. Default is IF_ANY.
+.TP
+\fB\-temi \fR[URL]
+Inserts TEMI time codes in adaptation field. URL is optionnal
+.TP
+\fB\-temi-delay \fRDelayMS
+Specifies delay between two TEMI url descriptors (default is 1000)
+.TP
+\fB\-temi-offset \fROffsetMS
+Specifies an offset in ms to add to TEMI (by default TEMI starts at 0)
+.TP
+\fB\-temi-noloop
+Do not restart the TEMI timeline at the end of the source
+.TP
+\fB\-sdt-rate \fRMS
+Gives the SDT carrousel rate in milliseconds. If 0 (default), SDT is not sent
+
+.SS "MPEG-4/T-DMB options"
+.TP
+\fB\-bifs-src \fRfilename
+update file: must be either an .sdp or a .bt file
+.TP
+\fB\-audio \fRurl
+may be mp3/udp or aac/http (shoutcast/icecast)
+.TP
+\fB\-video \fRurl
+shall be a raw h264 frame
+.TP
+\fB\-mpeg4-carousel \fRn
+carousel period in ms
+.TP
+\fB\-mpeg4\fR,\fB \-4on2
+forces usage of MPEG-4 signaling (IOD and SL Config)
+.TP
+\fB\-4over2
+same as -4on2 and uses PMT to carry OD Updates
+.TP
+\fB\-bifs-pes
+carries BIFS over PES instead of sections
+.TP
+\fB\-bifs-pes-ex
+carries BIFS over PES without writing timestamps in SL
+
+.SS "Misc options"
+.TP
+\fB\-logs
+set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX
+.TP
+\fB\-h\fR,\fB \-help
+print this screen
+
+.SH BUGS and OTHER HELP
+For bug reports, more information on BT or XMT-A formats or GPAC TTXT files or ISMACryp,
+MPEG-4 Systems usage and more help on MP42TS please visit the GPAC web site http://www.gpac.io
+
+.SH "AUTHORS"
+Jean Le Feuvre, Cyril Concolato, Romain Bouqueau.
+Copyright \(co Telecom ParisTech 2005-2012.
+
+.SH "SEE ALSO"
+.BR GPAC (1),
+.BR MP4Box (1),
+.BR MP4Client (1)

v0.5.2.tar.gz/doc/man/mp4box.1 -> v0.6.1.tar.gz/doc/man/mp4box.1 Changed

v0.5.2.tar.gz/extra_lib/include/DTAPI.h -> v0.6.1.tar.gz/extra_lib/include/DTAPI.h Changed

@@ -1,5855 +1,7232 @@
-//*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* DTAPI.h *#*#*#*#*#*#*#*#*#* (C) 2000-2014 DekTec
-//
-// DTAPI - C++ API for DekTec PCI/PCI-Express cards, USB-2 adapters and network devices
-//
- 
-#ifndef __DTAPI_H
-#define __DTAPI_H
-
-// DTAPI version
-#define DTAPI_VERSION_MAJOR 5
-#define DTAPI_VERSION_MINOR 8
-#define DTAPI_VERSION_BUGFIX 0
-#define DTAPI_VERSION_BUILD 43
-
-//-.-.-.-.-.-.-.-.-.-.-.-.- Additional Libraries to be Linked In -.-.-.-.-.-.-.-.-.-.-.-.-
-
-#ifdef _WIN32
-
-#ifndef _LIB // Do not link libraries into DTAPI itself
-#pragma comment(lib, "iphlpapi.lib")
-#pragma comment(lib, "ws2_32.lib")
-#pragma comment(lib, "setupapi.lib")
-#pragma comment(lib, "comctl32.lib")
-#pragma comment(lib, "wbemuuid.lib")
-#endif
-
-#ifndef _DTAPI_DISABLE_AUTO_LINK
- // Are we using multi-threaded-DLL or static runtime libraries?
- #ifdef _DLL
- // Link with DLL runtime version (/MD)
- #ifdef _DEBUG
- #ifdef _WIN64
- #pragma comment(lib, "DTAPI64MDd.lib") // Debug 64bit
- #pragma message("Automatically linking with DTAPI64MDd.lib")
- #else
- #pragma comment(lib, "DTAPIMDd.lib") // Debug 32bit
- #pragma message("Automatically linking with DTAPIMDd.lib") 
- #endif
- #else
- #ifdef _WIN64
- #pragma comment(lib, "DTAPI64MD.lib") // Release 64bit
- #pragma message("Automatically linking with DTAPI64MD.lib")
- #else
- #pragma comment(lib, "DTAPIMD.lib") // Release 32bit
- #pragma message("Automatically linking with DTAPIMD.lib") 
- #endif
- #endif
- #else
- // Link to static runtime version (/MT)
- #ifdef _DEBUG
- #ifdef _WIN64
- #pragma comment(lib, "DTAPI64MTd.lib") // Debug 64bit
- #pragma message("Automatically linking with DTAPI64MTd.lib")
- #else
- #pragma comment(lib, "DTAPIMTd.lib") // Debug 32bit
- #pragma message("Automatically linking with DTAPIMTd.lib") 
- #endif
- #else
- #ifdef _WIN64
- #pragma comment(lib, "DTAPI64MT.lib") // Release 64bit
- #pragma message("Automatically linking with DTAPI64MT.lib")
- #else
- #pragma comment(lib, "DTAPIMT.lib") // Release 32bit
- #pragma message("Automatically linking with DTAPIMT.lib") 
- #endif
- #endif
- #endif
-#endif
-#endif // #ifdef _WIN32
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Includes -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-#ifndef _WIN32
- // Linux specific includes: For NULL type definition
- #include </usr/include/linux/stddef.h>
- // For intptr_t
- #include <stdint.h>
-#endif
-
-// STL includes
-#include <list>
-#include <map>
-#include <string>
-#include <vector>
-#include <limits>
-
-// When creating a DLL under Windows, disable warnings related to exporting STL
-// instantiations in classes.
-// See also: http://support.microsoft.com/kb/q168958/
-#ifdef _MSC_VER
- #pragma warning(disable: 4251)
-#endif
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Support Types -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-#ifndef _WIN32
- typedef signed long long __int64;
-#endif
-
-// All DTAPI code lives in namespace Dtapi
-namespace Dtapi
-{
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Forward declarations -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-class AdvDemod;
-class DtaPlusDevice;
-class DtDvbT2Pars;
-class DteDevice;
-class DtSdiUtility;
-class FrameBufImpl;
-class IDevice;
-class IDtDemodEvent;
-class InpChannel;
-class IXpMutex;
-class MplpHelper;
-class OutpChannel;
-class SdiMatrixImpl;
-
-struct DtDabEnsembleInfo;
-struct DtDabEtiStreamSelPars;
-struct DtDabStreamSelPars;
-struct DtDemodParsAtsc;
-struct DtDemodParsDab;
-struct DtDemodParsDvbC2;
-struct DtDemodParsDvbS;
-struct DtDemodParsDvbS2;
-struct DtDemodParsDvbT;
-struct DtDemodParsDvbT2;
-struct DtDemodParsIq;
-struct DtDemodParsIq2131;
-struct DtDemodParsIsdbt;
-struct DtDemodParsQam;
-struct DtDemodLdpcStats;
-struct DtDemodMaLayerData;
-struct DtDemodMaLayerStats;
-struct DtDemodPlpBlocks;
-struct DtDvbC2DemodL1Part2Data;
-struct DtDvbC2DemodL1PlpSigData;
-struct DtDvbC2ModStatus;
-struct DtDvbC2Pars;
-struct DtDvbC2PlpPars;
-struct DtDvbC2StreamSelPars;
-struct DtDvbC2XFecFrameHeader;
-struct DtDvbS2ModStatus;
-struct DtDvbS2ModCod;
-struct DtDvbS2Pars;
-struct DtDemodParsDvbS2Adv;
-struct DtDvbTStreamSelPars;
-struct DtDvbTTpsInfo;
-struct DtDvbT2DemodL1Data;
-struct DtDvbT2ModStatus;
-struct DtDvbT2StreamSelPars;
-struct DtIsdbtStreamSelPars;
-struct DtIsdbTmmPars;
-struct DtPar;
-struct DtPlpInpPars;
-struct DtStatistic;
-struct DtT2MiStreamSelPars;
-struct DtVirtualOutData;
-struct DtRsDecStats;
-struct DtVitDecStats;
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+=+=+=+=+ DTAPI HELPER CLASSES AND HELPER TYPES +=+=+=+=+=+=+=+=+=+=+=+=+
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DTAPI_RESULT -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-// Type returned by most API calls
-typedef unsigned int DTAPI_RESULT;
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtExc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Exception object thrown from API calls (if API call throws an exception)
-//
-class DtExc
-{
-public:
- const DTAPI_RESULT m_Error; // DTAPI result code (i.e. reason of exception)
- 
-public:
- DtExc(DTAPI_RESULT e) : m_Error(e) {}
- virtual ~DtExc() {}
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBufferInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtBufferInfo
-{
- int m_VidStd; // Video standard 
- int m_NumColumns; // Number of columns 
- __int64 m_NumReceived; // Number of frames received
- __int64 m_NumDropped; // Number of frames dropped
- __int64 m_NumTransmitted; // Number of frames transmitted
- __int64 m_NumDuplicated; // Number of frames duplicated
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCaps - Capabilities -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Scalable type for storing (combinations of) capability flags.
-// It can be used with bitwise operators for testing and setting of capabilities.
-//
-class DtCaps 
-{
- // Number of 64-bit integers used to represent a capability
- static const int DTCAPS_SIZE = 3;
-
-public:
- DtCaps();
- DtCaps(int BitNr);
- DtCaps(__int64 F1, __int64 F2, __int64 F3);
-
-public:
- int GetCapIndex() const;
- std::string ToString() const;
- DtCaps operator & (const DtCaps& Caps) const;
- DtCaps& operator &= (const DtCaps& Caps);
- DtCaps operator | (const DtCaps& Caps) const;
- DtCaps& operator |= (const DtCaps& Caps);
- bool operator == (const DtCaps& Caps) const;
- bool operator == (const int Zero) const;
- bool operator != (const DtCaps& Caps) const;
- bool operator != (const int Zero) const;
- __int64 operator [] (const int n) const;
- DtCaps operator ~ () const;
- // Implementation data
-private:
- __int64 m_Flags[DTCAPS_SIZE];
-};
-
-// Capabilities
-#define DTAPI_CAP_EMPTY Dtapi::DtCaps() // DtCaps without any capability flags
-
-// Capability group 3GLVL - 3G-SDI level config
-#define DTAPI_CAP_3GLVLA Dtapi::DtCaps(0) // 3G-SDI level A
-#define DTAPI_CAP_3GLVLB Dtapi::DtCaps(1) // 3G-SDI level B
-
-// Capability group APPS - Applications
-#define DTAPI_CAP_C2X Dtapi::DtCaps(2) // C2Xpert
-#define DTAPI_CAP_DP Dtapi::DtCaps(3) // DtGrabber+ and DtTV
-#define DTAPI_CAP_DTTV Dtapi::DtCaps(4) // DtTV
-#define DTAPI_CAP_E Dtapi::DtCaps(5) // DtEncode
-#define DTAPI_CAP_J Dtapi::DtCaps(6) // DtJitter
-#define DTAPI_CAP_MR Dtapi::DtCaps(7) // MuxXpert runtime
-#define DTAPI_CAP_MS Dtapi::DtCaps(8) // MuxXpert SDK
-#define DTAPI_CAP_MX Dtapi::DtCaps(9) // MuxXpert
-#define DTAPI_CAP_RC Dtapi::DtCaps(10) // StreamXpress remote control
-#define DTAPI_CAP_RX Dtapi::DtCaps(11) // RFXpert
-#define DTAPI_CAP_SP Dtapi::DtCaps(12) // StreamXpress stream player
-#define DTAPI_CAP_SX Dtapi::DtCaps(13) // StreamXpert analyzer
-#define DTAPI_CAP_SXDGL Dtapi::DtCaps(14) // StreamXpert analyzer (dongled)
-#define DTAPI_CAP_SY Dtapi::DtCaps(15) // SdEye
-#define DTAPI_CAP_XP Dtapi::DtCaps(16) // Xpect
-#define DTAPI_CAP_T2X Dtapi::DtCaps(17) // T2Xpert
-
-// Capability group BOOLIO - Boolean I/O capabilities
-#define DTAPI_CAP_BW Dtapi::DtCaps(18) // Isochronous bandwidth allocated
-#define DTAPI_CAP_FAILSAFE Dtapi::DtCaps(19) // A fail-over relay is available
-#define DTAPI_CAP_FRACMODE Dtapi::DtCaps(20) // Fractional mode is supported
-#define DTAPI_CAP_GENLOCKED Dtapi::DtCaps(21) // Locked to a genlock reference
-#define DTAPI_CAP_GENREF Dtapi::DtCaps(22) // Genlock reference input
-#define DTAPI_CAP_SWS2APSK Dtapi::DtCaps(23) // DVB-S2 APSK mode
-
-// Capability group DEMODPROPS - Demodulation properties
-#define DTAPI_CAP_ANTPWR Dtapi::DtCaps(24) // Antenna power
-#define DTAPI_CAP_LNB Dtapi::DtCaps(25) // LNB
-#define DTAPI_CAP_RX_ADV Dtapi::DtCaps(26) // Advanced demodulation
-
-// Capability group FREQBAND - Frequency band
-#define DTAPI_CAP_LBAND Dtapi::DtCaps(27) // L-band 950-2150MHz
-#define DTAPI_CAP_VHF Dtapi::DtCaps(28) // VHF-band 47-470MHz
-#define DTAPI_CAP_UHF Dtapi::DtCaps(29) // UHF-band 400-862MHz
-
-// Capability group IODIR - I/O direction
-#define DTAPI_CAP_DISABLED Dtapi::DtCaps(30) // Port is disabled
-#define DTAPI_CAP_INPUT Dtapi::DtCaps(31) // Uni-directional input
-#define DTAPI_CAP_OUTPUT Dtapi::DtCaps(32) // Uni-directional output
-
-// Subcapabilities of IODIR, DTAPI_CAP_INPUT
-#define DTAPI_CAP_SHAREDANT Dtapi::DtCaps(33) // Get antenna signal from another port
-
-// Subcapabilities of IODIR, DTAPI_CAP_OUTPUT
-#define DTAPI_CAP_DBLBUF Dtapi::DtCaps(34) // Double buffered output
-#define DTAPI_CAP_LOOPS2L3 Dtapi::DtCaps(35) // Loop-through of DVB-S2 in L3-frames
-#define DTAPI_CAP_LOOPS2TS Dtapi::DtCaps(36) // Loop-through of an DVB-S(2) input
-#define DTAPI_CAP_LOOPTHR Dtapi::DtCaps(37) // Loop-through of another input
-
-// Capability group IOPROPS - Miscellaneous I/O properties
-#define DTAPI_CAP_ASIPOL Dtapi::DtCaps(38) // ASI output signal can be inverted
-#define DTAPI_CAP_HUFFMAN Dtapi::DtCaps(39) // Huffman coding for SDI
-#define DTAPI_CAP_IPPAIR Dtapi::DtCaps(40) // Network port supports failover
-#define DTAPI_CAP_L3MODE Dtapi::DtCaps(41) // L3-frame mode
-#define DTAPI_CAP_MATRIX Dtapi::DtCaps(42) // Matrix API support
-#define DTAPI_CAP_RAWASI Dtapi::DtCaps(43) // Raw ASI
-#define DTAPI_CAP_SDI10BNBO Dtapi::DtCaps(44) // 10-bit network byte order
-#define DTAPI_CAP_SDITIME Dtapi::DtCaps(45) // SDI timestamping
-#define DTAPI_CAP_TIMESTAMP64 Dtapi::DtCaps(46) // 64-bit timestamping
-#define DTAPI_CAP_TRPMODE Dtapi::DtCaps(47) // Transparent mode
-#define DTAPI_CAP_TS Dtapi::DtCaps(48) // MPEG-2 transport stream
-#define DTAPI_CAP_TXONTIME Dtapi::DtCaps(49) // Transmit on timestamp
-
-// Capability group IOSTD - I/O standard
-#define DTAPI_CAP_3GSDI Dtapi::DtCaps(50) // 3G-SDI
-#define DTAPI_CAP_ASI Dtapi::DtCaps(51) // DVB-ASI transport stream
-#define DTAPI_CAP_DEMOD Dtapi::DtCaps(52) // Demodulation
-#define DTAPI_CAP_HDSDI Dtapi::DtCaps(53) // HD-SDI
-#define DTAPI_CAP_IFADC Dtapi::DtCaps(54) // IF A/D converter
-#define DTAPI_CAP_IP Dtapi::DtCaps(55) // Transport stream over IP
-#define DTAPI_CAP_MOD Dtapi::DtCaps(56) // Modulator output
-#define DTAPI_CAP_RS422 Dtapi::DtCaps(57) // RS422 port
-#define DTAPI_CAP_SDI Dtapi::DtCaps(58) // SD-SDI
-#define DTAPI_CAP_SPI Dtapi::DtCaps(59) // DVB-SPI transport stream
-#define DTAPI_CAP_SPISDI Dtapi::DtCaps(60) // SD-SDI on a parallel port
-
-// Subcapabilities of IOSTD, DTAPI_CAP_3GSDI
-#define DTAPI_CAP_1080P50 Dtapi::DtCaps(61) // 1080p/50
-#define DTAPI_CAP_1080P59_94 Dtapi::DtCaps(62) // 1080p/59.94
-#define DTAPI_CAP_1080P60 Dtapi::DtCaps(63) // 1080p/60
-
-// Subcapabilities of IOSTD, DTAPI_CAP_HDSDI
-#define DTAPI_CAP_1080I50 Dtapi::DtCaps(64) // 1080i/50
-#define DTAPI_CAP_1080I59_94 Dtapi::DtCaps(65) // 1080i/59.94
-#define DTAPI_CAP_1080I60 Dtapi::DtCaps(66) // 1080i/60
-#define DTAPI_CAP_1080P23_98 Dtapi::DtCaps(67) // 1080p/23.98
-#define DTAPI_CAP_1080P24 Dtapi::DtCaps(68) // 1080p/24
-#define DTAPI_CAP_1080P25 Dtapi::DtCaps(69) // 1080p/25
-#define DTAPI_CAP_1080P29_97 Dtapi::DtCaps(70) // 1080p/29.97
-#define DTAPI_CAP_1080P30 Dtapi::DtCaps(71) // 1080p/30
-#define DTAPI_CAP_720P23_98 Dtapi::DtCaps(72) // 720p/23.98
-#define DTAPI_CAP_720P24 Dtapi::DtCaps(73) // 720p/24
-#define DTAPI_CAP_720P25 Dtapi::DtCaps(74) // 720p/25
-#define DTAPI_CAP_720P29_97 Dtapi::DtCaps(75) // 720p/29.97
-#define DTAPI_CAP_720P30 Dtapi::DtCaps(76) // 720p/30
-#define DTAPI_CAP_720P50 Dtapi::DtCaps(77) // 720p/50
-#define DTAPI_CAP_720P59_94 Dtapi::DtCaps(78) // 720p/59.94
-#define DTAPI_CAP_720P60 Dtapi::DtCaps(79) // 720p/60
-
-// Subcapabilities of IOSTD, DTAPI_CAP_SDI
-#define DTAPI_CAP_525I59_94 Dtapi::DtCaps(80) // 525i/59.94
-#define DTAPI_CAP_625I50 Dtapi::DtCaps(81) // 625i/50
-
-// Subcapabilities of IOSTD, DTAPI_CAP_SPISDI
-#define DTAPI_CAP_SPI525I59_94 Dtapi::DtCaps(82) // SPI 525i/59.94
-#define DTAPI_CAP_SPI625I50 Dtapi::DtCaps(83) // SPI 625i/50
-
-// Capability group MODSTD - Modulation standards
-#define DTAPI_CAP_TX_ATSC Dtapi::DtCaps(84) // ATSC 8-VSB modulation
-#define DTAPI_CAP_TX_CMMB Dtapi::DtCaps(85) // CMMB modulation
-#define DTAPI_CAP_TX_DAB Dtapi::DtCaps(86) // DAB modulation
-#define DTAPI_CAP_TX_DTMB Dtapi::DtCaps(87) // DTMB modulation
-#define DTAPI_CAP_TX_DVBC2 Dtapi::DtCaps(88) // DVB-C2 modulation
-#define DTAPI_CAP_TX_DVBS Dtapi::DtCaps(89) // DVB-S modulation
-#define DTAPI_CAP_TX_DVBS2 Dtapi::DtCaps(90) // DVB-S2 modulation
-#define DTAPI_CAP_TX_DVBS2X Dtapi::DtCaps(91) // DVB-S2X modulation
-#define DTAPI_CAP_TX_DVBT Dtapi::DtCaps(92) // DVB-T modulation
-#define DTAPI_CAP_TX_DVBT2 Dtapi::DtCaps(93) // DVB-T2 modulation
-#define DTAPI_CAP_TX_GOLD Dtapi::DtCaps(94) // GOLD for modulators
-#define DTAPI_CAP_TX_IQ Dtapi::DtCaps(95) // I/Q sample modulation
-#define DTAPI_CAP_TX_ISDBS Dtapi::DtCaps(96) // ISDB-S modulation
-#define DTAPI_CAP_TX_ISDBT Dtapi::DtCaps(97) // ISDB-T modulation
-#define DTAPI_CAP_TX_ISDBTMM Dtapi::DtCaps(98) // ISDB-Tmm modulation
-#define DTAPI_CAP_TX_MH Dtapi::DtCaps(99) // ATSC-MH modulation
-#define DTAPI_CAP_TX_QAMA Dtapi::DtCaps(100) // QAM-A modulation
-#define DTAPI_CAP_TX_QAMB Dtapi::DtCaps(101) // QAM-B modulation
-#define DTAPI_CAP_TX_QAMC Dtapi::DtCaps(102) // QAM-C modulation
-#define DTAPI_CAP_TX_T2MI Dtapi::DtCaps(103) // T2MI transmission
-#define DTAPI_CAP_TX_T2SPLP Dtapi::DtCaps(104) // DVB-T2 single PLP modulation
-
-// Capability group MODPROPS - Modulation properties
-#define DTAPI_CAP_ADJLVL Dtapi::DtCaps(105) // Adjustable output level
-#define DTAPI_CAP_CM Dtapi::DtCaps(106) // Channel simulation
-#define DTAPI_CAP_CW Dtapi::DtCaps(107) // Continuous wave
-#define DTAPI_CAP_DIGIQ Dtapi::DtCaps(108) // Digital I/Q sample output
-#define DTAPI_CAP_IF Dtapi::DtCaps(109) // IF output
-#define DTAPI_CAP_MUTE Dtapi::DtCaps(110) // Mute RF output signal
-#define DTAPI_CAP_ROLLOFF Dtapi::DtCaps(111) // Adjustable roll-off factor
-#define DTAPI_CAP_S2APSK Dtapi::DtCaps(112) // DVB-S2 16-APSK/32-APSK
-#define DTAPI_CAP_SNR Dtapi::DtCaps(113) // AWGN insertion
-#define DTAPI_CAP_TX_16MHZ Dtapi::DtCaps(114) // 16MHz bandwidth mode
-
-// Capability group RFCLKSEL - RF clock source selection
-#define DTAPI_CAP_RFCLKEXT Dtapi::DtCaps(115) // External RF clock input
-#define DTAPI_CAP_RFCLKINT Dtapi::DtCaps(116) // Internal RF clock reference
-
-// Capability group RXSTD - Receiver standards
-#define DTAPI_CAP_RX_ATSC Dtapi::DtCaps(117) // ATSC 8-VSB reception
-#define DTAPI_CAP_RX_CMMB Dtapi::DtCaps(118) // CMMB reception
-#define DTAPI_CAP_RX_DAB Dtapi::DtCaps(119) // DAB reception
-#define DTAPI_CAP_RX_DTMB Dtapi::DtCaps(120) // DTMB reception
-#define DTAPI_CAP_RX_DVBC2 Dtapi::DtCaps(121) // DVB-C2 reception
-#define DTAPI_CAP_RX_DVBS Dtapi::DtCaps(122) // DVB-S reception
-#define DTAPI_CAP_RX_DVBS2 Dtapi::DtCaps(123) // DVB-S2 reception
-#define DTAPI_CAP_RX_DVBT Dtapi::DtCaps(124) // DVB-T reception
-#define DTAPI_CAP_RX_DVBT2 Dtapi::DtCaps(125) // DVB-T2 reception
-#define DTAPI_CAP_RX_GOLD Dtapi::DtCaps(126) // GOLD for receivers
-#define DTAPI_CAP_RX_IQ Dtapi::DtCaps(127) // I/Q sample reception
-#define DTAPI_CAP_RX_ISDBS Dtapi::DtCaps(128) // ISDB-S reception
-#define DTAPI_CAP_RX_ISDBT Dtapi::DtCaps(129) // ISDB-T reception
-#define DTAPI_CAP_RX_MH Dtapi::DtCaps(130) // ATSC-MH reception
-#define DTAPI_CAP_RX_QAMA Dtapi::DtCaps(131) // QAM-A reception
-#define DTAPI_CAP_RX_QAMB Dtapi::DtCaps(132) // QAM-B reception
-#define DTAPI_CAP_RX_QAMC Dtapi::DtCaps(133) // QAM-C reception
-#define DTAPI_CAP_RX_T2MI Dtapi::DtCaps(134) // T2MI reception
-
-// Capability group SPICLKSEL - Parallel port clock source selection
-#define DTAPI_CAP_SPICLKEXT Dtapi::DtCaps(135) // External clock input
-#define DTAPI_CAP_SPICLKINT Dtapi::DtCaps(136) // Internal clock reference
-
-// Capability group SPIMODE - Parallel port mode
-#define DTAPI_CAP_SPIFIXEDCLK Dtapi::DtCaps(137) // SPI fixed clock with valid signal
-#define DTAPI_CAP_SPIDVBMODE Dtapi::DtCaps(138) // SPI DVB mode
-#define DTAPI_CAP_SPISER8B Dtapi::DtCaps(139) // SPI serial 8-bit mode
-#define DTAPI_CAP_SPISER10B Dtapi::DtCaps(140) // SPI serial 10-bit mode
-
-// Capability group SPISTD - Parallel port I/O standard
-#define DTAPI_CAP_SPILVDS1 Dtapi::DtCaps(141) // LVDS1
-#define DTAPI_CAP_SPILVDS2 Dtapi::DtCaps(142) // LVDS2
-#define DTAPI_CAP_SPILVTTL Dtapi::DtCaps(143) // LVTTL
-
-// Capability group TSRATESEL - Transport-stream rate selection
-#define DTAPI_CAP_EXTTSRATE Dtapi::DtCaps(144) // External TS rate clock input
-#define DTAPI_CAP_EXTRATIO Dtapi::DtCaps(145) // External TS rate clock with ratio
-#define DTAPI_CAP_INTTSRATE Dtapi::DtCaps(146) // Internal TS rate clock reference
-#define DTAPI_CAP_LOCK2INP Dtapi::DtCaps(147) // Lock TS rate to input port
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmmbPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// CMMB Modulation Parameters
-//
-struct DtCmmbPars
-{
- int m_Bandwidth; // CMMB Bandwitdh
- int m_TsRate; // CMMB TS rate in bps
- int m_TsPid; // PID on which the CMMB stream is found
- int m_AreaId; // Area ID (0..127)
- int m_TxId; // Transmitter ID (128..255)
- 
-public:
- DtCmmbPars();
- DTAPI_RESULT RetrieveTsRateFromTs(char* pBuffer, int NumBytes);
- bool operator == (DtCmmbPars& Rhs);
- bool operator != (DtCmmbPars& Rhs);
-};
-
-// DtOutpChannel::SetModControl - Bandwidth
-#define DTAPI_CMMB_BW_2MHZ 0x00000000
-#define DTAPI_CMMB_BW_8MHZ 0x00000001
-
-//-.-.-.-.-.-.-.-.-.-.-.- DtCmPars - Channel Modelling Parameters -.-.-.-.-.-.-.-.-.-.-.-.
-
-// Maximum number of fading paths
-#define DTAPI_CM_MAX_PATHS 32
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmPath -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure describes the fading parameters for a single path in a
-// multi-path simulation.
-//
-struct DtCmPath
-{
- enum Type
- {
- CONSTANT_DELAY, // Constant delay/phase
- CONSTANT_DOPPLER, // Constant frequency shift
- RAYLEIGH_JAKES, // Rayleigh fading with Jakes power spectral density
- // (mobile path model)
- RAYLEIGH_GAUSSIAN // Rayleigh fading with Gaussian power spectral
- // density (ionospheric path model)
- };
- Type m_Type; // Type of path fading
- double m_Attenuation; // Attenuation in dB
- double m_Delay; // Delay in us
- double m_Phase; // Phase shift in degrees for CONSTANT_DELAY paths
- double m_Doppler; // Doppler frequency in Hz
-
- // Constructor - Gives parameters a default value
- DtCmPath() :
- m_Type(CONSTANT_DELAY),
- m_Attenuation(0.0), m_Delay(0.0), m_Phase(0.0), m_Doppler(0.0)
- {}
- // Operators
- bool operator == (DtCmPath& Rhs);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure describes channel-modeling parameters. It\92s used to simulate the 
-// transmission distortions that may occur in the channel between a transmitter and
-// a receiver.
-//
-struct DtCmPars
-{
- bool m_EnableAwgn; // Enable white Gaussian noise (AWGN) injection
- double m_Snr; // Signal-to-noise ratio in dB
- bool m_EnablePaths; // Enable multi-path simulation
- std::vector<DtCmPath> m_Paths; // Parameters per path
-
- // Constructor and operators
- DtCmPars();
- bool operator == (DtCmPars&);
- bool operator != (DtCmPars& Rhs) { return !(*this == Rhs); }
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPoint -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure describes a constellation point in a receiver constellation diagram
-//
-struct DtConstelPoint
-{
- int m_X, m_Y; // X and Y coordinates
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- IDtDemodEvent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Callback event interface for demodulators
-//
-class IDtDemodEvent
-{
-public:
- virtual void TuningFreqHasChanged(__int64 OldFreqHz, __int64 NewFreqHz) {}
- virtual void TuningParsHaveChanged(
- __int64 OldFreqHz, int OldModType, int OldParXtra[3],
- __int64 NewFreqHz, int NewModType, int NewParXtra[3]) {}
-};
-
-
-// Maximum number of IpV6 addresses per interface
-#define MAX_IPV6_ADDR 3
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDeviceDesc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure describes a DekTec device
-//
-struct DtDeviceDesc
-{
- int m_Category; // Device category (DTAPI_CAT_XXX)
- __int64 m_Serial; // Unique serial number of the device
- int m_PciBusNumber; // PCI-bus number
- int m_SlotNumber; // PCI-slot number
- int m_UsbAddress; // USB address
- int m_TypeNumber; // Device type number
- int m_SubType; // Device subtype (0=none, 1=A, ...)
- int m_DeviceId; // Device ID
- int m_VendorId; // Vendor ID
- int m_SubsystemId; // Subsystem ID
- int m_SubVendorId; // Subsystem Vendor ID
- int m_NumHwFuncs; // Number of hardware funtions hosted by device
- int m_HardwareRevision; // Hardware revision (e.g. 302 = 3.2)
- int m_FirmwareVersion; // Firmware version
- int m_FirmwareVariant; // Firmware variant
- int m_NumDtInpChan; // Number of input channels (max)
- int m_NumDtOutpChan; // Number of output channels (max)
- int m_NumPorts; // Number of physical ports
- unsigned char m_Ip[4]; // IP address (only valid for DTE-31xx devices)
- unsigned char m_IpV6[MAX_IPV6_ADDR][16];
- // IP address (only valid for DTE-31xx devices)
- unsigned char m_MacAddr[6]; // MAC address (only valid for DTE-31xx devices)
- int m_PcieNumLanes; // Number of allocated PCIe lanes
- int m_PcieMaxLanes; // Maximum number of PCIe lanes
- int m_PcieLinkSpeed; // Current PCIe link speed (GEN1, 2 or 3)
- int m_PcieMaxSpeed; // Maximum PCIe link speed (GEN1, 2 or 3)
-};
-
-// Device categories
-#define DTAPI_CAT_PCI 0 // PCI or PCI-Express device
-#define DTAPI_CAT_USB 1 // USB-2 or USB-3 device
-#define DTAPI_CAT_NW 2 // Network device
-#define DTAPI_CAT_IP 3 // Network appliance: DTE-31xx
-#define DTAPI_CAT_NIC 4 // Non-DekTec network card
-#define DTAPI_CAT_NWAP 5 // Network Advanced Protocol(VLAN device)
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDtaPlusDeviceDesc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure describes a DekTec DTA-plus device
-//
-struct DtDtaPlusDeviceDesc
-{
- __int64 m_Serial; // Unique serial number of the device
- std::string m_DevicePath; // Path of file to open to interface with the device
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEventArgs -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Details for a specific event
-//
-struct DtEventArgs
-{
- DtEventArgs() : m_Value1(0), m_Value2(0), m_pContext(0) {};
-
- int m_HwCat; // Hardware category: DTAPI_CAT_XXX
- __int64 m_Serial; // Serial number of device causing event
- int m_Value1; // Event value #1
- int m_Value2; // Event value #2
- void* m_pContext; // Context-specific pointer
-};
-
-// Event call back function
-typedef void (*pDtEventCallback)(int Event, const DtEventArgs* pArgs);
-
-// Global events
-#define DT_EVENT_TYPE_ADD 0x00000001
-#define DT_EVENT_TYPE_REMOVE 0x00000002
-// Device events
-#define DT_EVENT_TYPE_POWER 0x00000004
-#define DT_EVENT_TYPE_GENLOCK 0x00000008
-#define DT_EVENT_TYPE_TEST 0x80000000
-// Network events
-#define DT_EVENT_IP_CHANGED 0x01000000
-#define DT_EVENT_ADMINST_CHANGED 0x02000000
-
-#define DT_EVENT_TYPE_ALL 0xFFFFFFFF
-
-// Event values
-#define DT_EVENT_VALUE1_POWER_UP 1
-#define DT_EVENT_VALUE1_POWER_DOWN 2
-#define DT_EVENT_VALUE1_NO_LOCK 1
-#define DT_EVENT_VALUE1_LOCKED 2
-#define DT_EVENT_VALUE2_XXX 1
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFiltCoeff -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// A single FIR filter coefficient
-//
-struct DtFiltCoeff
-{
- int m_TapIdx; // Tap number
- double m_Coeff; // FIR coefficient
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFilterPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Filter coefficients for use in a FIR filter
-//
-struct DtFilterPars
-{
- std::vector<DtFiltCoeff> m_FiltCoeffs;
-};
-
-// Maximum number of filter coefficients
-#define DTAPI_MAX_NUM_COEFFS 64
-
-#define DTAPI_FRAME_STATUS_OK 0
-#define DTAPI_FRAME_STATUS_ERR_NO_SIGNAL 1
-#define DTAPI_FRAME_STATUS_ERR_STD_MISMATCH 2
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtFrameInfo
-{
- int m_VidStd; // Video standard 
- __int64 m_Timestamp; // 64-bit timestamp
- __int64 m_FrameNumber; // 64-bit frame number
- __int64 m_Rp188; // RP188 timestamp
- int m_RxMode; // RX mode at the time this frame was received
- int m_Status; // One of DTAPI_FRAME_STATUS_*
-};
-
-//-.-.-.-.-.-.-.-.-.-.- DtHwFuncDesc - Hardware Function Descriptor -.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure describing a hardware function
-//
-struct DtHwFuncDesc
-{
- DtDeviceDesc m_DvcDesc; // Device descriptor
- int m_ChanType; // Channel type (OR-able)
- DtCaps m_Flags; // Capability flags (OR-able)
- int m_IndexOnDvc; // Relative index of hardware function
- int m_Port; // Physical port number
- unsigned char m_Ip[4]; // IP V4 address (TS-over-IP functions only)
- unsigned char m_IpV6[MAX_IPV6_ADDR][16];
- // IP V6 address (TS-over-IP functions only)
- unsigned char m_MacAddr[6]; // MAC address (TS-over-IP functions only)
-};
-
-// Hardware Function - Channel types
-// For IP hardware functions, both DTAPI_CHAN_INPUT and DTAPI_CHAN_OUTPUT are set
-#define DTAPI_CHAN_DISABLED 0 // Channel is disabled
-#define DTAPI_CHAN_INPUT 1 // Input channel
-#define DTAPI_CHAN_OUTPUT 2 // Output channel
-#define DTAPI_CHAN_DBLBUF 4 // Double-buffered copy of an output
-#define DTAPI_CHAN_LOOPTHR 8 // Loop-through copy of another port
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIoConfig - I/O Configuration -.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Stores the I/O configuration parameters for one I/O port configuration
-//
-struct DtIoConfig
-{
- int m_Port; // Port number
- int m_Group; // Config group, linked to I/O capability groups
- int m_Value; // Config value, linked to I/O capabilities
- int m_SubValue; // Config sub value, linked to I/O sub capabilities
- __int64 m_ParXtra[2]; // Extra parameters, e.g. source port number
-
- // Constructor - Gives parameters a default value
- DtIoConfig()
- {
- m_Port = -1;
- m_Group = -1;
- m_Value = m_SubValue = -1;
- m_ParXtra[0] = m_ParXtra[1] = -1;
- }
- DtIoConfig(int Port, int Group)
- {
- m_Port = Port;
- m_Group = Group;
- m_Value = m_SubValue = -1;
- m_ParXtra[0] = m_ParXtra[1] = -1;
- }
-};
-
-// I/O configuration groups
-#define DTAPI_IOCONFIG_3GLVL 0 // 3G-SDI level config
-#define DTAPI_IOCONFIG_IODIR 1 // I/O direction
-#define DTAPI_IOCONFIG_IOSTD 2 // I/O standard
-#define DTAPI_IOCONFIG_RFCLKSEL 3 // RF clock source selection
-#define DTAPI_IOCONFIG_SPICLKSEL 4 // Parallel port clock source selection
-#define DTAPI_IOCONFIG_SPIMODE 5 // Parallel port mode
-#define DTAPI_IOCONFIG_SPISTD 6 // Parallel port I/O standard
-#define DTAPI_IOCONFIG_TSRATESEL 7 // Transport-stream rate selection
-
-// I/O configuration groups - Boolean I/O
-#define DTAPI_IOCONFIG_BW 8 // Isochronous bandwidth allocated
-#define DTAPI_IOCONFIG_FAILSAFE 9 // A fail-over relay is available
-#define DTAPI_IOCONFIG_FRACMODE 10 // Fractional mode is supported
-#define DTAPI_IOCONFIG_GENLOCKED 11 // Locked to a genlock reference
-#define DTAPI_IOCONFIG_GENREF 12 // Genlock reference input
-#define DTAPI_IOCONFIG_SWS2APSK 13 // DVB-S2 APSK mode
-
-// Values for group IO_CONFIG_3GLVL (3G-SDI level config)
-#define DTAPI_IOCONFIG_3GLVLA 14 // 3G-SDI level A
-#define DTAPI_IOCONFIG_3GLVLB 15 // 3G-SDI level B
-
-// Values for boolean I/O configuration options
-#define DTAPI_IOCONFIG_TRUE 16 // Turn I/O capability on
-#define DTAPI_IOCONFIG_FALSE 17 // Turn I/O capability off
-
-// Values for group IO_CONFIG_IODIR (I/O direction)
-#define DTAPI_IOCONFIG_DISABLED 18 // Port is disabled
-#define DTAPI_IOCONFIG_INPUT 19 // Uni-directional input
-#define DTAPI_IOCONFIG_OUTPUT 20 // Uni-directional output
-
-// SubValues for group DTAPI_IOCONFIG_IODIR, value DTAPI_IOCONFIG_INPUT
-#define DTAPI_IOCONFIG_SHAREDANT 21 // Get antenna signal from another port
-
-// SubValues for group DTAPI_IOCONFIG_IODIR, value DTAPI_IOCONFIG_OUTPUT
-#define DTAPI_IOCONFIG_DBLBUF 22 // Double buffered output
-#define DTAPI_IOCONFIG_LOOPS2L3 23 // Loop-through of DVB-S2 in L3-frames
-#define DTAPI_IOCONFIG_LOOPS2TS 24 // Loop-through of an DVB-S(2) input
-#define DTAPI_IOCONFIG_LOOPTHR 25 // Loop-through of another input
-
-// Values for group IO_CONFIG_IOSTD (I/O standard)
-#define DTAPI_IOCONFIG_3GSDI 26 // 3G-SDI
-#define DTAPI_IOCONFIG_ASI 27 // DVB-ASI transport stream
-#define DTAPI_IOCONFIG_DEMOD 28 // Demodulation
-#define DTAPI_IOCONFIG_HDSDI 29 // HD-SDI
-#define DTAPI_IOCONFIG_IFADC 30 // IF A/D converter
-#define DTAPI_IOCONFIG_IP 31 // Transport stream over IP
-#define DTAPI_IOCONFIG_MOD 32 // Modulator output
-#define DTAPI_IOCONFIG_RS422 33 // RS422 port
-#define DTAPI_IOCONFIG_SDI 34 // SD-SDI
-#define DTAPI_IOCONFIG_SPI 35 // DVB-SPI transport stream
-#define DTAPI_IOCONFIG_SPISDI 36 // SD-SDI on a parallel port
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_3GSDI
-#define DTAPI_IOCONFIG_1080P50 37 // 1080p/50
-#define DTAPI_IOCONFIG_1080P59_94 38 // 1080p/59.94
-#define DTAPI_IOCONFIG_1080P60 39 // 1080p/60
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_HDSDI
-#define DTAPI_IOCONFIG_1080I50 40 // 1080i/50
-#define DTAPI_IOCONFIG_1080I59_94 41 // 1080i/59.94
-#define DTAPI_IOCONFIG_1080I60 42 // 1080i/60
-#define DTAPI_IOCONFIG_1080P23_98 43 // 1080p/23.98
-#define DTAPI_IOCONFIG_1080P24 44 // 1080p/24
-#define DTAPI_IOCONFIG_1080P25 45 // 1080p/25
-#define DTAPI_IOCONFIG_1080P29_97 46 // 1080p/29.97
-#define DTAPI_IOCONFIG_1080P30 47 // 1080p/30
-#define DTAPI_IOCONFIG_720P23_98 48 // 720p/23.98
-#define DTAPI_IOCONFIG_720P24 49 // 720p/24
-#define DTAPI_IOCONFIG_720P25 50 // 720p/25
-#define DTAPI_IOCONFIG_720P29_97 51 // 720p/29.97
-#define DTAPI_IOCONFIG_720P30 52 // 720p/30
-#define DTAPI_IOCONFIG_720P50 53 // 720p/50
-#define DTAPI_IOCONFIG_720P59_94 54 // 720p/59.94
-#define DTAPI_IOCONFIG_720P60 55 // 720p/60
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SDI
-#define DTAPI_IOCONFIG_525I59_94 56 // 525i/59.94
-#define DTAPI_IOCONFIG_625I50 57 // 625i/50
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SPISDI
-#define DTAPI_IOCONFIG_SPI525I59_94 58 // SPI 525i/59.94
-#define DTAPI_IOCONFIG_SPI625I50 59 // SPI 625i/50
-
-// Values for group IO_CONFIG_RFCLKSEL (RF clock source selection)
-#define DTAPI_IOCONFIG_RFCLKEXT 60 // External RF clock input
-#define DTAPI_IOCONFIG_RFCLKINT 61 // Internal RF clock reference
-
-// Values for group IO_CONFIG_SPICLKSEL (Parallel port clock source selection)
-#define DTAPI_IOCONFIG_SPICLKEXT 62 // External clock input
-#define DTAPI_IOCONFIG_SPICLKINT 63 // Internal clock reference
-
-// Values for group IO_CONFIG_SPIMODE (Parallel port mode)
-#define DTAPI_IOCONFIG_SPIFIXEDCLK 64 // SPI fixed clock with valid signal
-#define DTAPI_IOCONFIG_SPIDVBMODE 65 // SPI DVB mode
-#define DTAPI_IOCONFIG_SPISER8B 66 // SPI serial 8-bit mode
-#define DTAPI_IOCONFIG_SPISER10B 67 // SPI serial 10-bit mode
-
-// Values for group IO_CONFIG_SPISTD (Parallel port I/O standard)
-#define DTAPI_IOCONFIG_SPILVDS1 68 // LVDS1
-#define DTAPI_IOCONFIG_SPILVDS2 69 // LVDS2
-#define DTAPI_IOCONFIG_SPILVTTL 70 // LVTTL
-
-// Values for group IO_CONFIG_TSRATESEL (Transport-stream rate selection)
-#define DTAPI_IOCONFIG_EXTTSRATE 71 // External TS rate clock input
-#define DTAPI_IOCONFIG_EXTRATIO 72 // External TS rate clock with ratio
-#define DTAPI_IOCONFIG_INTTSRATE 73 // Internal TS rate clock reference
-#define DTAPI_IOCONFIG_LOCK2INP 74 // Lock TS rate to input port
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIqData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure representing an I/Q data sample
-//
-struct DtIqData
-{
- int m_I, m_Q; // I/Q sample pair
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbsLayerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// DtIsdbsLayerPars
-//
-struct DtIsdbsLayerPars
-{
- int m_NumSlots; // Number of slots
- int m_ModCod; // Modulation method and Code rate
-};
-
-// Number of slots per ISDB-S frame
-#define DTAPI_ISDBS_SLOTS_PER_FRAME 48
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbsPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// ISDB-S parameters including per-layer parameters
-//
-struct DtIsdbsPars
-{
- DtIsdbsPars() : m_DoMux(false) {}
-
- bool m_DoMux; // Hierarchical multiplexing yes/no
- int m_Emergency; // Switch-on control for emergency broadcast
- int m_RelTs2TsId[8]; // Relative TS to TS-ID mapping
- // Slot to relative TS mapping
- int m_Slot2RelTs[DTAPI_ISDBS_SLOTS_PER_FRAME];
- // Modulation parameters per hierarchical layer
- DtIsdbsLayerPars m_LayerPars[4];
-
- DTAPI_RESULT CheckValidity(void);
- void Init(void);
- bool operator == (DtIsdbsPars& Rhs);
- bool operator != (DtIsdbsPars& Rhs);
-};
-
-// ISDB-S modulation method and code rate
-#define DTAPI_ISDBS_MODCOD_BPSK_1_2 1
-#define DTAPI_ISDBS_MODCOD_QPSK_1_2 2
-#define DTAPI_ISDBS_MODCOD_QPSK_2_3 3
-#define DTAPI_ISDBS_MODCOD_QPSK_3_4 4
-#define DTAPI_ISDBS_MODCOD_QPSK_5_6 5
-#define DTAPI_ISDBS_MODCOD_QPSK_7_8 6
-#define DTAPI_ISDBS_MODCOD_8PSK_2_3 7
-#define DTAPI_ISDBS_MODCOD_NOT_ALLOC 15
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtLayerData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Parameters per hierarchical ISDB-T layer used for statistic: DTAPI_STAT_ISDBT_PARSDATA
-//
-struct DtIsdbtLayerData
-{
- int m_NumSegments; // Number of segments
- int m_Modulation; // Modulation type
- int m_CodeRate; // Code rate
- int m_TimeInterleave; // Time interleaving 0..4 (new spec limits the
- // maximum value to 3 instead of 4).
- // Time interleaving I = 0 if ti = 0 or
- // I = (1 << (ti + 2 - mode)) if ti != 0
- DtIsdbtLayerData();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtLayerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Parameters per hierarchical ISDB-T layer
-//
-struct DtIsdbtLayerPars
-{
- int m_NumSegments; // Number of segments
- int m_Modulation; // Modulation type
- int m_CodeRate; // Code rate
- int m_TimeInterleave; // Time interleaving
- // Derived:
- int m_BitRate; // Bits per second assuming 6 MHz channel
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtParamsData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// ISDB-T parameters including per-layer parameters used for statistic: 
-// DTAPI_STAT_ISDBT_PARSDATA
-//
-struct DtIsdbtParamsData
-{
- int m_BType; // Broadcast type
- int m_Mode; // Transmission mode: 1, 2 or 3 
- int m_Guard; // Guard interval
- int m_PartialRx; // Use first layer for partial reception.
- // Ignored for radio broadcasts 
- // Layer-A/B/C parameters
- DtIsdbtLayerData m_LayerPars[3];
-
- DtIsdbtParamsData();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// ISDB-T parameters including per-layer parameters
-//
-struct DtIsdbtPars
-{
- bool m_DoMux; // Hierarchical multiplexing yes/no
- bool m_FilledOut; // Members have been given a value
- int m_ParXtra0; // #Segments, bandwidth, sample rate, sub channel
- int m_BType; // Broadcast type
- int m_Mode; // Transmission mode
- int m_Guard; // Guard interval
- int m_PartialRx; // Partal reception
- int m_Emergency; // Switch-on control for emergency broadcast
- int m_IipPid; // PID used for multiplexing IIP packet
- int m_LayerOther; // Other PIDs are mapped to this layer
- int m_Virtual13Segm; // Virtual 13-segment mode
- 
- // Layer-A/B/C parameters
- DtIsdbtLayerPars m_LayerPars[3];
-
- // PID-to-layer mapping
- std::map<int, int> m_Pid2Layer;
-
- // Derived:
- bool m_Valid; // The parameter set is valid
- int m_TotalBitrate; // Bitrate of entire stream
-
- // Member function
- DtIsdbtPars();
- static bool BTypeCompat(int BType, int NumSegm);
- DTAPI_RESULT CheckValidity(int& ResultCode);
- DTAPI_RESULT ComputeRates(void);
- void MakeConsistent();
- void MakeNumSegmConsistent();
- int NumSegm();
- DTAPI_RESULT RetrieveParsFromTs(char* pBuffer, int NumBytes);
- bool operator == (DtIsdbtPars& Rhs);
- bool operator != (DtIsdbtPars& Rhs);
-};
-
- 
-
-
-// ISDB-T layer selection used for demodulation
-#define DTAPI_ISDBT_LAYER_NONE -1
-#define DTAPI_ISDBT_LAYER_AUTO -2
-
-// PID-to-layer mapping
-#define DTAPI_ISDBT_LAYER_A 1
-#define DTAPI_ISDBT_LAYER_B 2
-#define DTAPI_ISDBT_LAYER_C 4
-
-// DtIsdbtPars.m_BType - Broadcast type
-#define DTAPI_ISDBT_BTYPE_TV 0 // 1/3/13-segment TV broadcast
-#define DTAPI_ISDBT_BTYPE_RAD1 1 // 1-segment radio broadcast
-#define DTAPI_ISDBT_BTYPE_RAD3 2 // 3-segment radio broadcast
-
-// DtIsdbtPars.m_Guard - Guard interval
-#define DTAPI_ISDBT_GUARD_1_32 0
-#define DTAPI_ISDBT_GUARD_1_16 1
-#define DTAPI_ISDBT_GUARD_1_8 2
-#define DTAPI_ISDBT_GUARD_1_4 3
-
-// DtIsdbtLayerPars.m_Modulation - Modulation type
-#define DTAPI_ISDBT_MOD_DQPSK 0
-#define DTAPI_ISDBT_MOD_QPSK 1
-#define DTAPI_ISDBT_MOD_QAM16 2
-#define DTAPI_ISDBT_MOD_QAM64 3
-
-// DtIsdbtLayerPars.m_CodeRate - Code rate
-#define DTAPI_ISDBT_RATE_1_2 0
-#define DTAPI_ISDBT_RATE_2_3 1
-#define DTAPI_ISDBT_RATE_3_4 2
-#define DTAPI_ISDBT_RATE_5_6 3
-#define DTAPI_ISDBT_RATE_7_8 4
-
-// DtOutpChannel::SetModControl - Initial Total Number of Segments
-#define DTAPI_ISDBT_SEGM_1 0x00000001
-#define DTAPI_ISDBT_SEGM_3 0x00000003
-#define DTAPI_ISDBT_SEGM_13 0x0000000D
-#define DTAPI_ISDBT_SEGM_MSK 0x0000000F
-
-// DtOutpChannel::SetModControl - Bandwidth
-#define DTAPI_ISDBT_BW_5MHZ 0x00000010
-#define DTAPI_ISDBT_BW_6MHZ 0x00000020
-#define DTAPI_ISDBT_BW_7MHZ 0x00000030
-#define DTAPI_ISDBT_BW_8MHZ 0x00000040
-#define DTAPI_ISDBT_BW_MSK 0x000000F0
-
-// DtOutpChannel::SetModControl - Sample Rate
-#define DTAPI_ISDBT_SRATE_1_1 0x00000100
-#define DTAPI_ISDBT_SRATE_1_2 0x00000200
-#define DTAPI_ISDBT_SRATE_1_4 0x00000300
-#define DTAPI_ISDBT_SRATE_1_8 0x00000400
-#define DTAPI_ISDBT_SRATE_27_32 0x00000500
-#define DTAPI_ISDBT_SRATE_135_64 0x00000600
-#define DTAPI_ISDBT_SRATE_MSK 0x00000F00
-
-// DtOutpChannel::SetModControl - Sub Channel
-#define DTAPI_ISDBT_SUBCH_MSK 0x0003F000
-#define DTAPI_ISDBT_SUBCH_SHIFT 12
-
-// Result codes for DtIsdbtPars::CheckValidity
-#define DTAPI_ISDBT_OK 0
-#define DTAPI_ISDBT_E_BTYPE 1
-#define DTAPI_ISDBT_E_NSEGM 2
-#define DTAPI_ISDBT_E_PARTIAL 3
-#define DTAPI_ISDBT_E_NOT_FILLED 4
-#define DTAPI_ISDBT_E_SUBCHANNEL 5
-#define DTAPI_ISDBT_E_SRATE 6
-#define DTAPI_ISDBT_E_BANDWIDTH 7
-#define DTAPI_ISDBT_E_MODE 8
-#define DTAPI_ISDBT_E_GUARD 9
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMatrixInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtMatrixInfo
-{
- int m_VidStd; // Video standard
- int m_Scaling; // Scaled frame format
- int m_NumColumns; // Number of columns 
-};
-
-// Maximum number of fading paths, used in DtModPars
-#define DTAPI_MAX_OUTPUTS 16
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtModPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for storing a complete set of modulation parameters.
-//
-// NOTE FOR ISDB-T: DtModPars.m_ParXtra0 is never used, all ISDB-T parameters are stored
-// in DtIsdbtPars (in *m_pXtraPars).
-//
-struct DtModPars
-{
- // Modulation parameters
- int m_ModType; // Modulation type; -1 = not set
- int m_ParXtra0; // ParXtra0 (Code Rate / J.83 Annex); -1 = not set
- int m_ParXtra1; // ParXtra1; -1 = not set
- int m_ParXtra2; // ParXtra2; -1 = not set
- void* m_pXtraPars; // Extra CMMB/ISDB-S/ISDB-T/DVB-C2/DVB-T2 parameters
-
- // Rates; Set to -1 (not set) by SetModControl, except for symbol rate which is set
- // to a default value for modulation types that support a symbol rate.
- // If both symbol and TS rate are set, TS rate takes precedence.
- int m_SymRate; // Symbol rate in baud
- int m_TsRate; // Transport-stream rate in bps
-
- // Channel modelling per output channel
- bool m_IsCmEnable[DTAPI_MAX_OUTPUTS];
- // Channel modelling is enabled yes/no
- DtCmPars m_CmPars[DTAPI_MAX_OUTPUTS];
- // Channel modelling parameters
-
- // Custom roll-off filter
- bool m_IsRoEnable; // Custom roll-off filter enable yes/no
- DtFilterPars m_RollOffFilter; // Custom roll-off filter parameters
-
- // Miscellaneous
- int m_OutputLevel; // Output level; -9999 = not set
- __int64 m_RfFreqHz; // RF frequency in Hz
- unsigned char m_S2PlHdrScrSeq[12];
- // DVB-S2 PL header scrambling sequence
- int m_TxMode; // Transmit mode; Included here because packet
- // size affects the modulation process
- int m_StuffMode; // Stuffing mode
-
- // Operations
- DTAPI_RESULT CheckPars();
- DTAPI_RESULT SetModControl(int ModType, int, int, int, void* pXtraPars);
-
- // Member functions
- DtCmmbPars* pCmmbPars() { return (DtCmmbPars*)m_pXtraPars; }
- DtDvbC2Pars* pDvbC2Pars() { return (DtDvbC2Pars*)m_pXtraPars; }
- DtDvbS2Pars* pDvbS2Pars() { return (DtDvbS2Pars*)m_pXtraPars; }
- DtDvbT2Pars* pDvbT2Pars() { return (DtDvbT2Pars*)m_pXtraPars; }
- DtIsdbsPars* pIsdbsPars() { return (DtIsdbsPars*)m_pXtraPars; }
- DtIsdbtPars* pIsdbtPars() { return (DtIsdbtPars*)m_pXtraPars; }
- DtIsdbTmmPars* pIsdbTmmPars() { return (DtIsdbTmmPars*)m_pXtraPars; }
-
- // Predicates
- bool HasSymRate();
- bool IsAdtbT(), IsAdtbtDtmb(), IsAtsc(), IsAtscMh(), IsCmmb(), IsCmEnable(int i=0);
- bool IsDab();
- bool IsDtmb(), IsDvbC2(), IsDvbS(), IsDvbS2(), IsDvbS2Apsk(), IsDvbS2L3(),
- IsDvbS2X(), IsDvbS2XL3();
- bool IsDvbS2Mux();
- bool IsDvbT(), IsDvbT2(), IsIqDirect(), IsIsdbS(), IsIsdbT(), IsIsdbTmm();
- bool IsModTypeSet(), IsOfdm(), IsQam(), IsQamA(), IsQamB(), IsQamC(), IsQamAC();
- bool IsRoEnable(), IsT2Mi();
- bool RequiresMplpMod();
-
- // Constructor, destructor
- DtModPars();
- ~DtModPars();
-private:
- // No implementation is provided for the copy constructor
- DtModPars(const DtModPars&);
-
-private:
- void CleanUpXtraPars();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPar .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Generic structure to represent a single parameter setting.
-// It is used in the advanced demodulator for setting and retrieving parameter settings.
-//
-struct DtPar
-{
- DtPar();
- DtPar(int ParId); // Constructor with DTAPI_PAR_xxx initialization
- virtual ~DtPar();
-
- // Value types supported for parameters
- enum ParValueType
- {
- PAR_VT_UNDEFINED, PAR_VT_BOOL, PAR_VT_DOUBLE, PAR_VT_INT
- };
-
- DTAPI_RESULT m_Result; // Result of retrieving the parameters
- int m_ParId; // Identifies the parameter: DTAPI_PAR_XXX
- int m_IdXtra[4]; // Extra identification parameters
- ParValueType m_ValueType; // Value type of parameter: PAR_VT_XXX
- union {
- bool m_ValueBool; // Value if value type is PAR_VT_BOOL
- double m_ValueDouble; // Value if value type is PAR_VT_DOUBLE
- int m_ValueInt; // Value if value type is PAR_VT_INT
- void* m_pValue; // Pointer for complex types
- };
- void Cleanup();
- DTAPI_RESULT GetName(const char*& pName, const char*& pShortName);
- DTAPI_RESULT GetName(const wchar_t*& pName, const wchar_t*& pShortName);
- DTAPI_RESULT GetValue(int &Value);
- DTAPI_RESULT GetValue(double &Value);
- DTAPI_RESULT GetValue(bool &Value);
- DTAPI_RESULT SetId(int ParameterId);
- DTAPI_RESULT SetValue(int Value);
- DTAPI_RESULT SetValue(double Value);
- DTAPI_RESULT SetValue(bool Value);
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-
- // Serialisation of an array of parameters
- static DTAPI_RESULT FromXml(const std::wstring&, DtPar*& pPars, int& Count);
- static DTAPI_RESULT ToXml(DtPar* pPars, int Count, std::wstring& XmlString);
-
- // Assignment operator
- DtPar& operator=(const DtPar&);
-
-private:
- // No implementation is provided for the copy constructor
- DtPar(const DtPar&);
-};
-
-// Integer parameters
-#define DTAPI_PAR_DEMOD_THREADS 0x001 // Number of Threads/CPU cores used for
- // software demodulation: default 4
-#define DTAPI_PAR_DEMOD_LDPC_MAX 0x002 // LDPC maximum iterations: default 50
-#define DTAPI_PAR_DEMOD_LDPC_AVG 0x003 // LDPC average iterations limit, used
- // to limit CPU load; default 16
-// Boolean parameters
-#define DTAPI_PAR_DEMOD_MER_ENA 0x004 // Enable MER calculation; default on
-// Undefined parameter
-#define DTAPI_PAR_UNDEFINED 0x000 // Value is not defined yet
-
-// Unsported item values
-#define DTAPI_PAR_UNSUP_INTITEM 0x80000000 // Unsupported integer item
-#define DTAPI_PAR_UNSUP_UINTITEM 0xFFFFFFFF // Unsupported unsigned integer item
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRawIpHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Header placed in front of all IP Packets when DTAPI_RXMODE_IPRAW mode is used
-//
-struct DtRawIpHeader
-{
- unsigned short m_Tag; // 0x44A0h = \91D\92160
- unsigned short m_Length; // IP packet length
- unsigned int m_TimeStamp; // IP packet arrival/transmit timestamp
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStatistic -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtStatistic
-{
- DtStatistic();
- DtStatistic(int StatisticId); // Constructor with DTAPI_STAT_xxx initialization
- virtual ~DtStatistic();
-
- // Value types supported for statistics
- // NOTE: ALWAYS ADD NEW TYPES TO END OF LIST, FOR BACKWARDS COMPATIBILITY
- enum StatValueType
- {
- STAT_VT_UNDEFINED, STAT_VT_BOOL, STAT_VT_DOUBLE, STAT_VT_INT, 
- STAT_VT_DVBC2_L1P2, STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT2_L1,
- STAT_VT_ISDBT_PARS, STAT_VT_LDPC_STATS, STAT_VT_MA_DATA,
- STAT_VT_MA_STATS, STAT_VT_PLP_BLOCKS, STAT_VT_VIT_STATS,
- STAT_VT_DAB_ENSEM, STAT_VT_RS_STATS, STAT_VT_DVBT_TPS
- };
-
-
- DTAPI_RESULT m_Result; // Result of retrieving the statistic
- int m_StatisticId; // Identifies the statistic: DTAPI_STAT_XXX
- int m_IdXtra[4]; // Extra identification parameters
- StatValueType m_ValueType; // Value type of statistic: STAT_VT_XXX
- union {
- bool m_ValueBool; // Value if value type is STAT_VT_BOOL
- double m_ValueDouble; // Value if value type is STAT_VT_DOUBLE
- int m_ValueInt; // Value if value type is STAT_VT_INT
- void* m_pValue; // Pointer if value type is STAT_VT_DVBC2_L1P2,
- // STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT_TPS,
- // STAT_VT_DVBT2_L1, STAT_VT_VIT_STATS
- // STAT_VT_DAB_ENSEM or STAT_VT_RS_STATS
- };
- void Cleanup();
- DTAPI_RESULT GetName(const char*& pName, const char*& pShortName);
- DTAPI_RESULT GetName(const wchar_t*& pName, const wchar_t*& pShortName);
- DTAPI_RESULT GetValue(int &Value);
- DTAPI_RESULT GetValue(double &Value);
- DTAPI_RESULT GetValue(bool &Value);
- DTAPI_RESULT GetValue(DtDabEnsembleInfo*& pValue);
- DTAPI_RESULT GetValue(DtDvbC2DemodL1Part2Data*& pValue);
- DTAPI_RESULT GetValue(DtDvbC2DemodL1PlpSigData*& pValue);
- DTAPI_RESULT GetValue(DtDvbTTpsInfo*& pValue);
- DTAPI_RESULT GetValue(DtDvbT2DemodL1Data*& pValue);
- DTAPI_RESULT GetValue(DtDemodLdpcStats*& pValue);
- DTAPI_RESULT GetValue(DtDemodMaLayerData*& pValue);
- DTAPI_RESULT GetValue(DtDemodMaLayerStats*& pValue);
- DTAPI_RESULT GetValue(DtDemodPlpBlocks*& pValue);
- DTAPI_RESULT GetValue(DtIsdbtParamsData*& pValue);
- DTAPI_RESULT GetValue(DtRsDecStats*& pValue);
- DTAPI_RESULT GetValue(DtVitDecStats*& pValue);
- DTAPI_RESULT SetId(int StatisticId);
- DTAPI_RESULT SetValue(int Value);
- DTAPI_RESULT SetValue(double Value);
- DTAPI_RESULT SetValue(bool Value);
- DTAPI_RESULT SetValue(DtDabEnsembleInfo& pValue);
- DTAPI_RESULT SetValue(DtDvbC2DemodL1Part2Data& Value);
- DTAPI_RESULT SetValue(DtDvbC2DemodL1PlpSigData& Value);
- DTAPI_RESULT SetValue(DtDvbTTpsInfo& pValue);
- DTAPI_RESULT SetValue(DtDvbT2DemodL1Data& Value);
- DTAPI_RESULT SetValue(DtDemodLdpcStats& Value);
- DTAPI_RESULT SetValue(DtDemodMaLayerData& Value);
- DTAPI_RESULT SetValue(DtDemodMaLayerStats& Value);
- DTAPI_RESULT SetValue(DtDemodPlpBlocks& Value);
- DTAPI_RESULT SetValue(DtIsdbtParamsData& Value);
- DTAPI_RESULT SetValue(DtRsDecStats& pValue);
- DTAPI_RESULT SetValue(DtVitDecStats& pValue);
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-
- // Serialisation of an array of statistics
- static DTAPI_RESULT FromXml(const std::wstring&, DtStatistic*&, int& Count);
- static DTAPI_RESULT ToXml(DtStatistic* pStatistics, int Count, std::wstring&);
-
- // Assignment operator
- DtStatistic& operator=(const DtStatistic&);
-
-private:
- // No implementation is given of the copy constructor
- DtStatistic(const DtStatistic&);
-};
-
-// Integer statistics
-#define DTAPI_STAT_BADPCKCNT 0x003 // Count of uncorrected packets
-#define DTAPI_STAT_CNR 0x105 // Carrier-to-noise ratio in dB
-#define DTAPI_STAT_DVBC2_DSLICEDISC 0x010 // DVB-C2 Data slice discontinuity count
-#define DTAPI_STAT_DVBC2_L1HDR_ERR 0x00E // DVB-C2 L1 Preamble header error count
-#define DTAPI_STAT_DVBC2_L1P2_ERR 0x00F // DVB-C2 L1-Part 2 error count
-#define DTAPI_STAT_DVBT2_L1PRE_ERR 0x00C // DVB-T2 L1-Pre error count
-#define DTAPI_STAT_DVBT2_L1POST_ERR 0x00D // DVB-T2 L1-Post error count
-#define DTAPI_STAT_EBN0 0x111 // Eb/N0 in dB (estimated on MER)
-#define DTAPI_STAT_ESN0 0x110 // Es/N0 in dB (estimated on MER)
-#define DTAPI_STAT_LINKMARGIN 0x10F // Link margin in dB
-#define DTAPI_STAT_MER 0x106 // Modulation error rate in dB
-#define DTAPI_STAT_MOD_SAT 0x004 // Modulator saturation count
-#define DTAPI_STAT_RELOCKCNT 0x00A // Receiver re-lock count
-#define DTAPI_STAT_RFLVL_CHAN 0x005 // RF power level for channel bandwidth
-#define DTAPI_STAT_RFLVL_CHAN_QS 0x015 // Quick scan of channel level
-#define DTAPI_STAT_RFLVL_NARROW 0x006 // RF power level for a narrow bandwidth
-#define DTAPI_STAT_RFLVL_NARROW_QS 0x016 // Quick scan of channel level
-#define DTAPI_STAT_RS 0x008 // Reed-Solomon error counter
-#define DTAPI_STAT_SNR 0x107 // Signal-to-noise ratio in dB
-#define DTAPI_STAT_TEMP_TUNER 0x009 // Tuner temperature
-#define DTAPI_STAT_T2MI_OVFS 0x00B // DVB-T2 T2-MI overflow count
-
-// Double statistics
-#define DTAPI_STAT_BER_POSTBCH 0x100 // Post-BCH bit error rate
-#define DTAPI_STAT_BER_POSTLDPC 0x101 // Post-LDPC bit error rate
-#define DTAPI_STAT_BER_POSTVIT 0x102 // Post-Viterbi bit error rate
-#define DTAPI_STAT_BER_PREBCH 0x10D // Pre-BCH bit error rate
-#define DTAPI_STAT_BER_PRELDPC 0x10E // Pre-LDPC bit error rate
-#define DTAPI_STAT_BER_PRERS 0x103 // Pre-Reed-Solomon bit error rate
-#define DTAPI_STAT_BER_PREVIT 0x104 // Pre-Viterbi bit error rate
-#define DTAPI_STAT_FER_POSTBCH 0x116 // Post-BCH frame error rate
-#define DTAPI_STAT_FREQ_SHIFT 0x10B // Input frequency shift (Hz)
-#define DTAPI_STAT_OCCUPIEDBW 0x112 // Occupied bandwidth
-#define DTAPI_STAT_PER 0x108 // Packet error rate
-#define DTAPI_STAT_ROLLOFF 0x113 // Roll-off factor in percentage
-#define DTAPI_STAT_SAMPRATE_OFFSET 0x10C // Sample rate offset (ppm) 
-
-// Boolean lock statistics
-#define DTAPI_STAT_CARRIER_LOCK 0x201 // Carrier lock
-#define DTAPI_STAT_FEC_LOCK 0x202 // FEC lock
-#define DTAPI_STAT_LOCK 0x200 // Overall lock status
-#define DTAPI_STAT_PACKET_LOCK 0x203 // Packet lock
-#define DTAPI_STAT_SPECTRUMINV 0x205 // Spectrum inversion
-#define DTAPI_STAT_VIT_LOCK 0x204 // Viterbi lock
-
-// Complex statistics
-#define DTAPI_STAT_DAB_ENSEM_INFO 0x308 // DAB ensemble information from the
- // Fast Information Channel (FIC)
-#define DTAPI_STAT_DVBC2_L1P2DATA 0x300 // DVB-C2 Layer-1 Part 2 data
-#define DTAPI_STAT_DVBC2_PLPSIGDATA 0x301 // DVB-C2 Layer-1 PLP signalling data
-#define DTAPI_STAT_DVBT_TPS_INFO 0x30B // DVB-T TPS information
-#define DTAPI_STAT_DVBT2_L1DATA 0x302 // DVB-T2 Layer-1 data
-#define DTAPI_STAT_ISDBT_PARSDATA 0x303 // ISDB-T parameters data
-#define DTAPI_STAT_LDPC_STATS 0x304 // DVB-C2/T2 LDPC statistics
-#define DTAPI_STAT_MA_DATA 0x305 // DVB-C2/T2 mode adaptation data
-#define DTAPI_STAT_MA_STATS 0x306 // DVB-C2/T2 mode adaptation statistics
-#define DTAPI_STAT_PLP_BLOCKS 0x307 // DVB-C2/T2 PLP number of FEC blocks
-#define DTAPI_STAT_RSDEC_STATS 0x30A // Reed-Solomon decoder statistics
-#define DTAPI_STAT_VITDEC_STATS 0x309 // Viterbi decoder statistics 
-
-// DekTec internal statistics
-#define DTAPI_STAT_AGC1 0x001 // First AGC value
-#define DTAPI_STAT_AGC2 0x002 // Second AGC value
-#define DTAPI_STAT_RFLVL_UNCALIB 0x007 // Uncalibrated RF power level
-#define DTAPI_STAT_RFLVL_UNCALIB_DBM 0x10A // Uncalibrated RF power level in dBm
-#define DTAPI_STAT_SYNTAX_ERR_CNT 0x114 // Num syntax errors in usb bitstream
-#define DTAPI_STAT_OVERFLOW_CNT 0x115 // Number of dtapi<>kernel buf overflows
-
-// Unsupported item values
-#define DTAPI_STAT_UNDEFINED 0x000 // Value is not defined yet
-#define DTAPI_STAT_UNSUP_INTITEM 0x80000000 // Unsupported integer item
-#define DTAPI_STAT_UNSUP_UINTITEM 0xFFFFFFFF // Unsupported unsigned integer item
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTransmitter -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure describing a transmitter. Used by DtInpChannel::BlindScan to return the
-// transmitters found by scanning a frequency band.
-//
-struct DtTransmitter
-{
- __int64 m_FreqHz; // Center frequency of the transmitter
- int m_ModType; // Modulation type
- int m_SymbolRate; // Symbol rate
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for storing TSoIP parameters
-//
-struct DtIpPars
-{
-public:
- unsigned char m_Ip[16]; // IP address (IPv4/IPv6)
- unsigned short m_Port; // Port number
- unsigned char m_SrcFltIp[16]; // Source filter: IP address (IPv4/IPv6)
- unsigned short m_SrcFltPort; // Source filter: port number
- int m_VlanId; // VLAN ID
- int m_VlanPriority; // VLAN priority
-
- // Redundant link
- unsigned char m_Ip2[16]; // IP address (IPv4/IPv6)
- unsigned short m_Port2; // Port number
- unsigned char m_SrcFltIp2[16]; // Source filter: IP address (IPv4/IPv6)
- unsigned short m_SrcFltPort2; // Source filter: port number
- int m_VlanId2; // VLAN ID
- int m_VlanPriority2; // VLAN priority
-
- int m_TimeToLive; // Time-to-Live setting for IP TX
- int m_NumTpPerIp; // #TPs per IP packet
- int m_Protocol; // Protocol: DTAPI_PROTO_UDP/RTP
- int m_DiffServ; // Differentiated services
- int m_FecMode; // Error correction mode: DTAPI_FEC_DISABLE/2D
- int m_FecNumRows; // \91D\92 = #rows in FEC matrix
- int m_FecNumCols; // \91L\92 = #columns in FEC matrix
- int m_Flags; // Optional control/status flags: IPv4/IPv6
- int m_Mode; // DTAPI_IP_NORMAL, DTAPI_IP_TX_DBLBUF,
- // DTAPI_IP_RX_DBLBUF, DTAPI_IP_RX_FAILOVER
-public:
- DtIpPars();
- ~DtIpPars();
-};
-
-// Legacy
-#define DtTsIpPars DtIpPars
-
-// Error correction modes (DtIpPars::m_FecMode)
-#define DTAPI_FEC_DISABLE 0
-#define DTAPI_FEC_2D 1 // FEC reconstruction
-#define DTAPI_FEC_2D_M1 1 // Mode1: FECdT = DVBdT + .5 * DVBdT
-#define DTAPI_FEC_2D_M2 2 // Mode2: FECdT = DVBdT
-
-// Optional control/status flags (DtIpPars::m_Flags)
-#define DTAPI_IP_V4 0x00
-#define DTAPI_IP_V6 0x01
-#define DTAPI_IP_TX_MANSRCPORT 0x10
-
-// Transmission/reception mode (DtIpPars::m_Mode)
-#define DTAPI_IP_NORMAL 0
-#define DTAPI_IP_TX_DBLBUF 1
-#define DTAPI_IP_RX_DBLBUF 2
-#define DTAPI_IP_RX_FAILOVER 3
-
-// IP protocol (DtIpPars::m_Protocol)
-#define DTAPI_PROTO_UDP 0
-#define DTAPI_PROTO_RTP 1
-#define DTAPI_PROTO_AUTO 2
-#define DTAPI_PROTO_UNKN 2
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpStat -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for retrieving IP statistics from drivers.
-//
-struct DtIpStat
-{
- unsigned int m_TotNumIpPackets;
- unsigned int m_LostIpPacketsBeforeFec; // #Lost IP packets before FEC 
- unsigned int m_LostIpPacketsAfterFec; // #Lost IP packets after FEC
-};
-
-// Legacy
-#define DtTsIpStat DtIpStat
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTunePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for setting tuner specific parameters
-//
-struct DtTunePars
-{
- union {
- // DTA-2131 specific tuner parameters
- struct {
- int m_TunerStandard; // DTAPI_TUNMOD_xxx
- int m_TunerBandwidth; // Tuning bandwidth in Hz
- int m_IfFrequency; // IF frequency in Hz
- // (-1 according tuner standard)
- int m_LpfCutOff; // Low-pass filter cutoff; DTAPI_TUN31_LPF_x
- int m_LpfOffset; // Low-pass filter offset; DTAPI_TUN31_LPF_x
- int m_HiPass; // Hi Pass filter; DTAPI_TUN31_HPF_x
- int m_DcNotchIfPpf; // Enable DC notch IF PPF; DTAPI_TUN31_NOTCH_x
- int m_IfNotch; // Enable IF notch; DTAPI_TUN31_NOTCH_x
- int m_IfNotchToRssi; // Enable IF notch to RSSI; DTAPI_TUN31_NOTCH_x
- } m_Dta2131TunePars;
- } u;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVidStdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtVidStdInfo
-{
- int m_VidStd; // Video Standard
- bool m_IsHd; // true: is an HD format: false: is SD format
-
- bool m_IsInterlaced; // Is interlaced
- int m_NumLines; // Number of lines per frame
- double m_Fps; // Frame rate
- bool m_IsFractional; // Fractional framerate
- 
- int m_FrameNumSym; // Size of frame (in # symbols)
- int m_LineNumSym; // # of symbol per line
- int m_LineNumSymHanc; // # of HANC symbols per line
- int m_LineNumSymVanc; // # of VANC symbols per line
- int m_LineNumSymEav; // # of EAV symbols per line
- int m_LineNumSymSav; // # of SAV symbols per line
-
- // Field 1
- int m_Field1StartLine; // Line # of first line for field 1
- int m_Field1EndLine; // Line # of last line for field 1
- int m_Field1VidStartLine; // Line # of first line containing active video
- int m_Field1VidEndLine; // Line # of last line containing active video
- 
- // Field 2
- int m_Field2StartLine; // Line # of first line for field 2
- int m_Field2EndLine; // Line # of last line for field 2
- int m_Field2VidStartLine; // Line # of first line containing active video
- int m_Field2VidEndLine; // Line # of last line containing active video
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DEMODULATION PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDemodDvbS2ModCodSettings -.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for storing the DVB-S2 
-// 
-struct DtDemodDvbS2ModCodSettings
-{
- bool m_Enable; // Demodulation of this MODCOD (yes/no)
- int m_SnrThreshold; // SNR threshold of this MODCOD for automute algorithm
- DtDemodDvbS2ModCodSettings() : m_Enable(false), m_SnrThreshold(0) {}
- DtDemodDvbS2ModCodSettings(bool Enable, int SnrThreshold) : 
- m_Enable(Enable), m_SnrThreshold(SnrThreshold) {}
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for storing a complete set of demodulation parameters
-//
-class DtDemodPars
-{
-public:
- DtDemodPars();
- DtDemodPars(const DtDemodPars&);
- ~DtDemodPars();
-public:
- DTAPI_RESULT CheckValidity();
- int GetModType() const;
- DTAPI_RESULT SetModType(int ModType);
- DtDemodParsAtsc* Atsc() const;
- DtDemodParsDab* Dab() const;
- DtDemodParsDvbC2* DvbC2() const;
- DtDemodParsDvbS* DvbS() const;
- DtDemodParsDvbS2* DvbS2() const;
- DtDemodParsDvbS2Adv* DvbS2Adv() const; 
- DtDemodParsDvbT* DvbT() const;
- DtDemodParsDvbT2* DvbT2() const;
- DtDemodParsIq* Iq() const;
- DtDemodParsIq2131* Iq2131() const; 
- DtDemodParsIsdbt* Isdbt() const;
- DtDemodParsQam* Qam() const;
-
- // Predicates
- bool IsAtsc() const, IsDab() const, IsDvbC2() const, IsDvbS() const, 
- IsDvbS2() const, IsDvbT() const,IsDvbT2() const, IsIq() const, IsIq2131() const,
- IsIsdbt() const, IsQam() const;
-
- // Operators
- void operator=(const DtDemodPars& Pars);
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-
- // Conversion helper
- DTAPI_RESULT FromOldStyle(int ModType, int ParXtra0, int ParXtra1, int ParXtra2);
- DTAPI_RESULT ToOldStyle(int& ModType, int& ParXtra0, int& ParXtra1, int& ParXtra2);
-private:
- int m_ModType; // Modulation type
- void* m_pDemodPars; // Demodulation parameters; Type depends on m_ModType
-private:
- void CleanUpDemodPars();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsAtsc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Demodulation parameters for modulation type DTAPI_MOD_ATSC
-//
-struct DtDemodParsAtsc
-{
- int m_Constellation; // VSB constellation
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDab -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Demodulation parameters for modulation type DTAPI_MOD_DAB
-//
-struct DtDemodParsDab
-{
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbC2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_DVBC2
-//
-struct DtDemodParsDvbC2
-{
- int m_Bandwidth; // Bandwidth
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Demodulation parameters for modulation type DTAPI_MOD_DVBS
-//
-struct DtDemodParsDvbS
-{
- int m_CodeRate; // DVB-S coderate
- int m_SpecInv; // Spectral inversion (yes/no)
- int m_SymRate; // Symbol rate in baud
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_DVBS2
-//
-struct DtDemodParsDvbS2
-{
- int m_CodeRate; // Coderate
- int m_Pilots; // Pilots (yes/no)
- int m_SpecInv; // Spectral inversion (yes/no)
- int m_FecFrame; // Long or short FECFRAME
- int m_SymRate; // Symbol rate in baud
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS2Adv -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Advanced demodulation parameters for modulation type DTAPI_MOD_DVBS2
-//
-struct DtDemodParsDvbS2Adv : DtDemodParsDvbS2
-{
- bool m_AutoMuteModCods; // MODCODS with an SNR threshold above the current SNR
- // will not be demodulated
- int m_HysteresisMargin; // Margin to add on top of the SNR threshold before 
- // re-enabling a certain modcod, in units of 0.1 dB
- std::map<DtDvbS2ModCod, DtDemodDvbS2ModCodSettings> m_ModCods; 
- // List with supported modcods 
- DtDemodParsDvbS2Adv();
- DTAPI_RESULT DeleteModCod(DtDvbS2ModCod ModCod);
- DTAPI_RESULT InitSnrThreshold(int TypeNumber);
- DTAPI_RESULT SetModCod(DtDvbS2ModCod ModCod, DtDemodDvbS2ModCodSettings &Settings);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbT -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_DVBT
-//
-struct DtDemodParsDvbT
-{
- int m_CodeRate; // Coderate
- int m_Bandwidth; // Bandwidth
- int m_Constellation; // Constellation
- int m_Guard; // Guard interval
- int m_Interleaving; // Interleaving
- int m_Mode; // Transmission mode
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbT2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_DVBT2
-//
-struct DtDemodParsDvbT2
-{
- int m_Bandwidth; // Bandwidth
- int m_T2Profile; // DVB-T2 profile (Base/Lite)
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIq -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_IQ
-//
-struct DtDemodParsIq
-{
- int m_Bandwidth; // Signal bandwidth in Hz
- int m_IqDemodType; // IQ demodulation type (DTAPI_DEMOD_QAM or
- // DTAPI_DEMOD_OFDM)
- int m_SampleRate; // Sample rate in Hz
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIq2131 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_IQ_2131 (DTA-2131 specific)
-//
-struct DtDemodParsIq2131
-{
- int m_IqDemodFreq; // IQ demodulation frequency in Hz
- DtFilterPars m_LpfFilter; // Anti-aliasing filter
- double m_LpfScaleFactor; // Scale factor after anti-aliasing filter
- int m_SampleRate; // Sample rate in Hz
- DtTunePars m_TunePars; // Tuning parameters
-};
-
-// IQ-demodulation type
-#define DTAPI_DEMOD_OFDM 0 // OFDM IQ-demodulation type
-#define DTAPI_DEMOD_QAM 1 // QAM IQ-demodulation type
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIsdbt .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_ISDBT
-//
-struct DtDemodParsIsdbt
-{
- int m_Bandwidth; // Bandwidth DTAPI_ISDBT_BW_xMHZ
- int m_SubChannel; // Sub channel number, 0..41, default= 22
- int m_NumberOfSegments; // Number of segments DTAPI_ISDBT_SEGM_x
- DtDemodParsIsdbt() : m_SubChannel(22) {}
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsQam -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_QAMxxx
-//
-struct DtDemodParsQam
-{
- int m_Annex; // ITU-T J.83 Annex
- int m_Interleaving; // Interleaving; ignored for Annex A and C
- int m_SymRate; // Symbol rate in baud 
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+ Common Demodulation Structures +=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodLdpcStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// LDCP statistic information for DVB-T2 and DVB-C2
-//
-struct DtDemodLdpcStats
-{
- __int64 m_FecBlocksCount; // #Decoded FEC blocks
- __int64 m_UncorrFecBlocksCount;// #Uncorrected FEC blocks after BCH (not exact)
- __int64 m_FecBlocksCount1; // #Decoded FEC blocks, reset at the same time
- // as m_FecBlocksItCount/min/max
- __int64 m_FecBlocksItCount; // Total #LDPC iterations
- // Average #LDPC iteration =
- // m_FecBlocksItCount / m_FecBlocksCount1
- int m_FecBlocksItMin; // Minimum #LDPC iterations (-1 after reset)
- int m_FecBlocksItMax; // Maximum #LDPC iterations (-1 after reset)
- __int64 m_BchBitCount; // #Decoded data bits, including BCH bits
- // Currently only data+BCH bits are taken into account (LDPC parity bits are ignored),
- // so the BER before LDPC is approximatively: m_BchBitErrorCount / m_BchBitCount
- // This is accurate only if there are no uncorrected blocks (m_UncorrFecBlocksCount=0)
- __int64 m_BchBitErrorCount; // Bit error count before LDPC
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodMaLayerStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// LMode adaption layer statistics for DVB-T2 and DVB-C2
-//
-struct DtDemodMaLayerStats
-{
- __int64 m_HdrCrc8ErrorCount; // #CRC8 errors for BBframe header
- __int64 m_PckCrc8ErrorCount; // #CRC8 errors for packets (only for m_Hem = 0)
- __int64 m_FramingErrorCount; // SYNCD/DFL/UPL consistency errors
- __int64 m_CommonPlpResyncCount;// Number of times a resynchronization between data
- // and common PLP was needed. It normally happens
- // only in case of receive errors. This field is only
- // updated in the corresponding data PLP.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRsDecStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Reed-Solomon decoder info
-//
-struct DtRsDecStats
-{
- bool m_Locked; // Decoder is locked 
- __int64 m_ByteSkipCount; // Bytes skipped while looking for sync 
- __int64 m_PacketCount; // Decoded packets 
- __int64 m_UncorrPacketCount; // Uncorrected packets 
- __int64 m_ByteErrorCount; // Byte error count 
- __int64 m_BitErrorCount; // Bit error count
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVitDecStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Viterbi decoder info (pre-viterbi BER) 
-//
-struct DtVitDecStats
-{
- __int64 m_BitCount; // Input bit count 
- __int64 m_BitErrorCount; // Bit error count
-};
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodMaLayerData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Mode adaption layer info for DVB-T2 and DVB-C2
-struct DtDemodMaLayerData
-{
- bool m_Hem; // High efficiency mode
- bool m_Npd; // Null packet deletion
- int m_Issy; // ISSY: mode, see DTAPI_DVBx2_ISSY_x
- int m_IssyBufs; // ISSY: current 'BUFS' value
- int m_IssyTto; // ISSY: last 'TTO' value (DVB-T2 only)
- int m_IssyBufStat; // ISSY: last 'BUFSTAT' value (DVB-C2/S2 only)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodPlpBlocks -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Number of FEC blocks per frame
-//
-struct DtDemodPlpBlocks
-{
- int m_NumBlocks; // Last plp_num_blocks
- int m_NumBlocksMin; // Minimum plp_num_blocks (-1 = no new value since 
- // reset)
- int m_NumBlocksMax; // Maximum plp_num_blocks 
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MAIN DTAPI CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDevice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class representing a DekTec Device
-//
-class DtDevice
-{
- // Constructor, destructor
-public:
- DtDevice();
- virtual ~DtDevice();
-private:
- // No implementation is provided for the copy constructor
- DtDevice(const DtDevice&);
-
- // Public access functions
-public:
- virtual int Category(void);
- virtual int ChanType(int Port);
- virtual int FirmwareVersion(void);
- virtual bool IsAttached(void);
- virtual int TypeNumber(void);
- virtual bool HasCaps(int Port, const DtCaps Caps) const;
-
- // Public member functions
-public:
- virtual DTAPI_RESULT AttachToIpAddr(unsigned char Ip[4]);
- virtual DTAPI_RESULT AttachToSerial(__int64 SerialNumber);
- virtual DTAPI_RESULT AttachToSlot(int PciBusNumber, int SlotNumber);
- virtual DTAPI_RESULT AttachToType(int TypeNumber, int DeviceNo=0);
- virtual DTAPI_RESULT Detach(void);
- virtual DTAPI_RESULT DetectIoStd(int Port, int& Value, int& SubValue);
- virtual DTAPI_RESULT FlashDisplay(int NumFlashes=5, int OnTime=100, int OffTime=100);
- virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
- virtual DTAPI_RESULT GetAttribute(int Port, int AttrId, int& AttrValue);
- virtual DTAPI_RESULT GetAttribute(int Port, int AttrId, DtModPars& ModParVals, 
- int& AttrValue);
- virtual DTAPI_RESULT GetDescriptor(DtDeviceDesc& DvcDesc);
- virtual DTAPI_RESULT GetDeviceDriverVersion(int& Major, int& Minor, int& BugFix,
- int& Build);
- virtual DTAPI_RESULT GetDisplayName(wchar_t* pName);
- virtual DTAPI_RESULT GetDisplayName(char* pName);
- virtual DTAPI_RESULT GetFanSpeed(int Fan, int& Rpm);
- virtual DTAPI_RESULT GetFanTemperature(int Fan, int& Temp);
- virtual DTAPI_RESULT GetFirmwareVersion(int& FirmwareVersion);
- virtual DTAPI_RESULT GetGenlockState(int& State, int& RefVidStd);
- virtual DTAPI_RESULT GetGenlockState(int& State);
- virtual DTAPI_RESULT GetIoConfig(DtIoConfig& IoCfg);
- virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value);
- virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue);
- virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue,
- __int64& ParXtra0);
- virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue,
- __int64& ParXtra0, __int64& ParXtra1);
- virtual DTAPI_RESULT GetNwSpeed(int Port, bool& Enable, int& Speed);
- virtual DTAPI_RESULT GetRefClkCnt(int& RefClkCnt);
- virtual DTAPI_RESULT GetRefClkCnt(int& RefClkCnt, int& RefClkFreqHz);
- virtual DTAPI_RESULT GetRefClkFreq(int& RefClkFreqHz);
- virtual DTAPI_RESULT GetStateFlags(int Port, int &StateFlags);
- virtual DTAPI_RESULT GetUsbSpeed(int& UsbSpeed);
- virtual DTAPI_RESULT GetVcxoState(bool& Enable, int& Lock, int& VcxoClkFreqHz);
- virtual DTAPI_RESULT HwFuncScan(int NumEntries, int& NumEntriesResult,
- DtHwFuncDesc* pHwFuncs);
- virtual DTAPI_RESULT LedControl(int LedControl);
- virtual DTAPI_RESULT RegisterCallback(pDtEventCallback Callback, void* pContext,
- int EventTypes, void** pId = NULL);
- virtual DTAPI_RESULT SetDisplayName(wchar_t* pName);
- virtual DTAPI_RESULT SetDisplayName (char* pName);
- virtual DTAPI_RESULT SetIoConfig(int Port, int Group, int Value, int SubValue = -1,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- virtual DTAPI_RESULT SetIoConfig(DtIoConfig* pIoConfigs, int Count);
- virtual DTAPI_RESULT SetNwSpeed(int Port, bool Enable, int Speed);
- virtual DTAPI_RESULT UnregisterCallback(void* pId);
- virtual DTAPI_RESULT VpdDelete(const char* pTag);
- virtual DTAPI_RESULT VpdDelete(const wchar_t* pTag);
- virtual DTAPI_RESULT VpdRead(const char* pTag, char* pVpdItem);
- virtual DTAPI_RESULT VpdRead(const wchar_t* pTag, wchar_t* pVpdItem);
- virtual DTAPI_RESULT VpdRead(const char* pTag, char* pVpdItem, int& ItemSize);
- virtual DTAPI_RESULT VpdRead(const wchar_t* pTag, char* pVpdItem, int& ItemSize);
- virtual DTAPI_RESULT VpdWrite(const char* pTag, char* pVpdItem);
- virtual DTAPI_RESULT VpdWrite(const wchar_t* pTag, wchar_t* pVpdItem);
- virtual DTAPI_RESULT VpdWrite(const char* pTag, char* pVpdItem, int ItemSize);
- virtual DTAPI_RESULT VpdWrite(const wchar_t* pTag, char* pVpdItem, int ItemSize);
-
-protected:
- virtual void LoadDeviceData();
-private:
- static void DtEventCallback(int Event, DtEventArgs* pArgs);
-
- // Public attributes
-public:
- DtDeviceDesc m_DvcDesc; // Device descriptor, initialized in attach
- DtHwFuncDesc* m_pHwf; // Hardware functions, initialized in attach
- 
- // Implementation data
-private:
- std::list<void*> m_EventSubscriberList;
-
- // Friends
- friend class DtInpChannel;
- friend class DtOutpChannel;
-
-public: // TODOSD should be protected
- IDevice* m_pDev;
-};
-
-// Attribute identifiers
-#define DTAPI_ATTR_LEVEL_MAX 1
-#define DTAPI_ATTR_LEVEL_RANGE 2
-#define DTAPI_ATTR_LEVEL_STEPSIZE 3
-#define DTAPI_ATTR_RFFREQ_ABSMAX 4
-#define DTAPI_ATTR_RFFREQ_ABSMIN 5
-#define DTAPI_ATTR_RFFREQ_MAX 6
-#define DTAPI_ATTR_RFFREQ_MIN 7
-#define DTAPI_ATTR_SAMPRHW_ABSMAX 8
-#define DTAPI_ATTR_SAMPRHW_ABSMIN 9
-#define DTAPI_ATTR_SAMPRHW_HARDLIM 10
-#define DTAPI_ATTR_SAMPRHW_MAX 11
-#define DTAPI_ATTR_SAMPRHW_MIN 12
-#define DTAPI_ATTR_SAMPRATE_ABSMAX 13
-#define DTAPI_ATTR_SAMPRATE_ABSMIN 14
-#define DTAPI_ATTR_SAMPRATE_MAX 15
-#define DTAPI_ATTR_SAMPRATE_MIN 16
-#define DTAPI_ATTR_NUM_FANS 17
-#define DTAPI_ATTR_PCIE_REQ_BW 18
-#define DTAPI_ATTR_PCIE_AVAIL_BW 19
-
-// Order in which devices should be listed by DtapiDeviceScan/DtapiHwFuncScan
-#define DTAPI_SCANORDER_ORIG 0 // Devices are returned in order determined by OS
-#define DTAPI_SCANORDER_SN 1 // Devices are sorted by serial number
-
-// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
-#define DTAPI_DVC2STR_TYPE_NMB 0
-// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
-#define DTAPI_DVC2STR_TYPE_AND_LOC 1
-// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
-#define DTAPI_HWF2STR_TYPE_NMB 0
-// String conversion - Device type number + port (e.g. "DTA-124 port 1")
-#define DTAPI_HWF2STR_TYPE_AND_PORT 1
-// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
-#define DTAPI_HWF2STR_TYPE_AND_LOC 2
-// String conversion - Interface type (e.g. "DVB-ASI" or "DVB-C")
-#define DTAPI_HWF2STR_ITF_TYPE 3
-// String conversion - Short version of interface type (e.g. "ASI" instead "DVB-ASI")
-#define DTAPI_HWF2STR_ITF_TYPE_SHORT 4
-
-// Current genlock state
-#define DTAPI_GENL_NO_REF 1
-#define DTAPI_GENL_LOCKING 2
-#define DTAPI_GENL_LOCKED 3
-
-// Constants for GetStateFlags() on port level
-#define DTAPI_STATE_FLAG_INSUFF_USB_BW 0x010000
-#define DTAPI_STATE_FLAG_SDI_NO_LOCK 0x020000
-#define DTAPI_STATE_FLAG_SDI_INVALID 0x040000
-// Constants for GetStateFlags() on device level
-#define DTAPI_STATE_FLAG_VPD_CORRUPT 0x000001
-#define DTAPI_STATE_FLAG_NO_SERIAL 0x000002
-#define DTAPI_STATE_FLAG_NO_USB3 0x000004
-#define DTAPI_STATE_FLAG_SLEEPING 0x000008
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDtaPlusDevice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class representing a DekTec DTA-plus Device
-//
-class DtDtaPlusDevice
-{
- // Constructor, destructor
-public:
- DtDtaPlusDevice();
- virtual ~DtDtaPlusDevice();
-private:
- // No implementation is provided for the copy constructor
- DtDtaPlusDevice(const DtDtaPlusDevice&);
-
- // Public access functions
-public:
- bool IsAttached(void);
-
- // Public member functions
-public:
- DTAPI_RESULT AttachToDevice(const DtDtaPlusDeviceDesc &DvcDesc);
- DTAPI_RESULT AttachToSerial(__int64 SerialNumber);
- DTAPI_RESULT Detach();
- DTAPI_RESULT GetDeviceStatus(int &Status); 
- DTAPI_RESULT GetTempControlStatus(int &ControlStatus);
- DTAPI_RESULT GetTemperature(int &Temperature);
- DTAPI_RESULT GetSerialNumber(__int64 &SerialNumber);
- DTAPI_RESULT SetRfOutLevel(int Level);
- DTAPI_RESULT SetFreq(int Freq);
-
-private:
- DtaPlusDevice* m_Dev;
-};
-
-// DTA-plus status codes
-#define DTAPI_DTAPLUS_STATUS_OFF 0 // DTA-Plus not ready for operation
-#define DTAPI_DTAPLUS_STATUS_ON 1 // DTA-Plus ready for operation
-#define DTAPI_DTAPLUS_STATUS_ATTN_FOLLOW_UP 2 // DTA-Plus attenuator ctrl following up
-#define DTAPI_DTAPLUS_STATUS_ATTN_FOLLOW_DOWN 3 //DTA-Plus attenuator ctrl following down
-#define DTAPI_DTAPLUS_STATUS_DAC_FOLLOW_UP 4 // DTA-Plus DAC control following up
-#define DTAPI_DTAPLUS_STATUS_DAC_FOLLOW_DOWN 5 // DTA-Plus DAC control following down
-#define DTAPI_DTAPLUS_STATUS_HOLD 6 // DTA-Plus has valid input signal
-#define DTAPI_DTAPLUS_STATUS_NO_SIGNAL 7 // DTA-Plus has no input signal
-#define DTAPI_DTAPLUS_STATUS_OVER_POWER 8 // DTA-Plus input signal is too high
-
-// DTA-plus temperature control states
-#define DTAPI_DTAPLUS_TEMP_CONTROL_OFF 0 // DTA-Plus temperature control is off
-#define DTAPI_DTAPLUS_TEMP_CONTROL_FAN_ON 1 // DTA-Plus fan is on
-#define DTAPI_DTAPLUS_TEMP_CONTROL_HEATER_ON 2 // DTA-Plus heater is on
-
-// Ethernet speed
-#define DTAPI_NWSPEED_AUTO 0 // Set
-#define DTAPI_NWSPEED_NOLIN 0 // Get
-#define DTAPI_NWSPEED_10MB_HALF 1
-#define DTAPI_NWSPEED_10MB_FULL 2
-#define DTAPI_NWSPEED_100MB_HALF 3
-#define DTAPI_NWSPEED_100MB_FULL 4
-#define DTAPI_NWSPEED_1GB_MASTER 5
-#define DTAPI_NWSPEED_1GB_SLAVE 6
-
-// Microcode upload states
-#define DTAPI_UCODE_NOT_LOADED 0
-#define DTAPI_UCODE_LOADING 1
-#define DTAPI_UCODE_LOADED 2
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtInpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class to represent an input channel
-//
-class DtInpChannel
-{
-public:
- DtInpChannel();
- virtual ~DtInpChannel();
-private:
- // No implementation is provided for the copy constructor
- DtInpChannel(const DtInpChannel&);
-
-public:
- DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
-
- // Convenience functions
-public:
- int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
- int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
- bool IsAttached(void) { return m_pInp != NULL; }
- int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
- bool HasCaps(const DtCaps Caps) const 
- { 
- return ((m_HwFuncDesc.m_Flags & Caps) == Caps); 
- }
-
-public:
- DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
- bool Exclusive=true, bool ProbeOnly=false);
- DTAPI_RESULT BlindScan(int NumEntries, int& NumEntriesResult, 
- DtTransmitter* pScanResults, __int64 FreqHzSteps=10000000LL, 
- __int64 StartFreqHz=950000000LL, __int64 EndFreqHz=2150000000LL);
- DTAPI_RESULT ClearFifo();
- DTAPI_RESULT ClearFlags(int Latched);
- DTAPI_RESULT Detach(int DetachMode);
- DTAPI_RESULT DetectIoStd(int& Value, int& SubValue);
- DTAPI_RESULT Equalise(int EqualiserSetting);
- DTAPI_RESULT GetConstellationPoints(int NumPoints, DtConstelPoint* pPoint);
- DTAPI_RESULT GetDemodControl(int& ModType,
- int& ParXtra0, int& ParXtra1, int& ParXtra2);
- DTAPI_RESULT GetDemodControl(DtDemodPars* pDemodPars);
- DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
- DTAPI_RESULT GetFifoLoad(int& FifoLoad);
- DTAPI_RESULT GetFlags(int& Flags, int& Latched);
- DTAPI_RESULT GetIoConfig(int Group, int& Value);
- DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
- DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, __int64& ParXtra0);
- DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
- __int64& ParXtra0, __int64& ParXtra1);
- DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
- DTAPI_RESULT GetIpStat(DtIpStat* pIpStat);
- DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
- DTAPI_RESULT GetPars(int Count, DtPar* pPars); 
- DTAPI_RESULT GetRxClkFreq(int& RxClkFreq);
- DTAPI_RESULT GetRxControl(int& RxControl);
- DTAPI_RESULT GetRxMode(int& RxMode);
- DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
- DTAPI_RESULT GetStatistic(int Type, int& Statistic);
- DTAPI_RESULT GetStatistic(int Type, double& Statistic);
- DTAPI_RESULT GetStatistic(int Type, bool& Statistic);
- DTAPI_RESULT GetStatus(int& PacketSize, int& NumInv, int& ClkDet,
- int& AsiLock, int& RateOk, int& AsiInv);
- DTAPI_RESULT GetStreamSelection(DtDabEtiStreamSelPars& StreamSel);
- DTAPI_RESULT GetStreamSelection(DtDabStreamSelPars& StreamSel);
- DTAPI_RESULT GetStreamSelection(DtDvbC2StreamSelPars& StreamSel);
- DTAPI_RESULT GetStreamSelection(DtDvbTStreamSelPars& StreamSel);
- DTAPI_RESULT GetStreamSelection(DtDvbT2StreamSelPars& StreamSel);
- DTAPI_RESULT GetStreamSelection(DtIsdbtStreamSelPars& StreamSel);
- DTAPI_RESULT GetStreamSelection(DtT2MiStreamSelPars& StreamSel);
- DTAPI_RESULT GetSupportedStatistics(int& Count, DtStatistic* pStatistics);
- DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
- DTAPI_RESULT GetTsRateBps(int& TsRate);
- DTAPI_RESULT GetTunerFrequency(__int64& FreqHz, int TunerId=-1);
- DTAPI_RESULT GetViolCount(int& ViolCount);
- DTAPI_RESULT I2CLock(int TimeOut);
- DTAPI_RESULT I2CUnlock(void);
- DTAPI_RESULT I2CRead(int DvcAddr, char* pBuffer, int NumBytesToRead);
- DTAPI_RESULT I2CWrite(int DvcAddr, char* pBuffer, int NumBytesToWrite);
- DTAPI_RESULT I2CWriteRead(int DvcAddrWrite, char* pBufferWrite, int NumBytesToWrite,
- int DvcAddrRead, char* pBufferRead, int NumBytesToRead);
- DTAPI_RESULT LedControl(int LedControl);
- DTAPI_RESULT LnbEnable(bool Enable);
- DTAPI_RESULT LnbEnableTone(bool Enable);
- DTAPI_RESULT LnbSetVoltage(int Level);
- DTAPI_RESULT LnbSendBurst(int BurstType);
- DTAPI_RESULT LnbSendDiseqcMessage(const unsigned char* MsgOut, int NumBytesOut);
- DTAPI_RESULT LnbSendDiseqcMessage(const unsigned char* MsgOut, int NumBytesOut, 
- unsigned char* MsgIn, int& NumBytesIn);
- DTAPI_RESULT PolarityControl(int Polarity);
- DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead);
- DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead, int TimeOut);
- DTAPI_RESULT ReadFrame(unsigned int* pFrame, int& FrameSize, int TimeOut=-1);
- DTAPI_RESULT RegisterDemodCallback(IDtDemodEvent* pIEvent, __int64 Events=-1);
- DTAPI_RESULT Reset(int ResetMode);
- DTAPI_RESULT SetAdcSampleRate(int SampleRate);
- DTAPI_RESULT SetAntPower(int AntPower);
- DTAPI_RESULT SetDemodControl(int ModType, int ParXtra0, int ParXtra1, int ParXtra2);
- DTAPI_RESULT SetDemodControl(DtDemodPars *pDemodPars);
- DTAPI_RESULT SetErrorStatsMode(int ModType, int Mode);
- DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
- DTAPI_RESULT SetPars(int Count, DtPar* pPars); 
- DTAPI_RESULT SetRxControl(int RxControl);
- DTAPI_RESULT SetRxMode(int RxMode);
- DTAPI_RESULT SetStreamSelection(DtDabEtiStreamSelPars& StreamSel);
- DTAPI_RESULT SetStreamSelection(DtDabStreamSelPars& StreamSel);
- DTAPI_RESULT SetStreamSelection(DtDvbC2StreamSelPars& StreamSel);
- DTAPI_RESULT SetStreamSelection(DtDvbTStreamSelPars& StreamSel);
- DTAPI_RESULT SetStreamSelection(DtDvbT2StreamSelPars& StreamSel);
- DTAPI_RESULT SetStreamSelection(DtIsdbtStreamSelPars& StreamSel);
- DTAPI_RESULT SetStreamSelection(DtT2MiStreamSelPars& StreamSel);
- DTAPI_RESULT SetTuningMode(int Mode);
- DTAPI_RESULT SetTunerFrequency(__int64 FreqHz, int TunerId=-1);
- DTAPI_RESULT Tune(__int64 FreqHz, int ModType,
- int ParXtra0, int ParXtra1, int ParXtra2);
- DTAPI_RESULT Tune(__int64 FreqHz, DtDemodPars *pDemodPars);
-
- // Encapsulated data
-private:
- IXpMutex* m_pMTLock; // Multi-threading lock for Get/Read functions
- void* m_pDetachLockCount;
- int m_Port;
- bool m_WantToDetach;
-
-public: // TODOSD should be protected
- InpChannel* m_pInp; // Input channel implementation
- 
-// Private helper functions
-private:
- DTAPI_RESULT DetachLock(void);
- DTAPI_RESULT DetachUnlock(void);
- DTAPI_RESULT ReadAccessLock(void);
- DTAPI_RESULT ReadAccessUnlock(void);
- DTAPI_RESULT ReadWithTimeOut(char* pBuf, int NumBytesToRead, int TimeOut = -1);
-};
-
-// Tuner freq has changed
-#define DTAPI_EV_TUNE_FREQ_CHANGED 0x0000000000000001LL
-// Tuning parameters have changed
-#define DTAPI_EV_TUNE_PARS_CHANGED 0x0000000000000002LL
-
-#define DTAPI_ERRORSTATS_BER 0 // Bit error rate (default)
-#define DTAPI_ERRORSTATS_RS 1 // Reed-Solomon packet errors
-
-// Feature not supported
-#define DTAPI_NOT_SUPPORTED -1
-
-// ASI Polarity-Control Status
-#define DTAPI_ASIINV_NORMAL 0
-#define DTAPI_ASIINV_INVERT 1
-
-// ASI Input-Clock Lock
-#define DTAPI_ASI_NOLOCK 0
-#define DTAPI_ASI_INLOCK 1
-
-// SDI Input-Clock Lock
-#define DTAPI_GENLOCK_NOLOCK 0
-#define DTAPI_GENLOCK_INLOCK 1
-
-// Clock Detector
-#define DTAPI_CLKDET_FAIL 0
-#define DTAPI_CLKDET_OK 1
-
-// Input Rate Ok
-#define DTAPI_INPRATE_LOW 0
-#define DTAPI_INPRATE_OK 1
-
-// #Invalid bytes per packet
-#define DTAPI_NUMINV_NONE 0
-#define DTAPI_NUMINV_16 1
-#define DTAPI_NUMINV_OTHER 2
-
-// Packet Size
-#define DTAPI_PCKSIZE_INV 0
-#define DTAPI_PCKSIZE_188 2
-#define DTAPI_PCKSIZE_204 3
-
-// SDI Mode
-#define DTAPI_SDIMODE_INV 0
-#define DTAPI_SDIMODE_525 1
-#define DTAPI_SDIMODE_625 2
-
-// Receive Control
-#define DTAPI_RXCTRL_IDLE 0
-#define DTAPI_RXCTRL_RCV 1
-
-// Receive mode for Transport Streams - Modes
-#define DTAPI_RXMODE_TS 0x10
-#define DTAPI_RXMODE_TS_MODE_BITS 0x0F
-#define DTAPI_RXMODE_ST188 (DTAPI_RXMODE_TS | 0x01)
-#define DTAPI_RXMODE_ST204 (DTAPI_RXMODE_TS | 0x02)
-#define DTAPI_RXMODE_STMP2 (DTAPI_RXMODE_TS | 0x03)
-#define DTAPI_RXMODE_STRAW (DTAPI_RXMODE_TS | 0x04)
-#define DTAPI_RXMODE_STL3 (DTAPI_RXMODE_TS | 0x05)
-#define DTAPI_RXMODE_STL3FULL (DTAPI_RXMODE_TS | 0x06)
-#define DTAPI_RXMODE_IPRAW (DTAPI_RXMODE_TS | 0x07)
-#define DTAPI_RXMODE_RAWASI (DTAPI_RXMODE_TS | 0x08)
-#define DTAPI_RXMODE_STTRP (DTAPI_RXMODE_TS | 0x09)
-#define DTAPI_RXMODE_TS_MASK (DTAPI_RXMODE_TS | DTAPI_RXMODE_TS_MODE_BITS)
-
-// Receive mode for SDI - Modes
-#define DTAPI_RXMODE_SDI 0x1000
-#define DTAPI_RXMODE_SDI_MODE_BITS 0x0F00
-#define DTAPI_RXMODE_SDI_FULL (DTAPI_RXMODE_SDI | 0x100)
-#define DTAPI_RXMODE_SDI_ACTVID (DTAPI_RXMODE_SDI | 0x200)
-#define DTAPI_RXMODE_SDI_MASK (DTAPI_RXMODE_SDI | DTAPI_RXMODE_SDI_MODE_BITS)
-// Receive mode for SDI - Flags
-#define DTAPI_RXMODE_SDI_HUFFMAN 0x00002000
-#define DTAPI_RXMODE_SDI_10B 0x00004000
-#define DTAPI_RXMODE_SDI_16B 0x00008000
-#define DTAPI_RXMODE_SDI_10B_NBO 0x00010000
-
-// Receive mode for SDI and Transport Streams - Common flags
-#define DTAPI_RXMODE_TIMESTAMP32 0x01000000
-#define DTAPI_RXMODE_TIMESTAMP64 0x02000000
-
-// Demodulation status flags - FEC lock
-#define DTAPI_DEMOD_FECLOCK_FAIL 0
-#define DTAPI_DEMOD_FECLOCK_OK 1
-// Demodulation status flags - Receiver lock
-#define DTAPI_DEMOD_RCVLOCK_FAIL 0
-#define DTAPI_DEMOD_RCVLOCK_OK 1 
-
-// Channel bands
-#define DTAPI_BAND_BROADCAST_ONAIR 1
-#define DTAPI_BAND_FCC_CABLE 2
-#define DTAPI_BAND_IRC 3
-#define DTAPI_BAND_HRC 4
-
-// RF level bandwith
-#define DTAPI_RFLVL_CHANNEL 0
-#define DTAPI_RFLVL_NARROWBAND 1
-
-// ADC sampling rates
-#define DTAPI_ADCCLK_OFF 0 // Clock is off
-#define DTAPI_ADCCLK_20M647 20647059 // 20.647059 MHz clock
-#define DTAPI_ADCCLK_13M5 13500000 // 13.5 MHz clock
-#define DTAPI_ADCCLK_27M 27000000 // 27.0 MHz clock
-
-// LNB control values
-#define DTAPI_LNB_13V 0 // LNB power 13V
-#define DTAPI_LNB_18V 1 // LNB power 18V
-#define DTAPI_LNB_14V 2 // LNB power 14V
-#define DTAPI_LNB_19V 3 // LNB power 19V
-
-// LNB burst types
-#define DTAPI_LNB_BURST_A 0 // Burst A
-#define DTAPI_LNB_BURST_B 1 // Burst B
-
-// Tuner Parameters - Tuner standard
-#define DTAPI_TUNMOD_QAM 0x1
-#define DTAPI_TUNMOD_ATSC 0x2
-#define DTAPI_TUNMOD_ISDBT 0x3
-#define DTAPI_TUNMOD_DVBT 0x4
-#define DTAPI_TUNMOD_DMBT 0x5
-
-// Tuner Parameters - DTA-2131 specific - Value for automatic computation of parameters
-#define DTAPI_TUN31_AUTO -1 // According to tuner standard
-
-// Tuner Parameters - DTA-2131 specific - Low-pass filter cutoff frequency
-#define DTAPI_TUN31_LPF_1_5MHZ 0 // 1.5 MHz low-pass filter
-#define DTAPI_TUN31_LPF_6MHZ 1 // 6 MHz low-pass filter
-#define DTAPI_TUN31_LPF_7MHZ 2 // 7 MHz low-pass filter
-#define DTAPI_TUN31_LPF_8MHZ 3 // 8 MHz low-pass filter 
-#define DTAPI_TUN31_LPF_9MHZ 4 // 9 MHz low-pass filter 
-
-// Tuner Parameters - DTA-2131 specific - Low-pass filter offset 
-#define DTAPI_TUN31_LPF_0PCT 0 // 0% low-pass filter offset 
-#define DTAPI_TUN31_LPF_4PCT 1 // 4% low-pass filter offset 
-#define DTAPI_TUN31_LPF_8PCT 2 // 8% low-pass filter offset 
-#define DTAPI_TUN31_LPF_12PCT 3 // 12% low-pass filter offset
-
-// Tuner Parameters - DTA-2131 specific - IF hi-pass filter 
-#define DTAPI_TUN31_HPF_DIS 0 // Disabled IF hi-pass filter 
-#define DTAPI_TUN31_HPF_0_4MHZ 1 // 0.4 MHz IF hi-pass filter 
-#define DTAPI_TUN31_HPF_0_85MHZ 2 // 0.85 MHz IF hi-pass filter
-#define DTAPI_TUN31_HPF_1MHZ 3 // 1 MHz IF hi-pass filter
-#define DTAPI_TUN31_HPF_1_5MHZ 4 // 1.5 MHz IF hi-pass filter
-
-// Tuner Parameters - DTA-2131 specific - Notch settings
-#define DTAPI_TUN31_NOTCH_DIS 0 // Disable
-#define DTAPI_TUN31_NOTCH_ENA 1 // Enable
-
-// Tuner Parameters - DTA-2139 specific - Agc specific
-#define DTAPI_AGC1_FREE 0
-#define DTAPI_AGC1_FROZEN 1
-
-// Tuning mode - DTU-236A specific
-#define DTAPI_TUNING_NORMAL 0 // Standard tuning mode
-#define DTAPI_TUNING_INDEPENDENT 1 // Multiple tuners, tuned independently
-
-// Tuner ID - DTU-236A specific
-#define DTAPI_TUNERID_ALL -1 // ID for all tuners
-#define DTAPI_TUNERID_MAIN 0 // ID for main tuner
-#define DTAPI_TUNERID_MEASUREMENT 1 // ID for measurement tuner
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtOutpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class to represent a transport-stream or SDI output channel
-//
-class DtOutpChannel
-{
-public:
- DtOutpChannel();
- virtual ~DtOutpChannel();
-private:
- // No implementation is provided for the copy constructor
- DtOutpChannel(const DtOutpChannel&);
-
-public:
- DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
-
- // Convenience functions
-public:
- int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
- int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
- bool IsAttached(void) { return m_pOutp != NULL; }
- int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
- bool HasCaps(const DtCaps Caps) const 
- { 
- return ((m_HwFuncDesc.m_Flags & Caps) == Caps); 
- }
-
-public:
- virtual DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port, bool ProbeOnly=false);
- virtual DTAPI_RESULT ClearFifo(void);
- virtual DTAPI_RESULT ClearFlags(int Latched);
- virtual DTAPI_RESULT Detach(int DetachMode);
- virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
- virtual DTAPI_RESULT GetAttribute(int AttrId, DtModPars& ModParVals, int& AttrValue);
- virtual DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
- virtual DTAPI_RESULT GetExtClkFreq(int& ExtClkFreq);
- virtual DTAPI_RESULT GetFailsafeAlive(bool& Alive);
- virtual DTAPI_RESULT GetFailsafeConfig(bool& Enable, int& Timeout);
- virtual DTAPI_RESULT GetFifoLoad(int& FifoLoad);
- virtual DTAPI_RESULT GetFifoSize(int& FifoSize);
- virtual DTAPI_RESULT GetFifoSizeMax(int& FifoSizeMax);
- virtual DTAPI_RESULT GetFifoSizeTyp(int& FifoSizeTyp);
- virtual DTAPI_RESULT GetFlags(int& Status, int& Latched);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
- __int64& ParXtra0);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
- __int64& ParXtra0, __int64& ParXtra1);
- virtual DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
- virtual DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
- virtual DTAPI_RESULT GetModControl(int& ModType, int& ParXtra0, int& ParXtra1,
- int& ParXtra2, void*& pXtraPars);
- virtual DTAPI_RESULT GetOutputLevel(int& LeveldBm);
- virtual DTAPI_RESULT GetRfControl(__int64& RfFreq, int& LockStatus);
- virtual DTAPI_RESULT GetSpiClk(int& SpiClk);
- virtual DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
- virtual DTAPI_RESULT GetTsRateBps(int& TsRate);
- virtual DTAPI_RESULT GetTxControl(int& TxControl);
- virtual DTAPI_RESULT GetTxMode(int& TxMode, int& TxStuffMode);
- virtual DTAPI_RESULT LedControl(int LedControl);
- virtual DTAPI_RESULT Reset(int ResetMode);
- virtual DTAPI_RESULT SetChannelModelling(bool CmEnable, DtCmPars& CmPars); 
- virtual DTAPI_RESULT SetCustomRollOff(bool Enable, DtFilterPars& Filter); 
- virtual DTAPI_RESULT SetFailsafeAlive();
- virtual DTAPI_RESULT SetFailsafeConfig(bool Enable, int Timeout = 0);
- virtual DTAPI_RESULT SetFifoSize(int FifoSize);
- virtual DTAPI_RESULT SetFifoSizeMax(void);
- virtual DTAPI_RESULT SetFifoSizeTyp(void);
- virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- virtual DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
- virtual DTAPI_RESULT SetIsdbtCaptFile(void* IsdbtFile);
- virtual DTAPI_RESULT SetModControl(DtCmmbPars&);
- virtual DTAPI_RESULT SetModControl(DtDvbC2Pars&);
- virtual DTAPI_RESULT SetModControl(DtDvbS2Pars&);
- virtual DTAPI_RESULT SetModControl(DtDvbT2Pars&);
- virtual DTAPI_RESULT SetModControl(DtIsdbsPars&);
- virtual DTAPI_RESULT SetModControl(DtIsdbtPars&);
- virtual DTAPI_RESULT SetModControl(DtIsdbTmmPars&);
- virtual DTAPI_RESULT SetModControl(int ModType, int ParXtra0, int ParXtra1, 
- int ParXtra2);
- virtual DTAPI_RESULT SetModControl(unsigned char*);
- virtual DTAPI_RESULT SetOutputLevel(int LeveldBm);
- virtual DTAPI_RESULT SetPower(int Power);
- virtual DTAPI_RESULT SetRfControl(__int64 RfFreq);
- virtual DTAPI_RESULT SetRfMode(int RfMode);
- virtual DTAPI_RESULT SetRfMode(int Sel, int Mode);
- virtual DTAPI_RESULT SetSnr(int Mode, int Snr);
- virtual DTAPI_RESULT SetSpiClk(int SpiClk);
- virtual DTAPI_RESULT SetTsRateBps(int TsRate);
- virtual DTAPI_RESULT SetTsRateRatio(int TsRate, int ClockRef);
- virtual DTAPI_RESULT SetTxControl(int TxControl);
- virtual DTAPI_RESULT SetTxMode(int TxMode, int StuffMode);
- virtual DTAPI_RESULT SetTxPolarity(int TxPolarity);
- virtual DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite);
- // Undocumented
- virtual DTAPI_RESULT GetModBufLoads(bool&, int&, int&, int&);
-
-public: // TODOSD should be protected
- OutpChannel* m_pOutp; // Output channel implementation
-
-private:
- void* m_pDetachLockCount;
- bool m_WantToDetach;
- DTAPI_RESULT DetachLock(void);
- DTAPI_RESULT DetachUnlock(void);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMplpOutpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMplpOutpChannel : public DtOutpChannel
-{
-public:
- DtMplpOutpChannel();
- virtual ~DtMplpOutpChannel();
-private:
- // No implementation is provided for the copy constructor
- DtMplpOutpChannel(const DtMplpOutpChannel&);
-
-public:
- virtual bool IsAttached(void);
-
-public:
- virtual DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port, bool ProbeOnly=false);
- virtual DTAPI_RESULT ClearFifo(void);
- virtual DTAPI_RESULT ClearFlags(int Latched);
- virtual DTAPI_RESULT Detach(int DetachMode);
- virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
- virtual DTAPI_RESULT GetAttribute(int AttrId, DtModPars& ModParVals, int& AttrValue);
- virtual DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
- virtual DTAPI_RESULT GetExtClkFreq(int& ExtClkFreq);
- virtual DTAPI_RESULT GetFailsafeAlive(bool& Alive);
- virtual DTAPI_RESULT GetFailsafeConfig(bool& Enable, int& Timeout);
- virtual DTAPI_RESULT GetFifoLoad(int& FifoLoad);
- virtual DTAPI_RESULT GetFifoSize(int& FifoSize);
- virtual DTAPI_RESULT GetFifoSizeMax(int& FifoSizeMax);
- virtual DTAPI_RESULT GetFifoSizeTyp(int& FifoSizeTyp);
- virtual DTAPI_RESULT GetFlags(int& Status, int& Latched);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
- __int64& ParXtra0);
- virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, 
- __int64& ParXtra0, __int64& ParXtra1);
- virtual DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
- virtual DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
- virtual DTAPI_RESULT GetModControl(int& ModType, int& CodeRate,
- int& ParXtra1, int& ParXtra2, void*& pXtraPars);
- virtual DTAPI_RESULT GetOutputLevel(int& LeveldBm);
- virtual DTAPI_RESULT GetRfControl(__int64& RfFreq, int& LockStatus);
- virtual DTAPI_RESULT GetSpiClk(int& SpiClk);
- virtual DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
- virtual DTAPI_RESULT GetTsRateBps(int& TsRate);
- virtual DTAPI_RESULT GetTxControl(int& TxControl);
- virtual DTAPI_RESULT GetTxMode(int& TxMode, int& TxStuffMode);
- virtual DTAPI_RESULT LedControl(int LedControl);
- virtual DTAPI_RESULT Reset(int ResetMode);
- virtual DTAPI_RESULT SetChannelModelling(bool CmEnable, DtCmPars& CmPars); 
- virtual DTAPI_RESULT SetCustomRollOff(bool Enable, DtFilterPars& Filter); 
-
- virtual DTAPI_RESULT SetFailsafeConfig(bool Enable, int Timeout = 0);
- virtual DTAPI_RESULT SetFailsafeAlive();
- virtual DTAPI_RESULT SetFifoSize(int FifoSize);
- virtual DTAPI_RESULT SetFifoSizeMax(void);
- virtual DTAPI_RESULT SetFifoSizeTyp(void);
- virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- virtual DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
- virtual DTAPI_RESULT SetIsdbtCaptFile(void* IsdbtFile);
- virtual DTAPI_RESULT SetModControl(DtIsdbsPars&);
- virtual DTAPI_RESULT SetModControl(DtIsdbtPars&);
- virtual DTAPI_RESULT SetModControl(DtIsdbTmmPars&);
- virtual DTAPI_RESULT SetModControl(DtCmmbPars&);
- virtual DTAPI_RESULT SetModControl(DtDvbC2Pars&);
- virtual DTAPI_RESULT SetModControl(DtDvbS2Pars&);
- virtual DTAPI_RESULT SetModControl(DtDvbT2Pars&);
- virtual DTAPI_RESULT SetModControl(int ModType, int ParXtra0, int ParXtra1, 
- int ParXtra2);
- virtual DTAPI_RESULT SetModControl(unsigned char*);
- virtual DTAPI_RESULT SetOutputLevel(int LeveldBm);
- virtual DTAPI_RESULT SetPower(int Power);
- virtual DTAPI_RESULT SetRfControl(__int64 RfFreq);
- virtual DTAPI_RESULT SetRfMode(int RfMode);
- virtual DTAPI_RESULT SetRfMode(int Sel, int Mode);
- virtual DTAPI_RESULT SetSnr(int Mode, int Snr);
- virtual DTAPI_RESULT SetSpiClk(int SpiClk);
- virtual DTAPI_RESULT SetTsRateBps(int TsRate);
- virtual DTAPI_RESULT SetTsRateRatio(int TsRate, int ClockRef);
- virtual DTAPI_RESULT SetTxControl(int TxControl);
- virtual DTAPI_RESULT SetTxMode(int TxMode, int TxStuffMode);
- virtual DTAPI_RESULT SetTxPolarity(int TxPolarity);
- virtual DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite);
- // Undocumented
- virtual DTAPI_RESULT GetModBufLoads(bool&, int&, int&, int&);
-
- // IMplpModulator interface implementation
-public:
- virtual DTAPI_RESULT AttachVirtual(DtDevice* pDtDvc, 
- bool (*pFunc)(void*, DtVirtualOutData*), void* pOpaque);
- virtual DTAPI_RESULT GetMplpFifoFree(int FifoIdx, int& FifoFree);
- virtual DTAPI_RESULT GetMplpFifoLoad(int FifoIdx, int& FifoLoad);
- virtual DTAPI_RESULT GetMplpFifoSize(int FifoIdx, int& FifoSize);
- virtual DTAPI_RESULT GetMplpModStatus(DtDvbC2ModStatus* pMplpModStat);
- virtual DTAPI_RESULT GetMplpModStatus(DtDvbS2ModStatus* pMplpModStat);
- virtual DTAPI_RESULT GetMplpModStatus(DtDvbT2ModStatus* pMplpModStat);
- virtual DTAPI_RESULT GetMplpModStatus(DtDvbT2ModStatus* pMplpModStat1,
- DtDvbT2ModStatus* pMplpModStat2);
- virtual DTAPI_RESULT SetMplpChannelModelling(bool CmEnable, DtCmPars&, int Chan=0);
- virtual DTAPI_RESULT WriteMplp(int FifoIdx, char* pBuffer, int NumBytesToWrite);
- virtual DTAPI_RESULT WriteMplpPacket(int FifoIdx, char* pPacket, int PacketSize);
-
-private:
- bool m_IsAttachedToVirtual;
- MplpHelper* m_pMplpHelper;
-};
-
-// Detach mode flags
-#define DTAPI_INSTANT_DETACH 1
-#define DTAPI_WAIT_UNTIL_SENT 2
-
-// Equaliser settings 
-#define DTAPI_EQUALISER_OFF 0
-#define DTAPI_EQUALISER_ON 1
-
-// LED control
-#define DTAPI_LED_OFF 0
-#define DTAPI_LED_GREEN 1
-#define DTAPI_LED_RED 2
-#define DTAPI_LED_YELLOW 3
-#define DTAPI_LED_BLUE 4
-#define DTAPI_LED_HARDWARE 5
-
-// Noise modes
-#define DTAPI_NOISE_DISABLED 0 // No noise generation
-#define DTAPI_NOISE_WNG_HW 1 // White noise generator (hardware)
-
-// Polarity control
-#define DTAPI_POLARITY_AUTO 0
-#define DTAPI_POLARITY_NORMAL 2
-#define DTAPI_POLARITY_INVERT 3
-
-// Power mode
-#define DTAPI_POWER_OFF 0
-#define DTAPI_POWER_ON 1
-
-// Reset mode
-#define DTAPI_FIFO_RESET 0
-#define DTAPI_FULL_RESET 1
-
-// RF PLL lock status
-#define DTAPI_RFPLL_LOCK1 1 // RF PLL #1 is in lock
-#define DTAPI_RFPLL_LOCK2 2 // RF PLL #2 is in lock
-#define DTAPI_RFPLL_LOCK3 4 // RF PLL #3 is in lock
-
-// Status flags
-#define DTAPI_RX_FIFO_OVF 0x0002
-#define DTAPI_RX_SYNC_ERR 0x0004
-#define DTAPI_RX_RATE_OVF 0x0008
-#define DTAPI_RX_TARGET_ERR 0x0010
-#define DTAPI_RX_LINK_ERR 0x0040
-#define DTAPI_RX_DATA_ERR 0x0080
-#define DTAPI_RX_DRV_BUF_OVF 0x0100
-#define DTAPI_RX_SYNTAX_ERR 0x0200
-
-#define DTAPI_TX_FIFO_UFL 0x0002
-#define DTAPI_TX_SYNC_ERR 0x0004
-#define DTAPI_TX_READBACK_ERR 0x0008
-#define DTAPI_TX_TARGET_ERR 0x0010
-#define DTAPI_TX_MUX_OVF 0x0020
-#define DTAPI_TX_FIFO_OVF 0x0020
-#define DTAPI_TX_LINK_ERR 0x0040
-#define DTAPI_TX_DATA_ERR 0x0080
-#define DTAPI_TX_CPU_UFL 0x0100
-#define DTAPI_TX_DMA_UFL 0x0200
-
-// Target adapter present
-#define DTAPI_NO_CONNECTION 0
-#define DTAPI_DVB_SPI_SINK 1 // For output channels
-#define DTAPI_DVB_SPI_SOURCE 1 // For input channels
-#define DTAPI_TARGET_PRESENT 2
-#define DTAPI_TARGET_UNKNOWN 3
-
-// Transmit control
-#define DTAPI_TXCTRL_IDLE 1
-#define DTAPI_TXCTRL_HOLD 2
-#define DTAPI_TXCTRL_SEND 3
-
-// Transmit mode for Transport Streams - Modes
-#define DTAPI_TXMODE_TS 0x10
-#define DTAPI_TXMODE_TS_MODE_BITS 0x0F
-#define DTAPI_TXMODE_188 (DTAPI_TXMODE_TS | 0x01)
-#define DTAPI_TXMODE_192 (DTAPI_TXMODE_TS | 0x02)
-#define DTAPI_TXMODE_204 (DTAPI_TXMODE_TS | 0x03)
-#define DTAPI_TXMODE_ADD16 (DTAPI_TXMODE_TS | 0x04)
-#define DTAPI_TXMODE_MIN16 (DTAPI_TXMODE_TS | 0x05)
-#define DTAPI_TXMODE_IPRAW (DTAPI_TXMODE_TS | 0x06)
-#define DTAPI_TXMODE_RAW (DTAPI_TXMODE_TS | 0x07)
-#define DTAPI_TXMODE_RAWASI (DTAPI_TXMODE_TS | 0x08)
-#define DTAPI_TXMODE_TS_MASK (DTAPI_TXMODE_TS | DTAPI_TXMODE_TS_MODE_BITS)
-// Transmit mode for Transport Streams - DVB-ASI flags
-#define DTAPI_TXMODE_BURST 0x20
-#define DTAPI_TXMODE_TXONTIME 0x40
-
-// Transmit mode for SDI - Modes
-#define DTAPI_TXMODE_SDI 0x1000
-#define DTAPI_TXMODE_SDI_MODE_BITS 0x0F00
-#define DTAPI_TXMODE_SDI_FULL (DTAPI_TXMODE_SDI | 0x100)
-#define DTAPI_TXMODE_SDI_ACTVID (DTAPI_TXMODE_SDI | 0x200)
-#define DTAPI_TXMODE_SDI_MASK (DTAPI_TXMODE_SDI | DTAPI_TXMODE_SDI_MODE_BITS)
-// Transmit mode for SDI - Flags
-#define DTAPI_TXMODE_SDI_HUFFMAN 0x00002000
-#define DTAPI_TXMODE_SDI_10B 0x00004000
-#define DTAPI_TXMODE_SDI_16B 0x00008000
-#define DTAPI_TXMODE_SDI_10B_NBO 0x00010000
-
-// Stuff mode - TS : Null-packet stuffing on/off; SDI: Black-frame stuffing on/off
-#define DTAPI_TXSTUFF_MODE_OFF 0
-#define DTAPI_TXSTUFF_MODE_ON 1
-
-// Transmit polarity
-#define DTAPI_TXPOL_NORMAL 0
-#define DTAPI_TXPOL_INVERTED 1
-
-// Upconverter RF modes
-#define DTAPI_UPCONV_MODE 0 // Selects NORMAL/MUTE/CW/CWI/CWQ
-#define DTAPI_UPCONV_MODE_MSK 0xF // Mask for mode field
-#define DTAPI_UPCONV_NORMAL 0
-#define DTAPI_UPCONV_MUTE 1
-#define DTAPI_UPCONV_CW 2
-#define DTAPI_UPCONV_CWI 3
-#define DTAPI_UPCONV_CWQ 4
-#define DTAPI_UPCONV_SPECINV 0x100 // Can be OR-ed with other RF modes
-
-// USB speed modes
-#define DTAPI_USB_FULL_SPEED 0
-#define DTAPI_USB_HIGH_SPEED 1
-#define DTAPI_USB_SUPER_SPEED 2
-
-// PCIe standards
-#define DTAPI_PCIE_GEN_UNKNOWN 0 // PCIe Gen is unknown
-#define DTAPI_PCIE_GEN1 1 // PCIe Gen 1 (2.5Gbps per link)
-#define DTAPI_PCIE_GEN2 2 // PCIe Gen 2 (5.0Gbps per link)
-#define DTAPI_PCIE_GEN3 3 // PCIe Gen 3 (8.0Gbps per link)
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Modulation Parameters -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-// Modulation types
-#define DTAPI_MOD_DVBS_QPSK 0 // Native DVB-S on DTA-107
-#define DTAPI_MOD_DVBS_BPSK 1
-#define DTAPI_MOD_QAM4 3
-#define DTAPI_MOD_QAM16 4
-#define DTAPI_MOD_QAM32 5
-#define DTAPI_MOD_QAM64 6
-#define DTAPI_MOD_QAM128 7
-#define DTAPI_MOD_QAM256 8
-#define DTAPI_MOD_DVBT 9
-#define DTAPI_MOD_ATSC 10
-#define DTAPI_MOD_DVBT2 11
-#define DTAPI_MOD_ISDBT 12
-#define DTAPI_MOD_ISDBS 13
-#define DTAPI_MOD_IQDIRECT 15
-#define DTAPI_MOD_IQ_2131 16 // DTA-2131 specific (de)modulation
-#define DTAPI_MOD_DVBS2_QPSK 32
-#define DTAPI_MOD_DVBS2_8PSK 33
-#define DTAPI_MOD_DVBS2_16APSK 34
-#define DTAPI_MOD_DVBS2_32APSK 35
-#define DTAPI_MOD_DVBS2_L3 36 
-#define DTAPI_MOD_DVBS2 37
-#define DTAPI_MOD_DMBTH 48
-#define DTAPI_MOD_ADTBT 49
-#define DTAPI_MOD_CMMB 50
-#define DTAPI_MOD_T2MI 51
-#define DTAPI_MOD_DVBC2 52 
-#define DTAPI_MOD_DAB 53 
-#define DTAPI_MOD_QAM_AUTO 54 
-#define DTAPI_MOD_ATSC_MH 55
-#define DTAPI_MOD_ISDBTMM 56
-// Modulation types DVB-S2X specific
-#define DTAPI_MOD_S2X_QPSK_VLSNR 57 // DVB-S2X, QPSK, very low SNR
-#define DTAPI_MOD_S2X_BPSK_VLSNR 58 // DVB-S2X, BPSK, very low SNR
-#define DTAPI_MOD_S2X_BPSK_S_VLSNR 59 // DVB-S2X, BPSK-S, very low SNR
-#define DTAPI_MOD_S2X_8APSK_L 60 // DVB-S2X, 8APSK-L
-#define DTAPI_MOD_S2X_16APSK_L 61 // DVB-S2X, 16APSK-L
-#define DTAPI_MOD_S2X_32APSK_L 62 // DVB-S2X, 32APSK-L
-#define DTAPI_MOD_S2X_64APSK 63 // DVB-S2X, 64APSK
-#define DTAPI_MOD_S2X_64APSK_L 64 // DVB-S2X, 64APSK-L
-#define DTAPI_MOD_S2X_128APSK 65 // DVB-S2X, 128APSK
-#define DTAPI_MOD_S2X_256APSK 66 // DVB-S2X, 256APSK-L
-#define DTAPI_MOD_S2X_256APSK_L 67 // DVB-S2X, 256APSK
-#define DTAPI_MOD_DVBS2X_L3 68 // L3 modulation with S2X support
-#define DTAPI_MOD_TYPE_AUTO -1 // Auto detect modulation type
-#define DTAPI_MOD_TYPE_UNK -1 // Unknown modulation type
-
-// Modulation parameters - Common - ParXtra2
-#define DTAPI_MOD_SYMRATE_AUTO -1 // Auto detect symbol rate
-#define DTAPI_MOD_SYMRATE_UNK -1 // Symbol rate if unknown
-
-// Modulation parameters - ATSC - ParXtra0
-#define DTAPI_MOD_ATSC_VSB8 0x00000000 // 8-VSB, 10.762MBd, 19.392Mbps
-#define DTAPI_MOD_ATSC_VSB16 0x00000001 // 16-VSB, 10.762MBd, 38.785Mbps
-#define DTAPI_MOD_ATSC_VSB_AUTO 0x00000003 // Auto detect constellation
-#define DTAPI_MOD_ATSC_VSB_UNK 0x00000003 // Unknown constellation
-#define DTAPI_MOD_ATSC_VSB_MSK 0x00000003 // Constellation mask
-
-// Modulation parameters - DTMB - Bandwidth
-#define DTAPI_MOD_DTMB_5MHZ 0x00000001
-#define DTAPI_MOD_DTMB_6MHZ 0x00000002
-#define DTAPI_MOD_DTMB_7MHZ 0x00000003
-#define DTAPI_MOD_DTMB_8MHZ 0x00000004
-#define DTAPI_MOD_DTMB_BW_AUTO 0x0000000F // Auto detect
-#define DTAPI_MOD_DTMB_BW_UNK 0x0000000F // Unknown
-#define DTAPI_MOD_DTMB_BW_MSK 0x0000000F
-
-// Modulation parameters - DTMB - Code rate
-#define DTAPI_MOD_DTMB_0_4 0x00000100 // 0.4
-#define DTAPI_MOD_DTMB_0_6 0x00000200 // 0.6
-#define DTAPI_MOD_DTMB_0_8 0x00000300 // 0.8
-#define DTAPI_MOD_DTMB_RATE_AUTO 0x00000F00 // Auto detect
-#define DTAPI_MOD_DTMB_RATE_UNK 0x00000F00 // Unknown
-#define DTAPI_MOD_DTMB_RATE_MSK 0x00000F00 // Mask
-
-// Modulation parameters - DTMB - Constellation
-#define DTAPI_MOD_DTMB_QAM4NR 0x00001000 // 4-QAM-NR
-#define DTAPI_MOD_DTMB_QAM4 0x00002000 // 4-QAM
-#define DTAPI_MOD_DTMB_QAM16 0x00003000 // 16-QAM
-#define DTAPI_MOD_DTMB_QAM32 0x00004000 // 32-QAM
-#define DTAPI_MOD_DTMB_QAM64 0x00005000 // 64-QAM
-#define DTAPI_MOD_DTMB_CO_AUTO 0x0000F000 // Auto detect
-#define DTAPI_MOD_DTMB_CO_UNK 0x0000F000 // Unknown
-#define DTAPI_MOD_DTMB_CO_MSK 0x0000F000 // Mask
-
-// Modulation parameters - DTMB - Frame header mode
-#define DTAPI_MOD_DTMB_PN420 0x00010000 // PN420
-#define DTAPI_MOD_DTMB_PN595 0x00020000 // PN595
-#define DTAPI_MOD_DTMB_PN945 0x00030000 // PN945
-#define DTAPI_MOD_DTMB_PN_AUTO 0x000F0000 // Auto detect
-#define DTAPI_MOD_DTMB_PN_UNK 0x000F0000 // Unknown
-#define DTAPI_MOD_DTMB_PN_MSK 0x000F0000 // Mask
-
-// Modulation parameters - DTMB - Interleaver mode
-#define DTAPI_MOD_DTMB_IL_1 0x00100000 // Interleaver mode 1: B=54, M=240
-#define DTAPI_MOD_DTMB_IL_2 0x00200000 // Interleaver mode 2: B=54, M=720
-#define DTAPI_MOD_DTMB_IL_AUTO 0x00F00000 // Auto detect
-#define DTAPI_MOD_DTMB_IL_UNK 0x00F00000 // Unknown
-#define DTAPI_MOD_DTMB_IL_MSK 0x00F00000 // Mask
-
-// Modulation parameters - DTMB - pilots
-#define DTAPI_MOD_DTMB_NO_PILOTS 0x01000000 // No pilots
-#define DTAPI_MOD_DTMB_PILOTS 0x02000000 // Pilots, C=1 only
-#define DTAPI_MOD_DTMB_PIL_AUTO 0x0F000000 // Auto detect
-#define DTAPI_MOD_DTMB_PIL_UNK 0x0F000000 // Unknown
-#define DTAPI_MOD_DTMB_PIL_MSK 0x0F000000 // Mask
-
-// Modulation parameters - DTMB - Use frame numbering
-#define DTAPI_MOD_DTMB_NO_FRM_NO 0x10000000 // No frame numbering
-#define DTAPI_MOD_DTMB_USE_FRM_NO 0x20000000 // Use frame numbers
-#define DTAPI_MOD_DTMB_UFRM_AUTO 0xF0000000 // Auto detect
-#define DTAPI_MOD_DTMB_UFRM_UNK 0xF0000000 // Unknown
-#define DTAPI_MOD_DTMB_UFRM_MSK 0xF0000000 // Mask
-
-// Modulation parameters - DVB-S, DVB-S2
-#define DTAPI_MOD_1_2 0x0 // Code rate 1/2
-#define DTAPI_MOD_2_3 0x1 // Code rate 2/3
-#define DTAPI_MOD_3_4 0x2 // Code rate 3/4
-#define DTAPI_MOD_4_5 0x3 // Code rate 4/5
-#define DTAPI_MOD_5_6 0x4 // Code rate 5/6
-#define DTAPI_MOD_6_7 0x5 // Code rate 6/7
-#define DTAPI_MOD_7_8 0x6 // Code rate 7/8
-#define DTAPI_MOD_1_4 0x7 // Code rate 1/4
-#define DTAPI_MOD_1_3 0x8 // Code rate 1/3
-#define DTAPI_MOD_2_5 0x9 // Code rate 2/5
-#define DTAPI_MOD_3_5 0xA // Code rate 3/5
-#define DTAPI_MOD_8_9 0xB // Code rate 8/9
-#define DTAPI_MOD_9_10 0xC // Code rate 9/10
-#define DTAPI_MOD_CR_AUTO 0xF // Auto detect code rate
-#define DTAPI_MOD_CR_UNK 0xF // Unknown code rate
-//Coderates DVB-S2X specific
-#define DTAPI_MOD_1_5 0x10 // Code rate 1/5
-#define DTAPI_MOD_2_9 0x11 // Code rate 2/9
-#define DTAPI_MOD_11_45 0x12 // Code rate 11/45
-#define DTAPI_MOD_4_15 0x13 // Code rate 4/15
-#define DTAPI_MOD_13_45 0x14 // Code rate 13/45
-#define DTAPI_MOD_14_45 0x15 // Code rate 14/45
-#define DTAPI_MOD_9_20 0x16 // Code rate 9/20
-#define DTAPI_MOD_7_15 0x17 // Code rate 7/15
-#define DTAPI_MOD_8_15 0x18 // Code rate 8/15
-#define DTAPI_MOD_11_20 0x19 // Code rate 11/20
-#define DTAPI_MOD_5_9 0x1A // Code rate 5/9
-#define DTAPI_MOD_26_45 0x1B // Code rate 26/45
-#define DTAPI_MOD_28_45 0x1C // Code rate 28/45
-#define DTAPI_MOD_23_36 0x1D // Code rate 23/36
-#define DTAPI_MOD_29_45 0x1E // Code rate 29/45
-#define DTAPI_MOD_31_45 0x1F // Code rate 31/45
-#define DTAPI_MOD_25_36 0x20 // Code rate 25/36
-#define DTAPI_MOD_32_45 0x21 // Code rate 32/45
-#define DTAPI_MOD_13_18 0x22 // Code rate 13/18
-#define DTAPI_MOD_11_15 0x23 // Code rate 11/15
-#define DTAPI_MOD_7_9 0x24 // Code rate 7/9
-#define DTAPI_MOD_77_90 0x25 // Code rate 77/90
-
-// Modulation parameters - DVB-S, DVB-S2 - ParXtra1
-#define DTAPI_MOD_S_S2_SPECNONINV 0x00 // No spectrum inversion detected
-#define DTAPI_MOD_S_S2_SPECINV 0x10 // Spectrum inversion detected
-#define DTAPI_MOD_S_S2_SPECINV_AUTO 0x30 // Auto detect spectral inversion
-#define DTAPI_MOD_S_S2_SPECINV_UNK 0x30 // Spectral inversion is unknown
-#define DTAPI_MOD_S_S2_SPECINV_MSK 0x30 // Mask for spectrum inversion field
-
-// Modulation parameters - DVB-S2 - ParXtra1 - Pilots
-#define DTAPI_MOD_S2_NOPILOTS 0x00 // Pilots disabled
-#define DTAPI_MOD_S2_PILOTS 0x01 // Pilots enabled
-#define DTAPI_MOD_S2_PILOTS_AUTO 0x03 // Auto detect pilots
-#define DTAPI_MOD_S2_PILOTS_UNK 0x03 // State of pilots unknown
-#define DTAPI_MOD_S2_PILOTS_MSK 0x03 // Mask for pilots field
-
-// Modulation parameters - DVB-S2 - ParXtra1 - FEC frame length
-#define DTAPI_MOD_S2_LONGFRM 0x00 // Long FECFRAME
-#define DTAPI_MOD_S2_MEDIUMFRM 0x04 // Medium FECFRAME
-#define DTAPI_MOD_S2_SHORTFRM 0x08 // Short FECFRAME
-#define DTAPI_MOD_S2_FRM_AUTO 0x0C // Auto detect frame size
-#define DTAPI_MOD_S2_FRM_UNK 0x0C // Frame size unknown
-#define DTAPI_MOD_S2_FRM_MSK 0x0C // Mask for FECFRAME field
-
-// Modulation parameters - DVB-S2(X) - ParXtra1 - Constellation amplitude for 16-, 32-APSK
-#define DTAPI_MOD_S2_CONST_AUTO 0x00 // Default constellation amplitude
-#define DTAPI_MOD_S2_CONST_E_1 0x40 // E=1; Average symbol energy is constant
-#define DTAPI_MOD_S2_CONST_R_1 0x80 // R=1; Radius of outer ring is constant
-#define DTAPI_MOD_S2_CONST_MSK 0xC0 // Mask for constellation shape
-
-// Modulation parameters - DVB-T - Bandwidth
-#define DTAPI_MOD_DVBT_5MHZ 0x00000001
-#define DTAPI_MOD_DVBT_6MHZ 0x00000002
-#define DTAPI_MOD_DVBT_7MHZ 0x00000003
-#define DTAPI_MOD_DVBT_8MHZ 0x00000004
-#define DTAPI_MOD_DVBT_BW_UNK 0x0000000F // Unknown bandwidth
-#define DTAPI_MOD_DVBT_BW_MSK 0x0000000F
-
-// Modulation parameters - DVB-T - Constellation
-#define DTAPI_MOD_DVBT_QPSK 0x00000010
-#define DTAPI_MOD_DVBT_QAM16 0x00000020
-#define DTAPI_MOD_DVBT_QAM64 0x00000030
-#define DTAPI_MOD_DVBT_CO_AUTO 0x000000F0 // Auto detect constellation
-#define DTAPI_MOD_DVBT_CO_UNK 0x000000F0 // Unknown constellation
-#define DTAPI_MOD_DVBT_CO_MSK 0x000000F0
-
-// Modulation parameters - DVB-T - Guard interval
-#define DTAPI_MOD_DVBT_G_1_32 0x00000100
-#define DTAPI_MOD_DVBT_G_1_16 0x00000200
-#define DTAPI_MOD_DVBT_G_1_8 0x00000300
-#define DTAPI_MOD_DVBT_G_1_4 0x00000400
-#define DTAPI_MOD_DVBT_GU_AUTO 0x00000F00 // Auto detect guard interval
-#define DTAPI_MOD_DVBT_GU_UNK 0x00000F00 // Unknown guard interval
-#define DTAPI_MOD_DVBT_GU_MSK 0x00000F00
-
-// DVB-T TPS information - DVB-T Hierarchical layer
-#define DTAPI_MOD_DVBT_HARCHY_NONE 0x00000000
-#define DTAPI_MOD_DVBT_HARCHY_A1 0x01000000
-#define DTAPI_MOD_DVBT_HARCHY_A2 0x02000000
-#define DTAPI_MOD_DVBT_HARCHY_A4 0x03000000
-#define DTAPI_MOD_DVBT_HARCHY_MSK 0x0F000000
-// Modulation parameters - DVB-T - Interleaver mode
-#define DTAPI_MOD_DVBT_INDEPTH 0x00001000
-#define DTAPI_MOD_DVBT_NATIVE 0x00002000
-#define DTAPI_MOD_DVBT_IL_AUTO 0x0000F000 // Auto detect interleaver depth
-#define DTAPI_MOD_DVBT_IL_UNK 0x0000F000 // Unknown interleaver depth
-#define DTAPI_MOD_DVBT_IL_MSK 0x0000F000
-
-// Modulation parameters - DVB-T - FFT size
-#define DTAPI_MOD_DVBT_2K 0x00010000
-#define DTAPI_MOD_DVBT_4K 0x00020000
-#define DTAPI_MOD_DVBT_8K 0x00030000
-#define DTAPI_MOD_DVBT_MD_AUTO 0x000F0000 // Auto detect mode
-#define DTAPI_MOD_DVBT_MD_UNK 0x000F0000 // Unknown mode
-#define DTAPI_MOD_DVBT_MD_MSK 0x000F0000
-
-// Modulation parameters - DVB-T - s48
-#define DTAPI_MOD_DVBT_S48_OFF 0x00000000
-#define DTAPI_MOD_DVBT_S48 0x00100000
-#define DTAPI_MOD_DVBT_S48_MSK 0x00100000
-
-// Modulation parameters - DVB-T - s49
-#define DTAPI_MOD_DVBT_S49_OFF 0x00000000
-#define DTAPI_MOD_DVBT_S49 0x00200000
-#define DTAPI_MOD_DVBT_S49_MSK 0x00200000
-
-// Modulation parameters - DVB-T - s48s49
-#define DTAPI_MOD_DVBT_ENA4849 0x00000000
-#define DTAPI_MOD_DVBT_DIS4849 0x00400000
-#define DTAPI_MOD_DVBT_4849_MSK 0x00400000
-
-// Modulation parameters - IQ - ParXtra0
-#define DTAPI_MOD_INTERPOL_RAW 0 // Raw mode, no interpolation
-#define DTAPI_MOD_INTERPOL_OFDM 1 // Use OFDM interpolation
-#define DTAPI_MOD_INTERPOL_QAM 2 // Use QAM interpolation
-
-// Modulation parameters - IQ - ParXtra2 Packing
-#define DTAPI_MOD_IQPCK_AUTO 0x00000000 // Auto IQ-sample packin
-#define DTAPI_MOD_IQPCK_NONE 0x00000001 // No IQ-sample packing
-#define DTAPI_MOD_IQPCK_12B 0x00000002 // IQ-samples packed in 12-bit
-#define DTAPI_MOD_IQPCK_10B 0x00000003 // IQ-samples packed in 10-bit
-#define DTAPI_MOD_IQPCK_UNK 0x000000FF // Unknown (= use auto)
-#define DTAPI_MOD_IQPCK_MSK 0x000000FF
-
-// Modulation parameters - Roll-off factor - ParXtra1 (DVB-S2), ParXtra2 (IQ)
-#define DTAPI_MOD_ROLLOFF_AUTO 0x00000000 // Default roll-off factor
-#define DTAPI_MOD_ROLLOFF_NONE 0x00000100 // No roll-off
-#define DTAPI_MOD_ROLLOFF_5 0x00000200 // 5% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_10 0x00000300 // 10% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_15 0x00000400 // 15% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_20 0x00000500 // 20% roll-off for DVB-S2
-#define DTAPI_MOD_ROLLOFF_25 0x00000600 // 25% roll-off for DVB-S2
-#define DTAPI_MOD_ROLLOFF_35 0x00000700 // 35% roll-off for DVB-S/S2
-#define DTAPI_MOD_ROLLOFF_UNK 0x0000FF00 // Unknown (= use default)
-#define DTAPI_MOD_ROLLOFF_MSK 0x0000FF00
-
-// Modulation parameters - DVB-T2-MI - ParXtra0 used for T2-MI bitrate
-
-// Modulation parameters - DVB-T2-MI - ParXtra1
-#define DTAPI_MOD_T2MI_PID1_MSK 0x1FFF
-#define DTAPI_MOD_T2MI_PID1_SHFT 0
-#define DTAPI_MOD_T2MI_PID2_MSK 0x1FFF0000
-#define DTAPI_MOD_T2MI_PID2_SHFT 16
-#define DTAPI_MOD_T2MI_MULT_DIS 0x00000000 // Single Profile
-#define DTAPI_MOD_T2MI_MULT_ENA 0x20000000 // Multi Profile
-#define DTAPI_MOD_T2MI_MULT_MSK 0x20000000 // Multi Profile mask
-
-// Modulation parameters - QAM - ParXtra0 - J.83 Annex
-#define DTAPI_MOD_J83_MSK 0x000F
-#define DTAPI_MOD_J83_UNK 0x000F // Unknown annex
-#define DTAPI_MOD_J83_AUTO 0x000F // Auto detect annex
-#define DTAPI_MOD_J83_A 0x0002 // J.83 annex A (DVB-C)
-#define DTAPI_MOD_J83_B 0x0003 // J.83 annex B (\93American QAM\94)
-#define DTAPI_MOD_J83_C 0x0001 // J.83 annex C (\93Japanese QAM\94)
-
-// Modulation parameters - QAM - ParXtra1 - QAM-B interleaver mode
-#define DTAPI_MOD_QAMB_I128_J1D 0x1
-#define DTAPI_MOD_QAMB_I64_J2 0x3
-#define DTAPI_MOD_QAMB_I32_J4 0x5
-#define DTAPI_MOD_QAMB_I16_J8 0x7
-#define DTAPI_MOD_QAMB_I8_J16 0x9
-#define DTAPI_MOD_QAMB_I128_J1 0x0
-#define DTAPI_MOD_QAMB_I128_J2 0x2
-#define DTAPI_MOD_QAMB_I128_J3 0x4
-#define DTAPI_MOD_QAMB_I128_J4 0x6
-#define DTAPI_MOD_QAMB_I128_J5 0x8
-#define DTAPI_MOD_QAMB_I128_J6 0xA
-#define DTAPI_MOD_QAMB_I128_J7 0xC
-#define DTAPI_MOD_QAMB_I128_J8 0xE
-#define DTAPI_MOD_QAMB_IL_UNK 0xF // Unknown interleaver mode
-#define DTAPI_MOD_QAMB_IL_AUTO 0xF // Auto detect interleaver mode
-#define DTAPI_MOD_QAMB_IL_MSK 0xF
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ SDI +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-// DtSdi - Table-of-content entry types
-#define DTAPI_SDI_TOC_ENTRY_UNKNOWN 0
-#define DTAPI_SDI_TOC_ENTRY_ACTVID 1
-#define DTAPI_SDI_TOC_ENTRY_HANC 2
-#define DTAPI_SDI_TOC_ENTRY_VANC 3
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiTocEntry -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtSdiTocEntry
-{
- friend class DtSdiUtility;
-
-public:
- inline int AncDataBlockNum() const 
- { 
- if (AncType() != 1) return -1;
- else return m_SdidOrDbn;
- }
- inline int AncDataId() const { return m_Did; }
- inline int AncNumUserWords() const { return m_NumUserWords; }
- inline int AncSecDataId() const
- { 
- if (AncType() != 2) return -1;
- else return m_SdidOrDbn;
- }
- inline int AncType() const { return m_AncType; }
-
- inline int Field() const { return m_Field; }
- inline int Line() const { return m_Line; }
- inline int NumSymbols() const { return m_NumSymbols; }
- inline int StartOffset() const { return m_StartOffset; }
- inline int TocType() const { return m_TocType; }
-
- // Encapsulated data
-protected:
- int m_TocType; // Type of TOC entry
- int m_Line; // Line number where data is located
- int m_Field; // Field in where data is located
- int m_StartOffset; // Symbol offset relative to start of line, first data
- int m_NumSymbols; // Number of symbols
-
- // Following members are only valid if TOC type is DTAPI_SDI_TOC_ENTRY_HANC or 
- // DTAPI_SDI_TOC_ENTRY_VANC
- int m_AncType; // Ancillery data packet type (DTAPI_SDI_ANC_TYPE1 or
- // DTAPI_SDI_ANC_TYPE2)
- int m_Did; // Ancillary packet data ID
- int m_SdidOrDbn; // Ancillary packet data block number (type 1 packet)
- // or secondary data ID (type 2 packet)
- int m_NumUserWords; // Number of ancillary data packet user words
-
- // Constructor, destructor
-public:
- DtSdiTocEntry() : m_TocType(DTAPI_SDI_TOC_ENTRY_UNKNOWN), m_Line(0), m_Field(0),
- m_StartOffset(0), m_NumSymbols(0) {}
- virtual ~DtSdiTocEntry() {};
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// The DtSdi class provides helper functions for processing SDI data
-// 
-class DtSdi
-{
- friend class DtSdiUtility;
-
-public:
- DtSdi();
- virtual ~DtSdi();
-
-public:
- DTAPI_RESULT ConvertFrame(unsigned int* pInFrame, int& InFrameSize,
- int InFrameFormat, unsigned int* pOutFrame, int& OutFrameSize, int OutFrameFormat);
- DTAPI_RESULT CreateBlackFrame(unsigned int* pFrame, int& FrameSize, int FrameFormat);
- DTAPI_RESULT GetActiveVideo(const DtSdiTocEntry& TocEntry,
- unsigned short* pVideo, int& NumSamples);
- DTAPI_RESULT GetActiveVideo(unsigned short* pVideo, int& NumSamples,
- int Field, int Stride=-1);
- DTAPI_RESULT GetAncillaryData(const DtSdiTocEntry& TocEntry,
- unsigned short* pData, int& NumSamples);
- DTAPI_RESULT GetAudio(int AudioGroup, int& Channel,
- unsigned short* pAudio, int& NumSamples);
- DTAPI_RESULT GetTableOfContents(const DtSdiTocEntry** ppToc, int& NumTocEntries);
- DTAPI_RESULT ParseFrame(const unsigned int* pFrame, int FrameSize, int FrameFormat,
- int ParseFlags, const DtSdiTocEntry** ppToc, int& NumTocEntries); 
-
-protected:
- DtSdiUtility* m_pSdiUtil; // Internal utility class
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdi constants -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-
-// Ancillary data packet types
-#define DTAPI_SDI_ANC_TYPE1 1 // Type 1 packet
-#define DTAPI_SDI_ANC_TYPE2 2 // Type 2 packet
-
-// Parse flags
-#define DTAPI_SDI_PARSE_ACTVID 0x0001 // Parse active video
-#define DTAPI_SDI_PARSE_HBLANK 0x0002 // Parse horizontal blanking
-#define DTAPI_SDI_PARSE_VBLANK 0x0004 // Parse vertical blanking
-
-#define DTAPI_SDI_PARSE_BLANK (DTAPI_SDI_PARSE_HBLANK | DTAPI_SDI_PARSE_VBLANK)
-#define DTAPI_SDI_PARSE_ALL (DTAPI_SDI_PARSE_ACTVID | DTAPI_SDI_PARSE_BLANK)
-
-// Field flags
-#define DTAPI_SDI_FIELD1 1
-#define DTAPI_SDI_FIELD2 2
-
-// Audio groups
-#define DTAPI_SDI_AUDIO_GROUP1 0x2FF
-#define DTAPI_SDI_AUDIO_GROUP2 0x1FD
-#define DTAPI_SDI_AUDIO_GROUP3 0x1FB
-#define DTAPI_SDI_AUDIO_GROUP4 0x2F9
-
-#define DTAPI_SDI_AUDIO_CHAN1 0x01
-#define DTAPI_SDI_AUDIO_CHAN2 0x02
-#define DTAPI_SDI_AUDIO_CHAN3 0x04
-#define DTAPI_SDI_AUDIO_CHAN4 0x08
-
-#define DTAPI_SDI_AUDIO_CH_PAIR1 (DTAPI_SDI_AUDIO_CHAN1 | DTAPI_SDI_AUDIO_CHAN2)
-#define DTAPI_SDI_AUDIO_CH_PAIR2 (DTAPI_SDI_AUDIO_CHAN3 | DTAPI_SDI_AUDIO_CHAN4)
-#define DTAPI_SDI_AUDIO_CH_MASK (DTAPI_SDI_AUDIO_CH_PAIR1 | DTAPI_SDI_AUDIO_CH_PAIR2)
-
-// Conversions format
-#define DTAPI_SDI_FULL 0x001
-#define DTAPI_SDI_ACTVID 0x002
-#define DTAPI_SDI_HUFFMAN 0x004
-#define DTAPI_SDI_625 0x008
-#define DTAPI_SDI_525 0x010
-#define DTAPI_SDI_8B 0x020
-#define DTAPI_SDI_10B 0x040
-#define DTAPI_SDI_16B 0x080
-#define DTAPI_SDI_10B_NBO 0x100 // 10-bit packed in network-byte-order
-
-#define DTAPI_SDI_BIT_MASK 0x1E0
-
-// Video standards
-#define DTAPI_VIDSTD_UNKNOWN -1
-#define DTAPI_VIDSTD_525I59_94 DTAPI_IOCONFIG_525I59_94
-#define DTAPI_VIDSTD_625I50 DTAPI_IOCONFIG_625I50
-#define DTAPI_VIDSTD_720P23_98 DTAPI_IOCONFIG_720P23_98
-#define DTAPI_VIDSTD_720P24 DTAPI_IOCONFIG_720P24
-#define DTAPI_VIDSTD_720P25 DTAPI_IOCONFIG_720P25
-#define DTAPI_VIDSTD_720P29_97 DTAPI_IOCONFIG_720P29_97
-#define DTAPI_VIDSTD_720P30 DTAPI_IOCONFIG_720P30
-#define DTAPI_VIDSTD_720P50 DTAPI_IOCONFIG_720P50
-#define DTAPI_VIDSTD_720P59_94 DTAPI_IOCONFIG_720P59_94
-#define DTAPI_VIDSTD_720P60 DTAPI_IOCONFIG_720P60
-#define DTAPI_VIDSTD_1080P23_98 DTAPI_IOCONFIG_1080P23_98
-#define DTAPI_VIDSTD_1080P24 DTAPI_IOCONFIG_1080P24
-#define DTAPI_VIDSTD_1080P25 DTAPI_IOCONFIG_1080P25
-#define DTAPI_VIDSTD_1080P30 DTAPI_IOCONFIG_1080P30
-#define DTAPI_VIDSTD_1080P29_97 DTAPI_IOCONFIG_1080P29_97
-#define DTAPI_VIDSTD_1080I50 DTAPI_IOCONFIG_1080I50
-#define DTAPI_VIDSTD_1080I59_94 DTAPI_IOCONFIG_1080I59_94
-#define DTAPI_VIDSTD_1080I60 DTAPI_IOCONFIG_1080I60
-#define DTAPI_VIDSTD_1080P50 DTAPI_IOCONFIG_1080P50
-#define DTAPI_VIDSTD_1080P59_94 DTAPI_IOCONFIG_1080P59_94
-#define DTAPI_VIDSTD_1080P60 DTAPI_IOCONFIG_1080P60
-
-// Audio standard
-#define DTAPI_SDI_AUDIO_SMPTE272A 1 // SMPTE-272 Level A, 48kHz, 20-bit audio
-
-// Audio formats
-#define DTAPI_SDI_AUDIO_PCM16 0
-#define DTAPI_SDI_AUDIO_PCM24 1
-#define DTAPI_SDI_AUDIO_PCM32 2
-
-// HANC/VANC/Video selection (can be OR-ed)
-//#define DTAPI_SDI_ACTVID 0x01
-#define DTAPI_SDI_HANC 0x02
-#define DTAPI_SDI_VANC 0x04
-#define DTAPI_SDI_ANC_MASK (DTAPI_SDI_HANC | DTAPI_SDI_VANC)
- 
-// Chrominace/luminance stream selection (can be OR-ed)
-#define DTAPI_SDI_CHROM 0x01
-#define DTAPI_SDI_LUM 0x02
-#define DTAPI_SDI_STREAM_MASK (DTAPI_SDI_CHROM | DTAPI_SDI_LUM)
-
-// Anc-data operation mode
-#define DTAPI_ANC_MARK 0x0001
-#define DTAPI_ANC_DELETE 0x0002
-
-// Scalling factor
-#define DTAPI_SCALING_OFF 1
-#define DTAPI_SCALING_1_4 2
-#define DTAPI_SCALING_1_16 3
-
-// Symbol filter mode
-#define DTAPI_SYMFLT_ALL 0 // YCbCr sample (CbYCrY order)
-#define DTAPI_SYMFLT_LUM 1 // Luminance only (Y) 
-#define DTAPI_SYMFLT_CHROM 2 // Chrominance only (CbCr)
-#define DTAPI_SYMFLT_SWAP 3 // Swap order of lum and chrom (i.e. YCbYCr)
-#define DTAPI_SYMFLT_RGB 4 // Convert to/from RGB
-
-// Ancillary filter mode
-#define DTAPI_ANCFLT_OFF 0
-#define DTAPI_ANCFLT_HANC_ALL 1
-#define DTAPI_ANCFLT_HANC_MIN 2
-#define DTAPI_ANCFLT_VANC_ALL 3
-#define DTAPI_ANCFLT_VANC_MIN 4
-
-// Receive mode hints for USB3 devices
-#define DTAPI_RXMODE_FRAMEBUFFER 0x10000
-#define DTAPI_RXMODE_ANC (DTAPI_RXMODE_FRAMEBUFFER | 1)
-#define DTAPI_RXMODE_RAW (DTAPI_RXMODE_FRAMEBUFFER | 2)
-#define DTAPI_RXMODE_FULL (DTAPI_RXMODE_FRAMEBUFFER | 3)
-#define DTAPI_RXMODE_FULL8 (DTAPI_RXMODE_FRAMEBUFFER | 4)
-#define DTAPI_RXMODE_FULL8_SCALED4 (DTAPI_RXMODE_FRAMEBUFFER | 5)
-#define DTAPI_RXMODE_FULL8_SCALED16 (DTAPI_RXMODE_FRAMEBUFFER | 6)
-#define DTAPI_RXMODE_VIDEO (DTAPI_RXMODE_FRAMEBUFFER | 7)
-#define DTAPI_RXMODE_VIDEO8 (DTAPI_RXMODE_FRAMEBUFFER | 8)
-#define DTAPI_RXMODE_VIDEO8_SCALED4 (DTAPI_RXMODE_FRAMEBUFFER | 9)
-#define DTAPI_RXMODE_VIDEO8_SCALED16 (DTAPI_RXMODE_FRAMEBUFFER | 10)
-#define DTAPI_RXMODE_RAW8 (DTAPI_RXMODE_FRAMEBUFFER | 15)
-#define DTAPI_RXMODE_FRMBUF_MASK 0x0F
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ HD-SDI CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- AncPacket -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class AncPacket
-{
-public:
- AncPacket();
- AncPacket(const AncPacket& s);
- virtual ~AncPacket();
-
-public:
- int m_Did; // Data identifier
- int m_SdidOrDbn; // Secondary data identifier / Data block number
- int m_Dc; // Data count
- int m_Cs; // Check sum
- unsigned short* m_pUdw; // User data words
-
- // Operations
-public:
- void Create(unsigned short* pUserWords, int NumWords);
- void Create(int NumWords=256);
- void Destroy();
- int Type() const { return (m_Did & 0x80)==0 ? 2 : 1; }
- int Size() const { return m_Size; }
-
- void operator = (const AncPacket& s);
-
-private:
- int m_Size; // Size of user data buffer (in # of words)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtFrameBufTrPars
-{
-public:
- enum ParsType { PT_VIDEO, PT_ANC, PT_RAW };
-
-protected:
- DtFrameBufTrPars(ParsType Type);
-public:
- virtual ~DtFrameBufTrPars();
-
- // Operations
-public:
- DTAPI_RESULT SetCommon(__int64 Frame, unsigned char* pBuf, int BufSize, 
- int DataFormat, int StartLine=1, int NumLines=-1);
-
- ParsType GetType() const { return m_Type; } 
-
-public:
- __int64 m_Frame; // Frame to transfer
- unsigned char* m_pBuf; // Transfer buffer
- int m_BufSize; // [in] size of buffer / [out] actual #bytes transferred
- int m_StartLine; // [in] 1st line to transfer / [out] actual first line
- int m_NumLines; // [in] #lines to transfer / [out] actual #lines
- int m_DataFormat; // Format of data (8-, 10-, 16-bit) 
-
-private:
- ParsType m_Type; // Parameter type
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsVideo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtFrameBufTrParsVideo : public DtFrameBufTrPars
-{
-public:
- DtFrameBufTrParsVideo(int Field, int Scaling=DTAPI_SCALING_OFF, int Stride=-1,
- int SymFlt=DTAPI_SYMFLT_ALL);
- virtual ~DtFrameBufTrParsVideo();
- 
-public:
- int m_Field; // Field to transfer
- int m_Scaling; // Scaling mode
- int m_Stride; // -1 means no stride
- int m_SymFlt; // Symbol filter mode
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsAnc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtFrameBufTrParsAnc : public DtFrameBufTrPars
-{
-public:
- DtFrameBufTrParsAnc(int HancVanc, int AncFlt=DTAPI_ANCFLT_OFF);
- virtual ~DtFrameBufTrParsAnc();
-
-public:
- int m_HancVanc; // HANC or VANC
- int m_AncFlt; // Anc filter mode
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsRaw -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtFrameBufTrParsRaw : public DtFrameBufTrPars
-{
-public:
- DtFrameBufTrParsRaw(int SymFlt=DTAPI_SYMFLT_ALL);
- virtual ~DtFrameBufTrParsRaw();
-
-public:
- int m_SymFlt; // Symbol filter mode
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBuffer -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class to represent an frame buffer
-//
-class DtFrameBuffer
-{
-public:
- DtFrameBuffer();
- virtual ~DtFrameBuffer();
-private:
- // No implementation is provided for the copy constructor
- DtFrameBuffer(const DtFrameBuffer&);
-
-public:
- virtual DTAPI_RESULT AncAddAudio(__int64 Frame, unsigned char* pBuf,
- int& BufSize, int Format, int Channels, int AudioGroup);
- virtual DTAPI_RESULT AncAddAudioStatusWord(__int64 Frame, unsigned char Status[24],
- int Channels, int AudioGroup);
- virtual DTAPI_RESULT AncAddPacket(__int64 Frame, AncPacket& AncPacket,
- int Line, int HancVanc, int Stream);
- virtual DTAPI_RESULT AncClear(__int64 Frame, int HancVanc, int Stream);
- virtual DTAPI_RESULT AncCommit(__int64 Frame);
- virtual DTAPI_RESULT AncDelAudio(__int64 Frame, int AudioGroup, int Mode);
- virtual DTAPI_RESULT AncDelPacket(__int64 Frame, int DID, int SDID, int StartLine,
- int NumLines, int HancVanc, int Stream, int Mode);
- virtual DTAPI_RESULT AncGetAudio(__int64 Frame, unsigned char* pBuf, 
- int& BufSize, int DataFormat, int& Channels, int AudioGroup);
- virtual DTAPI_RESULT AncGetPacket(__int64 Frame, int DID, int SDID, 
- AncPacket*, int& NumPackets, int HancVanc, int Stream);
- virtual DTAPI_RESULT AncReadRaw(__int64 Frame, unsigned char* pBuf,
- int& BufSize, int DataFormat, int StartLine,
- int NumLines, int HancVanc, bool EnableAncFilter = false);
- virtual DTAPI_RESULT AncReadRaw(DtFrameBufTrParsAnc& TP);
- virtual DTAPI_RESULT AncWriteRaw(__int64 Frame, unsigned char* pBuf, 
- int& BufSize, int Format, int StartLine, 
- int NumLines, int HancVanc, bool EnableAncFilter = false);
- virtual DTAPI_RESULT AncWriteRaw(DtFrameBufTrParsAnc& TP);
- virtual DTAPI_RESULT AttachToInput(DtDevice*, int Port);
- virtual DTAPI_RESULT AttachToOutput(DtDevice*, int Port, int Delay);
- virtual DTAPI_RESULT ClearFlags(int Latched);
- virtual DTAPI_RESULT Detach();
- virtual DTAPI_RESULT DetectIoStd(int& Value, int& SubValue);
- virtual DTAPI_RESULT GetBufferInfo(DtBufferInfo&);
- virtual DTAPI_RESULT GetCurFrame(__int64& CurFrame);
- virtual DTAPI_RESULT GetFlags(int& Flags, int& Latched);
- virtual DTAPI_RESULT GetFrameInfo(__int64 Frame, DtFrameInfo&);
- virtual DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
- virtual DTAPI_RESULT GetStatistic(int Type, int& Statistic);
- virtual DTAPI_RESULT ReadSdiLines(__int64 Frame, unsigned char* pBuf, 
- int& BufSize, int DataFormat, int StartLine, int& NumLines);
- virtual DTAPI_RESULT ReadSdiLines(DtFrameBufTrParsRaw& TP);
- virtual DTAPI_RESULT ReadSdiLines(__int64 Frame, unsigned char* pBuf, 
- int& BufSize, int DataFormat);
- virtual DTAPI_RESULT ReadVideo(__int64 Frame, unsigned char* pBuf,
- int& BufSize, int Field, int FullOrScaled,
- int DataFormat, int StartLine, int& NumLines);
- virtual DTAPI_RESULT ReadVideo(DtFrameBufTrParsVideo& TP);
- virtual DTAPI_RESULT SetRxMode(int RxMode, __int64& FirstFrame);
- virtual DTAPI_RESULT Start(bool Start=true);
- virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- virtual DTAPI_RESULT WaitFrame(__int64& LastFrame);
- virtual DTAPI_RESULT WaitFrame(__int64& FirstFrame, __int64& LastFrame);
- virtual DTAPI_RESULT WriteSdiLines(__int64 Frame, unsigned char* pBuf, 
- int& BufSize, int DataFormat);
- virtual DTAPI_RESULT WriteSdiLines(__int64 Frame, unsigned char* pBuf, 
- int& BufSize, int DataFormat, int StartLine, int& NumLines);
- virtual DTAPI_RESULT WriteSdiLines(DtFrameBufTrParsRaw& TP);
- virtual DTAPI_RESULT WriteVideo(__int64 Frame, unsigned char* pBuf, int& BufSize,
- int Field, int DataFormat, int StartLine, int& NumLines);
- virtual DTAPI_RESULT WriteVideo(DtFrameBufTrParsVideo& TP);
-
-protected:
- FrameBufImpl* m_pImpl; // Implementation class
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiMatrix -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtSdiMatrix
-{
-public:
- DtSdiMatrix();
- virtual ~DtSdiMatrix();
-private:
- // No implementation is provided for the copy constructor
- DtSdiMatrix(const DtSdiMatrix&);
-
-public:
- virtual DTAPI_RESULT Attach(DtDevice* pDvc, int& MaxNumRows);
- virtual DTAPI_RESULT Detach();
- virtual DTAPI_RESULT GetMatrixInfo(DtMatrixInfo& Info);
- virtual DtFrameBuffer& Row(int n);
- virtual DTAPI_RESULT Start(bool Start=true);
- virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- virtual DTAPI_RESULT WaitFrame(__int64& LastFrame);
- virtual DTAPI_RESULT WaitFrame(__int64& FirstFrame, __int64& LastFrame);
- 
-private:
- SdiMatrixImpl* m_pImpl; // Implementation class
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Global DTAPI Functions -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-
-DTAPI_RESULT DtapiCheckDeviceDriverVersion(void);
-DTAPI_RESULT DtapiCheckDeviceDriverVersion(int DeviceCategory);
-DTAPI_RESULT DtapiDeviceScan(int NumEntries, int& NumEntriesResult,
- DtDeviceDesc* DvcDescArr, bool InclDteDvcs=false,
- int ScanOrder=DTAPI_SCANORDER_ORIG);
-DTAPI_RESULT DtapiDtaPlusDeviceScan(int NumEntries, int& NumEntriesResult,
- DtDtaPlusDeviceDesc* DvcDescArr);
-DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
- char* pString, int StringLength);
-DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
- wchar_t* pString, int StringLength);
-DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
- char* pString, int StringLength);
-DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
- wchar_t* pString, int StringLength);
-DTAPI_RESULT DtapiGetDeviceDriverVersion(int, int&, int&, int&, int&);
-DTAPI_RESULT DtapiGetDtapiServiceVersion(int&, int&, int&, int&);
-DTAPI_RESULT DtapiGetVersion(int& Maj, int& Min, int& BugFix, int& Build);
-DTAPI_RESULT DtapiHwFuncScan(int NumEntries, int& NumEntriesResult,
- DtHwFuncDesc* pHwFuncs, bool InclDteDvcs=false,
- int ScanOrder=DTAPI_SCANORDER_ORIG);
-DTAPI_RESULT DtapiPower2Voltage(int dBm, int& dBmV, bool Is50Ohm=false);
-const char* DtapiResult2Str(DTAPI_RESULT DtapiResult);
-DTAPI_RESULT DtapiVoltage2Power(int dBmV, int& dBm, bool Is50Ohm=false);
-
-// Callbacks
-DTAPI_RESULT DtapiRegisterCallback(pDtEventCallback Callback, void* pContext,
- int EventTypes, void** pId = NULL);
-DTAPI_RESULT DtapiUnregisterCallback(void* pId);
-
-// IP address conversion
-DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
- const char* pDstIp, const char* pSrcIp);
-DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
- const wchar_t* pDstIp, const wchar_t* pSrcIp);
-DTAPI_RESULT DtapiIpAddr2ByteArray(const char* pIpStr, unsigned char* pIpByte,
- int& Flags);
-DTAPI_RESULT DtapiIpAddr2ByteArray(const wchar_t* pIpStr, 
- unsigned char* pIpByte, int& Flags);
-DTAPI_RESULT DtapiIpAddr2Str(char* pStr, int Len, unsigned char* pIpAddr);
-DTAPI_RESULT DtapiIpAddr2Str(wchar_t* pStr, int Len, unsigned char* pIpAddr);
-DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const char* pStr);
-DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const wchar_t* pStr);
-
-// Legacy
-#define DtapiInitDtTsIpParsFromIpString DtapiInitDtIpParsFromIpString
-
-// Modulator functions
-DTAPI_RESULT DtapiModPars2Bandwidth(int& ModBandwidth, int& TotalBandwidth,
- int ModType, int ParXtra0, int ParXtra1, int ParXtra2,
- void* pXtraPars, int SymRate);
-DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
- int ParXtra1, int ParXtra2, int TsRate);
-DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
- int ParXtra1, int ParXtra2, void* pXtraPars, int TsRate);
-DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
- int ParXtra1, int ParXtra2, int SymRate = -1);
-DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbC2Pars&, int PlpIdx = 0);
-DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbS2Pars&, int PlpIdx = 0);
-DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbT2Pars&, int PlpIdx = 0);
-DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtIsdbTmmPars&, int TsIdx = 0);
-DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
- int ParXtra1, int ParXtra2, void* pXtraPars, int SymRate);
-
-// HD-SDI functions
-DTAPI_RESULT DtapiGetRequiredUsbBandwidth(int VidStd, int RxMode, long long& Bandwidth);
-DTAPI_RESULT DtapiGetVidStdInfo(int VidStd, DtVidStdInfo& Info);
-DTAPI_RESULT DtapiIoStd2VidStd(int Value, int SubValue, int& VidStd);
-DTAPI_RESULT DtapiVidStd2IoStd(int VidStd, int& Value, int& SubValue);
-const char* DtapiVidStd2Str(int VidStd);
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Return Codes -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// NOTE: ERROR CODES 0x1100-0x12FF ARE RESERVED FOR USE IN THE DTAPIplus
-//
-#define DTAPI_OK 0
-#define DTAPI_OK_FAILSAFE 1
-#define DTAPI_E 0x1000
-#define DTAPI_E_ATTACHED (DTAPI_E + 0)
-#define DTAPI_E_BUF_TOO_SMALL (DTAPI_E + 1)
-#define DTAPI_E_DEV_DRIVER (DTAPI_E + 2)
-#define DTAPI_E_EEPROM_FULL (DTAPI_E + 3)
-#define DTAPI_E_EEPROM_READ (DTAPI_E + 4)
-#define DTAPI_E_EEPROM_WRITE (DTAPI_E + 5)
-#define DTAPI_E_EEPROM_FORMAT (DTAPI_E + 6)
-#define DTAPI_E_FIFO_FULL (DTAPI_E + 7)
-#define DTAPI_E_IN_USE (DTAPI_E + 8)
-#define DTAPI_E_INVALID_BUF (DTAPI_E + 9)
-#define DTAPI_E_INVALID_FLAGS (DTAPI_E + 11)
-#define DTAPI_E_INVALID_MODE (DTAPI_E + 12)
-#define DTAPI_E_INVALID_RATE (DTAPI_E + 13)
-#define DTAPI_E_INVALID_SIZE (DTAPI_E + 14)
-#define DTAPI_E_KEYWORD (DTAPI_E + 15)
-#define DTAPI_E_NO_DEVICE (DTAPI_E + 16)
-#define DTAPI_E_NO_LOOPBACK (DTAPI_E + 17)
-#define DTAPI_E_NO_SUCH_DEVICE (DTAPI_E + 18)
-#define DTAPI_E_NO_SUCH_OUTPUT (DTAPI_E + 19)
-#define DTAPI_E_NO_DT_OUTPUT (DTAPI_E + 20)
-#define DTAPI_E_NO_TS_OUTPUT (DTAPI_E + 20)
-#define DTAPI_E_NOT_ATTACHED (DTAPI_E + 21)
-#define DTAPI_E_NOT_FOUND (DTAPI_E + 22)
-#define DTAPI_E_NOT_SUPPORTED (DTAPI_E + 23)
-#define DTAPI_E_DEVICE (DTAPI_E + 24)
-#define DTAPI_E_TOO_LONG (DTAPI_E + 25)
-#define DTAPI_E_UNDERFLOW (DTAPI_E + 26)
-#define DTAPI_E_NO_SUCH_INPUT (DTAPI_E + 27)
-#define DTAPI_E_NO_DT_INPUT (DTAPI_E + 28)
-#define DTAPI_E_NO_TS_INPUT (DTAPI_E + 28)
-#define DTAPI_E_DRIVER_INCOMP (DTAPI_E + 29)
-#define DTAPI_E_INTERNAL (DTAPI_E + 30)
-#define DTAPI_E_OUT_OF_MEM (DTAPI_E + 31)
-#define DTAPI_E_INVALID_J83ANNEX (DTAPI_E + 32)
-#define DTAPI_E_IDLE (DTAPI_E + 33)
-#define DTAPI_E_INSUF_LOAD (DTAPI_E + 34)
-#define DTAPI_E_INVALID_BANDWIDTH (DTAPI_E + 35)
-#define DTAPI_E_INVALID_CONSTEL (DTAPI_E + 36)
-#define DTAPI_E_INVALID_GUARD (DTAPI_E + 37)
-#define DTAPI_E_INVALID_INTERLVNG (DTAPI_E + 38)
-#define DTAPI_E_INVALID_TRANSMODE (DTAPI_E + 39)
-#define DTAPI_E_INVALID_TSTYPE (DTAPI_E + 40)
-#define DTAPI_E_NO_IPPARS (DTAPI_E + 41)
-#define DTAPI_E_NO_TSRATE (DTAPI_E + 42)
-#define DTAPI_E_NOT_IDLE (DTAPI_E + 43)
-#define DTAPI_E_INVALID_ARG (DTAPI_E + 44)
-#define DTAPI_E_NW_DRIVER (DTAPI_E + 45)
-#define DTAPI_E_DST_MAC_ADDR (DTAPI_E + 46)
-#define DTAPI_E_NO_SUCH_PORT (DTAPI_E + 47)
-#define DTAPI_E_WINSOCK (DTAPI_E + 48)
-#define DTAPI_E_MULTICASTJOIN (DTAPI_E + 49)
-#define DTAPI_E_EMBEDDED (DTAPI_E + 50)
-#define DTAPI_E_LOCKED (DTAPI_E + 51)
-#define DTAPI_E_NO_VALID_CALDATA (DTAPI_E + 52)
-#define DTAPI_E_NO_LINK (DTAPI_E + 53)
-#define DTAPI_E_INVALID_HEADER (DTAPI_E + 54)
-#define DTAPI_E_INVALID_PARS (DTAPI_E + 55)
-#define DTAPI_E_NOT_SDI_MODE (DTAPI_E + 56)
-#define DTAPI_E_INCOMP_FRAME (DTAPI_E + 57)
-#define DTAPI_E_UNSUP_CONV (DTAPI_E + 58)
-#define DTAPI_E_OUTBUF_TOO_SMALL (DTAPI_E + 59)
-#define DTAPI_E_CONFIG (DTAPI_E + 60)
-#define DTAPI_E_TIMEOUT (DTAPI_E + 61)
-#define DTAPI_E_INVALID_TIMEOUT (DTAPI_E + 62)
-#define DTAPI_E_INVALID_FHMODE (DTAPI_E + 63)
-#define DTAPI_E_INVALID_PILOTS (DTAPI_E + 64)
-#define DTAPI_E_INVALID_USEFRAMENO (DTAPI_E + 65)
-#define DTAPI_E_SYMRATE_REQD (DTAPI_E + 66)
-#define DTAPI_E_NO_SYMRATE (DTAPI_E + 67)
-#define DTAPI_E_INVALID_NUMSEGM (DTAPI_E + 68)
-#define DTAPI_E_INVALID_NUMTAPS (DTAPI_E + 69)
-#define DTAPI_E_COMMUNICATION (DTAPI_E + 70)
-#define DTAPI_E_BIND (DTAPI_E + 71)
-#define DTAPI_E_FRAME_INTERVAL (DTAPI_E + 72)
-#define DTAPI_E_INVALID_BWT_EXT (DTAPI_E + 73)
-#define DTAPI_E_INVALID_FFTMODE (DTAPI_E + 74)
-#define DTAPI_E_INVALID_NUMDTSYM (DTAPI_E + 75)
-#define DTAPI_E_INVALID_NUMT2FRM (DTAPI_E + 76)
-#define DTAPI_E_INVALID_SUBCH (DTAPI_E + 77)
-#define DTAPI_E_INVALID_TIME_IL (DTAPI_E + 78)
-#define DTAPI_E_NUM_PLP (DTAPI_E + 79)
-#define DTAPI_E_PLP_NUMBLOCKS (DTAPI_E + 80)
-#define DTAPI_E_NUMPLPS_MUSTBE_1 (DTAPI_E + 81)
-#define DTAPI_E_INBAND (DTAPI_E + 82)
-#define DTAPI_E_ISSY (DTAPI_E + 83)
-#define DTAPI_E_OTHER_PLP_IN_BAND (DTAPI_E + 84)
-#define DTAPI_E_CM_NUMPATHS (DTAPI_E + 85)
-#define DTAPI_E_PILOT_PATTERN (DTAPI_E + 86)
-#define DTAPI_E_SUBSLICES (DTAPI_E + 87)
-#define DTAPI_E_NO_GENREF (DTAPI_E + 88)
-#define DTAPI_E_TI_MEM_OVF (DTAPI_E + 89)
-#define DTAPI_E_FEF (DTAPI_E + 90)
-#define DTAPI_E_UNSUP_FORMAT (DTAPI_E + 91)
-#define DTAPI_E_OUT_OF_SYNC (DTAPI_E + 92)
-#define DTAPI_E_NO_FRAME (DTAPI_E + 93)
-#define DTAPI_E_NO_SUCH_DATA (DTAPI_E + 94)
-#define DTAPI_E_INVALID_TYPE (DTAPI_E + 95)
-#define DTAPI_E_INVALID_MODPARS (DTAPI_E + 96)
-#define DTAPI_E_BIAS_BAL_CELLS (DTAPI_E + 97)
-#define DTAPI_E_COMMON_PLP_COUNT (DTAPI_E + 98)
-#define DTAPI_E_PLP_ID (DTAPI_E + 99)
-#define DTAPI_E_BUFS (DTAPI_E + 100)
-#define DTAPI_E_FIXED_CELL_PARS (DTAPI_E + 101)
-#define DTAPI_E_CM_CHANNEL (DTAPI_E + 102)
-#define DTAPI_E_INVALID_FIFO_IDX (DTAPI_E + 103)
-#define DTAPI_E_INVALID_INP_TYPE (DTAPI_E + 104)
-#define DTAPI_E_INVALID_OUTP_TYPE (DTAPI_E + 105)
-#define DTAPI_E_INVALID_START_FREQ (DTAPI_E + 106)
-#define DTAPI_E_DSLICE_TUNE_POS (DTAPI_E + 107)
-#define DTAPI_E_DSLICE_OFFSETS (DTAPI_E + 108)
-#define DTAPI_E_DSLICE_OVERLAP (DTAPI_E + 109)
-#define DTAPI_E_NOTCH_OFFSETS (DTAPI_E + 110)
-#define DTAPI_E_PLP_BUNDLED (DTAPI_E + 111)
-#define DTAPI_E_BROADBAND_NOTCH (DTAPI_E + 112)
-#define DTAPI_E_L1_PART2_TOO_LONG (DTAPI_E + 113)
-#define DTAPI_E_DSLICE_T1_NDP (DTAPI_E + 114)
-#define DTAPI_E_DSLICE_T1_TSRATE (DTAPI_E + 115)
-#define DTAPI_E_CONNECT_TO_SERVICE (DTAPI_E + 116)
-#define DTAPI_E_INVALID_SYMRATE (DTAPI_E + 117)
-#define DTAPI_E_MODPARS_NOT_SET (DTAPI_E + 118)
-#define DTAPI_E_SERVICE_INCOMP (DTAPI_E + 119)
-#define DTAPI_E_INVALID_LEVEL (DTAPI_E + 120)
-#define DTAPI_E_MODTYPE_UNSUP (DTAPI_E + 121)
-#define DTAPI_E_I2C_LOCK_TIMEOUT (DTAPI_E + 122)
-#define DTAPI_E_INVALID_FREQ (DTAPI_E + 123)
-#define DTAPI_E_INVALID_TSRATESEL (DTAPI_E + 124)
-#define DTAPI_E_INVALID_SPICLKSEL (DTAPI_E + 125)
-#define DTAPI_E_INVALID_SPIMODE (DTAPI_E + 126)
-#define DTAPI_E_NOT_INITIALIZED (DTAPI_E + 127)
-#define DTAPI_E_NOT_LOCKED (DTAPI_E + 128)
-#define DTAPI_E_NO_PERMISSION (DTAPI_E + 129)
-#define DTAPI_E_CANCELLED (DTAPI_E + 130)
-#define DTAPI_E_OUT_OF_RESOURCES (DTAPI_E + 131)
-#define DTAPI_E_LISTEN (DTAPI_E + 132)
-#define DTAPI_E_INVALID_STREAMFMT (DTAPI_E + 133)
-#define DTAPI_E_EVENT_POWER (DTAPI_E + 134)
-#define DTAPI_E_EVENT_REMOVAL (DTAPI_E + 135)
-#define DTAPI_E_UNSUP_ROLLOFF (DTAPI_E + 136)
-#define DTAPI_E_T2_LITE (DTAPI_E + 137)
-#define DTAPI_E_COMP_OVERLAP (DTAPI_E + 138)
-#define DTAPI_E_MULTI_COMPS (DTAPI_E + 139)
-#define DTAPI_E_INVALID_ISI (DTAPI_E + 140)
-#define DTAPI_E_FIRMW_INCOMP (DTAPI_E + 141)
-#define DTAPI_E_INVALID_MODTYPE (DTAPI_E + 142)
-#define DTAPI_E_NO_VIDSTD (DTAPI_E + 143)
-#define DTAPI_E_INVALID_VIDSTD (DTAPI_E + 144)
-#define DTAPI_E_INVALID_AUDSTD (DTAPI_E + 145)
-#define DTAPI_E_INVALID_SCALING (DTAPI_E + 146)
-#define DTAPI_E_INVALID_ROW (DTAPI_E + 147)
-#define DTAPI_E_NOT_STARTED (DTAPI_E + 148)
-#define DTAPI_E_STARTED (DTAPI_E + 149)
-#define DTAPI_E_INVALID_LINE (DTAPI_E + 150)
-#define DTAPI_E_INVALID_STREAM (DTAPI_E + 151)
-#define DTAPI_E_INVALID_ANC (DTAPI_E + 152)
-#define DTAPI_E_INVALID_FRAME (DTAPI_E + 153)
-#define DTAPI_E_NOT_IMPLEMENTED (DTAPI_E + 154)
-#define DTAPI_E_INVALID_CHANNEL (DTAPI_E + 155)
-#define DTAPI_E_INVALID_GROUP (DTAPI_E + 156)
-#define DTAPI_E_INVALID_FORMAT (DTAPI_E + 157)
-#define DTAPI_E_INVALID_FIELD (DTAPI_E + 158)
-#define DTAPI_E_BUF_TOO_LARGE (DTAPI_E + 159)
-#define DTAPI_E_INVALID_DELAY (DTAPI_E + 160)
-#define DTAPI_E_EXCL_MANDATORY (DTAPI_E + 161)
-#define DTAPI_E_INVALID_ROLLOFF (DTAPI_E + 162)
-#define DTAPI_E_CM_UNSUP (DTAPI_E + 163)
-#define DTAPI_E_I2C (DTAPI_E + 164)
-#define DTAPI_E_STATE (DTAPI_E + 165)
-#define DTAPI_E_NO_LOCK (DTAPI_E + 166)
-#define DTAPI_E_RANGE (DTAPI_E + 167)
-#define DTAPI_E_INVALID_T2PROFILE (DTAPI_E + 168)
-#define DTAPI_E_DSLICE_ID (DTAPI_E + 169)
-#define DTAPI_E_EXCL_ACCESS_REQD (DTAPI_E + 170)
-#define DTAPI_E_CHAN_ALREADY_ADDED (DTAPI_E + 171)
-#define DTAPI_E_LAYER_ID (DTAPI_E + 172)
-#define DTAPI_E_INVALID_FECMODE (DTAPI_E + 173)
-#define DTAPI_E_INVALID_PORT (DTAPI_E + 174)
-#define DTAPI_E_INVALID_PROTOCOL (DTAPI_E + 175)
-#define DTAPI_E_INVALID_FEC_MATRIX (DTAPI_E + 176)
-#define DTAPI_E_INVALID_IP_ADDR (DTAPI_E + 177)
-#define DTAPI_E_INVALID_SRCIP_ADDR (DTAPI_E + 178)
-#define DTAPI_E_IPV6_NOT_SUPPORTED (DTAPI_E + 179)
-#define DTAPI_E_INVALID_DIFFSERV (DTAPI_E + 180)
-#define DTAPI_E_INVALID_FOR_ACM (DTAPI_E + 181)
-#define DTAPI_E_NWAP_DRIVER (DTAPI_E + 182)
-#define DTAPI_E_INIT_ERROR (DTAPI_E + 183)
-#define DTAPI_E_NOT_USB3 (DTAPI_E + 184)
-#define DTAPI_E_INSUF_BW (DTAPI_E + 185)
-#define DTAPI_E_NO_ANC_DATA (DTAPI_E + 186)
-#define DTAPI_E_MATRIX_HALTED (DTAPI_E + 187)
-#define DTAPI_E_VLAN_NOT_FOUND (DTAPI_E + 188)
-#define DTAPI_E_NO_ADAPTER_IP_ADDR (DTAPI_E + 189)
-#define DTAPI_E_INVALID_BTYPE (DTAPI_E + 190)
-#define DTAPI_E_INVALID_PARTIAL (DTAPI_E + 191)
-#define DTAPI_E_INVALID_NUMTS (DTAPI_E + 192)
-#define DTAPI_E_INVALID (DTAPI_E + 193)
-#define DTAPI_E_NO_RS422 (DTAPI_E + 194)
-#define DTAPI_E_FECFRAMESIZE (DTAPI_E + 195)
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+ DVB-C2, DVB-S2, DVB-T2, ISDB-Tmm Multi PLP Parameters +=+=+=+=+=+=+=+=+
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBigTsSplitPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying 'Big TS' splitting
-//
-struct DtBigTsSplitPars
-{
- bool m_Enabled; // Enable 'Big TS' splitting
- bool m_IsCommonPlp; // Is Common PLP or Layer
- bool m_SplitSdtIn; // SDT already split (e.g. BBC TS-files)
- std::vector<int> m_Pids; // Series of PIDs to include in the PLP
-
- // The parameters below are not used in case of a common PLP
- int m_OnwId; // Original Network ID of the Big-TS
- int m_TsId; // Transport Stream ID of the Big-TS
- int m_ServiceId; // ID of service to include in PLP
- int m_PmtPid; // PID of the PMT-table
- int m_NewTsId; // New Transport Stream ID
- int m_SdtLoopDataLength; // SDT loop data length. 0..168
- // Not used if m_SplitSdtIn == true
- // The SDT-Actual loop data
- unsigned char m_SdtLoopData[168];
-
-public:
- // Methods
- void Init(void);
-
- // Operators
- bool operator == (DtBigTsSplitPars& TsSplitPars);
- bool operator != (DtBigTsSplitPars& TsSplitPars);
- bool IsEqual(DtBigTsSplitPars& TsSplitPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPlpInpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the PLP input
-//
-struct DtPlpInpPars
-{
- // PLP input data types
- enum InDataType 
- {
- TS188, // 188-byte TS packets 
- TS204, // 204-byte TS packets
- GSE // Generic Stream Encapsulation
- };
-
-public:
- int m_FifoIdx; // Fifo index used for the PLP
- // If Big TS file splitting is used, PLPs in a group
- // can share the input FIFO
- InDataType m_DataType; // TS188 or TS204 byte packets
- DtBigTsSplitPars m_BigTsSplit; // Big TS splitting (optional)
-
-public:
- // Methods
- void Init(int Idx = 0);
-
- // Operators
- bool operator == (DtPlpInpPars& PlpInPars);
- bool operator != (DtPlpInpPars& PlpInPars);
- bool IsEqual(DtPlpInpPars& PlpInPars);
-};
-
-// Test point data format
-#define DTAPI_TP_FORMAT_HEX 0
-#define DTAPI_TP_FORMAT_BIT 1
-#define DTAPI_TP_FORMAT_CFLOAT32 2
-#define DTAPI_TP_FORMAT_INT64 3
-
-// Complex floating point type
-struct DtComplexFloat
-{
- float m_Re, m_Im; // Real, imaginary part
-};
-
-// Function to write test point data
-typedef void DtTpWriteDataFunc(void* pOpaque, int TpIndex, int StreamIndex,
- const void* Buffer, int Length, int Format, float Mult, int IsNewFrame);
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTestPointOutPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for enabling the test point data output specifying a callback function
-//
-struct DtTestPointOutPars
-{
-public:
- bool m_Enabled; // Enable TP data output
- void* m_pTpWriteDataOpaque; // Opaque data pointer passed to TpWriteData
-
- // Callback function for writing test data
- DtTpWriteDataFunc* m_pTpWriteDataFunc;
-
-public:
- // Methods
- void Init(void);
-
- // Operators
- bool operator == (DtTestPointOutPars& RbmPars);
- bool operator != (DtTestPointOutPars& RbmPars);
- bool IsEqual(DtTestPointOutPars& RbmPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVirtualOutData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-// 
-// Structure describing and containing the output data for a virtual output channel 
-// 
-struct DtVirtualOutData
-{
- // Virtual output data types
- enum OutDataType 
- {
- IQ_INT16, // 16-bit I/Q samples 
- IQ_FLOAT32, // 32 bit float I/Q samples
- T2MI_TS188, // 188 byte T2MI TS-packets
- DVBS2_L3, // L3 format for DVB-S2
- };
- OutDataType m_DataType; // Output data type
-
- // Output type dependent parameters
- union {
- // 16-bit int I/Q samples
- struct {
- // Array of buffers; Per output channel a buffer with samples
- const unsigned char** m_pBuffer; 
- int m_NumBuffers; // Number of buffers
- int m_NumBytes; // Number of bytes
- } IqSamplesInt16;
-
- // 32-bit float I/Q samples
- struct {
- // Array of buffers. Per output channel a buffer with samples
- const unsigned char** m_pBuffer;
- int m_NumBuffers; // Number of buffers
- int m_NumBytes; // Number of bytes
- } IqSamplesFloat32;
-
- // 188-byte T2MI TS packets
- struct {
- // Pointer to T2MI TS-packet(s)
- const unsigned char* m_pBuffer;
- int m_NumBytes; // Number of bytes
- __int64 m_T2MiFrameNr; // T2MI super frame number counter
- } T2MiTs188;
-
- // L3 frames
- struct {
- // Pointer to L3 frame(s)
- const unsigned char* m_pBuffer;
- int m_NumBytes; // Number of bytes
- } DvbS2L3;
- 
- } u;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVirtualOutPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the output type and level for a virtual output.
-// These parameters are only relevant when outputting to a virtual output channel.
-//
-struct DtVirtualOutPars
-{
- bool m_Enabled; // Enable virtual output parameters
- DtVirtualOutData::OutDataType m_DataType;
- // Type of output data 
- double m_Gain; // The square root of the average power of
- // the generated signal
-public:
- void Init(void);
- bool IsEqual(DtVirtualOutPars& VirtOutPars);
- bool operator == (DtVirtualOutPars& VirtOutPars);
- bool operator != (DtVirtualOutPars& VirtOutPars);
-};
-
-
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DAB Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-// DAB error protection modes
-#define DTAPI_DAB_UEP 0 // DAB unequal error protection
-#define DTAPI_DAB_EEP 1 // DAB equal error protection
-
-// DAB data extraction mode
-enum DtDabExtractionMode
-{
- DAB_RAW, // Raw DAB stream, no extraction
- DAB_EXTRACTION_AAC, // AAC/DAB+ stream extraction 
- DAB_EXTRACTION_DMB // DMB stream extraction
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabEtiStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for DAB Ensemble Transport Interface (ETI) selection
-//
-struct DtDabEtiStreamSelPars
-{
- // No selection parameters yet
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for DAB selection
-//
-struct DtDabStreamSelPars
-{
- int m_BitrateKbps; // Bitrate in kbps
- int m_ErrProtLevel; // Error protection level: 1..5 (UEP); 1..4 (EEP)
- int m_ErrProtMode; // Error protection mode: DTAPI_DAB_UEP/EEP
- int m_ErrProtOption; // Error protection option (EEP only): 0 or 1
- int m_StartAddress; // Start address in DAB capacity units (64bits)
-
- // DAB data extraction mode: DAB_RAW, DAB_EXTRACTION_AAC or DAB_EXTRACTION_DMB
- DtDabExtractionMode m_ExtractionMode;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabFicStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Selection parameters for a DAB Fast Information Channel (FIC)
-//
-struct DtDabFicStreamSelPars
-{
- // Parameters below are passed in the WriteStreamFunc() callback function;
- // the parameters are not used for selection
- int m_CifIndex; // Index of the CIF in the DAB frame to which this
- // FIB is associated
- int m_FibIndex; // Index of this FIB in the group of FIBs that 
- // are associated to the same CIF
-};
-
-// Forward declarations
-struct DtDabService;
-struct DtDabSubChannel;
-struct DtDabServiceComp;
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabEnsembleInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Information about a DAB ensemble
-//
-struct DtDabEnsembleInfo
-{
- int m_CountryId; // Country identifier
- int m_EnsembleReference; // Indentifier of this ensemble in national area
- int m_ExtCountryCode; // Extended country code
- int m_InterTableId; // International table identifier
- std::wstring m_Label; // Label identifying this ensemble
- int m_LocalTimeOffset; // Local time offset in half hours from UTC
- int m_LtoUnique; // Covers one(=0) or several(=1) time zones
- int m_TransmissionMode; // Transmission mode: 1..4
-
- // Services contained in this ensemble
- std::vector<DtDabService> m_Services;
-
- // Subchannels in this ensemble. Key: subchannel identifier
- std::map<int, DtDabSubChannel> m_SubChannels;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabService -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Information about a single service. Every service must have one primary service
-// component and can have one or more non-primay service components
-//
-struct DtDabService
-{
- int m_CondAccessId; // Conditional access identifier
- int m_CountryId; // Country identifier
- int m_ExtCountryCode; // Extended country code; -1 for program service
- bool m_IsLocal; // True if local (partial) ensemble service area
- std::wstring m_Label; // Label identifying this service 
- int m_ServiceReference; // Identifier of the service
-
- // Components in this service
- std::vector<DtDabServiceComp> m_Components;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabServiceComp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Information about a single DAB service component
-//
-struct DtDabServiceComp
-{
- int m_AudioServiceCompType; // Audio service component type; -1 if not applicable
- int m_DataServiceCompType; // Data service component type; -1 if not applicable
- int m_FidChannelId; // Fast information data channel identifier 0..63;
- // -1 if not applicable
- bool m_HasCondAccess; // True if access control applies
- bool m_IsPrimary; // True if this is the primary component
- std::wstring m_Label; // Label identifying this service component
- int m_Language; // Service compoment language or -1
- int m_SubChannelId; // Subchannel identifier: 0..63; -1 if not applicable
- int m_ServiceCompId; // Service component identifier; -1 if not applicable
- int m_TransportMechanismId; // Transport mechanism identifier
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabSubChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// A DAB subchannel contains the data for a single audio or data stream. Every service
-// component refers to a subchannel, but multiple service components can refer to the
-// same subchannel. In that case more than one service can use the same audio stream.
-//
-struct DtDabSubChannel
-{
- int m_BitrateKbps; // Bitrate in kbps
- int m_ErrProtLevel; // Protection level UEP: 1..5; EEP: 1..4
- int m_ErrProtMode; // Error protection mode: DTAPI_DAB_UEP/EEP
- int m_ErrProtOption; // Option for EEP; -1 for UEP
- int m_FecScheme; // FEC scheme; -1 if not applicable
- int m_StartAddress; // Start address in capacity units (64bits)
- int m_SubChannelId; // Subchannel identifier: 0..63
- int m_SubChannelSize; // Size of subchannel in capacity units (64bits)
- int m_UepTableIndex; // Index in UEP table; -1 if not applicable
- int m_UepTableSwitch; // UEP table switch; -1 if not applicable
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-// Maxima
-#define DTAPI_DVBC2_NUM_DSLICE_MAX 255 // Maximum number of data slices
-#define DTAPI_DVBC2_NUM_PLP_MAX 255 // Maximum number of PLPs
-#define DTAPI_DVBC2_NUM_NOTCH_MAX 16 // Maximum number of Notches
-
-// PLP IDs
-#define DTAPI_DVBC2_PLP_ID_NONE -1 // No PLP selected
-#define DTAPI_DVBC2_PLP_ID_AUTO -2 // Automatic PLP selection
-
-// Data slice IDs
-#define DTAPI_DVBC2_DSLICE_ID_AUTO -2 // Automatic data slice selection
-
-// m_Bandwidth
-#define DTAPI_DVBC2_6MHZ 6 // 6 MHz
-#define DTAPI_DVBC2_8MHZ 8 // 8 MHz
-
-// m_Guard - Guard interval
-#define DTAPI_DVBC2_GI_1_128 0 // 1/128
-#define DTAPI_DVBC2_GI_1_64 1 // 1/64
-
-// m_L1TiMode - L1 time interleaving mode
-#define DTAPI_DVBC2_L1TIMODE_NONE 0 // No time interleaving
-#define DTAPI_DVBC2_L1TIMODE_BEST 1 // Best fit
-#define DTAPI_DVBC2_L1TIMODE_4 2 // 4 OFDM symbols 
-#define DTAPI_DVBC2_L1TIMODE_8 3 // 8 OFDM symbols 
-
-// m_Type - PLP type
-#define DTAPI_DVBC2_PLP_TYPE_COMMON 0 // Common PLP
-#define DTAPI_DVBC2_PLP_TYPE_GROUPED 1 // Grouped Data PLP
-#define DTAPI_DVBC2_PLP_TYPE_NORMAL 2 // Normal Data PLP
-
-// m_FecType - PLP FEC type
-#define DTAPI_DVBC2_LDPC_16K 0 // 16K LDPC
-#define DTAPI_DVBC2_LDPC_64K 1 // 64K LDPC
-
-// m_CodeRate - PLP code rate
-#define DTAPI_DVBC2_COD_2_3 1 // 2/3
-#define DTAPI_DVBC2_COD_3_4 2 // 3/4
-#define DTAPI_DVBC2_COD_4_5 3 // 4/5
-#define DTAPI_DVBC2_COD_5_6 4 // 5/6
-#define DTAPI_DVBC2_COD_8_9 5 // 8/9 (For 16K FEC)
-#define DTAPI_DVBC2_COD_9_10 5 // 9/10 (For 64K FEC)
-
-// m_Modulation - PLP constellation
-#define DTAPI_DVBC2_QAM16 1 // 16-QAM
-#define DTAPI_DVBC2_QAM64 2 // 64-QAM
-#define DTAPI_DVBC2_QAM256 3 // 256-QAM
-#define DTAPI_DVBC2_QAM1024 4 // 1024-QAM
-#define DTAPI_DVBC2_QAM4096 5 // 4096-QAM
-#define DTAPI_DVBC2_QAM16384 6 // 16K-QAM non standard, but supported
-#define DTAPI_DVBC2_QAM65536 7 // 64K-QAM non standard, but supported
-
-// m_Issy - PLP ISSY
-#define DTAPI_DVBC2_ISSY_NONE 0 // No ISSY field is used
-#define DTAPI_DVBC2_ISSY_SHORT 1 // 2 byte ISSY field is used
-#define DTAPI_DVBC2_ISSY_LONG 2 // 3 byte ISSY field is used
-
-// m_TiDepth - Data slice time interleaving depth
-#define DTAPI_DVBC2_TIDEPTH_NONE 0 // No time interleaving
-#define DTAPI_DVBC2_TIDEPTH_4 1 // 4 OFDM symbols 
-#define DTAPI_DVBC2_TIDEPTH_8 2 // 8 OFDM symbols 
-#define DTAPI_DVBC2_TIDEPTH_16 3 // 16 OFDM symbols 
-
-// m_Type - Data slice type
-#define DTAPI_DVBC2_DSLICE_TYPE_1 0 // Type 1 (Single PLP and fixed mod/cod)
-#define DTAPI_DVBC2_DSLICE_TYPE_2 1 // Type 2 
-
-// m_FecHdrType - Data slice FEC frame header type
-#define DTAPI_DVBC2_FECHDR_TYPE_ROBUST 0 // Robust mode
-#define DTAPI_DVBC2_FECHDR_TYPE_HEM 1 // High efficiency mode
-
-// DVB-C2 Test points
-enum {
- DTAPI_DVBC2_TP07, // FEC frame
- DTAPI_DVBC2_TP08,
- DTAPI_DVBC2_TP10,
- DTAPI_DVBC2_TP13,
- DTAPI_DVBC2_TP15, // Data slice
- DTAPI_DVBC2_TP18, // OFDM output
- DTAPI_DVBC2_TP20,
- DTAPI_DVBC2_TP22, // FEC header
- DTAPI_DVBC2_TP26,
- DTAPI_DVBC2_TP27, // L1 header
- DTAPI_DVBC2_TP31,
- DTAPI_DVBC2_TP32, // L1 part2 data
- DTAPI_DVBC2_TP33, // L1 part2 + padding & CRC
- DTAPI_DVBC2_TP37,
- DTAPI_DVBC2_TP40,
- DTAPI_DVBC2_TP41,
- DTAPI_DVBC2_TP42,
- DTAPI_DVBC2_TP01,
- DTAPI_DVBC2_TP_COUNT,
-};
-
-// DVB-C2 test points
-extern const int DTAPI_DVBC2_TESTPOINTS[DTAPI_DVBC2_TP_COUNT];
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DSlicePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the data slice parameters
-//
-struct DtDvbC2DSlicePars
-{
- int m_Id; // Data slice ID. 0..255
- int m_TunePosition; // Tune position relative to the start frequency in 
- // multiples of pilot carrier spacing.
- // For guard interval 1/128: 0..8191 
- // For guard interval 1/64: 0..16383 
- int m_OffsetLeft; // Offset left in multiples of pilot carrier spacing.
- // For guard interval 1/128: -128..127 
- // For guard interval 1/64: -256..255 
- int m_OffsetRight; // Offset right in multiples of pilot carrier spacing.
- // For guard interval 1/128: -128..127 
- // For guard interval 1/64: -256..255 
- // If m_OffsetLeft = m_OffsetRight, the data slice is
- // empty and no input streams are created for the PLPs
- // of the data slice.
- int m_TiDepth; // Time interleaving depth. See DTAPI_DVBC2_TIDEPTH_x
- int m_Type; // Data slice type. See DTAPI_DVBC2_DSLICE_TYPE_x
- int m_FecHdrType; // FEC header type. See DTAPI_DVBC2_FECHDR_TYPE_x 
- bool m_ConstConfig; // Constant data slice configuration
- bool m_LeftNotch; // Left notch present
- 
- // Data per PLP
- std::vector<DtDvbC2PlpPars> m_Plps;
-
-public:
- void Init(int Id=0);
- bool IsEqual(DtDvbC2DSlicePars& DSlicePars);
- bool operator == (DtDvbC2DSlicePars& DSlicePars);
- bool operator != (DtDvbC2DSlicePars& DSlicePars);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdatePlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// struct for L1 PLP parameter update support
-//
-struct DtDvbC2L1UpdatePlpPars 
-{
- bool m_Enable; // Enable or disable the PLP.
- // Only PLPs with m_NoData = true can be disabled.
-public:
- void Init();
- bool IsEqual(DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
- bool operator == (DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
- bool operator != (DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdateDSlicePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// struct for L1 DSlice parameter update support
-//
-struct DtDvbC2L1UpdateDSlicePars
-{
- bool m_Enable; // Enable or disable the DSlice.
- // Only dummy data slices can be disabled. 
- // A data slice is considered as dummy if either:
- // - m_OffsetLeft == m_OffsetRight in its 
- // global configuration; or
- // - all its PLPs have m_NoData = true
- // A dummy data slice is modulated with dummy data.
-
- int m_OffsetLeft; // Data slice left offset - 0..2^(8+g)-1
- int m_OffsetRight; // Data slice right offset - 0..2^(8+g)-1
- // If the data slice is not dummy:
- // - For type 1 , no size change is accepted.
- // - For type 2 , size change is accepted 
- // provided it is not zero (i.e. m_OffsetRight >
- // m_OffsetLeft). It is up to the user to ensure that
- // there is no bitrate overflow.
- std::vector<DtDvbC2L1UpdatePlpPars> m_Plps; // L1 PLP updates
-
-public:
- void Init();
- bool IsEqual(DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
- bool operator == (DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
- bool operator != (DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdatePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// L1 update support
-//
-struct DtDvbC2L1UpdatePars
-{
- int m_NumFrames; // The following parameters are used during
- // 'm_NumFrames' C2 frames
- // L1 DSlice updates
- std::vector<DtDvbC2L1UpdateDSlicePars> m_DSlices;
-
-public:
- void Init();
- bool IsEqual(DtDvbC2L1UpdatePars& L1UpdatePars);
- bool operator == (DtDvbC2L1UpdatePars& L1UpdatePars);
- bool operator != (DtDvbC2L1UpdatePars& L1UpdatePars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for retrieving the DVB-C2 MPLP modulator status
-//
-struct DtDvbC2ModStatus
-{
- int m_MplpModFlags; // Multi PLP modulator flags
- __int64 m_DjbOverflows; // Count number of DJB overflows. If it happens,
- // issy output delay must be decreased or "issy bufs"
- // increased.
- __int64 m_DjbUnderflows; // Count number of DJB underflows. If it happens,
- // issy output delay must be increased.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2NotchPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the notch parameters
-//
-struct DtDvbC2NotchPars
-{
- int m_Start; // Notch start in multiples of pilot carrier spacing.
- // For guard interval 1/128: 0..8191 
- // For guard interval 1/64: 0..16383 
- int m_Width; // Notch width in multiples of pilot carrier spacing.
- // For guard interval 1/128: 0..255 
- // For guard interval 1/64: 0..511 
-public:
- void Init(void);
- bool IsEqual(DtDvbC2NotchPars& NotchPars);
- bool operator == (DtDvbC2NotchPars& NotchPars);
- bool operator != (DtDvbC2NotchPars& NotchPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2PaprPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying and enabling the PAPR reduction parameters
-//
-struct DtDvbC2PaprPars
-{
- bool m_TrEnabled; // TR enabled
- double m_TrVclip; // TR clipping threshold 1..4.32 (Volt)
- int m_TrMaxIter; // TR maximum number of iterations. Must be >= 1.
- // Note: PAPR TR processing time is proportional
- // to this parameter
-public:
- void Init(void);
- bool IsEqual(DtDvbC2PaprPars& PaprPars);
- bool operator == (DtDvbC2PaprPars& PaprPars);
- bool operator != (DtDvbC2PaprPars& PaprPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// DVB-C2 parameter info
-//
-struct DtDvbC2ParamInfo 
-{
- int m_L1Part2Length; // #bits of the L1 part2 data (including CRC)
- int m_NumL1Symbols; // Number of L1 symbols (LP)
- int m_NumSymbols; // Total number of symbols per frame (LP + Ldata)
- int m_PilotSpacing; // Distance between pilots (Dx)
- int m_FftSize; // FFT size
- int m_MinCarrierOffset; // Lowest used carrier offset (Koffset)
- int m_CenterFrequency; // Center frequency in multiples of the carrier 
- // spacing
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the parameters of a PLP.
-// In case of bundled PLPs, only the mode adaptation parameters from the 
-// first PLP of the bundle are used.
-//
-struct DtDvbC2PlpPars
-{
- bool m_Hem; // High Efficiency Mode
- bool m_Npd; // Null Packet Deletion
- int m_Issy; // Issy mode. See DTAPI_DVBC2_ISSY_x
- int m_IssyBufs; // Issy BUFS
- int m_IssyOutputDelay; // Delay (in T units) between the incoming data and
- // the output TS in the receiver model. This value 
- // determines the minimum and maximum dejitter buffer
- // usage and is used to compute the ISSY BUFSTAT field
- int m_TsRate; // If 0 the rate is computed from the PLP parameters,
- // only possible in case of single PLP and no ISSY 
- // is used
- int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
- int m_Id; // PLP ID. 0..255
- bool m_Bundled; // A bundled PLP can appear in several data slices. 
- // All the PLP instances have the same PLP ID.
- // Only a single input stream results from the 
- // first PLP of the bundle.
- int m_Type; // PLP Type. See DTAPI_DVBC2_PLP_TYPE_x
- int m_GroupId; // Group ID. 0..255
- int m_FecType; // FEC Type. 0=16K, 1=64K
- int m_CodeRate; // PLP Code rate. See DTAPI_DVBC2_COD_x
- int m_Modulation; // PLP Modulation. See DTAPI_DVBC2_x
- int m_HdrCntr; // Header counter #FECFrames following the 
- // FECFrame header. 0=1FF 1=2FF.
- // Only used for DSlice type 2.
-
- // ACM test mode. Only available for type 2 data slices. If number ACM headers != 0, 
- // then the successive XFEC frames of this PLP use the modulation and coding 
- // parameters taken from the m_AcmHeaders array. After the last value is used, it
- // loops again to the start of the array.
- // So DtDvbC2PlpPars.m_FecType, m_Modulation, m_CodeRate and m_HdrCntr are ignored.
- std::vector<DtDvbC2XFecFrameHeader> m_AcmHeaders;
-
- bool m_PsiSiReproc; // Indicates whether PSI/SI reprocessing is performed
- int m_TsId; // Transport Stream ID (if m_PsiSiReproc=false)
- int m_OnwId; // Original Network ID (if m_PsiSiReproc=false)
- bool m_NoData; // No input data is provided for this PLP. 
- // It is implicitely true for all PLPs in a data slice 
- // with m_OffsetLeft = m_OffsetRight
-public:
- void Init(int PlpId = 0);
- bool IsEqual(DtDvbC2PlpPars& PlpPars);
- bool operator == (DtDvbC2PlpPars& PlpPars);
- bool operator != (DtDvbC2PlpPars& PlpPars);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2XFecFrameHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// DVBC2 FEC frame header for ACM test
-//
-struct DtDvbC2XFecFrameHeader
-{
- int m_FecType; // PLP FEC Type. 0=16K, 1=64K
- int m_Modulation; // PLP Modulation. See DTAPI_DVBC2_x
- int m_CodeRate; // PLP Code rate. See DTAPI_DVBC2_COD_x
- int m_HdrCntr; // Header counter #FEC frames following the 
- // FEC frame header. 0=1FF, 1=2FF
- int m_XFecFrameCount; // 1..256: Number of successive XFEC frames using 
- // these parameters
-public:
- void Init(void);
- bool IsEqual(DtDvbC2XFecFrameHeader& FecHeader);
- bool operator == (DtDvbC2XFecFrameHeader& FecHeader);
- bool operator != (DtDvbC2XFecFrameHeader& FecHeader);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the DVB-C2 modulation parameters
-//
- struct DtDvbC2Pars
-{
-public:
- // General C2 parameters
- int m_Bandwidth; // Bandwidth. Defines the OFDM carrier spacing 
- // F=8e6*bandwidth/7/4096 Hz. See DVBC2_BW_x
- int m_NetworkId; // Network ID. 0..0xFFFF
- int m_C2SystemId; // C2 System ID. 0..0xFFFF
- int m_StartFrequency; // Start frequency in multiple of carrier spacing
- // 0..2^24 - 1 and multiples of dx. 
- // For guard interval 1/128 dx=24, otherwise dx=12
- int m_C2Bandwidth; // Bandwidth of the generated signal in 
- // multiples of pilot carrier spacing. 0..65535
- int m_GuardInterval; // Guard interval See DVBC2_GI_x
- bool m_ReservedTone; // Reserved tone. When there are reserved carriers
- // (e.g. PAPR TR is enabled) it shall be set to true; 
- // otherwise false
- int m_L1TiMode; // L1 time interleaving mode. See DVBC2_L1TIMODE_x
-
- // Data slices parameters
- int m_NumDSlices; // Number of data slices
- DtDvbC2DSlicePars m_DSlices[DTAPI_DVBC2_NUM_DSLICE_MAX];
-
- // Notches
- int m_NumNotches; // Number of notches
- DtDvbC2NotchPars m_Notches[DTAPI_DVBC2_NUM_NOTCH_MAX];
- 
- // PLP input
- int m_NumPlpInputs; // Number of PLPs
- DtPlpInpPars m_PlpInputs[DTAPI_DVBC2_NUM_PLP_MAX]; // PLP inputs (Optional)
-
- DtDvbC2PaprPars m_PaprPars; // PAPR Params (Optional)
- DtVirtualOutPars m_VirtOutput; // Virtual Output parameters(Optional) 
- DtTestPointOutPars m_TpOutput; // Test point data output parameters (Optional)
- int m_OutpFreqOffset; // Output frequency offset from 'm_StartFrequency'
- // in carriers of the generated spectrum. 
- // Must be multiple of dx.
- int m_OutpBandwidth; // Output bandwidth in carriers and a multiple of dx.
- // 0 means default output bandwidth. 
- // Note: for convenience, one more carrier is output
- // if an edge carrier needs to be output.
-
- std::vector<DtDvbC2L1UpdatePars> m_L1Updates; // L1 updates
-
- // Undocumented
- int m_L1P2ChangeCtr; // Undocumented. For internal use only
- bool m_NotchTestEnable; // Undocumented. For internal use only
- int m_TimeWindowLength; // Undocumented. For internal use only
-
-public:
- DTAPI_RESULT CheckValidity(void);
- DTAPI_RESULT GetParamInfo(DtDvbC2ParamInfo& C2Info);
- void Init(void);
- bool IsEqual(DtDvbC2Pars& C2Pars);
- bool operator == (DtDvbC2Pars& C2Pars);
- bool operator != (DtDvbC2Pars& C2Pars);
-};
- 
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Demodulation +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-// DtDvbC2DemodL1Part2Plp::m_PayloadType - The PLP payload type
-#define DTAPI_DVBC2_PAYLOAD_GFPS 0 // Generic fixed-length packetized stream
-#define DTAPI_DVBC2_PAYLOAD_GCS 1 // Generic continuous stream
-#define DTAPI_DVBC2_PAYLOAD_GSE 2 // Generic stream encapsulation
-#define DTAPI_DVBC2_PAYLOAD_TS 3 // Transport Stream
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1PlpSigDataPlp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
- //
-// Struct for storing layer 1 PLP signalling information per PLP.
-// For type 1 data slices this struct contains the PLP-signalling information
-// from the layer 1 part 2 signalling.
-// For type 2 data slices this struct contains the PLP-signalling information
-// from the layer 1 part 1 (=FEC-frame header).
-//
-struct DtDvbC2DemodL1PlpSigDataPlp
-{
- int m_Id; // PLP ID: 0..255
- int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
- int m_Modulation; // PLP modulation, see DTAPI_DVBC2_x
- int m_CodeRate; // PLP modulation, see DTAPI_DVBC2_x
- int m_HdrCntr; // Header counter #FEC frames following the 
- // FEC frame header. 0=1FF, 1=2FF. Only present for
- // type 2 data slices
-
- DtDvbC2DemodL1PlpSigDataPlp();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1PlpSigData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Struct for storing the DVB-C2 layer 1 PLP signalling data
-//
-struct DtDvbC2DemodL1PlpSigData
-{
- int m_NumPlps; // Number of PLPs
- std::vector<DtDvbC2DemodL1PlpSigDataPlp> m_Plps;
-
- DtDvbC2DemodL1PlpSigData();
- 
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2Plp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Struct for storing Layer 1 part 2 information per PLP
-//
-struct DtDvbC2DemodL1Part2Plp
-{
- int m_Id; // PLP ID: 0..255
- int m_Bundled; // Bundled PLP
- int m_Type; // PLP type, see DTAPI_DVBC2_PLP_TYPE_x
- int m_PayloadType; // PLP payload type: 0..3
- int m_GroupId; // Group ID: 0..255
- // Start, FecType, Modulation and CodeRate parameters are not present for type 2 data 
- // slices
- int m_Start; // PLP start: Start of the first complete XFECframe
- int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
- int m_Modulation; // PLP modulation, see DTAPI_DVBC2_x
- int m_CodeRate; // PLP modulation, see DTAPI_DVBC2_x
- int m_PsiSiReproc; // Indicates whether PSI/SI reprocessing is performed
- int m_TsId; // Transport Stream ID (if m_PsiSiReproc=false)
- int m_OnwId; // Original Network ID (if m_PsiSiReproc=false)
- 
- DtDvbC2DemodL1Part2Plp();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
- 
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2DSlice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Struct for storing Layer 1 part 2 information per data slice
-//
-struct DtDvbC2DemodL1Part2DSlice 
-{
- int m_Id; // Data slice ID: 0..255
- int m_TunePosition; // Tune position relative to the start frequency in 
- // multiples of pilot carrier spacing.
- // For guard interval 1/128: 0..8191 
- // For guard interval 1/64: 0..16383 
- int m_OffsetLeft; // Offset left in multiples of pilot carrier spacing.
- // For guard interval 1/128: -128..127 
- // For guard interval 1/64: -256..255 
- int m_OffsetRight; // Offset right in multiples of pilot carrier spacing.
- // For guard interval 1/128: -128..127 
- // For guard interval 1/64: -256..255 
- // If m_OffsetLeft = m_OffsetRight, the data slice is
- // empty and no input streams are created for the PLPs
- // of the data slice.
- int m_TiDepth; // Time interleaving depth, see DTAPI_DVBC2_TIDEPTH_x
- int m_Type; // Data slice type, see DTAPI_DVBC2_DSLICE_TYPE_x
- int m_FecHdrType; // FEC header type, see DTAPI_DVBC2_FECHDR_TYPE_x 
- int m_ConstConfig; // Constant data slice configuration flag
- int m_LeftNotch; // Left notch present flag
- // PLPs
- int m_NumPlps; // Number of PLPs
- std::vector<DtDvbC2DemodL1Part2Plp> m_Plps;
-
- DtDvbC2DemodL1Part2DSlice();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Struct for storing the DVB-C2 layer 1 part 2data
-//
-struct DtDvbC2DemodL1Part2Data
-{
- int m_NetworkId; // Network ID: 0..0xFFFF
- int m_C2SystemId; // C2 System ID: 0..0xFFFF
- int m_StartFrequency; // Start frequency in multiple of carrier spacing:
- // 0..2^24 - 1
- int m_C2Bandwidth; // Bandwidth of the generated signal in 
- // multiples of pilot carrier spacing: 0..65535
- int m_GuardInterval; // Guard interval. See DVBC2_GI_x
- int m_C2FrameLength; // C2 frame length: #Data symbols per C2 frame
- int m_L1P2ChangeCtr; // Value of the L1_PART2_CHANGE_COUNTER field
- int m_ReservedTone; // Reserved tone
-
- // Data slices
- int m_NumDSlices; // Number of data slices
- std::vector<DtDvbC2DemodL1Part2DSlice> m_DSlices;
- 
- // Notches
- int m_NumNotches; // Number of notches
- std::vector<DtDvbC2NotchPars> m_Notches;
-
- DtDvbC2DemodL1Part2Data();
- 
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for DVB-C2 PLP-stream selection
-//
-struct DtDvbC2StreamSelPars
-{
- int m_DSliceId; // ID of the data slice or DTAPI_DVBC2_DSLICE_ID_AUTO
- int m_PlpId; // ID of the data PLP or DTAPI_DVBC2_PLP_ID_xxx
- int m_CommonPlpId; // ID of the common PLP or DTAPI_DVBC2_PLP_ID_xxx
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-S2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-#define DTAPI_DVBS2_NUM_PLP_MAX 255 // Maximum number of PLPs
-
-// m_Issy - PLP ISSY
-#define DTAPI_DVBS2_ISSY_NONE 0 // No ISSY field is used
-#define DTAPI_DVBS2_ISSY_SHORT 1 // 2 byte ISSY field is used
-#define DTAPI_DVBS2_ISSY_LONG 2 // 3 byte ISSY field is used
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-struct DtDvbS2ModStatus
-{
- int m_MplpModFlags; // Multi PLP modulator flags
- __int64 m_DjbOverflows; // Count number of DJB overflows. If it happens,
- // issy output delay must be decreased or "issy bufs"
- // increased.
- __int64 m_DjbUnderflows; // Count number of DJB underflows. If it happens,
- // issy output delay must be increased.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2FecFrameHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-struct DtDvbS2FecFrameHeader
-{
- int m_Modulation; // PLP Modulation. See DTAPI_MOD_DVBS2_*
- int m_CodeRate; // PLP Code rate. See DTAPI_MOD_x
- int m_FecFrameSize; // Fec frame size. See DTAPI_MOD_S2_*FRM
- bool m_HasPilots; // Enable pilots
- int m_FecFrameCount; // Number of successive FEC frames using these
- // parameters, 0 means infinite.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2ModCod -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-struct DtDvbS2ModCod
-{
- int m_ModType; // Modulation type, e.g. DTAPI_MOD_DVBS_QPSK
- int m_CodeRate; // Code rate, e.g. DTAPI_MOD_1_2
- // Constructor
- DtDvbS2ModCod();
- DtDvbS2ModCod(int ModType, int CodeRate);
- bool operator < (const DtDvbS2ModCod& ModCod) const;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-struct DtDvbS2PlpPars
-{
- bool m_Hem; // High Efficiency Mode
- bool m_Npd; // Null Packet Deletion
- int m_Issy; // Issy mode. See DTAPI_DVBS2_ISSY_x
- int m_IssyBufs; // Issy BUFS
- int m_IssyOutputDelay; // Delay (in T units) between the incoming data and
- // the output TS in the receiver model. This value 
- // determines the minimum and maximum dejitter buffer
- // usage and is used to compute the ISSY BUFSTAT field
- int m_TsRate; // Ts rate
- int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
- int m_Id; // PLP ID. 0..255
-
- // One or more fec frame headers. If there is only 1 the m_FecFrameCount member
- // is ignored. Otherwise that specifies the number of frames to generate with those
- // parameters. When that number of frames are generated, the next set of parameters
- // is taken. After the last DtDvbS2FecFrameHeader the first one is used again.
- std::vector<DtDvbS2FecFrameHeader> m_AcmHeaders;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-struct DtDvbS2Pars
-{
- DtVirtualOutPars m_VirtOutput; // Virtual-output parameters (Optional) 
- bool m_L3Output; // Set to true to enable L3 output
- int m_SymRate; // Symbol rate
- int m_RollOff; // Roll-off DTAPI_MOD_ROLLOFF_xxx
- 
- // Data per PLP
- std::vector<DtDvbS2PlpPars> m_Plps;
- // PLP input
- int m_NumPlpInputs; // Number of PLPs
- DtPlpInpPars m_PlpInputs[DTAPI_DVBS2_NUM_PLP_MAX]; // PLP inputs (Optional)
-
- DtDvbS2Pars();
- DTAPI_RESULT CheckValidity();
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-T2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-// Maxima
-#define DTAPI_DVBT2_NUM_PLP_MAX 255 // Maximum number of PLPs
-#define DTAPI_DVBT2_NUM_RF_MAX 7 // Maximum number of RF output signals
-
-// PLP IDs
-#define DTAPI_DVBT2_PLP_ID_NONE -1 // No PLP selected
-#define DTAPI_DVBT2_PLP_ID_AUTO -2 // Automatic PLP selection
-
-// m_Issy
-#define DTAPI_DVBT2_ISSY_NONE 0 // No ISSY field is used
-#define DTAPI_DVBT2_ISSY_SHORT 1 // 2-byte ISSY field is used
-#define DTAPI_DVBT2_ISSY_LONG 2 // 3-byte ISSY field is used
-
-// m_Bandwidth
-#define DTAPI_DVBT2_1_7MHZ 0 // 1.7 MHz
-#define DTAPI_DVBT2_5MHZ 1 // 5 MHz
-#define DTAPI_DVBT2_6MHZ 2 // 6 MHz
-#define DTAPI_DVBT2_7MHZ 3 // 7 MHz
-#define DTAPI_DVBT2_8MHZ 4 // 8 MHz
-#define DTAPI_DVBT2_10MHZ 5 // 10 MHz
-#define DTAPI_DVBT2_BW_UNK -1 // Unknown bandwith
-#define DTAPI_DVBT2MI_BW_MSK 0xF // Mask for T2MI ParXtra2
-#define DTAPI_DVBT2MI_BW_UNK 0xF //Val in ParXtra2 if not set, map to 8MHz
-
-// m_FftMode
-// Warning: the codes are different from the corresponding L1 field
-#define DTAPI_DVBT2_FFT_1K 0 // 1K FFT
-#define DTAPI_DVBT2_FFT_2K 1 // 2K FFT
-#define DTAPI_DVBT2_FFT_4K 2 // 4K FFT
-#define DTAPI_DVBT2_FFT_8K 3 // 8K FFT
-#define DTAPI_DVBT2_FFT_16K 4 // 16K FFT
-#define DTAPI_DVBT2_FFT_32K 5 // 32K FFT
-#define DTAPI_DVBT2_FFT_UNK -1 // Unknown FFT mode
-
-// m_Miso
-#define DTAPI_DVBT2_MISO_OFF 0 // No MISO
-#define DTAPI_DVBT2_MISO_TX1 1 // TX1 only
-#define DTAPI_DVBT2_MISO_TX2 2 // TX2 only
-#define DTAPI_DVBT2_MISO_TX1TX2 3 // TX1+TX2 Legacy
-#define DTAPI_DVBT2_MISO_SUM 3 // TX1+TX2
-#define DTAPI_DVBT2_MISO_BOTH 4 // TX1 and TX2
-
-// m_Guard - Guard interval
-// Warning: the codes are different from the corresponding L1 field
-#define DTAPI_DVBT2_GI_1_128 0 // 1/128
-#define DTAPI_DVBT2_GI_1_32 1 // 1/32
-#define DTAPI_DVBT2_GI_1_16 2 // 1/16
-#define DTAPI_DVBT2_GI_19_256 3 // 19/256
-#define DTAPI_DVBT2_GI_1_8 4 // 1/8
-#define DTAPI_DVBT2_GI_19_128 5 // 19/128
-#define DTAPI_DVBT2_GI_1_4 6 // 1/4
-#define DTAPI_DVBT2_GI_UNK -1 // Unknown guard interval
-
-// m_Papr - PAPR - Peak to Average Power Reduction
-#define DTAPI_DVBT2_PAPR_NONE 0
-#define DTAPI_DVBT2_PAPR_ACE 1 // ACE - Active Constellation Extension
-#define DTAPI_DVBT2_PAPR_TR 2 // TR - PAPR using reserved carriers
-#define DTAPI_DVBT2_PAPR_ACE_TR 3 // ACE and TR
-
-// m_BwtExt - Bandwidth extension
-#define DTAPI_DVBT2_BWTEXT_OFF false // No bandwidth extension
-#define DTAPI_DVBT2_BWTEXT_ON true // Bandwidth extension on
-
-// m_PilotPattern
-// Warning: the codes are different from the corresponding L1 field
-#define DTAPI_DVBT2_PP_1 1 // PP1
-#define DTAPI_DVBT2_PP_2 2 // PP2
-#define DTAPI_DVBT2_PP_3 3 // PP3
-#define DTAPI_DVBT2_PP_4 4 // PP4
-#define DTAPI_DVBT2_PP_5 5 // PP5
-#define DTAPI_DVBT2_PP_6 6 // PP6
-#define DTAPI_DVBT2_PP_7 7 // PP7
-#define DTAPI_DVBT2_PP_8 8 // PP8
-
-// m_CodeRate - Code rate
-#define DTAPI_DVBT2_COD_1_2 0 // 1/2
-#define DTAPI_DVBT2_COD_3_5 1 // 3/5
-#define DTAPI_DVBT2_COD_2_3 2 // 2/3
-#define DTAPI_DVBT2_COD_3_4 3 // 3/4
-#define DTAPI_DVBT2_COD_4_5 4 // 4/5 not for T2 lite
-#define DTAPI_DVBT2_COD_5_6 5 // 5/6 not for T2 lite
-#define DTAPI_DVBT2_COD_1_3 6 // 1/3 only for T2 lite
-#define DTAPI_DVBT2_COD_2_5 7 // 2/5 only for T2 lite
-
-// m_FefSignal - Type of signal generated during the FEF period
-#define DTAPI_DVBT2_FEF_ZERO 0 // Use zero I/Q samples during FEF
-#define DTAPI_DVBT2_FEF_1K_OFDM 1 // 1K OFDM symbols with 852 active
- // carriers containing BPSK symbols
- // (same PRBS as the T2 dummy cells,
- // not reset between symbols)
-#define DTAPI_DVBT2_FEF_1K_OFDM_384 2 // 1K OFDM symbols with 384 active
- // carriers containing BPSK symbols
-
-// m_PlpConstel and m_L1Constel - Modulation constellation
-#define DTAPI_DVBT2_BPSK 0 // BPSK
-#define DTAPI_DVBT2_QPSK 1 // QPSK
-#define DTAPI_DVBT2_QAM16 2 // 16-QAM
-#define DTAPI_DVBT2_QAM64 3 // 64-QAM
-#define DTAPI_DVBT2_QAM256 4 // 256-QAM
-
-// m_Type - PLP type
-#define DTAPI_DVBT2_PLP_TYPE_COMM 0 // Common PLP
-#define DTAPI_DVBT2_PLP_TYPE_1 1 // PLP type 1
-#define DTAPI_DVBT2_PLP_TYPE_2 2 // PLP type 2
-
-// m_FecType - PLP FEC type
-#define DTAPI_DVBT2_LDPC_16K 0 // 16K LDPC
-#define DTAPI_DVBT2_LDPC_64K 1 // 64K LDPC
-
-// m_TimeIlType - Time interleaving type
-#define DTAPI_DVBT2_IL_ONETOONE 0 // Interleaving frame in one T2 frame
-#define DTAPI_DVBT2_IL_MULTI 1 // Interleaving frame in multiple frames
-
-// m_TimeStamping - Type of timestamps in T2MI
-#define DTAPI_DVBT2MI_TIMESTAMP_NULL 0 // No timestamping
-#define DTAPI_DVBT2MI_TIMESTAMP_REL 1 // Relative timestamps. Use m_Subseconds
-#define DTAPI_DVBT2MI_TIMESTAMP_ABS 2 // Absolute timestamps. Use m_T2miUtco,
- // m_SecSince2000, m_Subseconds,
-
-// m_T2Version - DVB-T2 specification version
-#define DTAPI_DVBT2_VERSION_1_1_1 0 // DVB-T2 version 1.1.1
-#define DTAPI_DVBT2_VERSION_1_2_1 1 // DVB-T2 version 1.2.1
-#define DTAPI_DVBT2_VERSION_1_3_1 2 // DVB-T2 version 1.3.1
-
-// m_T2Profile - DVB-T2 profile
-#define DTAPI_DVBT2_PROFILE_BASE 0 
-#define DTAPI_DVBT2_PROFILE_LITE 1 // Requires DVB-T2 version 1.3.1
-
-// m_BiasBalancing
-#define DTAPI_DVBT2_BIAS_BAL_OFF 0 // No L1 bias compensation
-#define DTAPI_DVBT2_BIAS_BAL_ON 1 // Modify L1 reserved fields and L1 ext.
- // field padding to compensate L1 bias
-// m_GseLabelType - DVB-T2 GSE Label size
-#define DTAPI_DVBT2_GSE_LABEL_6BYTE 0 // 6 Byte GSE label
-#define DTAPI_DVBT2_GSE_LABEL_3BYTE 1 // 3 Byte GSE label
-#define DTAPI_DVBT2_GSE_LABEL_NONE 2 // No GSE label
-
-#define DTAPI_TXSIG_FEF_LEN_MIN 162212 // Min. FEF length for FEF TX sgnalling
-
-// DVB-T2 test point enum
-enum {
- DTAPI_DVBT2_TP00,
- DTAPI_DVBT2_TP01,
- DTAPI_DVBT2_TP03,
- DTAPI_DVBT2_TP04,
- DTAPI_DVBT2_TP06,
- DTAPI_DVBT2_TP08,
- DTAPI_DVBT2_TP09,
- DTAPI_DVBT2_TP11,
- DTAPI_DVBT2_TP12,
- DTAPI_DVBT2_TP15,
- DTAPI_DVBT2_TP16,
- DTAPI_DVBT2_TP19, // Only usable if CFLOAT32 output format is selected
- DTAPI_DVBT2_TP20,
- DTAPI_DVBT2_TP21,
- DTAPI_DVBT2_TP22,
- DTAPI_DVBT2_TP23,
- DTAPI_DVBT2_TP24,
- DTAPI_DVBT2_TP25,
- DTAPI_DVBT2_TP26,
- DTAPI_DVBT2_TP27,
- DTAPI_DVBT2_TP28,
- DTAPI_DVBT2_TP29,
- DTAPI_DVBT2_TP30,
- DTAPI_DVBT2_TP32,
- DTAPI_DVBT2_TP33, // T2MI output
- DTAPI_DVBT2_TP34, // T2MI output
-
- // Receiver Buffer Model
- DTAPI_DVBT2_TP50, // TDI size 
- DTAPI_DVBT2_TP51, // TDI write index, TDI read available
- DTAPI_DVBT2_TP53, // DJB size 
- DTAPI_DVBT2_TP_COUNT, // Number of test points
-};
-
-extern const int DTAPI_DVBT2_TESTPOINTS[DTAPI_DVBT2_TP_COUNT];
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2AuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the parameters of AUX streams
-//
-struct DtDvbT2AuxPars
-{
- int m_NumDummyStreams; // Number of dummy AUX streams
-
-public:
- void Init(void);
- bool IsEqual(DtDvbT2AuxPars& AuxPars);
- bool operator == (DtDvbT2AuxPars& AuxPars);
- bool operator != (DtDvbT2AuxPars& AuxPars);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2MiPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for specifying the parametes for T2MI output streams
-//
-struct DtDvbT2MiPars
-{
- bool m_Enabled; // Enable T2MI output. If enabled, a T2MI
- // Transport Stream is generated and output
- int m_Pid; // T2MI data PID
- int m_StreamId; // stream ID for the first T2MI stream 
- int m_Pid2; // Second T2MI data PID
- int m_StreamId2; // stream ID for the second T2MI stream
- int m_PcrPid; // PCR PID. If -1, no PCR is included otherwise
- // PCRs are inserted on the specified PID
- int m_PmtPid; // PMT PID. If -1, no PMT-table and no PAT-table
- // are included otherwise a PMT-table is inserted 
- // on the specified PID
- int m_TsRate; // Rate in bps for the T2MI output
- int m_TimeStamping; // T2MI timestamps: None, Absolute or Releative
- // See DVBT2MI_TIMESTAMP_x
- __int64 m_SecSince2000; // First T2MI output timestamp value. Next values
- // are computed
- int m_Subseconds; // The number of subseconds. See T2MI spec table 4 
- int m_T2miUtco; // Offset in seconds between UTC and m_SecSince2000.
- // As of February 2009 the value shall be 2 and 
- // shall change as a result of each new leap second.
- bool m_EncodeFef; // If true, outputs a FEF part composite packet 
- // with the required subpart. Otherwise, only 
- // outputs a FEF part NULL packet when FEF is
- // enabled.
- bool m_SyncWithExtClock; // Undocumented. For internal use only.
-public:
- void Init(void);
- bool IsEqual(DtDvbT2MiPars& T2MiPars);
- bool operator == (DtDvbT2MiPars& T2MiPars);
- bool operator != (DtDvbT2MiPars& T2MiPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for retrieving the MPLP modulator status
-//
-struct DtDvbT2ModStatus
-{
- int m_MplpModFlags; // Multi PLP modulator flags
- // General MPLP status info
- __int64 m_PlpNumBlocksOverflows;
- // Counts the FEC frames for which the requested
- // number of PLP blocks is bigger than NumBlocks
- // (the receiver will get an invalid stream)
- __int64 m_BitrateOverflows; // Counts the frames in which too many bits were
- // allocated (the receiver will get an invalid stream)
- __int64 m_TtoErrorCount; // Number of times the generated TTO value was
- // invalid (typically from a too small T_design)
- 
- // T2MI Specific status info
- __int64 m_T2MiOutputRateOverFlows;
- // Number of bit rate overflows(i.e. the T2MI output
- // rate must be increased for reliable operation)
- int m_T2MiOutputRate; // Current T2MI rate excluding null packets(in bps)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2PaprPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying and enabling the PAPR reduction parameters
-//
-struct DtDvbT2PaprPars
-{
- bool m_AceEnabled; // ACE enabled
- double m_AceVclip; // ACE clipping threshold 1..4.32 (Volt)
- double m_AceGain; // ACE gain 0..31 (steps of 1)
- double m_AceLimit; // ACE limit 0.7..1.4 (steps of 0.1) 
- int m_AceInterpFactor; // ACE interpolation factor 1..4
- // Note: PAPR ACE processing time is proportional
- // to this parameter (1 recommended for realtime)
- int m_AcePlpIndex; // PLP used for the PAPR ACE
- bool m_TrEnabled; // TR enabled
- bool m_TrP2Only; // PAPR TR is only applied on the P2 symbol
- double m_TrVclip; // TR clipping threshold 1..4.32 (Volt)
- int m_TrMaxIter; // TR maximum number of iterations. Must be >= 1
- // Note: PAPR TR processing time is proportional
- // to this parameter
- int m_L1ExtLength; // L1 extension field length 0..65535
- bool m_L1AceEnabled; // L1 ACE enabled
- double m_L1AceCMax; // L1 ACE maximum constellation extension value
- bool m_L1Scrambling; // L1 post scrabling (requires T2-version 1.3.1)
-
- // Parameters below only apply if DVB-T2 V1.2.1 is selected
- int m_NumBiasBalCells; // Dummy cells added to reduce the P2 PAPR
- // 0..BiasBalancingCellsMax
- int m_BiasBalancing; // Modify the L1 reserved fields and 
- // L1 ext padding to compensate the L1 bias. 
- // See DTAPI_DVBT2_BIAS_x
- int m_TrAlgorithm; // Undocumented. Must be 1 (default)
-
-public:
- void Init(void);
- bool IsEqual(DtDvbT2PaprPars& PaprPars);
- bool operator == (DtDvbT2PaprPars& PaprPars);
- bool operator != (DtDvbT2PaprPars& PaprPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// DVB-T2 parameter info
-//
-struct DtDvbT2ParamInfo 
-{
- int m_TotalCellsPerFrame; // Total number of cells per frame
- int m_L1CellsPerFrame; // Total #cells per frame used for L1 signaling
- // Overhead: m_L1CellsPerFrame/m_TotalCellsPerFrame
- int m_AuxCellsPerFrame; // Total number of auxiliary stream cells per frame 
- // (currently only used for TX signalling if enabled)
- int m_BiasBalCellsPerFrame; // Total number of L1 bias balancing cells per frame
- int m_BiasBalCellsMax; // Maximum number of L1 bias balancing cells per P2
- int m_DummyCellsPerFrame; // Total number of cells lost per frame. Dummy cells
- // overhead: m_DummyCellsPerFrame/m_TotalCellsPerFrame
- // It is computed in case no NDP is used for frame 0.
- int m_SamplesPerFrame; // Total number of samples per frame
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the parameters of a PLP
-//
-struct DtDvbT2PlpPars
-{
- // Mode adaptation layer: TS input
- bool m_Hem; // High Efficiency Mode: yes/no
- bool m_Npd; // Null Packet Deletion: yes/no
- int m_Issy; // ISSY mode. See DTAPI_DVBT2_ISSY_XXX
- int m_IssyBufs; // ISSY BUFS
- int m_IssyTDesign; // T-design value for TTO generation. 
- // Use 0 to have the modulator choose the value.
- // T-design is defined as the delay (in samples)
- // between the start of the first T2 frame in 
- // which the PLP is mapped (m_FirstFrameIdx) and
- // the first output bit of the transport stream.
- int m_CompensatingDelay; // Additional delay (in samples) before the TS 
- // data is sent. Use -1 to have the modulator 
- // choose the value
- int m_TsRate; // If 0 the rate is computed from the PLP 
- // parameters. Only possible if no NPD is used.
- // Mode adaptation layer: GSE input
- int m_GseLabelType; // GSE-label type. See DTAPI_DVBT2_GSE_LABEL_XXX
-
- // DVB-T2 L1 parameters
- int m_Id; // PLP ID: 0..255
- int m_GroupId; // PLP group ID: 0..255
- int m_Type; // PLP type: DTAPI_DVBT2_PLP_TYPE_XXX
- int m_PayloadType; // PLP payload type: DTAPI_DVBT2_PAYLOAD_XXX
- int m_CodeRate; // PLP code rate: DTAPI_DVBT2_COD_XXX
- int m_Modulation; // PLP modulation: DTAPI_DVBT2_BPSK/...
- bool m_Rotation; // Constellation rotation: yes/no
- int m_FecType; // FEC Type. 0=16K, 1=64K; Must be 16K for T2 lite
- int m_FrameInterval; // T2-frame interval for this PLP: 1..255
- int m_FirstFrameIdx; // First frame index: 0..m_FrameInterval-1
- int m_TimeIlLength; // Time interleaving length: 0..255
- int m_TimeIlType; // Time interleaving type: DTAPI_DVBT2_IL_XXX
- bool m_InBandAFlag; // In band A signaling information: yes/no
- bool m_InBandBFlag; // In band B Signaling information: yes/no
- // Only useful if DVB-T2 V1.2.1 is selected
- int m_NumBlocks; // Maximum number of FEC blocks contained in
- // one interleaving frame
-
- // IDs of the other PLPs in the in-band signaling
- int m_NumOtherPlpInBand; // Number of other PLPs in m_OtherPlpInBand
- int m_OtherPlpInBand[DTAPI_DVBT2_NUM_PLP_MAX-1];
-
- // The parameters below are only meaningful for type 1 PLPs in TFS case
- bool m_FfFlag; // FF flag
- int m_FirstRfIdx; // First TFS RF channel: 0..NumRf-1
-
-public:
- void Init(int PlpId = 0);
- bool IsEqual(DtDvbT2PlpPars& PlpPars);
- bool operator == (DtDvbT2PlpPars& PlpPars);
- bool operator != (DtDvbT2PlpPars& PlpPars);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- RBM events -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// RBM events all are errors except plot
-//
-enum DtDvbT2RbmEventType 
-{
- // Plot event (only generated if m_PlotEnabled is true)
- DTAPI_DVBT2_RBM_EVENT_PLOT,
- // Dejitter buffer underflow
- DTAPI_DVBT2_RBM_EVENT_DJB_UNDERFLOW,
- // BUFS=[m_Bufs] gives too small dejitter buffer
- DTAPI_DVBT2_RBM_EVENT_BUFS_TOO_SMALL,
- // TTO=[m_Tto] gives time in the past
- DTAPI_DVBT2_RBM_EVENT_TTO_IN_THE_PAST,
- // DJB overflow (should never happen except if the model is buggy) 
- DTAPI_DVBT2_RBM_EVENT_DJB_OVERFLOW,
- // BBFrame parser: CRC8 error in header (val=[m_Val]) 
- DTAPI_DVBT2_RBM_EVENT_CRC8_ERROR_HEADER,
- // BBFrame parser: DFL too large 
- DTAPI_DVBT2_RBM_EVENT_DFL_TOO_LARGE,
- // BBFrame parser: SYNCD too large (SYNCD=[m_SyncD] DFL=[m_Dfl]) 
- DTAPI_DVBT2_RBM_EVENT_SYNCD_TOO_LARGE,
- // BBFrame parser: invalid UPL 
- DTAPI_DVBT2_RBM_EVENT_INVALID_UPL,
- // BBFrame parser: invalid syncd (syncd=[m_SyncD] left=[m_Left]) 
- DTAPI_DVBT2_RBM_EVENT_INVALID_SYNCD,
- // TDI overflow: write pointer ([m_TdiWriteIndex]) ahead of 
- // read pointer ([m_TdiReadIndex]) 
- DTAPI_DVBT2_RBM_EVENT_TDI_OVERFLOW,
- // TDI overflow: too many TI blocks queued 
- DTAPI_DVBT2_RBM_EVENT_TOO_MANY_TI_BLOCKS,
- // plp_start value gives overlap between PLP id=[m_PlpId1] and id=[m_PlpId2] 
- DTAPI_DVBT2_RBM_EVENT_INVALID_PLP_START,
- // Frequency/L1 deinterleaver overflow 
- DTAPI_DVBT2_RBM_EVENT_FDI_OVERFLOW,
- // Not enough ISCR data to estimate the TS rate 
- DTAPI_DVBT2_RBM_EVENT_NO_TS_RATE,
- // ISCR error (delta=[m_Delta]) 
- DTAPI_DVBT2_RBM_EVENT_ISCR_ERROR,
- // BUFS not constant (current=[m_CurBufs] new=[m_NewBufs]) 
- DTAPI_DVBT2_RBM_EVENT_BUFS_NOT_CONSTANT,
- // ISSYI field cannot change its value 
- DTAPI_DVBT2_RBM_EVENT_ISSYI_NOT_CONSTANT,
- // HEM field cannot change its value 
- DTAPI_DVBT2_RBM_EVENT_HEM_NOT_CONSTANT,
- // plp_num_blocks for this interleaving frame is too small (plp_num_blocks=%d) 
- // At least 3 FEC block required in interleaving frame with HEM=1,
- // at least 1 if HEM=0. 
- DTAPI_DVBT2_RBM_EVENT_PLP_NUM_BLOCKS_TOO_SMALL,
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2RbmEvent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// RBM event parameters
-//
-struct DtDvbT2RbmEvent
-{
- int m_DataPlpId; // Data plp ID identifiying the stream
- int m_DataPlpIndex; // Data plp index
- double m_Time; // Time in T units
- int m_IsCommonPlp; // 1 = common PLP, 0 = data PLP,
- // -1 = the event does not refer to a particular PLP
- DtDvbT2RbmEventType m_EventType;
- // Additional parameters
- union {
- // DTAPI_DVBT2_RBM_EVENT_PLOT parameters
- struct {
- int m_TdiWriteIndex; // TDI write index
- int m_TdiReadIndex; // TDI read index
- int m_TdiReadAvailable;// Available cells in the TDI read buffer
- int m_DjbSize; // Dejitter buffer size in bits
- } Plot;
-
- // DTAPI_DVBT2_RBM_EVENT_BUFS_TOO_SMALL parameters
- struct {
- int m_Bufs; // BUFS value
- } BufsTooSmall;
-
- // DTAPI_DVBT2_RBM_EVENT_TTO_IN_THE_PAST parameters
- struct {
- int m_Tto; // TTO value
- } TtoInThePast;
-
- // DTAPI_DVBT2_RBM_EVENT_DJB_OVERFLOW paraneters
- struct {
- int m_DjbSize; // Dejitter buffer size in bits
- int m_DjbMaxSize;
- } DjbOverflow;
-
- // DTAPI_DVBT2_RBM_EVENT_CRC8_ERROR_HEADER parameters
- struct {
- int m_Val; // CRC8 value
- } Crc8ErrorHeader;
-
- // DTAPI_DVBT2_RBM_EVENT_DFL_TOO_LARGE parameters
- struct {
- int m_SyncD; // SYNCD
- int m_Dfl; // DFL
- } SyncDTooLarge;
- 
- // DTAPI_DVBT2_RBM_EVENT_INVALID_SYNCD parameters
- struct {
- int m_Syncd; // SYNCD
- int m_Left; // Left
- } InvalidSyncD;
- 
- // DTAPI_DVBT2_RBM_EVENT_TDI_OVERFLOW parameters
- struct {
- int m_TdiWriteIndex; // TDI write index
- int m_TdiReadIndex; // TDI read index
- } TdiOverflow;
-
- // DTAPI_DVBT2_RBM_EVENT_INVALID_PLP_START parameters
- struct {
- int m_PlpId1; // IDs of overlapping PLPs
- int m_PlpId2;
- } InvalidPlpStart;
-
- // DTAPI_DVBT2_RBM_EVENT_ISCR_ERROR parameters
- struct {
- int m_Delta; // Delta time in T units 
- } IscrError;
- 
- // DTAPI_DVBT2_RBM_EVENT_BUFS_NOT_CONSTANT parameters
- struct {
- int m_CurBufs; // Different BUFS values
- int m_newBufs;
- } BufsNotConstant;
- 
- // DTAPI_DVBT2_RBM_EVENT_PLP_NUM_BLOCKS_TOO_SMALL parameters
- struct {
- int m_PlpNumBlocks; // Number of blocks
- } PlpNumBlocksTooSmall;
- } u;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2RbmValidation -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for enabling the RBM validation and specifying a callback function
-//
-struct DtDvbT2RbmValidation
-{
-public:
- bool m_Enabled; // Enable RBM validation
- bool m_PlotEnabled; // Enable RBM plotting events
- int m_PlotPeriod; // Plot period
- void* m_pCallbackOpaque; // RBM event callback function and environment
- void (*m_pCallbackFunc)(void *pOpaque, const DtDvbT2RbmEvent* pRbmEvent);
-
-public:
- void Init(void);
- bool IsEqual(DtDvbT2RbmValidation& RbmPars);
- bool operator == (DtDvbT2RbmValidation& RbmPars);
- bool operator != (DtDvbT2RbmValidation& RbmPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2TxSigPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying and enabling the Transmitter Signature
-//
-struct DtDvbT2TxSigPars
-{
- // TX Signature through Auxiliary Streams
- // The total number of possible TX IDs are M=3*(P+1)
- // The number of cells used per transmitter is N=2^Q 
- // The number of of T2 frames per TX SIG frame is L=R+1 
- bool m_TxSigAuxEnabled; // Enabled
- int m_TxSigAuxId; // Transmitter ID. 0..3071
- int m_TxSigAuxP; // P 0..1023. The total number of possible 
- // TX IDs is M=3*(P+1). Hence M <= 3072
- int m_TxSigAuxQ; // Q 0..15. The number of cells used per 
- // transmitter is N=2^Q
- int m_TxSigAuxR; // R 0..255. The number of T2 frames
- // per TX SIG frame is L=R+1
-
- // TX Signature through FEF. 
- // To use this FEF generation must be enabled and the FEF length 
- // must be >= DTAPI_TXSIG_FEF_LEN_MIN
- bool m_TxSigFefEnabled; // Enabled
- int m_TxSigFefId1; // TX ID for 1st signature period. 0..7
- int m_TxSigFefId2; // TX ID for 2nd signature period. 0..7
-
-public:
- void Init(void);
- bool IsEqual(DtDvbT2TxSigPars& TxSigPars);
- bool operator == (DtDvbT2TxSigPars& TxSigPars);
- bool operator != (DtDvbT2TxSigPars& TxSigPars);
-};
-
-// Compare modes
-#define DTAPI_DVBT2_COMPA_ALL 0
-#define DTAPI_DVBT2_COMPA_ESSENTIAL 1
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ComponentPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the DVB-T2 component modulation parameters
-//
-class DtDvbT2ComponentPars
-{
-public:
- // General T2 parameters
- int m_T2Version; // DVB-T2 spec. version. See DVBT2_VERSION_x
- int m_T2Profile; // DVB-T2 profile. See DVBT2_PROFILE_x
- bool m_T2BaseLite; // Indicates whether T2 lite is used in a base
- // profile stream
- int m_Bandwidth; // Bandwidth: DVBT2_BW_XXX
- int m_FftMode; // FFT-mode: DVBT2_FFT_XXX
- int m_Miso; // MISO. See DVBT2_MISO_x
- int m_GuardInterval; // Guard interval. See DVBT2_GI_x
- int m_Papr; // PAPR. See DVBT2_PAPR_x
- bool m_BwtExt; // Bandwidth extention
- int m_PilotPattern; // Pilot pattern. Pattern 1 .. 8.
- int m_L1Modulation; // L1 modulation. See DVBT2_BPSK/... 
- int m_CellId; // Cell ID. 0..0xFFFF.
- int m_NetworkId; // Network ID. 0..0xFFFF.
- int m_T2SystemId; // T2 System ID. 0..0xFFFF.
- bool m_L1Repetition; // L1 repetition
-
- // T2-Frame related parameters
- int m_NumT2Frames; // #T2-frames per superframe. 1..255. 
- int m_NumDataSyms; // #Data symbols
- int m_NumSubslices; // #Subslices per T2-frame (for type2 PLPs)
-
- // Component start time
- int m_ComponentStartTime; // Offset in T unit at which the T2 component 
- // begins to be modulated. (0 in the first component)
- // FEF parameters
- bool m_FefEnable; // FEF enable
- int m_FefType; // FEF type. 0..15
- int m_FefS1; // FEF S1. 2..7
- int m_FefS2; // FEF S2. 1, 3, 5, 7, 9 ,11, 13 or 15
- int m_FefSignal; // Selects the type of signal generated during 
- // the FEF period (see DTAPI_DVBT2_FEF_x)
- int m_FefLength; // FEF Length in number of samples.
- int m_FefInterval; // FEF Interval. 
- // Requires: (m_NumT2Frames % m_FefInterval) == 0
- // RF channels for TFS
- int m_NumRfChans; // Number of RF channels 1..7
- int m_RfChanFreqs[DTAPI_DVBT2_NUM_RF_MAX];
- // Channel frequencis
- int m_StartRfIdx; // First used RF channel
-
- // PLPs
- int m_NumPlps; // Number of PLPs
- DtDvbT2PlpPars m_Plps[DTAPI_DVBT2_NUM_PLP_MAX];
- // PLP parameters
- DtPlpInpPars m_PlpInputs[DTAPI_DVBT2_NUM_PLP_MAX]; 
- // PLP inputs (Optional)
- // Optional
- DtDvbT2AuxPars m_Aux; // AUX Streams (Optional)
- DtDvbT2PaprPars m_PaprPars; // PAPR Params (Optional)
- DtDvbT2TxSigPars m_TxSignature;// TX-Signature (Optional)
- DtDvbT2RbmValidation m_RbmValidation;
- // RBM validation (Optional)
- DtTestPointOutPars m_TpOutput; // Test point data output parameters (optional)
-
- int m_L1ChangeCounter; // Undocumented. For internal use only.
-
-public:
- virtual void Init(void);
- virtual bool IsEqual(DtDvbT2ComponentPars&, int CompareMode=DTAPI_DVBT2_COMPA_ALL);
- virtual bool operator == (DtDvbT2ComponentPars& T2Pars);
- virtual bool operator != (DtDvbT2ComponentPars& T2Pars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the DVB-T2 modulation parameters.
-//
-class DtDvbT2Pars : public DtDvbT2ComponentPars
-{
-public:
- // Optional
- DtVirtualOutPars m_VirtOutput; // Virtual-output parameters (Optional) 
- DtDvbT2MiPars m_T2Mi; // T2MI output (Optional)
- int m_NumFefComponents; // Number of other T2 stream transmitted in the 
- // FEF part of the first component. The parameters 
- // come from 'm_FefComponent'.
-
- // FEF components. Currently maximum 1 other component
- DtDvbT2ComponentPars m_FefComponent[1];
-
-public:
- // Constructor
- DtDvbT2Pars() { Init(); }
-
- // Methods
- virtual void Init(void);
- virtual DTAPI_RESULT CheckValidity(void);
- virtual DTAPI_RESULT ComputeTDesign();
- virtual DTAPI_RESULT GetParamInfo(DtDvbT2ParamInfo& T2Info);
- virtual DTAPI_RESULT GetParamInfo(DtDvbT2ParamInfo& T2Info1, 
- DtDvbT2ParamInfo& T2Info2);
- 
- // Only usefull for single PLP
- DTAPI_RESULT OptimisePlpNumBlocks(DtDvbT2ParamInfo&, int&);
- DTAPI_RESULT OptimisePlpNumBlocks(DtDvbT2ParamInfo&, int&, int&);
-
- // Helper function to determine T2MI ts rate.
- static DTAPI_RESULT RetrieveT2miTsRateFromTs(char* pBuffer, int NumBytes,
- int Bandwidth, int& TsRate);
-
- // Operators
- virtual bool operator == (DtDvbT2Pars& T2Pars);
- virtual bool operator != (DtDvbT2Pars& T2Pars);
- virtual bool IsEqual(DtDvbT2Pars& T2Pars, int CompareMode=DTAPI_DVBT2_COMPA_ALL);
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-T2 Demodulation layer 1 data +=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-// DtDvbT2DemodL1PostPlp::m_PayloadType - The PLP payload type
-#define DTAPI_DVBT2_PAYLOAD_GFPS 0 // Generic Fixed-length Packetized Stream
-#define DTAPI_DVBT2_PAYLOAD_GCS 1 // Generic Continuous Stream
-#define DTAPI_DVBT2_PAYLOAD_GSE 2 // Generic Stream Encapsulation
-#define DTAPI_DVBT2_PAYLOAD_TS 3 // Transport Stream
-
-// DtDvbT2DemodL1Pre::m_Type - The current T2 super-frame stream type
-#define DTAPI_DVBT2_TYPE_TS 0 // Transport Stream (TS) only
-#define DTAPI_DVBT2_TYPE_GS 1 // Generic Stream (GS) only
-#define DTAPI_DVBT2_TYPE_TS_GS 2 // Mixed TS and GS
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodAuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Struct for storing the Auxiliary stream information from Layer 1 Post 
-//
-struct DtDvbT2DemodAuxPars
-{
- int m_AuxStreamType; // Auxiliary stream type
- int m_AuxPrivateConf; // Auxiliary stream info
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodL1PostPlp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Struct for storing Layer 1 Post per PLP
-//
-struct DtDvbT2DemodL1PostPlp
-{
- int m_Id; // PLP ID: 0..255
- int m_Type; // PLP type, see DTAPI_DVBT2_PLP_TYPE_x
- int m_PayloadType; // PLP payload type: 0..3
- int m_FfFlag; // FF flag
- int m_FirstRfIdx; // 0..NumRf-1
- int m_FirstFrameIdx; // First frame in which PLP appears
- int m_GroupId; // Group ID: 0..255
- int m_CodeRate; // PLP code rate, see DTAPI_DVBT2_COD_x
- int m_Modulation; // PLP modulation, see DTAPI_DVBT2_BPSK/...
- int m_Rotation; // PLP rotation yes/no
- int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
- int m_NumBlocks; // PLP_NUM_BLOCKS_MAX: Maximum number of FEC blocks
- // contained in one interleaving frame
- int m_FrameInterval; // The PLP appears every m_FrameInterval frames
- int m_TimeIlLength; // Time interleaver length: 0..255
- int m_TimeIlType; // Time interleaver type: 0 or 1
- int m_InBandAFlag; // IN_BAND_A_FLAG is used yes/no
- // V1.2.1 spec revision
- int m_InBandBFlag; // IN_BAND_B_FLAG is used yes/no
- int m_Reserved1; // Reserved field, may be used for bias balancing
- int m_PlpMode; // PLP mode: 0..3
- int m_Static; // Static flag: 0 or 1=Configuration changes only at
- // super frame boundaries
- int m_StaticPadding; // Static padding flag: 0 or 1=BBFRAME padding is not
- // used
- DtDvbT2DemodL1PostPlp();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodRfPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Struct for storing the TFS RF channels information from Layer 1 Post 
-//
-struct DtDvbT2DemodRfPars
-{
- int m_RfIdx; // Index of the RF-frequency
- int m_Frequency; // Centre frequency in Hz
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodL1Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Struct for storing the DVB-T2 layer 1 data
-//
-struct DtDvbT2DemodL1Data
-{
- // P1 Info
- struct DtDvbT2DemodL1P1
- {
- bool m_Valid; // True if P1 was found
- int m_FftMode; // FFT mode, see DVBT2_FFT_x
- int m_Miso; // MISO used
- int m_Fef; // FEF used
- int m_T2Profile; // DVB-T2 profile. See DVBT2_PROFILE_x
- } m_P1;
-
- // L1-pre info
- struct DtDvbT2DemodL1Pre
- {
- bool m_Valid; // True if L1 pre was correctly demodulated
-
- int m_Type; // Stream type within the current T2 super-frame
- int m_BwtExt; // Bandwidth extension
- int m_S1; // S1 signalling. P1 S1. 
- int m_S2; // S2 signalling. P1 S2.
- int m_L1Repetition; // L1 repetition
- int m_GuardInterval; // Guard interval, see DVBT2_GI_x
- int m_Papr; // PAPR. see DVBT2_PAPR_x
- int m_L1Modulation; // L1 modulation, see DVBT2_BPSK/...
- int m_L1CodeRate; // L1 coderate, see DTAPI_DVBT2_COD_x
- int m_L1FecType; // L1 FEC type: 0=LDPC 16K, 1=LDPC 64K
- int m_L1PostSize; // Size of the L1-post in OFDM cells
- int m_l1PostInfoSize; // L1-post info size = 
- // L1-post configurable+dynamic+extension
- int m_PilotPattern; // Pilot pattern: 1..8
- int m_TxIdAvailability; // The Tx ID
- int m_CellId; // Cell ID: 0..0xFFFF
- int m_NetworkId; // Network ID: 0..0xFFFF
- int m_T2SystemId; // T2 System ID: 0..0xFFFF
- int m_NumT2Frames; // Number of T2-frames per superframe: 1..255
- int m_NumDataSyms; // Number of data symbols
- int m_RegenFlag; // Regeneration count indicator
- int m_L1PostExt; // L1-post extensions enabled
- int m_NumRfChans; // Number of RF channels: 1..7
- int m_CurrentRfIdx; // Current RF index: 0..m_NumRfChans-1
- int m_T2Version; // DVB-T2 spec version, see DVBT2_VERSION_x
- int m_L1PostScrambling; // L1 Post scrambling
- int m_T2BaseLite; // Indicates whether T2 lite is used in a base
- // profile stream
- } m_L1Pre;
-
- // L1-post info
- struct DtDvbT2DemodL1Post
- {
- bool m_Valid; // True if L1 post was correctly demodulated
- int m_NumSubslices; // Number of subslices per T2-frame (for type2 PLPs)
- int m_NumPlps; // Number of PLPs
- int m_NumAux; // Number of auxiliary streams
-
- // TFS RF-channels
- std::vector<DtDvbT2DemodRfPars> m_RfChanFreqs; 
-
- // FEF info is meaningful if m_P1.m_Fef = true
- int m_FefType; // FEF type: 0..15
- int m_FefLength; // FEF length in number of samples
- int m_FefInterval; // FEF Interval
-
- // PLPs
- std::vector<DtDvbT2DemodL1PostPlp> m_Plps; 
-
- // Auxiliary stream signalling information
- std::vector<DtDvbT2DemodAuxPars> m_AuxPars; 
-
- } m_L1Post;
-
- DtDvbT2DemodL1Data();
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ISDBT-TMM +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-#define DTAPI_ISDBT_NUM_TS_MAX 14 
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbTmmPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// ISDB-Tmm parameters including per-layer parameters
-//
-struct DtIsdbTmmPars
-{
- int m_Bandwidth;
- int m_SubChannel;
- int m_NumTss;
- DtVirtualOutPars m_VirtOutput; // Virtual Output parameters(Optional) 
- DtIsdbtPars m_Tss[DTAPI_ISDBT_NUM_TS_MAX];
- DtPlpInpPars m_TsInputs[DTAPI_ISDBT_NUM_TS_MAX];
-
- // Member function
- DtIsdbTmmPars() { Init(); }
- DTAPI_RESULT CheckValidity();
- int NumSegm();
- void Init();
- DTAPI_RESULT SetSegmentFormat(int TsIdx, int SegmFormat);
-
- bool operator == (DtIsdbTmmPars& Rhs);
- bool operator != (DtIsdbTmmPars& Rhs);
-};
-
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ Advanced Demodulator +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStreamType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Classifies the type of the stream
-//
-enum DtStreamType 
-{
- STREAM_CONSTEL, // Constellation points
- STREAM_DAB, // DAB stream
- STREAM_DABETI, // DAB Ensemble Transport Interface (NI, G.703)
- STREAM_DABFIC, // DAB Fast Information Channel
- STREAM_DVBC2, // DVB-C2 stream (Transport Stream packets)
- STREAM_DVBC2_BBFRAME, // DVB-C2 stream base-band frames
- STREAM_DVBT, // DVB-T stream
- STREAM_DVBT2, // DVB-T2 stream (Transport Stream packets)
- STREAM_DVBT2_BBFRAME, // DVB-T2 stream base band frames
- STREAM_DVBT2_GSE, // DVB-T2 stream GSE-packets
- STREAM_IMPRESP, // Impulse response
- STREAM_ISDBT, // ISDB-T stream
- STREAM_MER, // MER
- STREAM_SPECTRUM, // Spectrum
- STREAM_T2MI, // DVB-T2 stream
- STREAM_TF_ABS, // Transfer function absolute
- STREAM_TF_PHASE, // Transfer function phase
- STREAM_TF_GROUPDELAY // Transfer function group delay
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the parameters for a stream of constellation points
-//
-struct DtConstelPars
-{
- int m_Period; // Minimum period between callbacks in ms
- int m_ConstellationType; // 0: Constellation per PLP
- // 1: Constellation per carrier (after equalization)
- int m_Index; // Index of the PLP or carrier
- int m_MaxNumPoints; // Maximum number of constellation points
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbTStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure specifies the selection parameters for a DVB-T transport stream
-//
-struct DtDvbTStreamSelPars
-{
- // No selection parameters yet
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbTTpsInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// DVB-T Transmission Parameter Signalling (TPS) information structure
-//
-struct DtDvbTTpsInfo
-{
- int m_LengthIndicator; // TPS length indicator 
- int m_Constellation; // Constellation (DTAPI_MOD_DVBT_xxx)
- int m_HpCodeRate; // High Priority code rate (DTAPI_MOD_xxx)
- int m_LpCodeRate; // Low Priority code rate(DTAPI_MOD_xxx)
- int m_Guard; // Guard interval (DTAPI_MOD_DVBT_G_xx)
- int m_Interleaving; // Interleaving (DTAPI_MOD_DVBT_xxx)
- int m_Mode; // Transmission mode (DTAPI_MOD_DVBT_xK)
- int m_Hierarchy; // Hierarchy (DTAPI_MOD_DVBT_HARCHY_xxx)
- int m_CellId; // CellId or -1 when not present
- int m_HpS48S49; // S48S49 of the odd frames (DTAPI_MOD_DVBT_Sxx)
- int m_LpS48S49; // S48S49 of the even frames (DTAPI_MOD_DVBT_Sxx)
- int m_OddS50_S53; // S50..S53 of the odd frames	
- int m_EvenS50_S53; // S50..S53 of the even frames	
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the selection parameters for a DVB-T2 DVB-T2 GSE and 
-// DVB-T2 BBFRAME stream
-//
-struct DtDvbT2StreamSelPars
-{
- int m_PlpId; // ID of the data PLP or DTAPI_DVBT2_PLP_ID_xxx
- int m_CommonPlpId; // ID of the common PLP or DTAPI_DVBT2_PLP_ID_xxx
-
- // Serialisation
- DTAPI_RESULT FromXml(const std::wstring& XmlString);
- DTAPI_RESULT ToXml(std::wstring& XmlString);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtImpRespPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the parameters for an impulse-response stream
-//
-struct DtImpRespPars
-{
- int m_Period; // Minimum period bewteen callbacks in ms
- int m_Channel; // Channel used for MISO
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the selection parameters for an ISDB-T stream
-//
-struct DtIsdbtStreamSelPars
-{
- // No additional selection parameters
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMeasurement -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure describing a set of measurement values. It used to pass measurements from 
-// the advanced demodulator to the user application through user-supplied 
-// DtWriteMeasFunc callback.
-//
-struct DtMeasurement
-{
- DtStreamType m_MeasurementType;// Type of measurement values
- __int64 m_TimeStamp; // Timestamp in number of samples
- int m_NumValues; // Number of measurement values
- DtComplexFloat* m_pMeasurement;// Measurement values
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the parameters for a MER stream.
-//
-struct DtMerPars
-{
- int m_Period; // Minimum period between callbacks in ms
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSpectrumPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure specifies the parameters for a spectrum stream.
-//
-struct DtSpectrumPars
-{
- int m_Period; // Minimum time between callbacks in ms 
- int m_FftLength; // FFT length, must be a power of two
- int m_AverageLength; // Number of FFT blocks on wich the average is done
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtT2MiStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure specifies the selection parameters for a T2-MI transport stream
-// containing a com-plete DVB-T2 stream.
-//
-struct DtT2MiStreamSelPars
-{
- int m_T2MiOutPid; // T2-MI output PID
- int m_T2MiTsRate; // Rate in bps for the T2MI output.
- // If -1, output a variable bitrate T2MI stream 
- // (set_output_rate is not called in this case).
- // Otherwise, use m_T2MiTsRate to set the rate.
- // Padding null packets are used to reach the target
- // bitrate. The maximum T2-MI bitrate is 72Mbps.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTransFuncPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure specifies the parameters for a transfer-function stream.
-//
-struct DtTransFuncPars
-{
- int m_Period; // Minimum time between callbacks in ms
- int m_Channel; // Channel used for MISO
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for streaming data selection
-//
-struct DtStreamSelPars
-{
- intptr_t m_Id; // Unique stream identifier
- DtStreamType m_StreamType; // Stream selection type
-
- union {
- // Selection parameters for demodulated streams
- DtDvbC2StreamSelPars m_DvbC2;
- DtDvbTStreamSelPars m_DvbT;
- DtDvbT2StreamSelPars m_DvbT2;
- DtIsdbtStreamSelPars m_Isdbt;
- DtT2MiStreamSelPars m_T2Mi;
- DtDabStreamSelPars m_Dab;
- DtDabEtiStreamSelPars m_DabEti;
- DtDabFicStreamSelPars m_DabFic;
-
- // Parameters for streams of measurement values
- DtConstelPars m_Constel;
- DtImpRespPars m_ImpResp;
- DtMerPars m_Mer;
- DtSpectrumPars m_Spectrum;
- DtTransFuncPars m_TransFunc;
- } u;
-
- bool operator == (DtStreamSelPars& Rhs);
- bool operator != (DtStreamSelPars& Rhs);
-};
-
-// Software demodulator callback functions
-typedef void DtOutputRateChangedFunc(void *pOpaque, DtStreamSelPars&, int Bitrate);
-typedef void DtReadIqFunc(void* pOpaque, 
- unsigned char* pIqBuf, int IqBufSize, int& IqLength);
-typedef void DtWriteMeasFunc(void *pOpaque, DtStreamSelPars&, DtMeasurement*);
-typedef void DtWriteStreamFunc(void* pOpaque, DtStreamSelPars& StreamSel, 
- const unsigned char* pData, int Length);
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAdvDemod -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class representing an advanced demodulator. 
-// DtAdvDemod can be considered a specialized in-put channel.
-//
-class DtAdvDemod
-{
-public:
- DtAdvDemod();
- virtual ~DtAdvDemod();
-private:
- // No implementation is provided for the copy constructor
- DtAdvDemod(const DtAdvDemod&);
-
-public:
- DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
-
- // Convenience functions
-public:
- int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
- int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
- bool IsAttached(void) { return m_pAdvDemod != NULL; }
- int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
-
-public:
- DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
- bool Exclusive=true, bool ProbeOnly=false);
- DTAPI_RESULT AttachVirtual(DtDevice* pDtDvc,
- DtReadIqFunc* pReadIqFunc, void* pOpaque);
- DTAPI_RESULT ClearFlags(int Latched);
- DTAPI_RESULT CloseStream(intptr_t Id);
- DTAPI_RESULT Detach(int DetachMode);
- DTAPI_RESULT GetDemodControl(DtDemodPars* pDemodPars);
- DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
- DTAPI_RESULT GetFlags(int& Flags, int& Latched);
- DTAPI_RESULT GetIoConfig(int Group, int& Value);
- DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
- DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, __int64& ParXtra0);
- DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
- __int64& ParXtra0, __int64& ParXtra1);
- DTAPI_RESULT GetPars(int Count, DtPar* pPars); 
- DTAPI_RESULT GetRxControl(int& RxControl);
- DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
- DTAPI_RESULT GetStatistic(int Type, int& Statistic);
- DTAPI_RESULT GetStatistic(int Type, double& Statistic);
- DTAPI_RESULT GetStatistic(int Type, bool& Statistic);
- DTAPI_RESULT GetStreamSelection(std::vector<DtStreamSelPars>& StreamSelList);
- DTAPI_RESULT GetSupportedPars(int& NumPars, DtPar* pPars);
- DTAPI_RESULT GetSupportedStatistics(int& Count, DtStatistic* pStatistics);
- DTAPI_RESULT GetTsRateBps(intptr_t Id, int& TsRate);
- DTAPI_RESULT GetTunerFrequency(__int64& FreqHz);
- DTAPI_RESULT LedControl(int LedControl);
- DTAPI_RESULT OpenStream(DtStreamSelPars StreamSel);
- DTAPI_RESULT RegisterCallback(DtOutputRateChangedFunc* pCallback, void* pOpaque);
- DTAPI_RESULT RegisterCallback(DtWriteStreamFunc* pCallback, void* pOpaque);
- DTAPI_RESULT RegisterCallback(DtWriteMeasFunc* pCallback, void* pOpaque);
- DTAPI_RESULT Reset(int ResetMode);
- DTAPI_RESULT SetAntPower(int AntPower);
- DTAPI_RESULT SetDemodControl(DtDemodPars *pDemodPars);
- DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue,
- __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
- DTAPI_RESULT SetPars(int Count, DtPar* pPars); 
- DTAPI_RESULT SetRxControl(int RxControl);
- DTAPI_RESULT SetTunerFrequency(__int64 FreqHz);
- DTAPI_RESULT Tune(__int64 FreqHz, int ModType,
- int ParXtra0, int ParXtra1, int ParXtra2);
- DTAPI_RESULT Tune(__int64 FreqHz, DtDemodPars *pDemodPars);
-
-protected: 
- AdvDemod* m_pAdvDemod; // Advanced demodulation channel implementation
- bool m_IsAttachedToVirtual; // Attached to virtual input port?
-
- // Encapsulated data
-private:
- IXpMutex* m_pMTLock; // Multi-threading lock for get/read functions
- void* m_pDetachLockCount;
- int m_Port;
- bool m_WantToDetach;
- 
-// Private helper functions
-private:
- DTAPI_RESULT DetachLock(void);
- DTAPI_RESULT DetachUnlock(void);
- DTAPI_RESULT ReadAccessLock(void);
- DTAPI_RESULT ReadAccessUnlock(void);
-};
-
-// Forward declaration for use in DtRs422Channel
-class Rs422Channel;
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRs422Channel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtRs422Channel
-{
-public:
- DtRs422Channel();
- virtual ~DtRs422Channel();
-private:
- // No implementation is provided for the copy constructor
- DtRs422Channel(const DtRs422Channel&);
-
-public:
- DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
- bool Exclusive=true, bool ProbeOnly=false);
- DTAPI_RESULT Detach();
- DTAPI_RESULT Flush();
- DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead, int Timeout, int& NumBytesRead);
- DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite, bool Blocking=true);
-
-protected:
- Rs422Channel* m_pRs422Channel;
- void* m_pDetachLockCount;
- bool m_WantToDetach;
-
-// Private helper functions
-private:
- DTAPI_RESULT DetachLock(void);
- DTAPI_RESULT DetachUnlock(void);
-};
-
-} // namespace Dtapi
-
-#ifndef _NO_USING_NAMESPACE_DTAPI
-using namespace Dtapi;
-#endif
-
-#endif //#ifndef __DTAPI_H
-
+//*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* DTAPI.h *#*#*#*#*#*#*#*#*#* (C) 2000-2015 DekTec
+//
+// DTAPI - C++ API for DekTec PCI/PCI-Express cards, USB-2 adapters and network devices
+//
+ 
+#ifndef __DTAPI_H
+#define __DTAPI_H
+
+// DTAPI version
+#define DTAPI_VERSION_MAJOR 5
+#define DTAPI_VERSION_MINOR 14
+#define DTAPI_VERSION_BUGFIX 0
+#define DTAPI_VERSION_BUILD 56
+
+//-.-.-.-.-.-.-.-.-.-.-.-.- Additional Libraries to be Linked In -.-.-.-.-.-.-.-.-.-.-.-.-
+
+#ifdef _WIN32
+
+#ifndef _LIB // Do not link libraries into DTAPI itself
+#pragma comment(lib, "iphlpapi.lib")
+#pragma comment(lib, "ws2_32.lib")
+#pragma comment(lib, "setupapi.lib")
+#pragma comment(lib, "comctl32.lib")
+#pragma comment(lib, "wbemuuid.lib")
+#endif
+
+#ifndef _DTAPI_DISABLE_AUTO_LINK
+ // Are we using multi-threaded-DLL or static runtime libraries?
+ #ifdef _DLL
+ // Link with DLL runtime version (/MD)
+ #ifdef _DEBUG
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MDd.lib") // Debug 64bit
+ #pragma message("Automatically linking with DTAPI64MDd.lib")
+ #else
+ #pragma comment(lib, "DTAPIMDd.lib") // Debug 32bit
+ #pragma message("Automatically linking with DTAPIMDd.lib") 
+ #endif
+ #else
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MD.lib") // Release 64bit
+ #pragma message("Automatically linking with DTAPI64MD.lib")
+ #else
+ #pragma comment(lib, "DTAPIMD.lib") // Release 32bit
+ #pragma message("Automatically linking with DTAPIMD.lib") 
+ #endif
+ #endif
+ #else
+ // Link to static runtime version (/MT)
+ #ifdef _DEBUG
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MTd.lib") // Debug 64bit
+ #pragma message("Automatically linking with DTAPI64MTd.lib")
+ #else
+ #pragma comment(lib, "DTAPIMTd.lib") // Debug 32bit
+ #pragma message("Automatically linking with DTAPIMTd.lib") 
+ #endif
+ #else
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MT.lib") // Release 64bit
+ #pragma message("Automatically linking with DTAPI64MT.lib")
+ #else
+ #pragma comment(lib, "DTAPIMT.lib") // Release 32bit
+ #pragma message("Automatically linking with DTAPIMT.lib") 
+ #endif
+ #endif
+ #endif
+#endif
+#endif // #ifdef _WIN32
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Includes -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+#ifndef _WIN32
+ // Linux specific includes: For NULL type definition
+ #include </usr/include/linux/stddef.h>
+ // For intptr_t
+ #include <stdint.h>
+#endif
+
+// STL includes
+#include <list>
+#include <map>
+#include <string>
+#include <vector>
+#include <limits>
+
+// When creating a DLL under Windows, disable warnings related to exporting STL
+// instantiations in classes.
+// See also: http://support.microsoft.com/kb/q168958/
+#ifdef _MSC_VER
+ #pragma warning(disable: 4251)
+#endif
+
+// Macro used to mark functions as deprecated. Using deprecated functions will generate
+// a compiler warning, pushing API users to stop using these functions.
+#ifdef __GNUC__
+#define DTAPI_DEPRECATED(func, msg) func __attribute__ ((deprecated))
+#elif defined(_MSC_VER)
+#define DTAPI_DEPRECATED(func, msg) __declspec(deprecated(msg)) func
+#else
+#define DTAPI_DEPRECATED(func, msg) func
+#endif
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Support Types -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+#ifdef _WIN32
+ typedef unsigned __int64 __uint64;
+#else
+ typedef signed long long __int64;
+ typedef unsigned long long __uint64;
+#endif
+
+// All DTAPI code lives in namespace Dtapi
+namespace Dtapi
+{
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Forward declarations -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+class AdvDemod;
+class DtaPlusDevice;
+class DtDemodPars;
+class DtDvbT2Pars;
+class DteDevice;
+class DtSdiUtility;
+class FrameBufImpl;
+class IDevice;
+class IDtDemodEvent;
+class InpChannel;
+class IXpMutex;
+class MplpHelper;
+class OutpChannel;
+class SdiMatrixImpl;
+
+struct DtDabEnsembleInfo;
+struct DtDabEtiStreamSelPars;
+struct DtDabStreamSelPars;
+struct DtDabTransmitterIdInfo;
+struct DtDemodParsAtsc;
+struct DtDemodParsDab;
+struct DtDemodParsDvbC2;
+struct DtDemodParsDvbS;
+struct DtDemodParsDvbS2;
+struct DtDemodParsDvbT;
+struct DtDemodParsDvbT2;
+struct DtDemodParsIq;
+struct DtDemodParsIq2131;
+struct DtDemodParsIsdbt;
+struct DtDemodParsQam;
+struct DtDemodLdpcStats;
+struct DtDemodMaLayerData;
+struct DtDemodMaLayerStats;
+struct DtDemodPlpBlocks;
+struct DtDvbC2DemodL1Part2Data;
+struct DtDvbC2DemodL1PlpSigData;
+struct DtDvbC2ModStatus;
+struct DtDvbC2Pars;
+struct DtDvbC2PlpPars;
+struct DtDvbC2StreamSelPars;
+struct DtDvbC2XFecFrameHeader;
+struct DtDvbCidPars;
+struct DtDvbS2ModStatus;
+struct DtDvbS2ModCod;
+struct DtDvbS2Pars;
+struct DtDemodParsDvbS2Adv;
+struct DtDvbTStreamSelPars;
+struct DtDvbTTpsInfo;
+struct DtDvbT2DemodL1Data;
+struct DtDvbT2ModStatus;
+struct DtDvbT2StreamSelPars;
+struct DtFractionInt;
+struct DtIsdbtStreamSelPars;
+struct DtIsdbTmmPars;
+struct DtPar;
+struct DtPlpInpPars;
+struct DtStatistic;
+struct DtT2MiStreamSelPars;
+struct DtVirtualOutData;
+struct DtRsDecStats;
+struct DtVitDecStats;
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+ DTAPI HELPER CLASSES AND HELPER TYPES +=+=+=+=+=+=+=+=+=+=+=+=+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DTAPI_RESULT -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+// Type returned by most API calls
+typedef unsigned int DTAPI_RESULT;
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtExc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Exception object thrown from API calls (if API call throws an exception)
+//
+class DtExc
+{
+public:
+ const DTAPI_RESULT m_Error; // DTAPI result code (i.e. reason of exception)
+ 
+public:
+ DtExc(DTAPI_RESULT e) : m_Error(e) {}
+ virtual ~DtExc() {}
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBufferInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+struct DtBufferInfo
+{
+ int m_VidStd; // Video standard 
+ int m_NumColumns; // Number of columns 
+ __int64 m_NumReceived; // Number of frames received
+ __int64 m_NumDropped; // Number of frames dropped
+ __int64 m_NumTransmitted; // Number of frames transmitted
+ __int64 m_NumDuplicated; // Number of frames duplicated
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCaps - Capabilities -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Scalable type for storing (combinations of) capability flags.
+// It can be used with bitwise operators for testing and setting of capabilities.
+//
+class DtCaps 
+{
+ // Number of 64-bit integers used to represent a capability
+ static const int DTCAPS_SIZE = 3;
+
+public:
+ DtCaps();
+ DtCaps(int BitNr);
+ DtCaps(__int64 F1, __int64 F2, __int64 F3);
+
+public:
+ int GetCapIndex() const;
+ std::string ToString() const;
+ DtCaps operator & (const DtCaps& Caps) const;
+ DtCaps& operator &= (const DtCaps& Caps);
+ DtCaps operator | (const DtCaps& Caps) const;
+ DtCaps& operator |= (const DtCaps& Caps);
+ bool operator == (const DtCaps& Caps) const;
+ bool operator == (const int Zero) const;
+ bool operator != (const DtCaps& Caps) const;
+ bool operator != (const int Zero) const;
+ __int64 operator [] (const int n) const;
+ DtCaps operator ~ () const;
+ // Implementation data
+private:
+ __int64 m_Flags[DTCAPS_SIZE];
+};
+
+// Capabilities
+#define DTAPI_CAP_EMPTY Dtapi::DtCaps() // DtCaps without any capability flags
+
+// Capability group APPS - Applications
+#define DTAPI_CAP_C2X Dtapi::DtCaps(0) // C2Xpert
+#define DTAPI_CAP_DP Dtapi::DtCaps(1) // DtGrabber+ and DtTV
+#define DTAPI_CAP_DTTV Dtapi::DtCaps(2) // DtTV
+#define DTAPI_CAP_E Dtapi::DtCaps(3) // DtEncode
+#define DTAPI_CAP_J Dtapi::DtCaps(4) // DtJitter
+#define DTAPI_CAP_MR Dtapi::DtCaps(5) // MuxXpert runtime
+#define DTAPI_CAP_MS Dtapi::DtCaps(6) // MuxXpert SDK
+#define DTAPI_CAP_MX Dtapi::DtCaps(7) // MuxXpert
+#define DTAPI_CAP_RC Dtapi::DtCaps(8) // StreamXpress remote control
+#define DTAPI_CAP_RX Dtapi::DtCaps(9) // RFXpert
+#define DTAPI_CAP_SP Dtapi::DtCaps(10) // StreamXpress stream player
+#define DTAPI_CAP_SPNIC Dtapi::DtCaps(11) // StreamXpress through local NIC
+#define DTAPI_CAP_SX Dtapi::DtCaps(12) // StreamXpert analyzer
+#define DTAPI_CAP_SXDGL Dtapi::DtCaps(13) // StreamXpert analyzer (dongled)
+#define DTAPI_CAP_SY Dtapi::DtCaps(14) // SdEye
+#define DTAPI_CAP_XP Dtapi::DtCaps(15) // Xpect
+#define DTAPI_CAP_T2X Dtapi::DtCaps(16) // T2Xpert
+
+// Capability group BOOLIO - Boolean I/O capabilities
+#define DTAPI_CAP_BW Dtapi::DtCaps(17) // Isochronous bandwidth allocated
+#define DTAPI_CAP_FAILSAFE Dtapi::DtCaps(18) // A fail-over relay is available
+#define DTAPI_CAP_FRACMODE Dtapi::DtCaps(19) // Fractional mode is supported
+#define DTAPI_CAP_GENLOCKED Dtapi::DtCaps(20) // Locked to a genlock reference
+#define DTAPI_CAP_GENREF Dtapi::DtCaps(21) // Genlock reference input
+#define DTAPI_CAP_SWS2APSK Dtapi::DtCaps(22) // DVB-S2 APSK mode
+
+// Capability group DEMODPROPS - Demodulation properties
+#define DTAPI_CAP_ANTPWR Dtapi::DtCaps(23) // Antenna power
+#define DTAPI_CAP_LNB Dtapi::DtCaps(24) // LNB
+#define DTAPI_CAP_RX_ADV Dtapi::DtCaps(25) // Advanced demodulation
+
+// Capability group FREQBAND - Frequency band
+#define DTAPI_CAP_LBAND Dtapi::DtCaps(26) // L-band 950-2150MHz
+#define DTAPI_CAP_VHF Dtapi::DtCaps(27) // VHF-band 47-470MHz
+#define DTAPI_CAP_UHF Dtapi::DtCaps(28) // UHF-band 400-862MHz
+
+// Capability group IODIR - I/O direction
+#define DTAPI_CAP_DISABLED Dtapi::DtCaps(29) // Port is disabled
+#define DTAPI_CAP_INPUT Dtapi::DtCaps(30) // Uni-directional input
+#define DTAPI_CAP_OUTPUT Dtapi::DtCaps(31) // Uni-directional output
+
+// Subcapabilities of IODIR, DTAPI_CAP_INPUT
+#define DTAPI_CAP_SHAREDANT Dtapi::DtCaps(32) // Get antenna signal from another port
+
+// Subcapabilities of IODIR, DTAPI_CAP_OUTPUT
+#define DTAPI_CAP_DBLBUF Dtapi::DtCaps(33) // Double buffered output
+#define DTAPI_CAP_LOOPS2L3 Dtapi::DtCaps(34) // Loop-through of DVB-S2 in L3-frames
+#define DTAPI_CAP_LOOPS2TS Dtapi::DtCaps(35) // Loop-through of an DVB-S(2) input
+#define DTAPI_CAP_LOOPTHR Dtapi::DtCaps(36) // Loop-through of another input
+
+// Capability group IOPROPS - Miscellaneous I/O properties
+#define DTAPI_CAP_ASIPOL Dtapi::DtCaps(37) // ASI output signal can be inverted
+#define DTAPI_CAP_HUFFMAN Dtapi::DtCaps(38) // Huffman coding for SDI
+#define DTAPI_CAP_IPPAIR Dtapi::DtCaps(39) // Network port supports failover
+#define DTAPI_CAP_L3MODE Dtapi::DtCaps(40) // L3-frame mode
+#define DTAPI_CAP_MATRIX Dtapi::DtCaps(41) // Matrix API support
+#define DTAPI_CAP_MATRIX2 Dtapi::DtCaps(42) // High-level Matrix API support
+#define DTAPI_CAP_RAWASI Dtapi::DtCaps(43) // Raw ASI
+#define DTAPI_CAP_SDI10BNBO Dtapi::DtCaps(44) // 10-bit network byte order
+#define DTAPI_CAP_SDITIME Dtapi::DtCaps(45) // SDI timestamping
+#define DTAPI_CAP_TIMESTAMP64 Dtapi::DtCaps(46) // 64-bit timestamping
+#define DTAPI_CAP_TRPMODE Dtapi::DtCaps(47) // Transparent mode
+#define DTAPI_CAP_TS Dtapi::DtCaps(48) // MPEG-2 transport stream
+#define DTAPI_CAP_TXONTIME Dtapi::DtCaps(49) // Transmit on timestamp
+#define DTAPI_CAP_VIRTUAL Dtapi::DtCaps(50) // Virtual port, no physical connection
+
+// Capability group IOSTD - I/O standard
+#define DTAPI_CAP_3GSDI Dtapi::DtCaps(51) // 3G-SDI
+#define DTAPI_CAP_ASI Dtapi::DtCaps(52) // DVB-ASI transport stream
+#define DTAPI_CAP_DEMOD Dtapi::DtCaps(53) // Demodulation
+#define DTAPI_CAP_GPSTIME Dtapi::DtCaps(54) // Supports GPS-time
+#define DTAPI_CAP_HDSDI Dtapi::DtCaps(55) // HD-SDI
+#define DTAPI_CAP_IFADC Dtapi::DtCaps(56) // IF A/D converter
+#define DTAPI_CAP_IP Dtapi::DtCaps(57) // Transport stream over IP
+#define DTAPI_CAP_MOD Dtapi::DtCaps(58) // Modulator output
+#define DTAPI_CAP_PHASENOISE Dtapi::DtCaps(59) // Phase noise injector
+#define DTAPI_CAP_RS422 Dtapi::DtCaps(60) // RS422 port
+#define DTAPI_CAP_SDI Dtapi::DtCaps(61) // SD-SDI
+#define DTAPI_CAP_SPI Dtapi::DtCaps(62) // DVB-SPI transport stream
+#define DTAPI_CAP_SPISDI Dtapi::DtCaps(63) // SD-SDI on a parallel port
+
+// Subcapabilities of IOSTD, DTAPI_CAP_3GSDI
+#define DTAPI_CAP_1080P50 Dtapi::DtCaps(64) // 1080p/50 lvl A
+#define DTAPI_CAP_1080P50B Dtapi::DtCaps(65) // 1080p/50 lvl B
+#define DTAPI_CAP_1080P59_94 Dtapi::DtCaps(66) // 1080p/59.94 lvl A
+#define DTAPI_CAP_1080P59_94B Dtapi::DtCaps(67) // 1080p/59.94 lvl B
+#define DTAPI_CAP_1080P60 Dtapi::DtCaps(68) // 1080p/60 lvl A
+#define DTAPI_CAP_1080P60B Dtapi::DtCaps(69) // 1080p/60 lvl B
+
+// Subcapabilities of IOSTD, DTAPI_CAP_HDSDI
+#define DTAPI_CAP_1080I50 Dtapi::DtCaps(70) // 1080i/50
+#define DTAPI_CAP_1080I59_94 Dtapi::DtCaps(71) // 1080i/59.94
+#define DTAPI_CAP_1080I60 Dtapi::DtCaps(72) // 1080i/60
+#define DTAPI_CAP_1080P23_98 Dtapi::DtCaps(73) // 1080p/23.98
+#define DTAPI_CAP_1080P24 Dtapi::DtCaps(74) // 1080p/24
+#define DTAPI_CAP_1080P25 Dtapi::DtCaps(75) // 1080p/25
+#define DTAPI_CAP_1080P29_97 Dtapi::DtCaps(76) // 1080p/29.97
+#define DTAPI_CAP_1080P30 Dtapi::DtCaps(77) // 1080p/30
+#define DTAPI_CAP_1080PSF23_98 Dtapi::DtCaps(78) // 1080psf/23.98
+#define DTAPI_CAP_1080PSF24 Dtapi::DtCaps(79) // 1080psf/24
+#define DTAPI_CAP_1080PSF25 Dtapi::DtCaps(80) // 1080psf/25
+#define DTAPI_CAP_1080PSF29_97 Dtapi::DtCaps(81) // 1080psf/29.97
+#define DTAPI_CAP_1080PSF30 Dtapi::DtCaps(82) // 1080psf/30
+#define DTAPI_CAP_720P23_98 Dtapi::DtCaps(83) // 720p/23.98
+#define DTAPI_CAP_720P24 Dtapi::DtCaps(84) // 720p/24
+#define DTAPI_CAP_720P25 Dtapi::DtCaps(85) // 720p/25
+#define DTAPI_CAP_720P29_97 Dtapi::DtCaps(86) // 720p/29.97
+#define DTAPI_CAP_720P30 Dtapi::DtCaps(87) // 720p/30
+#define DTAPI_CAP_720P50 Dtapi::DtCaps(88) // 720p/50
+#define DTAPI_CAP_720P59_94 Dtapi::DtCaps(89) // 720p/59.94
+#define DTAPI_CAP_720P60 Dtapi::DtCaps(90) // 720p/60
+
+// Subcapabilities of IOSTD, DTAPI_CAP_SDI
+#define DTAPI_CAP_525I59_94 Dtapi::DtCaps(91) // 525i/59.94
+#define DTAPI_CAP_625I50 Dtapi::DtCaps(92) // 625i/50
+
+// Subcapabilities of IOSTD, DTAPI_CAP_SPISDI
+#define DTAPI_CAP_SPI525I59_94 Dtapi::DtCaps(93) // SPI 525i/59.94
+#define DTAPI_CAP_SPI625I50 Dtapi::DtCaps(94) // SPI 625i/50
+
+// Capability group MODSTD - Modulation standards
+#define DTAPI_CAP_TX_ATSC Dtapi::DtCaps(95) // ATSC 8-VSB modulation
+#define DTAPI_CAP_TX_CMMB Dtapi::DtCaps(96) // CMMB modulation
+#define DTAPI_CAP_TX_DAB Dtapi::DtCaps(97) // DAB modulation
+#define DTAPI_CAP_TX_DTMB Dtapi::DtCaps(98) // DTMB modulation
+#define DTAPI_CAP_TX_DVBC2 Dtapi::DtCaps(99) // DVB-C2 modulation
+#define DTAPI_CAP_TX_DVBS Dtapi::DtCaps(100) // DVB-S modulation
+#define DTAPI_CAP_TX_DVBS2 Dtapi::DtCaps(101) // DVB-S2 modulation
+#define DTAPI_CAP_TX_DVBS2X Dtapi::DtCaps(102) // DVB-S2X modulation
+#define DTAPI_CAP_TX_DVBT Dtapi::DtCaps(103) // DVB-T modulation
+#define DTAPI_CAP_TX_DVBT2 Dtapi::DtCaps(104) // DVB-T2 modulation
+#define DTAPI_CAP_TX_GOLD Dtapi::DtCaps(105) // GOLD for modulators
+#define DTAPI_CAP_TX_IQ Dtapi::DtCaps(106) // I/Q sample modulation
+#define DTAPI_CAP_TX_ISDBS Dtapi::DtCaps(107) // ISDB-S modulation
+#define DTAPI_CAP_TX_ISDBT Dtapi::DtCaps(108) // ISDB-T modulation
+#define DTAPI_CAP_TX_ISDBTMM Dtapi::DtCaps(109) // ISDB-Tmm modulation
+#define DTAPI_CAP_TX_MH Dtapi::DtCaps(110) // ATSC-MH modulation
+#define DTAPI_CAP_TX_QAMA Dtapi::DtCaps(111) // QAM-A modulation
+#define DTAPI_CAP_TX_QAMB Dtapi::DtCaps(112) // QAM-B modulation
+#define DTAPI_CAP_TX_QAMC Dtapi::DtCaps(113) // QAM-C modulation
+#define DTAPI_CAP_TX_SWMC Dtapi::DtCaps(114) // SW multi-channel modulation
+#define DTAPI_CAP_TX_T2MI Dtapi::DtCaps(115) // T2MI transmission
+#define DTAPI_CAP_TX_T2SPLP Dtapi::DtCaps(116) // DVB-T2 single PLP modulation
+
+// Capability group MODPROPS - Modulation properties
+#define DTAPI_CAP_ADJLVL Dtapi::DtCaps(117) // Adjustable output level
+#define DTAPI_CAP_CM Dtapi::DtCaps(118) // Channel simulation
+#define DTAPI_CAP_CW Dtapi::DtCaps(119) // Continuous wave
+#define DTAPI_CAP_DIGIQ Dtapi::DtCaps(120) // Digital I/Q sample output
+#define DTAPI_CAP_DVBCID Dtapi::DtCaps(121) // DVB carrier ID 
+#define DTAPI_CAP_IF Dtapi::DtCaps(122) // IF output
+#define DTAPI_CAP_MUTE Dtapi::DtCaps(123) // Mute RF output signal
+#define DTAPI_CAP_ROLLOFF Dtapi::DtCaps(124) // Adjustable roll-off factor
+#define DTAPI_CAP_S2APSK Dtapi::DtCaps(125) // DVB-S2 16-APSK/32-APSK
+#define DTAPI_CAP_SNR Dtapi::DtCaps(126) // AWGN insertion
+#define DTAPI_CAP_TX_16MHZ Dtapi::DtCaps(127) // 16MHz bandwidth mode
+#define DTAPI_CAP_TX_SFN Dtapi::DtCaps(128) // SNF operation
+
+// Capability group RFCLKSEL - RF clock source selection
+#define DTAPI_CAP_RFCLKEXT Dtapi::DtCaps(129) // External RF clock input
+#define DTAPI_CAP_RFCLKINT Dtapi::DtCaps(130) // Internal RF clock reference
+
+// Capability group RXSTD - Receiver standards
+#define DTAPI_CAP_RX_ATSC Dtapi::DtCaps(131) // ATSC 8-VSB reception
+#define DTAPI_CAP_RX_CMMB Dtapi::DtCaps(132) // CMMB reception
+#define DTAPI_CAP_RX_DAB Dtapi::DtCaps(133) // DAB reception
+#define DTAPI_CAP_RX_DTMB Dtapi::DtCaps(134) // DTMB reception
+#define DTAPI_CAP_RX_DVBC2 Dtapi::DtCaps(135) // DVB-C2 reception
+#define DTAPI_CAP_RX_DVBS Dtapi::DtCaps(136) // DVB-S reception
+#define DTAPI_CAP_RX_DVBS2 Dtapi::DtCaps(137) // DVB-S2 reception
+#define DTAPI_CAP_RX_DVBT Dtapi::DtCaps(138) // DVB-T reception
+#define DTAPI_CAP_RX_DVBT2 Dtapi::DtCaps(139) // DVB-T2 reception
+#define DTAPI_CAP_RX_GOLD Dtapi::DtCaps(140) // GOLD for receivers
+#define DTAPI_CAP_RX_IQ Dtapi::DtCaps(141) // I/Q sample reception
+#define DTAPI_CAP_RX_ISDBS Dtapi::DtCaps(142) // ISDB-S reception
+#define DTAPI_CAP_RX_ISDBT Dtapi::DtCaps(143) // ISDB-T reception
+#define DTAPI_CAP_RX_MH Dtapi::DtCaps(144) // ATSC-MH reception
+#define DTAPI_CAP_RX_QAMA Dtapi::DtCaps(145) // QAM-A reception
+#define DTAPI_CAP_RX_QAMB Dtapi::DtCaps(146) // QAM-B reception
+#define DTAPI_CAP_RX_QAMC Dtapi::DtCaps(147) // QAM-C reception
+#define DTAPI_CAP_RX_T2MI Dtapi::DtCaps(148) // T2MI reception
+
+// Capability group SPICLKSEL - Parallel port clock source selection
+#define DTAPI_CAP_SPICLKEXT Dtapi::DtCaps(149) // External clock input
+#define DTAPI_CAP_SPICLKINT Dtapi::DtCaps(150) // Internal clock reference
+
+// Capability group SPIMODE - Parallel port mode
+#define DTAPI_CAP_SPIFIXEDCLK Dtapi::DtCaps(151) // SPI fixed clock with valid signal
+#define DTAPI_CAP_SPIDVBMODE Dtapi::DtCaps(152) // SPI DVB mode
+#define DTAPI_CAP_SPISER8B Dtapi::DtCaps(153) // SPI serial 8-bit mode
+#define DTAPI_CAP_SPISER10B Dtapi::DtCaps(154) // SPI serial 10-bit mode
+
+// Capability group SPISTD - Parallel port I/O standard
+#define DTAPI_CAP_SPILVDS1 Dtapi::DtCaps(155) // LVDS1
+#define DTAPI_CAP_SPILVDS2 Dtapi::DtCaps(156) // LVDS2
+#define DTAPI_CAP_SPILVTTL Dtapi::DtCaps(157) // LVTTL
+
+// Capability group TSRATESEL - Transport-stream rate selection
+#define DTAPI_CAP_EXTTSRATE Dtapi::DtCaps(158) // External TS rate clock input
+#define DTAPI_CAP_EXTRATIO Dtapi::DtCaps(159) // External TS rate clock with ratio
+#define DTAPI_CAP_INTTSRATE Dtapi::DtCaps(160) // Internal TS rate clock reference
+#define DTAPI_CAP_LOCK2INP Dtapi::DtCaps(161) // Lock TS rate to input port
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmmbPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// CMMB Modulation Parameters
+//
+struct DtCmmbPars
+{
+ int m_Bandwidth; // CMMB Bandwitdh
+ int m_TsRate; // CMMB TS rate in bps
+ int m_TsPid; // PID on which the CMMB stream is found
+ int m_AreaId; // Area ID (0..127)
+ int m_TxId; // Transmitter ID (128..255)
+ 
+public:
+ DtCmmbPars();
+ DTAPI_RESULT RetrieveTsRateFromTs(char* pBuffer, int NumBytes);
+ bool operator == (DtCmmbPars& Rhs);
+ bool operator != (DtCmmbPars& Rhs);
+};
+
+// DtOutpChannel::SetModControl - Bandwidth
+#define DTAPI_CMMB_BW_2MHZ 0x00000000
+#define DTAPI_CMMB_BW_8MHZ 0x00000001
+
+//-.-.-.-.-.-.-.-.-.-.-.- DtCmPars - Channel Modelling Parameters -.-.-.-.-.-.-.-.-.-.-.-.
+
+// Maximum number of fading paths
+#define DTAPI_CM_MAX_PATHS 32
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmPath -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure describes the fading parameters for a single path in a
+// multi-path simulation.
+//
+struct DtCmPath
+{
+ enum Type
+ {
+ CONSTANT_DELAY, // Constant delay/phase
+ CONSTANT_DOPPLER, // Constant frequency shift
+ RAYLEIGH_JAKES, // Rayleigh fading with Jakes power spectral density
+ // (mobile path model)
+ RAYLEIGH_GAUSSIAN // Rayleigh fading with Gaussian power spectral
+ // density (ionospheric path model)
+ };
+ Type m_Type; // Type of path fading
+ double m_Attenuation; // Attenuation in dB
+ double m_Delay; // Delay in us
+ double m_Phase; // Phase shift in degrees for CONSTANT_DELAY paths
+ double m_Doppler; // Doppler frequency in Hz
+
+ // Constructor - Gives parameters a default value
+ DtCmPath() :
+ m_Type(CONSTANT_DELAY),
+ m_Attenuation(0.0), m_Delay(0.0), m_Phase(0.0), m_Doppler(0.0)
+ {}
+ // Operators
+ bool operator == (DtCmPath& Rhs);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure describes channel-modeling parameters. It\92s used to simulate the 
+// transmission distortions that may occur in the channel between a transmitter and
+// a receiver.
+//
+struct DtCmPars
+{
+ bool m_EnableAwgn; // Enable white Gaussian noise (AWGN) injection
+ double m_Snr; // Signal-to-noise ratio in dB
+ bool m_EnablePaths; // Enable multi-path simulation
+ std::vector<DtCmPath> m_Paths; // Parameters per path
+
+ // Constructor and operators
+ DtCmPars();
+ bool operator == (DtCmPars&);
+ bool operator != (DtCmPars& Rhs) { return !(*this == Rhs); }
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPoint -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure describes a constellation point in a receiver constellation diagram
+//
+struct DtConstelPoint
+{
+ int m_X, m_Y; // X and Y coordinates
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- IDtDemodEvent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Callback event interface for demodulators
+//
+class IDtDemodEvent
+{
+public:
+ virtual void TuningFreqHasChanged(__int64 OldFreqHz, __int64 NewFreqHz) {}
+ virtual void TuningParsHaveChanged(
+ __int64 OldFreqHz, int OldModType, int OldParXtra[3],
+ __int64 NewFreqHz, int NewModType, int NewParXtra[3]) {}
+};
+
+
+// Maximum number of IpV6 addresses per interface
+#define MAX_IPV6_ADDR 3
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDeviceDesc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure describes a DekTec device
+//
+struct DtDeviceDesc
+{
+ int m_Category; // Device category (DTAPI_CAT_XXX)
+ __int64 m_Serial; // Unique serial number of the device
+ int m_PciBusNumber; // PCI-bus number
+ int m_SlotNumber; // PCI-slot number
+ int m_UsbAddress; // USB address
+ int m_TypeNumber; // Device type number
+ int m_SubType; // Device subtype (0=none, 1=A, ...)
+ int m_DeviceId; // Device ID
+ int m_VendorId; // Vendor ID
+ int m_SubsystemId; // Subsystem ID
+ int m_SubVendorId; // Subsystem Vendor ID
+ int m_NumHwFuncs; // Number of hardware funtions hosted by device
+ int m_HardwareRevision; // Hardware revision (e.g. 302 = 3.2)
+ int m_FirmwareVersion; // Firmware version
+ int m_FirmwareVariant; // Firmware variant
+ int m_NumDtInpChan; // Number of input channels (max)
+ int m_NumDtOutpChan; // Number of output channels (max)
+ int m_NumPorts; // Number of physical ports
+ unsigned char m_Ip[4]; // IP address (only valid for DTE-31xx devices)
+ unsigned char m_IpV6[MAX_IPV6_ADDR][16];
+ // IP address (only valid for DTE-31xx devices)
+ unsigned char m_MacAddr[6]; // MAC address (only valid for DTE-31xx devices)
+ int m_PcieNumLanes; // Number of allocated PCIe lanes
+ int m_PcieMaxLanes; // Maximum number of PCIe lanes
+ int m_PcieLinkSpeed; // Current PCIe link speed (GEN1, 2 or 3)
+ int m_PcieMaxSpeed; // Maximum PCIe link speed (GEN1, 2 or 3)
+};
+
+// Device categories
+#define DTAPI_CAT_PCI 0 // PCI or PCI-Express device
+#define DTAPI_CAT_USB 1 // USB-2 or USB-3 device
+#define DTAPI_CAT_NW 2 // Network device
+#define DTAPI_CAT_IP 3 // Network appliance: DTE-31xx
+#define DTAPI_CAT_NIC 4 // Non-DekTec network card
+#define DTAPI_CAT_NWAP 5 // Network Advanced Protocol(VLAN device)
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDtaPlusDeviceDesc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure describes a DekTec DTA-plus device
+//
+struct DtDtaPlusDeviceDesc
+{
+ __int64 m_Serial; // Unique serial number of the device
+ std::string m_DevicePath; // Path of file to open to interface with the device
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbCidPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for specifying the DVB channel identification for satellite (DVB-S2)
+// ETSI TS 103 129
+//
+struct DtDvbCidPars
+{
+ bool m_Enable; // Enable DVB-CID signalling
+ unsigned int m_GuidHigh; // DVB-CID Global Unique Identifier MSBs
+ unsigned int m_GuidLow; // DVB-CID Global Unique Identifier LSBs
+ 
+ // CID content. Key: Content ID (0...31); Value: Content information (24-bit)
+ // Content ID 0 (carrier ID format) shall have the value 0x0001
+ std::map<int, int> m_Content;
+
+ DTAPI_RESULT CheckValidity();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEventArgs -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Details for a specific event
+//
+struct DtEventArgs
+{
+ DtEventArgs() : m_Value1(0), m_Value2(0), m_pContext(0) {};
+
+ int m_HwCat; // Hardware category: DTAPI_CAT_XXX
+ __int64 m_Serial; // Serial number of device causing event
+ int m_Value1; // Event value #1
+ int m_Value2; // Event value #2
+ void* m_pContext; // Context-specific pointer
+};
+
+// Event call back function
+typedef void (*pDtEventCallback)(int Event, const DtEventArgs* pArgs);
+
+// Global events
+#define DT_EVENT_TYPE_ADD 0x00000001
+#define DT_EVENT_TYPE_REMOVE 0x00000002
+// Device events
+#define DT_EVENT_TYPE_POWER 0x00000004
+#define DT_EVENT_TYPE_GENLOCK 0x00000008
+#define DT_EVENT_TYPE_TEST 0x80000000
+// Network events
+#define DT_EVENT_IP_CHANGED 0x01000000
+#define DT_EVENT_ADMINST_CHANGED 0x02000000
+
+#define DT_EVENT_TYPE_ALL 0xFFFFFFFF
+
+// Event values
+#define DT_EVENT_VALUE1_POWER_UP 1
+#define DT_EVENT_VALUE1_POWER_DOWN 2
+#define DT_EVENT_VALUE1_NO_LOCK 1
+#define DT_EVENT_VALUE1_LOCKED 2
+#define DT_EVENT_VALUE2_XXX 1
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFiltCoeff -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// A single FIR filter coefficient
+//
+struct DtFiltCoeff
+{
+ int m_TapIdx; // Tap number
+ double m_Coeff; // FIR coefficient
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFilterPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Filter coefficients for use in a FIR filter
+//
+struct DtFilterPars
+{
+ std::vector<DtFiltCoeff> m_FiltCoeffs;
+};
+
+// Maximum number of filter coefficients
+#define DTAPI_MAX_NUM_COEFFS 64
+
+#define DTAPI_FRAME_STATUS_OK 0
+#define DTAPI_FRAME_STATUS_ERR_NO_SIGNAL 1
+#define DTAPI_FRAME_STATUS_ERR_STD_MISMATCH 2
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFractionInt -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// A rational number, expressed as the quotient of two integers
+//
+struct DtFractionInt
+{
+ int m_Num, m_Den;
+ DtFractionInt() { m_Num = 0; m_Den = 1; }
+ DtFractionInt(int Num, int Den) { m_Num = Num; m_Den = Den; }
+};
+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+struct DtFrameInfo
+{
+ int m_VidStd; // Video standard 
+ __int64 m_Timestamp; // 64-bit timestamp
+ __int64 m_FrameNumber; // 64-bit frame number
+ __int64 m_Rp188; // RP188 timestamp
+ int m_RxMode; // RX mode at the time this frame was received
+ int m_Status; // One of DTAPI_FRAME_STATUS_*
+};
+
+//-.-.-.-.-.-.-.-.-.-.- DtHwFuncDesc - Hardware Function Descriptor -.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure describing a hardware function
+//
+struct DtHwFuncDesc
+{
+ DtDeviceDesc m_DvcDesc; // Device descriptor
+ int m_ChanType; // Channel type (OR-able)
+ DtCaps m_Flags; // Capability flags (OR-able)
+ int m_IndexOnDvc; // Relative index of hardware function
+ int m_Port; // Physical port number
+ unsigned char m_Ip[4]; // IP V4 address (TS-over-IP functions only)
+ unsigned char m_IpV6[MAX_IPV6_ADDR][16];
+ // IP V6 address (TS-over-IP functions only)
+ unsigned char m_MacAddr[6]; // MAC address (TS-over-IP functions only)
+};
+
+// Hardware Function - Channel types
+// For IP hardware functions, both DTAPI_CHAN_INPUT and DTAPI_CHAN_OUTPUT are set
+#define DTAPI_CHAN_DISABLED 0 // Channel is disabled
+#define DTAPI_CHAN_INPUT 1 // Input channel
+#define DTAPI_CHAN_OUTPUT 2 // Output channel
+#define DTAPI_CHAN_DBLBUF 4 // Double-buffered copy of an output
+#define DTAPI_CHAN_LOOPTHR 8 // Loop-through copy of another port
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIoConfig - I/O Configuration -.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Stores the I/O configuration parameters for one I/O port configuration
+//
+struct DtIoConfig
+{
+ int m_Port; // Port number
+ int m_Group; // Config group, linked to I/O capability groups
+ int m_Value; // Config value, linked to I/O capabilities
+ int m_SubValue; // Config sub value, linked to I/O sub capabilities
+ __int64 m_ParXtra[2]; // Extra parameters, e.g. source port number
+
+ // Constructor - Gives parameters a default value
+ DtIoConfig()
+ {
+ m_Port = -1;
+ m_Group = -1;
+ m_Value = m_SubValue = -1;
+ m_ParXtra[0] = m_ParXtra[1] = -1;
+ }
+ DtIoConfig(int Port, int Group)
+ {
+ m_Port = Port;
+ m_Group = Group;
+ m_Value = m_SubValue = -1;
+ m_ParXtra[0] = m_ParXtra[1] = -1;
+ }
+};
+
+// I/O configuration groups
+#define DTAPI_IOCONFIG_IODIR 0 // I/O direction
+#define DTAPI_IOCONFIG_IOSTD 1 // I/O standard
+#define DTAPI_IOCONFIG_RFCLKSEL 2 // RF clock source selection
+#define DTAPI_IOCONFIG_SPICLKSEL 3 // Parallel port clock source selection
+#define DTAPI_IOCONFIG_SPIMODE 4 // Parallel port mode
+#define DTAPI_IOCONFIG_SPISTD 5 // Parallel port I/O standard
+#define DTAPI_IOCONFIG_TSRATESEL 6 // Transport-stream rate selection
+
+// I/O configuration groups - Boolean I/O
+#define DTAPI_IOCONFIG_BW 7 // Isochronous bandwidth allocated
+#define DTAPI_IOCONFIG_FAILSAFE 8 // A fail-over relay is available
+#define DTAPI_IOCONFIG_FRACMODE 9 // Fractional mode is supported
+#define DTAPI_IOCONFIG_GENLOCKED 10 // Locked to a genlock reference
+#define DTAPI_IOCONFIG_GENREF 11 // Genlock reference input
+#define DTAPI_IOCONFIG_SWS2APSK 12 // DVB-S2 APSK mode
+
+// Values for boolean I/O configuration options
+#define DTAPI_IOCONFIG_TRUE 13 // Turn I/O capability on
+#define DTAPI_IOCONFIG_FALSE 14 // Turn I/O capability off
+
+// Values for group IO_CONFIG_IODIR (I/O direction)
+#define DTAPI_IOCONFIG_DISABLED 15 // Port is disabled
+#define DTAPI_IOCONFIG_INPUT 16 // Uni-directional input
+#define DTAPI_IOCONFIG_OUTPUT 17 // Uni-directional output
+
+// SubValues for group DTAPI_IOCONFIG_IODIR, value DTAPI_IOCONFIG_INPUT
+#define DTAPI_IOCONFIG_SHAREDANT 18 // Get antenna signal from another port
+
+// SubValues for group DTAPI_IOCONFIG_IODIR, value DTAPI_IOCONFIG_OUTPUT
+#define DTAPI_IOCONFIG_DBLBUF 19 // Double buffered output
+#define DTAPI_IOCONFIG_LOOPS2L3 20 // Loop-through of DVB-S2 in L3-frames
+#define DTAPI_IOCONFIG_LOOPS2TS 21 // Loop-through of an DVB-S(2) input
+#define DTAPI_IOCONFIG_LOOPTHR 22 // Loop-through of another input
+
+// Values for group IO_CONFIG_IOSTD (I/O standard)
+#define DTAPI_IOCONFIG_3GSDI 23 // 3G-SDI
+#define DTAPI_IOCONFIG_ASI 24 // DVB-ASI transport stream
+#define DTAPI_IOCONFIG_DEMOD 25 // Demodulation
+#define DTAPI_IOCONFIG_GPSTIME 26 // Supports GPS-time
+#define DTAPI_IOCONFIG_HDSDI 27 // HD-SDI
+#define DTAPI_IOCONFIG_IFADC 28 // IF A/D converter
+#define DTAPI_IOCONFIG_IP 29 // Transport stream over IP
+#define DTAPI_IOCONFIG_MOD 30 // Modulator output
+#define DTAPI_IOCONFIG_PHASENOISE 31 // Phase noise injector
+#define DTAPI_IOCONFIG_RS422 32 // RS422 port
+#define DTAPI_IOCONFIG_SDI 33 // SD-SDI
+#define DTAPI_IOCONFIG_SPI 34 // DVB-SPI transport stream
+#define DTAPI_IOCONFIG_SPISDI 35 // SD-SDI on a parallel port
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_3GSDI
+#define DTAPI_IOCONFIG_1080P50 36 // 1080p/50 lvl A
+#define DTAPI_IOCONFIG_1080P50B 37 // 1080p/50 lvl B
+#define DTAPI_IOCONFIG_1080P59_94 38 // 1080p/59.94 lvl A
+#define DTAPI_IOCONFIG_1080P59_94B 39 // 1080p/59.94 lvl B
+#define DTAPI_IOCONFIG_1080P60 40 // 1080p/60 lvl A
+#define DTAPI_IOCONFIG_1080P60B 41 // 1080p/60 lvl B
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_HDSDI
+#define DTAPI_IOCONFIG_1080I50 42 // 1080i/50
+#define DTAPI_IOCONFIG_1080I59_94 43 // 1080i/59.94
+#define DTAPI_IOCONFIG_1080I60 44 // 1080i/60
+#define DTAPI_IOCONFIG_1080P23_98 45 // 1080p/23.98
+#define DTAPI_IOCONFIG_1080P24 46 // 1080p/24
+#define DTAPI_IOCONFIG_1080P25 47 // 1080p/25
+#define DTAPI_IOCONFIG_1080P29_97 48 // 1080p/29.97
+#define DTAPI_IOCONFIG_1080P30 49 // 1080p/30
+#define DTAPI_IOCONFIG_1080PSF23_98 50 // 1080psf/23.98
+#define DTAPI_IOCONFIG_1080PSF24 51 // 1080psf/24
+#define DTAPI_IOCONFIG_1080PSF25 52 // 1080psf/25
+#define DTAPI_IOCONFIG_1080PSF29_97 53 // 1080psf/29.97
+#define DTAPI_IOCONFIG_1080PSF30 54 // 1080psf/30
+#define DTAPI_IOCONFIG_720P23_98 55 // 720p/23.98
+#define DTAPI_IOCONFIG_720P24 56 // 720p/24
+#define DTAPI_IOCONFIG_720P25 57 // 720p/25
+#define DTAPI_IOCONFIG_720P29_97 58 // 720p/29.97
+#define DTAPI_IOCONFIG_720P30 59 // 720p/30
+#define DTAPI_IOCONFIG_720P50 60 // 720p/50
+#define DTAPI_IOCONFIG_720P59_94 61 // 720p/59.94
+#define DTAPI_IOCONFIG_720P60 62 // 720p/60
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SDI
+#define DTAPI_IOCONFIG_525I59_94 63 // 525i/59.94
+#define DTAPI_IOCONFIG_625I50 64 // 625i/50
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SPISDI
+#define DTAPI_IOCONFIG_SPI525I59_94 65 // SPI 525i/59.94
+#define DTAPI_IOCONFIG_SPI625I50 66 // SPI 625i/50
+
+// Values for group IO_CONFIG_RFCLKSEL (RF clock source selection)
+#define DTAPI_IOCONFIG_RFCLKEXT 67 // External RF clock input
+#define DTAPI_IOCONFIG_RFCLKINT 68 // Internal RF clock reference
+
+// Values for group IO_CONFIG_SPICLKSEL (Parallel port clock source selection)
+#define DTAPI_IOCONFIG_SPICLKEXT 69 // External clock input
+#define DTAPI_IOCONFIG_SPICLKINT 70 // Internal clock reference
+
+// Values for group IO_CONFIG_SPIMODE (Parallel port mode)
+#define DTAPI_IOCONFIG_SPIFIXEDCLK 71 // SPI fixed clock with valid signal
+#define DTAPI_IOCONFIG_SPIDVBMODE 72 // SPI DVB mode
+#define DTAPI_IOCONFIG_SPISER8B 73 // SPI serial 8-bit mode
+#define DTAPI_IOCONFIG_SPISER10B 74 // SPI serial 10-bit mode
+
+// Values for group IO_CONFIG_SPISTD (Parallel port I/O standard)
+#define DTAPI_IOCONFIG_SPILVDS1 75 // LVDS1
+#define DTAPI_IOCONFIG_SPILVDS2 76 // LVDS2
+#define DTAPI_IOCONFIG_SPILVTTL 77 // LVTTL
+
+// Values for group IO_CONFIG_TSRATESEL (Transport-stream rate selection)
+#define DTAPI_IOCONFIG_EXTTSRATE 78 // External TS rate clock input
+#define DTAPI_IOCONFIG_EXTRATIO 79 // External TS rate clock with ratio
+#define DTAPI_IOCONFIG_INTTSRATE 80 // Internal TS rate clock reference
+#define DTAPI_IOCONFIG_LOCK2INP 81 // Lock TS rate to input port
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIqData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure representing an I/Q data sample
+//
+struct DtIqData
+{
+ int m_I, m_Q; // I/Q sample pair
+};
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIqDirectPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Direct-IQ Modulation Parameters
+//
+struct DtIqDirectPars
+{
+ DtFractionInt m_SampleRate; // Sample rate
+ int m_IqPacking; // IQ-Packing; None, Auto, 10- or 12-bit packing 
+ int m_ChanFilter; // Channel filter
+ int m_Interpolation; // Interpolation method
+
+ 
+public:
+ DTAPI_RESULT CheckValidity(void);
+};
+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbsLayerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DtIsdbsLayerPars
+//
+struct DtIsdbsLayerPars
+{
+ int m_NumSlots; // Number of slots
+ int m_ModCod; // Modulation method and Code rate
+};
+
+// Number of slots per ISDB-S frame
+#define DTAPI_ISDBS_SLOTS_PER_FRAME 48
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbsPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// ISDB-S parameters including per-layer parameters
+//
+struct DtIsdbsPars
+{
+ DtIsdbsPars() : m_DoMux(false), m_B15Mode(false) {}
+
+ bool m_DoMux; // Hierarchical multiplexing yes/no
+ 
+ // Parameters for when m_DoMux==false
+ bool m_B15Mode; // ARIB B.15 mode (true) or TMCC in sync bytes (false)
+
+ // Parameters for when m_DoMux==true
+ int m_Emergency; // Switch-on control for emergency broadcast
+ int m_RelTs2TsId[8]; // Relative TS to TS-ID mapping
+ // Slot to relative TS mapping
+ int m_Slot2RelTs[DTAPI_ISDBS_SLOTS_PER_FRAME];
+ // Modulation parameters per hierarchical layer
+ DtIsdbsLayerPars m_LayerPars[4];
+
+ DTAPI_RESULT CheckValidity(void);
+ void Init(void);
+ bool operator == (DtIsdbsPars& Rhs);
+ bool operator != (DtIsdbsPars& Rhs);
+};
+
+// ISDB-S modulation method and code rate
+#define DTAPI_ISDBS_MODCOD_BPSK_1_2 1
+#define DTAPI_ISDBS_MODCOD_QPSK_1_2 2
+#define DTAPI_ISDBS_MODCOD_QPSK_2_3 3
+#define DTAPI_ISDBS_MODCOD_QPSK_3_4 4
+#define DTAPI_ISDBS_MODCOD_QPSK_5_6 5
+#define DTAPI_ISDBS_MODCOD_QPSK_7_8 6
+#define DTAPI_ISDBS_MODCOD_8PSK_2_3 7
+#define DTAPI_ISDBS_MODCOD_NOT_ALLOC 15
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtLayerData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Parameters per hierarchical ISDB-T layer used for statistic: DTAPI_STAT_ISDBT_PARSDATA
+//
+struct DtIsdbtLayerData
+{
+ int m_NumSegments; // Number of segments
+ int m_Modulation; // Modulation type
+ int m_CodeRate; // Code rate
+ int m_TimeInterleave; // Time interleaving 0..4 (new spec limits the
+ // maximum value to 3 instead of 4).
+ // Time interleaving I = 0 if ti = 0 or
+ // I = (1 << (ti + 2 - mode)) if ti != 0
+ DtIsdbtLayerData();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtLayerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Parameters per hierarchical ISDB-T layer
+//
+struct DtIsdbtLayerPars
+{
+ int m_NumSegments; // Number of segments
+ int m_Modulation; // Modulation type
+ int m_CodeRate; // Code rate
+ int m_TimeInterleave; // Time interleaving
+ // Derived:
+ int m_BitRate; // Bits per second assuming 6 MHz channel
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtParamsData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// ISDB-T parameters including per-layer parameters used for statistic: 
+// DTAPI_STAT_ISDBT_PARSDATA
+//
+struct DtIsdbtParamsData
+{
+ int m_BType; // Broadcast type
+ int m_Mode; // Transmission mode: 1, 2 or 3 
+ int m_Guard; // Guard interval
+ int m_PartialRx; // Use first layer for partial reception.
+ // Ignored for radio broadcasts 
+ // Layer-A/B/C parameters
+ DtIsdbtLayerData m_LayerPars[3];
+
+ DtIsdbtParamsData();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// ISDB-T parameters including per-layer parameters
+//
+struct DtIsdbtPars
+{
+ bool m_DoMux; // Hierarchical multiplexing yes/no
+ bool m_FilledOut; // Members have been given a value
+ int m_ParXtra0; // #Segments, bandwidth, sample rate, sub channel
+ int m_BType; // Broadcast type
+ int m_Mode; // Transmission mode
+ int m_Guard; // Guard interval
+ int m_PartialRx; // Partal reception
+ int m_Emergency; // Switch-on control for emergency broadcast
+ int m_IipPid; // PID used for multiplexing IIP packet
+ int m_LayerOther; // Other PIDs are mapped to this layer
+ int m_Virtual13Segm; // Virtual 13-segment mode
+ 
+ // Layer-A/B/C parameters
+ DtIsdbtLayerPars m_LayerPars[3];
+
+ // PID-to-layer mapping
+ std::map<int, int> m_Pid2Layer;
+
+ // Derived:
+ bool m_Valid; // The parameter set is valid
+ int m_TotalBitrate; // Bitrate of entire stream
+
+ // Member function
+ DtIsdbtPars();
+ static bool BTypeCompat(int BType, int NumSegm);
+ DTAPI_RESULT CheckValidity(int& ResultCode);
+ DTAPI_RESULT ComputeRates(void);
+ void MakeConsistent();
+ void MakeNumSegmConsistent();
+ int NumSegm();
+ DTAPI_RESULT RetrieveParsFromTs(char* pBuffer, int NumBytes);
+ bool operator == (DtIsdbtPars& Rhs);
+ bool operator != (DtIsdbtPars& Rhs);
+};
+
+ 
+
+
+// ISDB-T layer selection used for demodulation
+#define DTAPI_ISDBT_LAYER_NONE -1
+#define DTAPI_ISDBT_LAYER_AUTO -2
+
+// PID-to-layer mapping
+#define DTAPI_ISDBT_LAYER_A 1
+#define DTAPI_ISDBT_LAYER_B 2
+#define DTAPI_ISDBT_LAYER_C 4
+
+// DtIsdbtPars.m_BType - Broadcast type
+#define DTAPI_ISDBT_BTYPE_TV 0 // 1/3/13-segment TV broadcast
+#define DTAPI_ISDBT_BTYPE_RAD1 1 // 1-segment radio broadcast
+#define DTAPI_ISDBT_BTYPE_RAD3 2 // 3-segment radio broadcast
+
+// DtIsdbtPars.m_Guard - Guard interval
+#define DTAPI_ISDBT_GUARD_1_32 0
+#define DTAPI_ISDBT_GUARD_1_16 1
+#define DTAPI_ISDBT_GUARD_1_8 2
+#define DTAPI_ISDBT_GUARD_1_4 3
+
+// DtIsdbtLayerPars.m_Modulation - Modulation type
+#define DTAPI_ISDBT_MOD_DQPSK 0
+#define DTAPI_ISDBT_MOD_QPSK 1
+#define DTAPI_ISDBT_MOD_QAM16 2
+#define DTAPI_ISDBT_MOD_QAM64 3
+
+// DtIsdbtLayerPars.m_CodeRate - Code rate
+#define DTAPI_ISDBT_RATE_1_2 0
+#define DTAPI_ISDBT_RATE_2_3 1
+#define DTAPI_ISDBT_RATE_3_4 2
+#define DTAPI_ISDBT_RATE_5_6 3
+#define DTAPI_ISDBT_RATE_7_8 4
+
+// DtOutpChannel::SetModControl - Initial Total Number of Segments
+#define DTAPI_ISDBT_SEGM_1 0x00000001
+#define DTAPI_ISDBT_SEGM_3 0x00000003
+#define DTAPI_ISDBT_SEGM_13 0x0000000D
+#define DTAPI_ISDBT_SEGM_MSK 0x0000000F
+
+// DtOutpChannel::SetModControl - Bandwidth
+#define DTAPI_ISDBT_BW_5MHZ 0x00000010
+#define DTAPI_ISDBT_BW_6MHZ 0x00000020
+#define DTAPI_ISDBT_BW_7MHZ 0x00000030
+#define DTAPI_ISDBT_BW_8MHZ 0x00000040
+#define DTAPI_ISDBT_BW_MSK 0x000000F0
+
+// DtOutpChannel::SetModControl - Sample Rate
+#define DTAPI_ISDBT_SRATE_1_1 0x00000100
+#define DTAPI_ISDBT_SRATE_1_2 0x00000200
+#define DTAPI_ISDBT_SRATE_1_4 0x00000300
+#define DTAPI_ISDBT_SRATE_1_8 0x00000400
+#define DTAPI_ISDBT_SRATE_27_32 0x00000500
+#define DTAPI_ISDBT_SRATE_135_64 0x00000600
+#define DTAPI_ISDBT_SRATE_MSK 0x00000F00
+
+// DtOutpChannel::SetModControl - Sub Channel
+#define DTAPI_ISDBT_SUBCH_MSK 0x0003F000
+#define DTAPI_ISDBT_SUBCH_SHIFT 12
+
+// Result codes for DtIsdbtPars::CheckValidity
+#define DTAPI_ISDBT_OK 0
+#define DTAPI_ISDBT_E_BTYPE 1
+#define DTAPI_ISDBT_E_NSEGM 2
+#define DTAPI_ISDBT_E_PARTIAL 3
+#define DTAPI_ISDBT_E_NOT_FILLED 4
+#define DTAPI_ISDBT_E_SUBCHANNEL 5
+#define DTAPI_ISDBT_E_SRATE 6
+#define DTAPI_ISDBT_E_BANDWIDTH 7
+#define DTAPI_ISDBT_E_MODE 8
+#define DTAPI_ISDBT_E_GUARD 9
+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMatrixInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+struct DtMatrixInfo
+{
+ int m_VidStd; // Video standard
+ int m_Scaling; // Scaled frame format
+ int m_NumColumns; // Number of columns 
+};
+
+// Maximum number of fading paths, used in DtModPars
+#define DTAPI_MAX_OUTPUTS 16
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtModPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for storing a complete set of modulation parameters.
+//
+// NOTE FOR ISDB-T: DtModPars.m_ParXtra0 is never used, all ISDB-T parameters are stored
+// in DtIsdbtPars (in *m_pXtraPars).
+//
+struct DtModPars
+{
+ // Modulation parameters
+ int m_ModType; // Modulation type; -1 = not set
+ int m_ParXtra0; // ParXtra0 (Code Rate / J.83 Annex); -1 = not set
+ int m_ParXtra1; // ParXtra1; -1 = not set
+ int m_ParXtra2; // ParXtra2; -1 = not set
+ void* m_pXtraPars; // Extra CMMB/ISDB-S/ISDB-T/DVB-C2/DVB-T2 parameters
+ 
+ // Single Frequency Network parameters
+ int m_SfnMode; // SFN-operation mode DTAPI_SFN_MODE_XXXX
+ int m_SfnTimeOffset; // SFN time offset in nano seconds
+ int m_SfnAllowedTimeDiff; // Maximum allowed time difference in nano-seconds
+
+ // Rates; Set to -1 (not set) by SetModControl, except for symbol rate which is set
+ // to a default value for modulation types that support a symbol rate.
+ // If both symbol and TS rate are set, TS rate takes precedence.
+ int m_SymRate; // Symbol rate in baud
+ DtFractionInt m_TsRate; // Transport-stream rate in bps
+
+ // Channel modelling per output channel
+ bool m_IsCmEnable[DTAPI_MAX_OUTPUTS];
+ // Channel modelling is enabled yes/no
+ DtCmPars m_CmPars[DTAPI_MAX_OUTPUTS];
+ // Channel modelling parameters
+
+ // Custom roll-off roll
+ bool m_IsRoEnable; // Custom roll-off filter enable yes/no
+ DtFilterPars m_RollOffFilter; // Custom roll-off filter parameters
+
+ // Miscellaneous
+ int m_OutputLevel; // Output level; -9999 = not set
+ double m_RfFreqHz; // RF frequency in Hz
+ unsigned char m_S2PlHdrScrSeq[12];
+ // DVB-S2 PL header scrambling sequence
+ DtDvbCidPars m_DvbCidPars; // DVB carrier identification for satellite
+ int m_TxMode; // Transmit mode; Included here because packet
+ // size affects the modulation process
+ int m_StuffMode; // Stuffing mode
+
+ // Operations
+ DTAPI_RESULT CheckPars();
+ DTAPI_RESULT SetModControl(int ModType, int, int, int, void* pXtraPars);
+
+ // Member functions
+ DtCmmbPars* pCmmbPars() { return (DtCmmbPars*)m_pXtraPars; }
+ DtDvbC2Pars* pDvbC2Pars() { return (DtDvbC2Pars*)m_pXtraPars; }
+ DtDvbS2Pars* pDvbS2Pars() { return (DtDvbS2Pars*)m_pXtraPars; }
+ DtDvbT2Pars* pDvbT2Pars() { return (DtDvbT2Pars*)m_pXtraPars; }
+ DtIqDirectPars* pIqDirectPars() { return (DtIqDirectPars*)m_pXtraPars; }
+ DtIsdbsPars* pIsdbsPars() { return (DtIsdbsPars*)m_pXtraPars; }
+ DtIsdbtPars* pIsdbtPars() { return (DtIsdbtPars*)m_pXtraPars; }
+ DtIsdbTmmPars* pIsdbTmmPars() { return (DtIsdbTmmPars*)m_pXtraPars; }
+
+ // Predicates
+ bool HasSymRate();
+ bool IsAdtbT(), IsAdtbtDtmb(), IsAtsc(), IsAtscMh(), IsCmmb(), IsCmEnable(int i=0);
+ bool IsDab();
+ bool IsDtmb(), IsDvbC2(), IsDvbCidEnable(), IsDvbS(), IsDvbS2(), IsDvbS2Apsk(), 
+ IsDvbS2L3(), IsDvbS2X(), IsDvbS2XL3(), IsDvbS2Mux();
+ bool IsDvbT(), IsDvbT2(), IsIqDirect(), IsIsdbS(), IsIsdbT(), IsIsdbTmm();
+ bool IsModTypeSet(), IsOfdm(), IsQam(), IsQamA(), IsQamB(), IsQamC(), IsQamAC();
+ bool IsRoEnable(), IsSfnEnable(), IsT2Mi();
+ bool RequiresMplpMod();
+
+ // Constructor, destructor
+ DtModPars();
+ ~DtModPars();
+private:
+ // No implementation is provided for the copy constructor
+ DtModPars(const DtModPars&);
+
+private:
+ void CleanUpXtraPars();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPar .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Generic structure to represent a single parameter setting.
+// It is used in the advanced demodulator for setting and retrieving parameter settings.
+//
+struct DtPar
+{
+ DtPar();
+ DtPar(int ParId); // Constructor with DTAPI_PAR_xxx initialization
+ virtual ~DtPar();
+
+ // Value types supported for parameters
+ enum ParValueType
+ {
+ PAR_VT_UNDEFINED, PAR_VT_BOOL, PAR_VT_DOUBLE, PAR_VT_INT
+ };
+
+ DTAPI_RESULT m_Result; // Result of retrieving the parameters
+ int m_ParId; // Identifies the parameter: DTAPI_PAR_XXX
+ int m_IdXtra[4]; // Extra identification parameters
+ ParValueType m_ValueType; // Value type of parameter: PAR_VT_XXX
+ union {
+ bool m_ValueBool; // Value if value type is PAR_VT_BOOL
+ double m_ValueDouble; // Value if value type is PAR_VT_DOUBLE
+ int m_ValueInt; // Value if value type is PAR_VT_INT
+ void* m_pValue; // Pointer for complex types
+ };
+ void Cleanup();
+ DTAPI_RESULT GetName(const char*& pName, const char*& pShortName);
+ DTAPI_RESULT GetName(const wchar_t*& pName, const wchar_t*& pShortName);
+ DTAPI_RESULT GetValue(int &Value);
+ DTAPI_RESULT GetValue(double &Value);
+ DTAPI_RESULT GetValue(bool &Value);
+ DTAPI_RESULT SetId(int ParameterId);
+ DTAPI_RESULT SetValue(int Value);
+ DTAPI_RESULT SetValue(double Value);
+ DTAPI_RESULT SetValue(bool Value);
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+ // Serialisation of an array of parameters
+ static DTAPI_RESULT FromXml(const std::wstring&, DtPar*& pPars, int& Count);
+ static DTAPI_RESULT ToXml(DtPar* pPars, int Count, std::wstring& XmlString);
+
+ // Assignment operator
+ DtPar& operator=(const DtPar&);
+
+private:
+ // No implementation is provided for the copy constructor
+ DtPar(const DtPar&);
+};
+
+// Integer parameters
+#define DTAPI_PAR_DEMOD_THREADS 0x001 // Number of Threads/CPU cores used for
+ // software demodulation: default 4
+#define DTAPI_PAR_DEMOD_LDPC_MAX 0x002 // LDPC maximum iterations: default 50
+#define DTAPI_PAR_DEMOD_LDPC_AVG 0x003 // LDPC average iterations limit, used
+ // to limit CPU load; default 16
+// Boolean parameters
+#define DTAPI_PAR_DEMOD_MER_ENA 0x004 // Enable MER calculation; default on
+// Undefined parameter
+#define DTAPI_PAR_UNDEFINED 0x000 // Value is not defined yet
+
+// Unsported item values
+#define DTAPI_PAR_UNSUP_INTITEM 0x80000000 // Unsupported integer item
+#define DTAPI_PAR_UNSUP_UINTITEM 0xFFFFFFFF // Unsupported unsigned integer item
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPhaseNoisePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for specifying the phase noise parameters
+//
+struct DtPhaseNoisePars
+{
+ DtFractionInt m_SampleRate;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRawIpHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Header placed in front of all IP Packets when DTAPI_RXMODE_IPRAW mode is used
+//
+struct DtRawIpHeader
+{
+ unsigned short m_Tag; // 0x44A0h = \91D\92160
+ unsigned short m_Length; // IP packet length
+ unsigned int m_TimeStamp; // IP packet arrival/transmit timestamp
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStatistic -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+struct DtStatistic
+{
+ DtStatistic();
+ DtStatistic(int StatisticId); // Constructor with DTAPI_STAT_xxx initialization
+ virtual ~DtStatistic();
+
+ // Value types supported for statistics
+ // NOTE: ALWAYS ADD NEW TYPES TO END OF LIST, FOR BACKWARDS COMPATIBILITY
+ enum StatValueType
+ {
+ STAT_VT_UNDEFINED, STAT_VT_BOOL, STAT_VT_DOUBLE, STAT_VT_INT, 
+ STAT_VT_DVBC2_L1P2, STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT2_L1,
+ STAT_VT_ISDBT_PARS, STAT_VT_LDPC_STATS, STAT_VT_MA_DATA,
+ STAT_VT_MA_STATS, STAT_VT_PLP_BLOCKS, STAT_VT_VIT_STATS,
+ STAT_VT_DAB_ENSEM, STAT_VT_RS_STATS, STAT_VT_DVBT_TPS, STAT_VT_DAB_TXID
+ };
+
+
+ DTAPI_RESULT m_Result; // Result of retrieving the statistic
+ int m_StatisticId; // Identifies the statistic: DTAPI_STAT_XXX
+ int m_IdXtra[4]; // Extra identification parameters
+ StatValueType m_ValueType; // Value type of statistic: STAT_VT_XXX
+ union {
+ bool m_ValueBool; // Value if value type is STAT_VT_BOOL
+ double m_ValueDouble; // Value if value type is STAT_VT_DOUBLE
+ int m_ValueInt; // Value if value type is STAT_VT_INT
+ void* m_pValue; // Pointer if value type is STAT_VT_DVBC2_L1P2,
+ // STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT_TPS,
+ // STAT_VT_DVBT2_L1, STAT_VT_VIT_STATS
+ // STAT_VT_DAB_ENSEM or STAT_VT_RS_STATS,
+ // STAT_VT_DAB_TXID
+ };
+ void Cleanup();
+ DTAPI_RESULT GetName(const char*& pName, const char*& pShortName);
+ DTAPI_RESULT GetName(const wchar_t*& pName, const wchar_t*& pShortName);
+ DTAPI_RESULT GetValue(int &Value);
+ DTAPI_RESULT GetValue(double &Value);
+ DTAPI_RESULT GetValue(bool &Value);
+ DTAPI_RESULT GetValue(DtDabEnsembleInfo*& pValue);
+ DTAPI_RESULT GetValue(DtDabTransmitterIdInfo*& pValue);
+ DTAPI_RESULT GetValue(DtDvbC2DemodL1Part2Data*& pValue);
+ DTAPI_RESULT GetValue(DtDvbC2DemodL1PlpSigData*& pValue);
+ DTAPI_RESULT GetValue(DtDvbTTpsInfo*& pValue);
+ DTAPI_RESULT GetValue(DtDvbT2DemodL1Data*& pValue);
+ DTAPI_RESULT GetValue(DtDemodLdpcStats*& pValue);
+ DTAPI_RESULT GetValue(DtDemodMaLayerData*& pValue);
+ DTAPI_RESULT GetValue(DtDemodMaLayerStats*& pValue);
+ DTAPI_RESULT GetValue(DtDemodPlpBlocks*& pValue);
+ DTAPI_RESULT GetValue(DtIsdbtParamsData*& pValue);
+ DTAPI_RESULT GetValue(DtRsDecStats*& pValue);
+ DTAPI_RESULT GetValue(DtVitDecStats*& pValue);
+ DTAPI_RESULT SetId(int StatisticId);
+ DTAPI_RESULT SetValue(int Value);
+ DTAPI_RESULT SetValue(double Value);
+ DTAPI_RESULT SetValue(bool Value);
+ DTAPI_RESULT SetValue(DtDabEnsembleInfo& pValue);
+ DTAPI_RESULT SetValue(DtDabTransmitterIdInfo& pValue);
+ DTAPI_RESULT SetValue(DtDvbC2DemodL1Part2Data& Value);
+ DTAPI_RESULT SetValue(DtDvbC2DemodL1PlpSigData& Value);
+ DTAPI_RESULT SetValue(DtDvbTTpsInfo& pValue);
+ DTAPI_RESULT SetValue(DtDvbT2DemodL1Data& Value);
+ DTAPI_RESULT SetValue(DtDemodLdpcStats& Value);
+ DTAPI_RESULT SetValue(DtDemodMaLayerData& Value);
+ DTAPI_RESULT SetValue(DtDemodMaLayerStats& Value);
+ DTAPI_RESULT SetValue(DtDemodPlpBlocks& Value);
+ DTAPI_RESULT SetValue(DtIsdbtParamsData& Value);
+ DTAPI_RESULT SetValue(DtRsDecStats& pValue);
+ DTAPI_RESULT SetValue(DtVitDecStats& pValue);
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+ // Serialisation of an array of statistics
+ static DTAPI_RESULT FromXml(const std::wstring&, DtStatistic*&, int& Count);
+ static DTAPI_RESULT ToXml(DtStatistic* pStatistics, int Count, std::wstring&);
+
+ // Assignment operator
+ DtStatistic& operator=(const DtStatistic&);
+
+private:
+ // No implementation is given of the copy constructor
+ DtStatistic(const DtStatistic&);
+};
+
+// Integer statistics
+#define DTAPI_STAT_BADPCKCNT 0x003 // Count of uncorrected packets
+#define DTAPI_STAT_CNR 0x105 // Carrier-to-noise ratio in dB
+#define DTAPI_STAT_DVBC2_DSLICEDISC 0x010 // DVB-C2 Data slice discontinuity count
+#define DTAPI_STAT_DVBC2_L1HDR_ERR 0x00E // DVB-C2 L1 Preamble header error count
+#define DTAPI_STAT_DVBC2_L1P2_ERR 0x00F // DVB-C2 L1-Part 2 error count
+#define DTAPI_STAT_DVBT2_L1PRE_ERR 0x00C // DVB-T2 L1-Pre error count
+#define DTAPI_STAT_DVBT2_L1POST_ERR 0x00D // DVB-T2 L1-Post error count
+#define DTAPI_STAT_EBN0 0x111 // Eb/N0 in dB (estimated on MER)
+#define DTAPI_STAT_ESN0 0x110 // Es/N0 in dB (estimated on MER)
+#define DTAPI_STAT_LINKMARGIN 0x10F // Link margin in dB
+#define DTAPI_STAT_MER 0x106 // Modulation error rate in dB
+#define DTAPI_STAT_MOD_SAT 0x004 // Modulator saturation count
+#define DTAPI_STAT_RELOCKCNT 0x00A // Receiver re-lock count
+#define DTAPI_STAT_RFLVL_CHAN 0x005 // RF power level for channel bandwidth
+#define DTAPI_STAT_RFLVL_CHAN_QS 0x015 // Quick scan of channel level
+#define DTAPI_STAT_RFLVL_NARROW 0x006 // RF power level for a narrow bandwidth
+#define DTAPI_STAT_RFLVL_NARROW_QS 0x016 // Quick scan of channel level
+#define DTAPI_STAT_RS 0x008 // Reed-Solomon error counter
+#define DTAPI_STAT_SNR 0x107 // Signal-to-noise ratio in dB
+#define DTAPI_STAT_TEMP_TUNER 0x009 // Tuner temperature
+#define DTAPI_STAT_T2MI_OVFS 0x00B // DVB-T2 T2-MI overflow count
+
+// Double statistics
+#define DTAPI_STAT_BER_POSTBCH 0x100 // Post-BCH bit error rate
+#define DTAPI_STAT_BER_POSTLDPC 0x101 // Post-LDPC bit error rate
+#define DTAPI_STAT_BER_POSTVIT 0x102 // Post-Viterbi bit error rate
+#define DTAPI_STAT_BER_PREBCH 0x10D // Pre-BCH bit error rate
+#define DTAPI_STAT_BER_PRELDPC 0x10E // Pre-LDPC bit error rate
+#define DTAPI_STAT_BER_PRERS 0x103 // Pre-Reed-Solomon bit error rate
+#define DTAPI_STAT_BER_PREVIT 0x104 // Pre-Viterbi bit error rate
+#define DTAPI_STAT_FER_POSTBCH 0x116 // Post-BCH frame error rate
+#define DTAPI_STAT_FREQ_SHIFT 0x10B // Input frequency shift (Hz)
+#define DTAPI_STAT_OCCUPIEDBW 0x112 // Occupied bandwidth
+#define DTAPI_STAT_PER 0x108 // Packet error rate
+#define DTAPI_STAT_ROLLOFF 0x113 // Roll-off factor in percentage
+#define DTAPI_STAT_SAMPRATE_OFFSET 0x10C // Sample rate offset (ppm) 
+
+// Boolean lock statistics
+#define DTAPI_STAT_CARRIER_LOCK 0x201 // Carrier lock
+#define DTAPI_STAT_FEC_LOCK 0x202 // FEC lock
+#define DTAPI_STAT_LOCK 0x200 // Overall lock status
+#define DTAPI_STAT_PACKET_LOCK 0x203 // Packet lock
+#define DTAPI_STAT_SPECTRUMINV 0x205 // Spectrum inversion
+#define DTAPI_STAT_VIT_LOCK 0x204 // Viterbi lock
+
+// Complex statistics 
+#define DTAPI_STAT_DAB_ENSEM_INFO 0x308 // DAB ensemble information from the
+ // Fast Information Channel (FIC)
+#define DTAPI_STAT_DAB_TXID_INFO 0x30C // DAB transmitter ID information
+#define DTAPI_STAT_DVBC2_L1P2DATA 0x300 // DVB-C2 Layer-1 Part 2 data
+#define DTAPI_STAT_DVBC2_PLPSIGDATA 0x301 // DVB-C2 Layer-1 PLP signalling data
+#define DTAPI_STAT_DVBT_TPS_INFO 0x30B // DVB-T TPS information
+#define DTAPI_STAT_DVBT2_L1DATA 0x302 // DVB-T2 Layer-1 data
+#define DTAPI_STAT_ISDBT_PARSDATA 0x303 // ISDB-T parameters data
+#define DTAPI_STAT_LDPC_STATS 0x304 // DVB-C2/T2 LDPC statistics
+#define DTAPI_STAT_MA_DATA 0x305 // DVB-C2/T2 mode adaptation data
+#define DTAPI_STAT_MA_STATS 0x306 // DVB-C2/T2 mode adaptation statistics
+#define DTAPI_STAT_PLP_BLOCKS 0x307 // DVB-C2/T2 PLP number of FEC blocks
+#define DTAPI_STAT_RSDEC_STATS 0x30A // Reed-Solomon decoder statistics
+#define DTAPI_STAT_VITDEC_STATS 0x309 // Viterbi decoder statistics 
+
+// DekTec internal statistics
+#define DTAPI_STAT_AGC1 0x001 // First AGC value
+#define DTAPI_STAT_AGC2 0x002 // Second AGC value
+#define DTAPI_STAT_RFLVL_UNCALIB 0x007 // Uncalibrated RF power level
+#define DTAPI_STAT_RFLVL_UNCALIB_DBM 0x10A // Uncalibrated RF power level in dBm
+#define DTAPI_STAT_SYNTAX_ERR_CNT 0x114 // Num syntax errors in usb bitstream
+#define DTAPI_STAT_OVERFLOW_CNT 0x115 // Number of dtapi<>kernel buf overflows
+
+// Unsupported item values
+#define DTAPI_STAT_UNDEFINED 0x000 // Value is not defined yet
+#define DTAPI_STAT_UNSUP_INTITEM 0x80000000 // Unsupported integer item
+#define DTAPI_STAT_UNSUP_UINTITEM 0xFFFFFFFF // Unsupported unsigned integer item
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpQosStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Quality-of-Service related statistics for SDI/TS-over-IP channels, measured over a
+// certain period of time (the "time period").
+//
+// If the mode is "Seamless Protection Switching of IP Datagrams" (SMPTE 2022-7 mode), 
+// QoS statistics are maintained for path 1, path 2, and for the reconstructed stream.
+// If the mode is not SMPTE 2022-7 ("single-path" mode), the QoS statistics are stored
+// in the members for path 1.
+//
+// This structure is contained in the DtIpStat structure, once with the statistics 
+// measured over the last second, and once with statistics measured over the last minute.
+//
+struct DtIpQosStats
+{
+ // Packet Error Rate (PER) for path 1, path 2 and for the reconstructed stream.
+ // The PER is the number of lost IP packets per second.
+ double m_Per1, m_Per2, m_PerAfterFec;
+
+ // Delay factor in microseconds for path 1 and path 2.
+ // The delay factor is an indication of the jitter of the IP stream. It is defined
+ // as the maximum difference between the actual arrival time of a UDP/RTP packet
+ // and the ideal (jitterless) arrival time of that packet.
+ double m_DelayFactor1, m_DelayFactor2;
+
+ // The skew is the minimal and maximal difference over the time period 
+ // (1 sec or 1 minute) in arrival time between IP packets on path 1 and on path 2.
+ // If m_Skew is positive, path 1 has a longer delay than path 2; if m_Skew is
+ // negative, path 2 has the longer delay.
+ // Note: PD as defined in SMPTE 2022-7 is the absolute value of m_Skew.
+ double m_MinSkew; // Min. Skew between path 1 and path 2
+ double m_MaxSkew; // Max. Skew between path 1 and path 2
+
+ //Inter Packet arrival time of Ip packet per port over time period (1 sec or 1 minute)
+ double m_MinIpat1, m_MinIpat2; // Min. IPAT path1 and path2
+ double m_MaxIpat1, m_MaxIpat2; // Max. IPAT path1 and path2
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-. DtIpProfile -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for describing the IP transmission "profile". It defines the maximum
+// bitrate and (in SMPTE 2022-7 mode only) the maximum skew between path 1 and path 2.
+// DtIpProfile is used to dimension buffer sizes at the receiver.
+//
+struct DtIpProfile
+{
+ // m_Profile defines the maximum bitrate and the maximum path skew.
+ // Member variables m_MaxBitrate and m_MaxSkew are used only if m_Profile is
+ // DTAPI_IP_USER_DEFINED, otherwise m_Profile implicitly sets their values.
+ int m_Profile; // IP transmission profile
+
+ // m_MaxBitrate is used for single paths and in SMPTE 2022-7 mode.
+ unsigned int m_MaxBitrate; // Maximum bitrate in bps
+
+ // m_MaxSkew is used only in SMPTE 2022-7 mode. It defines the maximum skew
+ // between the two IP transmission paths.
+ int m_MaxSkew; // Maximum skew between path 1 and path 2 in ms
+
+ // Set the video standard to transmit/receive. 
+ int m_VideoStandard; // DTAPI_VIDSTD_ defines.
+};
+
+// IP tranmission profile (DtIpProfile::m_Profile)
+#define DTAPI_IP_PROF_NOT_DEFINED 0 // Not defined
+#define DTAPI_IP_USER_DEFINED 1 // Use m_MaxBitrate and m_MaxSkew
+// LBR (Low Bit Rate) profiles
+#define DTAPI_IP_LBR_LOW_SKEW 2 // m_MaxSkew=10ms, m_MaxBitrate=10Mbps
+#define DTAPI_IP_LBR_MODERATE_SKEW 3 // m_MaxSkew=50ms, m_MaxBitrate=10Mbps
+#define DTAPI_IP_LBR_HIGH_SKEW 4 // m_MaxSkew=450ms, m_MaxBitrate=10Mbps
+// SBR (Slower Bit Rate) profiles
+#define DTAPI_IP_SBR_LOW_SKEW 5 // m_MaxSkew=10ms, m_MaxBitrate=270Mbps
+#define DTAPI_IP_SBR_MODERATE_SKEW 6 // m_MaxSkew=50ms, m_MaxBitrate=270Mbps
+#define DTAPI_IP_SBR_HIGH_SKEW 7 // m_MaxSkew=450ms, m_MaxBitrate=270Mbps
+// HBR (High Bit Rate) profiles
+#define DTAPI_IP_HBR_LOW_SKEW 5 // m_MaxSkew=10ms, m_MaxBitrate=3Gbps
+#define DTAPI_IP_HBR_MODERATE_SKEW 6 // m_MaxSkew=50ms, m_MaxBitrate=3Gbps
+#define DTAPI_IP_HBR_HIGH_SKEW 7 // m_MaxSkew=150ms, m_MaxBitrate=3Gbps
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for storing SDI/TS-over-IP parameters
+//
+struct DtIpPars
+{
+public:
+ // Primary link
+ unsigned char m_Ip[16]; // IP address (IPv4/IPv6)
+ unsigned short m_Port; // Port number
+ unsigned char m_SrcFltIp[16]; // Source filter: IP address (IPv4/IPv6)
+ unsigned short m_SrcFltPort; // Source filter: port number
+ int m_VlanId; // VLAN ID
+ int m_VlanPriority; // VLAN priority
+
+ // Redundant link (path 2 in SMPTE 2022-7 mode)
+ unsigned char m_Ip2[16]; // IP address (IPv4/IPv6)
+ unsigned short m_Port2; // Port number
+ unsigned char m_SrcFltIp2[16]; // Source filter: IP address (IPv4/IPv6)
+ unsigned short m_SrcFltPort2; // Source filter: port number
+ int m_VlanId2; // VLAN ID
+ int m_VlanPriority2; // VLAN priority
+
+ int m_TimeToLive; // Time-to-Live setting for IP Tx
+ int m_NumTpPerIp; // Number of transport packets per IP packet
+ int m_Protocol; // Protocol: DTAPI_PROTO_UDP/RTP
+ int m_DiffServ; // Differentiated services
+ int m_FecMode; // Error correction mode: DTAPI_FEC_DISABLE/2D
+ int m_FecNumRows; // 'D' = #rows in FEC matrix
+ int m_FecNumCols; // 'L' = #columns in FEC matrix
+
+ // Control and status flags: DTAPI_IP_V4, DTAPI_IP_V6, DTAPI_IP_TX_MANSRCPORT
+ int m_Flags;
+
+ // Seamless Protection Switching of IP Datagrams (SMPTE 2022-7)
+
+ // Transmission- or reception mode. It determines whether "seamless protection
+ // switching of IP datagrams" according to SMPTE 2022-7 is applied.
+ // DTAPI_IP_NORMAL Default value for non-redundant Rx or Tx.
+ // DTAPI_IP_TX_2022_7 Apply SMPTE 2022-7 for Tx. IP packets will be duplicated to
+ // path 1 (primary link) and path 2 (redundant link)
+ // DTAPI_IP_RX_2022_7 Apply SMPTE 2022-7 for Rx. IP packets from path 1 and path 2
+ // will be seamlessly combined into a single logical stream.
+ int m_Mode;
+
+ // The IP transmission profile determines the maximum bitrate and the maximum skew
+ // between transmission path 1 and path 2.
+ DtIpProfile m_IpProfile;
+public:
+ DtIpPars();
+ ~DtIpPars();
+};
+
+// Legacy
+#define DtTsIpPars DtIpPars
+
+// Error correction modes (DtIpPars::m_FecMode)
+#define DTAPI_FEC_DISABLE 0
+#define DTAPI_FEC_2D 1 // FEC reconstruction
+#define DTAPI_FEC_2D_M1 1 // Mode1: FECdT = DVBdT + .5 * DVBdT
+#define DTAPI_FEC_2D_M2 2 // Mode2: FECdT = DVBdT
+#define DTAPI_FEC_2D_M1_B 3 // Mode1: FECdT = DVBdT + .5 * DVBdT (BLOCK)
+#define DTAPI_FEC_2D_M2_B 4 // Mode2: FECdT = DVBdT (BLOCK)
+
+// Optional control/status flags (DtIpPars::m_Flags)
+#define DTAPI_IP_V4 0x00
+#define DTAPI_IP_V6 0x01
+#define DTAPI_IP_TX_MANSRCPORT 0x10
+#define DTAPI_IP_RX_DIFFSRCPORTFEC 0x20
+
+// Transmission/reception mode (DtIpPars::m_Mode)
+#define DTAPI_IP_NORMAL 0
+#define DTAPI_IP_TX_2022_7 1 // Dual-path SMPTE 2022-7 transmission
+#define DTAPI_IP_RX_2022_7 2 // Dual-path SMPTE 2022-7 reception
+// Legacy definitions
+#define DTAPI_IP_TX_DBLBUF DTAPI_IP_TX_2022_7
+#define DTAPI_IP_RX_DBLBUF DTAPI_IP_RX_2022_7
+
+// IP protocol (DtIpPars::m_Protocol)
+#define DTAPI_PROTO_UDP 0
+#define DTAPI_PROTO_RTP 1
+#define DTAPI_PROTO_AUTO 2
+#define DTAPI_PROTO_UNKN 2
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-. DtIpStat .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for retrieving the IP statistics for an SDI/TS-over-IP channel.
+//
+// Counters start at zero, but counters are not reset after being read.
+// Counter wraps must be handled by the application.
+//
+// If the mode is "Seamless Protection Switching of IP Datagrams" (SMPTE 2022-7 mode), 
+// counters are maintained for path 1, path 2, and for the reconstructed stream.
+// If this mode is not active, only path 1 counters are valid.
+//
+struct DtIpStat
+{
+ // Total number of received or transmitted IP packets.This is the number of IP packets
+ // that the stream should contain, so lost packets are included in this counter.
+ unsigned int m_TotNumIpPackets;
+
+ // Number of IP packets lost before and after FEC.
+ // In SMPTE 2022-7 mode, these counters apply to the reconstructed stream.
+ unsigned int m_LostIpPacketsBeforeFec, m_LostIpPacketsAfterFec;
+
+ // Counters for the number of received and number of lost IP packets for path 1
+ // and for path 2.
+ // m_NumIpPacketsLost1 = m_TotNumIpPackets - m_NumIpPacketsReceived1
+ // m_NumIpPacketsLost2 = m_TotNumIpPackets - m_NumIpPacketsReceived2
+ unsigned int m_NumIpPacketsReceived1, m_NumIpPacketsReceived2;
+ unsigned int m_NumIpPacketsLost1, m_NumIpPacketsLost2;
+
+ // QoS statistics measured over the last second, and over the last minute.
+ DtIpQosStats m_QosStatsLastSec, m_QosStatsLastMin;
+}; 
+
+// Legacy
+#define DtTsIpStat DtIpStat
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTunePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for setting tuner specific parameters
+//
+struct DtTunePars
+{
+ union {
+ // DTA-2131 specific tuner parameters
+ struct {
+ int m_TunerStandard; // DTAPI_TUNMOD_xxx
+ int m_TunerBandwidth; // Tuning bandwidth in Hz
+ int m_IfFrequency; // IF frequency in Hz
+ // (-1 according tuner standard)
+ int m_LpfCutOff; // Low-pass filter cutoff; DTAPI_TUN31_LPF_x
+ int m_LpfOffset; // Low-pass filter offset; DTAPI_TUN31_LPF_x
+ int m_HiPass; // Hi Pass filter; DTAPI_TUN31_HPF_x
+ int m_DcNotchIfPpf; // Enable DC notch IF PPF; DTAPI_TUN31_NOTCH_x
+ int m_IfNotch; // Enable IF notch; DTAPI_TUN31_NOTCH_x
+ int m_IfNotchToRssi; // Enable IF notch to RSSI; DTAPI_TUN31_NOTCH_x
+ } m_Dta2131TunePars;
+ } u;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVidStdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+struct DtVidStdInfo
+{
+ int m_VidStd; // Video Standard
+ int m_LinkStd; // Link standard
+ bool m_IsHd; // true: is an HD format: false: is SD format
+ bool m_Is4k; // true: is a 4k resolution
+
+ int m_VidWidth; // Width in pixels
+ int m_VidHeight; // Height in number of lines
+
+ // NOTE: for 4k the following members describe the properties of a single link
+ bool m_IsInterlaced; // Is interlaced
+ int m_NumLines; // Number of lines per frame
+ double m_Fps; // Frame rate
+ bool m_IsFractional; // Fractional framerate
+ 
+ int m_FrameNumSym; // Size of frame (in # symbols)
+ int m_LineNumSym; // # of symbol per line
+ int m_LineNumSymHanc; // # of HANC symbols per line
+ int m_LineNumSymVanc; // # of VANC symbols per line
+ int m_LineNumSymEav; // # of EAV symbols per line
+ int m_LineNumSymSav; // # of SAV symbols per line
+
+ // Field 1
+ int m_Field1StartLine; // Line # of first line for field 1
+ int m_Field1EndLine; // Line # of last line for field 1
+ int m_Field1VidStartLine; // Line # of first line containing active video
+ int m_Field1VidEndLine; // Line # of last line containing active video
+ 
+ // Field 2
+ int m_Field2StartLine; // Line # of first line for field 2
+ int m_Field2EndLine; // Line # of last line for field 2
+ int m_Field2VidStartLine; // Line # of first line containing active video
+ int m_Field2VidEndLine; // Line # of last line containing active video
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DEMODULATION PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDemodDvbS2ModCodSettings -.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for storing the DVB-S2 
+// 
+struct DtDemodDvbS2ModCodSettings
+{
+ bool m_Enable; // Demodulation of this MODCOD (yes/no)
+ int m_SnrThreshold; // SNR threshold of this MODCOD for automute algorithm
+ DtDemodDvbS2ModCodSettings() : m_Enable(false), m_SnrThreshold(0) {}
+ DtDemodDvbS2ModCodSettings(bool Enable, int SnrThreshold) : 
+ m_Enable(Enable), m_SnrThreshold(SnrThreshold) {}
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for storing a complete set of demodulation parameters
+//
+class DtDemodPars
+{
+public:
+ DtDemodPars();
+ DtDemodPars(const DtDemodPars&);
+ ~DtDemodPars();
+public:
+ DTAPI_RESULT CheckValidity();
+ int GetModType() const;
+ DTAPI_RESULT SetModType(int ModType);
+ DtDemodParsAtsc* Atsc() const;
+ DtDemodParsDab* Dab() const;
+ DtDemodParsDvbC2* DvbC2() const;
+ DtDemodParsDvbS* DvbS() const;
+ DtDemodParsDvbS2* DvbS2() const;
+ DtDemodParsDvbS2Adv* DvbS2Adv() const; 
+ DtDemodParsDvbT* DvbT() const;
+ DtDemodParsDvbT2* DvbT2() const;
+ DtDemodParsIq* Iq() const;
+ DtDemodParsIq2131* Iq2131() const; 
+ DtDemodParsIsdbt* Isdbt() const;
+ DtDemodParsQam* Qam() const;
+
+ // Predicates
+ bool IsAtsc() const, IsDab() const, IsDvbC2() const, IsDvbS() const, 
+ IsDvbS2() const, IsDvbT() const,IsDvbT2() const, IsIq() const, IsIq2131() const,
+ IsIsdbt() const, IsQam() const;
+
+ // Operators
+ void operator=(const DtDemodPars& Pars);
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+ // Conversion helper
+ DTAPI_RESULT FromOldStyle(int ModType, int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT ToOldStyle(int& ModType, int& ParXtra0, int& ParXtra1, int& ParXtra2);
+private:
+ int m_ModType; // Modulation type
+ void* m_pDemodPars; // Demodulation parameters; Type depends on m_ModType
+private:
+ void CleanUpDemodPars();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsAtsc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Demodulation parameters for modulation type DTAPI_MOD_ATSC
+//
+struct DtDemodParsAtsc
+{
+ int m_Constellation; // VSB constellation
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDab -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DAB
+//
+struct DtDemodParsDab
+{
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbC2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBC2
+//
+struct DtDemodParsDvbC2
+{
+ int m_Bandwidth; // Bandwidth
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBS
+//
+struct DtDemodParsDvbS
+{
+ int m_CodeRate; // DVB-S coderate
+ int m_SpecInv; // Spectral inversion (yes/no)
+ int m_SymRate; // Symbol rate in baud
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBS2
+//
+struct DtDemodParsDvbS2
+{
+ int m_CodeRate; // Coderate
+ int m_Pilots; // Pilots (yes/no)
+ int m_SpecInv; // Spectral inversion (yes/no)
+ int m_FecFrame; // Long or short FECFRAME
+ int m_SymRate; // Symbol rate in baud
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS2Adv -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Advanced demodulation parameters for modulation type DTAPI_MOD_DVBS2
+//
+struct DtDemodParsDvbS2Adv : DtDemodParsDvbS2
+{
+ bool m_AutoMuteModCods; // MODCODS with an SNR threshold above the current SNR
+ // will not be demodulated
+ int m_HysteresisMargin; // Margin to add on top of the SNR threshold before 
+ // re-enabling a certain modcod, in units of 0.1 dB
+ std::map<DtDvbS2ModCod, DtDemodDvbS2ModCodSettings> m_ModCods; 
+ // List with supported modcods 
+ DtDemodParsDvbS2Adv();
+ DTAPI_RESULT DeleteModCod(DtDvbS2ModCod ModCod);
+ DTAPI_RESULT InitSnrThreshold(int TypeNumber);
+ DTAPI_RESULT SetModCod(DtDvbS2ModCod ModCod, DtDemodDvbS2ModCodSettings &Settings);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbT -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBT
+//
+struct DtDemodParsDvbT
+{
+ int m_CodeRate; // Coderate
+ int m_Bandwidth; // Bandwidth
+ int m_Constellation; // Constellation
+ int m_Guard; // Guard interval
+ int m_Interleaving; // Interleaving
+ int m_Mode; // Transmission mode
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbT2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBT2
+//
+struct DtDemodParsDvbT2
+{
+ int m_Bandwidth; // Bandwidth
+ int m_T2Profile; // DVB-T2 profile (Base/Lite)
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIq -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_IQ
+//
+struct DtDemodParsIq
+{
+ int m_Bandwidth; // Signal bandwidth in Hz
+ int m_IqDemodType; // IQ demodulation type (DTAPI_DEMOD_QAM or
+ // DTAPI_DEMOD_OFDM)
+ int m_SampleRate; // Sample rate in Hz
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIq2131 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_IQ_2131 (DTA-2131 specific)
+//
+struct DtDemodParsIq2131
+{
+ int m_IqDemodFreq; // IQ demodulation frequency in Hz
+ DtFilterPars m_LpfFilter; // Anti-aliasing filter
+ double m_LpfScaleFactor; // Scale factor after anti-aliasing filter
+ int m_SampleRate; // Sample rate in Hz
+ DtTunePars m_TunePars; // Tuning parameters
+};
+
+// IQ-demodulation type
+#define DTAPI_DEMOD_OFDM 0 // OFDM IQ-demodulation type
+#define DTAPI_DEMOD_QAM 1 // QAM IQ-demodulation type
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIsdbt .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_ISDBT
+//
+struct DtDemodParsIsdbt
+{
+ int m_Bandwidth; // Bandwidth DTAPI_ISDBT_BW_xMHZ
+ int m_SubChannel; // Sub channel number, 0..41, default= 22
+ int m_NumberOfSegments; // Number of segments DTAPI_ISDBT_SEGM_x
+ DtDemodParsIsdbt() : m_SubChannel(22) {}
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsQam -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_QAMxxx
+//
+struct DtDemodParsQam
+{
+ int m_Annex; // ITU-T J.83 Annex
+ int m_Interleaving; // Interleaving; ignored for Annex A and C
+ int m_SymRate; // Symbol rate in baud 
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+ Common Demodulation Structures +=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodLdpcStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// LDCP statistic information for DVB-T2 and DVB-C2
+//
+struct DtDemodLdpcStats
+{
+ __int64 m_FecBlocksCount; // #Decoded FEC blocks
+ __int64 m_UncorrFecBlocksCount;// #Uncorrected FEC blocks after BCH (not exact)
+ __int64 m_FecBlocksCount1; // #Decoded FEC blocks, reset at the same time
+ // as m_FecBlocksItCount/min/max
+ __int64 m_FecBlocksItCount; // Total #LDPC iterations
+ // Average #LDPC iteration =
+ // m_FecBlocksItCount / m_FecBlocksCount1
+ int m_FecBlocksItMin; // Minimum #LDPC iterations (-1 after reset)
+ int m_FecBlocksItMax; // Maximum #LDPC iterations (-1 after reset)
+ __int64 m_BchBitCount; // #Decoded data bits, including BCH bits
+ // Currently only data+BCH bits are taken into account (LDPC parity bits are ignored),
+ // so the BER before LDPC is approximatively: m_BchBitErrorCount / m_BchBitCount
+ // This is accurate only if there are no uncorrected blocks (m_UncorrFecBlocksCount=0)
+ __int64 m_BchBitErrorCount; // Bit error count before LDPC
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodMaLayerStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// LMode adaption layer statistics for DVB-T2 and DVB-C2
+//
+struct DtDemodMaLayerStats
+{
+ __int64 m_HdrCrc8ErrorCount; // #CRC8 errors for BBframe header
+ __int64 m_PckCrc8ErrorCount; // #CRC8 errors for packets (only for m_Hem = 0)
+ __int64 m_FramingErrorCount; // SYNCD/DFL/UPL consistency errors
+ __int64 m_CommonPlpResyncCount;// Number of times a resynchronization between data
+ // and common PLP was needed. It normally happens
+ // only in case of receive errors. This field is only
+ // updated in the corresponding data PLP.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRsDecStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Reed-Solomon decoder info
+//
+struct DtRsDecStats
+{
+ bool m_Locked; // Decoder is locked 
+ __int64 m_ByteSkipCount; // Bytes skipped while looking for sync 
+ __int64 m_PacketCount; // Decoded packets 
+ __int64 m_UncorrPacketCount; // Uncorrected packets 
+ __int64 m_ByteErrorCount; // Byte error count 
+ __int64 m_BitErrorCount; // Bit error count
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVitDecStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Viterbi decoder info (pre-viterbi BER) 
+//
+struct DtVitDecStats
+{
+ __int64 m_BitCount; // Input bit count 
+ __int64 m_BitErrorCount; // Bit error count
+};
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodMaLayerData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Mode adaption layer info for DVB-T2 and DVB-C2
+struct DtDemodMaLayerData
+{
+ bool m_Hem; // High efficiency mode
+ bool m_Npd; // Null packet deletion
+ int m_Issy; // ISSY: mode, see DTAPI_DVBx2_ISSY_x
+ int m_IssyBufs; // ISSY: current 'BUFS' value
+ int m_IssyTto; // ISSY: last 'TTO' value (DVB-T2 only)
+ int m_IssyBufStat; // ISSY: last 'BUFSTAT' value (DVB-C2/S2 only)
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodPlpBlocks -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Number of FEC blocks per frame
+//
+struct DtDemodPlpBlocks
+{
+ int m_NumBlocks; // Last plp_num_blocks
+ int m_NumBlocksMin; // Minimum plp_num_blocks (-1 = no new value since 
+ // reset)
+ int m_NumBlocksMax; // Maximum plp_num_blocks 
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//+=+=+=+=+=+=+=+=+ Demodulator Blindscan and Spectrum scan definitions +=+=+=+=+=+=+=+=+=
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTransmitter -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure describing a transmitter. Used by DtInpChannel::BlindScan to return the
+// transmitters found by scanning a frequency band.
+//
+struct DtTransmitter
+{
+ __int64 m_FreqHz; // Center frequency of the transmitter
+ int m_ModType; // Modulation type
+ int m_SymbolRate; // Symbol rate
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBsProgess -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure describing the progress of an asynchronous BlindScan.
+// Used by asynchronous DtInpChannel::BlindScan to return current state and the 
+// transmitters found by scanning a frequency band using the DtBsProgressFunc callback.
+//
+struct DtBsProgress
+{
+ enum BsEvent
+ {
+ BS_STEP, // One frequency step is completed
+ BS_CANCELLED, // Blindscan is cancelled
+ BS_DONE // Blindscan is completed
+ };
+
+ __int64 m_FreqHz; // Center frequency found
+ DtDemodPars m_DemodPars; // Demodulator parameters found for this transmitter
+ BsEvent m_ProgressEvent; // Progress event
+ bool m_ChannelFound; // If set, the channel is found on the transmitter 
+ // frequency
+ DTAPI_RESULT m_Result; // Result of the blindscan
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+public:
+ DtBsProgress();
+ ~DtBsProgress();
+};
+
+// Function to receive asynchronous progess.
+typedef void DtBsProgressFunc(DtBsProgress& Progress, void* pOpaque);
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRfLevel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure describing a RF-level on a frequency. 
+// Used by DtInpChannel::SpectrumScan to return the RF-levels found by scanning a
+// frequency band.
+//
+struct DtRfLevel
+{ 
+ __int64 m_FreqHz; // Center frequency of the RF level
+ int m_RfLevel; // RF level found in units of 0.1dBmV
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSpsProgress -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure describing the progress of an asynchronous SpectrumScan.
+// Used by DtInpChannel::SpectrumScan to return current state and the RF-Levels 
+// found by scanning a frequency band using the DtSpsProgressFunc callback.
+//
+struct DtSpsProgress {
+
+ enum SpsEvent
+ {
+ SPS_STEP, // One frequency step is completed
+ SPS_CANCELLED, // SpectrumScan is cancelled
+ SPS_DONE // SpectrumScan is completed
+ };
+
+ DtRfLevel m_DtRfLevel; // A single level
+ SpsEvent m_ProgressEvent; // Progress event
+ DTAPI_RESULT m_Result; // Result of the spectrumscan
+ 
+ //Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+ 
+public:
+ DtSpsProgress();
+ ~DtSpsProgress();
+};
+
+// Function to receive asynchronous spectrum scan progess.
+typedef void DtSpsProgressFunc(DtSpsProgress& Progress, void* pOpaque);
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MAIN DTAPI CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDevice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class representing a DekTec Device
+//
+class DtDevice
+{
+ // Constructor, destructor
+public:
+ DtDevice();
+ virtual ~DtDevice();
+private:
+ // No implementation is provided for the copy constructor
+ DtDevice(const DtDevice&);
+
+ // Public access functions
+public:
+ virtual int Category(void);
+ virtual int ChanType(int Port);
+ virtual int FirmwareVersion(void);
+ virtual bool IsAttached(void);
+ virtual int TypeNumber(void);
+ virtual bool HasCaps(int Port, const DtCaps Caps) const;
+
+ // Public member functions
+public:
+ virtual DTAPI_RESULT AttachToIpAddr(unsigned char Ip[4]);
+ virtual DTAPI_RESULT AttachToSerial(__int64 SerialNumber);
+ virtual DTAPI_RESULT AttachToSlot(int PciBusNumber, int SlotNumber);
+ virtual DTAPI_RESULT AttachToType(int TypeNumber, int DeviceNo=0);
+ virtual DTAPI_RESULT ClearGpsErrors();	
+ virtual DTAPI_RESULT Detach(void);
+ virtual DTAPI_RESULT DetectIoStd(int Port, int& Value, int& SubValue);
+ virtual DTAPI_RESULT FlashDisplay(int NumFlashes=5, int OnTime=100, int OffTime=100);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int Port, int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int Port, int AttrId, DtModPars& ModParVals, 
+ int& AttrValue);
+ virtual DTAPI_RESULT GetDescriptor(DtDeviceDesc& DvcDesc);
+ virtual DTAPI_RESULT GetDeviceDriverVersion(int& Major, int& Minor, int& BugFix,
+ int& Build);
+ virtual DTAPI_RESULT GetDisplayName(wchar_t* pName);
+ virtual DTAPI_RESULT GetDisplayName(char* pName);
+ virtual DTAPI_RESULT GetFanSpeed(int Fan, int& Rpm);
+ virtual DTAPI_RESULT GetFanTemperature(int Fan, int& Temp);
+ virtual DTAPI_RESULT GetFirmwareVersion(int& FirmwareVersion);
+ virtual DTAPI_RESULT GetGenlockState(int& State, int& RefVidStd);
+ virtual DTAPI_RESULT GetGenlockState(int& State);
+ virtual DTAPI_RESULT GetGpsStatus(int& Status, int& Error);
+ virtual DTAPI_RESULT GetGpsTime(int& GpsTime);
+ virtual DTAPI_RESULT GetIoConfig(DtIoConfig& IoCfg);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue,
+ __int64& ParXtra0);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ virtual DTAPI_RESULT GetNwSpeed(int Port, bool& Enable, int& Speed);
+ virtual DTAPI_RESULT GetRefClkCnt(int& RefClkCnt);
+ virtual DTAPI_RESULT GetRefClkCnt(__uint64& RefClkCnt);
+ virtual DTAPI_RESULT GetRefClkCnt(int& RefClkCnt, int& RefClkFreqHz);
+ virtual DTAPI_RESULT GetRefClkCnt(__uint64& RefClkCnt, int& RefClkFreqHz);
+ virtual DTAPI_RESULT GetRefClkFreq(int& RefClkFreqHz);
+ virtual DTAPI_RESULT GetStateFlags(int Port, int &StateFlags);
+ virtual DTAPI_RESULT GetUsbSpeed(int& UsbSpeed);
+ virtual DTAPI_RESULT GetVcxoState(bool& Enable, int& Lock, int& VcxoClkFreqHz);
+ virtual DTAPI_RESULT HwFuncScan(int NumEntries, int& NumEntriesResult,
+ DtHwFuncDesc* pHwFuncs);
+ virtual DTAPI_RESULT LedControl(int LedControl);
+ virtual DTAPI_RESULT RegisterCallback(pDtEventCallback Callback, void* pContext,
+ int EventTypes, void** pId = NULL);
+ virtual DTAPI_RESULT SetDisplayName(wchar_t* pName);
+ virtual DTAPI_RESULT SetDisplayName (char* pName);
+ virtual DTAPI_RESULT SetIoConfig(int Port, int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT SetIoConfig(DtIoConfig* pIoConfigs, int Count);
+ virtual DTAPI_RESULT SetNwSpeed(int Port, bool Enable, int Speed);
+ virtual DTAPI_RESULT UnregisterCallback(void* pId);
+ virtual DTAPI_RESULT VpdDelete(const char* pTag);
+ virtual DTAPI_RESULT VpdDelete(const wchar_t* pTag);
+ virtual DTAPI_RESULT VpdRead(const char* pTag, char* pVpdItem);
+ virtual DTAPI_RESULT VpdRead(const wchar_t* pTag, wchar_t* pVpdItem);
+ virtual DTAPI_RESULT VpdRead(const char* pTag, char* pVpdItem, int& ItemSize);
+ virtual DTAPI_RESULT VpdRead(const wchar_t* pTag, char* pVpdItem, int& ItemSize);
+ virtual DTAPI_RESULT VpdWrite(const char* pTag, char* pVpdItem);
+ virtual DTAPI_RESULT VpdWrite(const wchar_t* pTag, wchar_t* pVpdItem);
+ virtual DTAPI_RESULT VpdWrite(const char* pTag, char* pVpdItem, int ItemSize);
+ virtual DTAPI_RESULT VpdWrite(const wchar_t* pTag, char* pVpdItem, int ItemSize);
+
+protected:
+ virtual void LoadDeviceData();
+private:
+ static void DtEventCallback(int Event, DtEventArgs* pArgs);
+
+ // Public attributes
+public:
+ DtDeviceDesc m_DvcDesc; // Device descriptor, initialized in attach
+ DtHwFuncDesc* m_pHwf; // Hardware functions, initialized in attach
+ 
+ // Implementation data
+private:
+ std::list<void*> m_EventSubscriberList;
+
+ // Friends
+ friend class DtInpChannel;
+ friend class DtOutpChannel;
+
+public: // TODOSD should be protected
+ IDevice* m_pDev;
+};
+
+// Attribute identifiers
+#define DTAPI_ATTR_LEVEL_MAX 1
+#define DTAPI_ATTR_LEVEL_RANGE 2
+#define DTAPI_ATTR_LEVEL_STEPSIZE 3
+#define DTAPI_ATTR_RFFREQ_ABSMAX 4
+#define DTAPI_ATTR_RFFREQ_ABSMIN 5
+#define DTAPI_ATTR_RFFREQ_MAX 6
+#define DTAPI_ATTR_RFFREQ_MIN 7
+#define DTAPI_ATTR_SAMPRHW_ABSMAX 8
+#define DTAPI_ATTR_SAMPRHW_ABSMIN 9
+#define DTAPI_ATTR_SAMPRHW_HARDLIM 10
+#define DTAPI_ATTR_SAMPRHW_MAX 11
+#define DTAPI_ATTR_SAMPRHW_MIN 12
+#define DTAPI_ATTR_SAMPRATE_ABSMAX 13
+#define DTAPI_ATTR_SAMPRATE_ABSMIN 14
+#define DTAPI_ATTR_SAMPRATE_MAX 15
+#define DTAPI_ATTR_SAMPRATE_MIN 16
+#define DTAPI_ATTR_NUM_FANS 17
+#define DTAPI_ATTR_PCIE_REQ_BW 18
+#define DTAPI_ATTR_PCIE_AVAIL_BW 19
+
+// Order in which devices should be listed by DtapiDeviceScan/DtapiHwFuncScan
+#define DTAPI_SCANORDER_ORIG 0 // Devices are returned in order determined by OS
+#define DTAPI_SCANORDER_SN 1 // Devices are sorted by serial number
+
+// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
+#define DTAPI_DVC2STR_TYPE_NMB 0
+// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
+#define DTAPI_DVC2STR_TYPE_AND_LOC 1
+// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
+#define DTAPI_HWF2STR_TYPE_NMB 0
+// String conversion - Device type number + port (e.g. "DTA-124 port 1")
+#define DTAPI_HWF2STR_TYPE_AND_PORT 1
+// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
+#define DTAPI_HWF2STR_TYPE_AND_LOC 2
+// String conversion - Interface type (e.g. "DVB-ASI" or "DVB-C")
+#define DTAPI_HWF2STR_ITF_TYPE 3
+// String conversion - Short version of interface type (e.g. "ASI" instead "DVB-ASI")
+#define DTAPI_HWF2STR_ITF_TYPE_SHORT 4
+
+// Current genlock state
+#define DTAPI_GENL_NO_REF 1
+#define DTAPI_GENL_LOCKING 2
+#define DTAPI_GENL_LOCKED 3
+
+// Status and error flags for GPS-Synchronisation
+#define DTAPI_GPS_1PPS_SYNC 0x000001
+#define DTAPI_GPS_10MHZ_SYNC 0x000002
+#define DTAPI_GPS_1PPS_ERROR 0x000001
+
+// Constants for GetStateFlags() on port level
+#define DTAPI_STATE_FLAG_INSUFF_USB_BW 0x010000
+#define DTAPI_STATE_FLAG_SDI_NO_LOCK 0x020000
+#define DTAPI_STATE_FLAG_SDI_INVALID 0x040000
+// Constants for GetStateFlags() on device level
+#define DTAPI_STATE_FLAG_VPD_CORRUPT 0x000001
+#define DTAPI_STATE_FLAG_NO_SERIAL 0x000002
+#define DTAPI_STATE_FLAG_NO_USB3 0x000004
+#define DTAPI_STATE_FLAG_SLEEPING 0x000008
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDtaPlusDevice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class representing a DekTec DTA-plus Device
+//
+class DtDtaPlusDevice
+{
+ // Constructor, destructor
+public:
+ DtDtaPlusDevice();
+ virtual ~DtDtaPlusDevice();
+private:
+ // No implementation is provided for the copy constructor
+ DtDtaPlusDevice(const DtDtaPlusDevice&);
+
+ // Public access functions
+public:
+ bool IsAttached(void);
+
+ // Public member functions
+public:
+ DTAPI_RESULT AttachToDevice(const DtDtaPlusDeviceDesc &DvcDesc);
+ DTAPI_RESULT AttachToSerial(__int64 SerialNumber);
+ DTAPI_RESULT Detach();
+ DTAPI_RESULT GetDeviceStatus(int &Status); 
+ DTAPI_RESULT GetTempControlStatus(int &ControlStatus);
+ DTAPI_RESULT GetTemperature(int &Temperature);
+ DTAPI_RESULT GetSerialNumber(__int64 &SerialNumber);
+ DTAPI_RESULT SetRfOutLevel(int Level);
+ DTAPI_RESULT SetFreq(int Freq);
+
+private:
+ DtaPlusDevice* m_Dev;
+};
+
+// DTA-plus status codes
+#define DTAPI_DTAPLUS_STATUS_OFF 0 // DTA-Plus not ready for operation
+#define DTAPI_DTAPLUS_STATUS_ON 1 // DTA-Plus ready for operation
+#define DTAPI_DTAPLUS_STATUS_ATTN_FOLLOW_UP 2 // DTA-Plus attenuator ctrl following up
+#define DTAPI_DTAPLUS_STATUS_ATTN_FOLLOW_DOWN 3 //DTA-Plus attenuator ctrl following down
+#define DTAPI_DTAPLUS_STATUS_DAC_FOLLOW_UP 4 // DTA-Plus DAC control following up
+#define DTAPI_DTAPLUS_STATUS_DAC_FOLLOW_DOWN 5 // DTA-Plus DAC control following down
+#define DTAPI_DTAPLUS_STATUS_HOLD 6 // DTA-Plus has valid input signal
+#define DTAPI_DTAPLUS_STATUS_NO_SIGNAL 7 // DTA-Plus has no input signal
+#define DTAPI_DTAPLUS_STATUS_OVER_POWER 8 // DTA-Plus input signal is too high
+
+// DTA-plus temperature control states
+#define DTAPI_DTAPLUS_TEMP_CONTROL_OFF 0 // DTA-Plus temperature control is off
+#define DTAPI_DTAPLUS_TEMP_CONTROL_FAN_ON 1 // DTA-Plus fan is on
+#define DTAPI_DTAPLUS_TEMP_CONTROL_HEATER_ON 2 // DTA-Plus heater is on
+
+// Ethernet speed
+#define DTAPI_NWSPEED_AUTO 0 // Set
+#define DTAPI_NWSPEED_NOLIN 0 // Get
+#define DTAPI_NWSPEED_10MB_HALF 1
+#define DTAPI_NWSPEED_10MB_FULL 2
+#define DTAPI_NWSPEED_100MB_HALF 3
+#define DTAPI_NWSPEED_100MB_FULL 4
+#define DTAPI_NWSPEED_1GB_MASTER 5
+#define DTAPI_NWSPEED_1GB_SLAVE 6
+
+// Microcode upload states
+#define DTAPI_UCODE_NOT_LOADED 0
+#define DTAPI_UCODE_LOADING 1
+#define DTAPI_UCODE_LOADED 2
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtInpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class to represent an input channel
+//
+class DtInpChannel
+{
+public:
+ DtInpChannel();
+ virtual ~DtInpChannel();
+private:
+ // No implementation is provided for the copy constructor
+ DtInpChannel(const DtInpChannel&);
+
+public:
+ DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
+
+ // Convenience functions
+public:
+ int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
+ int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
+ bool IsAttached(void) { return m_pInp != NULL; }
+ int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
+ bool HasCaps(const DtCaps Caps) const 
+ { 
+ return ((m_HwFuncDesc.m_Flags & Caps) == Caps); 
+ }
+
+public:
+ DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
+ bool Exclusive=true, bool ProbeOnly=false);
+ DTAPI_RESULT BlindScan(int NumEntries, int& NumEntriesResult, 
+ DtTransmitter* pScanResults, __int64 FreqHzSteps=10000000LL, 
+ __int64 StartFreqHz=-1, __int64 EndFreqHz=-1);
+ DTAPI_RESULT BlindScan(DtBsProgressFunc* pCallback, void* pOpaque,
+ const DtDemodPars& DemodPars, 
+ __int64 FreqHzSteps=10000000LL, __int64 StartFreqHz=-1, 
+ __int64 EndFreqHz=-1);
+ DTAPI_RESULT CancelBlindScan();
+ DTAPI_RESULT CancelSpectrumScan();
+ DTAPI_RESULT ClearFifo();
+ DTAPI_RESULT ClearFlags(int Latched);
+ DTAPI_RESULT Detach(int DetachMode);
+ DTAPI_RESULT DetectIoStd(int& Value, int& SubValue);
+ DTAPI_RESULT Equalise(int EqualiserSetting);
+ DTAPI_RESULT GetConstellationPoints(int NumPoints, DtConstelPoint* pPoint);
+ DTAPI_RESULT GetDemodControl(int& ModType,
+ int& ParXtra0, int& ParXtra1, int& ParXtra2);
+ DTAPI_RESULT GetDemodControl(DtDemodPars* pDemodPars);
+ DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ DTAPI_RESULT GetFifoLoad(int& FifoLoad);
+ DTAPI_RESULT GetFlags(int& Flags, int& Latched);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, __int64& ParXtra0);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
+ DTAPI_RESULT GetIpStat(DtIpStat* pIpStat);
+ DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
+ DTAPI_RESULT GetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT GetRxClkFreq(int& RxClkFreq);
+ DTAPI_RESULT GetRxControl(int& RxControl);
+ DTAPI_RESULT GetRxMode(int& RxMode);
+ DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetStatistic(int Type, int& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, double& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, bool& Statistic);
+ DTAPI_RESULT GetStatus(int& PacketSize, int& NumInv, int& ClkDet,
+ int& AsiLock, int& RateOk, int& AsiInv);
+ DTAPI_RESULT GetStreamSelection(DtDabEtiStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDabStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDvbC2StreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDvbTStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDvbT2StreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtIsdbtStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtT2MiStreamSelPars& StreamSel);
+ DTAPI_RESULT GetSupportedStatistics(int& Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
+ DTAPI_RESULT GetTsRateBps(int& TsRate);
+ DTAPI_RESULT GetTunerFrequency(__int64& FreqHz, int TunerId=-1);
+ DTAPI_RESULT GetViolCount(int& ViolCount);
+ DTAPI_RESULT I2CLock(int TimeOut);
+ DTAPI_RESULT I2CUnlock(void);
+ DTAPI_RESULT I2CRead(int DvcAddr, char* pBuffer, int NumBytesToRead);
+ DTAPI_RESULT I2CWrite(int DvcAddr, char* pBuffer, int NumBytesToWrite);
+ DTAPI_RESULT I2CWriteRead(int DvcAddrWrite, char* pBufferWrite, int NumBytesToWrite,
+ int DvcAddrRead, char* pBufferRead, int NumBytesToRead);
+ DTAPI_RESULT LedControl(int LedControl);
+ DTAPI_RESULT LnbEnable(bool Enable);
+ DTAPI_RESULT LnbEnableTone(bool Enable);
+ DTAPI_RESULT LnbSetVoltage(int Level);
+ DTAPI_RESULT LnbSendBurst(int BurstType);
+ DTAPI_RESULT LnbSendDiseqcMessage(const unsigned char* MsgOut, int NumBytesOut);
+ DTAPI_RESULT LnbSendDiseqcMessage(const unsigned char* MsgOut, int NumBytesOut, 
+ unsigned char* MsgIn, int& NumBytesIn);
+ DTAPI_RESULT PolarityControl(int Polarity);
+ DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead);
+ DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead, int TimeOut);
+ DTAPI_RESULT ReadFrame(unsigned int* pFrame, int& FrameSize, int TimeOut=-1);
+ DTAPI_RESULT RegisterDemodCallback(IDtDemodEvent* pIEvent, __int64 Events=-1);
+ DTAPI_RESULT Reset(int ResetMode);
+ DTAPI_RESULT SetAdcSampleRate(int SampleRate);
+ DTAPI_RESULT SetAntPower(int AntPower);
+ DTAPI_RESULT SetDemodControl(int ModType, int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT SetDemodControl(DtDemodPars *pDemodPars);
+ DTAPI_RESULT SetErrorStatsMode(int ModType, int Mode);
+ DTAPI_RESULT SetFifoSize(int FifoSize);
+ DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
+ DTAPI_RESULT SetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT SetRxControl(int RxControl);
+ DTAPI_RESULT SetRxMode(int RxMode);
+ DTAPI_RESULT SetStreamSelection(DtDabEtiStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDabStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDvbC2StreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDvbTStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDvbT2StreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtIsdbtStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtT2MiStreamSelPars& StreamSel);
+ DTAPI_RESULT StatisticsPollingEnable(bool Enable);
+ DTAPI_RESULT SetTuningMode(int Mode);
+ DTAPI_RESULT SetTunerFrequency(__int64 FreqHz, int TunerId=-1);
+ DTAPI_RESULT SpectrumScan(DtSpsProgressFunc* pCallback, void* pOpaque, int ScanType,
+ __int64 FreqHzSteps=1000000LL, __int64 StartFreqHz=-1L,
+ __int64 EndFreqHz=-1L);
+ DTAPI_RESULT Tune(__int64 FreqHz, int ModType,
+ int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT Tune(__int64 FreqHz, DtDemodPars *pDemodPars);
+
+ // Encapsulated data
+private:
+ IXpMutex* m_pMTLock; // Multi-threading lock for Get/Read functions
+ void* m_pDetachLockCount;
+ int m_Port;
+ bool m_WantToDetach;
+
+public: // TODOSD should be protected
+ InpChannel* m_pInp; // Input channel implementation
+ 
+// Private helper functions
+private:
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+ DTAPI_RESULT ReadAccessLock(void);
+ DTAPI_RESULT ReadAccessUnlock(void);
+ DTAPI_RESULT ReadWithTimeOut(char* pBuf, int NumBytesToRead, int TimeOut = -1);
+};
+
+// Tuner freq has changed
+#define DTAPI_EV_TUNE_FREQ_CHANGED 0x0000000000000001LL
+// Tuning parameters have changed
+#define DTAPI_EV_TUNE_PARS_CHANGED 0x0000000000000002LL
+
+#define DTAPI_ERRORSTATS_BER 0 // Bit error rate (default)
+#define DTAPI_ERRORSTATS_RS 1 // Reed-Solomon packet errors
+
+// Feature not supported
+#define DTAPI_NOT_SUPPORTED -1
+
+// ASI Polarity-Control Status
+#define DTAPI_ASIINV_NORMAL 0
+#define DTAPI_ASIINV_INVERT 1
+
+// ASI Input-Clock Lock
+#define DTAPI_ASI_NOLOCK 0
+#define DTAPI_ASI_INLOCK 1
+
+// SDI Input-Clock Lock
+#define DTAPI_GENLOCK_NOLOCK 0
+#define DTAPI_GENLOCK_INLOCK 1
+
+// Clock Detector
+#define DTAPI_CLKDET_FAIL 0
+#define DTAPI_CLKDET_OK 1
+
+// Input Rate Ok
+#define DTAPI_INPRATE_LOW 0
+#define DTAPI_INPRATE_OK 1
+
+// #Invalid bytes per packet
+#define DTAPI_NUMINV_NONE 0
+#define DTAPI_NUMINV_16 1
+#define DTAPI_NUMINV_OTHER 2
+
+// Packet Size
+#define DTAPI_PCKSIZE_INV 0
+#define DTAPI_PCKSIZE_188 2
+#define DTAPI_PCKSIZE_204 3
+
+// SDI Mode
+#define DTAPI_SDIMODE_INV 0
+#define DTAPI_SDIMODE_525 1
+#define DTAPI_SDIMODE_625 2
+
+// Receive Control
+#define DTAPI_RXCTRL_IDLE 0
+#define DTAPI_RXCTRL_RCV 1
+
+// Receive mode for Transport Streams - Modes
+#define DTAPI_RXMODE_TS 0x10
+#define DTAPI_RXMODE_TS_MODE_BITS 0x0F
+#define DTAPI_RXMODE_ST188 (DTAPI_RXMODE_TS | 0x01)
+#define DTAPI_RXMODE_ST204 (DTAPI_RXMODE_TS | 0x02)
+#define DTAPI_RXMODE_STMP2 (DTAPI_RXMODE_TS | 0x03)
+#define DTAPI_RXMODE_STRAW (DTAPI_RXMODE_TS | 0x04)
+#define DTAPI_RXMODE_STL3 (DTAPI_RXMODE_TS | 0x05)
+#define DTAPI_RXMODE_STL3FULL (DTAPI_RXMODE_TS | 0x06)
+#define DTAPI_RXMODE_IPRAW (DTAPI_RXMODE_TS | 0x07)
+#define DTAPI_RXMODE_RAWASI (DTAPI_RXMODE_TS | 0x08)
+#define DTAPI_RXMODE_STTRP (DTAPI_RXMODE_TS | 0x09)
+#define DTAPI_RXMODE_TS_MASK (DTAPI_RXMODE_TS | DTAPI_RXMODE_TS_MODE_BITS)
+
+// Receive mode for SDI - Modes
+#define DTAPI_RXMODE_SDI 0x1000
+#define DTAPI_RXMODE_SDI_MODE_BITS 0x0F00
+#define DTAPI_RXMODE_SDI_FULL (DTAPI_RXMODE_SDI | 0x100)
+#define DTAPI_RXMODE_SDI_ACTVID (DTAPI_RXMODE_SDI | 0x200)
+#define DTAPI_RXMODE_SDI_MASK (DTAPI_RXMODE_SDI | DTAPI_RXMODE_SDI_MODE_BITS)
+// Receive mode for SDI - Flags
+#define DTAPI_RXMODE_SDI_HUFFMAN 0x00002000
+#define DTAPI_RXMODE_SDI_10B 0x00004000
+#define DTAPI_RXMODE_SDI_16B 0x00008000
+#define DTAPI_RXMODE_SDI_10B_NBO 0x00010000
+#define DTAPI_RXMODE_SDI_FRAMECOUNT 0x00020000
+
+// Receive mode for SDI and Transport Streams - Common flags
+#define DTAPI_RXMODE_TIMESTAMP32 0x01000000
+#define DTAPI_RXMODE_TIMESTAMP64 0x02000000
+
+// Demodulation status flags - FEC lock
+#define DTAPI_DEMOD_FECLOCK_FAIL 0
+#define DTAPI_DEMOD_FECLOCK_OK 1
+// Demodulation status flags - Receiver lock
+#define DTAPI_DEMOD_RCVLOCK_FAIL 0
+#define DTAPI_DEMOD_RCVLOCK_OK 1 
+
+// Channel bands
+#define DTAPI_BAND_BROADCAST_ONAIR 1
+#define DTAPI_BAND_FCC_CABLE 2
+#define DTAPI_BAND_IRC 3
+#define DTAPI_BAND_HRC 4
+
+// RF level bandwith
+#define DTAPI_RFLVL_CHANNEL 0
+#define DTAPI_RFLVL_NARROWBAND 1
+
+// ADC sampling rates
+#define DTAPI_ADCCLK_OFF 0 // Clock is off
+#define DTAPI_ADCCLK_20M647 20647059 // 20.647059 MHz clock
+#define DTAPI_ADCCLK_13M5 13500000 // 13.5 MHz clock
+#define DTAPI_ADCCLK_27M 27000000 // 27.0 MHz clock
+
+// LNB control values
+#define DTAPI_LNB_13V 0 // LNB power 13V
+#define DTAPI_LNB_18V 1 // LNB power 18V
+#define DTAPI_LNB_14V 2 // LNB power 14V
+#define DTAPI_LNB_19V 3 // LNB power 19V
+
+// LNB burst types
+#define DTAPI_LNB_BURST_A 0 // Burst A
+#define DTAPI_LNB_BURST_B 1 // Burst B
+
+// Tuner Parameters - Tuner standard
+#define DTAPI_TUNMOD_QAM 0x1
+#define DTAPI_TUNMOD_ATSC 0x2
+#define DTAPI_TUNMOD_ISDBT 0x3
+#define DTAPI_TUNMOD_DVBT 0x4
+#define DTAPI_TUNMOD_DMBT 0x5
+
+// Tuner Parameters - DTA-2131 specific - Value for automatic computation of parameters
+#define DTAPI_TUN31_AUTO -1 // According to tuner standard
+
+// Tuner Parameters - DTA-2131 specific - Low-pass filter cutoff frequency
+#define DTAPI_TUN31_LPF_1_5MHZ 0 // 1.5 MHz low-pass filter
+#define DTAPI_TUN31_LPF_6MHZ 1 // 6 MHz low-pass filter
+#define DTAPI_TUN31_LPF_7MHZ 2 // 7 MHz low-pass filter
+#define DTAPI_TUN31_LPF_8MHZ 3 // 8 MHz low-pass filter 
+#define DTAPI_TUN31_LPF_9MHZ 4 // 9 MHz low-pass filter 
+
+// Tuner Parameters - DTA-2131 specific - Low-pass filter offset 
+#define DTAPI_TUN31_LPF_0PCT 0 // 0% low-pass filter offset 
+#define DTAPI_TUN31_LPF_4PCT 1 // 4% low-pass filter offset 
+#define DTAPI_TUN31_LPF_8PCT 2 // 8% low-pass filter offset 
+#define DTAPI_TUN31_LPF_12PCT 3 // 12% low-pass filter offset
+
+// Tuner Parameters - DTA-2131 specific - IF hi-pass filter 
+#define DTAPI_TUN31_HPF_DIS 0 // Disabled IF hi-pass filter 
+#define DTAPI_TUN31_HPF_0_4MHZ 1 // 0.4 MHz IF hi-pass filter 
+#define DTAPI_TUN31_HPF_0_85MHZ 2 // 0.85 MHz IF hi-pass filter
+#define DTAPI_TUN31_HPF_1MHZ 3 // 1 MHz IF hi-pass filter
+#define DTAPI_TUN31_HPF_1_5MHZ 4 // 1.5 MHz IF hi-pass filter
+
+// Tuner Parameters - DTA-2131 specific - Notch settings
+#define DTAPI_TUN31_NOTCH_DIS 0 // Disable
+#define DTAPI_TUN31_NOTCH_ENA 1 // Enable
+
+// Tuner Parameters - DTA-2139 specific - Agc specific
+#define DTAPI_AGC1_FREE 0
+#define DTAPI_AGC1_FROZEN 1
+
+// Tuning mode - DTU-236A/238 specific
+#define DTAPI_TUNING_NORMAL 0 // Standard tuning mode
+#define DTAPI_TUNING_INDEPENDENT 1 // Multiple tuners, tuned independently
+
+// Tuner ID - DTU-236A/238 specific
+#define DTAPI_TUNERID_ALL -1 // ID for all tuners
+#define DTAPI_TUNERID_MAIN 0 // ID for main tuner
+#define DTAPI_TUNERID_MEASUREMENT 1 // ID for measurement tuner
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtOutpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class to represent a transport-stream or SDI output channel
+//
+class DtOutpChannel
+{
+public:
+ DtOutpChannel();
+ virtual ~DtOutpChannel();
+private:
+ // No implementation is provided for the copy constructor
+ DtOutpChannel(const DtOutpChannel&);
+
+public:
+ DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
+
+ // Convenience functions
+public:
+ int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
+ int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
+ bool IsAttached(void) { return m_pOutp != NULL; }
+ int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
+ bool HasCaps(const DtCaps Caps) const 
+ { 
+ return ((m_HwFuncDesc.m_Flags & Caps) == Caps); 
+ }
+
+public:
+ virtual DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port, bool ProbeOnly=false);
+ virtual DTAPI_RESULT ClearFifo(void);
+ virtual DTAPI_RESULT ClearFlags(int Latched);
+ virtual DTAPI_RESULT ClearSfnErrors();	
+ virtual DTAPI_RESULT Detach(int DetachMode);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, DtModPars& ModParVals, int& AttrValue);
+ virtual DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ virtual DTAPI_RESULT GetExtClkFreq(int& ExtClkFreq);
+ virtual DTAPI_RESULT GetFailsafeAlive(bool& Alive);
+ virtual DTAPI_RESULT GetFailsafeConfig(bool& Enable, int& Timeout);
+ virtual DTAPI_RESULT GetFifoLoad(int& FifoLoad, int SubChan=0);
+ virtual DTAPI_RESULT GetFifoSize(int& FifoSize);
+ virtual DTAPI_RESULT GetFifoSizeMax(int& FifoSizeMax);
+ virtual DTAPI_RESULT GetFifoSizeTyp(int& FifoSizeTyp);
+ virtual DTAPI_RESULT GetFlags(int& Status, int& Latched);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ virtual DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
+ virtual DTAPI_RESULT GetModControl(int& ModType, int& ParXtra0, int& ParXtra1,
+ int& ParXtra2, void*& pXtraPars);
+ virtual DTAPI_RESULT GetOutputLevel(int& LeveldBm);
+ virtual DTAPI_RESULT GetRfControl(__int64& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetRfControl(int& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetRfControl(double& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetSfnMaxTimeDiff(int& TimeDiff);
+ virtual DTAPI_RESULT GetSfnModDelay(int& ModDelay);
+ virtual DTAPI_RESULT GetSfnStatus(int& Status, int& Error);
+ virtual DTAPI_RESULT GetSpiClk(int& SpiClk);
+ virtual DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
+ virtual DTAPI_RESULT GetTsRateBps(int& TsRate);
+ virtual DTAPI_RESULT GetTsRateBps(DtFractionInt& TsRate);
+ virtual DTAPI_RESULT GetTxControl(int& TxControl);
+ virtual DTAPI_RESULT GetTxMode(int& TxMode, int& TxStuffMode);
+ virtual DTAPI_RESULT LedControl(int LedControl);
+ virtual DTAPI_RESULT Reset(int ResetMode);
+ virtual DTAPI_RESULT SetChannelModelling(bool CmEnable, DtCmPars& CmPars); 
+ virtual DTAPI_RESULT SetCustomRollOff(bool Enable, DtFilterPars& Filter); 
+ virtual DTAPI_RESULT SetFailsafeAlive();
+ virtual DTAPI_RESULT SetFailsafeConfig(bool Enable, int Timeout = 0);
+ virtual DTAPI_RESULT SetFifoSize(int FifoSize);
+ virtual DTAPI_RESULT SetFifoSizeMax(void);
+ virtual DTAPI_RESULT SetFifoSizeTyp(void);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT SetIsdbtCaptFile(void* IsdbtFile);
+ virtual DTAPI_RESULT SetModControl(DtCmmbPars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbC2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbCidPars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbS2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbT2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtIqDirectPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbsPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbtPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbTmmPars&);
+ virtual DTAPI_RESULT SetModControl(int ModType, int ParXtra0, int ParXtra1, 
+ int ParXtra2);
+ virtual DTAPI_RESULT SetModControl(unsigned char*);
+ virtual DTAPI_RESULT SetMultiModConfig(int NumSubChan, int FreqSpacing);
+ virtual DTAPI_RESULT SetOutputLevel(int LeveldBm);
+ virtual DTAPI_RESULT SetPhaseNoiseControl(DtPhaseNoisePars& PnPars);
+ virtual DTAPI_RESULT SetPower(int Power);
+ virtual DTAPI_RESULT SetRfControl(__int64 RfFreq);
+ virtual DTAPI_RESULT SetRfControl(double RfFreq);
+ virtual DTAPI_RESULT SetRfControl(int RfFreq);
+ virtual DTAPI_RESULT SetRfMode(int RfMode);
+ virtual DTAPI_RESULT SetRfMode(int Sel, int Mode);
+ virtual DTAPI_RESULT SetSfnAllowedTimeDiff(int TimeDiff);
+ virtual DTAPI_RESULT SetSfnControl(int SnfMode, int TimeOffset);
+ virtual DTAPI_RESULT SetSnr(int Mode, int Snr);
+ virtual DTAPI_RESULT SetSpiClk(int SpiClk);
+ virtual DTAPI_RESULT SetTsRateBps(int TsRate);
+ virtual DTAPI_RESULT SetTsRateBps(DtFractionInt TsRate);
+ virtual DTAPI_RESULT SetTsRateRatio(int TsRate, int ClockRef);
+ virtual DTAPI_RESULT SetTxControl(int TxControl);
+ virtual DTAPI_RESULT SetTxMode(int TxMode, int StuffMode);
+ virtual DTAPI_RESULT SetTxPolarity(int TxPolarity);
+ virtual DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite, int SubChan=0);
+ // Undocumented
+ virtual DTAPI_RESULT GetModBufLoads(bool&, int&, int&, int&);
+
+public: // TODOSD should be protected
+ OutpChannel* m_pOutp; // Output channel implementation
+
+private:
+ void* m_pDetachLockCount;
+ bool m_WantToDetach;
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMplpOutpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMplpOutpChannel : public DtOutpChannel
+{
+public:
+ DtMplpOutpChannel();
+ virtual ~DtMplpOutpChannel();
+private:
+ // No implementation is provided for the copy constructor
+ DtMplpOutpChannel(const DtMplpOutpChannel&);
+
+public:
+ virtual bool IsAttached(void);
+
+public:
+ virtual DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port, bool ProbeOnly=false);
+ virtual DTAPI_RESULT ClearFifo(void);
+ virtual DTAPI_RESULT ClearFlags(int Latched);
+ virtual DTAPI_RESULT ClearSfnErrors();	
+ virtual DTAPI_RESULT Detach(int DetachMode);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, DtModPars& ModParVals, int& AttrValue);
+ virtual DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ virtual DTAPI_RESULT GetExtClkFreq(int& ExtClkFreq);
+ virtual DTAPI_RESULT GetFailsafeAlive(bool& Alive);
+ virtual DTAPI_RESULT GetFailsafeConfig(bool& Enable, int& Timeout);
+ virtual DTAPI_RESULT GetFifoLoad(int& FifoLoad, int SubChan=0);
+ virtual DTAPI_RESULT GetFifoSize(int& FifoSize);
+ virtual DTAPI_RESULT GetFifoSizeMax(int& FifoSizeMax);
+ virtual DTAPI_RESULT GetFifoSizeTyp(int& FifoSizeTyp);
+ virtual DTAPI_RESULT GetFlags(int& Status, int& Latched);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, 
+ __int64& ParXtra0, __int64& ParXtra1);
+ virtual DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
+ virtual DTAPI_RESULT GetModControl(int& ModType, int& CodeRate,
+ int& ParXtra1, int& ParXtra2, void*& pXtraPars);
+ virtual DTAPI_RESULT GetOutputLevel(int& LeveldBm);
+ virtual DTAPI_RESULT GetRfControl(__int64& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetRfControl(int& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetRfControl(double& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetSfnMaxTimeDiff(int& TimeDiff);
+ virtual DTAPI_RESULT GetSfnModDelay(int& ModDelay);
+ virtual DTAPI_RESULT GetSfnStatus(int& Status, int& Error);
+ virtual DTAPI_RESULT GetSpiClk(int& SpiClk);
+ virtual DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
+ virtual DTAPI_RESULT GetTsRateBps(int& TsRate);
+ virtual DTAPI_RESULT GetTsRateBps(DtFractionInt& TsRate);
+ virtual DTAPI_RESULT GetTxControl(int& TxControl);
+ virtual DTAPI_RESULT GetTxMode(int& TxMode, int& TxStuffMode);
+ virtual DTAPI_RESULT LedControl(int LedControl);
+ virtual DTAPI_RESULT Reset(int ResetMode);
+ virtual DTAPI_RESULT SetChannelModelling(bool CmEnable, DtCmPars& CmPars); 
+ virtual DTAPI_RESULT SetCustomRollOff(bool Enable, DtFilterPars& Filter); 
+
+ virtual DTAPI_RESULT SetFailsafeConfig(bool Enable, int Timeout = 0);
+ virtual DTAPI_RESULT SetFailsafeAlive();
+ virtual DTAPI_RESULT SetFifoSize(int FifoSize);
+ virtual DTAPI_RESULT SetFifoSizeMax(void);
+ virtual DTAPI_RESULT SetFifoSizeTyp(void);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT SetIsdbtCaptFile(void* IsdbtFile);
+ virtual DTAPI_RESULT SetModControl(DtCmmbPars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbC2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbCidPars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbS2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbT2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtIqDirectPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbsPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbtPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbTmmPars&);
+ virtual DTAPI_RESULT SetModControl(int ModType, int ParXtra0, int ParXtra1, 
+ int ParXtra2);
+ virtual DTAPI_RESULT SetModControl(unsigned char*);
+ virtual DTAPI_RESULT SetMultiModConfig(int NumSubChan, int FreqSpacing);
+ virtual DTAPI_RESULT SetOutputLevel(int LeveldBm);
+ virtual DTAPI_RESULT SetPhaseNoiseControl(DtPhaseNoisePars& PnPars);
+ virtual DTAPI_RESULT SetPower(int Power);
+ virtual DTAPI_RESULT SetRfControl(__int64 RfFreq);
+ virtual DTAPI_RESULT SetRfControl(double RfFreq);
+ virtual DTAPI_RESULT SetRfControl(int RfFreq);
+ virtual DTAPI_RESULT SetRfMode(int RfMode);
+ virtual DTAPI_RESULT SetRfMode(int Sel, int Mode);
+ virtual DTAPI_RESULT SetSfnAllowedTimeDiff(int TimeDiff);
+ virtual DTAPI_RESULT SetSfnControl(int SnfMode, int TimeOffset);
+ virtual DTAPI_RESULT SetSnr(int Mode, int Snr);
+ virtual DTAPI_RESULT SetSpiClk(int SpiClk);
+ virtual DTAPI_RESULT SetTsRateBps(int TsRate);
+ virtual DTAPI_RESULT SetTsRateBps(DtFractionInt TsRate);
+ virtual DTAPI_RESULT SetTsRateRatio(int TsRate, int ClockRef);
+ virtual DTAPI_RESULT SetTxControl(int TxControl);
+ virtual DTAPI_RESULT SetTxMode(int TxMode, int TxStuffMode);
+ virtual DTAPI_RESULT SetTxPolarity(int TxPolarity);
+ virtual DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite, int SubChan=0);
+ // Undocumented
+ virtual DTAPI_RESULT GetModBufLoads(bool&, int&, int&, int&);
+
+ // IMplpModulator interface implementation
+public:
+ virtual DTAPI_RESULT AttachVirtual(DtDevice* pDtDvc, 
+ bool (*pFunc)(void*, DtVirtualOutData*), void* pOpaque);
+ virtual DTAPI_RESULT GetMplpFifoFree(int FifoIdx, int& FifoFree);
+ virtual DTAPI_RESULT GetMplpFifoLoad(int FifoIdx, int& FifoLoad);
+ virtual DTAPI_RESULT GetMplpFifoSize(int FifoIdx, int& FifoSize);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbC2ModStatus* pMplpModStat);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbS2ModStatus* pMplpModStat);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbT2ModStatus* pMplpModStat);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbT2ModStatus* pMplpModStat1,
+ DtDvbT2ModStatus* pMplpModStat2);
+ virtual DTAPI_RESULT SetMplpChannelModelling(bool CmEnable, DtCmPars&, int Chan=0);
+ virtual DTAPI_RESULT WriteMplp(int FifoIdx, char* pBuffer, int NumBytesToWrite);
+ virtual DTAPI_RESULT WriteMplpPacket(int FifoIdx, char* pPacket, int PacketSize);
+
+private:
+ bool m_IsAttachedToVirtual;
+ MplpHelper* m_pMplpHelper;
+};
+
+// Detach mode flags
+#define DTAPI_INSTANT_DETACH 1
+#define DTAPI_WAIT_UNTIL_SENT 2
+
+// Equaliser settings 
+#define DTAPI_EQUALISER_OFF 0
+#define DTAPI_EQUALISER_ON 1
+
+// LED control
+#define DTAPI_LED_OFF 0
+#define DTAPI_LED_GREEN 1
+#define DTAPI_LED_RED 2
+#define DTAPI_LED_YELLOW 3
+#define DTAPI_LED_BLUE 4
+#define DTAPI_LED_HARDWARE 5
+
+// Noise modes
+#define DTAPI_NOISE_DISABLED 0 // No noise generation
+#define DTAPI_NOISE_WNG_HW 1 // White noise generator (hardware)
+
+// Polarity control
+#define DTAPI_POLARITY_AUTO 0
+#define DTAPI_POLARITY_NORMAL 2
+#define DTAPI_POLARITY_INVERT 3
+
+// Power mode
+#define DTAPI_POWER_OFF 0
+#define DTAPI_POWER_ON 1
+
+// Reset mode
+#define DTAPI_FIFO_RESET 0
+#define DTAPI_FULL_RESET 1
+
+// RF PLL lock status
+#define DTAPI_RFPLL_LOCK1 1 // RF PLL #1 is in lock
+#define DTAPI_RFPLL_LOCK2 2 // RF PLL #2 is in lock
+#define DTAPI_RFPLL_LOCK3 4 // RF PLL #3 is in lock
+
+// Receiver status flags
+#define DTAPI_RX_FIFO_OVF 0x0002
+#define DTAPI_RX_SYNC_ERR 0x0004
+#define DTAPI_RX_RATE_OVF 0x0008
+#define DTAPI_RX_TARGET_ERR 0x0010
+#define DTAPI_RX_LINK_ERR 0x0040
+#define DTAPI_RX_DATA_ERR 0x0080
+#define DTAPI_RX_DRV_BUF_OVF 0x0100
+#define DTAPI_RX_SYNTAX_ERR 0x0200
+
+// Single Frequency Network status andd error flags
+#define DTAPI_SFN_IN_SYNC 0x0001
+#define DTAPI_SFN_TOO_EARLY_ERR 0x0001
+#define DTAPI_SFN_TOO_LATE_ERR 0x0002
+#define DTAPI_SFN_ABSTIME_ERR 0x0004
+#define DTAPI_SFN_DISCTIME_ERR 0x0008
+#define DTAPI_SFN_NOTIME_ERR 0x0010
+#define DTAPI_SFN_START_ERR 0x0020
+
+// Single Frequency operation mode
+#define DTAPI_SFN_MODE_DISABLED 0x0000
+#define DTAPI_SFN_MODE_AT_1PPS 0x0001
+#define DTAPI_SFN_MODE_IQPCK 0x0002
+#define DTAPI_SFN_MODE_DVBT_MIP 0x0003
+#define DTAPI_SFN_MODE_T2MI 0x0004
+
+// Transmit status flags
+#define DTAPI_TX_FIFO_UFL 0x0002
+#define DTAPI_TX_SYNC_ERR 0x0004
+#define DTAPI_TX_READBACK_ERR 0x0008
+#define DTAPI_TX_TARGET_ERR 0x0010
+#define DTAPI_TX_MUX_OVF 0x0020
+#define DTAPI_TX_FIFO_OVF 0x0020
+#define DTAPI_TX_LINK_ERR 0x0040
+#define DTAPI_TX_DATA_ERR 0x0080
+#define DTAPI_TX_CPU_UFL 0x0100
+#define DTAPI_TX_DMA_UFL 0x0200
+
+// Target adapter present
+#define DTAPI_NO_CONNECTION 0
+#define DTAPI_DVB_SPI_SINK 1 // For output channels
+#define DTAPI_DVB_SPI_SOURCE 1 // For input channels
+#define DTAPI_TARGET_PRESENT 2
+#define DTAPI_TARGET_UNKNOWN 3
+
+// Transmit control
+#define DTAPI_TXCTRL_IDLE 1
+#define DTAPI_TXCTRL_HOLD 2
+#define DTAPI_TXCTRL_SEND 3
+
+// Transmit mode for Transport Streams - Modes
+#define DTAPI_TXMODE_TS 0x10
+#define DTAPI_TXMODE_TS_MODE_BITS 0x0F
+#define DTAPI_TXMODE_188 (DTAPI_TXMODE_TS | 0x01)
+#define DTAPI_TXMODE_192 (DTAPI_TXMODE_TS | 0x02)
+#define DTAPI_TXMODE_204 (DTAPI_TXMODE_TS | 0x03)
+#define DTAPI_TXMODE_ADD16 (DTAPI_TXMODE_TS | 0x04)
+#define DTAPI_TXMODE_MIN16 (DTAPI_TXMODE_TS | 0x05)
+#define DTAPI_TXMODE_IPRAW (DTAPI_TXMODE_TS | 0x06)
+#define DTAPI_TXMODE_RAW (DTAPI_TXMODE_TS | 0x07)
+#define DTAPI_TXMODE_RAWASI (DTAPI_TXMODE_TS | 0x08)
+#define DTAPI_TXMODE_TS_MASK (DTAPI_TXMODE_TS | DTAPI_TXMODE_TS_MODE_BITS)
+// Transmit mode for Transport Streams - DVB-ASI flags
+#define DTAPI_TXMODE_BURST 0x20
+#define DTAPI_TXMODE_TXONTIME 0x40
+
+// Transmit mode for SDI - Modes
+#define DTAPI_TXMODE_SDI 0x1000
+#define DTAPI_TXMODE_SDI_MODE_BITS 0x0F00
+#define DTAPI_TXMODE_SDI_FULL (DTAPI_TXMODE_SDI | 0x100)
+#define DTAPI_TXMODE_SDI_ACTVID (DTAPI_TXMODE_SDI | 0x200)
+#define DTAPI_TXMODE_SDI_MASK (DTAPI_TXMODE_SDI | DTAPI_TXMODE_SDI_MODE_BITS)
+// Transmit mode for SDI - Flags
+#define DTAPI_TXMODE_SDI_HUFFMAN 0x00002000
+#define DTAPI_TXMODE_SDI_10B 0x00004000
+#define DTAPI_TXMODE_SDI_16B 0x00008000
+#define DTAPI_TXMODE_SDI_10B_NBO 0x00010000
+
+// Stuff mode - TS : Null-packet stuffing on/off; SDI: Black-frame stuffing on/off
+#define DTAPI_TXSTUFF_MODE_OFF 0
+#define DTAPI_TXSTUFF_MODE_ON 1
+
+// Transmit polarity
+#define DTAPI_TXPOL_NORMAL 0
+#define DTAPI_TXPOL_INVERTED 1
+
+// Upconverter RF modes
+#define DTAPI_UPCONV_MODE 0 // Selects NORMAL/MUTE/CW/CWI/CWQ
+#define DTAPI_UPCONV_MODE_MSK 0xF // Mask for mode field
+#define DTAPI_UPCONV_NORMAL 0
+#define DTAPI_UPCONV_MUTE 1
+#define DTAPI_UPCONV_CW 2
+#define DTAPI_UPCONV_CWI 3
+#define DTAPI_UPCONV_CWQ 4
+#define DTAPI_UPCONV_SPECINV 0x100 // Can be OR-ed with other RF modes
+
+// USB speed modes
+#define DTAPI_USB_FULL_SPEED 0
+#define DTAPI_USB_HIGH_SPEED 1
+#define DTAPI_USB_SUPER_SPEED 2
+
+// PCIe standards
+#define DTAPI_PCIE_GEN_UNKNOWN 0 // PCIe Gen is unknown
+#define DTAPI_PCIE_GEN1 1 // PCIe Gen 1 (2.5Gbps per link)
+#define DTAPI_PCIE_GEN2 2 // PCIe Gen 2 (5.0Gbps per link)
+#define DTAPI_PCIE_GEN3 3 // PCIe Gen 3 (8.0Gbps per link)
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Modulation Parameters -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+// Modulation types
+#define DTAPI_MOD_DVBS_QPSK 0 // Native DVB-S on DTA-107
+#define DTAPI_MOD_DVBS_BPSK 1
+#define DTAPI_MOD_QAM4 3
+#define DTAPI_MOD_QAM16 4
+#define DTAPI_MOD_QAM32 5
+#define DTAPI_MOD_QAM64 6
+#define DTAPI_MOD_QAM128 7
+#define DTAPI_MOD_QAM256 8
+#define DTAPI_MOD_DVBT 9
+#define DTAPI_MOD_ATSC 10
+#define DTAPI_MOD_DVBT2 11
+#define DTAPI_MOD_ISDBT 12
+#define DTAPI_MOD_ISDBS 13
+#define DTAPI_MOD_IQDIRECT 15
+#define DTAPI_MOD_IQ_2131 16 // DTA-2131 specific (de)modulation
+#define DTAPI_MOD_DVBS2_QPSK 32
+#define DTAPI_MOD_DVBS2_8PSK 33
+#define DTAPI_MOD_DVBS2_16APSK 34
+#define DTAPI_MOD_DVBS2_32APSK 35
+#define DTAPI_MOD_DVBS2_L3 36 
+#define DTAPI_MOD_DVBS2 37
+#define DTAPI_MOD_DMBTH 48
+#define DTAPI_MOD_ADTBT 49
+#define DTAPI_MOD_CMMB 50
+#define DTAPI_MOD_T2MI 51
+#define DTAPI_MOD_DVBC2 52 
+#define DTAPI_MOD_DAB 53 
+#define DTAPI_MOD_QAM_AUTO 54 
+#define DTAPI_MOD_ATSC_MH 55
+#define DTAPI_MOD_ISDBTMM 56
+// Modulation types DVB-S2X specific
+#define DTAPI_MOD_S2X_QPSK_VLSNR 57 // DVB-S2X, QPSK, very low SNR
+#define DTAPI_MOD_S2X_BPSK_VLSNR 58 // DVB-S2X, BPSK, very low SNR
+#define DTAPI_MOD_S2X_BPSK_S_VLSNR 59 // DVB-S2X, BPSK-S, very low SNR
+#define DTAPI_MOD_S2X_8APSK_L 60 // DVB-S2X, 8APSK-L
+#define DTAPI_MOD_S2X_16APSK_L 61 // DVB-S2X, 16APSK-L
+#define DTAPI_MOD_S2X_32APSK_L 62 // DVB-S2X, 32APSK-L
+#define DTAPI_MOD_S2X_64APSK 63 // DVB-S2X, 64APSK
+#define DTAPI_MOD_S2X_64APSK_L 64 // DVB-S2X, 64APSK-L
+#define DTAPI_MOD_S2X_128APSK 65 // DVB-S2X, 128APSK
+#define DTAPI_MOD_S2X_256APSK 66 // DVB-S2X, 256APSK-L
+#define DTAPI_MOD_S2X_256APSK_L 67 // DVB-S2X, 256APSK
+#define DTAPI_MOD_DVBS2X_L3 68 // L3 modulation with S2X support
+#define DTAPI_MOD_TYPE_AUTO -1 // Auto detect modulation type
+#define DTAPI_MOD_TYPE_UNK -1 // Unknown modulation type
+
+// Modulation parameters - Common - ParXtra2
+#define DTAPI_MOD_SYMRATE_AUTO -1 // Auto detect symbol rate
+#define DTAPI_MOD_SYMRATE_UNK -1 // Symbol rate if unknown
+
+// Modulation parameters - ATSC - ParXtra0
+#define DTAPI_MOD_ATSC_VSB8 0x00000000 // 8-VSB, 10.762MBd, 19.392Mbps
+#define DTAPI_MOD_ATSC_VSB16 0x00000001 // 16-VSB, 10.762MBd, 38.785Mbps
+#define DTAPI_MOD_ATSC_VSB_AUTO 0x00000003 // Auto detect constellation
+#define DTAPI_MOD_ATSC_VSB_UNK 0x00000003 // Unknown constellation
+#define DTAPI_MOD_ATSC_VSB_MSK 0x00000003 // Constellation mask
+
+// Modulation parameters - DTMB - Bandwidth
+#define DTAPI_MOD_DTMB_5MHZ 0x00000001
+#define DTAPI_MOD_DTMB_6MHZ 0x00000002
+#define DTAPI_MOD_DTMB_7MHZ 0x00000003
+#define DTAPI_MOD_DTMB_8MHZ 0x00000004
+#define DTAPI_MOD_DTMB_BW_AUTO 0x0000000F // Auto detect
+#define DTAPI_MOD_DTMB_BW_UNK 0x0000000F // Unknown
+#define DTAPI_MOD_DTMB_BW_MSK 0x0000000F
+
+// Modulation parameters - DTMB - Code rate
+#define DTAPI_MOD_DTMB_0_4 0x00000100 // 0.4
+#define DTAPI_MOD_DTMB_0_6 0x00000200 // 0.6
+#define DTAPI_MOD_DTMB_0_8 0x00000300 // 0.8
+#define DTAPI_MOD_DTMB_RATE_AUTO 0x00000F00 // Auto detect
+#define DTAPI_MOD_DTMB_RATE_UNK 0x00000F00 // Unknown
+#define DTAPI_MOD_DTMB_RATE_MSK 0x00000F00 // Mask
+
+// Modulation parameters - DTMB - Constellation
+#define DTAPI_MOD_DTMB_QAM4NR 0x00001000 // 4-QAM-NR
+#define DTAPI_MOD_DTMB_QAM4 0x00002000 // 4-QAM
+#define DTAPI_MOD_DTMB_QAM16 0x00003000 // 16-QAM
+#define DTAPI_MOD_DTMB_QAM32 0x00004000 // 32-QAM
+#define DTAPI_MOD_DTMB_QAM64 0x00005000 // 64-QAM
+#define DTAPI_MOD_DTMB_CO_AUTO 0x0000F000 // Auto detect
+#define DTAPI_MOD_DTMB_CO_UNK 0x0000F000 // Unknown
+#define DTAPI_MOD_DTMB_CO_MSK 0x0000F000 // Mask
+
+// Modulation parameters - DTMB - Frame header mode
+#define DTAPI_MOD_DTMB_PN420 0x00010000 // PN420
+#define DTAPI_MOD_DTMB_PN595 0x00020000 // PN595
+#define DTAPI_MOD_DTMB_PN945 0x00030000 // PN945
+#define DTAPI_MOD_DTMB_PN_AUTO 0x000F0000 // Auto detect
+#define DTAPI_MOD_DTMB_PN_UNK 0x000F0000 // Unknown
+#define DTAPI_MOD_DTMB_PN_MSK 0x000F0000 // Mask
+
+// Modulation parameters - DTMB - Interleaver mode
+#define DTAPI_MOD_DTMB_IL_1 0x00100000 // Interleaver mode 1: B=54, M=240
+#define DTAPI_MOD_DTMB_IL_2 0x00200000 // Interleaver mode 2: B=54, M=720
+#define DTAPI_MOD_DTMB_IL_AUTO 0x00F00000 // Auto detect
+#define DTAPI_MOD_DTMB_IL_UNK 0x00F00000 // Unknown
+#define DTAPI_MOD_DTMB_IL_MSK 0x00F00000 // Mask
+
+// Modulation parameters - DTMB - pilots
+#define DTAPI_MOD_DTMB_NO_PILOTS 0x01000000 // No pilots
+#define DTAPI_MOD_DTMB_PILOTS 0x02000000 // Pilots, C=1 only
+#define DTAPI_MOD_DTMB_PIL_AUTO 0x0F000000 // Auto detect
+#define DTAPI_MOD_DTMB_PIL_UNK 0x0F000000 // Unknown
+#define DTAPI_MOD_DTMB_PIL_MSK 0x0F000000 // Mask
+
+// Modulation parameters - DTMB - Use frame numbering
+#define DTAPI_MOD_DTMB_NO_FRM_NO 0x10000000 // No frame numbering
+#define DTAPI_MOD_DTMB_USE_FRM_NO 0x20000000 // Use frame numbers
+#define DTAPI_MOD_DTMB_UFRM_AUTO 0xF0000000 // Auto detect
+#define DTAPI_MOD_DTMB_UFRM_UNK 0xF0000000 // Unknown
+#define DTAPI_MOD_DTMB_UFRM_MSK 0xF0000000 // Mask
+
+// Modulation parameters - DVB-S, DVB-S2
+#define DTAPI_MOD_1_2 0x0 // Code rate 1/2
+#define DTAPI_MOD_2_3 0x1 // Code rate 2/3
+#define DTAPI_MOD_3_4 0x2 // Code rate 3/4
+#define DTAPI_MOD_4_5 0x3 // Code rate 4/5
+#define DTAPI_MOD_5_6 0x4 // Code rate 5/6
+#define DTAPI_MOD_6_7 0x5 // Code rate 6/7
+#define DTAPI_MOD_7_8 0x6 // Code rate 7/8
+#define DTAPI_MOD_1_4 0x7 // Code rate 1/4
+#define DTAPI_MOD_1_3 0x8 // Code rate 1/3
+#define DTAPI_MOD_2_5 0x9 // Code rate 2/5
+#define DTAPI_MOD_3_5 0xA // Code rate 3/5
+#define DTAPI_MOD_8_9 0xB // Code rate 8/9
+#define DTAPI_MOD_9_10 0xC // Code rate 9/10
+#define DTAPI_MOD_CR_AUTO 0xF // Auto detect code rate
+#define DTAPI_MOD_CR_UNK 0xF // Unknown code rate
+//Coderates DVB-S2X specific
+#define DTAPI_MOD_1_5 0x10 // Code rate 1/5
+#define DTAPI_MOD_2_9 0x11 // Code rate 2/9
+#define DTAPI_MOD_11_45 0x12 // Code rate 11/45
+#define DTAPI_MOD_4_15 0x13 // Code rate 4/15
+#define DTAPI_MOD_13_45 0x14 // Code rate 13/45
+#define DTAPI_MOD_14_45 0x15 // Code rate 14/45
+#define DTAPI_MOD_9_20 0x16 // Code rate 9/20
+#define DTAPI_MOD_7_15 0x17 // Code rate 7/15
+#define DTAPI_MOD_8_15 0x18 // Code rate 8/15
+#define DTAPI_MOD_11_20 0x19 // Code rate 11/20
+#define DTAPI_MOD_5_9 0x1A // Code rate 5/9
+#define DTAPI_MOD_26_45 0x1B // Code rate 26/45
+#define DTAPI_MOD_28_45 0x1C // Code rate 28/45
+#define DTAPI_MOD_23_36 0x1D // Code rate 23/36
+#define DTAPI_MOD_29_45 0x1E // Code rate 29/45
+#define DTAPI_MOD_31_45 0x1F // Code rate 31/45
+#define DTAPI_MOD_25_36 0x20 // Code rate 25/36
+#define DTAPI_MOD_32_45 0x21 // Code rate 32/45
+#define DTAPI_MOD_13_18 0x22 // Code rate 13/18
+#define DTAPI_MOD_11_15 0x23 // Code rate 11/15
+#define DTAPI_MOD_7_9 0x24 // Code rate 7/9
+#define DTAPI_MOD_77_90 0x25 // Code rate 77/90
+
+// Modulation parameters - DVB-S, DVB-S2 - ParXtra1
+#define DTAPI_MOD_S_S2_SPECNONINV 0x00 // No spectrum inversion detected
+#define DTAPI_MOD_S_S2_SPECINV 0x10 // Spectrum inversion detected
+#define DTAPI_MOD_S_S2_SPECINV_AUTO 0x30 // Auto detect spectral inversion
+#define DTAPI_MOD_S_S2_SPECINV_UNK 0x30 // Spectral inversion is unknown
+#define DTAPI_MOD_S_S2_SPECINV_MSK 0x30 // Mask for spectrum inversion field
+
+// Modulation parameters - DVB-S2 - ParXtra1 - Pilots
+#define DTAPI_MOD_S2_NOPILOTS 0x00 // Pilots disabled
+#define DTAPI_MOD_S2_PILOTS 0x01 // Pilots enabled
+#define DTAPI_MOD_S2_PILOTS_AUTO 0x03 // Auto detect pilots
+#define DTAPI_MOD_S2_PILOTS_UNK 0x03 // State of pilots unknown
+#define DTAPI_MOD_S2_PILOTS_MSK 0x03 // Mask for pilots field
+
+// Modulation parameters - DVB-S2 - ParXtra1 - FEC frame length
+#define DTAPI_MOD_S2_LONGFRM 0x00 // Long FECFRAME
+#define DTAPI_MOD_S2_MEDIUMFRM 0x04 // Medium FECFRAME
+#define DTAPI_MOD_S2_SHORTFRM 0x08 // Short FECFRAME
+#define DTAPI_MOD_S2_FRM_AUTO 0x0C // Auto detect frame size
+#define DTAPI_MOD_S2_FRM_UNK 0x0C // Frame size unknown
+#define DTAPI_MOD_S2_FRM_MSK 0x0C // Mask for FECFRAME field
+
+// Modulation parameters - DVB-S2(X) - ParXtra1 - Constellation amplitude for 16-, 32-APSK
+#define DTAPI_MOD_S2_CONST_AUTO 0x00 // Default constellation amplitude
+#define DTAPI_MOD_S2_CONST_E_1 0x40 // E=1; Average symbol energy is constant
+#define DTAPI_MOD_S2_CONST_R_1 0x80 // R=1; Radius of outer ring is constant
+#define DTAPI_MOD_S2_CONST_MSK 0xC0 // Mask for constellation shape
+
+// Modulation parameters - ISDB-S - Input stream
+#define DTAPI_MOD_ISDBS_STREAMTYPE_RAW 0x00 // Raw stream with TMCC in sync bytes
+#define DTAPI_MOD_ISDBS_STREAMTYPE_B15 0x01 // TMCC data following each TS packet
+#define DTAPI_MOD_ISDBS_STREAMTYPE_AUTO 0x07 // Default (raw) isdb-s input stream
+#define DTAPI_MOD_ISDBS_STREAMTYPE_MASK 0x07 // Mask for input stream type
+
+// Modulation parameters - DVB-T - Bandwidth
+#define DTAPI_MOD_DVBT_5MHZ 0x00000001
+#define DTAPI_MOD_DVBT_6MHZ 0x00000002
+#define DTAPI_MOD_DVBT_7MHZ 0x00000003
+#define DTAPI_MOD_DVBT_8MHZ 0x00000004
+#define DTAPI_MOD_DVBT_BW_UNK 0x0000000F // Unknown bandwidth
+#define DTAPI_MOD_DVBT_BW_MSK 0x0000000F
+
+// Modulation parameters - DVB-T - Constellation
+#define DTAPI_MOD_DVBT_QPSK 0x00000010
+#define DTAPI_MOD_DVBT_QAM16 0x00000020
+#define DTAPI_MOD_DVBT_QAM64 0x00000030
+#define DTAPI_MOD_DVBT_CO_AUTO 0x000000F0 // Auto detect constellation
+#define DTAPI_MOD_DVBT_CO_UNK 0x000000F0 // Unknown constellation
+#define DTAPI_MOD_DVBT_CO_MSK 0x000000F0
+
+// Modulation parameters - DVB-T - Guard interval
+#define DTAPI_MOD_DVBT_G_1_32 0x00000100
+#define DTAPI_MOD_DVBT_G_1_16 0x00000200
+#define DTAPI_MOD_DVBT_G_1_8 0x00000300
+#define DTAPI_MOD_DVBT_G_1_4 0x00000400
+#define DTAPI_MOD_DVBT_GU_AUTO 0x00000F00 // Auto detect guard interval
+#define DTAPI_MOD_DVBT_GU_UNK 0x00000F00 // Unknown guard interval
+#define DTAPI_MOD_DVBT_GU_MSK 0x00000F00
+
+// DVB-T TPS information - DVB-T Hierarchical layer
+#define DTAPI_MOD_DVBT_HARCHY_NONE 0x00000000
+#define DTAPI_MOD_DVBT_HARCHY_A1 0x01000000
+#define DTAPI_MOD_DVBT_HARCHY_A2 0x02000000
+#define DTAPI_MOD_DVBT_HARCHY_A4 0x03000000
+#define DTAPI_MOD_DVBT_HARCHY_MSK 0x0F000000
+// Modulation parameters - DVB-T - Interleaver mode
+#define DTAPI_MOD_DVBT_INDEPTH 0x00001000
+#define DTAPI_MOD_DVBT_NATIVE 0x00002000
+#define DTAPI_MOD_DVBT_IL_AUTO 0x0000F000 // Auto detect interleaver depth
+#define DTAPI_MOD_DVBT_IL_UNK 0x0000F000 // Unknown interleaver depth
+#define DTAPI_MOD_DVBT_IL_MSK 0x0000F000
+
+// Modulation parameters - DVB-T - FFT size
+#define DTAPI_MOD_DVBT_2K 0x00010000
+#define DTAPI_MOD_DVBT_4K 0x00020000
+#define DTAPI_MOD_DVBT_8K 0x00030000
+#define DTAPI_MOD_DVBT_MD_AUTO 0x000F0000 // Auto detect mode
+#define DTAPI_MOD_DVBT_MD_UNK 0x000F0000 // Unknown mode
+#define DTAPI_MOD_DVBT_MD_MSK 0x000F0000
+
+// Modulation parameters - DVB-T - s48
+#define DTAPI_MOD_DVBT_S48_OFF 0x00000000
+#define DTAPI_MOD_DVBT_S48 0x00100000
+#define DTAPI_MOD_DVBT_S48_MSK 0x00100000
+
+// Modulation parameters - DVB-T - s49
+#define DTAPI_MOD_DVBT_S49_OFF 0x00000000
+#define DTAPI_MOD_DVBT_S49 0x00200000
+#define DTAPI_MOD_DVBT_S49_MSK 0x00200000
+
+// Modulation parameters - DVB-T - s48s49
+#define DTAPI_MOD_DVBT_ENA4849 0x00000000
+#define DTAPI_MOD_DVBT_DIS4849 0x00400000
+#define DTAPI_MOD_DVBT_4849_MSK 0x00400000
+
+// Modulation parameters - IQ - ParXtra0
+#define DTAPI_MOD_INTERPOL_RAW 0 // Raw mode, no interpolation
+#define DTAPI_MOD_INTERPOL_OFDM 1 // Use OFDM interpolation
+#define DTAPI_MOD_INTERPOL_QAM 2 // Use QAM interpolation
+
+// Modulation parameters - IQ - ParXtra2 Packing
+#define DTAPI_MOD_IQPCK_AUTO 0x00000000 // Auto IQ-sample packin
+#define DTAPI_MOD_IQPCK_NONE 0x00000001 // No IQ-sample packing
+#define DTAPI_MOD_IQPCK_PCKD 0x00000002 // IQ-samples are already packed
+#define DTAPI_MOD_IQPCK_12B 0x00000003 // IQ-samples packed in 12-bit
+#define DTAPI_MOD_IQPCK_10B 0x00000004 // IQ-samples packed in 10-bit
+#define DTAPI_MOD_IQPCK_UNK 0x000000FF // Unknown (= use auto)
+#define DTAPI_MOD_IQPCK_MSK 0x000000FF
+
+// Modulation parameters - Roll-off factor ParXtra1 (DVB-S2), ParXtra2 (IQ) and
+// Low pass filters ParXtra2 (IQ) 
+#define DTAPI_MOD_ROLLOFF_AUTO 0x00000000 // Default roll-off factor
+#define DTAPI_MOD_ROLLOFF_NONE 0x00000100 // No roll-off
+#define DTAPI_MOD_ROLLOFF_5 0x00000200 // 5% roll-off for DVB-S2X
+#define DTAPI_MOD_ROLLOFF_10 0x00000300 // 10% roll-off for DVB-S2X
+#define DTAPI_MOD_ROLLOFF_15 0x00000400 // 15% roll-off for DVB-S2X
+#define DTAPI_MOD_ROLLOFF_20 0x00000500 // 20% roll-off for DVB-S2
+#define DTAPI_MOD_ROLLOFF_25 0x00000600 // 25% roll-off for DVB-S2
+#define DTAPI_MOD_ROLLOFF_35 0x00000700 // 35% roll-off for DVB-S/S2
+// Pre-defined low pass filters
+#define DTAPI_MOD_LPF_0_614 0x00000800 // Passband up to samplerate*0.614,
+ // used for 2MHz CMMB
+#define DTAPI_MOD_LPF_0_686 0x00000900 // Passband up to samplerate*0.686,
+ // used for ISDB-T/Tmm/Tsb
+#define DTAPI_MOD_LPF_0_754 0x00000A00 // Passband up to samplerate*0.754,
+ // used for 8MHz CMMB, DAB
+#define DTAPI_MOD_LPF_0_833 0x00000B00 // Passband up to samplerate*0.833,
+ // used for DVB-C2/T/T2
+#define DTAPI_MOD_LPF_0_850 0x00000C00 // Passband up to samplerate*0.850,
+ // used for DVB-T2 extended bandwidth
+#define DTAPI_MOD_ROLLOFF_UNK 0x0000FF00 // Unknown (= use default)
+#define DTAPI_MOD_ROLLOFF_MSK 0x0000FF00
+
+// Modulation parameters - DVB-T2-MI - ParXtra0 used for T2-MI bitrate
+
+// Modulation parameters - DVB-T2-MI - ParXtra1
+#define DTAPI_MOD_T2MI_PID1_MSK 0x1FFF
+#define DTAPI_MOD_T2MI_PID1_SHFT 0
+#define DTAPI_MOD_T2MI_PID2_MSK 0x1FFF0000
+#define DTAPI_MOD_T2MI_PID2_SHFT 16
+#define DTAPI_MOD_T2MI_MULT_DIS 0x00000000 // Single Profile
+#define DTAPI_MOD_T2MI_MULT_ENA 0x20000000 // Multi Profile
+#define DTAPI_MOD_T2MI_MULT_MSK 0x20000000 // Multi Profile mask
+
+// Modulation parameters - QAM - ParXtra0 - J.83 Annex
+#define DTAPI_MOD_J83_MSK 0x000F
+#define DTAPI_MOD_J83_UNK 0x000F // Unknown annex
+#define DTAPI_MOD_J83_AUTO 0x000F // Auto detect annex
+#define DTAPI_MOD_J83_A 0x0002 // J.83 annex A (DVB-C)
+#define DTAPI_MOD_J83_B 0x0003 // J.83 annex B (\93American QAM\94)
+#define DTAPI_MOD_J83_C 0x0001 // J.83 annex C (\93Japanese QAM\94)
+
+// Modulation parameters - QAM - ParXtra1 - QAM-B interleaver mode
+#define DTAPI_MOD_QAMB_I128_J1D 0x1
+#define DTAPI_MOD_QAMB_I64_J2 0x3
+#define DTAPI_MOD_QAMB_I32_J4 0x5
+#define DTAPI_MOD_QAMB_I16_J8 0x7
+#define DTAPI_MOD_QAMB_I8_J16 0x9
+#define DTAPI_MOD_QAMB_I128_J1 0x0
+#define DTAPI_MOD_QAMB_I128_J2 0x2
+#define DTAPI_MOD_QAMB_I128_J3 0x4
+#define DTAPI_MOD_QAMB_I128_J4 0x6
+#define DTAPI_MOD_QAMB_I128_J5 0x8
+#define DTAPI_MOD_QAMB_I128_J6 0xA
+#define DTAPI_MOD_QAMB_I128_J7 0xC
+#define DTAPI_MOD_QAMB_I128_J8 0xE
+#define DTAPI_MOD_QAMB_IL_UNK 0xF // Unknown interleaver mode
+#define DTAPI_MOD_QAMB_IL_AUTO 0xF // Auto detect interleaver mode
+#define DTAPI_MOD_QAMB_IL_MSK 0xF
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ SDI +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+// DtSdi - Table-of-content entry types
+#define DTAPI_SDI_TOC_ENTRY_UNKNOWN 0
+#define DTAPI_SDI_TOC_ENTRY_ACTVID 1
+#define DTAPI_SDI_TOC_ENTRY_HANC 2
+#define DTAPI_SDI_TOC_ENTRY_VANC 3
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiTocEntry -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtSdiTocEntry
+{
+ friend class DtSdiUtility;
+
+public:
+ inline int AncDataBlockNum() const 
+ { 
+ if (AncType() != 1) return -1;
+ else return m_SdidOrDbn;
+ }
+ inline int AncDataId() const { return m_Did; }
+ inline int AncNumUserWords() const { return m_NumUserWords; }
+ inline int AncSecDataId() const
+ { 
+ if (AncType() != 2) return -1;
+ else return m_SdidOrDbn;
+ }
+ inline int AncType() const { return m_AncType; }
+
+ inline int Field() const { return m_Field; }
+ inline int Line() const { return m_Line; }
+ inline int NumSymbols() const { return m_NumSymbols; }
+ inline int StartOffset() const { return m_StartOffset; }
+ inline int TocType() const { return m_TocType; }
+
+ // Encapsulated data
+protected:
+ int m_TocType; // Type of TOC entry
+ int m_Line; // Line number where data is located
+ int m_Field; // Field in where data is located
+ int m_StartOffset; // Symbol offset relative to start of line, first data
+ int m_NumSymbols; // Number of symbols
+
+ // Following members are only valid if TOC type is DTAPI_SDI_TOC_ENTRY_HANC or 
+ // DTAPI_SDI_TOC_ENTRY_VANC
+ int m_AncType; // Ancillery data packet type (DTAPI_SDI_ANC_TYPE1 or
+ // DTAPI_SDI_ANC_TYPE2)
+ int m_Did; // Ancillary packet data ID
+ int m_SdidOrDbn; // Ancillary packet data block number (type 1 packet)
+ // or secondary data ID (type 2 packet)
+ int m_NumUserWords; // Number of ancillary data packet user words
+
+ // Constructor, destructor
+public:
+ DtSdiTocEntry() : m_TocType(DTAPI_SDI_TOC_ENTRY_UNKNOWN), m_Line(0), m_Field(0),
+ m_StartOffset(0), m_NumSymbols(0) {}
+ virtual ~DtSdiTocEntry() {};
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// The DtSdi class provides helper functions for processing SDI data
+// 
+class DtSdi
+{
+ friend class DtSdiUtility;
+
+public:
+ DtSdi();
+ virtual ~DtSdi();
+
+public:
+ DTAPI_RESULT ConvertFrame(unsigned int* pInFrame, int& InFrameSize,
+ int InFrameFormat, unsigned int* pOutFrame, int& OutFrameSize, int OutFrameFormat);
+ DTAPI_RESULT CreateBlackFrame(unsigned int* pFrame, int& FrameSize, int FrameFormat);
+ DTAPI_RESULT GetActiveVideo(const DtSdiTocEntry& TocEntry,
+ unsigned short* pVideo, int& NumSamples);
+ DTAPI_RESULT GetActiveVideo(unsigned short* pVideo, int& NumSamples,
+ int Field, int Stride=-1);
+ DTAPI_RESULT GetAncillaryData(const DtSdiTocEntry& TocEntry,
+ unsigned short* pData, int& NumSamples);
+ DTAPI_RESULT GetAudio(int AudioGroup, int& Channel,
+ unsigned short* pAudio, int& NumSamples);
+ DTAPI_RESULT GetTableOfContents(const DtSdiTocEntry** ppToc, int& NumTocEntries);
+ DTAPI_RESULT ParseFrame(const unsigned int* pFrame, int FrameSize, int FrameFormat,
+ int ParseFlags, const DtSdiTocEntry** ppToc, int& NumTocEntries); 
+
+protected:
+ DtSdiUtility* m_pSdiUtil; // Internal utility class
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdi constants -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+
+// Ancillary data packet types
+#define DTAPI_SDI_ANC_TYPE1 1 // Type 1 packet
+#define DTAPI_SDI_ANC_TYPE2 2 // Type 2 packet
+
+// Parse flags
+#define DTAPI_SDI_PARSE_ACTVID 0x0001 // Parse active video
+#define DTAPI_SDI_PARSE_HBLANK 0x0002 // Parse horizontal blanking
+#define DTAPI_SDI_PARSE_VBLANK 0x0004 // Parse vertical blanking
+
+#define DTAPI_SDI_PARSE_BLANK (DTAPI_SDI_PARSE_HBLANK | DTAPI_SDI_PARSE_VBLANK)
+#define DTAPI_SDI_PARSE_ALL (DTAPI_SDI_PARSE_ACTVID | DTAPI_SDI_PARSE_BLANK)
+
+// Field flags
+#define DTAPI_SDI_FIELD1 1
+#define DTAPI_SDI_FIELD2 2
+
+// Audio groups
+#define DTAPI_SDI_AUDIO_GROUP1 0x2FF
+#define DTAPI_SDI_AUDIO_GROUP2 0x1FD
+#define DTAPI_SDI_AUDIO_GROUP3 0x1FB
+#define DTAPI_SDI_AUDIO_GROUP4 0x2F9
+
+#define DTAPI_SDI_AUDIO_CHAN1 0x01
+#define DTAPI_SDI_AUDIO_CHAN2 0x02
+#define DTAPI_SDI_AUDIO_CHAN3 0x04
+#define DTAPI_SDI_AUDIO_CHAN4 0x08
+
+#define DTAPI_SDI_AUDIO_CH_PAIR1 (DTAPI_SDI_AUDIO_CHAN1 | DTAPI_SDI_AUDIO_CHAN2)
+#define DTAPI_SDI_AUDIO_CH_PAIR2 (DTAPI_SDI_AUDIO_CHAN3 | DTAPI_SDI_AUDIO_CHAN4)
+#define DTAPI_SDI_AUDIO_CH_MASK (DTAPI_SDI_AUDIO_CH_PAIR1 | DTAPI_SDI_AUDIO_CH_PAIR2)
+
+// Conversions format
+#define DTAPI_SDI_FULL 0x001
+#define DTAPI_SDI_ACTVID 0x002
+#define DTAPI_SDI_HUFFMAN 0x004
+#define DTAPI_SDI_625 0x008
+#define DTAPI_SDI_525 0x010
+#define DTAPI_SDI_8B 0x020
+#define DTAPI_SDI_10B 0x040
+#define DTAPI_SDI_16B 0x080
+#define DTAPI_SDI_10B_NBO 0x100 // 10-bit packed in network-byte-order
+
+#define DTAPI_SDI_BIT_MASK 0x1E0
+
+// Video standards
+#define DTAPI_VIDSTD_UNKNOWN -1
+#define DTAPI_VIDSTD_TS 0
+#define DTAPI_VIDSTD_525I59_94 DTAPI_IOCONFIG_525I59_94
+#define DTAPI_VIDSTD_625I50 DTAPI_IOCONFIG_625I50
+#define DTAPI_VIDSTD_720P23_98 DTAPI_IOCONFIG_720P23_98
+#define DTAPI_VIDSTD_720P24 DTAPI_IOCONFIG_720P24
+#define DTAPI_VIDSTD_720P25 DTAPI_IOCONFIG_720P25
+#define DTAPI_VIDSTD_720P29_97 DTAPI_IOCONFIG_720P29_97
+#define DTAPI_VIDSTD_720P30 DTAPI_IOCONFIG_720P30
+#define DTAPI_VIDSTD_720P50 DTAPI_IOCONFIG_720P50
+#define DTAPI_VIDSTD_720P59_94 DTAPI_IOCONFIG_720P59_94
+#define DTAPI_VIDSTD_720P60 DTAPI_IOCONFIG_720P60
+#define DTAPI_VIDSTD_1080P23_98 DTAPI_IOCONFIG_1080P23_98
+#define DTAPI_VIDSTD_1080P24 DTAPI_IOCONFIG_1080P24
+#define DTAPI_VIDSTD_1080P25 DTAPI_IOCONFIG_1080P25
+#define DTAPI_VIDSTD_1080P29_97 DTAPI_IOCONFIG_1080P29_97
+#define DTAPI_VIDSTD_1080P30 DTAPI_IOCONFIG_1080P30
+#define DTAPI_VIDSTD_1080PSF23_98 DTAPI_IOCONFIG_1080PSF23_98
+#define DTAPI_VIDSTD_1080PSF24 DTAPI_IOCONFIG_1080PSF24
+#define DTAPI_VIDSTD_1080PSF25 DTAPI_IOCONFIG_1080PSF25
+#define DTAPI_VIDSTD_1080PSF29_97 DTAPI_IOCONFIG_1080PSF29_97
+#define DTAPI_VIDSTD_1080PSF30 DTAPI_IOCONFIG_1080PSF30
+#define DTAPI_VIDSTD_1080I50 DTAPI_IOCONFIG_1080I50
+#define DTAPI_VIDSTD_1080I59_94 DTAPI_IOCONFIG_1080I59_94
+#define DTAPI_VIDSTD_1080I60 DTAPI_IOCONFIG_1080I60
+#define DTAPI_VIDSTD_1080P50 DTAPI_IOCONFIG_1080P50
+#define DTAPI_VIDSTD_1080P50B DTAPI_IOCONFIG_1080P50B
+#define DTAPI_VIDSTD_1080P59_94 DTAPI_IOCONFIG_1080P59_94
+#define DTAPI_VIDSTD_1080P59_94B DTAPI_IOCONFIG_1080P59_94B
+#define DTAPI_VIDSTD_1080P60 DTAPI_IOCONFIG_1080P60
+#define DTAPI_VIDSTD_1080P60B DTAPI_IOCONFIG_1080P60B
+// The video standards above map 1-to-1 to an IOConfig value. The video formats below
+// are used for multi-link video standards. Start at a high value to make sure there
+// is no overlap.
+#define DTAPI_VIDSTD_BASE 1000
+#define DTAPI_VIDSTD_2160P50 (DTAPI_VIDSTD_BASE + 0)
+#define DTAPI_VIDSTD_2160P50B (DTAPI_VIDSTD_BASE + 1)
+#define DTAPI_VIDSTD_2160P59_94 (DTAPI_VIDSTD_BASE + 2)
+#define DTAPI_VIDSTD_2160P59_94B (DTAPI_VIDSTD_BASE + 3)
+#define DTAPI_VIDSTD_2160P60 (DTAPI_VIDSTD_BASE + 4)
+#define DTAPI_VIDSTD_2160P60B (DTAPI_VIDSTD_BASE + 5)
+#define DTAPI_VIDSTD_2160P23_98 (DTAPI_VIDSTD_BASE + 6)
+#define DTAPI_VIDSTD_2160P24 (DTAPI_VIDSTD_BASE + 7)
+#define DTAPI_VIDSTD_2160P25 (DTAPI_VIDSTD_BASE + 8)
+#define DTAPI_VIDSTD_2160P29_97 (DTAPI_VIDSTD_BASE + 9)
+#define DTAPI_VIDSTD_2160P30 (DTAPI_VIDSTD_BASE + 10)
+
+// Video link standards.
+#define DTAPI_VIDLNK_4K_SMPTE425 0 // 4K mapping according to SMPTE 425
+#define DTAPI_VIDLNK_4K_SMPTE425B 1 // 4K mapping acc. to SMPTE 425 annex B
+
+// Audio standard
+#define DTAPI_SDI_AUDIO_SMPTE272A 1 // SMPTE-272 Level A, 48kHz, 20-bit audio
+
+// Audio formats
+#define DTAPI_SDI_AUDIO_PCM16 0
+#define DTAPI_SDI_AUDIO_PCM24 1
+#define DTAPI_SDI_AUDIO_PCM32 2
+
+// HANC/VANC/Video selection (can be OR-ed)
+//#define DTAPI_SDI_ACTVID 0x01
+#define DTAPI_SDI_HANC 0x02
+#define DTAPI_SDI_VANC 0x04
+#define DTAPI_SDI_ANC_MASK (DTAPI_SDI_HANC | DTAPI_SDI_VANC)
+ 
+// Chrominace/luminance stream selection (can be OR-ed)
+#define DTAPI_SDI_CHROM 0x01
+#define DTAPI_SDI_LUM 0x02
+#define DTAPI_SDI_STREAM_MASK (DTAPI_SDI_CHROM | DTAPI_SDI_LUM)
+
+// Anc-data operation mode
+#define DTAPI_ANC_MARK 0x0001
+#define DTAPI_ANC_DELETE 0x0002
+
+// Scalling factor
+#define DTAPI_SCALING_OFF 1
+#define DTAPI_SCALING_1_4 2
+#define DTAPI_SCALING_1_16 3
+
+// Symbol filter mode
+#define DTAPI_SYMFLT_ALL 0 // YCbCr sample (CbYCrY order)
+#define DTAPI_SYMFLT_LUM 1 // Luminance only (Y) 
+#define DTAPI_SYMFLT_CHROM 2 // Chrominance only (CbCr)
+#define DTAPI_SYMFLT_SWAP 3 // Swap order of lum and chrom (i.e. YCbYCr)
+#define DTAPI_SYMFLT_RGB 4 // Convert to/from RGB
+
+// Ancillary filter mode
+#define DTAPI_ANCFLT_OFF 0
+#define DTAPI_ANCFLT_HANC_ALL 1
+#define DTAPI_ANCFLT_HANC_MIN 2
+#define DTAPI_ANCFLT_VANC_ALL 3
+#define DTAPI_ANCFLT_VANC_MIN 4
+
+// Receive mode hints for USB3 devices
+#define DTAPI_RXMODE_FRAMEBUFFER 0x10000
+#define DTAPI_RXMODE_ANC (DTAPI_RXMODE_FRAMEBUFFER | 1)
+#define DTAPI_RXMODE_RAW (DTAPI_RXMODE_FRAMEBUFFER | 2)
+#define DTAPI_RXMODE_FULL (DTAPI_RXMODE_FRAMEBUFFER | 3)
+#define DTAPI_RXMODE_FULL8 (DTAPI_RXMODE_FRAMEBUFFER | 4)
+#define DTAPI_RXMODE_FULL8_SCALED4 (DTAPI_RXMODE_FRAMEBUFFER | 5)
+#define DTAPI_RXMODE_FULL8_SCALED16 (DTAPI_RXMODE_FRAMEBUFFER | 6)
+#define DTAPI_RXMODE_VIDEO (DTAPI_RXMODE_FRAMEBUFFER | 7)
+#define DTAPI_RXMODE_VIDEO8 (DTAPI_RXMODE_FRAMEBUFFER | 8)
+#define DTAPI_RXMODE_VIDEO8_SCALED4 (DTAPI_RXMODE_FRAMEBUFFER | 9)
+#define DTAPI_RXMODE_VIDEO8_SCALED16 (DTAPI_RXMODE_FRAMEBUFFER | 10)
+#define DTAPI_RXMODE_RAW8 (DTAPI_RXMODE_FRAMEBUFFER | 15)
+#define DTAPI_RXMODE_FRMBUF_MASK 0x0F
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ HD-SDI CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- AncPacket -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class AncPacket
+{
+public:
+ AncPacket();
+ AncPacket(const AncPacket& s);
+ virtual ~AncPacket();
+
+public:
+ int m_Did; // Data identifier
+ int m_SdidOrDbn; // Secondary data identifier / Data block number
+ int m_Dc; // Data count
+ int m_Cs; // Check sum
+ unsigned short* m_pUdw; // User data words
+ int m_Line; // Line number in which packet was found
+
+ // Operations
+public:
+ void Create(unsigned short* pUserWords, int NumWords);
+ void Create(int NumWords=256);
+ void Destroy();
+ int Type() const { return (m_Did & 0x80)==0 ? 2 : 1; }
+ int Size() const { return m_Size; }
+
+ void operator = (const AncPacket& s);
+
+private:
+ int m_Size; // Size of user data buffer (in # of words)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtFrameBufTrPars
+{
+public:
+ enum ParsType { PT_VIDEO, PT_ANC, PT_RAW };
+
+protected:
+ DtFrameBufTrPars(ParsType Type);
+public:
+ virtual ~DtFrameBufTrPars();
+
+ // Operations
+public:
+ DTAPI_RESULT SetCommon(__int64 Frame, unsigned char* pBuf, int BufSize, 
+ int DataFormat, int StartLine=1, int NumLines=-1);
+
+ ParsType GetType() const { return m_Type; } 
+
+ virtual DtFrameBufTrPars* Clone() = 0;
+
+public:
+ __int64 m_Frame; // Frame to transfer
+ unsigned char* m_pBuf; // Transfer buffer
+ int m_BufSize; // [in] size of buffer / [out] actual #bytes transferred
+ int m_StartLine; // [in] 1st line to transfer / [out] actual first line
+ int m_NumLines; // [in] #lines to transfer / [out] actual #lines
+ int m_DataFormat; // Format of data (8-, 10-, 16-bit) 
+
+private:
+ ParsType m_Type; // Parameter type
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsVideo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtFrameBufTrParsVideo : public DtFrameBufTrPars
+{
+public:
+ DtFrameBufTrParsVideo(int Field, int Scaling=DTAPI_SCALING_OFF, int Stride=-1,
+ int SymFlt=DTAPI_SYMFLT_ALL);
+ virtual ~DtFrameBufTrParsVideo();
+
+ DtFrameBufTrParsVideo* Clone();
+
+public:
+ int m_Field; // Field to transfer (DTAPI_SDI_FIELD*)
+ int m_Scaling; // Scaling mode (DTAPI_SCALING_*)
+ int m_Stride; // -1 means no stride
+ int m_SymFlt; // Symbol filter mode (DTAPI_SYMFLT_*)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsAnc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtFrameBufTrParsAnc : public DtFrameBufTrPars
+{
+public:
+ DtFrameBufTrParsAnc(int HancVanc, int AncFlt=DTAPI_ANCFLT_OFF);
+ virtual ~DtFrameBufTrParsAnc();
+
+ DtFrameBufTrParsAnc* Clone();
+
+public:
+ int m_HancVanc; // HANC or VANC
+ int m_AncFlt; // Anc filter mode (DTAPI_ANCFLT_*)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsRaw -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtFrameBufTrParsRaw : public DtFrameBufTrPars
+{
+public:
+ DtFrameBufTrParsRaw(int SymFlt=DTAPI_SYMFLT_ALL, int Stride=-1);
+ virtual ~DtFrameBufTrParsRaw();
+
+ DtFrameBufTrParsRaw* Clone();
+
+public:
+ int m_SymFlt; // Symbol filter mode
+ int m_Stride; // -1 means no stride
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBuffer -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class to represent an frame buffer
+//
+class DtFrameBuffer
+{
+public:
+ DtFrameBuffer();
+ virtual ~DtFrameBuffer();
+private:
+ // No implementation is provided for the copy constructor
+ DtFrameBuffer(const DtFrameBuffer&);
+
+public:
+ virtual DTAPI_RESULT AncAddAudio(__int64 Frame, unsigned char* pBuf,
+ int& BufSize, int Format, int Channels, int AudioGroup);
+ virtual DTAPI_RESULT AncAddAudioStatusWord(__int64 Frame, unsigned char Status[24],
+ int Channels, int AudioGroup);
+ // Old declaration of the AncAddPacket function. The AncPacket class has been extended
+ // with a new m_Line member.
+ DTAPI_DEPRECATED(virtual DTAPI_RESULT AncAddPacket(__int64 Frame,
+ AncPacket& AncPacket,
+ int Line, int HancVanc, int Stream),
+ "Deprecated (will be removed!): use overloaded AncAddPacket without "
+ "line argument, use AncPacket::m_Line instead");
+ virtual DTAPI_RESULT AncAddPacket(__int64 Frame, AncPacket& AncPacket,
+ int HancVanc, int Stream);
+ virtual DTAPI_RESULT AncClear(__int64 Frame, int HancVanc, int Stream);
+ virtual DTAPI_RESULT AncCommit(__int64 Frame);
+ virtual DTAPI_RESULT AncDelAudio(__int64 Frame, int AudioGroup, int Mode);
+ virtual DTAPI_RESULT AncDelPacket(__int64 Frame, int DID, int SDID, int StartLine,
+ int NumLines, int HancVanc, int Stream, int Mode);
+ virtual DTAPI_RESULT AncGetAudio(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat, int& Channels, int AudioGroup);
+ virtual DTAPI_RESULT AncGetPacket(__int64 Frame, int DID, int SDID, 
+ AncPacket*, int& NumPackets, int HancVanc, int Stream);
+ virtual DTAPI_RESULT AncReadRaw(__int64 Frame, unsigned char* pBuf,
+ int& BufSize, int DataFormat, int StartLine,
+ int NumLines, int HancVanc, bool EnableAncFilter = false);
+ virtual DTAPI_RESULT AncReadRaw(DtFrameBufTrParsAnc& TP);
+ virtual DTAPI_RESULT AncWriteRaw(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int Format, int StartLine, 
+ int NumLines, int HancVanc, bool EnableAncFilter = false);
+ virtual DTAPI_RESULT AncWriteRaw(DtFrameBufTrParsAnc& TP);
+ virtual DTAPI_RESULT AttachToInput(DtDevice*, int Port);
+ virtual DTAPI_RESULT AttachToOutput(DtDevice*, int Port, int Delay);
+ virtual DTAPI_RESULT ClearFlags(int Latched);
+ virtual DTAPI_RESULT Detach();
+ virtual DTAPI_RESULT DetectIoStd(int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetBufferInfo(DtBufferInfo&);
+ virtual DTAPI_RESULT GetCurFrame(__int64& CurFrame);
+ virtual DTAPI_RESULT GetFlags(int& Flags, int& Latched);
+ virtual DTAPI_RESULT GetFrameInfo(__int64 Frame, DtFrameInfo&);
+ virtual DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
+ virtual DTAPI_RESULT GetStatistic(int Type, int& Statistic);
+ virtual DTAPI_RESULT ReadSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT ReadSdiLines(DtFrameBufTrParsRaw& TP);
+ virtual DTAPI_RESULT ReadSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat);
+ virtual DTAPI_RESULT ReadVideo(__int64 Frame, unsigned char* pBuf,
+ int& BufSize, int Field, int FullOrScaled,
+ int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT ReadVideo(DtFrameBufTrParsVideo& TP);
+ virtual DTAPI_RESULT SetRxMode(int RxMode, __int64& FirstFrame);
+ virtual DTAPI_RESULT Start(bool Start=true);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT WaitFrame(__int64& LastFrame);
+ virtual DTAPI_RESULT WaitFrame(__int64& FirstFrame, __int64& LastFrame);
+ virtual DTAPI_RESULT WriteSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat);
+ virtual DTAPI_RESULT WriteSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT WriteSdiLines(DtFrameBufTrParsRaw& TP);
+ virtual DTAPI_RESULT WriteVideo(__int64 Frame, unsigned char* pBuf, int& BufSize,
+ int Field, int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT WriteVideo(DtFrameBufTrParsVideo& TP);
+
+protected:
+ FrameBufImpl* m_pImpl; // Implementation class
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiMatrix -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtSdiMatrix
+{
+public:
+ DtSdiMatrix();
+ virtual ~DtSdiMatrix();
+private:
+ // No implementation is provided for the copy constructor
+ DtSdiMatrix(const DtSdiMatrix&);
+
+public:
+ virtual DTAPI_RESULT Attach(DtDevice* pDvc, int& MaxNumRows);
+ virtual DTAPI_RESULT Detach();
+ virtual DTAPI_RESULT GetMatrixInfo(DtMatrixInfo& Info);
+ virtual DtFrameBuffer& Row(int n);
+ virtual DTAPI_RESULT Start(bool Start=true);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT WaitFrame(__int64& LastFrame);
+ virtual DTAPI_RESULT WaitFrame(__int64& FirstFrame, __int64& LastFrame);
+ 
+private:
+ SdiMatrixImpl* m_pImpl; // Implementation class
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Global DTAPI Functions -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+
+DTAPI_RESULT DtapiCheckDeviceDriverVersion(void);
+DTAPI_RESULT DtapiCheckDeviceDriverVersion(int DeviceCategory);
+DTAPI_RESULT DtapiDeviceScan(int NumEntries, int& NumEntriesResult,
+ DtDeviceDesc* DvcDescArr, bool InclDteDvcs=false,
+ int ScanOrder=DTAPI_SCANORDER_ORIG);
+DTAPI_RESULT DtapiDtaPlusDeviceScan(int NumEntries, int& NumEntriesResult,
+ DtDtaPlusDeviceDesc* DvcDescArr);
+DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
+ char* pString, int StringLength);
+DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
+ wchar_t* pString, int StringLength);
+DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
+ char* pString, int StringLength);
+DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
+ wchar_t* pString, int StringLength);
+DTAPI_RESULT DtapiGetDeviceDriverVersion(int, int&, int&, int&, int&);
+DTAPI_RESULT DtapiGetDtapiServiceVersion(int&, int&, int&, int&);
+DTAPI_RESULT DtapiGetVersion(int& Maj, int& Min, int& BugFix, int& Build);
+DTAPI_RESULT DtapiHwFuncScan(int NumEntries, int& NumEntriesResult,
+ DtHwFuncDesc* pHwFuncs, bool InclDteDvcs=false,
+ int ScanOrder=DTAPI_SCANORDER_ORIG);
+DTAPI_RESULT DtapiPower2Voltage(int dBm, int& dBmV, bool Is50Ohm=false);
+const char* DtapiResult2Str(DTAPI_RESULT DtapiResult);
+DTAPI_RESULT DtapiVoltage2Power(int dBmV, int& dBm, bool Is50Ohm=false);
+
+// Callbacks
+DTAPI_RESULT DtapiRegisterCallback(pDtEventCallback Callback, void* pContext,
+ int EventTypes, void** pId = NULL);
+DTAPI_RESULT DtapiUnregisterCallback(void* pId);
+
+// IP address conversion
+DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
+ const char* pDstIp, const char* pSrcIp);
+DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
+ const wchar_t* pDstIp, const wchar_t* pSrcIp);
+DTAPI_RESULT DtapiIpAddr2ByteArray(const char* pIpStr, unsigned char* pIpByte,
+ int& Flags);
+DTAPI_RESULT DtapiIpAddr2ByteArray(const wchar_t* pIpStr, 
+ unsigned char* pIpByte, int& Flags);
+DTAPI_RESULT DtapiIpAddr2Str(char* pStr, int Len, unsigned char* pIpAddr);
+DTAPI_RESULT DtapiIpAddr2Str(wchar_t* pStr, int Len, unsigned char* pIpAddr);
+DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const char* pStr);
+DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const wchar_t* pStr);
+
+// Legacy
+#define DtapiInitDtTsIpParsFromIpString DtapiInitDtIpParsFromIpString
+
+// Modulator functions
+DTAPI_RESULT DtapiModPars2Bandwidth(int& ModBandwidth, int& TotalBandwidth,
+ int ModType, int ParXtra0, int ParXtra1, int ParXtra2,
+ void* pXtraPars, int SymRate);
+DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, int TsRate);
+DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, DtFractionInt TsRate);
+DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, void* pXtraPars, int TsRate);
+DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, void* pXtraPars, DtFractionInt TsRate);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, int SymRate = -1);
+DTAPI_RESULT DtapiModPars2TsRate(DtFractionInt& TsRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, int SymRate = -1);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbC2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(DtFractionInt& TsRate, DtDvbC2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbS2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(DtFractionInt& TsRate, DtDvbS2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbT2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(DtFractionInt& TsRate, DtDvbT2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtIsdbTmmPars&, int TsIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(DtFractionInt& TsRate, DtIsdbTmmPars&, int TsIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, void* pXtraPars, int SymRate);
+DTAPI_RESULT DtapiModPars2TsRate(DtFractionInt& TsRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, void* pXtraPars, int SymRate);
+
+// HD-SDI functions
+DTAPI_RESULT DtapiGetRequiredUsbBandwidth(int VidStd, int RxMode, long long& Bandwidth);
+DTAPI_RESULT DtapiGetVidStdInfo(int VidStd, DtVidStdInfo& Info);
+DTAPI_RESULT DtapiGetVidStdInfo(int VidStd, int LinkStd, DtVidStdInfo& Info);
+DTAPI_RESULT DtapiIoStd2VidStd(int Value, int SubValue, int& VidStd);
+DTAPI_RESULT DtapiVidStd2IoStd(int VidStd, int& Value, int& SubValue);
+DTAPI_RESULT DtapiVidStd2IoStd(int VidStd, int LinkStd, int& Value, int& SubValue);
+const char* DtapiVidStd2Str(int VidStd);
+const char* DtapiLinkStd2Str(int LinkStd);
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Return Codes -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// NOTE: ERROR CODES 0x1100-0x12FF ARE RESERVED FOR USE IN THE DTAPIplus
+//
+#define DTAPI_OK 0
+#define DTAPI_OK_FAILSAFE 1
+#define DTAPI_E 0x1000
+#define DTAPI_E_ATTACHED (DTAPI_E + 0)
+#define DTAPI_E_BUF_TOO_SMALL (DTAPI_E + 1)
+#define DTAPI_E_DEV_DRIVER (DTAPI_E + 2)
+#define DTAPI_E_EEPROM_FULL (DTAPI_E + 3)
+#define DTAPI_E_EEPROM_READ (DTAPI_E + 4)
+#define DTAPI_E_EEPROM_WRITE (DTAPI_E + 5)
+#define DTAPI_E_EEPROM_FORMAT (DTAPI_E + 6)
+#define DTAPI_E_FIFO_FULL (DTAPI_E + 7)
+#define DTAPI_E_IN_USE (DTAPI_E + 8)
+#define DTAPI_E_INVALID_BUF (DTAPI_E + 9)
+#define DTAPI_E_INVALID_FLAGS (DTAPI_E + 11)
+#define DTAPI_E_INVALID_MODE (DTAPI_E + 12)
+#define DTAPI_E_INVALID_RATE (DTAPI_E + 13)
+#define DTAPI_E_INVALID_SIZE (DTAPI_E + 14)
+#define DTAPI_E_KEYWORD (DTAPI_E + 15)
+#define DTAPI_E_NO_DEVICE (DTAPI_E + 16)
+#define DTAPI_E_NO_LOOPBACK (DTAPI_E + 17)
+#define DTAPI_E_NO_SUCH_DEVICE (DTAPI_E + 18)
+#define DTAPI_E_NO_SUCH_OUTPUT (DTAPI_E + 19)
+#define DTAPI_E_NO_DT_OUTPUT (DTAPI_E + 20)
+#define DTAPI_E_NO_TS_OUTPUT (DTAPI_E + 20)
+#define DTAPI_E_NOT_ATTACHED (DTAPI_E + 21)
+#define DTAPI_E_NOT_FOUND (DTAPI_E + 22)
+#define DTAPI_E_NOT_SUPPORTED (DTAPI_E + 23)
+#define DTAPI_E_DEVICE (DTAPI_E + 24)
+#define DTAPI_E_TOO_LONG (DTAPI_E + 25)
+#define DTAPI_E_UNDERFLOW (DTAPI_E + 26)
+#define DTAPI_E_NO_SUCH_INPUT (DTAPI_E + 27)
+#define DTAPI_E_NO_DT_INPUT (DTAPI_E + 28)
+#define DTAPI_E_NO_TS_INPUT (DTAPI_E + 28)
+#define DTAPI_E_DRIVER_INCOMP (DTAPI_E + 29)
+#define DTAPI_E_INTERNAL (DTAPI_E + 30)
+#define DTAPI_E_OUT_OF_MEM (DTAPI_E + 31)
+#define DTAPI_E_INVALID_J83ANNEX (DTAPI_E + 32)
+#define DTAPI_E_IDLE (DTAPI_E + 33)
+#define DTAPI_E_INSUF_LOAD (DTAPI_E + 34)
+#define DTAPI_E_INVALID_BANDWIDTH (DTAPI_E + 35)
+#define DTAPI_E_INVALID_CONSTEL (DTAPI_E + 36)
+#define DTAPI_E_INVALID_GUARD (DTAPI_E + 37)
+#define DTAPI_E_INVALID_INTERLVNG (DTAPI_E + 38)
+#define DTAPI_E_INVALID_TRANSMODE (DTAPI_E + 39)
+#define DTAPI_E_INVALID_TSTYPE (DTAPI_E + 40)
+#define DTAPI_E_NO_IPPARS (DTAPI_E + 41)
+#define DTAPI_E_NO_TSRATE (DTAPI_E + 42)
+#define DTAPI_E_NOT_IDLE (DTAPI_E + 43)
+#define DTAPI_E_INVALID_ARG (DTAPI_E + 44)
+#define DTAPI_E_NW_DRIVER (DTAPI_E + 45)
+#define DTAPI_E_DST_MAC_ADDR (DTAPI_E + 46)
+#define DTAPI_E_NO_SUCH_PORT (DTAPI_E + 47)
+#define DTAPI_E_WINSOCK (DTAPI_E + 48)
+#define DTAPI_E_MULTICASTJOIN (DTAPI_E + 49)
+#define DTAPI_E_EMBEDDED (DTAPI_E + 50)
+#define DTAPI_E_LOCKED (DTAPI_E + 51)
+#define DTAPI_E_NO_VALID_CALDATA (DTAPI_E + 52)
+#define DTAPI_E_NO_LINK (DTAPI_E + 53)
+#define DTAPI_E_INVALID_HEADER (DTAPI_E + 54)
+#define DTAPI_E_INVALID_PARS (DTAPI_E + 55)
+#define DTAPI_E_NOT_SDI_MODE (DTAPI_E + 56)
+#define DTAPI_E_INCOMP_FRAME (DTAPI_E + 57)
+#define DTAPI_E_UNSUP_CONV (DTAPI_E + 58)
+#define DTAPI_E_OUTBUF_TOO_SMALL (DTAPI_E + 59)
+#define DTAPI_E_CONFIG (DTAPI_E + 60)
+#define DTAPI_E_TIMEOUT (DTAPI_E + 61)
+#define DTAPI_E_INVALID_TIMEOUT (DTAPI_E + 62)
+#define DTAPI_E_INVALID_FHMODE (DTAPI_E + 63)
+#define DTAPI_E_INVALID_PILOTS (DTAPI_E + 64)
+#define DTAPI_E_INVALID_USEFRAMENO (DTAPI_E + 65)
+#define DTAPI_E_SYMRATE_REQD (DTAPI_E + 66)
+#define DTAPI_E_NO_SYMRATE (DTAPI_E + 67)
+#define DTAPI_E_INVALID_NUMSEGM (DTAPI_E + 68)
+#define DTAPI_E_INVALID_NUMTAPS (DTAPI_E + 69)
+#define DTAPI_E_COMMUNICATION (DTAPI_E + 70)
+#define DTAPI_E_BIND (DTAPI_E + 71)
+#define DTAPI_E_FRAME_INTERVAL (DTAPI_E + 72)
+#define DTAPI_E_INVALID_BWT_EXT (DTAPI_E + 73)
+#define DTAPI_E_INVALID_FFTMODE (DTAPI_E + 74)
+#define DTAPI_E_INVALID_NUMDTSYM (DTAPI_E + 75)
+#define DTAPI_E_INVALID_NUMT2FRM (DTAPI_E + 76)
+#define DTAPI_E_INVALID_SUBCH (DTAPI_E + 77)
+#define DTAPI_E_INVALID_TIME_IL (DTAPI_E + 78)
+#define DTAPI_E_NUM_PLP (DTAPI_E + 79)
+#define DTAPI_E_PLP_NUMBLOCKS (DTAPI_E + 80)
+#define DTAPI_E_NUMPLPS_MUSTBE_1 (DTAPI_E + 81)
+#define DTAPI_E_INBAND (DTAPI_E + 82)
+#define DTAPI_E_ISSY (DTAPI_E + 83)
+#define DTAPI_E_OTHER_PLP_IN_BAND (DTAPI_E + 84)
+#define DTAPI_E_CM_NUMPATHS (DTAPI_E + 85)
+#define DTAPI_E_PILOT_PATTERN (DTAPI_E + 86)
+#define DTAPI_E_SUBSLICES (DTAPI_E + 87)
+#define DTAPI_E_NO_GENREF (DTAPI_E + 88)
+#define DTAPI_E_TI_MEM_OVF (DTAPI_E + 89)
+#define DTAPI_E_FEF (DTAPI_E + 90)
+#define DTAPI_E_UNSUP_FORMAT (DTAPI_E + 91)
+#define DTAPI_E_OUT_OF_SYNC (DTAPI_E + 92)
+#define DTAPI_E_NO_FRAME (DTAPI_E + 93)
+#define DTAPI_E_NO_SUCH_DATA (DTAPI_E + 94)
+#define DTAPI_E_INVALID_TYPE (DTAPI_E + 95)
+#define DTAPI_E_INVALID_MODPARS (DTAPI_E + 96)
+#define DTAPI_E_BIAS_BAL_CELLS (DTAPI_E + 97)
+#define DTAPI_E_COMMON_PLP_COUNT (DTAPI_E + 98)
+#define DTAPI_E_PLP_ID (DTAPI_E + 99)
+#define DTAPI_E_BUFS (DTAPI_E + 100)
+#define DTAPI_E_FIXED_CELL_PARS (DTAPI_E + 101)
+#define DTAPI_E_CM_CHANNEL (DTAPI_E + 102)
+#define DTAPI_E_INVALID_FIFO_IDX (DTAPI_E + 103)
+#define DTAPI_E_INVALID_INP_TYPE (DTAPI_E + 104)
+#define DTAPI_E_INVALID_OUTP_TYPE (DTAPI_E + 105)
+#define DTAPI_E_INVALID_START_FREQ (DTAPI_E + 106)
+#define DTAPI_E_DSLICE_TUNE_POS (DTAPI_E + 107)
+#define DTAPI_E_DSLICE_OFFSETS (DTAPI_E + 108)
+#define DTAPI_E_DSLICE_OVERLAP (DTAPI_E + 109)
+#define DTAPI_E_NOTCH_OFFSETS (DTAPI_E + 110)
+#define DTAPI_E_PLP_BUNDLED (DTAPI_E + 111)
+#define DTAPI_E_BROADBAND_NOTCH (DTAPI_E + 112)
+#define DTAPI_E_L1_PART2_TOO_LONG (DTAPI_E + 113)
+#define DTAPI_E_DSLICE_T1_NDP (DTAPI_E + 114)
+#define DTAPI_E_DSLICE_T1_TSRATE (DTAPI_E + 115)
+#define DTAPI_E_CONNECT_TO_SERVICE (DTAPI_E + 116)
+#define DTAPI_E_INVALID_SYMRATE (DTAPI_E + 117)
+#define DTAPI_E_MODPARS_NOT_SET (DTAPI_E + 118)
+#define DTAPI_E_SERVICE_INCOMP (DTAPI_E + 119)
+#define DTAPI_E_INVALID_LEVEL (DTAPI_E + 120)
+#define DTAPI_E_MODTYPE_UNSUP (DTAPI_E + 121)
+#define DTAPI_E_I2C_LOCK_TIMEOUT (DTAPI_E + 122)
+#define DTAPI_E_INVALID_FREQ (DTAPI_E + 123)
+#define DTAPI_E_INVALID_TSRATESEL (DTAPI_E + 124)
+#define DTAPI_E_INVALID_SPICLKSEL (DTAPI_E + 125)
+#define DTAPI_E_INVALID_SPIMODE (DTAPI_E + 126)
+#define DTAPI_E_NOT_INITIALIZED (DTAPI_E + 127)
+#define DTAPI_E_NOT_LOCKED (DTAPI_E + 128)
+#define DTAPI_E_NO_PERMISSION (DTAPI_E + 129)
+#define DTAPI_E_CANCELLED (DTAPI_E + 130)
+#define DTAPI_E_OUT_OF_RESOURCES (DTAPI_E + 131)
+#define DTAPI_E_LISTEN (DTAPI_E + 132)
+#define DTAPI_E_INVALID_STREAMFMT (DTAPI_E + 133)
+#define DTAPI_E_EVENT_POWER (DTAPI_E + 134)
+#define DTAPI_E_EVENT_REMOVAL (DTAPI_E + 135)
+#define DTAPI_E_UNSUP_ROLLOFF (DTAPI_E + 136)
+#define DTAPI_E_T2_LITE (DTAPI_E + 137)
+#define DTAPI_E_COMP_OVERLAP (DTAPI_E + 138)
+#define DTAPI_E_MULTI_COMPS (DTAPI_E + 139)
+#define DTAPI_E_INVALID_ISI (DTAPI_E + 140)
+#define DTAPI_E_FIRMW_INCOMP (DTAPI_E + 141)
+#define DTAPI_E_INVALID_MODTYPE (DTAPI_E + 142)
+#define DTAPI_E_NO_VIDSTD (DTAPI_E + 143)
+#define DTAPI_E_INVALID_VIDSTD (DTAPI_E + 144)
+#define DTAPI_E_INVALID_AUDSTD (DTAPI_E + 145)
+#define DTAPI_E_INVALID_SCALING (DTAPI_E + 146)
+#define DTAPI_E_INVALID_ROW (DTAPI_E + 147)
+#define DTAPI_E_NOT_STARTED (DTAPI_E + 148)
+#define DTAPI_E_STARTED (DTAPI_E + 149)
+#define DTAPI_E_INVALID_LINE (DTAPI_E + 150)
+#define DTAPI_E_INVALID_STREAM (DTAPI_E + 151)
+#define DTAPI_E_INVALID_ANC (DTAPI_E + 152)
+#define DTAPI_E_INVALID_FRAME (DTAPI_E + 153)
+#define DTAPI_E_NOT_IMPLEMENTED (DTAPI_E + 154)
+#define DTAPI_E_INVALID_CHANNEL (DTAPI_E + 155)
+#define DTAPI_E_INVALID_GROUP (DTAPI_E + 156)
+#define DTAPI_E_INVALID_FORMAT (DTAPI_E + 157)
+#define DTAPI_E_INVALID_FIELD (DTAPI_E + 158)
+#define DTAPI_E_BUF_TOO_LARGE (DTAPI_E + 159)
+#define DTAPI_E_INVALID_DELAY (DTAPI_E + 160)
+#define DTAPI_E_EXCL_MANDATORY (DTAPI_E + 161)
+#define DTAPI_E_INVALID_ROLLOFF (DTAPI_E + 162)
+#define DTAPI_E_CM_UNSUP (DTAPI_E + 163)
+#define DTAPI_E_I2C (DTAPI_E + 164)
+#define DTAPI_E_STATE (DTAPI_E + 165)
+#define DTAPI_E_NO_LOCK (DTAPI_E + 166)
+#define DTAPI_E_RANGE (DTAPI_E + 167)
+#define DTAPI_E_INVALID_T2PROFILE (DTAPI_E + 168)
+#define DTAPI_E_DSLICE_ID (DTAPI_E + 169)
+#define DTAPI_E_EXCL_ACCESS_REQD (DTAPI_E + 170)
+#define DTAPI_E_CHAN_ALREADY_ADDED (DTAPI_E + 171)
+#define DTAPI_E_LAYER_ID (DTAPI_E + 172)
+#define DTAPI_E_INVALID_FECMODE (DTAPI_E + 173)
+#define DTAPI_E_INVALID_PORT (DTAPI_E + 174)
+#define DTAPI_E_INVALID_PROTOCOL (DTAPI_E + 175)
+#define DTAPI_E_INVALID_FEC_MATRIX (DTAPI_E + 176)
+#define DTAPI_E_INVALID_IP_ADDR (DTAPI_E + 177)
+#define DTAPI_E_INVALID_SRCIP_ADDR (DTAPI_E + 178)
+#define DTAPI_E_IPV6_NOT_SUPPORTED (DTAPI_E + 179)
+#define DTAPI_E_INVALID_DIFFSERV (DTAPI_E + 180)
+#define DTAPI_E_INVALID_FOR_ACM (DTAPI_E + 181)
+#define DTAPI_E_NWAP_DRIVER (DTAPI_E + 182)
+#define DTAPI_E_INIT_ERROR (DTAPI_E + 183)
+#define DTAPI_E_NOT_USB3 (DTAPI_E + 184)
+#define DTAPI_E_INSUF_BW (DTAPI_E + 185)
+#define DTAPI_E_NO_ANC_DATA (DTAPI_E + 186)
+#define DTAPI_E_MATRIX_HALTED (DTAPI_E + 187)
+#define DTAPI_E_VLAN_NOT_FOUND (DTAPI_E + 188)
+#define DTAPI_E_NO_ADAPTER_IP_ADDR (DTAPI_E + 189)
+#define DTAPI_E_INVALID_BTYPE (DTAPI_E + 190)
+#define DTAPI_E_INVALID_PARTIAL (DTAPI_E + 191)
+#define DTAPI_E_INVALID_NUMTS (DTAPI_E + 192)
+#define DTAPI_E_INVALID (DTAPI_E + 193)
+#define DTAPI_E_NO_RS422 (DTAPI_E + 194)
+#define DTAPI_E_FECFRAMESIZE (DTAPI_E + 195)
+#define DTAPI_E_SFN_NOT_SUPPORTED (DTAPI_E + 196)
+#define DTAPI_E_SFN_INVALID_MODE (DTAPI_E + 197)
+#define DTAPI_E_SFN_INVALID_OFFSET (DTAPI_E + 198)
+#define DTAPI_E_SFN_DISABLED (DTAPI_E + 199)
+#define DTAPI_E_SFN_INVALID_TIMEDIFF (DTAPI_E + 200)
+#define DTAPI_E_NO_GPSCLKREF (DTAPI_E + 201)
+#define DTAPI_E_NO_GPSSYNC (DTAPI_E + 202)
+#define DTAPI_E_INVALID_PROFILE (DTAPI_E + 203)
+#define DTAPI_E_INVALID_LINKSTD (DTAPI_E + 204)
+#define DTAPI_E_FRAMERATE_MISMATCH (DTAPI_E + 205)
+#define DTAPI_E_CID_INVALID_ID (DTAPI_E + 206)
+#define DTAPI_E_CID_INVALID_INFO (DTAPI_E + 207)
+#define DTAPI_E_CID_INVALID_FORMAT (DTAPI_E + 208)
+#define DTAPI_E_CID_NOT_SUPPORTED (DTAPI_E + 209)
+#define DTAPI_E_INVALID_SAMPRATE (DTAPI_E + 210)
+#define DTAPI_E_MULTIMOD_UNSUP (DTAPI_E + 211)
+#define DTAPI_E_NUM_CHAN (DTAPI_E + 212)
+#define DTAPI_E_INVALID_TIME (DTAPI_E + 213)
+#define DTAPI_E_INVALID_LINK (DTAPI_E + 214)
+#define DTAPI_E_MODE_VIDEOSTD (DTAPI_E + 215)
+
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+ DVB-C2, DVB-S2, DVB-T2, ISDB-Tmm Multi PLP Parameters +=+=+=+=+=+=+=+=+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBigTsSplitPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying 'Big TS' splitting
+//
+struct DtBigTsSplitPars
+{
+ bool m_Enabled; // Enable 'Big TS' splitting
+ bool m_IsCommonPlp; // Is Common PLP or Layer
+ bool m_SplitSdtIn; // SDT already split (e.g. BBC TS-files)
+ std::vector<int> m_Pids; // Series of PIDs to include in the PLP
+
+ // The parameters below are not used in case of a common PLP
+ int m_OnwId; // Original Network ID of the Big-TS
+ int m_TsId; // Transport Stream ID of the Big-TS
+ int m_ServiceId; // ID of service to include in PLP
+ int m_PmtPid; // PID of the PMT-table
+ int m_NewTsId; // New Transport Stream ID
+ int m_SdtLoopDataLength; // SDT loop data length. 0..168
+ // Not used if m_SplitSdtIn == true
+ // The SDT-Actual loop data
+ unsigned char m_SdtLoopData[168];
+
+public:
+ // Methods
+ void Init(void);
+
+ // Operators
+ bool operator == (DtBigTsSplitPars& TsSplitPars);
+ bool operator != (DtBigTsSplitPars& TsSplitPars);
+ bool IsEqual(DtBigTsSplitPars& TsSplitPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPlpInpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the PLP input
+//
+struct DtPlpInpPars
+{
+ // PLP input data types
+ enum InDataType 
+ {
+ TS188, // 188-byte TS packets 
+ TS204, // 204-byte TS packets
+ GSE // Generic Stream Encapsulation
+ };
+
+public:
+ int m_FifoIdx; // Fifo index used for the PLP
+ // If Big TS file splitting is used, PLPs in a group
+ // can share the input FIFO
+ InDataType m_DataType; // TS188, TS204 byte or GSE packets
+ DtBigTsSplitPars m_BigTsSplit; // Big TS splitting (optional)
+
+public:
+ // Methods
+ void Init(int Idx = 0);
+
+ // Operators
+ bool operator == (DtPlpInpPars& PlpInPars);
+ bool operator != (DtPlpInpPars& PlpInPars);
+ bool IsEqual(DtPlpInpPars& PlpInPars);
+};
+
+// Test point data format
+#define DTAPI_TP_FORMAT_HEX 0
+#define DTAPI_TP_FORMAT_BIT 1
+#define DTAPI_TP_FORMAT_CFLOAT32 2
+#define DTAPI_TP_FORMAT_INT64 3
+
+// Complex floating point type
+struct DtComplexFloat
+{
+ float m_Re, m_Im; // Real, imaginary part
+};
+
+// Function to write test point data
+typedef void DtTpWriteDataFunc(void* pOpaque, int TpIndex, int StreamIndex,
+ const void* Buffer, int Length, int Format, float Mult, int IsNewFrame);
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTestPointOutPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for enabling the test point data output specifying a callback function
+//
+struct DtTestPointOutPars
+{
+public:
+ bool m_Enabled; // Enable TP data output
+ void* m_pTpWriteDataOpaque; // Opaque data pointer passed to TpWriteData
+
+ // Callback function for writing test data
+ DtTpWriteDataFunc* m_pTpWriteDataFunc;
+
+public:
+ // Methods
+ void Init(void);
+
+ // Operators
+ bool operator == (DtTestPointOutPars& RbmPars);
+ bool operator != (DtTestPointOutPars& RbmPars);
+ bool IsEqual(DtTestPointOutPars& RbmPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVirtualOutData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+// 
+// Structure describing and containing the output data for a virtual output channel 
+// 
+struct DtVirtualOutData
+{
+ // Virtual output data types
+ enum OutDataType 
+ {
+ IQ_INT16, // 16-bit I/Q samples 
+ IQ_FLOAT32, // 32 bit float I/Q samples
+ T2MI_TS188, // 188 byte T2MI TS-packets
+ DVBS2_L3, // L3 format for DVB-S2
+ };
+ OutDataType m_DataType; // Output data type
+
+ // Output type dependent parameters
+ union {
+ // 16-bit int I/Q samples
+ struct {
+ // Array of buffers; Per output channel a buffer with samples
+ const unsigned char** m_pBuffer; 
+ int m_NumBuffers; // Number of buffers
+ int m_NumBytes; // Number of bytes
+ } IqSamplesInt16;
+
+ // 32-bit float I/Q samples
+ struct {
+ // Array of buffers. Per output channel a buffer with samples
+ const unsigned char** m_pBuffer;
+ int m_NumBuffers; // Number of buffers
+ int m_NumBytes; // Number of bytes
+ } IqSamplesFloat32;
+
+ // 188-byte T2MI TS packets
+ struct {
+ // Pointer to T2MI TS-packet(s)
+ const unsigned char* m_pBuffer;
+ int m_NumBytes; // Number of bytes
+ __int64 m_T2MiFrameNr; // T2MI super frame number counter
+ } T2MiTs188;
+
+ // L3 frames
+ struct {
+ // Pointer to L3 frame(s)
+ const unsigned char* m_pBuffer;
+ int m_NumBytes; // Number of bytes
+ } DvbS2L3;
+ 
+ } u;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVirtualOutPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the output type and level for a virtual output.
+// These parameters are only relevant when outputting to a virtual output channel.
+//
+struct DtVirtualOutPars
+{
+ bool m_Enabled; // Enable virtual output parameters
+ DtVirtualOutData::OutDataType m_DataType;
+ // Type of output data 
+ double m_Gain; // The square root of the average power of
+ // the generated signal
+public:
+ void Init(void);
+ bool IsEqual(DtVirtualOutPars& VirtOutPars);
+ bool operator == (DtVirtualOutPars& VirtOutPars);
+ bool operator != (DtVirtualOutPars& VirtOutPars);
+};
+
+
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DAB Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+// DAB error protection modes
+#define DTAPI_DAB_UEP 0 // DAB unequal error protection
+#define DTAPI_DAB_EEP 1 // DAB equal error protection
+
+// DAB data extraction mode
+enum DtDabExtractionMode
+{
+ DAB_RAW, // Raw DAB stream, no extraction
+ DAB_EXTRACTION_AAC, // AAC/DAB+ stream extraction 
+ DAB_EXTRACTION_DMB // DMB stream extraction
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabEtiStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for DAB Ensemble Transport Interface (ETI) selection
+//
+struct DtDabEtiStreamSelPars
+{
+ // No selection parameters yet
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for DAB selection
+//
+struct DtDabStreamSelPars
+{
+ int m_BitrateKbps; // Bitrate in kbps
+ int m_ErrProtLevel; // Error protection level: 1..5 (UEP); 1..4 (EEP)
+ int m_ErrProtMode; // Error protection mode: DTAPI_DAB_UEP/EEP
+ int m_ErrProtOption; // Error protection option (EEP only): 0 or 1
+ int m_StartAddress; // Start address in DAB capacity units (64bits)
+
+ // DAB data extraction mode: DAB_RAW, DAB_EXTRACTION_AAC or DAB_EXTRACTION_DMB
+ DtDabExtractionMode m_ExtractionMode;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabFicStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Selection parameters for a DAB Fast Information Channel (FIC)
+//
+struct DtDabFicStreamSelPars
+{
+ // Parameters below are passed in the WriteStreamFunc() callback function;
+ // the parameters are not used for selection
+ int m_CifIndex; // Index of the CIF in the DAB frame to which this
+ // FIB is associated
+ int m_FibIndex; // Index of this FIB in the group of FIBs that 
+ // are associated to the same CIF
+};
+
+// Forward declarations
+struct DtDabService;
+struct DtDabSubChannel;
+struct DtDabServiceComp;
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabEnsembleInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Information about a DAB ensemble
+//
+struct DtDabEnsembleInfo
+{
+ int m_CountryId; // Country identifier
+ int m_EnsembleReference; // Indentifier of this ensemble in national area
+ int m_ExtCountryCode; // Extended country code
+ int m_InterTableId; // International table identifier
+ std::wstring m_Label; // Label identifying this ensemble
+ int m_LocalTimeOffset; // Local time offset in half hours from UTC
+ int m_LtoUnique; // Covers one(=0) or several(=1) time zones
+ int m_TransmissionMode; // Transmission mode: 1..4
+
+ // Services contained in this ensemble
+ std::vector<DtDabService> m_Services;
+
+ // Subchannels in this ensemble. Key: subchannel identifier
+ std::map<int, DtDabSubChannel> m_SubChannels;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabService -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Information about a single service. Every service must have one primary service
+// component and can have one or more non-primay service components
+//
+struct DtDabService
+{
+ int m_CondAccessId; // Conditional access identifier
+ int m_CountryId; // Country identifier
+ int m_ExtCountryCode; // Extended country code; -1 for program service
+ bool m_IsLocal; // True if local (partial) ensemble service area
+ std::wstring m_Label; // Label identifying this service 
+ int m_ServiceReference; // Identifier of the service
+
+ // Components in this service
+ std::vector<DtDabServiceComp> m_Components;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabServiceComp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Information about a single DAB service component
+//
+struct DtDabServiceComp
+{
+ int m_AudioServiceCompType; // Audio service component type; -1 if not applicable
+ int m_DataServiceCompType; // Data service component type; -1 if not applicable
+ int m_FidChannelId; // Fast information data channel identifier 0..63;
+ // -1 if not applicable
+ bool m_HasCondAccess; // True if access control applies
+ bool m_IsPrimary; // True if this is the primary component
+ std::wstring m_Label; // Label identifying this service component
+ int m_Language; // Service compoment language or -1
+ int m_SubChannelId; // Subchannel identifier: 0..63; -1 if not applicable
+ int m_ServiceCompId; // Service component identifier; -1 if not applicable
+ int m_TransportMechanismId; // Transport mechanism identifier
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabSubChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// A DAB subchannel contains the data for a single audio or data stream. Every service
+// component refers to a subchannel, but multiple service components can refer to the
+// same subchannel. In that case more than one service can use the same audio stream.
+//
+struct DtDabSubChannel
+{
+ int m_BitrateKbps; // Bitrate in kbps
+ int m_ErrProtLevel; // Protection level UEP: 1..5; EEP: 1..4
+ int m_ErrProtMode; // Error protection mode: DTAPI_DAB_UEP/EEP
+ int m_ErrProtOption; // Option for EEP; -1 for UEP
+ int m_FecScheme; // FEC scheme; -1 if not applicable
+ int m_StartAddress; // Start address in capacity units (64bits)
+ int m_SubChannelId; // Subchannel identifier: 0..63
+ int m_SubChannelSize; // Size of subchannel in capacity units (64bits)
+ int m_UepTableIndex; // Index in UEP table; -1 if not applicable
+ int m_UepTableSwitch; // UEP table switch; -1 if not applicable
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabTransmitterId -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+struct DtDabTransmitterId
+{
+ int m_TxMainId; // Transmitter main identifier; 
+ // 0...5 (for transmission mode 3) otherwise 0...69
+ int m_TxSubId; // Transmitter sub-identifier; 0...23
+ double m_RelativePowerdB;; // Transmitter power, relative to total power
+};
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabTransmitterIdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Information about a DAB transmitter identification
+//
+struct DtDabTransmitterIdInfo
+{
+ std::vector<DtDabTransmitterId> m_Transmitters;
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// Maxima
+#define DTAPI_DVBC2_NUM_DSLICE_MAX 255 // Maximum number of data slices
+#define DTAPI_DVBC2_NUM_PLP_MAX 255 // Maximum number of PLPs
+#define DTAPI_DVBC2_NUM_NOTCH_MAX 16 // Maximum number of Notches
+
+// PLP IDs
+#define DTAPI_DVBC2_PLP_ID_NONE -1 // No PLP selected
+#define DTAPI_DVBC2_PLP_ID_AUTO -2 // Automatic PLP selection
+
+// Data slice IDs
+#define DTAPI_DVBC2_DSLICE_ID_AUTO -2 // Automatic data slice selection
+
+// m_Bandwidth
+#define DTAPI_DVBC2_6MHZ 6 // 6 MHz
+#define DTAPI_DVBC2_8MHZ 8 // 8 MHz
+
+// m_Guard - Guard interval
+#define DTAPI_DVBC2_GI_1_128 0 // 1/128
+#define DTAPI_DVBC2_GI_1_64 1 // 1/64
+
+// m_L1TiMode - L1 time interleaving mode
+#define DTAPI_DVBC2_L1TIMODE_NONE 0 // No time interleaving
+#define DTAPI_DVBC2_L1TIMODE_BEST 1 // Best fit
+#define DTAPI_DVBC2_L1TIMODE_4 2 // 4 OFDM symbols 
+#define DTAPI_DVBC2_L1TIMODE_8 3 // 8 OFDM symbols 
+
+// m_Type - PLP type
+#define DTAPI_DVBC2_PLP_TYPE_COMMON 0 // Common PLP
+#define DTAPI_DVBC2_PLP_TYPE_GROUPED 1 // Grouped Data PLP
+#define DTAPI_DVBC2_PLP_TYPE_NORMAL 2 // Normal Data PLP
+
+// m_FecType - PLP FEC type
+#define DTAPI_DVBC2_LDPC_16K 0 // 16K LDPC
+#define DTAPI_DVBC2_LDPC_64K 1 // 64K LDPC
+
+// m_CodeRate - PLP code rate
+#define DTAPI_DVBC2_COD_2_3 1 // 2/3
+#define DTAPI_DVBC2_COD_3_4 2 // 3/4
+#define DTAPI_DVBC2_COD_4_5 3 // 4/5
+#define DTAPI_DVBC2_COD_5_6 4 // 5/6
+#define DTAPI_DVBC2_COD_8_9 5 // 8/9 (For 16K FEC)
+#define DTAPI_DVBC2_COD_9_10 5 // 9/10 (For 64K FEC)
+
+// m_Modulation - PLP constellation
+#define DTAPI_DVBC2_QAM16 1 // 16-QAM
+#define DTAPI_DVBC2_QAM64 2 // 64-QAM
+#define DTAPI_DVBC2_QAM256 3 // 256-QAM
+#define DTAPI_DVBC2_QAM1024 4 // 1024-QAM
+#define DTAPI_DVBC2_QAM4096 5 // 4096-QAM
+#define DTAPI_DVBC2_QAM16384 6 // 16K-QAM non standard, but supported
+#define DTAPI_DVBC2_QAM65536 7 // 64K-QAM non standard, but supported
+
+// m_C2Version - DVB-C2 specification version
+#define DTAPI_DVBC2_VERSION_1_2_1 0 // DVB-C2 version 1.2.1
+#define DTAPI_DVBC2_VERSION_1_3_1 1 // DVB-C2 version 1.3.1
+// m_Issy - PLP ISSY
+#define DTAPI_DVBC2_ISSY_NONE 0 // No ISSY field is used
+#define DTAPI_DVBC2_ISSY_SHORT 1 // 2 byte ISSY field is used
+#define DTAPI_DVBC2_ISSY_LONG 2 // 3 byte ISSY field is used
+
+// m_TiDepth - Data slice time interleaving depth
+#define DTAPI_DVBC2_TIDEPTH_NONE 0 // No time interleaving
+#define DTAPI_DVBC2_TIDEPTH_4 1 // 4 OFDM symbols 
+#define DTAPI_DVBC2_TIDEPTH_8 2 // 8 OFDM symbols 
+#define DTAPI_DVBC2_TIDEPTH_16 3 // 16 OFDM symbols 
+
+// m_Type - Data slice type
+#define DTAPI_DVBC2_DSLICE_TYPE_1 0 // Type 1 (Single PLP and fixed mod/cod)
+#define DTAPI_DVBC2_DSLICE_TYPE_2 1 // Type 2 
+
+// m_FecHdrType - Data slice FEC frame header type
+#define DTAPI_DVBC2_FECHDR_TYPE_ROBUST 0 // Robust mode
+#define DTAPI_DVBC2_FECHDR_TYPE_HEM 1 // High efficiency mode
+
+// DVB-C2 Test points
+enum {
+ DTAPI_DVBC2_TP07, // FEC frame
+ DTAPI_DVBC2_TP08,
+ DTAPI_DVBC2_TP10,
+ DTAPI_DVBC2_TP13,
+ DTAPI_DVBC2_TP15, // Data slice
+ DTAPI_DVBC2_TP18, // OFDM output
+ DTAPI_DVBC2_TP20,
+ DTAPI_DVBC2_TP22, // FEC header
+ DTAPI_DVBC2_TP26,
+ DTAPI_DVBC2_TP27, // L1 header
+ DTAPI_DVBC2_TP31,
+ DTAPI_DVBC2_TP32, // L1 part2 data
+ DTAPI_DVBC2_TP33, // L1 part2 + padding & CRC
+ DTAPI_DVBC2_TP37,
+ DTAPI_DVBC2_TP40,
+ DTAPI_DVBC2_TP41,
+ DTAPI_DVBC2_TP42,
+ DTAPI_DVBC2_TP01,
+ DTAPI_DVBC2_TP_COUNT,
+};
+
+// DVB-C2 test points
+extern const int DTAPI_DVBC2_TESTPOINTS[DTAPI_DVBC2_TP_COUNT];
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DSlicePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the data slice parameters
+//
+struct DtDvbC2DSlicePars
+{
+ int m_Id; // Data slice ID. 0..255
+ int m_TunePosition; // Tune position relative to the start frequency in 
+ // multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..8191 
+ // For guard interval 1/64: 0..16383 
+ int m_OffsetLeft; // Offset left in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ int m_OffsetRight; // Offset right in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ // If m_OffsetLeft = m_OffsetRight, the data slice is
+ // empty and no input streams are created for the PLPs
+ // of the data slice.
+ int m_TiDepth; // Time interleaving depth. See DTAPI_DVBC2_TIDEPTH_x
+ int m_Type; // Data slice type. See DTAPI_DVBC2_DSLICE_TYPE_x
+ int m_FecHdrType; // FEC header type. See DTAPI_DVBC2_FECHDR_TYPE_x 
+ bool m_ConstConfig; // Constant data slice configuration
+ bool m_LeftNotch; // Left notch present
+ 
+ // Data per PLP
+ std::vector<DtDvbC2PlpPars> m_Plps;
+
+public:
+ void Init(int Id=0);
+ bool IsEqual(DtDvbC2DSlicePars& DSlicePars);
+ bool operator == (DtDvbC2DSlicePars& DSlicePars);
+ bool operator != (DtDvbC2DSlicePars& DSlicePars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdatePlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// struct for L1 PLP parameter update support
+//
+struct DtDvbC2L1UpdatePlpPars 
+{
+ bool m_Enable; // Enable or disable the PLP.
+ // Only PLPs with m_NoData = true can be disabled.
+public:
+ void Init();
+ bool IsEqual(DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
+ bool operator == (DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
+ bool operator != (DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdateDSlicePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// struct for L1 DSlice parameter update support
+//
+struct DtDvbC2L1UpdateDSlicePars
+{
+ bool m_Enable; // Enable or disable the DSlice.
+ // Only dummy data slices can be disabled. 
+ // A data slice is considered as dummy if either:
+ // - m_OffsetLeft == m_OffsetRight in its 
+ // global configuration; or
+ // - all its PLPs have m_NoData = true
+ // A dummy data slice is modulated with dummy data.
+
+ int m_OffsetLeft; // Data slice left offset - 0..2^(8+g)-1
+ int m_OffsetRight; // Data slice right offset - 0..2^(8+g)-1
+ // If the data slice is not dummy:
+ // - For type 1 , no size change is accepted.
+ // - For type 2 , size change is accepted 
+ // provided it is not zero (i.e. m_OffsetRight >
+ // m_OffsetLeft). It is up to the user to ensure that
+ // there is no bitrate overflow.
+ std::vector<DtDvbC2L1UpdatePlpPars> m_Plps; // L1 PLP updates
+
+public:
+ void Init();
+ bool IsEqual(DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
+ bool operator == (DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
+ bool operator != (DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdatePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// L1 update support
+//
+struct DtDvbC2L1UpdatePars
+{
+ int m_NumFrames; // The following parameters are used during
+ // 'm_NumFrames' C2 frames
+ // L1 DSlice updates
+ std::vector<DtDvbC2L1UpdateDSlicePars> m_DSlices;
+ bool m_EarlyWarningSystem;		// Early warning system
+
+public:
+ void Init();
+ bool IsEqual(DtDvbC2L1UpdatePars& L1UpdatePars);
+ bool operator == (DtDvbC2L1UpdatePars& L1UpdatePars);
+ bool operator != (DtDvbC2L1UpdatePars& L1UpdatePars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for retrieving the DVB-C2 MPLP modulator status
+//
+struct DtDvbC2ModStatus
+{
+ int m_MplpModFlags; // Multi PLP modulator flags
+ __int64 m_DjbOverflows; // Count number of DJB overflows. If it happens,
+ // issy output delay must be decreased or "issy bufs"
+ // increased.
+ __int64 m_DjbUnderflows; // Count number of DJB underflows. If it happens,
+ // issy output delay must be increased.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2NotchPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the notch parameters
+//
+struct DtDvbC2NotchPars
+{
+ int m_Start; // Notch start in multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..8191 
+ // For guard interval 1/64: 0..16383 
+ int m_Width; // Notch width in multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..255 
+ // For guard interval 1/64: 0..511 
+public:
+ void Init(void);
+ bool IsEqual(DtDvbC2NotchPars& NotchPars);
+ bool operator == (DtDvbC2NotchPars& NotchPars);
+ bool operator != (DtDvbC2NotchPars& NotchPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2PaprPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying and enabling the PAPR reduction parameters
+//
+struct DtDvbC2PaprPars
+{
+ bool m_TrEnabled; // TR enabled
+ double m_TrVclip; // TR clipping threshold 1..4.32 (Volt)
+ int m_TrMaxIter; // TR maximum number of iterations. Must be >= 1.
+ // Note: PAPR TR processing time is proportional
+ // to this parameter
+public:
+ void Init(void);
+ bool IsEqual(DtDvbC2PaprPars& PaprPars);
+ bool operator == (DtDvbC2PaprPars& PaprPars);
+ bool operator != (DtDvbC2PaprPars& PaprPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DVB-C2 parameter info
+//
+struct DtDvbC2ParamInfo 
+{
+ int m_L1Part2Length; // #bits of the L1 part2 data (including CRC)
+ int m_NumL1Symbols; // Number of L1 symbols (LP)
+ int m_NumSymbols; // Total number of symbols per frame (LP + Ldata)
+ int m_PilotSpacing; // Distance between pilots (Dx)
+ int m_FftSize; // FFT size
+ int m_MinCarrierOffset; // Lowest used carrier offset (Koffset)
+ int m_CenterFrequency; // Center frequency in multiples of the carrier 
+ // spacing
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the parameters of a PLP.
+// In case of bundled PLPs, only the mode adaptation parameters from the 
+// first PLP of the bundle are used.
+//
+struct DtDvbC2PlpPars
+{
+ bool m_Hem; // High Efficiency Mode
+ bool m_Npd; // Null Packet Deletion
+ int m_Issy; // Issy mode. See DTAPI_DVBC2_ISSY_x
+ int m_IssyBufs; // Issy BUFS
+ int m_IssyOutputDelay; // Delay (in T units) between the incoming data and
+ // the output TS in the receiver model. This value 
+ // determines the minimum and maximum dejitter buffer
+ // usage and is used to compute the ISSY BUFSTAT field
+ int m_TsRate; // If 0 the rate is computed from the PLP parameters,
+ // only possible in case of single PLP and no ISSY 
+ // is used
+ int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
+ int m_Id; // PLP ID. 0..255
+ bool m_Bundled; // A bundled PLP can appear in several data slices. 
+ // All the PLP instances have the same PLP ID.
+ // Only a single input stream results from the 
+ // first PLP of the bundle.
+ int m_Type; // PLP Type. See DTAPI_DVBC2_PLP_TYPE_x
+ int m_GroupId; // Group ID. 0..255
+ int m_FecType; // FEC Type. 0=16K, 1=64K
+ int m_CodeRate; // PLP Code rate. See DTAPI_DVBC2_COD_x
+ int m_Modulation; // PLP Modulation. See DTAPI_DVBC2_x
+ int m_HdrCntr; // Header counter #FECFrames following the 
+ // FECFrame header. 0=1FF 1=2FF.
+ // Only used for DSlice type 2.
+
+ // ACM test mode. Only available for type 2 data slices. If number ACM headers != 0, 
+ // then the successive XFEC frames of this PLP use the modulation and coding 
+ // parameters taken from the m_AcmHeaders array. After the last value is used, it
+ // loops again to the start of the array.
+ // So DtDvbC2PlpPars.m_FecType, m_Modulation, m_CodeRate and m_HdrCntr are ignored.
+ std::vector<DtDvbC2XFecFrameHeader> m_AcmHeaders;
+
+ bool m_PsiSiReproc; // Indicates whether PSI/SI reprocessing is performed
+ int m_TsId; // Transport Stream ID (if m_PsiSiReproc=false)
+ int m_OnwId; // Original Network ID (if m_PsiSiReproc=false)
+ bool m_NoData; // No input data is provided for this PLP. 
+ // It is implicitely true for all PLPs in a data slice 
+ // with m_OffsetLeft = m_OffsetRight
+public:
+ void Init(int PlpId = 0);
+ bool IsEqual(DtDvbC2PlpPars& PlpPars);
+ bool operator == (DtDvbC2PlpPars& PlpPars);
+ bool operator != (DtDvbC2PlpPars& PlpPars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2XFecFrameHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// DVBC2 FEC frame header for ACM test
+//
+struct DtDvbC2XFecFrameHeader
+{
+ int m_FecType; // PLP FEC Type. 0=16K, 1=64K
+ int m_Modulation; // PLP Modulation. See DTAPI_DVBC2_x
+ int m_CodeRate; // PLP Code rate. See DTAPI_DVBC2_COD_x
+ int m_HdrCntr; // Header counter #FEC frames following the 
+ // FEC frame header. 0=1FF, 1=2FF
+ int m_XFecFrameCount; // 1..256: Number of successive XFEC frames using 
+ // these parameters
+public:
+ void Init(void);
+ bool IsEqual(DtDvbC2XFecFrameHeader& FecHeader);
+ bool operator == (DtDvbC2XFecFrameHeader& FecHeader);
+ bool operator != (DtDvbC2XFecFrameHeader& FecHeader);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the DVB-C2 modulation parameters
+//
+ struct DtDvbC2Pars
+{
+public:
+ // General C2 parameters
+ int m_Bandwidth; // Bandwidth. Defines the OFDM carrier spacing 
+ // F=8e6*bandwidth/7/4096 Hz. See DVBC2_BW_x
+ int m_NetworkId; // Network ID. 0..0xFFFF
+ int m_C2SystemId; // C2 System ID. 0..0xFFFF
+ int m_StartFrequency; // Start frequency in multiple of carrier spacing
+ // 0..2^24 - 1 and multiples of dx. 
+ // For guard interval 1/128 dx=24, otherwise dx=12
+ int m_C2Bandwidth; // Bandwidth of the generated signal in 
+ // multiples of pilot carrier spacing. 0..65535
+ int m_GuardInterval; // Guard interval See DVBC2_GI_x
+ bool m_ReservedTone; // Reserved tone. When there are reserved carriers
+ // (e.g. PAPR TR is enabled) it shall be set to true; 
+ // otherwise false
+ bool m_EarlyWarningSystem;		// Early warning system
+ int m_C2Version; // DVB-C2 Version
+ int m_L1TiMode; // L1 time interleaving mode. See DVBC2_L1TIMODE_x
+
+ // Data slices parameters
+ int m_NumDSlices; // Number of data slices
+ DtDvbC2DSlicePars m_DSlices[DTAPI_DVBC2_NUM_DSLICE_MAX];
+
+ // Notches
+ int m_NumNotches; // Number of notches
+ DtDvbC2NotchPars m_Notches[DTAPI_DVBC2_NUM_NOTCH_MAX];
+ 
+ // PLP input
+ int m_NumPlpInputs; // Number of PLPs
+ DtPlpInpPars m_PlpInputs[DTAPI_DVBC2_NUM_PLP_MAX]; // PLP inputs (Optional)
+
+ DtDvbC2PaprPars m_PaprPars; // PAPR Params (Optional)
+ DtVirtualOutPars m_VirtOutput; // Virtual Output parameters(Optional) 
+ DtTestPointOutPars m_TpOutput; // Test point data output parameters (Optional)
+ int m_OutpFreqOffset; // Output frequency offset from 'm_StartFrequency'
+ // in carriers of the generated spectrum. 
+ // Must be multiple of dx.
+ int m_OutpBandwidth; // Output bandwidth in carriers and a multiple of dx.
+ // 0 means default output bandwidth. 
+ // Note: for convenience, one more carrier is output
+ // if an edge carrier needs to be output.
+
+ std::vector<DtDvbC2L1UpdatePars> m_L1Updates; // L1 updates
+
+ // Undocumented
+ int m_L1P2ChangeCtr; // Undocumented. For internal use only
+ bool m_NotchTestEnable; // Undocumented. For internal use only
+ int m_TimeWindowLength; // Undocumented. For internal use only
+
+public:
+ DTAPI_RESULT CheckValidity(void);
+ DTAPI_RESULT GetParamInfo(DtDvbC2ParamInfo& C2Info);
+ void Init(void);
+ bool IsEqual(DtDvbC2Pars& C2Pars);
+ bool operator == (DtDvbC2Pars& C2Pars);
+ bool operator != (DtDvbC2Pars& C2Pars);
+};
+ 
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Demodulation +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// DtDvbC2DemodL1Part2Plp::m_PayloadType - The PLP payload type
+#define DTAPI_DVBC2_PAYLOAD_GFPS 0 // Generic fixed-length packetized stream
+#define DTAPI_DVBC2_PAYLOAD_GCS 1 // Generic continuous stream
+#define DTAPI_DVBC2_PAYLOAD_GSE 2 // Generic stream encapsulation
+#define DTAPI_DVBC2_PAYLOAD_TS 3 // Transport Stream
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1PlpSigDataPlp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+ //
+// Struct for storing layer 1 PLP signalling information per PLP.
+// For type 1 data slices this struct contains the PLP-signalling information
+// from the layer 1 part 2 signalling.
+// For type 2 data slices this struct contains the PLP-signalling information
+// from the layer 1 part 1 (=FEC-frame header).
+//
+struct DtDvbC2DemodL1PlpSigDataPlp
+{
+ int m_Id; // PLP ID: 0..255
+ int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_Modulation; // PLP modulation, see DTAPI_DVBC2_x
+ int m_CodeRate; // PLP modulation, see DTAPI_DVBC2_x
+ int m_HdrCntr; // Header counter #FEC frames following the 
+ // FEC frame header. 0=1FF, 1=2FF. Only present for
+ // type 2 data slices
+
+ DtDvbC2DemodL1PlpSigDataPlp();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1PlpSigData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Struct for storing the DVB-C2 layer 1 PLP signalling data
+//
+struct DtDvbC2DemodL1PlpSigData
+{
+ int m_NumPlps; // Number of PLPs
+ std::vector<DtDvbC2DemodL1PlpSigDataPlp> m_Plps;
+
+ DtDvbC2DemodL1PlpSigData();
+ 
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2Plp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing Layer 1 part 2 information per PLP
+//
+struct DtDvbC2DemodL1Part2Plp
+{
+ int m_Id; // PLP ID: 0..255
+ int m_Bundled; // Bundled PLP
+ int m_Type; // PLP type, see DTAPI_DVBC2_PLP_TYPE_x
+ int m_PayloadType; // PLP payload type: 0..3
+ int m_GroupId; // Group ID: 0..255
+ // Start, FecType, Modulation and CodeRate parameters are not present for type 2 data 
+ // slices
+ int m_Start; // PLP start: Start of the first complete XFECframe
+ int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_Modulation; // PLP modulation, see DTAPI_DVBC2_x
+ int m_CodeRate; // PLP modulation, see DTAPI_DVBC2_x
+ int m_PsiSiReproc; // Indicates whether PSI/SI reprocessing is performed
+ int m_TsId; // Transport Stream ID (if m_PsiSiReproc=false)
+ int m_OnwId; // Original Network ID (if m_PsiSiReproc=false)
+ 
+ DtDvbC2DemodL1Part2Plp();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+ 
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2DSlice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Struct for storing Layer 1 part 2 information per data slice
+//
+struct DtDvbC2DemodL1Part2DSlice 
+{
+ int m_Id; // Data slice ID: 0..255
+ int m_TunePosition; // Tune position relative to the start frequency in 
+ // multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..8191 
+ // For guard interval 1/64: 0..16383 
+ int m_OffsetLeft; // Offset left in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ int m_OffsetRight; // Offset right in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ // If m_OffsetLeft = m_OffsetRight, the data slice is
+ // empty and no input streams are created for the PLPs
+ // of the data slice.
+ int m_TiDepth; // Time interleaving depth, see DTAPI_DVBC2_TIDEPTH_x
+ int m_Type; // Data slice type, see DTAPI_DVBC2_DSLICE_TYPE_x
+ int m_FecHdrType; // FEC header type, see DTAPI_DVBC2_FECHDR_TYPE_x 
+ int m_ConstConfig; // Constant data slice configuration flag
+ int m_LeftNotch; // Left notch present flag
+ // PLPs
+ int m_NumPlps; // Number of PLPs
+ std::vector<DtDvbC2DemodL1Part2Plp> m_Plps;
+
+ DtDvbC2DemodL1Part2DSlice();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the DVB-C2 layer 1 part 2data
+//
+struct DtDvbC2DemodL1Part2Data
+{
+ int m_NetworkId; // Network ID: 0..0xFFFF
+ int m_C2SystemId; // C2 System ID: 0..0xFFFF
+ int m_StartFrequency; // Start frequency in multiple of carrier spacing:
+ // 0..2^24 - 1
+ int m_C2Bandwidth; // Bandwidth of the generated signal in 
+ // multiples of pilot carrier spacing: 0..65535
+ int m_GuardInterval; // Guard interval. See DVBC2_GI_x
+ int m_C2FrameLength; // C2 frame length: #Data symbols per C2 frame
+ int m_L1P2ChangeCtr; // Value of the L1_PART2_CHANGE_COUNTER field
+ int m_ReservedTone; // Reserved tone
+ bool m_EarlyWarningSystem;		// Early warning system
+ int m_C2Version; // DVB-C2 Version
+
+ // Data slices
+ int m_NumDSlices; // Number of data slices
+ std::vector<DtDvbC2DemodL1Part2DSlice> m_DSlices;
+ 
+ // Notches
+ int m_NumNotches; // Number of notches
+ std::vector<DtDvbC2NotchPars> m_Notches;
+
+ DtDvbC2DemodL1Part2Data();
+ 
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for DVB-C2 PLP-stream selection
+//
+struct DtDvbC2StreamSelPars
+{
+ int m_DSliceId; // ID of the data slice or DTAPI_DVBC2_DSLICE_ID_AUTO
+ int m_PlpId; // ID of the data PLP or DTAPI_DVBC2_PLP_ID_xxx
+ int m_CommonPlpId; // ID of the common PLP or DTAPI_DVBC2_PLP_ID_xxx
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-S2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+#define DTAPI_DVBS2_NUM_PLP_MAX 255 // Maximum number of PLPs
+
+// m_Issy - PLP ISSY
+#define DTAPI_DVBS2_ISSY_NONE 0 // No ISSY field is used
+#define DTAPI_DVBS2_ISSY_SHORT 1 // 2 byte ISSY field is used
+#define DTAPI_DVBS2_ISSY_LONG 2 // 3 byte ISSY field is used
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+struct DtDvbS2ModStatus
+{
+ int m_MplpModFlags; // Multi PLP modulator flags
+ __int64 m_DjbOverflows; // Count number of DJB overflows. If it happens,
+ // issy output delay must be decreased or "issy bufs"
+ // increased.
+ __int64 m_DjbUnderflows; // Count number of DJB underflows. If it happens,
+ // issy output delay must be increased.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2FecFrameHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+struct DtDvbS2FecFrameHeader
+{
+ int m_Modulation; // PLP Modulation. See DTAPI_MOD_DVBS2_*
+ int m_CodeRate; // PLP Code rate. See DTAPI_MOD_x
+ int m_FecFrameSize; // Fec frame size. See DTAPI_MOD_S2_*FRM
+ bool m_HasPilots; // Enable pilots
+ int m_FecFrameCount; // Number of successive FEC frames using these
+ // parameters, 0 means infinite.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2ModCod -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+struct DtDvbS2ModCod
+{
+ int m_ModType; // Modulation type, e.g. DTAPI_MOD_DVBS_QPSK
+ int m_CodeRate; // Code rate, e.g. DTAPI_MOD_1_2
+ // Constructor
+ DtDvbS2ModCod();
+ DtDvbS2ModCod(int ModType, int CodeRate);
+ bool operator < (const DtDvbS2ModCod& ModCod) const;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+struct DtDvbS2PlpPars
+{
+ bool m_Hem; // High Efficiency Mode
+ bool m_Npd; // Null Packet Deletion
+ int m_Issy; // Issy mode. See DTAPI_DVBS2_ISSY_x
+ int m_IssyBufs; // Issy BUFS
+ int m_IssyOutputDelay; // Delay (in T units) between the incoming data and
+ // the output TS in the receiver model. This value 
+ // determines the minimum and maximum dejitter buffer
+ // usage and is used to compute the ISSY BUFSTAT field
+ int m_TsRate; // Ts rate
+ int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
+ int m_Id; // PLP ID. 0..255
+
+ // One or more fec frame headers. If there is only 1 the m_FecFrameCount member
+ // is ignored. Otherwise that specifies the number of frames to generate with those
+ // parameters. When that number of frames are generated, the next set of parameters
+ // is taken. After the last DtDvbS2FecFrameHeader the first one is used again.
+ std::vector<DtDvbS2FecFrameHeader> m_AcmHeaders;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+struct DtDvbS2Pars
+{
+ DtVirtualOutPars m_VirtOutput; // Virtual-output parameters (Optional) 
+ bool m_L3Output; // Set to true to enable L3 output
+ int m_SymRate; // Symbol rate
+ int m_RollOff; // Roll-off DTAPI_MOD_ROLLOFF_xxx
+ 
+ // Data per PLP
+ std::vector<DtDvbS2PlpPars> m_Plps;
+ // PLP input
+ int m_NumPlpInputs; // Number of PLPs
+ DtPlpInpPars m_PlpInputs[DTAPI_DVBS2_NUM_PLP_MAX]; // PLP inputs (Optional)
+
+ DtDvbS2Pars();
+ DTAPI_RESULT CheckValidity();
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-T2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// Maxima
+#define DTAPI_DVBT2_NUM_PLP_MAX 255 // Maximum number of PLPs
+#define DTAPI_DVBT2_NUM_RF_MAX 7 // Maximum number of RF output signals
+
+// PLP IDs
+#define DTAPI_DVBT2_PLP_ID_NONE -1 // No PLP selected
+#define DTAPI_DVBT2_PLP_ID_AUTO -2 // Automatic PLP selection
+
+// m_Issy
+#define DTAPI_DVBT2_ISSY_NONE 0 // No ISSY field is used
+#define DTAPI_DVBT2_ISSY_SHORT 1 // 2-byte ISSY field is used
+#define DTAPI_DVBT2_ISSY_LONG 2 // 3-byte ISSY field is used
+
+// m_Bandwidth
+#define DTAPI_DVBT2_1_7MHZ 0 // 1.7 MHz
+#define DTAPI_DVBT2_5MHZ 1 // 5 MHz
+#define DTAPI_DVBT2_6MHZ 2 // 6 MHz
+#define DTAPI_DVBT2_7MHZ 3 // 7 MHz
+#define DTAPI_DVBT2_8MHZ 4 // 8 MHz
+#define DTAPI_DVBT2_10MHZ 5 // 10 MHz
+#define DTAPI_DVBT2_BW_UNK -1 // Unknown bandwith
+#define DTAPI_DVBT2MI_BW_MSK 0xF // Mask for T2MI ParXtra2
+#define DTAPI_DVBT2MI_BW_UNK 0xF //Val in ParXtra2 if not set, map to 8MHz
+
+// m_FftMode
+// Warning: the codes are different from the corresponding L1 field
+#define DTAPI_DVBT2_FFT_1K 0 // 1K FFT
+#define DTAPI_DVBT2_FFT_2K 1 // 2K FFT
+#define DTAPI_DVBT2_FFT_4K 2 // 4K FFT
+#define DTAPI_DVBT2_FFT_8K 3 // 8K FFT
+#define DTAPI_DVBT2_FFT_16K 4 // 16K FFT
+#define DTAPI_DVBT2_FFT_32K 5 // 32K FFT
+#define DTAPI_DVBT2_FFT_UNK -1 // Unknown FFT mode
+
+// m_Miso
+#define DTAPI_DVBT2_MISO_OFF 0 // No MISO
+#define DTAPI_DVBT2_MISO_TX1 1 // TX1 only
+#define DTAPI_DVBT2_MISO_TX2 2 // TX2 only
+#define DTAPI_DVBT2_MISO_TX1TX2 3 // TX1+TX2 Legacy
+#define DTAPI_DVBT2_MISO_SUM 3 // TX1+TX2
+#define DTAPI_DVBT2_MISO_BOTH 4 // TX1 and TX2
+
+// m_Guard - Guard interval
+// Warning: the codes are different from the corresponding L1 field
+#define DTAPI_DVBT2_GI_1_128 0 // 1/128
+#define DTAPI_DVBT2_GI_1_32 1 // 1/32
+#define DTAPI_DVBT2_GI_1_16 2 // 1/16
+#define DTAPI_DVBT2_GI_19_256 3 // 19/256
+#define DTAPI_DVBT2_GI_1_8 4 // 1/8
+#define DTAPI_DVBT2_GI_19_128 5 // 19/128
+#define DTAPI_DVBT2_GI_1_4 6 // 1/4
+#define DTAPI_DVBT2_GI_UNK -1 // Unknown guard interval
+
+// m_Papr - PAPR - Peak to Average Power Reduction
+#define DTAPI_DVBT2_PAPR_NONE 0
+#define DTAPI_DVBT2_PAPR_ACE 1 // ACE - Active Constellation Extension
+#define DTAPI_DVBT2_PAPR_TR 2 // TR - PAPR using reserved carriers
+#define DTAPI_DVBT2_PAPR_ACE_TR 3 // ACE and TR
+
+// m_BwtExt - Bandwidth extension
+#define DTAPI_DVBT2_BWTEXT_OFF false // No bandwidth extension
+#define DTAPI_DVBT2_BWTEXT_ON true // Bandwidth extension on
+
+// m_PilotPattern
+// Warning: the codes are different from the corresponding L1 field
+#define DTAPI_DVBT2_PP_1 1 // PP1
+#define DTAPI_DVBT2_PP_2 2 // PP2
+#define DTAPI_DVBT2_PP_3 3 // PP3
+#define DTAPI_DVBT2_PP_4 4 // PP4
+#define DTAPI_DVBT2_PP_5 5 // PP5
+#define DTAPI_DVBT2_PP_6 6 // PP6
+#define DTAPI_DVBT2_PP_7 7 // PP7
+#define DTAPI_DVBT2_PP_8 8 // PP8
+
+// m_CodeRate - Code rate
+#define DTAPI_DVBT2_COD_1_2 0 // 1/2
+#define DTAPI_DVBT2_COD_3_5 1 // 3/5
+#define DTAPI_DVBT2_COD_2_3 2 // 2/3
+#define DTAPI_DVBT2_COD_3_4 3 // 3/4
+#define DTAPI_DVBT2_COD_4_5 4 // 4/5 not for T2 lite
+#define DTAPI_DVBT2_COD_5_6 5 // 5/6 not for T2 lite
+#define DTAPI_DVBT2_COD_1_3 6 // 1/3 only for T2 lite
+#define DTAPI_DVBT2_COD_2_5 7 // 2/5 only for T2 lite
+
+// m_FefSignal - Type of signal generated during the FEF period
+#define DTAPI_DVBT2_FEF_ZERO 0 // Use zero I/Q samples during FEF
+#define DTAPI_DVBT2_FEF_1K_OFDM 1 // 1K OFDM symbols with 852 active
+ // carriers containing BPSK symbols
+ // (same PRBS as the T2 dummy cells,
+ // not reset between symbols)
+#define DTAPI_DVBT2_FEF_1K_OFDM_384 2 // 1K OFDM symbols with 384 active
+ // carriers containing BPSK symbols
+
+// m_PlpConstel and m_L1Constel - Modulation constellation
+#define DTAPI_DVBT2_BPSK 0 // BPSK
+#define DTAPI_DVBT2_QPSK 1 // QPSK
+#define DTAPI_DVBT2_QAM16 2 // 16-QAM
+#define DTAPI_DVBT2_QAM64 3 // 64-QAM
+#define DTAPI_DVBT2_QAM256 4 // 256-QAM
+
+// m_Type - PLP type
+#define DTAPI_DVBT2_PLP_TYPE_COMM 0 // Common PLP
+#define DTAPI_DVBT2_PLP_TYPE_1 1 // PLP type 1
+#define DTAPI_DVBT2_PLP_TYPE_2 2 // PLP type 2
+
+// m_FecType - PLP FEC type
+#define DTAPI_DVBT2_LDPC_16K 0 // 16K LDPC
+#define DTAPI_DVBT2_LDPC_64K 1 // 64K LDPC
+
+// m_TimeIlType - Time interleaving type
+#define DTAPI_DVBT2_IL_ONETOONE 0 // Interleaving frame in one T2 frame
+#define DTAPI_DVBT2_IL_MULTI 1 // Interleaving frame in multiple frames
+
+// m_TimeStamping - Type of timestamps in T2MI
+#define DTAPI_DVBT2MI_TIMESTAMP_NULL 0 // No timestamping
+#define DTAPI_DVBT2MI_TIMESTAMP_REL 1 // Relative timestamps. Use m_Subseconds
+#define DTAPI_DVBT2MI_TIMESTAMP_ABS 2 // Absolute timestamps. Use m_T2miUtco,
+ // m_SecSince2000, m_Subseconds,
+
+// m_T2Version - DVB-T2 specification version
+#define DTAPI_DVBT2_VERSION_1_1_1 0 // DVB-T2 version 1.1.1
+#define DTAPI_DVBT2_VERSION_1_2_1 1 // DVB-T2 version 1.2.1
+#define DTAPI_DVBT2_VERSION_1_3_1 2 // DVB-T2 version 1.3.1
+
+// m_T2Profile - DVB-T2 profile
+#define DTAPI_DVBT2_PROFILE_BASE 0 
+#define DTAPI_DVBT2_PROFILE_LITE 1 // Requires DVB-T2 version 1.3.1
+
+// m_BiasBalancing
+#define DTAPI_DVBT2_BIAS_BAL_OFF 0 // No L1 bias compensation
+#define DTAPI_DVBT2_BIAS_BAL_ON 1 // Modify L1 reserved fields and L1 ext.
+ // field padding to compensate L1 bias
+// m_GseLabelType - DVB-T2 GSE Label size
+#define DTAPI_DVBT2_GSE_LABEL_6BYTE 0 // 6 Byte GSE label
+#define DTAPI_DVBT2_GSE_LABEL_3BYTE 1 // 3 Byte GSE label
+#define DTAPI_DVBT2_GSE_LABEL_NONE 2 // No GSE label
+
+#define DTAPI_TXSIG_FEF_LEN_MIN 162212 // Min. FEF length for FEF TX sgnalling
+
+// DVB-T2 test point enum
+enum {
+ DTAPI_DVBT2_TP00,
+ DTAPI_DVBT2_TP01,
+ DTAPI_DVBT2_TP03,
+ DTAPI_DVBT2_TP04,
+ DTAPI_DVBT2_TP06,
+ DTAPI_DVBT2_TP08,
+ DTAPI_DVBT2_TP09,
+ DTAPI_DVBT2_TP11,
+ DTAPI_DVBT2_TP12,
+ DTAPI_DVBT2_TP15,
+ DTAPI_DVBT2_TP16,
+ DTAPI_DVBT2_TP19, // Only usable if CFLOAT32 output format is selected
+ DTAPI_DVBT2_TP20,
+ DTAPI_DVBT2_TP21,
+ DTAPI_DVBT2_TP22,
+ DTAPI_DVBT2_TP23,
+ DTAPI_DVBT2_TP24,
+ DTAPI_DVBT2_TP25,
+ DTAPI_DVBT2_TP26,
+ DTAPI_DVBT2_TP27,
+ DTAPI_DVBT2_TP28,
+ DTAPI_DVBT2_TP29,
+ DTAPI_DVBT2_TP30,
+ DTAPI_DVBT2_TP32,
+ DTAPI_DVBT2_TP33, // T2MI output
+ DTAPI_DVBT2_TP34, // T2MI output
+
+ // Receiver Buffer Model
+ DTAPI_DVBT2_TP50, // TDI size 
+ DTAPI_DVBT2_TP51, // TDI write index, TDI read available
+ DTAPI_DVBT2_TP53, // DJB size 
+ DTAPI_DVBT2_TP_COUNT, // Number of test points
+};
+
+extern const int DTAPI_DVBT2_TESTPOINTS[DTAPI_DVBT2_TP_COUNT];
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2AuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the parameters of AUX streams
+//
+struct DtDvbT2AuxPars
+{
+ int m_NumDummyStreams; // Number of dummy AUX streams
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2AuxPars& AuxPars);
+ bool operator == (DtDvbT2AuxPars& AuxPars);
+ bool operator != (DtDvbT2AuxPars& AuxPars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2MiPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for specifying the parametes for T2MI output streams
+//
+struct DtDvbT2MiPars
+{
+ bool m_Enabled; // Enable T2MI output. If enabled, a T2MI
+ // Transport Stream is generated and output
+ int m_Pid; // T2MI data PID
+ int m_StreamId; // stream ID for the first T2MI stream 
+ int m_Pid2; // Second T2MI data PID
+ int m_StreamId2; // stream ID for the second T2MI stream
+ int m_PcrPid; // PCR PID. If -1, no PCR is included otherwise
+ // PCRs are inserted on the specified PID
+ int m_PmtPid; // PMT PID. If -1, no PMT-table and no PAT-table
+ // are included otherwise a PMT-table is inserted 
+ // on the specified PID
+ int m_TsRate; // Rate in bps for the T2MI output
+ int m_TimeStamping; // T2MI timestamps: None, Absolute or Releative
+ // See DVBT2MI_TIMESTAMP_x
+ __int64 m_SecSince2000; // First T2MI output timestamp value. Next values
+ // are computed
+ int m_Subseconds; // The number of subseconds. See T2MI spec table 4 
+ int m_T2miUtco; // Offset in seconds between UTC and m_SecSince2000.
+ // As of February 2009 the value shall be 2 and 
+ // shall change as a result of each new leap second.
+ bool m_EncodeFef; // If true, outputs a FEF part composite packet 
+ // with the required subpart. Otherwise, only 
+ // outputs a FEF part NULL packet when FEF is
+ // enabled.
+ bool m_SyncWithExtClock; // Undocumented. For internal use only.
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2MiPars& T2MiPars);
+ bool operator == (DtDvbT2MiPars& T2MiPars);
+ bool operator != (DtDvbT2MiPars& T2MiPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for retrieving the MPLP modulator status
+//
+struct DtDvbT2ModStatus
+{
+ int m_MplpModFlags; // Multi PLP modulator flags
+ // General MPLP status info
+ __int64 m_PlpNumBlocksOverflows;
+ // Counts the FEC frames for which the requested
+ // number of PLP blocks is bigger than NumBlocks
+ // (the receiver will get an invalid stream)
+ __int64 m_BitrateOverflows; // Counts the frames in which too many bits were
+ // allocated (the receiver will get an invalid stream)
+ __int64 m_TtoErrorCount; // Number of times the generated TTO value was
+ // invalid (typically from a too small T_design)
+ 
+ // T2MI Specific status info
+ __int64 m_T2MiOutputRateOverFlows;
+ // Number of bit rate overflows(i.e. the T2MI output
+ // rate must be increased for reliable operation)
+ int m_T2MiOutputRate; // Current T2MI rate excluding null packets(in bps)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2PaprPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying and enabling the PAPR reduction parameters
+//
+struct DtDvbT2PaprPars
+{
+ bool m_AceEnabled; // ACE enabled
+ double m_AceVclip; // ACE clipping threshold 1..4.32 (Volt)
+ double m_AceGain; // ACE gain 0..31 (steps of 1)
+ double m_AceLimit; // ACE limit 0.7..1.4 (steps of 0.1) 
+ int m_AceInterpFactor; // ACE interpolation factor 1..4
+ // Note: PAPR ACE processing time is proportional
+ // to this parameter (1 recommended for realtime)
+ int m_AcePlpIndex; // PLP used for the PAPR ACE
+ bool m_TrEnabled; // TR enabled
+ bool m_TrP2Only; // PAPR TR is only applied on the P2 symbol
+ double m_TrVclip; // TR clipping threshold 1..4.32 (Volt)
+ int m_TrMaxIter; // TR maximum number of iterations. Must be >= 1
+ // Note: PAPR TR processing time is proportional
+ // to this parameter
+ int m_L1ExtLength; // L1 extension field length 0..65535
+ bool m_L1AceEnabled; // L1 ACE enabled
+ double m_L1AceCMax; // L1 ACE maximum constellation extension value
+ bool m_L1Scrambling; // L1 post scrabling (requires T2-version 1.3.1)
+
+ // Parameters below only apply if DVB-T2 V1.2.1 is selected
+ int m_NumBiasBalCells; // Dummy cells added to reduce the P2 PAPR
+ // 0..BiasBalancingCellsMax
+ int m_BiasBalancing; // Modify the L1 reserved fields and 
+ // L1 ext padding to compensate the L1 bias. 
+ // See DTAPI_DVBT2_BIAS_x
+ int m_TrAlgorithm; // Undocumented. Must be 1 (default)
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2PaprPars& PaprPars);
+ bool operator == (DtDvbT2PaprPars& PaprPars);
+ bool operator != (DtDvbT2PaprPars& PaprPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DVB-T2 parameter info
+//
+struct DtDvbT2ParamInfo 
+{
+ int m_TotalCellsPerFrame; // Total number of cells per frame
+ int m_L1CellsPerFrame; // Total #cells per frame used for L1 signaling
+ // Overhead: m_L1CellsPerFrame/m_TotalCellsPerFrame
+ int m_AuxCellsPerFrame; // Total number of auxiliary stream cells per frame 
+ // (currently only used for TX signalling if enabled)
+ int m_BiasBalCellsPerFrame; // Total number of L1 bias balancing cells per frame
+ int m_BiasBalCellsMax; // Maximum number of L1 bias balancing cells per P2
+ int m_DummyCellsPerFrame; // Total number of cells lost per frame. Dummy cells
+ // overhead: m_DummyCellsPerFrame/m_TotalCellsPerFrame
+ // It is computed in case no NDP is used for frame 0.
+ int m_SamplesPerFrame; // Total number of samples per frame
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the parameters of a PLP
+//
+struct DtDvbT2PlpPars
+{
+ // Mode adaptation layer: TS input
+ bool m_Hem; // High Efficiency Mode: yes/no
+ bool m_Npd; // Null Packet Deletion: yes/no
+ int m_Issy; // ISSY mode. See DTAPI_DVBT2_ISSY_XXX
+ int m_IssyBufs; // ISSY BUFS
+ int m_IssyTDesign; // T-design value for TTO generation. 
+ // Use 0 to have the modulator choose the value.
+ // T-design is defined as the delay (in samples)
+ // between the start of the first T2 frame in 
+ // which the PLP is mapped (m_FirstFrameIdx) and
+ // the first output bit of the transport stream.
+ int m_CompensatingDelay; // Additional delay (in samples) before the TS 
+ // data is sent. Use -1 to have the modulator 
+ // choose the value
+ int m_TsRate; // If 0 the rate is computed from the PLP 
+ // parameters. Only possible if no NPD is used.
+ // Mode adaptation layer: GSE input
+ int m_GseLabelType; // GSE-label type. See DTAPI_DVBT2_GSE_LABEL_XXX
+
+ // DVB-T2 L1 parameters
+ int m_Id; // PLP ID: 0..255
+ int m_GroupId; // PLP group ID: 0..255
+ int m_Type; // PLP type: DTAPI_DVBT2_PLP_TYPE_XXX
+ int m_PayloadType; // PLP payload type: DTAPI_DVBT2_PAYLOAD_XXX
+ int m_CodeRate; // PLP code rate: DTAPI_DVBT2_COD_XXX
+ int m_Modulation; // PLP modulation: DTAPI_DVBT2_BPSK/...
+ bool m_Rotation; // Constellation rotation: yes/no
+ int m_FecType; // FEC Type. 0=16K, 1=64K; Must be 16K for T2 lite
+ int m_FrameInterval; // T2-frame interval for this PLP: 1..255
+ int m_FirstFrameIdx; // First frame index: 0..m_FrameInterval-1
+ int m_TimeIlLength; // Time interleaving length: 0..255
+ int m_TimeIlType; // Time interleaving type: DTAPI_DVBT2_IL_XXX
+ bool m_InBandAFlag; // In band A signaling information: yes/no
+ bool m_InBandBFlag; // In band B Signaling information: yes/no
+ // Only useful if DVB-T2 V1.2.1 is selected
+ int m_NumBlocks; // Maximum number of FEC blocks contained in
+ // one interleaving frame
+
+ // IDs of the other PLPs in the in-band signaling
+ int m_NumOtherPlpInBand; // Number of other PLPs in m_OtherPlpInBand
+ int m_OtherPlpInBand[DTAPI_DVBT2_NUM_PLP_MAX-1];
+
+ // The parameters below are only meaningful for type 1 PLPs in TFS case
+ bool m_FfFlag; // FF flag
+ int m_FirstRfIdx; // First TFS RF channel: 0..NumRf-1
+
+public:
+ void Init(int PlpId = 0);
+ bool IsEqual(DtDvbT2PlpPars& PlpPars);
+ bool operator == (DtDvbT2PlpPars& PlpPars);
+ bool operator != (DtDvbT2PlpPars& PlpPars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- RBM events -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// RBM events all are errors except plot
+//
+enum DtDvbT2RbmEventType 
+{
+ // Plot event (only generated if m_PlotEnabled is true)
+ DTAPI_DVBT2_RBM_EVENT_PLOT,
+ // Dejitter buffer underflow
+ DTAPI_DVBT2_RBM_EVENT_DJB_UNDERFLOW,
+ // BUFS=[m_Bufs] gives too small dejitter buffer
+ DTAPI_DVBT2_RBM_EVENT_BUFS_TOO_SMALL,
+ // TTO=[m_Tto] gives time in the past
+ DTAPI_DVBT2_RBM_EVENT_TTO_IN_THE_PAST,
+ // DJB overflow (should never happen except if the model is buggy) 
+ DTAPI_DVBT2_RBM_EVENT_DJB_OVERFLOW,
+ // BBFrame parser: CRC8 error in header (val=[m_Val]) 
+ DTAPI_DVBT2_RBM_EVENT_CRC8_ERROR_HEADER,
+ // BBFrame parser: DFL too large 
+ DTAPI_DVBT2_RBM_EVENT_DFL_TOO_LARGE,
+ // BBFrame parser: SYNCD too large (SYNCD=[m_SyncD] DFL=[m_Dfl]) 
+ DTAPI_DVBT2_RBM_EVENT_SYNCD_TOO_LARGE,
+ // BBFrame parser: invalid UPL 
+ DTAPI_DVBT2_RBM_EVENT_INVALID_UPL,
+ // BBFrame parser: invalid syncd (syncd=[m_SyncD] left=[m_Left]) 
+ DTAPI_DVBT2_RBM_EVENT_INVALID_SYNCD,
+ // TDI overflow: write pointer ([m_TdiWriteIndex]) ahead of 
+ // read pointer ([m_TdiReadIndex]) 
+ DTAPI_DVBT2_RBM_EVENT_TDI_OVERFLOW,
+ // TDI overflow: too many TI blocks queued 
+ DTAPI_DVBT2_RBM_EVENT_TOO_MANY_TI_BLOCKS,
+ // plp_start value gives overlap between PLP id=[m_PlpId1] and id=[m_PlpId2] 
+ DTAPI_DVBT2_RBM_EVENT_INVALID_PLP_START,
+ // Frequency/L1 deinterleaver overflow 
+ DTAPI_DVBT2_RBM_EVENT_FDI_OVERFLOW,
+ // Not enough ISCR data to estimate the TS rate 
+ DTAPI_DVBT2_RBM_EVENT_NO_TS_RATE,
+ // ISCR error (delta=[m_Delta]) 
+ DTAPI_DVBT2_RBM_EVENT_ISCR_ERROR,
+ // BUFS not constant (current=[m_CurBufs] new=[m_NewBufs]) 
+ DTAPI_DVBT2_RBM_EVENT_BUFS_NOT_CONSTANT,
+ // ISSYI field cannot change its value 
+ DTAPI_DVBT2_RBM_EVENT_ISSYI_NOT_CONSTANT,
+ // HEM field cannot change its value 
+ DTAPI_DVBT2_RBM_EVENT_HEM_NOT_CONSTANT,
+ // plp_num_blocks for this interleaving frame is too small (plp_num_blocks=%d) 
+ // At least 3 FEC block required in interleaving frame with HEM=1,
+ // at least 1 if HEM=0. 
+ DTAPI_DVBT2_RBM_EVENT_PLP_NUM_BLOCKS_TOO_SMALL,
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2RbmEvent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// RBM event parameters
+//
+struct DtDvbT2RbmEvent
+{
+ int m_DataPlpId; // Data plp ID identifiying the stream
+ int m_DataPlpIndex; // Data plp index
+ double m_Time; // Time in T units
+ int m_IsCommonPlp; // 1 = common PLP, 0 = data PLP,
+ // -1 = the event does not refer to a particular PLP
+ DtDvbT2RbmEventType m_EventType;
+ // Additional parameters
+ union {
+ // DTAPI_DVBT2_RBM_EVENT_PLOT parameters
+ struct {
+ int m_TdiWriteIndex; // TDI write index
+ int m_TdiReadIndex; // TDI read index
+ int m_TdiReadAvailable;// Available cells in the TDI read buffer
+ int m_DjbSize; // Dejitter buffer size in bits
+ } Plot;
+
+ // DTAPI_DVBT2_RBM_EVENT_BUFS_TOO_SMALL parameters
+ struct {
+ int m_Bufs; // BUFS value
+ } BufsTooSmall;
+
+ // DTAPI_DVBT2_RBM_EVENT_TTO_IN_THE_PAST parameters
+ struct {
+ int m_Tto; // TTO value
+ } TtoInThePast;
+
+ // DTAPI_DVBT2_RBM_EVENT_DJB_OVERFLOW paraneters
+ struct {
+ int m_DjbSize; // Dejitter buffer size in bits
+ int m_DjbMaxSize;
+ } DjbOverflow;
+
+ // DTAPI_DVBT2_RBM_EVENT_CRC8_ERROR_HEADER parameters
+ struct {
+ int m_Val; // CRC8 value
+ } Crc8ErrorHeader;
+
+ // DTAPI_DVBT2_RBM_EVENT_DFL_TOO_LARGE parameters
+ struct {
+ int m_SyncD; // SYNCD
+ int m_Dfl; // DFL
+ } SyncDTooLarge;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_INVALID_SYNCD parameters
+ struct {
+ int m_Syncd; // SYNCD
+ int m_Left; // Left
+ } InvalidSyncD;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_TDI_OVERFLOW parameters
+ struct {
+ int m_TdiWriteIndex; // TDI write index
+ int m_TdiReadIndex; // TDI read index
+ } TdiOverflow;
+
+ // DTAPI_DVBT2_RBM_EVENT_INVALID_PLP_START parameters
+ struct {
+ int m_PlpId1; // IDs of overlapping PLPs
+ int m_PlpId2;
+ } InvalidPlpStart;
+
+ // DTAPI_DVBT2_RBM_EVENT_ISCR_ERROR parameters
+ struct {
+ int m_Delta; // Delta time in T units 
+ } IscrError;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_BUFS_NOT_CONSTANT parameters
+ struct {
+ int m_CurBufs; // Different BUFS values
+ int m_newBufs;
+ } BufsNotConstant;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_PLP_NUM_BLOCKS_TOO_SMALL parameters
+ struct {
+ int m_PlpNumBlocks; // Number of blocks
+ } PlpNumBlocksTooSmall;
+ } u;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2RbmValidation -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for enabling the RBM validation and specifying a callback function
+//
+struct DtDvbT2RbmValidation
+{
+public:
+ bool m_Enabled; // Enable RBM validation
+ bool m_PlotEnabled; // Enable RBM plotting events
+ int m_PlotPeriod; // Plot period
+ void* m_pCallbackOpaque; // RBM event callback function and environment
+ void (*m_pCallbackFunc)(void *pOpaque, const DtDvbT2RbmEvent* pRbmEvent);
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2RbmValidation& RbmPars);
+ bool operator == (DtDvbT2RbmValidation& RbmPars);
+ bool operator != (DtDvbT2RbmValidation& RbmPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2TxSigPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying and enabling the Transmitter Signature
+//
+struct DtDvbT2TxSigPars
+{
+ // TX Signature through Auxiliary Streams
+ // The total number of possible TX IDs are M=3*(P+1)
+ // The number of cells used per transmitter is N=2^Q 
+ // The number of of T2 frames per TX SIG frame is L=R+1 
+ bool m_TxSigAuxEnabled; // Enabled
+ int m_TxSigAuxId; // Transmitter ID. 0..3071
+ int m_TxSigAuxP; // P 0..1023. The total number of possible 
+ // TX IDs is M=3*(P+1). Hence M <= 3072
+ int m_TxSigAuxQ; // Q 0..15. The number of cells used per 
+ // transmitter is N=2^Q
+ int m_TxSigAuxR; // R 0..255. The number of T2 frames
+ // per TX SIG frame is L=R+1
+
+ // TX Signature through FEF. 
+ // To use this FEF generation must be enabled and the FEF length 
+ // must be >= DTAPI_TXSIG_FEF_LEN_MIN
+ bool m_TxSigFefEnabled; // Enabled
+ int m_TxSigFefId1; // TX ID for 1st signature period. 0..7
+ int m_TxSigFefId2; // TX ID for 2nd signature period. 0..7
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2TxSigPars& TxSigPars);
+ bool operator == (DtDvbT2TxSigPars& TxSigPars);
+ bool operator != (DtDvbT2TxSigPars& TxSigPars);
+};
+
+// Compare modes
+#define DTAPI_DVBT2_COMPA_ALL 0
+#define DTAPI_DVBT2_COMPA_ESSENTIAL 1
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ComponentPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the DVB-T2 component modulation parameters
+//
+class DtDvbT2ComponentPars
+{
+public:
+ // General T2 parameters
+ int m_T2Version; // DVB-T2 spec. version. See DVBT2_VERSION_x
+ int m_T2Profile; // DVB-T2 profile. See DVBT2_PROFILE_x
+ bool m_T2BaseLite; // Indicates whether T2 lite is used in a base
+ // profile stream
+ int m_Bandwidth; // Bandwidth: DVBT2_BW_XXX
+ int m_FftMode; // FFT-mode: DVBT2_FFT_XXX
+ int m_Miso; // MISO. See DVBT2_MISO_x
+ int m_GuardInterval; // Guard interval. See DVBT2_GI_x
+ int m_Papr; // PAPR. See DVBT2_PAPR_x
+ bool m_BwtExt; // Bandwidth extention
+ int m_PilotPattern; // Pilot pattern. Pattern 1 .. 8.
+ int m_L1Modulation; // L1 modulation. See DVBT2_BPSK/... 
+ int m_CellId; // Cell ID. 0..0xFFFF.
+ int m_NetworkId; // Network ID. 0..0xFFFF.
+ int m_T2SystemId; // T2 System ID. 0..0xFFFF.
+ bool m_L1Repetition; // L1 repetition
+
+ // T2-Frame related parameters
+ int m_NumT2Frames; // #T2-frames per superframe. 1..255. 
+ int m_NumDataSyms; // #Data symbols
+ int m_NumSubslices; // #Subslices per T2-frame (for type2 PLPs)
+
+ // Component start time
+ int m_ComponentStartTime; // Offset in T unit at which the T2 component 
+ // begins to be modulated. (0 in the first component)
+ // FEF parameters
+ bool m_FefEnable; // FEF enable
+ int m_FefType; // FEF type. 0..15
+ int m_FefS1; // FEF S1. 2..7
+ int m_FefS2; // FEF S2. 1, 3, 5, 7, 9 ,11, 13 or 15
+ int m_FefSignal; // Selects the type of signal generated during 
+ // the FEF period (see DTAPI_DVBT2_FEF_x)
+ int m_FefLength; // FEF Length in number of samples.
+ int m_FefInterval; // FEF Interval. 
+ // Requires: (m_NumT2Frames % m_FefInterval) == 0
+ // RF channels for TFS
+ int m_NumRfChans; // Number of RF channels 1..7
+ int m_RfChanFreqs[DTAPI_DVBT2_NUM_RF_MAX];
+ // Channel frequencis
+ int m_StartRfIdx; // First used RF channel
+
+ // PLPs
+ int m_NumPlps; // Number of PLPs
+ DtDvbT2PlpPars m_Plps[DTAPI_DVBT2_NUM_PLP_MAX];
+ // PLP parameters
+ DtPlpInpPars m_PlpInputs[DTAPI_DVBT2_NUM_PLP_MAX]; 
+ // PLP inputs (Optional)
+ // Optional
+ DtDvbT2AuxPars m_Aux; // AUX Streams (Optional)
+ DtDvbT2PaprPars m_PaprPars; // PAPR Params (Optional)
+ DtDvbT2TxSigPars m_TxSignature;// TX-Signature (Optional)
+ DtDvbT2RbmValidation m_RbmValidation;
+ // RBM validation (Optional)
+ DtTestPointOutPars m_TpOutput; // Test point data output parameters (optional)
+
+ int m_L1ChangeCounter; // Undocumented. For internal use only.
+
+public:
+ virtual void Init(void);
+ virtual bool IsEqual(DtDvbT2ComponentPars&, int CompareMode=DTAPI_DVBT2_COMPA_ALL);
+ virtual bool operator == (DtDvbT2ComponentPars& T2Pars);
+ virtual bool operator != (DtDvbT2ComponentPars& T2Pars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the DVB-T2 modulation parameters.
+//
+class DtDvbT2Pars : public DtDvbT2ComponentPars
+{
+public:
+ // Optional
+ DtVirtualOutPars m_VirtOutput; // Virtual-output parameters (Optional) 
+ DtDvbT2MiPars m_T2Mi; // T2MI output (Optional)
+ int m_NumFefComponents; // Number of other T2 stream transmitted in the 
+ // FEF part of the first component. The parameters 
+ // come from 'm_FefComponent'.
+
+ // FEF components. Currently maximum 1 other component
+ DtDvbT2ComponentPars m_FefComponent[1];
+
+public:
+ // Constructor
+ DtDvbT2Pars() { Init(); }
+
+ // Methods
+ virtual void Init(void);
+ virtual DTAPI_RESULT CheckValidity(void);
+ virtual DTAPI_RESULT ComputeTDesign();
+ virtual DTAPI_RESULT GetParamInfo(DtDvbT2ParamInfo& T2Info);
+ virtual DTAPI_RESULT GetParamInfo(DtDvbT2ParamInfo& T2Info1, 
+ DtDvbT2ParamInfo& T2Info2);
+ 
+ // Only usefull for single PLP
+ DTAPI_RESULT OptimisePlpNumBlocks(DtDvbT2ParamInfo&, int&);
+ DTAPI_RESULT OptimisePlpNumBlocks(DtDvbT2ParamInfo&, int&, int&);
+
+ // Helper function to determine T2MI ts rate.
+ static DTAPI_RESULT RetrieveT2miTsRateFromTs(char* pBuffer, int NumBytes,
+ int Bandwidth, int& TsRate);
+
+ // Operators
+ virtual bool operator == (DtDvbT2Pars& T2Pars);
+ virtual bool operator != (DtDvbT2Pars& T2Pars);
+ virtual bool IsEqual(DtDvbT2Pars& T2Pars, int CompareMode=DTAPI_DVBT2_COMPA_ALL);
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-T2 Demodulation layer 1 data +=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// DtDvbT2DemodL1PostPlp::m_PayloadType - The PLP payload type
+#define DTAPI_DVBT2_PAYLOAD_GFPS 0 // Generic Fixed-length Packetized Stream
+#define DTAPI_DVBT2_PAYLOAD_GCS 1 // Generic Continuous Stream
+#define DTAPI_DVBT2_PAYLOAD_GSE 2 // Generic Stream Encapsulation
+#define DTAPI_DVBT2_PAYLOAD_TS 3 // Transport Stream
+
+// DtDvbT2DemodL1Pre::m_Type - The current T2 super-frame stream type
+#define DTAPI_DVBT2_TYPE_TS 0 // Transport Stream (TS) only
+#define DTAPI_DVBT2_TYPE_GS 1 // Generic Stream (GS) only
+#define DTAPI_DVBT2_TYPE_TS_GS 2 // Mixed TS and GS
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodAuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the Auxiliary stream information from Layer 1 Post 
+//
+struct DtDvbT2DemodAuxPars
+{
+ int m_AuxStreamType; // Auxiliary stream type
+ int m_AuxPrivateConf; // Auxiliary stream info
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodL1PostPlp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Struct for storing Layer 1 Post per PLP
+//
+struct DtDvbT2DemodL1PostPlp
+{
+ int m_Id; // PLP ID: 0..255
+ int m_Type; // PLP type, see DTAPI_DVBT2_PLP_TYPE_x
+ int m_PayloadType; // PLP payload type: 0..3
+ int m_FfFlag; // FF flag
+ int m_FirstRfIdx; // 0..NumRf-1
+ int m_FirstFrameIdx; // First frame in which PLP appears
+ int m_GroupId; // Group ID: 0..255
+ int m_CodeRate; // PLP code rate, see DTAPI_DVBT2_COD_x
+ int m_Modulation; // PLP modulation, see DTAPI_DVBT2_BPSK/...
+ int m_Rotation; // PLP rotation yes/no
+ int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_NumBlocks; // PLP_NUM_BLOCKS_MAX: Maximum number of FEC blocks
+ // contained in one interleaving frame
+ int m_FrameInterval; // The PLP appears every m_FrameInterval frames
+ int m_TimeIlLength; // Time interleaver length: 0..255
+ int m_TimeIlType; // Time interleaver type: 0 or 1
+ int m_InBandAFlag; // IN_BAND_A_FLAG is used yes/no
+ // V1.2.1 spec revision
+ int m_InBandBFlag; // IN_BAND_B_FLAG is used yes/no
+ int m_Reserved1; // Reserved field, may be used for bias balancing
+ int m_PlpMode; // PLP mode: 0..3
+ int m_Static; // Static flag: 0 or 1=Configuration changes only at
+ // super frame boundaries
+ int m_StaticPadding; // Static padding flag: 0 or 1=BBFRAME padding is not
+ // used
+ DtDvbT2DemodL1PostPlp();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodRfPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the TFS RF channels information from Layer 1 Post 
+//
+struct DtDvbT2DemodRfPars
+{
+ int m_RfIdx; // Index of the RF-frequency
+ int m_Frequency; // Centre frequency in Hz
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodL1Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the DVB-T2 layer 1 data
+//
+struct DtDvbT2DemodL1Data
+{
+ // P1 Info
+ struct DtDvbT2DemodL1P1
+ {
+ bool m_Valid; // True if P1 was found
+ int m_FftMode; // FFT mode, see DVBT2_FFT_x
+ int m_Miso; // MISO used
+ int m_Fef; // FEF used
+ int m_T2Profile; // DVB-T2 profile. See DVBT2_PROFILE_x
+ } m_P1;
+
+ // L1-pre info
+ struct DtDvbT2DemodL1Pre
+ {
+ bool m_Valid; // True if L1 pre was correctly demodulated
+
+ int m_Type; // Stream type within the current T2 super-frame
+ int m_BwtExt; // Bandwidth extension
+ int m_S1; // S1 signalling. P1 S1. 
+ int m_S2; // S2 signalling. P1 S2.
+ int m_L1Repetition; // L1 repetition
+ int m_GuardInterval; // Guard interval, see DVBT2_GI_x
+ int m_Papr; // PAPR. see DVBT2_PAPR_x
+ int m_L1Modulation; // L1 modulation, see DVBT2_BPSK/...
+ int m_L1CodeRate; // L1 coderate, see DTAPI_DVBT2_COD_x
+ int m_L1FecType; // L1 FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_L1PostSize; // Size of the L1-post in OFDM cells
+ int m_l1PostInfoSize; // L1-post info size = 
+ // L1-post configurable+dynamic+extension
+ int m_PilotPattern; // Pilot pattern: 1..8
+ int m_TxIdAvailability; // The Tx ID
+ int m_CellId; // Cell ID: 0..0xFFFF
+ int m_NetworkId; // Network ID: 0..0xFFFF
+ int m_T2SystemId; // T2 System ID: 0..0xFFFF
+ int m_NumT2Frames; // Number of T2-frames per superframe: 1..255
+ int m_NumDataSyms; // Number of data symbols
+ int m_RegenFlag; // Regeneration count indicator
+ int m_L1PostExt; // L1-post extensions enabled
+ int m_NumRfChans; // Number of RF channels: 1..7
+ int m_CurrentRfIdx; // Current RF index: 0..m_NumRfChans-1
+ int m_T2Version; // DVB-T2 spec version, see DVBT2_VERSION_x
+ int m_L1PostScrambling; // L1 Post scrambling
+ int m_T2BaseLite; // Indicates whether T2 lite is used in a base
+ // profile stream
+ } m_L1Pre;
+
+ // L1-post info
+ struct DtDvbT2DemodL1Post
+ {
+ bool m_Valid; // True if L1 post was correctly demodulated
+ int m_NumSubslices; // Number of subslices per T2-frame (for type2 PLPs)
+ int m_NumPlps; // Number of PLPs
+ int m_NumAux; // Number of auxiliary streams
+
+ // TFS RF-channels
+ std::vector<DtDvbT2DemodRfPars> m_RfChanFreqs; 
+
+ // FEF info is meaningful if m_P1.m_Fef = true
+ int m_FefType; // FEF type: 0..15
+ int m_FefLength; // FEF length in number of samples
+ int m_FefInterval; // FEF Interval
+
+ // PLPs
+ std::vector<DtDvbT2DemodL1PostPlp> m_Plps; 
+
+ // Auxiliary stream signalling information
+ std::vector<DtDvbT2DemodAuxPars> m_AuxPars; 
+
+ } m_L1Post;
+
+ DtDvbT2DemodL1Data();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ISDBT-TMM +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+#define DTAPI_ISDBT_NUM_TS_MAX 14 
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbTmmPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// ISDB-Tmm parameters including per-layer parameters
+//
+struct DtIsdbTmmPars
+{
+ int m_Bandwidth;
+ int m_SubChannel;
+ int m_NumTss;
+ DtVirtualOutPars m_VirtOutput; // Virtual Output parameters(Optional) 
+ DtIsdbtPars m_Tss[DTAPI_ISDBT_NUM_TS_MAX];
+ DtPlpInpPars m_TsInputs[DTAPI_ISDBT_NUM_TS_MAX];
+
+ // Member function
+ DtIsdbTmmPars() { Init(); }
+ DTAPI_RESULT CheckValidity();
+ int NumSegm();
+ void Init();
+ DTAPI_RESULT SetSegmentFormat(int TsIdx, int SegmFormat);
+
+ bool operator == (DtIsdbTmmPars& Rhs);
+ bool operator != (DtIsdbTmmPars& Rhs);
+};
+
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ Advanced Demodulator +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStreamType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Classifies the type of the stream
+//
+enum DtStreamType 
+{
+ STREAM_CONSTEL, // Constellation points
+ STREAM_DAB, // DAB stream
+ STREAM_DABETI, // DAB Ensemble Transport Interface (NI, G.703)
+ STREAM_DABFIC, // DAB Fast Information Channel
+ STREAM_DVBC2, // DVB-C2 stream (Transport Stream packets)
+ STREAM_DVBC2_BBFRAME, // DVB-C2 stream base-band frames
+ STREAM_DVBT, // DVB-T stream
+ STREAM_DVBT2, // DVB-T2 stream (Transport Stream packets)
+ STREAM_DVBT2_BBFRAME, // DVB-T2 stream base band frames
+ STREAM_DVBT2_GSE, // DVB-T2 stream GSE-packets
+ STREAM_IMPRESP, // Impulse response
+ STREAM_ISDBT, // ISDB-T stream
+ STREAM_MER, // MER
+ STREAM_SPECTRUM, // Spectrum
+ STREAM_T2MI, // DVB-T2 stream
+ STREAM_TF_ABS, // Transfer function absolute
+ STREAM_TF_PHASE, // Transfer function phase
+ STREAM_TF_GROUPDELAY // Transfer function group delay
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the parameters for a stream of constellation points
+//
+struct DtConstelPars
+{
+ int m_Period; // Minimum period between callbacks in ms
+ int m_ConstellationType; // 0: Constellation per PLP
+ // 1: Constellation per carrier (after equalization)
+ int m_Index; // Index of the PLP or carrier
+ int m_MaxNumPoints; // Maximum number of constellation points
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbTStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the selection parameters for a DVB-T transport stream
+//
+struct DtDvbTStreamSelPars
+{
+ // No selection parameters yet
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbTTpsInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DVB-T Transmission Parameter Signalling (TPS) information structure
+//
+struct DtDvbTTpsInfo
+{
+ int m_LengthIndicator; // TPS length indicator 
+ int m_Constellation; // Constellation (DTAPI_MOD_DVBT_xxx)
+ int m_HpCodeRate; // High Priority code rate (DTAPI_MOD_xxx)
+ int m_LpCodeRate; // Low Priority code rate(DTAPI_MOD_xxx)
+ int m_Guard; // Guard interval (DTAPI_MOD_DVBT_G_xx)
+ int m_Interleaving; // Interleaving (DTAPI_MOD_DVBT_xxx)
+ int m_Mode; // Transmission mode (DTAPI_MOD_DVBT_xK)
+ int m_Hierarchy; // Hierarchy (DTAPI_MOD_DVBT_HARCHY_xxx)
+ int m_CellId; // CellId or -1 when not present
+ int m_HpS48S49; // S48S49 of the odd frames (DTAPI_MOD_DVBT_Sxx)
+ int m_LpS48S49; // S48S49 of the even frames (DTAPI_MOD_DVBT_Sxx)
+ int m_OddS50_S53; // S50..S53 of the odd frames	
+ int m_EvenS50_S53; // S50..S53 of the even frames	
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the selection parameters for a DVB-T2 DVB-T2 GSE and 
+// DVB-T2 BBFRAME stream
+//
+struct DtDvbT2StreamSelPars
+{
+ int m_PlpId; // ID of the data PLP or DTAPI_DVBT2_PLP_ID_xxx
+ int m_CommonPlpId; // ID of the common PLP or DTAPI_DVBT2_PLP_ID_xxx
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtImpRespPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the parameters for an impulse-response stream
+//
+struct DtImpRespPars
+{
+ int m_Period; // Minimum period bewteen callbacks in ms
+ int m_Channel; // Channel used for MISO
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the selection parameters for an ISDB-T stream
+//
+struct DtIsdbtStreamSelPars
+{
+ // No additional selection parameters
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMeasurement -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure describing a set of measurement values. It used to pass measurements from 
+// the advanced demodulator to the user application through user-supplied 
+// DtWriteMeasFunc callback.
+//
+struct DtMeasurement
+{
+ DtStreamType m_MeasurementType;// Type of measurement values
+ __int64 m_TimeStamp; // Timestamp in number of samples
+ int m_NumValues; // Number of measurement values
+ DtComplexFloat* m_pMeasurement;// Measurement values
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the parameters for a MER stream.
+//
+struct DtMerPars
+{
+ int m_Period; // Minimum period between callbacks in ms
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSpectrumPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the parameters for a spectrum stream.
+//
+struct DtSpectrumPars
+{
+ int m_Period; // Minimum time between callbacks in ms 
+ int m_FftLength; // FFT length, must be a power of two
+ int m_AverageLength; // Number of FFT blocks on wich the average is done
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtT2MiStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the selection parameters for a T2-MI transport stream
+// containing a com-plete DVB-T2 stream.
+//
+struct DtT2MiStreamSelPars
+{
+ int m_T2MiOutPid; // T2-MI output PID
+ int m_T2MiTsRate; // Rate in bps for the T2MI output.
+ // If -1, output a variable bitrate T2MI stream 
+ // (set_output_rate is not called in this case).
+ // Otherwise, use m_T2MiTsRate to set the rate.
+ // Padding null packets are used to reach the target
+ // bitrate. The maximum T2-MI bitrate is 72Mbps.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTransFuncPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the parameters for a transfer-function stream.
+//
+struct DtTransFuncPars
+{
+ int m_Period; // Minimum time between callbacks in ms
+ int m_Channel; // Channel used for MISO
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for streaming data selection
+//
+struct DtStreamSelPars
+{
+ intptr_t m_Id; // Unique stream identifier
+ DtStreamType m_StreamType; // Stream selection type
+
+ union {
+ // Selection parameters for demodulated streams
+ DtDvbC2StreamSelPars m_DvbC2;
+ DtDvbTStreamSelPars m_DvbT;
+ DtDvbT2StreamSelPars m_DvbT2;
+ DtIsdbtStreamSelPars m_Isdbt;
+ DtT2MiStreamSelPars m_T2Mi;
+ DtDabStreamSelPars m_Dab;
+ DtDabEtiStreamSelPars m_DabEti;
+ DtDabFicStreamSelPars m_DabFic;
+
+ // Parameters for streams of measurement values
+ DtConstelPars m_Constel;
+ DtImpRespPars m_ImpResp;
+ DtMerPars m_Mer;
+ DtSpectrumPars m_Spectrum;
+ DtTransFuncPars m_TransFunc;
+ } u;
+
+ bool operator == (DtStreamSelPars& Rhs);
+ bool operator != (DtStreamSelPars& Rhs);
+};
+
+// Software demodulator callback functions
+typedef void DtOutputRateChangedFunc(void *pOpaque, DtStreamSelPars&, int Bitrate);
+typedef void DtReadIqFunc(void* pOpaque, 
+ unsigned char* pIqBuf, int IqBufSize, int& IqLength);
+typedef void DtWriteMeasFunc(void *pOpaque, DtStreamSelPars&, DtMeasurement*);
+typedef void DtWriteStreamFunc(void* pOpaque, DtStreamSelPars& StreamSel, 
+ const unsigned char* pData, int Length);
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAdvDemod -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class representing an advanced demodulator. 
+// DtAdvDemod can be considered a specialized in-put channel.
+//
+class DtAdvDemod
+{
+public:
+ DtAdvDemod();
+ virtual ~DtAdvDemod();
+private:
+ // No implementation is provided for the copy constructor
+ DtAdvDemod(const DtAdvDemod&);
+
+public:
+ DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
+
+ // Convenience functions
+public:
+ int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
+ int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
+ bool IsAttached(void) { return m_pAdvDemod != NULL; }
+ int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
+
+public:
+ DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
+ bool Exclusive=true, bool ProbeOnly=false);
+ DTAPI_RESULT AttachVirtual(DtDevice* pDtDvc,
+ DtReadIqFunc* pReadIqFunc, void* pOpaque);
+ DTAPI_RESULT ClearFlags(int Latched);
+ DTAPI_RESULT CloseStream(intptr_t Id);
+ DTAPI_RESULT Detach(int DetachMode);
+ DTAPI_RESULT GetDemodControl(DtDemodPars* pDemodPars);
+ DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ DTAPI_RESULT GetFlags(int& Flags, int& Latched);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, __int64& ParXtra0);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ DTAPI_RESULT GetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT GetRxControl(int& RxControl);
+ DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetStatistic(int Type, int& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, double& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, bool& Statistic);
+ DTAPI_RESULT GetStreamSelection(std::vector<DtStreamSelPars>& StreamSelList);
+ DTAPI_RESULT GetSupportedPars(int& NumPars, DtPar* pPars);
+ DTAPI_RESULT GetSupportedStatistics(int& Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetTsRateBps(intptr_t Id, int& TsRate);
+ DTAPI_RESULT GetTunerFrequency(__int64& FreqHz);
+ DTAPI_RESULT LedControl(int LedControl);
+ DTAPI_RESULT OpenStream(DtStreamSelPars StreamSel);
+ DTAPI_RESULT RegisterCallback(DtOutputRateChangedFunc* pCallback, void* pOpaque);
+ DTAPI_RESULT RegisterCallback(DtWriteStreamFunc* pCallback, void* pOpaque);
+ DTAPI_RESULT RegisterCallback(DtWriteMeasFunc* pCallback, void* pOpaque);
+ DTAPI_RESULT Reset(int ResetMode);
+ DTAPI_RESULT SetAntPower(int AntPower);
+ DTAPI_RESULT SetDemodControl(DtDemodPars *pDemodPars);
+ DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ DTAPI_RESULT SetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT SetRxControl(int RxControl);
+ DTAPI_RESULT SetTunerFrequency(__int64 FreqHz);
+ DTAPI_RESULT Tune(__int64 FreqHz, int ModType,
+ int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT Tune(__int64 FreqHz, DtDemodPars *pDemodPars);
+
+protected: 
+ AdvDemod* m_pAdvDemod; // Advanced demodulation channel implementation
+ bool m_IsAttachedToVirtual; // Attached to virtual input port?
+
+ // Encapsulated data
+private:
+ IXpMutex* m_pMTLock; // Multi-threading lock for get/read functions
+ void* m_pDetachLockCount;
+ int m_Port;
+ bool m_WantToDetach;
+ 
+// Private helper functions
+private:
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+ DTAPI_RESULT ReadAccessLock(void);
+ DTAPI_RESULT ReadAccessUnlock(void);
+};
+
+// Forward declaration for use in DtRs422Channel
+class Rs422Channel;
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRs422Channel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtRs422Channel
+{
+public:
+ DtRs422Channel();
+ virtual ~DtRs422Channel();
+private:
+ // No implementation is provided for the copy constructor
+ DtRs422Channel(const DtRs422Channel&);
+
+public:
+ DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
+ bool Exclusive=true, bool ProbeOnly=false);
+ DTAPI_RESULT Detach();
+ DTAPI_RESULT Flush();
+ DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead, int Timeout, int& NumBytesRead);
+ DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite, bool Blocking=true);
+
+protected:
+ Rs422Channel* m_pRs422Channel;
+ void* m_pDetachLockCount;
+ bool m_WantToDetach;
+
+// Private helper functions
+private:
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CONFIGURATION +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxPixelFormat -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+enum DtMxPixelFormat
+{
+ DT_PXFMT_UYVY422_8B, // Packed CbYCrY, 8 bits per symbol
+ DT_PXFMT_UYVY422_10B, // Packed CbYCrY, 10 bits per symbol
+ DT_PXFMT_UYVY422_16B, // Packed CbYCrY, 16 bits per symbol (10 significant bits)
+ DT_PXFMT_UYVY422_10B_NBO, // Packed CbYCrY, 10 bits per symbol, network byte order
+ DT_PXFMT_YUYV422_8B, // Packed YCbYCr, symbol swap of DT_PXFMT_UYVY422_8B
+ DT_PXFMT_YUYV422_10B, // Packed YCbYCr, symbol swap of DT_PXFMT_UYVY422_10B
+ DT_PXFMT_YUYV422_16B, // Packed YCbYCr, symbol swap of DT_PXFMT_UYVY422_16B
+ DT_PXFMT_Y_8B, // Luminance plane only, 8 bits per symbol
+ DT_PXFMT_Y_16B, // Luminance plane only, 16 bits per symbol (10 sign bits)
+ DT_PXFMT_YUV422P_8B, // Planar YUV, 3 planes, 1 Cb & 1 Cr sample per 2 Y. 8BPS
+ DT_PXFMT_YUV422P_16B, // Planar YUV, 3 planes, 1 Cb & 1 Cr sample per 2 Y. 16BPS
+ DT_PXFMT_YUV422P2_8B, // Planar YUV, 2 planes, Y plane + Cb+Cr plane. 8BPS
+ DT_PXFMT_YUV422P2_16B, // Planar YUV, 2 planes, Y plane + Cb+Cr plane. 16BPS
+ DT_PXFMT_BGR_8B, // Packed RGB data. First B, then G, then R. 8 bits per ch
+ DT_PXFMT_V210, // Packed CbYCrY, 3 10-bit symbols per 32-bit
+ // Likely future extensions:
+ //DT_PXFMT_YUV420P, // Planar YUV, 3 planes, 1 Cb & 1 Cr sample per 2x2 Y.This
+ // is often used as decoder input/output.
+ //DT_PXFMT_RGBX, // Packed RGB data with a 4th dummy symbol per pixel. With
+ // 8-byte data this means 32-bit per pixel which is easy
+ // to process.
+ //DT_PXFMT_RGB_P, // Planar RGB data
+
+ DT_PXFMT_INVALID = -1,
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxVideoConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxVideoConfig
+{
+public:
+ // m_StartLine1 / m_NumLines1 are for field 1, m_StartLine2 / m_NumLines2 are for
+ // field 2. For progressive input m_StartLine2 / m_NumLines2 are ignored.
+ // If no video input is required set m_NumLines1 and m_NumLines2 to 0.
+ int m_StartLine1; // 1st line to transfer (1-based relative to 1st field)
+ int m_NumLines1; // #lines to transfer (-1 for all lines)
+ 
+ int m_StartLine2; // 1st line to transfer (1-based relative to 2nd field)
+ int m_NumLines2; // #lines to transfer (-1 for all lines)
+
+ int m_Scaling; // Scaling mode (OFF, 1/4, 1/16). DTAPI_SCALING_*
+ int m_LineAlignment; // -1 if all symbols should directly follow eachother,
+ // otherwise the minimum alignment each line should
+ // have. HLM will chose a stride, usually
+ // n*m_LineAlignment for smallest n where the stride is
+ // equal or longer than the required number of bytes per
+ // line. HLM is allowed to pick larger stride for
+ // performance reasons.
+ // Common values will be -1 (no alignment), 1 (align
+ // each line at byte-boundary) and 16 (sse2 alignment).
+ DtMxPixelFormat m_PixelFormat; // Pixel format
+ bool m_UserBuffer; // When set to true the callback function is responsible
+ // for allocating the video sample buffers. When set to
+ // false the framework will allocate the buffers. Defaults
+ // to false.
+
+ DtMxVideoConfig();
+};
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawConfigSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxRawConfigSdi
+{
+public:
+ DtMxPixelFormat m_PixelFormat; // Pixel format. Allowed are: UYVY422 or YUYV422
+ int m_StartLine; // 1st line to transfer (1-based)
+ int m_NumLines; // #lines to transfer (-1 for all lines)
+ int m_LineAlignment; // See DtMxVideoConfig::m_LineAlignment
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxRawDataType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+enum DtMxRawDataType
+{
+ DT_RAWDATA_SDI,
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxRawConfig
+{
+public:
+ DtMxRawDataType m_Type; // Indicates which of the fields below is valid.
+
+ union {
+ DtMxRawConfigSdi m_Sdi;
+ };
+
+ DtMxRawConfig();
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMuxAudioSampleType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+enum DtMxAudioSampleType
+{
+ DT_AUDIO_SAMPLE_PCM, // 32-bit PCM samples
+ DT_AUDIO_SAMPLE_AES3, // AES samples
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxOutputMode -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+enum DtMxOutputMode
+{
+ DT_OUTPUT_MODE_ADD,
+ DT_OUTPUT_MODE_COPY,
+ DT_OUTPUT_MODE_DROP,
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxAudioConfig
+{
+public:
+ int m_Index; // Identifies the corresponding audio channel.
+ bool m_DeEmbed; // If true, decode the input to data buffers per stream.
+ // m_DeEmbed is ignored for output rows.
+ DtMxOutputMode m_OutputMode; 
+ // DROP: Audio group is not generated at output, whether
+ // or not it was available at input. Data buffers
+ // are available read-only if m_DeEmbed is true.
+ // COPY: Output for this group is directly copied from
+ // input, timing stays the same. Data buffers are
+ // available read-only if m_DeEmbed is true. For
+ // output rows this has the same effect as DROP: no
+ // generated output.
+ // ADD: Output is generated by framework from data
+ // buffers filled by callback. Data buffers are
+ // initialized with input data if m_DeEmbed is
+ // true, otherwise they're initially empty.
+ // m_OutputMode is ignored for input rows.
+ DtMxAudioSampleType m_Format; // Inidicate whether to (de-)embed PCM samples or
+ // AES subframes. Dolby E can be (de-)embedded as
+ // AES samples.
+
+ DtMxAudioConfig();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxAuxDataType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+enum DtMxAuxDataType
+{
+ DT_AUXDATA_SDI,
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxObjConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxAuxObjConfig
+{
+public:
+ bool m_DeEmbed; // If true, decode this AuxData object. m_DeEmbed is
+ // ignored for output rows.
+ DtMxOutputMode m_OutputMode; 
+ // DROP: AuxData object is not generated at output no
+ // matter whether or not it was available at the
+ // input. AuxData object is available read-only if
+ // m_DeEmbed is true.
+ // COPY: The embedded AuxData of this type in the input
+ // frame, if present, is copied one-to-one to the
+ // output, without re-embedding. If m_DeEmbed is
+ // true the data will be available in the callback.
+ // ADD: Output is generated by framework from data
+ // buffers filled by callback. Data buffers are
+ // initialized with input data if m_DeEmbed is
+ // true, otherwise they're initially empty.
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxConfigSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxAuxConfigSdi
+{
+public:
+ DtMxAuxObjConfig m_AncPackets; // Settings for ancillary data packets
+ //DtMxAuxObjConfig m_Rp188;
+ //DtMxAuxObjConfig m_Vitc;
+ //DtMxAuxObjConfig m_Eia608;
+ //DtMxAuxObjConfig m_Eia708;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxDataConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxAuxDataConfig
+{
+public:
+ bool m_DeEmbedAll; // De-embed all auxdata. Defaults to false.
+ DtMxAuxDataType m_DataType; // Indicates which of the following objects is valid.
+
+ union
+ {
+ DtMxAuxConfigSdi m_Sdi;
+ };
+
+ DtMxAuxDataConfig();
+};
+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRowConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxRowConfig
+{
+ // Constants
+public:
+ static const int MAX_NUM_AUDIO_CHANNELS = 16; // Max. # audio channels supported
+
+public:
+ DtMxRowConfig();
+ virtual ~DtMxRowConfig();
+
+public:
+ bool m_Enable; // Global flag to enable/disable to the complete row.
+ // When disabled input rows will not provide data and all
+ // output ports will generate black frames.
+ // Wnen set to false all further configuration below
+ // is not taken into account.
+
+ int m_RowSize; // Number of frame buffers available in the callback
+ // function.
+
+ void* m_pOpaq; // Opaque user pointer. Framework itself will not change
+ // this value. This can be used if the row configuration
+ // is changed dynamically to detect the change. It can
+ // also be used to change the function of the callback
+ // frame-synchronous without implementing any locks
+ // on the user-side.
+
+ // Each matrix row operates either in RAW mode or in "parsed data" mode. This means
+ // that m_RawDataEnable is mutually exclusive with m_VideoEnable, m_AudioEnable
+ // and m_AuxDataEnable.
+
+ // Raw data
+ bool m_RawDataEnable; // Enable raw data processing. m_RawData is ignored when
+ // set to false. Defaults to false.
+ DtMxRawConfig m_RawData; // Configuration of raw input/output data.
+
+ // Video
+ bool m_VideoEnable; // Enables video processing. m_Video is ignored when set
+ // to false. Defaults to true.
+ DtMxVideoConfig m_Video; // Configuration of video input/output.
+
+ // Audio
+ bool m_AudioEnable; // Enables audio processing. m_AudioGen and m_Audio are 
+ // ignored when set to false. Defaults to true.
+ DtMxAudioConfig m_AudioDef; // Default audio settings, can be used to de-embed all
+ // channels. These settings are used as defaults for
+ // all channels and can be overriden on a per-channel
+ // basis by the m_Audio vector.
+ std::vector<DtMxAudioConfig> m_Audio; // Configuration for each audio channel
+
+ // AUX data
+ bool m_AuxDataEnable; // Enables auxiliary data processing. m_AuxData is ignored
+ // when set to false. Defaults to false.
+ DtMxAuxDataConfig m_AuxData; // Configuration of aux data input/output.
+};
+
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CALLBACK DATA STRUCTURES +=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawDataSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxRawDataSdi
+{
+public:
+ unsigned char* m_pBuf;
+ int m_BufSize;
+ int m_Stride; // Size of each line in bytes
+ int m_StartLine; // 1st line in buffer (1-based)
+ int m_NumLines; // #lines to transfer (-1 for all lines)
+ // Informational
+ DtMxPixelFormat m_PixelFormat; // Pixel format. Can be UYVY422 or YUVY422
+ int m_Width; // Width in pixels
+ int m_Height; // Height in pixels
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxRawData
+{
+public:
+ DtMxRawDataType m_Type; // Indicates which of the fields below is valid.
+
+ union {
+ DtMxRawDataSdi m_Sdi;
+ };
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxVideoPlaneBuf -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxVideoPlaneBuf
+{
+public:
+ unsigned char* m_pBuf; // Pointer to buffer
+ int m_BufSize; // Total size in bytes of buffer
+ int m_Stride; // Size of each line in bytes
+ int m_StartLine; // 1st line in buffer (1-based)
+ int m_NumLines; // Number of lines. Usually equal to
+ // DtMxVideoBuf::m_Height but might vary for some
+ // pixel formats, for 4:2:0 planar for example both
+ // chrominancy planes have m_NumLines twice as small
+ // as DtMatrixVideoBuf::m_Height.
+
+ DtMxVideoPlaneBuf();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxVidPattern -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+enum DtMxVidPattern
+{
+ DT_VIDPAT_BLACK_FRAME,
+ DT_VIDPAT_RED_FRAME,
+ DT_VIDPAT_GREEN_FRAME,
+ DT_VIDPAT_BLUE_FRAME,
+ DT_VIDPAT_WHITE_FRAME,
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxVideoBuf -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxVideoBuf
+{
+public:
+ DtMxVideoPlaneBuf m_Planes[3];
+ int m_NumPlanes; // The number of planes directly depends on the pixel
+ // format chosen.
+ DtMxPixelFormat m_PixelFormat; // See DtMxVideoConfig::m_PixelFormat
+ int m_Scaling; // Scaling mode (OFF, 1/4, 1/16). DTAPI_SCALING_*
+ int m_Width; // Width in pixels
+ int m_Height; // Height in pixels
+
+ // Initialize the video buffers with a specific pattern in an efficient way. Can
+ // be used by the callback function for output rows if no useful data is available.
+ // Framework does not do this automatically because in normal operation it'd be
+ // a waste of resources to initialize buffers that will be overwritten later anyway.
+ DTAPI_RESULT InitBuf(DtMxVidPattern Pattern);
+ 
+ DtMxVideoBuf();
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxAuxData
+{
+public:
+ // Teletext
+ // Closed captioning
+
+ // Other anc data
+ bool m_AncTimeCodeValid;
+ __int64 m_AncTimeCode;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMxAncPacket -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxAncPacket
+{
+public:
+ int m_Did; // Data identifier
+ int m_SdidOrDbn; // Secondary data identifier / Data block number
+ int m_Dc; // Data count
+ int m_Cs; // Check sum
+ unsigned short* m_pUdw; // User data words
+ int m_Line; // Line number in which packet was found
+
+ // Operations
+public:
+ int Type() const { return (m_Did & 0x80)==0 ? 2 : 1; }
+
+public:
+ DtMxAncPacket();
+ virtual ~DtMxAncPacket();
+private:
+ DtMxAncPacket(const DtMxAncPacket&);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioChannelStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxAudioChannelStatus
+{
+public:
+ // Get or set the sampling rate in Hz.
+ DTAPI_RESULT GetSampleRate(int& SampleRate);
+ DTAPI_RESULT SetSampleRate(int SampleRate);
+ // Get or set whether the channel contains linear audio PCM data or something else.
+ DTAPI_RESULT GetPcmAudio(bool& IsPcm);
+ DTAPI_RESULT SetPcmAudio(bool IsPcm);
+ // Get or set the the significant and maximum number of bits
+ DTAPI_RESULT GetPcmNumBits(int& NumBits, int& NumAuxBits);
+ DTAPI_RESULT SetPcmNumBits(int NumBits, int NumAuxBits=0);
+
+ unsigned char m_Data[24]; // Raw AES3 channel-status word data.
+ bool m_Valid; // True, if channel status word has been initialised
+
+ DtMxAudioChannelStatus();
+ virtual ~DtMxAudioChannelStatus();
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxAudioChannel
+{
+public:
+ int m_Index; // Index of this channel in underlaying AV format.
+ bool m_Present; // True if this channel was actually present in the
+ // input frame.
+ int m_Service; // Index in m_Services vector for the service this
+ // channel is a part of.
+ 
+ unsigned int* m_pBuf; // Buffer with audio samples
+ int m_BufSizeSamples; // Total size of buffer (in #samples)
+ int m_NumValidSamples; // Number of valid samples inside buffer
+ 
+ DtMxAudioChannelStatus m_Status; // AES3 status word;
+
+ const int m_NumSamplesHint; // Suggested number of audio samples for this frame. 
+ // This is based on the audio frame number.
+ const DtMxAudioSampleType m_Format; // Format of audio samples: PCM32 or AES
+
+ // Constructor, destructor
+public:
+ DtMxAudioChannel();
+ virtual ~DtMxAudioChannel();
+ DtMxAudioChannel& operator=(const DtMxAudioChannel& Other);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxAudioServiceType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+enum DtMxAudioServiceType
+{
+ DT_AUDIOSERVICE_UNKNOWN,
+ DT_AUDIOSERVICE_MONO,
+ DT_AUDIOSERVICE_DUAL_MONO,
+ DT_AUDIOSERVICE_STEREO,
+ DT_AUDIOSERVICE_5_1,
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtFixedVector -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Represents a vector which has a fixed size (i.e. cannot add or remove elements)
+//
+template<typename T>
+class DtFixedVector
+{
+ // Operations
+public:
+ bool empty() const { return m_Data.empty(); }
+ size_t size() const { return m_Data.size(); }
+ T& operator[](size_t n) { return m_Data[n]; }
+protected:
+ // Cast to a "normal" std::vector. NOTE: Intended for internal DTAPI use only
+ inline operator typename std::vector<T>& () { return m_Data; }
+ inline DtFixedVector& operator=(const DtFixedVector& Oth)
+ {
+ this->m_Data = Oth.m_Data;
+ return *this;
+ }
+ 
+ // Data / Attributes
+private:
+ std::vector<T> m_Data; // Actual std::vector with the data
+
+ // Constructor / Desstructor
+public:
+ DtFixedVector() {}
+ virtual ~DtFixedVector() {}
+protected:
+ DtFixedVector(size_t Size) { m_Data.resize(Size); }
+ DtFixedVector(const DtFixedVector& Oth) { *this= Oth; }
+
+ // Friends
+private:
+ friend class MxFrameImpl;
+ friend class MxCommonData;
+ friend class MxDecData;
+ friend class MxActionAncEnc;
+ friend class MxProcessImpl;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioService -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxAudioService
+{
+public:
+ bool m_Valid; // Indicates whether or not this is a valid entry
+ DtMxAudioServiceType m_ServiceType; // Type of service: mono, stereo, 5.1 etc.
+ std::vector<int> m_Channels; // Indices of channels that are part of this service
+ int m_PcmNumBits; // For PCM samples only: number of significant bits
+ bool m_ContainsData; // For AES only: true if data, false if PCM samples
+ int m_SampleRate; // Sample rate of audio channels
+ const int m_SamplesInFrame; // Number of samples in the current frame
+ //double m_SamplePhase; // Phase of the first audio sample
+ int m_AudioFrameNumber; // Indicates where we are in the audio frame 
+ // sequence frame 
+
+ // Constructor, destructor
+public:
+ DtMxAudioService();
+ DtMxAudioService& operator=(const DtMxAudioService& Other);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtMxAudioData
+{
+public:
+ DtFixedVector<DtMxAudioChannel> m_Channels;
+ DtFixedVector<DtMxAudioService> m_Services;
+
+ // Utility function to make the AES3 status word consistent with the members in this
+ // struct. It's recommended to call this after modifying any members to make sure
+ // the final output is consistent.
+ DTAPI_RESULT InitChannelStatus();
+ DTAPI_RESULT InitChannelStatus(const DtMxAudioService& Service);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxFrameStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+enum DtMxFrameStatus
+{
+ DT_FRMSTATUS_OK, // Frame has been received and decoded without problems
+ DT_FRMSTATUS_SKIPPED, // Row has been received and decoded but the callback
+ // function was never called. This will only be set
+ // for historic buffers, never for the current
+ // frame buffer.
+ DT_FRMSTATUS_DISABLED, // Row has been disabled, buffers not available.
+ DT_FRMSTATUS_DUPLICATE, // Frame data is duplicated from previous frame
+ // because the input was too slow.
+ DT_FRMSTATUS_DROPPED, // Frame data was dropped because the input thread
+ // in the API was too slow. Data is not available. This
+ // should never happen under normal circumstances.
+ DT_FRMSTATUS_NO_SIGNAL, // No signal at input port. Frame data not available.
+ DT_FRMSTATUS_WRONG_VIDSTD, // Unconfigured video signal at input. Frame data
+ // not available.
+ DT_FRMSTATUS_DEV_DISCONNECTED, // Input (usb) device has been disconnected. Frame data
+ // not available.
+ DT_FRMSTATUS_ERROR_INTERNAL, // Internal error. Frame data is not available.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxFrame -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Data buffers for a single frame. Can be used for input, for output or be shared
+// between input and output.
+//
+class DtMxFrame
+{
+public:
+ const DtMxRowConfig* const m_Config;
+ // Row configuration at the time the frame processing
+ // was started by the HLM.
+
+ // Status of this frame. DT_FRMSTATUS_DISABLED overrules all other status fields.
+ // For output-only rows this will always be DT_FRMSTATUS_OK or DT_FRMSTATUS_DISABLED.
+ // For input/output and output-only rows the data buffers requested will always be 
+ // available if m_Status is not DT_FRMSTATUS_DISABLED.
+ DtMxFrameStatus m_Status;
+
+ // Configured video standard, or for fixed-rate rows the actual received rate.
+ // For fixed rate output rows this has to be set by callback.
+ int m_VidStd;
+
+ // For input and input/output rows this can contain a pointer to the data of an input
+ // frame that was received before this frame but not processed to maintain clock sync.
+ // Normally this is a NULL pointer, but if the input is faster than the HLM clock
+ // occasionally a frame needs to be dropped to keep the system in sync. By providing
+ // a pointer to the data of the dropped frame the callback might be able to prevent
+ // audio hickups.
+ // For each frame processed by the callback function there will be at most one
+ // dropped frame due to different clocks, so this->m_DroppedFrame->m_DroppedFrame is
+ // always NULL.
+ DtMxFrame* m_DroppedFrame;
+
+ bool m_InpPhaseValid; // True if m_InpPhase contains a valid value.
+ double m_InpPhase; // Phase of this input relative to the HLM clock source.
+ // In a genlocked system this should be approximately
+ // zero. In a non-genlocked system the HLM will try
+ // to keep it between -1.25 and 0.05. A frame drop will
+ // increase this value by 1.
+
+ bool m_RawTimestampValid; // True if m_RawTimestamp is valid
+ __int64 m_RawTimestamp; // 64-bit timestamp of the arrival of the SDI frame.
+ // Timestamps created by different hardware devices have
+ // no relation to eachother.
+
+ // Raw data buffer
+ bool m_RawDataValid; // True, if the raw data is valid; False if invalid
+ DtMxRawData m_RawData;
+ // Video buffers for field 1 and 2
+ bool m_VideoValid; // True, if the video data is valid; False if invalid
+ DtMxVideoBuf m_Video[2];
+ // Audio data
+ bool m_AudioValid; // True, if the audio data is valid; False if invalid
+ DtMxAudioData m_Audio;
+ // Auxiliary data
+ bool m_AuxDataValid; // True, if the aux data is valid; False if invalid
+ DtMxAuxData m_AuxData;
+
+ // Access functions for raw ANC packets
+ virtual DTAPI_RESULT AncAddPacket(DtMxAncPacket& AncPacket, int HancVanc,
+ int Stream, int Link=-1) = 0;
+ virtual DTAPI_RESULT AncDelPacket(int Did, int Sdid, int StartLine,
+ int NumLines, int HancVanc, int Stream, int Mode, int Link=-1) = 0;
+ virtual DTAPI_RESULT AncGetPacket(int Did, int Sdid, DtMxAncPacket*, int& NumPackets,
+ int HancVanc, int Stream, int Link=-1) = 0;
+ 
+ // Constructor, destructor
+protected:
+ DtMxFrame();
+ virtual ~DtMxFrame();
+private:
+ // No implementation is provided for the copy constructor or for operator=
+ DtMxFrame(const DtMxFrame&);
+ DtMxFrame& operator=(const DtMxFrame&);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRowData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxRowData
+{
+public:
+ // Pointer to current frame. This is the only read/write buffer, all other buffers
+ // are read-only.
+ DtMxFrame* m_CurFrame;
+
+ // m_Hist.size() == RowSize-1
+ // m_Hist[0] is the previous frame, m_Hist[1] the one before that etc.
+ std::vector<const DtMxFrame*> m_Hist;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Top-level data class for the user callback function.
+//
+class DtMxData
+{
+public:
+ __int64 m_Frame; // Frame counter. Increases by 1 for every frame the
+ // matrix clock source processes.
+ int m_Phase; // Current phase (0..NumPhases-1). Each callback function
+ // can run up to NumPhases time in parallel, each of them
+ // will be called with a different value in m_Phase.
+ int m_NumSkippedFrames; // Error counter, will normally be 0. If due to a timeout
+ // the matrix API has to skip the callback processing of
+ // a number of frames, it'll indicate it here in the data
+ // of the next processed frame.
+ DtFixedVector<DtMxRowData> m_Rows; // Data per row
+ 
+ // Constructor, destructor
+public:
+ DtMxData();
+ virtual ~DtMxData();
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CONTROL +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxPort -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// The DtMxPort is used as abstraction for one logical input or output. Often this
+// maps 1-to-1 to one physical output port, but other mappings are possible as well.
+// 4K-video over SDI can be transported over 4x3G links for example, creating
+// a 1 logical to 4 physical ports mapping.
+//
+// Example for single-port:
+// Matrix.AttachToInput(0, DtMxPort(&Dvc, 1));
+// 
+// Example for 4K (Assuming DtDevice Dvc; which is attached to DTA-2174):
+// DtMxPort Port4k(DTAPI_VIDSTD_2160P60, DTAPI_LINK_4K_SMPTE425);
+// Port4k.AddPhysicalPort(&Dvc, 1);
+// Port4k.AddPhysicalPort(&Dvc, 2);
+// Port4k.AddPhysicalPort(&Dvc, 3);
+// Port4k.AddPhysicalPort(&Dvc, 4);
+// Matrix.AttachToOutput(0, Port4k, 3);
+//
+// 3G over 1x3G-SDI link:
+// DtMxPort Port3G1(DTAPI_VIDSTD_1080P60);
+// Port3G1.AddPhysicalPort(&Dvc, 1);
+// Alternatively "DtMxPort Port3G;" is enough, VidStd can be determined
+// from the IoConfig.
+//
+// 3G over 2xHD-SDI links (NOT SUPPORTED):
+// DtMxPort Port3G2(DTAPI_VIDSTD_1080P60, DTAPI_LINK_3G_SMPTE372);
+// Port3G2.AddPhysicalPort(&Dvc, 1);
+// Port3G2.AddPhysicalPort(&Dvc, 2);
+//
+// After Matrix.AttachToInput() / Matrix.AttachToOutput() it's completely transparent
+// whether Port3G1 or Port3G2 is used. Both support exactly the same data and filtering,
+// the matrix API will take care of splitting over 1 or multiple physical links.
+//
+class DtMxPort
+{
+public:
+ // 1. Constructor that doesn't link to a physical port yet.
+ DtMxPort();
+ // 2. Constructor that links to a single physical port. Video standard and
+ // link standard are not explicitly set and will be determined from IOConfig.
+ DtMxPort(DtDevice*, int Port, int ClockPriority=0);
+ // 3. Constructor that initializes the object for a multi-link structure.
+ DtMxPort(int VidStd, int LinkStd);
+ // 4. Copy constructor
+ DtMxPort(const DtMxPort&);
+ // Destructor
+ virtual ~DtMxPort();
+ // Assignment operator
+ DtMxPort& operator=(const DtMxPort&);
+ 
+ DTAPI_RESULT AddPhysicalPort(DtDevice*, int Port, int ClockPriority=0);
+
+private:
+ class MxPortImpl* m_pImpl;
+ friend class DtMxProcess;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMxProcFrameFunc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Signature of a user-defined matrix callback function.
+//
+typedef void DtMxProcFrameFunc(DtMxData* pData, void* pOpaque);
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMxVidBufFreeCallback -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Signature of callback function that will be called by the HLM to free user-provided
+// video buffers.
+//
+typedef void DtMxVidBufFreeCallback(void* pMem, void* pOpaque);
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxClockMode -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+enum DtMxClockMode
+{
+ DT_MXCLOCK_AUTO, // Default, HLM internally picks a device as clock source
+ DT_MXCLOCK_PCR_TIME_ACC, // HLM changes internal clock source based on PCR samples
+ // provided by user. Each PCR sample is accurately
+ // timestamped (by using transparent input mode on
+ // a DekTec device).
+ DT_MXCLOCK_PCR_TIME_IP, // HLM changes internal clock source based on PCR samples
+ // provided by user. The PCR samples do not have an
+ // accurate timestamp, so HLM will adjust the internal
+ // clock very slowly.
+ DT_MXCLOCK_SW_FIFO, // User provides timestamped Fifo-loads. HLM controls the
+ // clock so that the average fifo load remains the same.
+};
+
+
+// Affinity masks for several threads. Each can be set to 0 to disable them.
+class DtMxCpuAffinity
+{
+public:
+ unsigned int m_Default; // Mask for all other threads
+ unsigned int m_Dma; // Mask for DMA threads
+ unsigned int m_Decode; // Mask for decode threads
+ unsigned int m_Encode; // Mask for encode threads
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxProcess -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxProcess
+{
+public:
+ // The matrix process has 2 states: IDLE and RUNNING. You can switch between those
+ // states by calling Start() and Stop(). Most functions can only be called in IDLE and
+ // will return immediately with an error if called in RUN mode.
+
+ // Register a new callback function that will be called by the framework whenever
+ // a new frame is ready for processing.
+ DTAPI_RESULT AddMatrixCbFunc(DtMxProcFrameFunc* pFunc, void* pOpaque);
+
+ // Reset complete matrix process. The following things will be done:
+ // 1. Detach all attached ports.
+ // 2. Set NumPhases to default value.
+ // 3. Clear any configuration done via SetRowConfig()
+ // 4. Set end-to-end delay to default.
+ // 5. Remove all callbacks.
+ DTAPI_RESULT Reset();
+ 
+ // The matrix can have any number of rows (limited by system resources). Row numbers
+ // start with 0 and go up to N-1 (where N=number of rows). Rows can be attached to
+ // ports in any order, it's not required to start with row 0.
+ // Each row can be attached to:
+ // - 1 input port
+ // - 1 or more output ports
+ // - 1 input port and 1 or more output ports
+ DTAPI_RESULT AttachRowToInput(int Row, const DtMxPort& Port);
+ DTAPI_RESULT AttachRowToOutput(int Row, const DtMxPort& Port, int ExtraOutDelay=0);
+
+ // Change the way the HLM clock source is controlled.
+ DTAPI_RESULT SetClockControl(DtMxClockMode ClockMode, DtDevice* pDvc=NULL,
+ int AvgFifoLoad=-1);
+
+ // Can be called by the user while the matrix process is running. HLM will keep
+ // track of a number of these samples and will adjust it's clock source so the
+ // output rate is matched to the provided samples.
+ DTAPI_RESULT NewClockSample(__int64 PcrOrFifoLoad, int RefClkCnt);
+ 
+ // Changes the number of phases. Global setting per matrix.
+ DTAPI_RESULT SetNumPhases(int NumPhases);
+
+ // SetRowConfig sets the configuration and validates if it is possible valid. Not all
+ // errors can be caught at this time since some depend on the video standard (for
+ // example DtMxVideoConfig::m_NumLines1 if not equal to -1).
+ // SetRowConfig(Row) is only valid after AttachToInput(Row)/AttachToOutput(Row) has
+ // been called and will return an error otherwise.
+ DTAPI_RESULT SetRowConfig(int Row, const DtMxRowConfig& Config);
+
+ // Function to change the video standard for all ports attached to the given row.
+ DTAPI_RESULT SetVidStd(int Row, int VidStd);
+
+ // Set a callback function the framework can use to free user-provided video buffers.
+ DTAPI_RESULT SetVidBufFreeCb(DtMxVidBufFreeCallback* pFunc);
+
+ // Get the minimum/default end-to-end delay. CbFrames will be an approximation
+ // of the time the user callback function has relative to the time of a complete
+ // frame. GetDefEndToEndDelay() will return a value: CbFrames >= NumPhases.
+ // GetMinEndToEndDelay() will return a value: NumPhases-1 < CbFrames <= NumPhases.
+ DTAPI_RESULT GetMinEndToEndDelay(int& Delay, double& CbFrames);
+ DTAPI_RESULT GetDefEndToEndDelay(int& Delay, double& CbFrames);
+ DTAPI_RESULT SetEndToEndDelay(int Delay);
+
+ // Makes sure the configuration of all rows and global matrix settings is consistent.
+ // If it is, start the matrix process.
+ DTAPI_RESULT Start();
+ // Stop a runnig matrix process and return to IDLE.
+ DTAPI_RESULT Stop();
+
+ DTAPI_RESULT SetThreadAffinity(const DtMxCpuAffinity& Affinity);
+
+ //TODO: add function to initialize "error-frame" for input/output and output rows.
+ // This error-frame can be played out during the first few frames when there is
+ // no data available yet and when the input is stalled and configuration requests it.
+ 
+ // Print profiling information collected while the matrix was running
+ DTAPI_RESULT PrintProfilingInfo();
+ 
+ // Implementation data
+private:
+ class MxProcessImpl* m_pImpl;
+
+ // Constructor, destructor
+public:
+ DtMxProcess();
+ ~DtMxProcess();
+private:
+ // No implementation is provided for the copy constructor or for operator=
+ DtMxProcess(const DtMxProcess&);
+ DtMxProcess& operator=(const DtMxProcess&);
+};
+
+
+} // namespace Dtapi
+
+#ifndef _NO_USING_NAMESPACE_DTAPI
+using namespace Dtapi;
+#endif
+
+#endif //#ifndef __DTAPI_H
+

v0.5.2.tar.gz/extra_lib/include/js/jscpucfg.h -> v0.6.1.tar.gz/extra_lib/include/js/jscpucfg.h Changed

@@ -42,11 +42,12 @@
 
 #include "jsosdep.h"
 
-#if defined(XP_WIN) || defined(XP_OS2) || defined(WINCE)
+#if defined(XP_WIN) || defined(XP_OS2) || defined(WINCE) || defined(IPHONE_OS)
 
 #if defined(_WIN64)
 
 #if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
+
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN
 
@@ -94,7 +95,7 @@
 #error "CPU type is unknown"
 #endif /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
 
-#elif defined(_WIN32) || defined(XP_OS2) || defined(WINCE)
+#elif defined(_WIN32) || defined(XP_OS2) || defined(WINCE) 
 
 #ifdef __WATCOMC__
 #define HAVE_VA_LIST_AS_ARRAY
@@ -143,8 +144,111 @@
 #define JS_BYTES_PER_WORD_LOG2   2L
 #define JS_BYTES_PER_DWORD_LOG2  3L
 #define PR_WORDS_PER_DWORD_LOG2  1L
+
 #endif /* _WIN32 || XP_OS2 || WINCE*/
 
+#if defined(IPHONE_OS)
+
+//ios64
+#if defined(__LP64__)
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   8L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    64L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   6L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 8L
+#define JS_ALIGN_OF_WORD    8L
+
+#define JS_BYTES_PER_WORD_LOG2   3L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define PR_WORDS_PER_DWORD_LOG2  0L
+
+#else //ios64
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   4L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  4L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif //ios32
+
+
+#endif
+
+
 #if defined(_WINDOWS) && !defined(_WIN32) /* WIN16 */
 
 #define IS_LITTLE_ENDIAN 1

v0.5.2.tar.gz/extra_lib/include/js/jstypes.h -> v0.6.1.tar.gz/extra_lib/include/js/jstypes.h Changed

v0.5.2.tar.gz/extra_lib/include/openHevcWrapper.h -> v0.6.1.tar.gz/extra_lib/include/openHevcWrapper.h Changed

v0.6.1.tar.gz/extra_lib/include/openssl/x509v3.h Added

@@ -0,0 +1,1045 @@
+/* x509v3.h */
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999.
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+#ifndef HEADER_X509V3_H
+# define HEADER_X509V3_H
+
+# include <openssl/bio.h>
+# include <openssl/x509.h>
+# include <openssl/conf.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+# ifdef OPENSSL_SYS_WIN32
+/* Under Win32 these are defined in wincrypt.h */
+# undef X509_NAME
+# undef X509_EXTENSIONS
+# endif
+
+/* Forward reference */
+struct v3_ext_method;
+struct v3_ext_ctx;
+
+/* Useful typedefs */
+
+typedef void *(*X509V3_EXT_NEW)(void);
+typedef void (*X509V3_EXT_FREE) (void *);
+typedef void *(*X509V3_EXT_D2I)(void *, const unsigned char **, long);
+typedef int (*X509V3_EXT_I2D) (void *, unsigned char **);
+typedef STACK_OF(CONF_VALUE) *
+ (*X509V3_EXT_I2V) (const struct v3_ext_method *method, void *ext,
+ STACK_OF(CONF_VALUE) *extlist);
+typedef void *(*X509V3_EXT_V2I)(const struct v3_ext_method *method,
+ struct v3_ext_ctx *ctx,
+ STACK_OF(CONF_VALUE) *values);
+typedef char *(*X509V3_EXT_I2S)(const struct v3_ext_method *method,
+ void *ext);
+typedef void *(*X509V3_EXT_S2I)(const struct v3_ext_method *method,
+ struct v3_ext_ctx *ctx, const char *str);
+typedef int (*X509V3_EXT_I2R) (const struct v3_ext_method *method, void *ext,
+ BIO *out, int indent);
+typedef void *(*X509V3_EXT_R2I)(const struct v3_ext_method *method,
+ struct v3_ext_ctx *ctx, const char *str);
+
+/* V3 extension structure */
+
+struct v3_ext_method {
+ int ext_nid;
+ int ext_flags;
+/* If this is set the following four fields are ignored */
+ ASN1_ITEM_EXP *it;
+/* Old style ASN1 calls */
+ X509V3_EXT_NEW ext_new;
+ X509V3_EXT_FREE ext_free;
+ X509V3_EXT_D2I d2i;
+ X509V3_EXT_I2D i2d;
+/* The following pair is used for string extensions */
+ X509V3_EXT_I2S i2s;
+ X509V3_EXT_S2I s2i;
+/* The following pair is used for multi-valued extensions */
+ X509V3_EXT_I2V i2v;
+ X509V3_EXT_V2I v2i;
+/* The following are used for raw extensions */
+ X509V3_EXT_I2R i2r;
+ X509V3_EXT_R2I r2i;
+ void *usr_data; /* Any extension specific data */
+};
+
+typedef struct X509V3_CONF_METHOD_st {
+ char *(*get_string) (void *db, char *section, char *value);
+ STACK_OF(CONF_VALUE) *(*get_section) (void *db, char *section);
+ void (*free_string) (void *db, char *string);
+ void (*free_section) (void *db, STACK_OF(CONF_VALUE) *section);
+} X509V3_CONF_METHOD;
+
+/* Context specific info */
+struct v3_ext_ctx {
+# define CTX_TEST 0x1
+# define X509V3_CTX_REPLACE 0x2
+ int flags;
+ X509 *issuer_cert;
+ X509 *subject_cert;
+ X509_REQ *subject_req;
+ X509_CRL *crl;
+ X509V3_CONF_METHOD *db_meth;
+ void *db;
+/* Maybe more here */
+};
+
+typedef struct v3_ext_method X509V3_EXT_METHOD;
+
+DECLARE_STACK_OF(X509V3_EXT_METHOD)
+
+/* ext_flags values */
+# define X509V3_EXT_DYNAMIC 0x1
+# define X509V3_EXT_CTX_DEP 0x2
+# define X509V3_EXT_MULTILINE 0x4
+
+typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
+
+typedef struct BASIC_CONSTRAINTS_st {
+ int ca;
+ ASN1_INTEGER *pathlen;
+} BASIC_CONSTRAINTS;
+
+typedef struct PKEY_USAGE_PERIOD_st {
+ ASN1_GENERALIZEDTIME *notBefore;
+ ASN1_GENERALIZEDTIME *notAfter;
+} PKEY_USAGE_PERIOD;
+
+typedef struct otherName_st {
+ ASN1_OBJECT *type_id;
+ ASN1_TYPE *value;
+} OTHERNAME;
+
+typedef struct EDIPartyName_st {
+ ASN1_STRING *nameAssigner;
+ ASN1_STRING *partyName;
+} EDIPARTYNAME;
+
+typedef struct GENERAL_NAME_st {
+# define GEN_OTHERNAME 0
+# define GEN_EMAIL 1
+# define GEN_DNS 2
+# define GEN_X400 3
+# define GEN_DIRNAME 4
+# define GEN_EDIPARTY 5
+# define GEN_URI 6
+# define GEN_IPADD 7
+# define GEN_RID 8
+ int type;
+ union {
+ char *ptr;
+ OTHERNAME *otherName; /* otherName */
+ ASN1_IA5STRING *rfc822Name;
+ ASN1_IA5STRING *dNSName;
+ ASN1_TYPE *x400Address;
+ X509_NAME *directoryName;
+ EDIPARTYNAME *ediPartyName;
+ ASN1_IA5STRING *uniformResourceIdentifier;
+ ASN1_OCTET_STRING *iPAddress;
+ ASN1_OBJECT *registeredID;
+ /* Old names */
+ ASN1_OCTET_STRING *ip; /* iPAddress */
+ X509_NAME *dirn; /* dirn */
+ ASN1_IA5STRING *ia5; /* rfc822Name, dNSName,
+ * uniformResourceIdentifier */
+ ASN1_OBJECT *rid; /* registeredID */
+ ASN1_TYPE *other; /* x400Address */
+ } d;
+} GENERAL_NAME;
+
+typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
+
+typedef struct ACCESS_DESCRIPTION_st {
+ ASN1_OBJECT *method;
+ GENERAL_NAME *location;
+} ACCESS_DESCRIPTION;
+
+typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
+
+typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
+
+DECLARE_STACK_OF(GENERAL_NAME)
+
+DECLARE_STACK_OF(ACCESS_DESCRIPTION)
+
+typedef struct DIST_POINT_NAME_st {
+ int type;
+ union {
+ GENERAL_NAMES *fullname;
+ STACK_OF(X509_NAME_ENTRY) *relativename;
+ } name;
+/* If relativename then this contains the full distribution point name */
+ X509_NAME *dpname;
+} DIST_POINT_NAME;
+/* All existing reasons */
+# define CRLDP_ALL_REASONS 0x807f
+
+# define CRL_REASON_NONE -1
+# define CRL_REASON_UNSPECIFIED 0
+# define CRL_REASON_KEY_COMPROMISE 1
+# define CRL_REASON_CA_COMPROMISE 2
+# define CRL_REASON_AFFILIATION_CHANGED 3
+# define CRL_REASON_SUPERSEDED 4
+# define CRL_REASON_CESSATION_OF_OPERATION 5
+# define CRL_REASON_CERTIFICATE_HOLD 6
+# define CRL_REASON_REMOVE_FROM_CRL 8
+# define CRL_REASON_PRIVILEGE_WITHDRAWN 9
+# define CRL_REASON_AA_COMPROMISE 10
+
+struct DIST_POINT_st {
+ DIST_POINT_NAME *distpoint;
+ ASN1_BIT_STRING *reasons;
+ GENERAL_NAMES *CRLissuer;
+ int dp_reasons;
+};
+
+typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
+
+DECLARE_STACK_OF(DIST_POINT)
+
+struct AUTHORITY_KEYID_st {
+ ASN1_OCTET_STRING *keyid;
+ GENERAL_NAMES *issuer;
+ ASN1_INTEGER *serial;
+};
+
+/* Strong extranet structures */
+
+typedef struct SXNET_ID_st {
+ ASN1_INTEGER *zone;
+ ASN1_OCTET_STRING *user;
+} SXNETID;
+
+DECLARE_STACK_OF(SXNETID)
+
+typedef struct SXNET_st {
+ ASN1_INTEGER *version;
+ STACK_OF(SXNETID) *ids;
+} SXNET;
+
+typedef struct NOTICEREF_st {
+ ASN1_STRING *organization;
+ STACK_OF(ASN1_INTEGER) *noticenos;
+} NOTICEREF;
+
+typedef struct USERNOTICE_st {
+ NOTICEREF *noticeref;
+ ASN1_STRING *exptext;
+} USERNOTICE;
+
+typedef struct POLICYQUALINFO_st {
+ ASN1_OBJECT *pqualid;
+ union {
+ ASN1_IA5STRING *cpsuri;
+ USERNOTICE *usernotice;
+ ASN1_TYPE *other;
+ } d;
+} POLICYQUALINFO;
+
+DECLARE_STACK_OF(POLICYQUALINFO)
+
+typedef struct POLICYINFO_st {
+ ASN1_OBJECT *policyid;
+ STACK_OF(POLICYQUALINFO) *qualifiers;
+} POLICYINFO;
+
+typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
+
+DECLARE_STACK_OF(POLICYINFO)
+
+typedef struct POLICY_MAPPING_st {
+ ASN1_OBJECT *issuerDomainPolicy;
+ ASN1_OBJECT *subjectDomainPolicy;
+} POLICY_MAPPING;
+
+DECLARE_STACK_OF(POLICY_MAPPING)
+
+typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
+
+typedef struct GENERAL_SUBTREE_st {
+ GENERAL_NAME *base;
+ ASN1_INTEGER *minimum;
+ ASN1_INTEGER *maximum;
+} GENERAL_SUBTREE;
+
+DECLARE_STACK_OF(GENERAL_SUBTREE)
+
+struct NAME_CONSTRAINTS_st {
+ STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
+ STACK_OF(GENERAL_SUBTREE) *excludedSubtrees;
+};
+
+typedef struct POLICY_CONSTRAINTS_st {
+ ASN1_INTEGER *requireExplicitPolicy;
+ ASN1_INTEGER *inhibitPolicyMapping;
+} POLICY_CONSTRAINTS;
+
+/* Proxy certificate structures, see RFC 3820 */
+typedef struct PROXY_POLICY_st {
+ ASN1_OBJECT *policyLanguage;
+ ASN1_OCTET_STRING *policy;
+} PROXY_POLICY;
+
+typedef struct PROXY_CERT_INFO_EXTENSION_st {
+ ASN1_INTEGER *pcPathLengthConstraint;
+ PROXY_POLICY *proxyPolicy;
+} PROXY_CERT_INFO_EXTENSION;
+
+DECLARE_ASN1_FUNCTIONS(PROXY_POLICY)
+DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
+
+struct ISSUING_DIST_POINT_st {
+ DIST_POINT_NAME *distpoint;
+ int onlyuser;
+ int onlyCA;
+ ASN1_BIT_STRING *onlysomereasons;
+ int indirectCRL;
+ int onlyattr;
+};
+
+/* Values in idp_flags field */
+/* IDP present */
+# define IDP_PRESENT 0x1
+/* IDP values inconsistent */
+# define IDP_INVALID 0x2
+/* onlyuser true */
+# define IDP_ONLYUSER 0x4
+/* onlyCA true */
+# define IDP_ONLYCA 0x8
+/* onlyattr true */
+# define IDP_ONLYATTR 0x10
+/* indirectCRL true */
+# define IDP_INDIRECT 0x20
+/* onlysomereasons present */
+# define IDP_REASONS 0x40
+
+# define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
+",name:", val->name, ",value:", val->value);
+
+# define X509V3_set_ctx_test(ctx) \
+ X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
+# define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
+
+# define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
+ 0,0,0,0, \
+ 0,0, \
+ (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
+ (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
+ NULL, NULL, \
+ table}
+
+# define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
+ 0,0,0,0, \
+ (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
+ (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
+ 0,0,0,0, \
+ NULL}
+
+# define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+
+/* X509_PURPOSE stuff */
+
+# define EXFLAG_BCONS 0x1
+# define EXFLAG_KUSAGE 0x2
+# define EXFLAG_XKUSAGE 0x4
+# define EXFLAG_NSCERT 0x8
+
+# define EXFLAG_CA 0x10
+/* Really self issued not necessarily self signed */
+# define EXFLAG_SI 0x20
+# define EXFLAG_V1 0x40
+# define EXFLAG_INVALID 0x80
+# define EXFLAG_SET 0x100
+# define EXFLAG_CRITICAL 0x200
+# define EXFLAG_PROXY 0x400
+
+# define EXFLAG_INVALID_POLICY 0x800
+# define EXFLAG_FRESHEST 0x1000
+/* Self signed */
+# define EXFLAG_SS 0x2000
+
+# define KU_DIGITAL_SIGNATURE 0x0080
+# define KU_NON_REPUDIATION 0x0040
+# define KU_KEY_ENCIPHERMENT 0x0020
+# define KU_DATA_ENCIPHERMENT 0x0010
+# define KU_KEY_AGREEMENT 0x0008
+# define KU_KEY_CERT_SIGN 0x0004
+# define KU_CRL_SIGN 0x0002
+# define KU_ENCIPHER_ONLY 0x0001
+# define KU_DECIPHER_ONLY 0x8000
+
+# define NS_SSL_CLIENT 0x80
+# define NS_SSL_SERVER 0x40
+# define NS_SMIME 0x20
+# define NS_OBJSIGN 0x10
+# define NS_SSL_CA 0x04
+# define NS_SMIME_CA 0x02
+# define NS_OBJSIGN_CA 0x01
+# define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
+
+# define XKU_SSL_SERVER 0x1
+# define XKU_SSL_CLIENT 0x2
+# define XKU_SMIME 0x4
+# define XKU_CODE_SIGN 0x8
+# define XKU_SGC 0x10
+# define XKU_OCSP_SIGN 0x20
+# define XKU_TIMESTAMP 0x40
+# define XKU_DVCS 0x80
+# define XKU_ANYEKU 0x100
+
+# define X509_PURPOSE_DYNAMIC 0x1
+# define X509_PURPOSE_DYNAMIC_NAME 0x2
+
+typedef struct x509_purpose_st {
+ int purpose;
+ int trust; /* Default trust ID */
+ int flags;
+ int (*check_purpose) (const struct x509_purpose_st *, const X509 *, int);
+ char *name;
+ char *sname;
+ void *usr_data;
+} X509_PURPOSE;
+
+# define X509_PURPOSE_SSL_CLIENT 1
+# define X509_PURPOSE_SSL_SERVER 2
+# define X509_PURPOSE_NS_SSL_SERVER 3
+# define X509_PURPOSE_SMIME_SIGN 4
+# define X509_PURPOSE_SMIME_ENCRYPT 5
+# define X509_PURPOSE_CRL_SIGN 6
+# define X509_PURPOSE_ANY 7
+# define X509_PURPOSE_OCSP_HELPER 8
+# define X509_PURPOSE_TIMESTAMP_SIGN 9
+
+# define X509_PURPOSE_MIN 1
+# define X509_PURPOSE_MAX 9
+
+/* Flags for X509V3_EXT_print() */
+
+# define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
+/* Return error for unknown extensions */
+# define X509V3_EXT_DEFAULT 0
+/* Print error for unknown extensions */
+# define X509V3_EXT_ERROR_UNKNOWN (1L << 16)
+/* ASN1 parse unknown extensions */
+# define X509V3_EXT_PARSE_UNKNOWN (2L << 16)
+/* BIO_dump unknown extensions */
+# define X509V3_EXT_DUMP_UNKNOWN (3L << 16)
+
+/* Flags for X509V3_add1_i2d */
+
+# define X509V3_ADD_OP_MASK 0xfL
+# define X509V3_ADD_DEFAULT 0L
+# define X509V3_ADD_APPEND 1L
+# define X509V3_ADD_REPLACE 2L
+# define X509V3_ADD_REPLACE_EXISTING 3L
+# define X509V3_ADD_KEEP_EXISTING 4L
+# define X509V3_ADD_DELETE 5L
+# define X509V3_ADD_SILENT 0x10
+
+DECLARE_STACK_OF(X509_PURPOSE)
+
+DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
+
+DECLARE_ASN1_FUNCTIONS(SXNET)
+DECLARE_ASN1_FUNCTIONS(SXNETID)
+
+int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen);
+int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
+ int userlen);
+int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user,
+ int userlen);
+
+ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone);
+ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
+ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone);
+
+DECLARE_ASN1_FUNCTIONS(AUTHORITY_KEYID)
+
+DECLARE_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
+
+DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
+GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a);
+int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b);
+
+ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx,
+ STACK_OF(CONF_VALUE) *nval);
+STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
+ ASN1_BIT_STRING *bits,
+ STACK_OF(CONF_VALUE) *extlist);
+char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
+ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, char *str);
+
+STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
+ GENERAL_NAME *gen,
+ STACK_OF(CONF_VALUE) *ret);
+int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
+
+DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
+
+STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
+ GENERAL_NAMES *gen,
+ STACK_OF(CONF_VALUE) *extlist);
+GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+
+DECLARE_ASN1_FUNCTIONS(OTHERNAME)
+DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
+int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
+void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
+void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype);
+int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
+ ASN1_OBJECT *oid, ASN1_TYPE *value);
+int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen,
+ ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
+
+char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
+ ASN1_OCTET_STRING *ia5);
+ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, char *str);
+
+DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
+int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a);
+
+DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
+DECLARE_ASN1_FUNCTIONS(POLICYINFO)
+DECLARE_ASN1_FUNCTIONS(POLICYQUALINFO)
+DECLARE_ASN1_FUNCTIONS(USERNOTICE)
+DECLARE_ASN1_FUNCTIONS(NOTICEREF)
+
+DECLARE_ASN1_FUNCTIONS(CRL_DIST_POINTS)
+DECLARE_ASN1_FUNCTIONS(DIST_POINT)
+DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
+DECLARE_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
+
+int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, X509_NAME *iname);
+
+int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc);
+
+DECLARE_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
+DECLARE_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
+
+DECLARE_ASN1_ITEM(POLICY_MAPPING)
+DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
+DECLARE_ASN1_ITEM(POLICY_MAPPINGS)
+
+DECLARE_ASN1_ITEM(GENERAL_SUBTREE)
+DECLARE_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
+
+DECLARE_ASN1_ITEM(NAME_CONSTRAINTS)
+DECLARE_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
+
+DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
+DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
+
+GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
+ const X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, int gen_type, char *value,
+ int is_nc);
+
+# ifdef HEADER_CONF_H
+GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, CONF_VALUE *cnf);
+GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
+ const X509V3_EXT_METHOD *method,
+ X509V3_CTX *ctx, CONF_VALUE *cnf,
+ int is_nc);
+void X509V3_conf_free(CONF_VALUE *val);
+
+X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
+ char *value);
+X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name,
+ char *value);
+int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section,
+ STACK_OF(X509_EXTENSION) **sk);
+int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
+ X509 *cert);
+int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
+ X509_REQ *req);
+int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
+ X509_CRL *crl);
+
+X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
+ X509V3_CTX *ctx, int ext_nid,
+ char *value);
+X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
+ char *name, char *value);
+int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
+ char *section, X509 *cert);
+int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
+ char *section, X509_REQ *req);
+int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
+ char *section, X509_CRL *crl);
+
+int X509V3_add_value_bool_nf(char *name, int asn1_bool,
+ STACK_OF(CONF_VALUE) **extlist);
+int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
+int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
+void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
+void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
+# endif
+
+char *X509V3_get_string(X509V3_CTX *ctx, char *name, char *section);
+STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, char *section);
+void X509V3_string_free(X509V3_CTX *ctx, char *str);
+void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
+void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
+ X509_REQ *req, X509_CRL *crl, int flags);
+
+int X509V3_add_value(const char *name, const char *value,
+ STACK_OF(CONF_VALUE) **extlist);
+int X509V3_add_value_uchar(const char *name, const unsigned char *value,
+ STACK_OF(CONF_VALUE) **extlist);
+int X509V3_add_value_bool(const char *name, int asn1_bool,
+ STACK_OF(CONF_VALUE) **extlist);
+int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
+ STACK_OF(CONF_VALUE) **extlist);
+char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
+ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
+char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
+char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth,
+ ASN1_ENUMERATED *aint);
+int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
+int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
+int X509V3_EXT_add_alias(int nid_to, int nid_from);
+void X509V3_EXT_cleanup(void);
+
+const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext);
+const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
+int X509V3_add_standard_extensions(void);
+STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
+void *X509V3_EXT_d2i(X509_EXTENSION *ext);
+void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
+ int *idx);
+
+X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
+int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
+ int crit, unsigned long flags);
+
+char *hex_to_string(const unsigned char *buffer, long len);
+unsigned char *string_to_hex(const char *str, long *len);
+int name_cmp(const char *name, const char *cmp);
+
+void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
+ int ml);
+int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
+ int indent);
+int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
+
+int X509V3_extensions_print(BIO *out, char *title,
+ STACK_OF(X509_EXTENSION) *exts,
+ unsigned long flag, int indent);
+
+int X509_check_ca(X509 *x);
+int X509_check_purpose(X509 *x, int id, int ca);
+int X509_supported_extension(X509_EXTENSION *ex);
+int X509_PURPOSE_set(int *p, int purpose);
+int X509_check_issued(X509 *issuer, X509 *subject);
+int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid);
+int X509_PURPOSE_get_count(void);
+X509_PURPOSE *X509_PURPOSE_get0(int idx);
+int X509_PURPOSE_get_by_sname(char *sname);
+int X509_PURPOSE_get_by_id(int id);
+int X509_PURPOSE_add(int id, int trust, int flags,
+ int (*ck) (const X509_PURPOSE *, const X509 *, int),
+ char *name, char *sname, void *arg);
+char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
+char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
+int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
+void X509_PURPOSE_cleanup(void);
+int X509_PURPOSE_get_id(X509_PURPOSE *);
+
+STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
+STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
+void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
+STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
+/* Flags for X509_check_* functions */
+
+/*
+ * Always check subject name for host match even if subject alt names present
+ */
+# define X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT 0x1
+/* Disable wildcard matching for dnsName fields and common name. */
+# define X509_CHECK_FLAG_NO_WILDCARDS 0x2
+/* Wildcards must not match a partial label. */
+# define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0x4
+/* Allow (non-partial) wildcards to match multiple labels. */
+# define X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS 0x8
+/* Constraint verifier subdomain patterns to match a single labels. */
+# define X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10
+/*
+ * Match reference identifiers starting with "." to any sub-domain.
+ * This is a non-public flag, turned on implicitly when the subject
+ * reference identity is a DNS name.
+ */
+# define _X509_CHECK_FLAG_DOT_SUBDOMAINS 0x8000
+
+int X509_check_host(X509 *x, const char *chk, size_t chklen,
+ unsigned int flags, char **peername);
+int X509_check_email(X509 *x, const char *chk, size_t chklen,
+ unsigned int flags);
+int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
+ unsigned int flags);
+int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags);
+
+ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
+ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
+int a2i_ipadd(unsigned char *ipout, const char *ipasc);
+int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
+ unsigned long chtype);
+
+void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
+DECLARE_STACK_OF(X509_POLICY_NODE)
+
+typedef struct ASRange_st {
+ ASN1_INTEGER *min, *max;
+} ASRange;
+
+# define ASIdOrRange_id 0
+# define ASIdOrRange_range 1
+
+typedef struct ASIdOrRange_st {
+ int type;
+ union {
+ ASN1_INTEGER *id;
+ ASRange *range;
+ } u;
+} ASIdOrRange;
+
+typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
+DECLARE_STACK_OF(ASIdOrRange)
+
+# define ASIdentifierChoice_inherit 0
+# define ASIdentifierChoice_asIdsOrRanges 1
+
+typedef struct ASIdentifierChoice_st {
+ int type;
+ union {
+ ASN1_NULL *inherit;
+ ASIdOrRanges *asIdsOrRanges;
+ } u;
+} ASIdentifierChoice;
+
+typedef struct ASIdentifiers_st {
+ ASIdentifierChoice *asnum, *rdi;
+} ASIdentifiers;
+
+DECLARE_ASN1_FUNCTIONS(ASRange)
+DECLARE_ASN1_FUNCTIONS(ASIdOrRange)
+DECLARE_ASN1_FUNCTIONS(ASIdentifierChoice)
+DECLARE_ASN1_FUNCTIONS(ASIdentifiers)
+
+typedef struct IPAddressRange_st {
+ ASN1_BIT_STRING *min, *max;
+} IPAddressRange;
+
+# define IPAddressOrRange_addressPrefix 0
+# define IPAddressOrRange_addressRange 1
+
+typedef struct IPAddressOrRange_st {
+ int type;
+ union {
+ ASN1_BIT_STRING *addressPrefix;
+ IPAddressRange *addressRange;
+ } u;
+} IPAddressOrRange;
+
+typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
+DECLARE_STACK_OF(IPAddressOrRange)
+
+# define IPAddressChoice_inherit 0
+# define IPAddressChoice_addressesOrRanges 1
+
+typedef struct IPAddressChoice_st {
+ int type;
+ union {
+ ASN1_NULL *inherit;
+ IPAddressOrRanges *addressesOrRanges;
+ } u;
+} IPAddressChoice;
+
+typedef struct IPAddressFamily_st {
+ ASN1_OCTET_STRING *addressFamily;
+ IPAddressChoice *ipAddressChoice;
+} IPAddressFamily;
+
+typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
+DECLARE_STACK_OF(IPAddressFamily)
+
+DECLARE_ASN1_FUNCTIONS(IPAddressRange)
+DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)
+DECLARE_ASN1_FUNCTIONS(IPAddressChoice)
+DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
+
+/*
+ * API tag for elements of the ASIdentifer SEQUENCE.
+ */
+# define V3_ASID_ASNUM 0
+# define V3_ASID_RDI 1
+
+/*
+ * AFI values, assigned by IANA. It'd be nice to make the AFI
+ * handling code totally generic, but there are too many little things
+ * that would need to be defined for other address families for it to
+ * be worth the trouble.
+ */
+# define IANA_AFI_IPV4 1
+# define IANA_AFI_IPV6 2
+
+/*
+ * Utilities to construct and extract values from RFC3779 extensions,
+ * since some of the encodings (particularly for IP address prefixes
+ * and ranges) are a bit tedious to work with directly.
+ */
+int v3_asid_add_inherit(ASIdentifiers *asid, int which);
+int v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
+ ASN1_INTEGER *min, ASN1_INTEGER *max);
+int v3_addr_add_inherit(IPAddrBlocks *addr,
+ const unsigned afi, const unsigned *safi);
+int v3_addr_add_prefix(IPAddrBlocks *addr,
+ const unsigned afi, const unsigned *safi,
+ unsigned char *a, const int prefixlen);
+int v3_addr_add_range(IPAddrBlocks *addr,
+ const unsigned afi, const unsigned *safi,
+ unsigned char *min, unsigned char *max);
+unsigned v3_addr_get_afi(const IPAddressFamily *f);
+int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
+ unsigned char *min, unsigned char *max,
+ const int length);
+
+/*
+ * Canonical forms.
+ */
+int v3_asid_is_canonical(ASIdentifiers *asid);
+int v3_addr_is_canonical(IPAddrBlocks *addr);
+int v3_asid_canonize(ASIdentifiers *asid);
+int v3_addr_canonize(IPAddrBlocks *addr);
+
+/*
+ * Tests for inheritance and containment.
+ */
+int v3_asid_inherits(ASIdentifiers *asid);
+int v3_addr_inherits(IPAddrBlocks *addr);
+int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b);
+int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
+
+/*
+ * Check whether RFC 3779 extensions nest properly in chains.
+ */
+int v3_asid_validate_path(X509_STORE_CTX *);
+int v3_addr_validate_path(X509_STORE_CTX *);
+int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
+ ASIdentifiers *ext, int allow_inheritance);
+int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
+ IPAddrBlocks *ext, int allow_inheritance);
+
+/* BEGIN ERROR CODES */
+/*
+ * The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_X509V3_strings(void);
+
+/* Error codes for the X509V3 functions. */
+
+/* Function codes. */
+# define X509V3_F_A2I_GENERAL_NAME 164
+# define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 161
+# define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL 162
+# define X509V3_F_COPY_EMAIL 122
+# define X509V3_F_COPY_ISSUER 123
+# define X509V3_F_DO_DIRNAME 144
+# define X509V3_F_DO_EXT_CONF 124
+# define X509V3_F_DO_EXT_I2D 135
+# define X509V3_F_DO_EXT_NCONF 151
+# define X509V3_F_DO_I2V_NAME_CONSTRAINTS 148
+# define X509V3_F_GNAMES_FROM_SECTNAME 156
+# define X509V3_F_HEX_TO_STRING 111
+# define X509V3_F_I2S_ASN1_ENUMERATED 121
+# define X509V3_F_I2S_ASN1_IA5STRING 149
+# define X509V3_F_I2S_ASN1_INTEGER 120
+# define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138
+# define X509V3_F_NOTICE_SECTION 132
+# define X509V3_F_NREF_NOS 133
+# define X509V3_F_POLICY_SECTION 131
+# define X509V3_F_PROCESS_PCI_VALUE 150
+# define X509V3_F_R2I_CERTPOL 130
+# define X509V3_F_R2I_PCI 155
+# define X509V3_F_S2I_ASN1_IA5STRING 100
+# define X509V3_F_S2I_ASN1_INTEGER 108
+# define X509V3_F_S2I_ASN1_OCTET_STRING 112
+# define X509V3_F_S2I_ASN1_SKEY_ID 114
+# define X509V3_F_S2I_SKEY_ID 115
+# define X509V3_F_SET_DIST_POINT_NAME 158
+# define X509V3_F_STRING_TO_HEX 113
+# define X509V3_F_SXNET_ADD_ID_ASC 125
+# define X509V3_F_SXNET_ADD_ID_INTEGER 126
+# define X509V3_F_SXNET_ADD_ID_ULONG 127
+# define X509V3_F_SXNET_GET_ID_ASC 128
+# define X509V3_F_SXNET_GET_ID_ULONG 129
+# define X509V3_F_V2I_ASIDENTIFIERS 163
+# define X509V3_F_V2I_ASN1_BIT_STRING 101
+# define X509V3_F_V2I_AUTHORITY_INFO_ACCESS 139
+# define X509V3_F_V2I_AUTHORITY_KEYID 119
+# define X509V3_F_V2I_BASIC_CONSTRAINTS 102
+# define X509V3_F_V2I_CRLD 134
+# define X509V3_F_V2I_EXTENDED_KEY_USAGE 103
+# define X509V3_F_V2I_GENERAL_NAMES 118
+# define X509V3_F_V2I_GENERAL_NAME_EX 117
+# define X509V3_F_V2I_IDP 157
+# define X509V3_F_V2I_IPADDRBLOCKS 159
+# define X509V3_F_V2I_ISSUER_ALT 153
+# define X509V3_F_V2I_NAME_CONSTRAINTS 147
+# define X509V3_F_V2I_POLICY_CONSTRAINTS 146
+# define X509V3_F_V2I_POLICY_MAPPINGS 145
+# define X509V3_F_V2I_SUBJECT_ALT 154
+# define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 160
+# define X509V3_F_V3_GENERIC_EXTENSION 116
+# define X509V3_F_X509V3_ADD1_I2D 140
+# define X509V3_F_X509V3_ADD_VALUE 105
+# define X509V3_F_X509V3_EXT_ADD 104
+# define X509V3_F_X509V3_EXT_ADD_ALIAS 106
+# define X509V3_F_X509V3_EXT_CONF 107
+# define X509V3_F_X509V3_EXT_I2D 136
+# define X509V3_F_X509V3_EXT_NCONF 152
+# define X509V3_F_X509V3_GET_SECTION 142
+# define X509V3_F_X509V3_GET_STRING 143
+# define X509V3_F_X509V3_GET_VALUE_BOOL 110
+# define X509V3_F_X509V3_PARSE_LIST 109
+# define X509V3_F_X509_PURPOSE_ADD 137
+# define X509V3_F_X509_PURPOSE_SET 141
+
+/* Reason codes. */
+# define X509V3_R_BAD_IP_ADDRESS 118
+# define X509V3_R_BAD_OBJECT 119
+# define X509V3_R_BN_DEC2BN_ERROR 100
+# define X509V3_R_BN_TO_ASN1_INTEGER_ERROR 101
+# define X509V3_R_DIRNAME_ERROR 149
+# define X509V3_R_DISTPOINT_ALREADY_SET 160
+# define X509V3_R_DUPLICATE_ZONE_ID 133
+# define X509V3_R_ERROR_CONVERTING_ZONE 131
+# define X509V3_R_ERROR_CREATING_EXTENSION 144
+# define X509V3_R_ERROR_IN_EXTENSION 128
+# define X509V3_R_EXPECTED_A_SECTION_NAME 137
+# define X509V3_R_EXTENSION_EXISTS 145
+# define X509V3_R_EXTENSION_NAME_ERROR 115
+# define X509V3_R_EXTENSION_NOT_FOUND 102
+# define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103
+# define X509V3_R_EXTENSION_VALUE_ERROR 116
+# define X509V3_R_ILLEGAL_EMPTY_EXTENSION 151
+# define X509V3_R_ILLEGAL_HEX_DIGIT 113
+# define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG 152
+# define X509V3_R_INVALID_MULTIPLE_RDNS 161
+# define X509V3_R_INVALID_ASNUMBER 162
+# define X509V3_R_INVALID_ASRANGE 163
+# define X509V3_R_INVALID_BOOLEAN_STRING 104
+# define X509V3_R_INVALID_EXTENSION_STRING 105
+# define X509V3_R_INVALID_INHERITANCE 165
+# define X509V3_R_INVALID_IPADDRESS 166
+# define X509V3_R_INVALID_NAME 106
+# define X509V3_R_INVALID_NULL_ARGUMENT 107
+# define X509V3_R_INVALID_NULL_NAME 108
+# define X509V3_R_INVALID_NULL_VALUE 109
+# define X509V3_R_INVALID_NUMBER 140
+# define X509V3_R_INVALID_NUMBERS 141
+# define X509V3_R_INVALID_OBJECT_IDENTIFIER 110
+# define X509V3_R_INVALID_OPTION 138
+# define X509V3_R_INVALID_POLICY_IDENTIFIER 134
+# define X509V3_R_INVALID_PROXY_POLICY_SETTING 153
+# define X509V3_R_INVALID_PURPOSE 146
+# define X509V3_R_INVALID_SAFI 164
+# define X509V3_R_INVALID_SECTION 135
+# define X509V3_R_INVALID_SYNTAX 143
+# define X509V3_R_ISSUER_DECODE_ERROR 126
+# define X509V3_R_MISSING_VALUE 124
+# define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS 142
+# define X509V3_R_NO_CONFIG_DATABASE 136
+# define X509V3_R_NO_ISSUER_CERTIFICATE 121
+# define X509V3_R_NO_ISSUER_DETAILS 127
+# define X509V3_R_NO_POLICY_IDENTIFIER 139
+# define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED 154
+# define X509V3_R_NO_PUBLIC_KEY 114
+# define X509V3_R_NO_SUBJECT_DETAILS 125
+# define X509V3_R_ODD_NUMBER_OF_DIGITS 112
+# define X509V3_R_OPERATION_NOT_DEFINED 148
+# define X509V3_R_OTHERNAME_ERROR 147
+# define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED 155
+# define X509V3_R_POLICY_PATH_LENGTH 156
+# define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED 157
+# define X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED 158
+# define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
+# define X509V3_R_SECTION_NOT_FOUND 150
+# define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS 122
+# define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID 123
+# define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT 111
+# define X509V3_R_UNKNOWN_EXTENSION 129
+# define X509V3_R_UNKNOWN_EXTENSION_NAME 130
+# define X509V3_R_UNKNOWN_OPTION 120
+# define X509V3_R_UNSUPPORTED_OPTION 117
+# define X509V3_R_UNSUPPORTED_TYPE 167
+# define X509V3_R_USER_TOO_LONG 132
+
+#ifdef __cplusplus
+}
+#endif
+#endif

v0.5.2.tar.gz/generate_installer.bat -> v0.6.1.tar.gz/generate_installer.bat Changed

@@ -37,23 +37,29 @@
 if not exist include/gpac/revision.h echo   version couldn't be found - check include/gpac/revision.h exists
 if not exist include/gpac/revision.h goto Abort
 
-REM execute svnversion and check if the result if found within revision.h
-for /f "delims=" %%i in ('svnversion.exe') do Set VarRevisionSVN=%%i
-REM 'M', 'S', 'P', ':' are special 'svnversion' results
-for /f "delims=" %%i in ('echo %VarRevisionSVN% ^| findstr /i /r M^"') do goto RevisionAbort
-for /f "delims=" %%i in ('echo %VarRevisionSVN% ^| findstr /i /r S^"') do goto RevisionAbort
-for /f "delims=" %%i in ('echo %VarRevisionSVN% ^| findstr /i /r P^"') do goto RevisionAbort
-for /f "delims=" %%i in ('echo %VarRevisionSVN% ^| findstr /i /r :^"') do goto RevisionAbort
-for /f "delims=" %%i in ('type include\gpac\revision.h ^| findstr /i /r "%VarRevisionSVN%"') do Set VarRevisionBuild=%%i
+REM check if found a local commit which has not been pushed
+for /f "delims=" %%a in ('git diff  master..origin/master') do @set diff=%%a
+echo diff = %diff%
+if "%diff"=="" goto RevisionAbort
+
+REM execute git and check if the result if found within revision.h
+for /f "delims=" %%a in ('git describe --tags --long') do @set VERSION=%%a
+for /f "delims=" %%a in ('git describe --tags --abbrev^=0') do @set TAG=%%a-
+for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set BRANCH=%%a
+REM remove anotated tag from VERSION
+setlocal enabledelayedexpansion
+call set VERSION=%%VERSION:!TAG!=%%
+setlocal disabledelayedexpansion
+SET VarRevisionGIT=%VERSION%-%BRANCH%
+for /f "delims=" %%i in ('type include\gpac\revision.h ^| findstr /i /r "%VarRevisionGIT%"') do Set VarRevisionBuild=%%i
 echo VarRevisionBuild = %VarRevisionBuild%
-echo VarRevisionSVN   = %VarRevisionSVN%
-if !"%VarRevisionBuild%"==!"%VarRevisionSVN%" echo   local revision and last build revision are not congruent - please consider rebuilding before generating an installer
-if !"%VarRevisionBuild%"==!"%VarRevisionSVN%" goto Abort
-REM echo   version found: %VarRevisionSVN%
+echo VarRevisionGIT  = %VarRevisionGIT%
+if !"%VarRevisionBuild%"==!"%VarRevisionGIT%" echo   local revision and last build revision are not congruent - please consider rebuilding before generating an installer
+if !"%VarRevisionBuild%"==!"%VarRevisionGIT%" goto Abort
 
 move packagers\win32_64\nsis\default.out packagers\win32_64\nsis\default.out_
-echo Name "GPAC Framework ${GPAC_VERSION} for %1 revision %VarRevisionSVN%" > packagers\win32_64\nsis\default.out
-echo OutFile "GPAC.Framework.Setup-${GPAC_VERSION}-rev%VarRevisionSVN%-%1.exe" >> packagers\win32_64\nsis\default.out
+echo Name "GPAC Framework ${GPAC_VERSION} for %1 revision %VarRevisionGIT%" > packagers\win32_64\nsis\default.out
+echo OutFile "gpac-${GPAC_VERSION}-rev%VarRevisionGIT%-%1.exe" >> packagers\win32_64\nsis\default.out
 IF "%1"=="x64" echo !define IS_WIN64 >> packagers\win32_64\nsis\default.out
 
 echo:
@@ -75,20 +81,20 @@
 echo Windows GPAC installer generated - goodbye!
 REM ============================================
 REM LeaveBatchSuccess
-set VarRevisionSVN=
+set VarRevisionGIT=
 set VarRevisionBuild=
 cd /d %OLDDIR%
 exit/b 0
 
 :RevisionAbort
-echo   SVN revision "%VarRevisionSVN%" is not a simple number, you may have local modification (please check 'svnrevision' flags meaning or execute the NSIS script manually)
+echo Local revision and remote revision are not congruent; you may have local commit
+echo Please consider pushing your commit before generating an installer
 
 :Abort
 echo:
 echo  *** ABORTING: CHECK ERROR MESSAGES ABOVE ***
 
 REM LeaveBatchError 
-set VarRevisionSVN=
 set VarRevisionBuild=
 cd /d %OLDDIR%
 exit/b 1

v0.5.2.tar.gz/gpac.spec -> v0.6.1.tar.gz/gpac.spec Changed

v0.5.2.tar.gz/gui/extensions/H2B2VS/h2b2vs.js -> v0.6.1.tar.gz/gui/extensions/H2B2VS/h2b2vs.js Changed

@@ -1,285 +1,462 @@
-extension = {
- setup: false,
- dialog: null,
- active_addon: null,
-
- ext_filter_event: function (evt) {
- switch (evt.type) {
- case GF_EVENT_ADDON_DETECTED:
- this.confirm_addon(evt);
- return true;
- case GF_EVENT_QUIT:
- this.save_session();
- return false;
- default:
- return false;
- }
- },
-
- create_event_filter: function (__anobj) {
- return function (evt) {
- __anobj.ext_filter_event(evt);
- }
- },
-
- start: function () {
- //first launch - register event filter and exit
- if (!this.setup) {
- gwlib_add_event_filter(this.create_event_filter(this));
- this.setup = true;
-
- this.restore_session();
- return;
- }
-
- gw_hide_dock();
- var wnd = gw_new_window_full(null, true, 'H2B2VS Preferences');
-
- this.dialog = wnd;
- this.dialog.extension = this;
-
- wnd.area = gw_new_grid_container(wnd);
- wnd.area.spread_h = true;
- wnd.area.break_at_hidden = true;
-
- wnd.txt1 = gw_new_text(wnd.area, 'Overlay Position');
- gw_new_separator(wnd.area);
-
-
- wnd.check_pos = function (value) {
- this.chk_pos1.set_checked((value == 0) ? true : false);
- this.chk_pos2.set_checked((value == 1) ? true : false);
- this.chk_pos3.set_checked((value == 2) ? true : false);
- this.chk_pos4.set_checked((value == 3) ? true : false);
-
- this.extension.set_option('OverlayPosition', '' + value);
- this.extension.refresh_addon();
- }
- wnd.chk_pos4 = gw_new_checkbox(wnd.area, 'Top-Left');
- wnd.chk_pos4.on_check = function (value) {
- this.parent.parent.check_pos(3);
- }
- wnd.chk_pos2 = gw_new_checkbox(wnd.area, 'Top-Right');
- wnd.chk_pos2.on_check = function (value) {
- this.parent.parent.check_pos(1);
- }
- wnd.chk_pos3 = gw_new_checkbox(wnd.area, 'Bottom-Left');
- wnd.chk_pos3.on_check = function (value) {
- this.parent.parent.check_pos(2);
- }
- wnd.chk_pos1 = gw_new_checkbox(wnd.area, 'Bottom-Right');
- wnd.chk_pos1.on_check = function (value) {
- this.parent.parent.check_pos(0);
- }
-
- wnd.txt2 = gw_new_text(wnd.area, 'Overlay Size');
- gw_new_separator(wnd.area);
-
-
- wnd.check_size = function (value) {
- this.chk_size1.set_checked((value == 0) ? true : false);
- this.chk_size2.set_checked((value == 1) ? true : false);
- this.chk_size3.set_checked((value == 2) ? true : false);
- this.extension.set_option('OverlaySize', '' + value);
- this.extension.refresh_addon();
- }
- wnd.chk_size1 = gw_new_checkbox(wnd.area, '1/2 Height');
- wnd.chk_size1.on_check = function (value) {
- this.parent.parent.check_size(0);
- }
- wnd.chk_size2 = gw_new_checkbox(wnd.area, '1/3 Height');
- wnd.chk_size2.on_check = function (value) {
- this.parent.parent.check_size(1);
- }
- wnd.chk_size3 = gw_new_checkbox(wnd.area, '1/4 Height');
- wnd.chk_size3.on_check = function (value) {
- this.parent.parent.check_size(2);
- }
-
- wnd.txt3 = gw_new_text(wnd.area, 'User Identifier');
- gw_new_separator(wnd.area);
- wnd.edit = gw_new_text_edit(wnd.area, this.get_option('UserID', 'H2B2VSUser'));
- gpac.set_focus(wnd.edit);
- wnd.edit.on_text = function (val) {
- if (val != '') {
- this.parent.parent.extension.set_option('UserID', val);
- }
- }
-
- gw_new_separator(wnd.area);
- wnd.chk_addon = gw_new_checkbox(wnd.area, 'Auto-select addon');
- wnd.chk_addon.on_check = function (value) {
- this.parent.parent.extension.set_option('AutoSelect', value ? 'yes' : 'no');
- }
- var do_sel = this.get_option('AutoSelect', 'no');
- wnd.chk_addon.set_checked((do_sel == 'yes') ? true : false);
-
- wnd.dbg_addon = gw_new_checkbox(wnd.area, 'Debug PVR addon');
- wnd.dbg_addon.on_check = function (value) {
- gpac.set_option('Systems', 'DebugPVRScene', value ? 'yes' : 'no');
- }
- do_sel = gpac.get_option('Systems', 'DebugPVRScene');
- wnd.dbg_addon.set_checked((do_sel == 'yes') ? true : false);
-
-
- wnd.on_display_size = function (width, height) {
- w = 0.9 * width;
- if (w > 500) w = 500;
- this.txt1.set_size(w / 3, gwskin.default_icon_height);
-
- this.chk_pos1.set_size(w / 2, gwskin.default_control_height);
- this.chk_pos2.set_size(w / 2, gwskin.default_control_height);
- this.chk_pos3.set_size(w / 2, gwskin.default_control_height);
- this.chk_pos4.set_size(w / 2, gwskin.default_control_height);
-
- this.txt2.set_size(w / 3, gwskin.default_icon_height);
-
- this.chk_size1.set_size(w / 3, gwskin.default_control_height);
- this.chk_size2.set_size(w / 3, gwskin.default_control_height);
- this.chk_size3.set_size(w / 3, gwskin.default_control_height);
-
- this.txt3.set_size(w / 3, gwskin.default_icon_height);
- this.edit.set_size(w / 2, gwskin.default_icon_height);
- this.chk_addon.set_size(w / 2, gwskin.default_icon_height);
- this.dbg_addon.set_size(w / 2, gwskin.default_icon_height);
-
- this.set_size(w, 12 * gwskin.default_icon_height);
- }
-
- wnd.check_pos(parseInt(this.get_option('OverlayPosition', '0')));
- wnd.check_size(parseInt(this.get_option('OverlaySize', '0')));
-
-
- wnd.on_display_size(gw_display_width, gw_display_height);
- wnd.set_alpha(0.9);
- wnd.show();
-
-
- wnd.on_close = function () {
- gw_show_dock();
- wnd.extension.dialog = null;
- };
- },
-
- refresh_addon: function () {
- if (this.active_url) {
- var odm = gpac.get_object_manager(this.active_url);
- if (odm) {
- odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
- }
- }
- },
-
- do_activate_addon: function (obj) {
- var odm = gpac.get_object_manager(obj.scene_url);
- if (odm) {
- odm.enable_addon(obj.addon_url);
- odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
- }
- this.active_url = obj.scene_url;
- },
-
- confirm_addon: function (evt) {
-
- if (this.get_option('AutoSelect', 'no') == 'yes') {
- this.do_activate_addon(evt);
- return;
- }
-
- var names = ext = evt.addon_url.split('/');
- if (names.length == 0) names = f.url.split('\\');
-
- var dlg = gw_new_confirm_wnd(null, 'Addon detected (' + names.pop() + '), enable it ?');
- dlg.set_alpha(0.95);
- dlg.show();
- dlg.extension = this;
- dlg.scene_url = evt.scene_url;
- dlg.addon_url = evt.addon_url;
-
- dlg.on_confirm = function (value) {
- if (!value) return;
- this.extension.do_activate_addon(this);
- }
- },
-
- do_xhr: function (url, cmd) {
- var xhr = new XMLHttpRequest();
- xhr.open('POST', url, false);
-
- xhr.setRequestHeader('Content-Type', 'application/json');
- xhr.setRequestHeader('Content-Length', cmd.length);
- xhr.send(cmd);
-
- if ((xhr.status != 200) || (xhr.readyState != 4)) {
- if (xhr.status) {
- gwlog(l_err, '[H2B2VS] Failed to query server: ' + xhr.responseText);
- } else {
- gwlog(l_err, '[H2B2VS] Failed to send request');
- }
- return null;
- }
- gwlog(l_deb, 'Command sent is ' + cmd + ' - response is ' + xhr.responseText);
-
- var obj = gwskin.parse(xhr.responseText);
- if (typeof obj.result == 'undefined') {
- gwlog(l_err, '[H2B2VS] Non conformant response object ' + xhr.responseText);
- return null;
- }
- if (obj.result != 0) {
- gwlog(l_inf, '[H2B2VS] No session found for user - ' + xhr.responseText);
- return null;
- }
- return obj;
- },
-
- restore_session: function () {
-
- if (gwskin.media_url) {
- gwlog(l_inf, 'URL was given when opening, skipping session restore');
- return;
- }
- var server = this.get_option('SessionServer', null);
- var user = this.get_option('UserID', null);
- if (!server || !user) return;
-
- var url = server + 'getData';
- var cmd = 'ID=' + user;
-
- var obj = this.do_xhr(url, cmd);
- if (!obj) return;
-
- var dlg = gw_new_confirm_wnd(null, 'Restore last session ?');
- dlg.set_alpha(0.95);
- dlg.show();
- dlg.sess = obj.data;
-
- dlg.on_confirm = function (value) {
- if (!value) return;
- gwskin.restore_session(this.sess.url, this.sess.media_time, this.sess.media_clock);
- }
- },
-
- save_session: function () {
- var server = this.get_option('SessionServer', null);
- var user = this.get_option('UserID', null);
- if (!server || !user) return;
-
- var obj = {};
- var url = gwskin.pvr_url;
- if (url === '') url = gwskin.media_url;
-
- obj.url = url.replace(/\\/g, "/");
- obj.media_time = 0;
- obj.media_clock = 0;
- if (typeof gwskin.media_time != 'undefined') obj.media_time = gwskin.media_time;
- if (typeof gwskin.media_clock != 'undefined') obj.media_clock = gwskin.media_clock;
-
- var str = gwskin.stringify(obj);
-
- var url = server + 'setData';
- var cmd = 'ID=' + user + '&Data=' + str;
- this.do_xhr(url, cmd);
-
- }
+extension = {
+ setup: false,
+ dialog: null,
+ uhd_demo_enabled: false,
+ uhd_demo_on: false,
+ uhd_state_on: true,
+ addon_url: null,
+ scene_url: null,
+ overlay_position: 0,
+ icon_width: 0,
+ icon_height: 0,
+ movie_width: 0,
+ movie_height: 0,
+ disable_save_session: false,
+ disable_addons: false,
+
+ toggle_uhd_demo: function (val) {
+ this.uhd_demo_on = val;
+ var notif = null;
+ if (this.uhd_demo_on) {
+ notif = gw_new_message(null, 'UHD Demo Enbaled', 'Click to toggle quality');
+ } else {
+ notif = gw_new_message(null, 'UHD Demo Disabled', 'Double-click to re-enable');
+ this.logo.children[0].url[0] = '';
+ }
+ this.do_layout();
+ notif.set_size(20 * gwskin.default_text_font_size, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+ notif.show();
+ },
+
+ ext_filter_event: function (evt) {
+ switch (evt.type) {
+ case GF_EVENT_ADDON_DETECTED:
+ this.confirm_addon(evt);
+ return true;
+ case GF_EVENT_QUIT:
+ this.save_session();
+ return false;
+ case GF_EVENT_DBLCLICK:
+ if (this.uhd_demo_enabled) {
+ this.toggle_uhd_demo(!this.uhd_demo_on);
+ }
+ return false;
+ case GF_EVENT_MOUSEUP:
+ if (this.uhd_demo_on) {
+ this.uhd_state_on = !this.uhd_state_on;
+ gpac.switch_quality(this.uhd_state_on);
+ return true;
+ }
+ return false;
+
+ case GF_EVENT_MOUSEDOWN:
+ if (this.uhd_demo_on) {
+ return true;
+ }
+ return false;
+
+ case GF_EVENT_SCENE_SIZE:
+ if (typeof evt.width != 'undefined') {
+ this.movie_width = evt.width;
+ this.movie_height = evt.height;
+ if (this.movie_height > 1080) this.uhd_state_on = true;
+
+ if (this.uhd_demo_on) {
+ this.do_layout();
+ }
+ }
+ return false;
+ case GF_EVENT_KEYDOWN:
+ //alert('key is '+evt.keycode + ' hw code is ' + evt.hwkey);
+
+ var odm = gpac.get_object_manager(this.scene_url);
+ if (!odm || odm.main_addon_url) return false;
+
+ if (evt.keycode == 'F7') {
+ this.uhd_state_on = !this.uhd_state_on;
+ gpac.switch_quality(this.uhd_state_on);
+ return true;
+ }
+
+ if (evt.keycode == 'F6') {
+ this.overlay_position++;
+ if (this.overlay_position == 4) {
+ this.do_deactivate_addon();
+
+ } else {
+ if (this.overlay_position == 5) {
+ this.do_activate_addon();
+ this.overlay_position = 0;
+ }
+ this.set_option('OverlayPosition', '' + this.overlay_position);
+ this.refresh_addon();
+ }
+ return true;
+ }
+/*
+ if (evt.keycode == 'F12') {
+ gpac.exit();
+ return true;
+ }
+*/
+ return false;
+			case GF_JS_EVENT_PLAYBACK:
+				//whenever paused, store pause time
+				if (! evt.is_playing) {
+					this.save_session();
+				}
+				return false;
+				
+ default:
+ return false;
+ }
+ },
+
+ create_event_filter: function (__anobj) {
+ return function (evt) {
+ return __anobj.ext_filter_event(evt);
+ }
+ },
+
+ do_layout: function () {
+ if (this.uhd_demo_enabled && this.uhd_demo_on) {
+ var url = this.get_option('path');
+ if (this.movie_height > 1080) {
+ url += 'logo_uhd.png';
+ this.logo.scale.x = 1;
+ this.logo.scale.y = 1;
+ } else {
+ url += 'logo_hd.png';
+ this.logo.scale.x = 2;
+ this.logo.scale.y = 2;
+ }
+ this.logo.children[0].url[0] = url;
+ } else {
+ this.logo.children[0].url[0] = '';
+ }
+ },
+
+ start: function () {
+ //first launch - register event filter and exit
+ if (!this.setup) {
+ gwlib_add_event_filter(this.create_event_filter(this), true);
+ this.setup = true;
+
+ this.overlay_position = parseInt(this.get_option('OverlayPosition', '0'));
+
+ /*create media nodes element for playback*/
+ this.logo = gw_new_container();
+ this.logo.children[0] = new SFNode('Inline');
+ this.logo.children[0].extension = this;
+ this.logo.children[0].url[0] = '';
+ this.logo.children[0].on_scene_size = function (evt) {
+ this.extension.icon_width = evt.width;
+ this.extension.icon_height = evt.height;
+ this.extension.do_layout();
+ };
+
+ gw_add_child(null, this.logo);
+
+ this.logo.children[0].addEventListener('gpac_scene_attached', this.logo.children[0].on_scene_size, 0);
+
+ this.restore_session();
+
+ //check our args
+ var i, argc = gpac.argc;
+ for (i = 1; i < argc; i++) {
+ var arg = gpac.get_arg(i);
+ if (arg == '-demo-uhd') {
+ this.uhd_demo_enabled = true;
+ this.toggle_uhd_demo(true);
+ gwlog(l_war, 'UHD Demo enabled');
+ }
+ else if (arg == '-no-addon') {
+ this.disable_addons = true;
+ }
+ }
+ return;
+ }
+
+ gw_hide_dock();
+ var wnd = gw_new_window_full(null, true, 'H2B2VS Preferences');
+
+ this.dialog = wnd;
+ this.dialog.extension = this;
+
+ wnd.area = gw_new_grid_container(wnd);
+ wnd.area.spread_h = true;
+ wnd.area.break_at_hidden = true;
+
+ wnd.txt1 = gw_new_text(wnd.area, 'Overlay Position');
+ gw_new_separator(wnd.area);
+
+
+ wnd.check_pos = function (value) {
+ this.chk_pos1.set_checked((value == 0) ? true : false);
+ this.chk_pos2.set_checked((value == 1) ? true : false);
+ this.chk_pos3.set_checked((value == 2) ? true : false);
+ this.chk_pos4.set_checked((value == 3) ? true : false);
+
+ this.extension.set_option('OverlayPosition', '' + value);
+ this.extension.refresh_addon();
+ }
+ wnd.chk_pos4 = gw_new_checkbox(wnd.area, 'Top-Left');
+ wnd.chk_pos4.on_check = function (value) {
+ this.parent.parent.check_pos(3);
+ }
+ wnd.chk_pos2 = gw_new_checkbox(wnd.area, 'Top-Right');
+ wnd.chk_pos2.on_check = function (value) {
+ this.parent.parent.check_pos(1);
+ }
+ wnd.chk_pos3 = gw_new_checkbox(wnd.area, 'Bottom-Left');
+ wnd.chk_pos3.on_check = function (value) {
+ this.parent.parent.check_pos(2);
+ }
+ wnd.chk_pos1 = gw_new_checkbox(wnd.area, 'Bottom-Right');
+ wnd.chk_pos1.on_check = function (value) {
+ this.parent.parent.check_pos(0);
+ }
+
+ wnd.txt2 = gw_new_text(wnd.area, 'Overlay Size');
+ gw_new_separator(wnd.area);
+
+
+ wnd.check_size = function (value) {
+ this.chk_size1.set_checked((value == 0) ? true : false);
+ this.chk_size2.set_checked((value == 1) ? true : false);
+ this.chk_size3.set_checked((value == 2) ? true : false);
+ this.extension.set_option('OverlaySize', '' + value);
+ this.extension.refresh_addon();
+ }
+ wnd.chk_size1 = gw_new_checkbox(wnd.area, '1/2 Height');
+ wnd.chk_size1.on_check = function (value) {
+ this.parent.parent.check_size(0);
+ }
+ wnd.chk_size2 = gw_new_checkbox(wnd.area, '1/3 Height');
+ wnd.chk_size2.on_check = function (value) {
+ this.parent.parent.check_size(1);
+ }
+ wnd.chk_size3 = gw_new_checkbox(wnd.area, '1/4 Height');
+ wnd.chk_size3.on_check = function (value) {
+ this.parent.parent.check_size(2);
+ }
+
+ wnd.txt3 = gw_new_text(wnd.area, 'User Identifier');
+ gw_new_separator(wnd.area);
+ wnd.edit = gw_new_text_edit(wnd.area, this.get_option('UserID', 'H2B2VSUser'));
+ gpac.set_focus(wnd.edit);
+ wnd.edit.on_text = function (val) {
+ if (val != '') {
+ this.parent.parent.extension.set_option('UserID', val);
+ }
+ }
+
+ gw_new_separator(wnd.area);
+ wnd.chk_addon = gw_new_checkbox(wnd.area, 'Auto-select addon');
+ wnd.chk_addon.on_check = function (value) {
+ this.parent.parent.extension.set_option('AutoSelect', value ? 'yes' : 'no');
+ }
+ var do_sel = this.get_option('AutoSelect', 'no');
+ wnd.chk_addon.set_checked((do_sel == 'yes') ? true : false);
+
+ wnd.dbg_addon = gw_new_checkbox(wnd.area, 'Debug PVR addon');
+ wnd.dbg_addon.on_check = function (value) {
+ gpac.set_option('Systems', 'DebugPVRScene', value ? 'yes' : 'no');
+ }
+ do_sel = gpac.get_option('Systems', 'DebugPVRScene');
+ wnd.dbg_addon.set_checked((do_sel == 'yes') ? true : false);
+
+ gw_new_separator(wnd.area);
+ wnd.uhd_demo = gw_new_checkbox(wnd.area, 'UHD Demo');
+ wnd.uhd_demo.on_check = function (value) {
+ this.parent.parent.extension.uhd_demo_enabled = value;
+ this.parent.parent.extension.set_option('UHDDemo', value ? 'yes' : 'no');
+ }
+ do_sel = this.get_option('UHDDemo', 'no');
+ this.uhd_demo_enabled = (do_sel == 'yes') ? true : false;
+ wnd.uhd_demo.set_checked(this.uhd_demo_enabled);
+ if (this.uhd_demo_enabled) this.uhd_demo_on = true;
+
+ wnd.on_display_size = function (width, height) {
+ w = 0.9 * width;
+ if (w > 500) w = 500;
+ this.txt1.set_size(w / 3, gwskin.default_icon_height);
+
+ this.chk_pos1.set_size(w / 2, gwskin.default_control_height);
+ this.chk_pos2.set_size(w / 2, gwskin.default_control_height);
+ this.chk_pos3.set_size(w / 2, gwskin.default_control_height);
+ this.chk_pos4.set_size(w / 2, gwskin.default_control_height);
+
+ this.txt2.set_size(w / 3, gwskin.default_icon_height);
+
+ this.chk_size1.set_size(w / 3, gwskin.default_control_height);
+ this.chk_size2.set_size(w / 3, gwskin.default_control_height);
+ this.chk_size3.set_size(w / 3, gwskin.default_control_height);
+
+ this.txt3.set_size(w / 3, gwskin.default_icon_height);
+ this.edit.set_size(w / 2, gwskin.default_icon_height);
+ this.chk_addon.set_size(w / 2, gwskin.default_icon_height);
+ this.dbg_addon.set_size(w / 2, gwskin.default_icon_height);
+ this.uhd_demo.set_size(w / 2, gwskin.default_icon_height);
+
+ this.set_size(w, 13 * gwskin.default_icon_height);
+ }
+
+ wnd.check_pos(this.overlay_position);
+ wnd.check_size(parseInt(this.get_option('OverlaySize', '0')));
+
+
+ wnd.on_display_size(gw_display_width, gw_display_height);
+ wnd.set_alpha(0.9);
+ wnd.show();
+
+
+ wnd.on_close = function () {
+ gw_show_dock();
+ wnd.extension.dialog = null;
+ };
+ },
+
+ refresh_addon: function () {
+ if (this.scene_url) {
+ var odm = gpac.get_object_manager(this.scene_url);
+ if (odm) {
+ odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
+ }
+ }
+ },
+
+ do_activate_addon: function () {
+ var odm = gpac.get_object_manager(this.scene_url);
+ if (odm) {
+ odm.enable_addon(this.addon_url);
+ odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
+ }
+ },
+
+ do_deactivate_addon: function () {
+ var odm = gpac.get_object_manager(this.scene_url);
+ if (odm) {
+ odm.enable_addon(this.addon_url, true);
+ }
+ },
+
+
+ confirm_addon: function (evt) {
+
+ if (this.disable_addons) return;
+
+ if (this.get_option('AutoSelect', 'no') == 'yes') {
+ this.scene_url = evt.scene_url;
+ this.addon_url = evt.addon_url;
+ this.do_activate_addon();
+ return;
+ }
+
+ var names = ext = evt.addon_url.split('/');
+ if (names.length == 0) names = f.url.split('\\');
+
+ var dlg = gw_new_confirm_wnd(null, 'Addon detected (' + names.pop() + '), enable it ?');
+ dlg.set_alpha(0.95);
+ dlg.show();
+ dlg.extension = this;
+ dlg.scene_url = evt.scene_url;
+ dlg.addon_url = evt.addon_url;
+
+ dlg.on_confirm = function (value) {
+ if (!value) return;
+ this.extension.scene_url = evt.scene_url;
+ this.extension.addon_url = evt.addon_url;
+ this.extension.do_activate_addon();
+ }
+ },
+
+ do_xhr: function (url, cmd) {
+ var xhr = new XMLHttpRequest();
+ xhr.open('POST', url, false);
+
+ xhr.setRequestHeader('Content-Type', 'application/json');
+ xhr.setRequestHeader('Content-Length', cmd.length);
+ xhr.send(cmd);
+
+ if ((xhr.status != 200) || (xhr.readyState != 4)) {
+ if (xhr.status) {
+ gwlog(l_err, '[H2B2VS] Failed to query server: ' + xhr.responseText);
+ } else {
+ gwlog(l_err, '[H2B2VS] Failed to send request');
+ }
+ return null;
+ }
+ gwlog(l_deb, 'Command sent is ' + cmd + ' - response is ' + xhr.responseText);
+
+ var obj = gwskin.parse(xhr.responseText);
+ if (typeof obj.result == 'undefined') {
+ gwlog(l_err, '[H2B2VS] Non conformant response object ' + xhr.responseText);
+ return null;
+ }
+ if (obj.result != 0) {
+ gwlog(l_inf, '[H2B2VS] No session found for user - ' + xhr.responseText);
+ return null;
+ }
+ return obj;
+ },
+
+ restore_session: function () {
+
+ if (gwskin.media_url) {
+ gwlog(l_inf, 'URL was given when opening, skipping session restore');
+ return;
+ }
+ //this.disable_save_session = true;
+
+ var server = this.get_option('SessionServer', null);
+ var user = this.get_option('UserID', null);
+ if (!server || !user) return;
+
+ var url = server + 'getData';
+ var cmd = 'ID=' + user;
+
+ var obj = this.do_xhr(url, cmd);
+ if (!obj || !obj.data || !obj.data.url || (obj.data.url== '') ) return;
+
+ var dlg = gw_new_confirm_wnd(null, 'Restore last session ?');
+ dlg.set_alpha(0.95);
+ dlg.show();
+ dlg.sess = obj.data;
+
+ gwlog(l_deb, 'H2B2VS state to restore: ' + gwskin.stringify(obj.data));
+
+ dlg.on_confirm = function (value) {
+ if (!value) return;
+ gwskin.restore_session(this.sess.url, this.sess.media_time, this.sess.media_clock);
+ }
+ },
+
+ save_session: function () {
+
+ if (this.disable_save_session) return;
+
+ var obj = {};
+ var url = gwskin.pvr_url;
+ if (url === '') url = gwskin.media_url;
+
+ obj.url = url.replace(/\\/g, "/");
+ obj.media_time = 0;
+ obj.media_clock = 0;
+ if (typeof gwskin.media_time != 'undefined') obj.media_time = gwskin.media_time;
+ if (typeof gwskin.media_clock != 'undefined') obj.media_clock = gwskin.media_clock;
+
+ var str = gwskin.stringify(obj);
+ gwlog(l_deb, 'H2B2VS storing state: ' + str);
+
+		var server = this.get_option('SessionServer', null);
+		var user = this.get_option('UserID', null);
+		if (!server || !user) return;
+
+		var url = server + 'setData';
+ var cmd = 'ID=' + user + '&Data=' + str;
+ this.do_xhr(url, cmd);
+
+ }
 };

v0.5.2.tar.gz/gui/extensions/H2B2VS/init.js -> v0.6.1.tar.gz/gui/extensions/H2B2VS/init.js Changed

v0.6.1.tar.gz/gui/extensions/H2B2VS/logo_hd.png Added

v0.6.1.tar.gz/gui/extensions/H2B2VS/logo_uhd.png Added

v0.6.1.tar.gz/gui/extensions/bifs_tests Added

v0.6.1.tar.gz/gui/extensions/bifs_tests/applications-other.svg Added

@@ -0,0 +1,204 @@
+<?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: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="32"
+ height="32"
+ id="svg53383"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docbase="/home/lapo/Desktop/tango-icon-theme/32x32/categories"
+ sodipodi:docname="applications-other.svg"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 16 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="32 : 16 : 1"
+ inkscape:persp3d-origin="16 : 10.666667 : 1"
+ id="perspective27" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient9662">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop9664" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop9666" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9649">
+ <stop
+ style="stop-color:#fcaf3e;stop-opacity:1;"
+ offset="0"
+ id="stop9651" />
+ <stop
+ style="stop-color:#d37f03;stop-opacity:1;"
+ offset="1"
+ id="stop9653" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2300">
+ <stop
+ id="stop2302"
+ offset="0.0000000"
+ style="stop-color:#000000;stop-opacity:0.32673267;" />
+ <stop
+ id="stop2304"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2300"
+ id="radialGradient2810"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+ cx="14.287618"
+ cy="68.872971"
+ fx="14.287618"
+ fy="72.568001"
+ r="11.68987" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9662"
+ id="linearGradient2837"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.626086,0,0,0.626086,1.294987,0.921108)"
+ x1="26.502604"
+ y1="10.027484"
+ x2="28.786495"
+ y2="52.807446" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9649"
+ id="radialGradient2842"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.127528,0,0,1.128837,-10.90078,-17.17678)"
+ cx="24.285801"
+ cy="36.720772"
+ fx="24.285801"
+ fy="36.720772"
+ r="20.410614" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:showpageshadow="false"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="-135.88345"
+ inkscape:cy="-1.9952676"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1034"
+ inkscape:window-height="697"
+ inkscape:window-x="236"
+ inkscape:window-y="151"
+ width="32px"
+ height="32px"
+ showborder="false"
+ showguides="false"
+ inkscape:guide-bbox="true">
+ <sodipodi:guide
+ orientation="vertical"
+ position="2.5"
+ id="guide2073" />
+ <sodipodi:guide
+ orientation="horizontal"
+ position="34"
+ id="guide2075" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4">
+ <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>Other applications</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz/</dc:source>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>category</rdf:li>
+ <rdf:li>applications</rdf:li>
+ <rdf:li>other</rdf:li>
+ <rdf:li>unspecified</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="shadow"
+ id="layer2"
+ inkscape:groupmode="layer" />
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ transform="matrix(0.79092,0,0,0.790922,-3.026476,-5.196462)"
+ d="M 44.285715 38.714287 A 19.928572 9.837245 0 1 1 4.4285717,38.714287 A 19.928572 9.837245 0 1 1 44.285715 38.714287 z"
+ sodipodi:ry="9.837245"
+ sodipodi:rx="19.928572"
+ sodipodi:cy="38.714287"
+ sodipodi:cx="24.357143"
+ id="path1538"
+ style="color:black;fill:url(#radialGradient2810);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ style="fill:url(#radialGradient2842);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 16.48213,28.505538 L 3.4894131,15.497734 L 16.48213,2.4899315 L 29.474847,15.497734 L 16.48213,28.505538 L 16.48213,28.505538 z "
+ id="path53304" />
+ <path
+ style="opacity:0.5;fill:white;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+ d="M 13.25 5.71875 L 11 8 C 11.364233 9.2741624 11.5625 10.616828 11.5625 12 C 11.5625 15.258084 10.495099 18.260005 8.6875 20.6875 L 10.71875 22.71875 C 11.140628 22.175525 11.547154 21.62365 11.90625 21.03125 L 14.03125 21.71875 C 14.337904 21.182347 14.619099 20.628928 14.875 20.0625 L 13.0625 18.75 C 13.440442 17.853671 13.743844 16.934237 13.96875 15.96875 L 16.1875 15.96875 C 16.311671 15.366484 16.401143 14.745863 16.46875 14.125 L 14.375 13.46875 C 14.415293 12.984457 14.4375 12.49456 14.4375 12 C 14.4375 11.505247 14.415293 11.015543 14.375 10.53125 L 16.46875 9.84375 C 16.401143 9.222499 16.311866 8.602267 16.1875 8 L 13.96875 8 C 13.784885 7.2106963 13.536627 6.4590339 13.25 5.71875 z M 24 15.625 C 23.55871 15.673235 23.14647 15.755415 22.71875 15.84375 L 22.71875 17.40625 C 22.032991 17.565873 21.3555 17.794008 20.71875 18.0625 L 19.8125 16.78125 C 19.41015 16.963344 19.00566 17.157069 18.625 17.375 L 19.125 18.875 C 18.527769 19.23725 17.963248 19.639097 17.4375 20.09375 L 16.15625 19.1875 C 15.830612 19.484081 15.515137 19.799362 15.21875 20.125 L 16.15625 21.375 C 15.701403 21.900748 15.29975 22.464882 14.9375 23.0625 L 13.4375 22.5625 C 13.219569 22.943348 13.025456 23.347844 12.84375 23.75 L 14.125 24.6875 C 13.977998 25.036128 13.836894 25.390754 13.71875 25.75 L 16.46875 28.5 L 28.375 16.59375 L 28.375 15.84375 C 27.94727 15.755415 27.50359 15.673235 27.0625 15.625 L 26.59375 17.125 C 26.249709 17.096523 25.88285 17.09375 25.53125 17.09375 C 25.180041 17.09375 24.84405 17.09633 24.5 17.125 L 24 15.625 z "
+ id="path2065" />
+ <path
+ id="path9660"
+ d="M 16.499992,26.969649 L 5.030329,15.499988 L 16.499992,4.0303271 L 27.969654,15.499988 L 16.499992,26.969649 L 16.499992,26.969649 z "
+ style="opacity:0.47252748;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2837);stroke-width:0.99999964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f57900;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 16.48213,28.505538 L 3.489413,15.497734 L 16.48213,2.4899315 L 29.474847,15.497734 L 16.48213,28.505538 L 16.48213,28.505538 z "
+ id="path2844" />
+ </g>
+</svg>

v0.6.1.tar.gz/gui/extensions/bifs_tests/bifs_tests.js Added

@@ -0,0 +1,354 @@
+extension = {
+	source_url: 'http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/',
+
+	filter_event : function(evt) {
+		switch (evt.type) {
+		case GF_JS_EVENT_PLAYBACK:
+			this.set_option('SequenceIndex', ''+ evt.index);
+			return false;
+		default:
+			return false;
+		}
+	},
+	
+	create_event_filter : function (__anobj) {
+		return function (evt) {
+			return __anobj.filter_event(evt);
+		}
+	},
+	
+	_event_filter : null,
+
+	start: function () {
+		if (!this._event_filter) {
+			this._event_filter = this.create_event_filter(this);
+			gwlib_add_event_filter(this._event_filter);
+		}
+		var e = {};
+		e.type = GF_JS_EVENT_PLAYLIST_RESET;
+		gwlib_filter_event(e);
+
+		e.type = GF_JS_EVENT_PLAYLIST_ADD;
+		for (var i=0; i<this.sequences.length; i++) {
+			e.url = this.source_url + this.sequences[i];
+			gwlib_filter_event(e);
+		}
+		
+		var sequence_index = parseInt( this.get_option('SequenceIndex', '0') );
+		if (sequence_index >= this.sequences.length) sequence_index = 0;
+		else if (sequence_index < 0) sequence_index = 0;
+		
+		var msg = gw_new_message(null, 'Playlist Loaded', '');
+		msg.set_size(20 * gwskin.default_text_font_size, gwskin.default_icon_height + gwskin.default_text_font_size);
+		msg.set_alpha(0.8);
+		msg.show();
+
+		e.type = GF_JS_EVENT_PLAYLIST_PLAY;
+		e.index = sequence_index;
+		gwlib_filter_event(e);
+ },
+	
+	sequences : [
+
+				 'bifs-2D-background-background2D-bind.mp4',
+				 'bifs-2D-background-background2D-image.mp4',
+				 'bifs-2D-background-background2D-layer2D.mp4',
+				 'bifs-2D-background-background2D-movie.mp4',
+				 'bifs-2D-background-background2D-url-change.mp4',
+				 'bifs-2D-interactivity-discsensor.mp4',
+				 'bifs-2D-interactivity-htk-sensor.mp4',
+				 'bifs-2D-interactivity-keysensor.mp4',
+				 'bifs-2D-interactivity-mousesensor.mp4',
+				 'bifs-2D-interactivity-nested-sensors.mp4',
+				 'bifs-2D-interactivity-planesensor2D.mp4',
+				 'bifs-2D-interactivity-proximitysensor2D.mp4',
+				 'bifs-2D-interactivity-stringsensor.mp4',
+				 'bifs-2D-interactivity-touchsensor-4states.mp4',
+				 'bifs-2D-interactivity-touchsensor-hitpoint.mp4',
+				 'bifs-2D-interactivity-touchsensor-isactive-exposedfield.mp4',
+				 'bifs-2D-interactivity-touchsensor-isactive.mp4',
+				 'bifs-2D-interactivity-touchsensor-isover.mp4',
+				 'bifs-2D-interactivity-touchsensor-move_over.mp4',
+				 'bifs-2D-painting-colortransform-alpha.mp4',
+				 'bifs-2D-painting-colortransform-bitmap.mp4',
+				 'bifs-2D-painting-colortransform-color.mp4',
+				 'bifs-2D-painting-lineproperties.mp4',
+				 'bifs-2D-painting-material2D.mp4',
+				 'bifs-2D-painting-xlineproperties-cap.mp4',
+				 'bifs-2D-painting-xlineproperties-compositetexture2D.mp4',
+				 'bifs-2D-painting-xlineproperties-dash.mp4',
+				 'bifs-2D-painting-xlineproperties-imagetexture.mp4',
+				 'bifs-2D-painting-xlineproperties-join.mp4',
+				 'bifs-2D-painting-xlineproperties-lineargradient.mp4',
+				 'bifs-2D-painting-xlineproperties-radialgradient.mp4',
+				 'bifs-2D-painting-xlineproperties-scalable.mp4',
+				 'bifs-2D-painting-xlineproperties-transparent.mp4',
+				 'bifs-2D-positioning-clipper2D.mp4',
+				 'bifs-2D-positioning-form-align-center.mp4',
+				 'bifs-2D-positioning-form-align-horiz.mp4',
+				 'bifs-2D-positioning-form-align-vert.mp4',
+				 'bifs-2D-positioning-form-spread-horiz.mp4',
+				 'bifs-2D-positioning-form-spread-vert.mp4',
+				 'bifs-2D-positioning-layer2D.mp4',
+				 'bifs-2D-positioning-layer2d-in-layer2d.mp4',
+				 'bifs-2D-positioning-layout-horiz-ltr-nowrap.mp4',
+				 'bifs-2D-positioning-layout-horiz-ltr-wrap-btt.mp4',
+				 'bifs-2D-positioning-layout-horiz-ltr-wrap-ttb.mp4',
+				 'bifs-2D-positioning-layout-horiz-rtl-nowrap.mp4',
+				 'bifs-2D-positioning-layout-horiz-rtl-wrap-btt.mp4',
+				 'bifs-2D-positioning-layout-horiz-rtl-wrap-ttb.mp4',
+				 'bifs-2D-positioning-layout-horiz-text.mp4',
+				 'bifs-2D-positioning-layout-scroll-child.mp4',
+				 'bifs-2D-positioning-layout-scroll-full.mp4',
+				 'bifs-2D-positioning-layout-scroll-modes-horiz.mp4',
+				 'bifs-2D-positioning-layout-scroll-modes-vert.mp4',
+				 'bifs-2D-positioning-layout-scroll-on-off.mp4',
+				 'bifs-2D-positioning-layout-vert-btt-nowrap.mp4',
+				 'bifs-2D-positioning-layout-vert-btt-wrap-ltr.mp4',
+				 'bifs-2D-positioning-layout-vert-btt-wrap-rtl.mp4',
+				 'bifs-2D-positioning-layout-vert-ttb-nowrap.mp4',
+				 'bifs-2D-positioning-layout-vert-ttb-wrap-ltr.mp4',
+				 'bifs-2D-positioning-layout-vert-ttb-wrap-rtl.mp4',
+				 'bifs-2D-positioning-orderedgroup.mp4',
+				 'bifs-2D-positioning-pathlayout-graphics.mp4',
+				 'bifs-2D-positioning-pathlayout.mp4',
+				 'bifs-2D-positioning-transform2D.mp4',
+				 'bifs-2D-positioning-transformmatrix2D.mp4',
+				 'bifs-2D-shapes-all.mp4',
+				 'bifs-2D-shapes-indexfaceset2D.mp4',
+				 'bifs-2D-shapes-indexlineset2D.mp4',
+				 'bifs-2D-shapes-pointset2D.mp4',
+				 'bifs-2D-shapes-xcurve2D.mp4',
+				 'bifs-2D-texturing-compositetexture2D-background.mp4',
+				 'bifs-2D-texturing-compositetexture2D-bitmap.mp4',
+				 'bifs-2D-texturing-compositetexture2D-transparent.mp4',
+				 'bifs-2D-texturing-gradients-text.mp4',
+				 'bifs-2D-texturing-gradients-transparent.mp4',
+				 'bifs-2D-texturing-imagetexture-shapes.mp4',
+				 'bifs-2D-texturing-lineargradient-simple.mp4',
+				 'bifs-2D-texturing-lineargradient-spread.mp4',
+				 'bifs-2D-texturing-movietexture-shapes.mp4',
+				 'bifs-2D-texturing-pixeltexture.mp4',
+				 'bifs-2D-texturing-radialgradient-simple.mp4',
+				 'bifs-2D-texturing-radialgradient-spread.mp4',
+				 'bifs-2D-texturing-texturetransform-base.mp4',
+				 'bifs-2D-texturing-texturetransform-interact.mp4',
+				 'bifs-2D-texturing-texturetransform-transformmatrix2D.mp4',
+				 'bifs-2D-viewport-complete.mp4',
+				 'bifs-2D-viewport-simple.mp4',
+				 'bifs-3D-background-images.mp4',
+				 'bifs-3D-background.mp4',
+				 'bifs-3D-interactivity-collision-proxy.mp4',
+				 'bifs-3D-interactivity-collision.mp4',
+				 'bifs-3D-interactivity-cylindersensor.mp4',
+				 'bifs-3D-interactivity-planesensor.mp4',
+				 'bifs-3D-interactivity-proximitysensor.mp4',
+				 'bifs-3D-interactivity-spheresensor.mp4',
+				 'bifs-3D-interactivity-visibilitysensor.mp4',
+				 'bifs-3D-lighting-directionalLight.mp4',
+				 'bifs-3D-lighting-fog.mp4',
+				 'bifs-3D-lighting-pointlight.mp4',
+				 'bifs-3D-lighting-spotlight.mp4',
+				 'bifs-3D-positioning-billboard-viewer-alignment.mp4',
+				 'bifs-3D-positioning-billboard.mp4',
+				 'bifs-3D-positioning-gravity.mp4',
+				 'bifs-3D-positioning-layer3D-views.mp4',
+				 'bifs-3D-positioning-layer3D.mp4',
+				 'bifs-3D-positioning-lod.mp4',
+				 'bifs-3D-positioning-transform.mp4',
+				 'bifs-3D-shapes-box-transparent.mp4',
+				 'bifs-3D-shapes-box.mp4',
+				 'bifs-3D-shapes-cone.mp4',
+				 'bifs-3D-shapes-cylinder.mp4',
+				 'bifs-3D-shapes-elevationgrid.mp4',
+				 'bifs-3D-shapes-extrusion.mp4',
+				 'bifs-3D-shapes-indexedfaceset.mp4',
+				 'bifs-3D-shapes-indexedlineset.mp4',
+				 'bifs-3D-shapes-nonlineardeformer.mp4',
+				 'bifs-3D-shapes-pointset.mp4',
+				 'bifs-3D-texturing-box-transparent.mp4',
+				 'bifs-3D-texturing-box-video.mp4',
+				 'bifs-3D-texturing-box.mp4',
+				 'bifs-3D-texturing-compositetexture3D-bitmap.mp4',
+				 'bifs-3D-texturing-compositetexture3D-box.mp4',
+				 'bifs-3D-texturing-cone-transparent.mp4',
+				 'bifs-3D-texturing-cone.mp4',
+				 'bifs-3D-texturing-cylinder-transparent.mp4',
+				 'bifs-3D-texturing-cylinder.mp4',
+				 'bifs-3D-texturing-transform-box.mp4',
+				 'bifs-3D-texturing-transform-matrix-box.mp4',
+				 'bifs-3D-viewpoint-anim.mp4',
+				 'bifs-3D-viewpoint-bind-jump.mp4',
+				 'bifs-3D-viewpoint-bind.mp4',
+				 'bifs-3D-viewpoint-ortho-bind.mp4',
+				 'bifs-bitmap-image-meter-metrics.mp4',
+				 'bifs-bitmap-image-pixel-metrics.mp4',
+				 'bifs-bitmap-image-resizing.mp4',
+				 'bifs-bitmap-movie-materialkey.mp4',
+				 'bifs-bitmap-movie.mp4',
+				 'bifs-bitmap-video-resizing.mp4',
+				 'bifs-cachetexture_cache.mp4',
+				 'bifs-cachetexture_nocache.mp4',
+				 'bifs-command-animated-osmo4logo.mp4',
+				 'bifs-command-delete-index.mp4',
+				 'bifs-command-delete-node.mp4',
+				 'bifs-command-delete-route.mp4',
+				 'bifs-command-global-qp.mp4',
+				 'bifs-command-insert-index.mp4',
+				 'bifs-command-insert-node.mp4',
+				 'bifs-command-insert-nodedef.mp4',
+				 'bifs-command-insert-route.mp4',
+				 'bifs-command-multiple-replace-field.mp4',
+				 'bifs-command-multiple-replace-index.mp4',
+				 'bifs-command-node-delete-ex.mp4',
+				 'bifs-command-proto-delete.mp4',
+				 'bifs-command-proto-insert.mp4',
+				 'bifs-command-protolist-delete.mp4',
+				 'bifs-command-quantification.mp4',
+				 'bifs-command-replace-field.mp4',
+				 'bifs-command-replace-index.mp4',
+				 'bifs-command-replace-node-null.mp4',
+				 'bifs-command-replace-node.mp4',
+				 'bifs-command-replace-route.mp4',
+				 'bifs-command-replace-scene-null.mp4',
+				 'bifs-command-replace-scene.mp4',
+				 'bifs-command-route-add-children.mp4',
+				 'bifs-command-route-children.mp4',
+				 'bifs-command-route-node-exposedfield.mp4',
+				 'bifs-command-route-node.mp4',
+				 'bifs-command-route-remove-children.mp4',
+				 'bifs-environmenttest.mp4',
+				 'bifs-externproto-forestgump-lib.mp4',
+				 'bifs-externproto-forestgump.mp4',
+				 'bifs-externproto-mfurl-lib.mp4',
+				 'bifs-externproto-mfurl.mp4',
+				 'bifs-externproto-nood-lib.mp4',
+				 'bifs-externproto-nood.mp4',
+				 'bifs-externproto-simple-lib.mp4',
+				 'bifs-externproto-simple.mp4',
+				 'bifs-game-arrange.mp4',
+				 'bifs-game-breakout.mp4',
+				 'bifs-game-bubble.mp4',
+				 'bifs-game-minesweeper.mp4',
+				 'bifs-game-othello.mp4',
+				 'bifs-interpolation-colorinterpolator.mp4',
+				 'bifs-interpolation-coordinateinterpolator2D.mp4',
+				 'bifs-interpolation-positionanimator.mp4',
+				 'bifs-interpolation-positionanimator2D.mp4',
+				 'bifs-interpolation-positioninterpolator-position.mp4',
+				 'bifs-interpolation-positioninterpolator-size.mp4',
+				 'bifs-interpolation-positioninterpolator2D-position.mp4',
+				 'bifs-interpolation-positioninterpolator2D-size.mp4',
+				 'bifs-interpolation-scalaranimator.mp4',
+				 'bifs-interpolation-scalarinterpolator.mp4',
+				 'bifs-interpolation-timesensor-enabled.mp4',
+				 'bifs-interpolation-timesensor-starttime_norestart.mp4',
+				 'bifs-interpolation-timesensor-starttime_restart.mp4',
+				 'bifs-interpolation-valuator-sftime.mp4',
+				 'bifs-keynavigator.mp4',
+				 'bifs-linking-anchor-mp4-next.mp4',
+				 'bifs-linking-anchor-mp4-prev.mp4',
+				 'bifs-linking-anchor-viewpoint.mp4',
+				 'bifs-linking-anchor-www.mp4',
+				 'bifs-linking-animationstream.mp4',
+				 'bifs-linking-inline-direct-inline.mp4',
+				 'bifs-linking-inline-direct.mp4',
+				 'bifs-linking-inline-od-inline.mp4',
+				 'bifs-linking-inline-od.mp4',
+				 'bifs-linking-inline-rtsp-no-od.mp4',
+				 'bifs-linking-inline-rtsp.mp4',
+				 'bifs-linking-inline-segment-inline.mp4',
+				 'bifs-linking-inline-segment.mp4',
+				 'bifs-media-audiobuffer.mp4',
+				 'bifs-media-audioclip-urlchanged.mp4',
+				 'bifs-media-audioclip.mp4',
+				 'bifs-media-audiosource-mixing.mp4',
+				 'bifs-media-audiosource-urlchanged.mp4',
+				 'bifs-media-audiosource.mp4',
+				 'bifs-media-imagetexture-OD-reuse.mp4',
+				 'bifs-media-imagetexture-no-od.mp4',
+				 'bifs-media-imagetexture-object-scale.mp4',
+				 'bifs-media-imagetexture-transparent.mp4',
+				 'bifs-media-imagetexture-url-change.mp4',
+				 'bifs-media-movietexture-control.mp4',
+				 'bifs-media-movietexture-no-od.mp4',
+				 'bifs-media-movietexture-od-joinsession.mp4',
+				 'bifs-media-movietexture-od-leave-session.mp4',
+				 'bifs-media-movietexture-owns-OCR.mp4',
+				 'bifs-media-movietexture-shares-OCR.mp4',
+				 'bifs-media-movietexture-url-change.mp4',
+				 'bifs-media-sound-spatialize.mp4',
+				 'bifs-media-sound.mp4',
+				 'bifs-misc-UTF16-input.mp4',
+				 'bifs-misc-cyclic-graph.mp4',
+				 'bifs-misc-hc-proto-events.mp4',
+				 'bifs-misc-hc-proto-pathextrusion.mp4',
+				 'bifs-misc-hc-proto-planarextrusion.mp4',
+				 'bifs-misc-hc-proto-planeclipper.mp4',
+				 'bifs-misc-non-linear-parsing-conditional.mp4',
+				 'bifs-misc-non-linear-parsing-use.mp4',
+				 'bifs-misc-srt-import-3gpp-control-share-ocr.mp4',
+				 'bifs-misc-srt-import-3gpp-control.mp4',
+				 'bifs-misc-srt-import-3gpp.mp4',
+				 'bifs-misc-srt-import.mp4',
+				 'bifs-od-remove-esd.mp4',
+				 'bifs-od-remove-od.mp4',
+				 'bifs-od-update-od.mp4',
+				 'bifs-proto-conditional.mp4',
+				 'bifs-proto-delete-def.mp4',
+				 'bifs-proto-delete-index.mp4',
+				 'bifs-proto-forestgump.mp4',
+				 'bifs-proto-mfurl.mp4',
+				 'bifs-proto-multiple.mp4',
+				 'bifs-proto-nested.mp4',
+				 'bifs-proto-route.mp4',
+				 'bifs-proto-sftime-protocode.mp4',
+				 'bifs-proto-sftime-protointerface.mp4',
+				 'bifs-proto-simple.mp4',
+				 'bifs-proto-use.mp4',
+				 'bifs-script-char-to-int.mp4',
+				 'bifs-script-child-create.mp4',
+				 'bifs-script-date.mp4',
+				 'bifs-script-event-out.mp4',
+				 'bifs-script-initialize.mp4',
+				 'bifs-script-load-url.mp4',
+				 'bifs-script-node-access.mp4',
+				 'bifs-script-node-create.mp4',
+				 'bifs-script-proto.mp4',
+				 'bifs-script-timestamp.mp4',
+				 'bifs-storage.mp4',
+				 'bifs-stream-text-switch.mp4',
+				 'bifs-text-align-horiz1.mp4',
+				 'bifs-text-align-horiz2.mp4',
+				 'bifs-text-align-horiz3.mp4',
+				 'bifs-text-align-horiz4.mp4',
+				 'bifs-text-align-vert1.mp4',
+				 'bifs-text-align-vert2.mp4',
+				 'bifs-text-align-vert3.mp4',
+				 'bifs-text-align-vert4.mp4',
+				 'bifs-text-glyph-advance.mp4',
+				 'bifs-text-length.mp4',
+				 'bifs-text-maxextend.mp4',
+				 'bifs-text-style.mp4',
+				 'bifs-text-unicode.mp4',
+				 'bifs-text-vrml-alignment.mp4',
+				 'bifs-timeline-mediacontrol-OCR.mp4',
+				 'bifs-timeline-mediacontrol-audio-speed.mp4',
+				 'bifs-timeline-mediacontrol-audio.mp4',
+				 'bifs-timeline-mediacontrol-complete.mp4',
+				 'bifs-timeline-mediacontrol-deactivation.mp4',
+				 'bifs-timeline-mediacontrol-inline-av.mp4',
+				 'bifs-timeline-mediacontrol-inline-segments.mp4',
+				 'bifs-timeline-mediacontrol-inline.mp4',
+				 'bifs-timeline-mediacontrol-rtsp.mp4',
+				 'bifs-timeline-mediacontrol-seg-inline.mp4',
+				 'bifs-timeline-mediacontrol-segments.mp4',
+				 'bifs-timeline-mediacontrol-video.mp4',
+				 'bifs-timeline-mediacontrol-videospeed.mp4',
+				 'bifs-timeline-mediasensor-segment-switch.mp4',
+				 'bifs-timeline-mediasensor-segment.mp4',
+				 'bifs-timeline-mediasensor.mp4',
+	
+	]
+
+};

v0.6.1.tar.gz/gui/extensions/bifs_tests/init.js Added

v0.5.2.tar.gz/gui/extensions/player/fileopen.js -> v0.6.1.tar.gz/gui/extensions/player/fileopen.js Changed

@@ -1,198 +1,219 @@
 extension.open_local_file = function () {
- var filebrowse = gw_new_file_dialog(null, 'Open file');
- filebrowse.filter = '*';
- filebrowse.browse(gpac.last_working_directory);
+ var filebrowse = gw_new_file_dialog(null, 'Open file');
+ filebrowse.filter = '*';
+ filebrowse.browse(gpac.last_working_directory);
 
- filebrowse.extension = this;
- this.file_open_dlg = true;
+ filebrowse.extension = this;
+ this.file_open_dlg = true;
+
+ if (!gwskin.mobile_device)
 gw_object_set_dragable(filebrowse);
 
- filebrowse.on_display_size = function (width, height) {
+ filebrowse.on_display_size = function (width, height) {
+ if (gwskin.mobile_device) {
+ this.set_size(width, height);
+ } else {
 var w = width / 2;
 if (w < 200) w = width - 20;
 if (w > 500) w = 500;
 this.set_size(w, 0.8 * height);
 this.move((width - w) / 2, 0);
 }
+ }
 
- filebrowse.on_browse = function (value, directory) {
- if (value == null) {
- this.extension.controler.show();
- } else {
- if (directory) gpac.last_working_directory = directory;
- this.extension.set_movie_url(value);
- }
- this.file_open_dlg = false;
- }
-
- filebrowse.on_close = function () {
+ filebrowse.on_browse = function (value, directory) {
+ if (value == null) {
 this.extension.controler.show();
- this.extension.file_open_dlg = false;
- }
-
- if (this.history.length) {
- filebrowse.go_hist = filebrowse.add_tool('history');
- filebrowse.go_hist.on_click = function () {
- var hist_items = [];
- var history = this.dlg.extension.history;
- for (var i = 0; i < history.length; i++) {
- var o = {};
- var f = history[history.length - i - 1];
- var names = f.url.split('/');
- if (names.length == 0) names = f.url.split('\\');
-
- o.name = names.pop();
- o.directory = false;
- o.path = f.url;
- var delim = f.url.slice(-1);
- hist_items.push(o);
- }
- this.dlg.set_label('History');
- this.dlg.browse(hist_items);
- }
+ } else {
+ if (directory) gpac.last_working_directory = directory;
+ this.extension.set_movie_url(value);
 }
-
- filebrowse.go_fav = filebrowse.add_tool('favorite');
- filebrowse.go_fav.on_click = function () {
- var fav_items = [];
- var bookmarks = this.dlg.extension.bookmarks;
- for (var i = 0; i < bookmarks.length; i++) {
+ this.file_open_dlg = false;
+ }
+
+ filebrowse.on_close = function () {
+ this.extension.controler.show();
+ this.extension.file_open_dlg = false;
+ }
+
+ if (this.history.length) {
+ filebrowse.go_hist = filebrowse.add_tool('history');
+ filebrowse.go_hist.on_click = function () {
+ var hist_items = [];
+ var history = this.dlg.extension.history;
+ for (var i = 0; i < history.length; i++) {
 var o = {};
- var f = bookmarks[bookmarks.length - i - 1];
+ var f = history[history.length - i - 1];
 var names = f.url.split('/');
 if (names.length == 0) names = f.url.split('\\');
 
 o.name = names.pop();
- if (o.name == '') {
- o.directory = true;
- o.name = names.pop();
- } else {
- o.directory = false;
- }
+ o.directory = false;
 o.path = f.url;
 var delim = f.url.slice(-1);
- fav_items.push(o);
+ hist_items.push(o);
 }
- this.dlg.set_label('Bookmarks');
- this.dlg.browse(fav_items);
+ this.dlg.set_label('History');
+ this.dlg.browse(hist_items);
 }
- if (this.bookmarks.length) filebrowse.go_fav.show();
- else filebrowse.go_fav.hide();
-
-
- filebrowse.on_long_click = function (filename, path, directory) {
- var popup = gw_new_window_full(null, true, '');
- popup.dlg = this;
- this.disable();
- popup.area = gw_new_grid_container(popup);
- popup.area.dlg = popup;
- popup.area.break_at_line = true;
- var hist_idx = this.extension.is_in_history(path, true);
-
- if (hist_idx > -1) {
- var item = gw_new_icon_button(popup.area, 'history', 'Remove from history', true, 'listitem');
- item.dlg = popup;
- item.set_size(0.9 * this.width, gwskin.default_control_height);
- item.index = hist_idx;
- item.on_click = function () {
- var fb_dlg = this.dlg.dlg;
- fb_dlg.extension.history.splice(this.index, 1);
- gpac.set_option('GUI', 'PlaybackHistory', gwskin.stringify(fb_dlg.extension.history));
- fb_dlg.go_hist.on_click();
- this.dlg.close();
- }
+ }
+
+ filebrowse.go_fav = filebrowse.add_tool('favorite');
+ filebrowse.go_fav.on_click = function () {
+ var fav_items = [];
+ var bookmarks = this.dlg.extension.bookmarks;
+ for (var i = 0; i < bookmarks.length; i++) {
+ var o = {};
+ var f = bookmarks[bookmarks.length - i - 1];
+ var names = f.url.split('/');
+ if (names.length == 0) names = f.url.split('\\');
+
+ o.name = names.pop();
+ if (o.name == '') {
+ o.directory = true;
+ o.name = names.pop();
+ } else {
+ o.directory = false;
 }
-
- if (this.extension.history.length) {
- var item = gw_new_icon_button(popup.area, 'trash', 'Clear all history', true, 'listitem');
- item.dlg = popup;
- item.set_size(0.9 * this.width, gwskin.default_control_height);
- item.index = hist_idx;
- item.on_click = function () {
- var fb_dlg = this.dlg.dlg;
- fb_dlg.extension.history = [];
- gpac.set_option('GUI', 'PlaybackHistory', gwskin.stringify(fb_dlg.extension.history));
- fb_dlg.close();
- this.dlg.close();
- }
+ o.path = f.url;
+ var delim = f.url.slice(-1);
+ fav_items.push(o);
+ }
+ this.dlg.set_label('Bookmarks');
+ this.dlg.browse(fav_items);
+ }
+ if (this.bookmarks.length) filebrowse.go_fav.show();
+ else filebrowse.go_fav.hide();
+
+
+ filebrowse.on_long_click = function (filename, path, directory) {
+ var popup = gw_new_window_full(null, true, '');
+ popup.dlg = this;
+ this.disable();
+ popup.area = gw_new_grid_container(popup);
+ popup.area.dlg = popup;
+ popup.area.break_at_line = true;
+ var hist_idx = this.extension.is_in_history(path, true);
+
+ if (hist_idx > -1) {
+ var item = gw_new_icon_button(popup.area, 'history', 'Remove from history', true, 'listitem');
+ item.dlg = popup;
+ item.set_size(0.9 * this.width, gwskin.default_control_height);
+ item.index = hist_idx;
+ item.on_click = function () {
+ var fb_dlg = this.dlg.dlg;
+ fb_dlg.extension.history.splice(this.index, 1);
+ fb_dlg.extension.set_option('PlaybackHistory', gwskin.stringify(fb_dlg.extension.history));
+ fb_dlg.go_hist.on_click();
+ this.dlg.close();
 }
+ }
 
- var hist_idx = this.extension.is_in_history(path, false);
- item = gw_new_icon_button(popup.area, 'favorite', hist_idx > -1 ? 'Remove from favorites' : 'Add to favorites', true, 'listitem');
+ if (this.extension.history.length) {
+ var item = gw_new_icon_button(popup.area, 'trash', 'Clear all history', true, 'listitem');
 item.dlg = popup;
 item.set_size(0.9 * this.width, gwskin.default_control_height);
 item.index = hist_idx;
 item.on_click = function () {
 var fb_dlg = this.dlg.dlg;
- if (this.index > -1) {
- fb_dlg.extension.bookmarks.splice(this.index, 1);
- gpac.set_option('GUI', 'Bookmarks', gwskin.stringify(fb_dlg.extension.bookmarks));
- if (fb_dlg.extension.bookmarks.length == 0) {
- fb_dlg.go_fav.hide();
- fb_dlg.browse(fb_dlg.directory);
- }
- } else {
- fb_dlg.extension.add_bookmark(path, false, filename);
- fb_dlg.go_fav.show();
- }
- fb_dlg.layout(this.dlg.dlg.width, this.dlg.dlg.height);
+ fb_dlg.extension.history = [];
+ fb_dlg.extension.set_option('PlaybackHistory', gwskin.stringify(fb_dlg.extension.history));
+ fb_dlg.close();
 this.dlg.close();
 }
+ }
 
-
- popup.set_size(0.9 * this.width, 0.9 * this.height);
- popup.set_alpha(this.get_alpha());
-
- popup.on_close = function () {
- this.dlg.enable();
+ var hist_idx = this.extension.is_in_history(path, false);
+ item = gw_new_icon_button(popup.area, 'favorite', hist_idx > -1 ? 'Remove from favorites' : 'Add to favorites', true, 'listitem');
+ item.dlg = popup;
+ item.set_size(0.9 * this.width, gwskin.default_control_height);
+ item.index = hist_idx;
+ item.on_click = function () {
+ var fb_dlg = this.dlg.dlg;
+ if (this.index > -1) {
+ fb_dlg.extension.bookmarks.splice(this.index, 1);
+ fb_dlg.extension.set_option('Bookmarks', gwskin.stringify(fb_dlg.extension.bookmarks));
+ if (fb_dlg.extension.bookmarks.length == 0) {
+ fb_dlg.go_fav.hide();
+ fb_dlg.browse(fb_dlg.directory);
+ }
+ } else {
+ fb_dlg.extension.add_bookmark(path, false, filename);
+ fb_dlg.go_fav.show();
 }
- popup.show();
+ fb_dlg.layout(this.dlg.dlg.width, this.dlg.dlg.height);
+ this.dlg.close();
+ }
+
+ var item = gw_new_icon_button(popup.area, 'view360', 'View as 360', true, 'listitem');
+ item.dlg = popup;
+ item.set_size(0.9 * this.width, gwskin.default_control_height);
+ item.index = hist_idx;
+ item.on_click = function () {
+ var fb_dlg = this.dlg.dlg;
+ path += '#LIVE360TV';
+ fb_dlg.extension.set_movie_url(path);
+ if (directory) gpac.last_working_directory = directory;
+ fb_dlg.close();
+ this.dlg.close();
 }
 
 
- filebrowse.go_net = filebrowse.add_tool('remote_location');
- filebrowse.go_net.on_click = function () {
- var popup = gw_new_window_full(null, true, 'Enter Adress');
- popup.dlg = this.dlg;
- this.dlg.disable();
- popup.area = gw_new_grid_container(popup);
- popup.area.dlg = popup;
- popup.area.spread_h = true;
-
- popup.edit = gw_new_text_edit(popup.area, '');
- popup.edit.dlg = popup;
- gpac.set_focus(popup.edit);
- popup.edit.on_text = function (val) {
- if (val != '') {
- this.dlg.dlg.on_browse(val, null);
- this.dlg.dlg.close();
- }
- this.dlg.close();
- }
+ popup.set_size(0.9 * this.width, 0.9 * this.height);
+ popup.set_alpha(1);
+ popup.move(this.translation.x, this.translation.y);
 
- popup.on_display_size = function (w, h) {
- this.edit.set_size(0.8 * w, 2 * gwskin.default_text_font_size);
- this.set_size(0.8 * w, 2 * gwskin.default_text_font_size + gwskin.default_icon_height);
+ popup.on_close = function () {
+ this.dlg.enable();
+ }
+ popup.show();
+ }
+
+
+ filebrowse.go_net = filebrowse.add_tool('remote_location');
+ filebrowse.go_net.on_click = function () {
+ var popup = gw_new_window_full(null, true, 'Enter Adress');
+ popup.dlg = this.dlg;
+ this.dlg.disable();
+ popup.area = gw_new_grid_container(popup);
+ popup.area.dlg = popup;
+ popup.area.spread_h = true;
+
+ popup.edit = gw_new_text_edit(popup.area, '');
+ popup.edit.dlg = popup;
+ gpac.set_focus(popup.edit);
+ popup.edit.on_text = function (val) {
+ if (val != '') {
+ this.dlg.dlg.on_browse(val, null);
+ this.dlg.dlg.close();
 }
+ this.dlg.close();
+ }
 
- popup.on_display_size(gw_display_width, gw_display_height);
- popup.set_alpha(1.0);
+ popup.on_display_size = function (w, h) {
+ this.edit.set_size(w, 2 * gwskin.default_text_font_size);
+ this.set_size(w, 2 * gwskin.default_text_font_size + gwskin.default_icon_height);
+ this.move(0, h / 2 - this.height / 2);
+ }
 
- popup.on_close = function () {
- this.dlg.enable();
- }
- popup.show();
+ popup.on_display_size(gw_display_width, gw_display_height);
+ popup.set_alpha(1.0);
+
+ popup.on_close = function () {
+ this.dlg.enable();
 }
+ popup.show();
+ }
 
 
- filebrowse.on_display_size(gw_display_width, gw_display_height);
- if (gpac.hardware_rgba) filebrowse.set_alpha(0.8);
+ filebrowse.on_display_size(gw_display_width, gw_display_height);
+ if (gpac.hardware_rgba) filebrowse.set_alpha(0.8);
 
- this.controler.hide();
- filebrowse.show();
- 
- return filebrowse;
- };
+ this.controler.hide();
+ filebrowse.show();
+
+ return filebrowse;
+};
 
 
 extension.is_in_history = function (url, is_history) {
@@ -230,5 +251,5 @@
 }
 }
 
- gpac.set_option('GUI', is_history ? 'PlaybackHistory' : 'Bookmarks', gwskin.stringify(store));
+ this.set_option(is_history ? 'PlaybackHistory' : 'Bookmarks', gwskin.stringify(store));
 };

v0.5.2.tar.gz/gui/extensions/player/init.js -> v0.6.1.tar.gz/gui/extensions/player/init.js Changed

v0.5.2.tar.gz/gui/extensions/player/player.js -> v0.6.1.tar.gz/gui/extensions/player/player.js Changed

@@ -1,1396 +1,1599 @@
-
-extension = {
- GF_STATE_PLAY: 0,
- GF_STATE_PAUSE: 1,
- GF_STATE_STOP: 2,
- GF_STATE_TRICK: 3,
-
-
- movie: null,
- movie_control: null,
- movie_sensor: null,
- UPnP_Enabled: false,
- dynamic_scene: false,
- movie_connected: false,
- controlled_renderer: null,
- current_url: null,
- local_url: false,
- initial_play_done: false,
- dictionary: null,
- icon_pause: 1,
- icon_play: 0,
- controler: null,
- stat_wnd: null,
- buffer_wnd: null,
- current_time: 0,
- duration: 0,
- timeshift_depth: 0,
- muted: 0,
- file_open_dlg: false,
- stoped_url: null,
- initial_service_id: 0,
- default_addon: null,
- history: [],
- bookmarks: [],
- root_odm: null,
- navigation_wnd: null,
- initial_loop: false,
- initial_speed: 1,
- initial_start: 0,
- show_stats_init: 0,
- services: [],
- channels_wnd: null,
-
- do_show_controler: function () {
- if (this.file_open_dlg) {
- alert('Cannot show - File dialog is open');
- return false;
- }
- gw_hide_dock();
- if (this.controler.visible) {
- this.controler.hide();
- } else {
- this.controler.show();
- }
- },
-
- ext_filter_event: function (evt) {
- switch (evt.type) {
- case GF_EVENT_MOUSEUP:
- this.do_show_controler();
- return 1;
- case GF_EVENT_KEYUP:
- if (evt.keycode == gwskin.keys.close) {
- this.do_show_controler();
- return 1;
- }
- return 0;
- case GF_EVENT_QUALITY_SWITCHED:
- if (this.stat_wnd) {
- this.stat_wnd.quality_changed();
- }
- return 1;
- case GF_EVENT_TIMESHIFT_UPDATE:
- if (this.timeshift_depth) {
- this.set_time(0);
- }
- return 1;
- case GF_EVENT_TIMESHIFT_OVERFLOW:
- if (this.state == this.GF_STATE_PAUSE) {
- this.set_state(this.GF_STATE_PLAY);
- var msg = gw_new_message(null, 'Timeshift Overflow', 'Falling outside of timeshift buffer: resuming playback');
- msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
- msg.show();
- }
- return 1;
- case GF_EVENT_TIMESHIFT_UNDERRUN:
- if (this.movie_control.mediaSpeed > 1) {
- this.set_speed(1);
- var msg = gw_new_message(null, 'Timeshift Underrun', 'Resuming to normal speed');
- msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
- msg.show();
- }
- return 1;
- case GF_EVENT_NAVIGATE:
- this.set_movie_url(evt.target_url);
- return 1;
- }
- },
-
- init_extension: function () {
-
- /*create media nodes element for playback*/
- var a_movie = new SFNode('OrderedGroup');
- this.movie = new SFNode('Transform2D');
- a_movie.children[0] = this.movie;
- a_movie.children[0].children[0] = new SFNode('Inline');
- a_movie.children[0].children[0].url[0] = '';
- this.movie_control = new SFNode('MediaControl')
- a_movie.children[0].children[1] = this.movie_control;
- this.movie_sensor = new SFNode('MediaSensor')
- a_movie.children[0].children[2] = this.movie_sensor;
-
- gw_insert_media_node(a_movie);
- //dictionary of resources to load 
- this.dictionary = gw_new_container(null);
- this.dictionary.hide();
-
- this.movie.children[0].extension = this;
-
- this.movie.children[0].on_scene_size = function (evt) {
- var ext = this.extension;
-
- if (!this.callback_done) {
- this.callback_done = true;
-
- //process the error or connect service
- if (evt.error) {
- var notif = gw_new_message(null, 'Error opening file!', 'Failed to open ' + this.url[0] + '\n\nReason: ' + gpac.error_string(evt.error));
- notif.show();
-
- var url = ext.movie.children[0].url.length ? ext.movie.children[0].url[0] : '';
- //reassign old inline URL
- this.url[0] = url;
- if (url == '') {
- ext.controler.show();
- } else {
- this.movie_connected = true;
- }
- }
-
- //switch back inline nodes and remove from dictionary
- gw_detach_child(this);
- //force detach, we don't know when GC will be done
- ext.movie.children[0].url[0] = '';
- ext.movie.children[0] = this;
-
- if (evt.error) return;
-
- //success !
- ext.current_url = this.url[0];
- ext.set_speed(ext.initial_speed);
- if (ext.initial_start >= 0) {
- ext.movie_control.mediaStartTime = ext.initial_start;
- } else {
- ext.movie_control.mediaStartTime = 0;
- ext.movie_control.mediaStopTime = ext.initial_start;
- alert('MC stopTime is ' + ext.movie_control.mediaStopTime + ' TS buffer is ' + ext.timeshift_depth);
- }
- ext.movie_control.loop = ext.initial_loop;
-
- ext.movie_control.url[0] = ext.current_url;
- ext.movie_sensor.url[0] = ext.current_url;
-
- ext.timeshift_depth = 0;
- ext.initial_loop = false;
- ext.initial_speed = 1;
- ext.initial_start = 0;
-
-
- if ((ext.current_url.indexOf('gpac://') == 0) && ((ext.current_url.indexOf('://') < 0) || (ext.current_url.indexOf('file://') == 0))) {
- ext.local_url = true;
- } else {
- ext.local_url = false;
- }
-
- ext.root_odm = gpac.get_object_manager(ext.current_url);
-
-
- gw_background_control(false);
-
- ext.controler.hide();
- gpac.caption = ext.current_url;
- ext.add_bookmark(ext.current_url, true);
-
- ext.declare_addons();
-
- if (ext.initial_service_id) {
- var odm = gpac.get_object_manager(ext.current_url);
- if (odm) odm.select_service(ext.initial_service_id);
- ext.initial_service_id = 0;
- }
- if (ext.show_stats_init) {
- ext.view_stats();
- }
- }
-
- if (!ext.movie_connected) {
- ext.movie_connected = true;
- gpac.set_3d(evt.type3d ? 1 : 0);
- ext.controler.play.switch_icon(ext.icon_pause);
- ext.dynamic_scene = evt.dynamic_scene;
- //force display size notif on controler to trigger resize of the window
- ext.controler.on_display_size(ext.controler.width, ext.controler.height);
- }
- if (!gpac.fullscreen && evt.width && evt.height) {
- var w, h, r_w, r_h;
- w = evt.width;
- h = evt.height;
-
- if (w > gpac.screen_width) w = gpac.screen_width;
- if (h > gpac.screen_height) h = gpac.screen_height;
-
- r_w = r_h = 1;
- // if (w < min_width) r_w = Math.ceil(min_width / w);
- // if (h < min_height) r_h = Math.ceil(min_height / h);
- if (r_w < r_h) r_w = r_h;
- w = r_w * w;
- h = r_w * h;
- gpac.set_size(w, h);
- }
- ext.streamlist_changed();
- }
- this.movie.children[0].on_addon_found = function (evt) {
- var e = {};
- e.type = GF_EVENT_ADDON_DETECTED;
- e.addon_url = evt.url;
- e.scene_url = this.url[0];
- e.discarded = false;
- gwlib_filter_event(e);
- }
-
- this.movie.children[0].on_streamlist_changed = function (evt) {
- this.extension.streamlist_changed();
- }
-
- this.movie.children[0].addEventListener('gpac_scene_attached', this.movie.children[0].on_scene_size, 0);
- this.movie.children[0].addEventListener('gpac_addon_found', this.movie.children[0].on_addon_found, 0);
- this.movie.children[0].addEventListener('gpac_streamlist_changed', this.movie.children[0].on_streamlist_changed, 0);
-
-
- this.movie.children[0].on_media_progress = function (evt) {
- if (evt.buffering) {
- this.extension.show_buffer(evt.bufferLevel);
- this.extension.controler.layout();
-
- }
- if (evt.total) {
- var percent_dload = 100 * evt.loaded / evt.total;
- if (percent_dload >= 100) percent_dload = 0;
- this.extension.controler.media_line.set_progress(percent_dload);
- }
- }
-
- this.movie.children[0].on_media_playing = function (evt) {
- this.extension.show_buffer(-1);
-
- if (!this.extension.initial_play_done) {
- this.extension.initial_play_done = true;
-
- this.extension.controler.play.switch_icon(this.extension.icon_pause);
-
- if (!this.extension.root_odm) {
- this.extension.root_odm = gpac.get_object_manager(this.extension.current_url);
- }
- if (this.extension.root_odm) {
- this.extension.declare_addons();
- }
- }
-
- if (this.extension.root_odm) {
- this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
- }
- }
-
- this.movie.children[0].on_media_end = function (evt) {
- if (this.extension.duration) {
- if (this.extension.movie_control.loop) {
- this.extension.movie_control.mediaStartTime = 0;
- this.extension.current_time = 0;
- } else if (this.extension.playlist_mode && (this.extension.playlist_idx + 1 < this.extension.playlist.length)) {
- this.extension.playlist_next();
- } else {
- this.extension.set_state(this.extension.GF_STATE_STOP);
- }
- }
- }
-
- this.movie.children[0].on_media_waiting = function (evt) {
- // alert('URL is now buffering');
- }
- this.movie.children[0].on_tsb_change = function (evt) {
- if (this.extension.root_odm) {
- this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
-
- var main_addon_url = this.extension.root_odm.main_addon_url;
- if (main_addon_url != null) gwskin.pvr_url = main_addon_url;
-
- }
- }
- this.movie.children[0].on_main_addon = function (evt) {
- this.extension.controler.layout();
- }
-
-
- this.movie.children[0].addEventListener('progress', this.movie.children[0].on_media_progress, 0);
- this.movie.children[0].addEventListener('playing', this.movie.children[0].on_media_playing, 0);
- this.movie.children[0].addEventListener('canplay', this.movie.children[0].on_media_playing, 0);
- this.movie.children[0].addEventListener('waiting', this.movie.children[0].on_media_waiting, 0);
- this.movie.children[0].addEventListener('ended', this.movie.children[0].on_media_end, 0);
- this.movie.children[0].addEventListener('gpac_timeshift_depth_changed', this.movie.children[0].on_tsb_change, 0);
- this.movie.children[0].addEventListener('gpac_main_addon_state', this.movie.children[0].on_main_addon, 0);
-
-
- this.on_movie_duration = function (value) {
- if (value < 0) value = 0;
- this.current_duration = value;
- this.set_duration(value);
- if (this.UPnP_Enabled) UPnP.MovieDuration = value;
- }
-
- this.on_movie_active = function (value) {
- if (!value) {
- this.movie_control.mediaStartTime = -1;
- }
- }
-
- this.on_movie_time = function (value) {
- var diff = this.current_time - value;
- if (diff < 0) diff = -diff;
- /*filter out every 1/2 seconds*/
- if (diff < 0.5) return;
- this.current_time = value;
- this.set_time(value);
- if (this.UPnP_Enabled) UPnP.MovieTime = value;
- }
-
- Browser.addRoute(this.movie_sensor, 'mediaDuration', this, this.on_movie_duration);
- Browser.addRoute(this.movie_sensor, 'mediaCurrentTime', this, this.on_movie_time);
- Browser.addRoute(this.movie_sensor, 'isActive', this, this.on_movie_active);
-
- var hist = gpac.get_option('GUI', 'PlaybackHistory');
- if ((hist != null) && (hist != '')) {
- this.history = gwskin.parse(hist);
- }
-
- var bmarks = gpac.get_option('GUI', 'Bookmarks');
- if ((bmarks != null) && (bmarks != '')) {
- this.bookmarks = gwskin.parse(bmarks);
- }
-
- /*create player control UI*/
- var wnd = gw_new_window(null, true, true);
- //remember it !
- this.controler = wnd;
- wnd.extension = this;
-
- wnd.set_corners(true, true, false, false);
- wnd.set_alpha(0.95);
-
- /*first set of controls*/
- wnd.infobar = gw_new_grid_container(wnd);
- wnd.infobar.spread_h = true;
-
- /*add our controls in order*/
-
- wnd.media_line = gw_new_progress_bar(wnd.infobar, false, true);
- wnd.media_line.extension = this;
- wnd.media_line.on_slide = function (value, type) {
- if (!this.extension.movie_connected && !this.extension.controlled_renderer) {
- this.set_value(0);
- return;
- }
-
- var duration = this.extension.duration;
- var time;
- if (duration) {
- time = value * duration / 100;
- } else if (this.extension.timeshift_depth) {
- time = (100 - value) * this.extension.timeshift_depth / 100;
-
- if (this.extension.controlled_renderer) {
- return;
- }
- if (type != 2) return;
-
- this.extension.movie_control.mediaStopTime = -time;
- this.extension.controler.layout();
- return;
- }
-
- if (this.extension.controlled_renderer) {
- this.extension.controlled_renderer.Seek(time);
- return;
- }
- gw_background_control(false);
- switch (type) {
- //start sliding 
- case 1:
- this.extension.set_state(this.extension.GF_STATE_PAUSE);
- this.extension.set_speed(0);
- break;
- //done sliding 
- case 2:
- this.extension.set_state(this.extension.GF_STATE_PLAY);
- this.extension.movie_control.mediaStartTime = time;
- this.extension.set_speed(1);
- break;
- //init slide, go in play mode 
- default:
- if (this.extension.state == this.extension.GF_STATE_STOP)
- this.extension.set_state(this.extension.GF_STATE_PLAY);
-
- this.extension.set_state(this.extension.GF_STATE_PAUSE);
- break;
- }
- }
-
- wnd.time = gw_new_text(wnd.infobar, '00:00:00');
- gw_object_set_hitable(wnd.time);
- wnd.time.extension = this;
- wnd.time.reversed = false;
- wnd.time.on_down = function (val) {
- if (!val) return;
-
- if (this.extension.timeshift_depth) {
- return;
- // if (this.extension.movie_control.mediaStopTime < 0)
- // this.extension.movie_control.mediaStopTime = 0;
- } else {
- this.reversed = !this.reversed;
- this.extension.set_time(this.extension.current_time);
- }
- }
-
- wnd.back_live = gw_new_icon(wnd.infobar, 'live');
- wnd.back_live.extension = this;
- wnd.back_live.on_click = function () {
- if (0 && this.extension.root_odm && this.extension.root_odm.main_addon_on) {
- this.extension.root_odm.disable_main_addon();
- }
- else if (this.extension.movie_control.mediaStopTime < 0) {
- this.extension.set_time(0);
- this.extension.movie_control.mediaStopTime = 0;
- this.extension.controler.layout();
- }
- }
-
- gw_new_separator(wnd.infobar);
-
-
- wnd.stop = gw_new_icon(wnd.infobar, 'stop');
- wnd.stop.extension = this;
- wnd.stop.on_click = function () {
- this.extension.set_state(this.extension.GF_STATE_STOP);
- }
-
- if (0) {
- wnd.rewind = gw_new_icon(wnd.infobar, 'rewind');
- } else {
- wnd.rewind = null;
- }
-
- wnd.play = gw_new_icon(wnd.infobar, 'play');
- wnd.play.extension = this;
- this.state = this.GF_STATE_PLAY;
- wnd.play.add_icon(gwskin.images.pause);
- wnd.play.on_click = function () {
- this.extension.set_state((this.extension.state == this.extension.GF_STATE_PLAY) ? this.extension.GF_STATE_PAUSE : this.extension.GF_STATE_PLAY);
- }
-
-
- wnd.forward = gw_new_icon_button(wnd.infobar, 'seek_forward', '', true, 'icon_label');
- wnd.forward.extension = this;
- wnd.forward.on_click = function () {
- if (this.extension.movie_control.mediaSpeed) {
- this.extension.set_state(this.extension.GF_STATE_TRICK);
- this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
- }
- }
- wnd.forward.on_long_click = function () {
- if (this.extension.movie_control.mediaSpeed) {
- this.extension.set_state(this.extension.GF_STATE_TRICK);
- this.extension.set_speed(this.extension.movie_control.mediaSpeed / 2);
- }
- }
-
- wnd.loop = gw_new_icon(wnd.infobar, 'play_once');
- wnd.loop.extension = this;
- wnd.loop.add_icon(gwskin.images.play_loop);
- // wnd.loop.add_icon(gwskin.images.play_shuffle);
- wnd.loop.on_click = function () {
- this.extension.movie_control.loop = this.extension.movie_control.loop ? FALSE : TRUE;
- this.switch_icon(this.extension.movie_control.loop ? 1 : 0);
- }
-
- wnd.media_list = gw_new_icon(wnd.infobar, 'media');
- wnd.media_list.extension = this;
- wnd.media_list.hide();
-
- wnd.channels = gw_new_icon(wnd.infobar, 'channels');
- wnd.channels.extension = this;
- wnd.channels.hide();
-
-
- wnd.navigate = gw_new_icon(wnd.infobar, 'navigation');
- wnd.navigate.extension = this;
- wnd.navigate.on_click = function () {
- this.extension.select_navigation_type();
- }
-
- wnd.stats = gw_new_icon(wnd.infobar, 'statistics');
- wnd.stats.extension = this;
- wnd.stats.on_click = function () {
- this.extension.view_stats();
- }
-
-
- gw_new_separator(wnd.infobar);
-
-
- wnd.snd_low = gw_new_icon(wnd.infobar, 'audio');
- wnd.snd_low.extension = this;
- wnd.snd_ctrl = gw_new_slider(wnd.infobar);
- wnd.snd_ctrl.extension = this;
- wnd.snd_ctrl.stick_to_previous = true;
- wnd.snd_low.add_icon('audio_mute');
- wnd.snd_low.on_click = function () {
- if (this.extension.muted) {
- gpac.volume = this.extension.muted;
- this.extension.muted = 0;
- this.switch_icon(0);
- } else {
- this.extension.muted = gpac.volume ? gpac.volume : 1;
- gpac.volume = 0;
- this.switch_icon(1);
- }
- }
- wnd.snd_ctrl.on_slide = function (value, type) {
- if (this.extension.muted) this.extension.controler.snd_low.on_click();
- gpac.volume = value;
- }
- wnd.snd_ctrl.set_value(gpac.volume);
-
- wnd.open = null;
- if (!gwskin.browser_mode) {
- wnd.open = gw_new_icon(wnd.infobar, 'file_open');
- wnd.open.extension = this;
- wnd.open.on_click = function () {
- this.extension.open_local_file();
- }
- }
-
- wnd.playlist = gw_new_icon(wnd.infobar, 'playlist');
- wnd.playlist.extension = this;
- wnd.playlist.on_click = function () {
- this.extension.view_playlist();
- }
-
- wnd.playlist_prev = gw_new_icon(wnd.infobar, 'playlist_prev');
- wnd.playlist_prev.extension = this;
- wnd.playlist_prev.on_click = function () {
- this.extension.playlist_prev();
- }
-
- wnd.playlist_next = gw_new_icon(wnd.infobar, 'playlist_next');
- wnd.playlist_next.extension = this;
- wnd.playlist_next.on_click = function () {
- this.extension.playlist_next();
- }
-
-
- wnd.home = null;
- if (!gwskin.browser_mode) {
- wnd.home = gw_new_icon(wnd.infobar, 'osmo');
- wnd.home.extension = this;
- wnd.home.on_click = function () {
- this.extension.controler.hide();
- if (this.extension._evt_filter != null) {
- gwlib_remove_event_filter(this.extension._evt_filter);
- this.extension._evt_filter = null;
- }
- gw_show_dock();
- }
- }
-
-
- if (this.UPnP_Enabled) {
- wnd.remote = gw_new_icon(wnd.infobar, 'remote_display');
- wnd.remote.on_click = function () { select_remote_display('push'); }
- } else {
- wnd.remote = null;
- }
-
- wnd.fullscreen = gw_new_icon(wnd.infobar, 'fullscreen');
- wnd.fullscreen.add_icon(gwskin.images.fullscreen_back);
- wnd.fullscreen.on_click = function () {
- gpac.fullscreen = !gpac.fullscreen;
- }
- wnd.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
-
- if (!gwskin.browser_mode) {
- wnd.exit = gw_new_icon(wnd.infobar, 'exit');
- wnd.exit.on_click = function () { gpac.exit(); }
- } else {
- wnd.exit = null;
- }
-
- wnd.on_size = function (width, height) {
- var control_icon_size = gwskin.default_icon_height;
- var children = this.infobar.get_children();
- for (i = 0; i < children.length; i++) {
- children[i].set_size(control_icon_size, control_icon_size);
- }
- if (this.time) this.time.set_size(4 * wnd.time.font_size(), control_icon_size);
- if (this.snd_ctrl) {
- this.snd_ctrl.set_size(2 * control_icon_size, control_icon_size / 2, control_icon_size / 3, control_icon_size / 2);
- this.snd_ctrl.set_value(gpac.volume);
- }
-
- var speed = this.extension.movie_control.mediaSpeed;
- if (speed && (speed != 1)) {
- if ((speed > 100) || (speed < 1))
- this.forward.set_size(3 * control_icon_size, control_icon_size);
- else
- this.forward.set_size(2 * control_icon_size, control_icon_size);
- } else {
- this.forward.set_size(control_icon_size, control_icon_size);
- }
- }
-
- wnd.layout = function (width, height) {
- var min_w, full_w, time_w;
- var control_icon_size = gwskin.default_icon_height;
- var is_over = true;
- var show_navigate = false;
- if (arguments.length == 0) {
- width = this.width;
- height = this.height;
- }
- this.move(0, Math.floor((height - gw_display_height) / 2));
-
- this.on_size(width, height);
-
- this.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
-
-
- width -= control_icon_size / 2;
- min_w = control_icon_size;
- if (this.time.visible) min_w += this.time.width;
- if (this.open) min_w += control_icon_size;
- if (this.home) min_w += control_icon_size;
- if (this.exit && gpac.fullscreen) min_w += control_icon_size;
- full_w = 0;
- if (this.snd_low) full_w += control_icon_size;
- if (this.snd_ctrl) full_w += this.snd_ctrl.width;
- if (this.fullscreen) full_w += control_icon_size;
-
-
- if (this.navigate) {
- this.navigate.hide();
- if (!this.extension.dynamic_scene && this.extension.movie_connected && (gpac.navigation_type != GF_NAVIGATE_TYPE_NONE)) {
- show_navigate = true;
- full_w += control_icon_size;
- }
- }
-
- if (this.extension.movie_connected) {
- if (this.extension.state == this.extension.GF_STATE_STOP) {
- this.stats.hide();
- } else {
- full_w += control_icon_size;
- this.stats.show();
- }
- if (this.extension.duration || this.extension.timeshift_depth) {
- full_w += control_icon_size;
- this.stop.show();
- full_w += control_icon_size;
- this.play.show();
- } else {
- full_w += control_icon_size;
- this.play.show();
- if (this.extension.state == this.extension.GF_STATE_STOP) {
- this.stop.hide();
- this.play.show();
- } else {
- // this.play.hide();
- // this.stop.show();
- }
- }
-
- if (this.extension.root_odm && !this.extension.dynamic_scene && !this.extension.root_odm.is_over)
- is_over = false;
-
- // this.media_list.show();
-
- } else {
- this.stats.hide();
- this.stop.hide();
- this.play.hide();
- this.media_list.hide();
- }
-
- if (this.extension.duration) {
- if (this.rewind) full_w += control_icon_size;
- if (this.forward) full_w += control_icon_size;
- if (this.loop) full_w += control_icon_size;
- }
- else if (this.extension.movie_control.mediaStopTime < 0) {
- if (this.forward) full_w += control_icon_size;
- } else if (!is_over) {
- if (this.forward) full_w += control_icon_size;
- }
-
- if ((this.extension.root_odm && this.extension.root_odm.main_addon_on) || this.extension.movie_control.mediaStopTime < 0) {
- full_w += control_icon_size;
- this.back_live.show();
- } else {
- this.back_live.hide();
- }
-
-
- if (this.remote && UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
- full_w += control_icon_size;
- }
- time_w = this.media_line.visible ? 2 * control_icon_size : 0;
-
- if (this.exit) {
- if (gpac.fullscreen) {
- this.exit.show();
- } else {
- this.exit.hide();
- }
- }
-
- // if (min_w + full_w + time_w < width) {
- if (1) {
- if (this.media_line.visible)
- this.media_line.set_size(width - min_w - full_w, control_icon_size / 3);
-
- if (this.snd_low) this.snd_low.show();
- if (this.snd_ctrl) this.snd_ctrl.show();
-
- if (this.extension.duration) {
- if (this.rewind) this.rewind.show();
- if (this.forward) this.forward.show();
- if (this.loop) this.loop.show();
- if (this.stop) this.stop.show();
- }
- else if (this.extension.movie_control.mediaStopTime < 0) {
- if (this.forward) this.forward.show();
- } else if (!is_over) {
- if (this.forward) this.forward.show();
- } else {
- if (this.forward) this.forward.hide();
- }
- if (wnd.fullscreen) wnd.fullscreen.show();
-
- if (this.remote) {
- if (UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
- this.remote.show();
- } else {
- this.remote.hide();
- }
- }
-
- if (show_navigate) {
- this.navigate.show();
- }
- } else {
-
- if (this.snd_low) this.snd_low.hide();
- if (this.snd_ctrl) this.snd_ctrl.hide();
- if (this.rewind) this.rewind.hide();
- if (this.forward) this.forward.hide();
- if (this.loop) this.loop.hide();
- if (this.fullscreen) this.fullscreen.hide();
- if (this.remote) this.remote.hide();
-
- if (show_navigate) {
- if (min_w + time_w + this.navigate.width < width) {
- min_w += this.navigate.width;
- this.navigate.show();
- }
- }
-
- if (this.remote) {
- if (UPnP.MediaRenderersCount && (this.extension.current_url != '') && (min_w + time_w + this.remote.width < width)) {
- min_w += this.remote.width;
- this.remote.show();
- } else {
- this.remote.hide();
- }
- }
-
- if (this.media_line.visible)
- this.media_line.set_size(width - min_w - 5, control_icon_size / 3);
-
- }
-
- if (this.extension.duration || this.extension.timeshift_depth) {
- this.media_line.show();
- this.time.show();
- } else {
- this.media_line.hide();
- this.time.hide();
- }
- //this.time.set_size(width - 6*control_icon_size, control_icon_size / 3);
- this.media_line.set_size(width - this.time.width - 2 * control_icon_size, control_icon_size / 3);
-
- // this.infobar.set_size(width, control_icon_size);
- this.infobar.set_size(width, height);
- this.infobar.move(0, -0.1 * control_icon_size);
- }
-
- wnd.on_display_size = function (w, h) {
- var def_width = 640;
- if (!gpac.fullscreen) {
- if (w < def_width) {
- gpac.set_size(480, h);
- return;
- }
- } else {
- if (w < def_width) {
- def_width = w;
- }
- }
-
- // this.set_size(w, 1.2 * gwskin.default_icon_height);
-
- if (this.extension.movie_connected) h = 3.3 * gwskin.default_icon_height;
- else h = 1.1 * gwskin.default_icon_height;
-
- this.set_size(def_width, h);
-
- this.layout();
- }
-
- wnd.on_event = function (evt) {
- if (this.infobar.on_event(evt)) return true;
- return false;
- }
- //make the bar hitable so that clicking on it does not make it disappear
- gw_object_set_hitable(wnd);
- wnd.set_size(gw_display_width, 2.2 * gwskin.default_icon_height);
- this.set_duration(0);
- this.set_time(0);
-
-
- this._evt_filter = null;
- },
-
- start: function () {
- if (!this._evt_filter) {
- this._evt_filter = this.create_event_filter(this);
- gwlib_add_event_filter(this._evt_filter);
- }
-
- if (!this.movie) {
- this.init_extension();
-
- //check our args
- var i, argc = gpac.argc;
- var url_arg = null;
-
- for (i = 1; i < argc; i++) {
- var arg = gpac.get_arg(i);
- if (!arg) break;
-
- //that's our file
- if (arg.charAt(0) != '-') {
- //do not reopen ourselves !
- if (arg.indexOf('gui.bt') >= 0) continue;
-
- url_arg
- if (arg.indexOf('://') < 0) url_arg = 'gpac://' + arg;
- else url_arg = arg;
- }
-
- //MP4Client options taking 2 args
- else if ((arg == '-rti') || (arg == '-rtix') || (arg == '-c') || (arg == '-cfg') || (arg == '-size') || (arg == '-lf') || (arg == '-log-file') || (arg == '-logs')
- || (arg == '-opt') || (arg == '-ifce') || (arg == '-views') || (arg == '-run-for')
- ) {
- i++;
- } else if (arg == '-service') {
- this.initial_service_id = parseInt(gpac.get_arg(i + 1));
- i++;
- } else if (arg == '-com') {
- arg = gpac.get_arg(i + 1);
- var idx = arg.indexOf('gpac add ');
-
- if (idx == 0) {
- this.default_addon = arg.substring(9);
- }
-
- i++;
- } else if (arg == '-addon') {
- this.default_addon = gpac.get_arg(i + 1);
- i++;
- } else if (arg == '-loop') {
- this.initial_loop = true;
- } else if (arg == '-stats') {
- this.show_stats_init = true;
- } else if (arg == '-speed') {
- this.initial_speed = Number(gpac.get_arg(i + 1));
- i++;
- } else if (arg == '-play-from') {
- this.initial_start = Number(gpac.get_arg(i + 1));
- i++;
- }
- }
-
- gwskin.media_url = '';
- gwskin.pvr_url = '';
- gwskin.media_time = 0;
- gwskin.media_clock = 0;
- gwskin.restore_session = this.create_restore_session(this);
-
- if (url_arg != null) {
- this.set_playlist_mode(false);
- var def_addon = this.default_addon;
- this.set_movie_url(url_arg);
- gw_hide_dock();
- this.default_addon = def_addon;
- return;
- }
- this.set_playlist_mode(true);
-
+
+extension = {
+ GF_STATE_PLAY: 0,
+ GF_STATE_PAUSE: 1,
+ GF_STATE_STOP: 2,
+ GF_STATE_TRICK: 3,
+
+
+ movie: null,
+ movie_control: null,
+ movie_sensor: null,
+ UPnP_Enabled: false,
+ dynamic_scene: false,
+ movie_connected: false,
+ controlled_renderer: null,
+ current_url: null,
+ local_url: false,
+ initial_play_done: false,
+ dictionary: null,
+ icon_pause: 1,
+ icon_play: 0,
+ controler: null,
+ stat_wnd: null,
+ buffer_wnd: null,
+ current_time: 0,
+ duration: 0,
+ timeshift_depth: 0,
+ time_in_tsb: 0,
+ muted: 0,
+ file_open_dlg: false,
+ stoped_url: null,
+ initial_service_id: 0,
+ default_addon: null,
+ history: [],
+ bookmarks: [],
+ root_odm: null,
+ navigation_wnd: null,
+ initial_loop: false,
+ initial_speed: 1,
+ initial_start: 0,
+ show_stats_init: 0,
+	def_width: 600,
+	def_height: 600,
+	disabled: false,
+ services: [],
+ channels_wnd: null,
+	medialist_wnd: null,
+ reverse_playback_supported: false,
+
+ do_show_controler: function () {
+		if (this.file_open_dlg) {
+ alert('Cannot show - File dialog is open');
+ return false;
+ }
+ gw_hide_dock();
+ if (this.controler.visible) {
+ this.controler.hide();
+ } else {
+ this.controler.show();
+ }
+ },
+
+ ext_filter_event: function (evt) {
+		if (this.disabled) return false;
+		
+ switch (evt.type) {
+		case GF_EVENT_MOUSEUP:
+			if ((gwskin.last_hit_x == evt.mouse_x) && (gwskin.last_hit_y == evt.mouse_y)) {
+				this.do_show_controler();
+			}
+			//we always return false so that the event is handled by the navigation logic of the player, otherwise
+			//the mouse would never be released and navigation would stay always on
+			return false;
+		case GF_EVENT_KEYUP:
+			if (evt.keycode == gwskin.keys.close) {
+				this.do_show_controler();
+				return true;
+			}
+			return false;
+		case GF_EVENT_QUALITY_SWITCHED:
+			if (this.stat_wnd) {
+				this.stat_wnd.quality_changed();
+			}
+			return true;
+		case GF_EVENT_TIMESHIFT_UPDATE:
+			if (this.timeshift_depth) {
+				this.set_time(0);
+			}
+			return true;
+		case GF_EVENT_TIMESHIFT_OVERFLOW:
+			var msg = '';
+			if ((this.state == this.GF_STATE_PAUSE) || (this.movie_control.mediaSpeed != 1)) {
+				this.set_state(this.GF_STATE_PLAY);
+				this.set_speed(1);
+
+				msg = gw_new_message(null, 'Timeshift Overflow', 'Falling outside of timeshift buffer: resuming playback');
+				msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+				msg.show();
+			}
+			return true;
+		case GF_EVENT_TIMESHIFT_UNDERRUN:
+			if (this.movie_control.mediaSpeed > 1) {
+				this.set_speed(1);
+				var msg = gw_new_message(null, 'Timeshift Underrun', 'Resuming to normal speed');
+				msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+				msg.show();
+			}
+			return true;
+		case GF_EVENT_NAVIGATE:
+			this.set_movie_url(evt.target_url);
+			return true;
+		case GF_EVENT_KEYDOWN:
+			//alert('key is '+evt.keycode + ' hw code is ' + evt.hwkey);
+			if (evt.keycode == 'F1') {
+				this.controler.rewind.on_click();
+				return true;
+			}
+			if (evt.keycode == 'F2') {
+				this.controler.play.on_click();
+				return true;
+			}
+			if (evt.keycode == 'F3') {
+				this.controler.forward.on_click();
+				return true;
+			}
+			if (evt.keycode == 'F4') {
+				this.controler.back_live.on_click();
+				return true;
+			}
+			/*
+			if (evt.keycode == 'F7') {
+			 this.controler.fullscreen.on_click();
+			 return true;
+			}
+			if (evt.keycode == 'F8') {
+			 gpac.reload();
+			 return true;
+			}
+			*/
+			return false;
+
+		default:
+			return false;
+ }
+ },
+
+ init_extension: function () {
+
+ /*create media nodes element for playback*/
+ var a_movie = new SFNode('OrderedGroup');
+ this.movie = new SFNode('Transform2D');
+ a_movie.children[0] = this.movie;
+ a_movie.children[0].children[0] = new SFNode('Inline');
+ a_movie.children[0].children[0].url[0] = '';
+ this.movie_control = new SFNode('MediaControl')
+ a_movie.children[0].children[1] = this.movie_control;
+ this.movie_sensor = new SFNode('MediaSensor')
+ a_movie.children[0].children[2] = this.movie_sensor;
+
+ gw_insert_media_node(a_movie);
+ //dictionary of resources to load 
+ this.dictionary = gw_new_container(null);
+ this.dictionary.hide();
+
+ this.movie.children[0].extension = this;
+
+ this.movie.children[0].on_scene_size = function (evt) {
+ var ext = this.extension;
+
+ if (!this.callback_done) {
+ this.callback_done = true;
+
+ //process the error or connect service
+ if (evt.error) {
+ var notif = gw_new_message(null, 'Error opening file!', 'Failed to open ' + this.url[0] + '\n\nReason: ' + gpac.error_string(evt.error));
+ notif.show();
+
+ var url = ext.movie.children[0].url.length ? ext.movie.children[0].url[0] : '';
+ //reassign old inline URL
+ this.url[0] = url;
+ if (url == '') {
+ ext.controler.show();
+ } else {
+ this.movie_connected = true;
+ }
+ }
+
+ //switch back inline nodes and remove from dictionary
+ gw_detach_child(this);
+ //force detach, we don't know when GC will be done
+ ext.movie.children[0].url[0] = '';
+ ext.movie.children[0] = this;
+
+ if (evt.error) return;
+
+ //success !
+ ext.current_url = this.url[0];
+ ext.set_speed(ext.initial_speed);
+ if (ext.initial_start >= 0) {
+ ext.movie_control.mediaStartTime = ext.initial_start;
+ } else {
+ ext.movie_control.mediaStartTime = 0;
+ ext.movie_control.mediaStopTime = ext.initial_start;
+ }
+ ext.movie_control.loop = ext.initial_loop;
+ alert('mc.mST is ' + ext.movie_control.mediaStopTime);
+
+ ext.movie_control.url[0] = ext.current_url;
+ ext.movie_sensor.url[0] = ext.current_url;
+
+ ext.timeshift_depth = 0;
+ ext.time_in_tsb = 0;
+ ext.initial_loop = false;
+ ext.initial_speed = 1;
+ ext.initial_start = 0;
+
+
+ if ((ext.current_url.indexOf('gpac://') == 0) && ((ext.current_url.indexOf('://') < 0) || (ext.current_url.indexOf('file://') == 0))) {
+ ext.local_url = true;
+ } else {
+ ext.local_url = false;
+ }
+
+ ext.root_odm = gpac.get_object_manager(ext.current_url);
+ ext.reverse_playback_supported = ext.root_odm.reverse_playback_supported;
+
+ ext.controler.hide();
+
+				var names = ext.current_url.split('/');
+				if (names.length == 0) names = ext.current_url.split('\\');
+				gpac.caption = names.pop();
+				
+ ext.add_bookmark(ext.current_url, true);
+
+				gwskin.enable_background(false);
+ ext.declare_addons();
+
+ if (ext.initial_service_id) {
+ var odm = gpac.get_object_manager(ext.current_url);
+ if (odm) odm.select_service(ext.initial_service_id);
+ ext.initial_service_id = 0;
+ }
+ if (ext.show_stats_init) {
+ ext.view_stats();
+ }
+ }
+
+ if (!ext.movie_connected) {
+ ext.movie_connected = true;
+ gpac.set_3d(evt.type3d ? 1 : 0);
+ ext.controler.play.switch_icon(ext.icon_pause);
+ ext.dynamic_scene = evt.dynamic_scene;
+ //force display size notif on controler to trigger resize of the window
+ ext.controler.on_display_size(ext.controler.width, ext.controler.height);
+ }
+ if (!gpac.fullscreen && evt.width && evt.height) {
+ var w, h, r_w, r_h;
+ w = evt.width;
+ h = evt.height;
+
+				gpac.set_size(w, h, true);
+
+ if (w > gpac.screen_width) w = gpac.screen_width;
+ if (h > gpac.screen_height) h = gpac.screen_height;
+
+				var min_width = this.extension.def_width;
+				var min_height = this.extension.def_height;
+ r_w = r_h = 1;
+ if (w < min_width) r_w = Math.ceil(min_width / w);
+ if (h < min_height) r_h = Math.ceil(min_height / h);
+ if (r_w < r_h) r_w = r_h;
+ w = r_w * w;
+ h = r_w * h;
+ gpac.set_size(w, h);
+ } else {
+ gpac.set_size(evt.width, evt.height, true);
+ }
+ ext.streamlist_changed();
+
+ if (evt.width) {
+ var e = {};
+ e.type = GF_EVENT_SCENE_SIZE;
+ e.width = evt.width;
+ e.height = evt.height;
+ gwlib_filter_event(e);
+ }
+ }
+ this.movie.children[0].on_addon_found = function (evt) {
+ var e = {};
+ e.type = GF_EVENT_ADDON_DETECTED;
+ e.addon_url = evt.url;
+ e.scene_url = this.url[0];
+ e.discarded = false;
+ gwlib_filter_event(e);
+ }
+
+ this.movie.children[0].on_streamlist_changed = function (evt) {
+ this.extension.streamlist_changed();
+ }
+ this.movie.children[0].on_scene_size_modify = function (evt) {
+ var e = {};
+ e.type = GF_EVENT_SCENE_SIZE;
+ e.width = evt.width;
+ e.height = evt.height;
+ gwlib_filter_event(e);
+ }
+
+ this.movie.children[0].addEventListener('gpac_scene_attached', this.movie.children[0].on_scene_size, 0);
+ this.movie.children[0].addEventListener('gpac_addon_found', this.movie.children[0].on_addon_found, 0);
+ this.movie.children[0].addEventListener('gpac_streamlist_changed', this.movie.children[0].on_streamlist_changed, 0);
+ this.movie.children[0].addEventListener('gpac_scene_size', this.movie.children[0].on_scene_size_modify, 0);
+
+
+ this.movie.children[0].on_media_progress = function (evt) {
+ if (evt.buffering) {
+ this.extension.show_buffer(evt.bufferLevel);
+ this.extension.controler.layout();
+
+ }
+ if (evt.total) {
+ var percent_dload = 100 * evt.loaded / evt.total;
+ if (percent_dload >= 100) percent_dload = 0;
+ this.extension.controler.media_line.set_progress(percent_dload);
+ }
+ }
+
+ this.movie.children[0].on_media_playing = function (evt) {
+ this.extension.show_buffer(-1);
+
+ if (!this.extension.initial_play_done) {
+ this.extension.initial_play_done = true;
+
+ this.extension.controler.play.switch_icon(this.extension.icon_pause);
+
+ if (!this.extension.root_odm) {
+ this.extension.root_odm = gpac.get_object_manager(this.extension.current_url);
+ }
+ if (this.extension.root_odm) {
+ this.extension.declare_addons();
+ }
+ }
+
+ if (this.extension.root_odm) {
+ this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
+ }
+ }
+
+ this.movie.children[0].on_media_end = function (evt) {
+ if (this.extension.duration>1) {
+ if (this.extension.movie_control.loop) {
+ this.extension.movie_control.mediaStartTime = 0;
+ this.extension.current_time = 0;
+ } else if (this.extension.playlist_mode && (this.extension.playlist_idx + 1 < this.extension.playlist.length)) {
+ this.extension.playlist_next();
+ } else {
+ this.extension.set_state(this.extension.GF_STATE_STOP);
+ }
+ }
+ }
+
+ this.movie.children[0].on_media_waiting = function (evt) {
+ // alert('URL is now buffering');
+ }
+ this.movie.children[0].on_tsb_change = function (evt) {
+ if (this.extension.root_odm) {
+ this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
+
+ var main_addon_url = this.extension.root_odm.main_addon_url;
+ if (main_addon_url != null) gwskin.pvr_url = main_addon_url;
+
+ }
+ }
+ this.movie.children[0].on_main_addon = function (evt) {
+ this.extension.reload_stats();
+ this.extension.controler.layout();
+ }
+
+
+ this.movie.children[0].addEventListener('progress', this.movie.children[0].on_media_progress, 0);
+ this.movie.children[0].addEventListener('playing', this.movie.children[0].on_media_playing, 0);
+ this.movie.children[0].addEventListener('canplay', this.movie.children[0].on_media_playing, 0);
+ this.movie.children[0].addEventListener('waiting', this.movie.children[0].on_media_waiting, 0);
+ this.movie.children[0].addEventListener('ended', this.movie.children[0].on_media_end, 0);
+ this.movie.children[0].addEventListener('gpac_timeshift_depth_changed', this.movie.children[0].on_tsb_change, 0);
+ this.movie.children[0].addEventListener('gpac_main_addon_state', this.movie.children[0].on_main_addon, 0);
+
+
+ this.on_movie_duration = function (value) {
+ if (value < 0) value = 0;
+ this.current_duration = value;
+ this.set_duration(value);
+ if (this.UPnP_Enabled) UPnP.MovieDuration = value;
+ }
+
+ this.on_movie_active = function (value) {
+ if (!value) {
+ this.movie_control.mediaStartTime = -1;
+ }
+ }
+
+ this.on_movie_time = function (value) {
+ var diff = this.current_time - value;
+ if (diff < 0) diff = -diff;
+ /*filter out every 1/2 seconds*/
+ if (diff < 0.5) return;
+ this.current_time = value;
+ this.set_time(value);
+ if (this.UPnP_Enabled) UPnP.MovieTime = value;
+ }
+
+ Browser.addRoute(this.movie_sensor, 'mediaDuration', this, this.on_movie_duration);
+ Browser.addRoute(this.movie_sensor, 'mediaCurrentTime', this, this.on_movie_time);
+ Browser.addRoute(this.movie_sensor, 'isActive', this, this.on_movie_active);
+
+ var hist = this.get_option('PlaybackHistory');
+ if ((hist != null) && (hist != '')) {
+ this.history = gwskin.parse(hist);
+ }
+
+ var bmarks = this.get_option('Bookmarks');
+ if ((bmarks != null) && (bmarks != '')) {
+ this.bookmarks = gwskin.parse(bmarks);
+ }
+		
+ /*create player control UI*/
+ var wnd = gw_new_window(null, true, true);
+ //remember it !
+ this.controler = wnd;
+ wnd.extension = this;
+
+ wnd.set_corners(true, true, false, false);
+ wnd.set_alpha(0.9);
+
+		/*create default interactive zone in case the content grabs all mouse events*/
+		this.safe_interact = gw_new_rectangle('button', 'invisible');
+		gw_add_child(null, this.safe_interact);
+		this.safe_interact.show();
+		
+		
+ /*first set of controls*/
+ wnd.infobar = gw_new_grid_container(wnd);
+ wnd.infobar.spread_h = true;
+
+ /*add our controls in order*/
+
+ wnd.media_line = gw_new_progress_bar(wnd.infobar, false, true);
+ wnd.media_line.extension = this;
+ wnd.media_line.on_slide = function (value, type) {
+ if (!this.extension.movie_connected && !this.extension.controlled_renderer) {
+ this.set_value(0);
+ return;
+ }
+
+ var duration = this.extension.duration;
+ var time;
+ if (duration) {
+ time = value * duration / 100;
+ } else if (this.extension.timeshift_depth) {
+ time = (100 - value) * this.extension.timeshift_depth / 100;
+
+ if (this.extension.controlled_renderer) {
+ return;
+ }
+ if (type != 2) return;
+
+ this.extension.movie_control.mediaStopTime = -time;
+ this.extension.controler.layout();
+ return;
+ }
+
+ if (this.extension.controlled_renderer) {
+ this.extension.controlled_renderer.Seek(time);
+ return;
+ }
+ switch (type) {
+ //start sliding 
+ case 1:
+ this.extension.set_state(this.extension.GF_STATE_PAUSE);
+ this.extension.set_speed(0);
+ break;
+ //done sliding 
+ case 2:
+ this.extension.set_state(this.extension.GF_STATE_PLAY);
+ this.extension.movie_control.mediaStartTime = time;
+ this.extension.set_speed(1);
+ break;
+ //init slide, go in play mode 
+ default:
+ if (this.extension.state == this.extension.GF_STATE_STOP)
+ this.extension.set_state(this.extension.GF_STATE_PLAY);
+
+ this.extension.set_state(this.extension.GF_STATE_PAUSE);
+ break;
+ }
+ }
+
+ wnd.time = gw_new_text(wnd.infobar, '00:00:00');
+ gw_object_set_hitable(wnd.time);
+ wnd.time.extension = this;
+ wnd.time.reversed = false;
+ wnd.time.on_down = function (val) {
+ if (!val) return;
+
+ if (this.extension.timeshift_depth) {
+ return;
+ // if (this.extension.movie_control.mediaStopTime < 0)
+ // this.extension.movie_control.mediaStopTime = 0;
+ } else {
+ this.reversed = !this.reversed;
+ this.extension.set_time(this.extension.current_time);
+ }
+ }
+
+ wnd.back_live = gw_new_icon(wnd.infobar, 'live');
+ wnd.back_live.extension = this;
+ wnd.back_live.on_click = function () {
+ if (this.extension.movie_control.mediaStopTime < 0) {
+ this.extension.set_time(0);
+ this.extension.movie_control.mediaStopTime = 0;
+ this.extension.set_state(this.extension.GF_STATE_PLAY);
+ //this.extension.controler.layout();
+ }
+ }
+
+ gw_new_separator(wnd.infobar);
+
+
+ wnd.stop = gw_new_icon(wnd.infobar, 'stop');
+ wnd.stop.extension = this;
+ wnd.stop.on_click = function () {
+ this.extension.set_state(this.extension.GF_STATE_STOP);
+ }
+
+ wnd.rewind = gw_new_icon(wnd.infobar, 'rewind');
+ wnd.rewind.extension = this;
+ wnd.rewind.on_click = function () {
+ if (!this.extension.movie_control.mediaSpeed) {
+ this.extension.set_state(this.extension.GF_STATE_PLAY);
+ }
+ this.extension.set_state(this.extension.GF_STATE_TRICK);
+ if (this.extension.movie_control.mediaSpeed > 0) {
+ this.extension.set_speed(-1.0);
+ this.extension.controler.layout();
+ } else {
+ this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
+ }
+ }
+
+ wnd.play = gw_new_icon(wnd.infobar, 'play');
+ wnd.play.extension = this;
+ this.state = this.GF_STATE_PLAY;
+ wnd.play.add_icon(gwskin.images.pause);
+ wnd.play.on_click = function () {
+ this.extension.set_state((this.extension.state == this.extension.GF_STATE_PLAY) ? this.extension.GF_STATE_PAUSE : this.extension.GF_STATE_PLAY);
+ }
+
+
+ wnd.forward = gw_new_icon_button(wnd.infobar, 'seek_forward', '', true, 'icon_label');
+ wnd.forward.extension = this;
+ wnd.forward.on_click = function () {
+ if (!this.extension.movie_control.mediaSpeed) {
+ this.extension.set_state(this.extension.GF_STATE_PLAY);
+ }
+ this.extension.set_state(this.extension.GF_STATE_TRICK);
+ if (this.extension.movie_control.mediaSpeed < 0) {
+ this.extension.set_speed(1.0);
+ } else {
+ this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
+ }
+ }
+ wnd.forward.on_long_click = function () {
+ if (this.extension.movie_control.mediaSpeed > 0) {
+ this.extension.set_state(this.extension.GF_STATE_TRICK);
+ this.extension.set_speed(this.extension.movie_control.mediaSpeed / 2);
+ }
+ }
+
+ wnd.loop = gw_new_icon(wnd.infobar, 'play_once');
+ wnd.loop.extension = this;
+ wnd.loop.add_icon(gwskin.images.play_loop);
+ // wnd.loop.add_icon(gwskin.images.play_shuffle);
+ wnd.loop.on_click = function () {
+ this.extension.movie_control.loop = this.extension.movie_control.loop ? FALSE : TRUE;
+ this.switch_icon(this.extension.movie_control.loop ? 1 : 0);
+ }
+
+ wnd.media_list = gw_new_icon(wnd.infobar, 'media');
+ wnd.media_list.extension = this;
+ wnd.media_list.hide();
+
+ wnd.channels = gw_new_icon(wnd.infobar, 'channels');
+ wnd.channels.extension = this;
+ wnd.channels.hide();
+
+
+ wnd.navigate = gw_new_icon(wnd.infobar, 'navigation');
+ wnd.navigate.extension = this;
+ wnd.navigate.on_click = function () {
+ this.extension.select_navigation_type();
+ }
+
+ wnd.stats = gw_new_icon(wnd.infobar, 'statistics');
+ wnd.stats.extension = this;
+ wnd.stats.on_click = function () {
+ this.extension.view_stats();
+ }
+
+ gw_new_separator(wnd.infobar);
+
+ wnd.snd_low = gw_new_icon(wnd.infobar, 'audio');
+ wnd.snd_low.extension = this;
+ wnd.snd_ctrl = gw_new_slider(wnd.infobar);
+ wnd.snd_ctrl.extension = this;
+ wnd.snd_ctrl.stick_to_previous = true;
+ wnd.snd_low.add_icon('audio_mute');
+ wnd.snd_low.on_click = function () {
+ if (this.extension.muted) {
+ gpac.volume = this.extension.muted;
+ this.extension.muted = 0;
+ this.switch_icon(0);
+ } else {
+ this.extension.muted = gpac.volume ? gpac.volume : 1;
+ gpac.volume = 0;
+ this.switch_icon(1);
+ }
+ }
+ wnd.snd_ctrl.on_slide = function (value, type) {
+ if (this.extension.muted) this.extension.controler.snd_low.on_click();
+ gpac.volume = value;
+ }
+ wnd.snd_ctrl.set_value(gpac.volume);
+
+ wnd.open = null;
+ if (!gwskin.browser_mode) {
+ wnd.open = gw_new_icon(wnd.infobar, 'file_open');
+ wnd.open.extension = this;
+ wnd.open.on_click = function () {
+ this.extension.open_local_file();
+ }
+ }
+
+ wnd.playlist = gw_new_icon(wnd.infobar, 'playlist');
+ wnd.playlist.extension = this;
+ wnd.playlist.on_click = function () {
+ this.extension.view_playlist();
+ }
+
+ wnd.playlist_prev = gw_new_icon(wnd.infobar, 'playlist_prev');
+ wnd.playlist_prev.extension = this;
+ wnd.playlist_prev.on_click = function () {
+ this.extension.playlist_prev();
+ }
+
+ wnd.playlist_next = gw_new_icon(wnd.infobar, 'playlist_next');
+ wnd.playlist_next.extension = this;
+ wnd.playlist_next.on_click = function () {
+ this.extension.playlist_next();
+ }
+
+
+ wnd.home = null;
+ if (!gwskin.browser_mode) {
+ wnd.home = gw_new_icon(wnd.infobar, 'osmo');
+ wnd.home.extension = this;
+ wnd.home.on_click = function () {
+ this.extension.controler.hide();
+ if (this.extension._evt_filter != null) {
+ gwlib_remove_event_filter(this.extension._evt_filter);
+ this.extension._evt_filter = null;
+ }
+				gwskin.enable_background(true);
+				gw_show_dock();
+				this.extension.disabled = true;
+ }
+ }
+
+
+ if (this.UPnP_Enabled) {
+ wnd.remote = gw_new_icon(wnd.infobar, 'remote_display');
+ wnd.remote.on_click = function () { select_remote_display('push'); }
+ } else {
+ wnd.remote = null;
+ }
+
+ if (gwskin.mobile_device) {
+ wnd.fullscreen = null;
+ wnd.exit = null;
+ } else {
+ wnd.fullscreen = gw_new_icon(wnd.infobar, 'fullscreen');
+ wnd.fullscreen.add_icon(gwskin.images.fullscreen_back);
+ wnd.fullscreen.on_click = function () {
+ gpac.fullscreen = !gpac.fullscreen;
+ }
+ wnd.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
+
+ if (!gwskin.browser_mode) {
+ wnd.exit = gw_new_icon(wnd.infobar, 'exit');
+ wnd.exit.on_click = function () { gpac.exit(); }
+ } else {
+ wnd.exit = null;
+ }
+ }
+
+
+ wnd.on_size = function (width, height) {
+ var control_icon_size = gwskin.default_icon_height;
+ var children = this.infobar.get_children();
+ for (i = 0; i < children.length; i++) {
+ children[i].set_size(control_icon_size, control_icon_size);
+ }
+ if (this.time) this.time.set_size(4 * wnd.time.font_size(), control_icon_size);
+ if (this.snd_ctrl) {
+ this.snd_ctrl.set_size(2 * control_icon_size, control_icon_size / 2, control_icon_size / 3, control_icon_size / 2);
+ this.snd_ctrl.set_value(gpac.volume);
+ }
+
+ var speed = this.extension.movie_control.mediaSpeed;
+ if (speed < 0) speed = -speed;
+ if (speed && (speed != 1)) {
+ if ((speed > 100) || (speed < 1))
+ this.forward.set_size(3 * control_icon_size, control_icon_size);
+ else
+ this.forward.set_size(2 * control_icon_size, control_icon_size);
+ } else {
+ this.forward.set_size(control_icon_size, control_icon_size);
+ }
+ }
+
+ wnd.layout = function (width, height) {
+ var min_w, full_w, time_w;
+ var control_icon_size = gwskin.default_icon_height;
+ var is_over = true;
+ var show_navigate = false;
+ if (arguments.length == 0) {
+ width = this.width;
+ height = this.height;
+ }
+ this.move(0, Math.floor((height - gw_display_height) / 2));
+
+ this.on_size(width, height);
+
+ if (this.fullscreen)
+ this.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
+
+ width -= control_icon_size / 2;
+ min_w = control_icon_size;
+ if (this.time.visible) min_w += this.time.width;
+ if (this.open) min_w += control_icon_size;
+ if (this.home) min_w += control_icon_size;
+ if (this.exit && gpac.fullscreen) min_w += control_icon_size;
+ full_w = 0;
+ if (this.snd_low) full_w += control_icon_size;
+ if (this.snd_ctrl) full_w += this.snd_ctrl.width;
+ if (this.fullscreen) full_w += control_icon_size;
+
+
+ if (this.navigate) {
+ this.navigate.hide();
+ if ( (this.extension.dynamic_scene != 1) && this.extension.movie_connected && (gpac.navigation_type != GF_NAVIGATE_TYPE_NONE)) {
+ show_navigate = true;
+ full_w += control_icon_size;
+ }
+ }
+
+ if (this.extension.movie_connected) {
+ if (this.extension.state == this.extension.GF_STATE_STOP) {
+ this.stats.hide();
+ } else {
+ full_w += control_icon_size;
+ this.stats.show();
+ }
+ if (this.extension.duration || this.extension.timeshift_depth) {
+ full_w += control_icon_size;
+ this.stop.show();
+ full_w += control_icon_size;
+ this.play.show();
+ } else {
+ full_w += control_icon_size;
+ //this.play.show();
+ if (this.extension.state == this.extension.GF_STATE_STOP) {
+ this.stop.hide();
+ this.play.show();
+ } else {
+ this.play.hide();
+ this.stop.show();
+ }
+ }
+
+ if (this.extension.root_odm && !this.extension.dynamic_scene && !this.extension.root_odm.is_over)
+ is_over = false;
+
+ } else {
+ this.stats.hide();
+ this.stop.hide();
+ this.play.hide();
+ }
+
+ if (this.extension.duration) {
+				if (this.forward) full_w += control_icon_size;
+				if (this.extension.duration>1) {
+					if (this.extension.reverse_playback_supported && this.rewind) full_w += control_icon_size;
+					if (this.loop) full_w += control_icon_size;
+				}
+ }
+ else if (this.extension.movie_control.mediaStopTime < 0) {
+ if (this.forward) full_w += control_icon_size;
+ } else if (!is_over) {
+ if (this.forward) full_w += control_icon_size;
+ }
+
+ if ((this.extension.root_odm && this.extension.root_odm.main_addon_on) || this.extension.movie_control.mediaStopTime < 0) {
+ full_w += control_icon_size;
+ this.back_live.show();
+ } else {
+ this.back_live.hide();
+ }
+
+
+ if (this.remote && UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
+ full_w += control_icon_size;
+ }
+ time_w = this.media_line.visible ? 2 * control_icon_size : 0;
+
+ if (this.exit) {
+ if (gpac.fullscreen) {
+ this.exit.show();
+ } else {
+ this.exit.hide();
+ }
+ }
+
+ if (this.media_line.visible)
+ this.media_line.set_size(width - min_w - full_w, control_icon_size / 3);
+
+ if (this.snd_low) this.snd_low.show();
+ if (this.snd_ctrl) this.snd_ctrl.show();
+
+ if (this.extension.duration) {
+ if (this.forward) this.forward.show();
+				if (this.extension.duration>1) {
+					if (this.loop) this.loop.show();
+				}
+ if (this.stop) this.stop.show();
+ }
+ else if ((this.extension.movie_control.mediaStopTime < 0) || (this.extension.movie_control.mediaSpeed < 0)) {
+ if (this.extension.time_in_tsb > 2) {
+ if (this.forward) this.forward.show();
+ } else {
+ if (this.forward) this.forward.hide();
+ }
+ } else if (!is_over) {
+ if (this.forward) this.forward.show();
+ } else {
+ if (this.forward) this.forward.hide();
+ }
+ if (wnd.fullscreen) wnd.fullscreen.show();
+
+ if (this.remote) {
+ if (UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
+ this.remote.show();
+ } else {
+ this.remote.hide();
+ }
+ }
+
+ if (show_navigate) {
+ this.navigate.show();
+ }
+
+ if ((this.extension.duration>1.0) || this.extension.timeshift_depth) {
+ this.media_line.show();
+ this.time.show();
+ } else {
+ this.media_line.hide();
+ this.time.hide();
+ }
+ //this.time.set_size(width - 6*control_icon_size, control_icon_size / 3);
+ this.media_line.set_size(width - this.time.width - 2 * control_icon_size, control_icon_size / 3);
+
+ // this.infobar.set_size(width, control_icon_size);
+ this.infobar.set_size(width, height);
+ this.infobar.move(0, -0.1 * control_icon_size);
+ }
+
+ wnd.on_display_size = function (width, height) {
+			var h;
+			if (!gpac.fullscreen) {
+ if (width < this.extension.def_width) {
+ gpac.set_size(this.extension.def_width, height);
+ return;
+ }
+ } else {
+ if (width < this.extension.def_width) {
+ this.extension.def_width = width;
+ }
+ }
+
+ // this.set_size(w, 1.2 * gwskin.default_icon_height);
+
+ if (this.extension.movie_connected) {
+ h = 3.3 * gwskin.default_icon_height;
+ if (!this.media_line.visible) {
+ h -= gwskin.default_icon_height;
+ }
+ }
+ else h = 1.1 * gwskin.default_icon_height;
+
+
+ this.set_size(this.extension.def_width, h);
+
+			this.extension.safe_interact.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+			this.extension.safe_interact.show();
+			this.extension.safe_interact.move((-gwskin.default_icon_height+width)/2, (gwskin.default_icon_height-height)/2);
+			
+ this.layout();
+ }
+
+ wnd.on_event = function (evt) {
+ if (this.infobar.on_event(evt)) return true;
+ return false;
+ }
+ //make the bar hitable so that clicking on it does not make it disappear
+ gw_object_set_hitable(wnd);
+ wnd.set_size(gw_display_width, 2.2 * gwskin.default_icon_height);
+ this.set_duration(0);
+ this.set_time(0);
+
+
+ this._evt_filter = null;
+ },
+
+ start: function () {
+ if (!this._evt_filter) {
+ this._evt_filter = this.create_event_filter(this);
+ gwlib_add_event_filter(this._evt_filter);
+ }
+
+		this.disabled = false;
+		
+ if (!this.movie) {
+ this.init_extension();
+
+ //check our args
+ var i, argc = gpac.argc;
+ var url_arg = null;
+
+ for (i = 1; i < argc; i++) {
+ var arg = gpac.get_arg(i);
+ if (!arg) break;
+
+ //that's our file
+ if (arg.charAt(0) != '-') {
+ //do not reopen ourselves !
+ if (arg.indexOf('gui.bt') >= 0) continue;
+
+ url_arg
+ if (arg.indexOf('://') < 0) url_arg = 'gpac://' + arg;
+ else url_arg = arg;
+ }
+
+ //MP4Client options taking 2 args
+ else if ((arg == '-rti') || (arg == '-rtix') || (arg == '-c') || (arg == '-cfg') || (arg == '-size') || (arg == '-lf') || (arg == '-log-file') || (arg == '-logs')
+ || (arg == '-opt') || (arg == '-ifce') || (arg == '-views') || (arg == '-run-for')
+ ) {
+ i++;
+ } else if (arg == '-service') {
+ this.initial_service_id = parseInt(gpac.get_arg(i + 1));
+ i++;
+ } else if (arg == '-com') {
+ arg = gpac.get_arg(i + 1);
+ var idx = arg.indexOf('gpac add ');
+
+ if (idx == 0) {
+ this.default_addon = arg.substring(9);
+ }
+
+ i++;
+ } else if (arg == '-addon') {
+ this.default_addon = gpac.get_arg(i + 1);
+ i++;
+ } else if (arg == '-loop') {
+ this.initial_loop = true;
+ } else if (arg == '-stats') {
+ this.show_stats_init = true;
+ } else if (arg == '-speed') {
+ this.initial_speed = Number(gpac.get_arg(i + 1));
+ i++;
+ } else if (arg == '-play-from') {
+ this.initial_start = Number(gpac.get_arg(i + 1));
+ i++;
+ }
+ }
+
+ gwskin.media_url = '';
+ gwskin.pvr_url = '';
+ gwskin.media_time = 0;
+ gwskin.media_clock = 0;
+ gwskin.restore_session = this.create_restore_session(this);
+
+ if (url_arg != null) {
+ this.set_playlist_mode(false);
+ var def_addon = this.default_addon;
+ this.set_movie_url(url_arg);
+ gw_hide_dock();
+ this.default_addon = def_addon;
+ return;
+ }
+ this.set_playlist_mode(true);
+
 /*
- var label = '';
- for (i = 1; i < argc; i++) {
- label += '#'+i + ': ' + gpac.get_arg(i) + '\n';
- }
- var notif = gw_new_message(null, 'GPAC Arguments', label);
- notif.show();
- */
-
- }
-
- this.controler.show();
- gw_hide_dock();
- },
-
- create_event_filter: function (__anobj) {
- return function (evt) {
- __anobj.ext_filter_event(evt);
- }
- },
-
- create_restore_session: function (__anobj) {
- return function (url, media_time, media_clock) {
- __anobj.set_movie_url(url);
- if (media_clock) {
- var time_in_tsb = (new Date()).getTime() - media_clock;
- if (time_in_tsb >= 0) {
- __anobj.initial_start = -time_in_tsb / 1000;
- }
-
- } else {
- __anobj.initial_start = media_time;
- }
- }
- },
-
- declare_addons: function () {
- if (this.default_addon && (this.default_addon != '')) {
- var addon_url = this.default_addon;
- if (addon_url.indexOf('://') < 0) addon_url = 'gpac://' + addon_url;
- this.root_odm.declare_addon(addon_url);
- }
- },
-
- set_time: function (value) {
- var h, m, s, str;
- str = '';
- if (this.timeshift_depth) {
- var pos = 100;
- var time_in_tsb = 0;
-
- if (this.movie_control.mediaStopTime < 0) {
- time_in_tsb = this.root_odm.timeshift_time;
- if (this.timeshift_depth > time_in_tsb) {
- pos = 100 * (this.timeshift_depth - time_in_tsb) / this.timeshift_depth;
- }
- }
- this.controler.media_line.set_value(pos);
-
- gwskin.media_clock = (new Date()).getTime() - time_in_tsb * 1000;
-
- if (!time_in_tsb) {
- this.controler.time.set_label('live');
- this.controler.time.hide();
- this.controler.layout();
- return;
- }
-
- if (!this.controler.time.visible) {
- this.controler.time.show();
- this.controler.layout();
- }
- str = '-';
- value = time_in_tsb;
-
- } else {
- if (!this.duration) return;
-
- this.current_time = value;
- gwskin.media_time = value;
-
- if (this.duration) {
- this.controler.media_line.set_value(100 * value / this.duration);
- }
- if (this.controler.time.reversed) {
- value = this.duration - value;
- str = '-';
- }
- }
-
- h = Math.floor(value / 3600);
- value -= h * 3600;
- m = Math.floor(value / 60);
- value -= m * 60;
- s = Math.floor(value);
- if (h) {
- if (h < 10) str += '0';
- str += h + ':';
- }
- if (m < 10) str += '0';
- str += m + ':';
- if (s < 10) str += '0';
- str += s;
- this.controler.time.set_label(str);
- },
-
- set_duration: function (value) {
- this.duration = value;
- var dlg = this.controler;
- if (!value) {
- if (this.timeshift_depth > 0) {
- return;
- }
- dlg.time.hide();
- dlg.media_line.hide();
- if (dlg.rewind) dlg.rewind.hide();
- dlg.play.hide();
- dlg.forward.hide();
- dlg.loop.hide();
- dlg.time.set_size(0, gwskin.default_icon_height);
- dlg.time.set_width(0);
- } else {
- dlg.time.show();
- dlg.media_line.show();
- if (dlg.rewind) dlg.rewind.show();
- dlg.stop.show();
- dlg.forward.show();
- dlg.loop.show();
- if (value < 3600) {
- dlg.time.set_size(gwskin.default_icon_height / 2, gwskin.default_icon_height);
- dlg.time.set_width(3 * dlg.time.font_size());
- } else {
- dlg.time.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
- dlg.time.set_width(4 * dlg.time.font_size());
- }
- }
- dlg.layout();
- },
- set_timeshift_depth: function (value) {
- if (this.timeshift_depth == value) return;
-
- this.timeshift_depth = value;
- var dlg = this.controler;
-
- if (!value) {
- dlg.time.hide();
- dlg.media_line.hide();
- if (dlg.rewind) dlg.rewind.hide();
- if (dlg.forward) dlg.forward.hide();
- dlg.time.set_size(0, gwskin.default_icon_height);
- dlg.time.set_width(0);
- } else {
- dlg.time.show();
- dlg.media_line.show();
- /*
- if (dlg.rewind) dlg.rewind.show();
- if (dlg.stop) dlg.stop.show();
- if (dlg.forward) dlg.forward.show();
- if (dlg.loop) dlg.loop.show();
- */
- var w = 3 * dlg.time.font_size();
- if (value > 3600) w += dlg.time.font_size();
-
- dlg.time.set_size(w, gwskin.default_icon_height);
- dlg.time.set_width(w);
- }
- dlg.layout();
- },
-
- set_state: function (state) {
- if (!this.movie_connected && !this.controlled_renderer) return;
-
- if (state == this.state) return;
-
- if (state == this.GF_STATE_STOP) {
- if (this.stat_wnd) this.stat_wnd.close_all();
- this.stoped_url = '' + this.current_url;
- if (this.controlled_renderer) this.controlled_renderer.Stop();
- else {
- this.set_movie_url('');
- /*override movie_connected to avoid auto-resizing*/
- this.movie_connected = true;
- }
- this.movie_control.mediaStartTime = 0;
- this.controler.media_line.set_value(0);
- this.controler.play.switch_icon(this.icon_play);
- this.state = this.GF_STATE_STOP;
- this.set_speed(1);
- this.root_odm = null;
- return;
- }
- if (state == this.GF_STATE_PAUSE) {
- if (this.state == this.GF_STATE_STOP) return;
- if (this.controlled_renderer) this.controlled_renderer.Pause();
- this.state = this.GF_STATE_PAUSE;
- this.controler.play.switch_icon(this.icon_play);
- this.set_speed(0);
- return;
- }
- //we are playing, resume from stop if needed
- if (this.stoped_url) {
- if (this.controlled_renderer) {
- this.controlled_renderer.Play();
- } else {
- this.set_movie_url(this.stoped_url, true);
- }
- this.stoped_url = null;
- //not in trick mode, next pause/play will restart from current time
- if (state != this.GF_STATE_TRICK)
- this.movie_control.mediaStartTime = -1;
- }
-
-
- if (state == this.GF_STATE_PLAY) {
- if (this.controlled_renderer) this.controlled_renderer.Play();
- this.state = state;
- this.controler.play.switch_icon(this.icon_pause);
- if (this.movie_control.mediaSpeed != 1);
- this.movie_control.mediaStartTime = -1;
- this.set_speed(1);
- return;
- }
- if (state == this.GF_STATE_TRICK) {
- this.state = state;
- this.controler.play.switch_icon(this.icon_play);
- this.movie_control.mediaStartTime = -1;
- return;
- }
- },
-
-
- set_speed: function (value) {
- this.movie_control.mediaSpeed = value;
-
- if (!this.duration && this.timeshift_depth && !value) {
- this.movie_control.mediaStopTime = -0.1;
- //
- this.movie_control.mediaStartTime = -1;
- }
- if (value && value != 1) {
- if (value > 1)
- this.controler.forward.set_label('x' + value);
- else
- this.controler.forward.set_label('x' + Math.round(100 * value) / 100);
- } else {
- this.controler.forward.set_label('');
- }
- this.controler.layout();
- },
-
- set_movie_url: function (url) {
- this.initial_play_done = false;
-
- gwskin.media_url = url;
- gwskin.pvr_url = '';
-
- if ((url == '') || (url == this.current_url)) {
- this.movie.children[0].url[0] = url;
- this.movie_control.url[0] = url;
- this.movie_sensor.url[0] = url;
- if (this.UPnP_Enabled) UPnP.MovieURL = url;
- this.movie_connected = (url == '') ? false : true;
- gw_background_control(this.movie_connected ? false : true);
- gpac.caption = url;
-
- } else if (this.controlled_renderer == null) {
- //resume from stop 
- if ((arguments.length == 2) && (arguments[1] == true)) {
- this.current_url = url;
- this.set_speed(1);
- this.movie_control.mediaStartTime = 0;
- this.movie_control.url[0] = url;
- this.movie_sensor.url[0] = url;
- this.movie.children[0].url[0] = url;
- gw_background_control(false);
-
- return;
- }
-
- this.default_addon = null;
- this.root_odm = null;
-
- /*create a temp inline holding the previous scene, use it as the main movie and use the old inline to test the resource. 
- This avoids messing up with event targets already setup*/
- var movie_inline = this.movie.children[0];
- var temp_inline = new SFNode('Inline');
- if (typeof movie_inline.url[0] != 'undefined')
- temp_inline.url[0] = movie_inline.url[0];
-
- this.movie.children[0] = temp_inline;
-
- movie_inline.callback_done = false;
- this.movie_connected = false;
-
- /*handle navigation between local files*/
- if ((this.current_url && this.current_url.indexOf('gpac://') >= 0) && (url.indexOf('://') < 0)) {
- movie_inline.url[0] = "gpac://" + url;
- } else {
- movie_inline.url[0] = url;
- }
-
- if (!movie_inline.callback_done) {
- gw_add_child(this.dictionary, movie_inline);
- }
-
- return;
-
- } else {
- var uri = UPnP.ShareResource(url);
- this.controlled_renderer.Open(uri);
- }
- this.current_url = url;
-
- if (url == '') this.controler.show();
- else this.controler.hide();
-
- },
-
-
- show_buffer: function (level) {
- if ((level < 0) || (level >= 98)) {
- if (this.buffer_wnd) {
- this.buffer_wnd.close();
- this.buffer_wnd = null;
- }
- return;
- }
-
- if (!this.buffer_wnd) {
- this.buffer_wnd = gw_new_window(null, true, true);
- this.buffer_wnd.txt = gw_new_text(this.buffer_wnd, '');
- this.buffer_wnd.on_display_size = function (w, h) {
- this.set_size(20 * gwskin.default_text_font_size, 2 * gwskin.default_text_font_size);
- this.txt.set_width(20 * gwskin.default_text_font_size);
- this.move(0, h / 2 - gwskin.default_text_font_size);
- }
- this.buffer_wnd.on_display_size(gw_display_width, gw_display_height);
- this.buffer_wnd.set_alpha(0.9);
- this.buffer_wnd.show();
- this.buffer_wnd.show();
-
- this.buffer_wnd.timer = gw_new_timer(false);
- this.buffer_wnd.timer.wnd = this.buffer_wnd;
- this.buffer_wnd.timer.set_timeout(gwskin.default_message_timeout, false);
- this.buffer_wnd.timer.start(0);
- this.buffer_wnd.timer.on_active = function (val) {
- if (!val) this.wnd.close();
- }
-
- }
-
- this.buffer_wnd.timer.stop(gwskin.default_message_timeout);
- this.buffer_wnd.txt.set_label('Buffering ' + level + ' %');
- },
-
- select_navigation_type: function () {
- var nb_items = 0;
- var type = gpac.navigation;
- if (this.navigation_wnd) {
- this.navigation_wnd.close();
- return;
- }
- var wnd = gw_new_popup(this.controler.navigate, 'up');
- this.navigation_wnd = wnd;
- wnd.extension = this;
-
- wnd.on_close = function () {
- this.extension.navigation_wnd = null;
- }
-
- wnd.select = function (type) {
- this.extension.navigation_wnd = null;
- if (type == 'reset') {
- gpac.navigation_type = 0;
- } else {
- gpac.navigation = type;
- }
- }
- wnd.make_select_item = function (text, type, current_type) {
- if (current_type == type) text = '* ' + text;
- wnd.add_menu_item(text, function () { this.select(type); });
- }
- wnd.add_menu_item('Reset', function () { this.select('reset'); });
-
- wnd.make_select_item('None', GF_NAVIGATE_NONE, type);
- wnd.make_select_item('Slide', GF_NAVIGATE_SLIDE, type);
- wnd.make_select_item('Examine', GF_NAVIGATE_EXAMINE, type);
-
- if (gpac.navigation_type == GF_NAVIGATE_TYPE_3D) {
- wnd.make_select_item('Walk', GF_NAVIGATE_WALK, type);
- wnd.make_select_item('Fly', GF_NAVIGATE_FLY, type);
- wnd.make_select_item('Pan', GF_NAVIGATE_PAN, type);
- wnd.make_select_item('Game', GF_NAVIGATE_GAME, type);
- wnd.make_select_item('Orbit', GF_NAVIGATE_ORBIT, type);
- wnd.make_select_item('VR', GF_NAVIGATE_VR, type);
- }
- wnd.on_display_size(gw_display_width, gw_display_height);
- wnd.show();
- },
-
- streamlist_changed: function () {
- this.services = [];
-
- var root_odm = this.root_odm;
-
- if (root_odm) {
- for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
- var m = root_odm.get_resource(res_i);
- if (!m || !m.service_id) continue;
- var res = null;
- for (var k = 0; k < this.services.length; k++) {
- if (this.services[k].service_id == m.service_id) {
- res = this.services[k];
- break;
- }
- }
- if (res == null) {
- this.services.push(m);
- }
- }
- }
-
- if (this.services.length <= 1) {
- this.controler.channels.hide();
- this.controler.channels.on_click = function () { }
- this.controler.layout();
- return;
- }
- if (!this.controler.channels.visible) {
- this.controler.channels.show();
- this.controler.layout();
- }
-
- this.controler.channels.on_click = function () {
-
- if (this.extension.channels_wnd) {
- this.extension.channels_wnd.close();
- return;
- }
- var wnd = gw_new_popup(this.extension.controler.channels, 'up');
- this.extension.channels_wnd = wnd;
- wnd.extension = this.extension;
-
- wnd.on_close = function () {
- this.extension.channels_wnd = null;
- }
-
- wnd.make_item = function (text, i) {
- wnd.add_menu_item(text, function () {
- this.extension.root_odm.select_service(this.extension.services[i].service_id);
- });
- }
- for (var i = 0; i < this.extension.services.length; i++) {
- var text = '';
- var n = this.extension.services[i].service_name;
- if (this.extension.root_odm.selected_service == this.extension.services[i].service_id) text += '* ';
- if (n == null) n = 'Service ' + this.extension.services[i].service_id;
- text += n;
- wnd.make_item(text, i);
- }
- wnd.on_display_size(gw_display_width, gw_display_height);
- wnd.show();
- }
-
- }
-
-
-};
-
+ var label = '';
+ for (i = 1; i < argc; i++) {
+ label += '#'+i + ': ' + gpac.get_arg(i) + '\n';
+ }
+ var notif = gw_new_message(null, 'GPAC Arguments', label);
+ notif.show();
+ */
+
+ }
+
+ this.controler.show();
+ gw_hide_dock();
+ },
+
+ create_event_filter: function (__anobj) {
+ return function (evt) {
+ return __anobj.ext_filter_event(evt);
+ }
+ },
+
+ create_restore_session: function (__anobj) {
+ return function (url, media_time, media_clock) {
+			__anobj.movie_connected = false;
+			__anobj.disabled = false;
+ __anobj.set_movie_url(url);
+ if (media_clock) {
+ var time_in_tsb = (new Date()).getTime() - media_clock;
+ if (time_in_tsb >= 0) {
+ __anobj.initial_start = -time_in_tsb / 1000;
+ }
+
+ } else {
+ __anobj.initial_start = media_time;
+ }
+			if (!__anobj.movie_connected) {
+				__anobj.reverse_playback_supported = false;
+				__anobj.duration = 0;
+				__anobj.root_odm = null;
+			}
+			__anobj.controler.on_display_size(gw_display_width, gw_display_height);
+ }
+ },
+
+ declare_addons: function () {
+ if (this.default_addon && (this.default_addon != '')) {
+ var addon_url = this.default_addon;
+ if (addon_url.indexOf('://') < 0) addon_url = 'gpac://' + addon_url;
+ this.root_odm.declare_addon(addon_url);
+ }
+ },
+
+ set_time: function (value) {
+ var h, m, s, str;
+ str = '';
+ if (this.timeshift_depth) {
+ var pos = 100;
+ this.time_in_tsb = 0;
+
+ if ((this.movie_control.mediaStopTime < 0) || (this.movie_control.mediaSpeed <= 0)) {
+ this.time_in_tsb = this.root_odm.timeshift_time;
+ if (this.timeshift_depth > this.time_in_tsb) {
+ pos = 100 * (this.timeshift_depth - this.time_in_tsb) / this.timeshift_depth;
+ } else if (this.time_in_tsb) {
+ pos = 0;
+ }
+ }
+ this.controler.media_line.set_value(pos);
+
+ //we need to figure out if the main addon is on-demand content, in which case we have to store media time for session restore
+ var addon_media_time = this.root_odm.main_addon_media_time;
+ if (addon_media_time >= 0) {
+ gwskin.media_clock = 0;
+ gwskin.media_time = addon_media_time;
+ }
+ //if not, we will restore the session based on wallclock 
+ else {
+ gwskin.media_clock = (new Date()).getTime() - this.time_in_tsb * 1000;
+ }
+
+ if (!this.time_in_tsb) {
+ this.controler.time.set_label('');
+ this.controler.time.hide();
+ this.controler.layout();
+ return;
+ }
+
+ if (!this.controler.time.visible) {
+ this.controler.time.show();
+ this.controler.layout();
+ }
+ if (!this.controler.forward.visible) {
+ this.controler.forward.show();
+ this.controler.layout();
+ }
+ str = '-';
+ value = this.time_in_tsb;
+
+ } else {
+ if (!this.duration) {
+ if (this.controler.time.visible) {
+ this.controler.time.hide();
+ this.controler.layout();
+ }
+ return;
+ }
+
+ this.current_time = value;
+ gwskin.media_time = value;
+
+ if (this.duration) {
+ this.controler.media_line.set_value(100 * value / this.duration);
+ }
+ if (this.controler.time.reversed) {
+ value = this.duration - value;
+ str = '-';
+ }
+ }
+
+ h = Math.floor(value / 3600);
+ value -= h * 3600;
+ m = Math.floor(value / 60);
+ value -= m * 60;
+ s = Math.floor(value);
+ if (h) {
+ if (h < 10) str += '0';
+ str += h + ':';
+ }
+ if (m < 10) str += '0';
+ str += m + ':';
+ if (s < 10) str += '0';
+ str += s;
+ this.controler.time.set_label(str);
+ },
+
+ set_duration: function (value) {
+ this.duration = value;
+ var dlg = this.controler;
+ if (!value) {
+ if (this.timeshift_depth > 0) {
+ return;
+ }
+ dlg.time.hide();
+ dlg.media_line.hide();
+ dlg.rewind.hide();
+ dlg.play.hide();
+ dlg.forward.hide();
+ dlg.loop.hide();
+ dlg.time.set_size(0, gwskin.default_icon_height);
+ dlg.time.set_width(0);
+ } else {
+			if (value>1) {
+				dlg.time.show();
+				dlg.media_line.show();
+				if (this.reverse_playback_supported) dlg.rewind.show();
+				dlg.loop.show();
+				if (value < 3600) {
+					dlg.time.set_size(gwskin.default_icon_height / 2, gwskin.default_icon_height);
+					dlg.time.set_width(3 * dlg.time.font_size());
+				} else {
+					dlg.time.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+					dlg.time.set_width(4 * dlg.time.font_size());
+				}
+			} else {
+				dlg.time.hide();
+				dlg.media_line.hide();
+				dlg.rewind.hide();
+				dlg.loop.hide();
+			}
+			dlg.stop.show();
+ dlg.forward.show();
+ }
+ dlg.on_display_size(gw_display_width, gw_display_height);
+ },
+ set_timeshift_depth: function (value) {
+ if (this.timeshift_depth == value) return;
+
+ this.timeshift_depth = value;
+ var dlg = this.controler;
+
+ this.reverse_playback_supported = this.root_odm.reverse_playback_supported;
+
+ if (!value) {
+ dlg.time.hide();
+ dlg.media_line.hide();
+ if (dlg.rewind) dlg.rewind.hide();
+ if (dlg.forward) dlg.forward.hide();
+ dlg.time.set_size(0, gwskin.default_icon_height);
+ dlg.time.set_width(0);
+ } else {
+ dlg.time.show();
+ dlg.media_line.show();
+
+ var w = 3 * dlg.time.font_size();
+ if (value > 3600) w += dlg.time.font_size();
+
+ dlg.time.set_size(w, gwskin.default_icon_height);
+ dlg.time.set_width(w);
+ }
+ dlg.on_display_size(gw_display_width, gw_display_height);
+ },
+
+ set_state: function (state) {
+ if (!this.movie_connected && !this.controlled_renderer) return;
+
+ if (state == this.state) return;
+
+ if (state == this.GF_STATE_STOP) {
+ if (this.stat_wnd) this.stat_wnd.close_all();
+ this.stoped_url = '' + this.current_url;
+ if (this.controlled_renderer) this.controlled_renderer.Stop();
+ else {
+ this.set_movie_url('');
+ /*override movie_connected to avoid auto-resizing*/
+ this.movie_connected = true;
+ }
+ this.movie_control.mediaStartTime = 0;
+ this.controler.media_line.set_value(0);
+ this.controler.play.switch_icon(this.icon_play);
+ this.state = this.GF_STATE_STOP;
+ this.set_speed(1);
+ this.root_odm = null;
+
+			var e = {};
+			e.type = GF_JS_EVENT_PLAYBACK;
+			e.is_playing = false;
+			e.index = this.playlist_idx;
+			gwlib_filter_event(e);
+			return;
+ }
+ if (state == this.GF_STATE_PAUSE) {
+ if (this.state == this.GF_STATE_STOP) return;
+ if (this.controlled_renderer) this.controlled_renderer.Pause();
+ this.state = this.GF_STATE_PAUSE;
+ this.controler.play.switch_icon(this.icon_play);
+ this.set_speed(0);
+
+			var e = {};
+			e.type = GF_JS_EVENT_PLAYBACK;
+			e.is_playing = false;
+			e.index = this.playlist_idx;
+			gwlib_filter_event(e);
+			return;
+ }
+ //we are playing, resume from stop if needed
+ if (this.stoped_url) {
+ if (this.controlled_renderer) {
+ this.controlled_renderer.Play();
+ } else {
+ this.set_movie_url(this.stoped_url, true);
+ }
+ this.stoped_url = null;
+ //not in trick mode, next pause/play will restart from current time
+ if (state != this.GF_STATE_TRICK)
+ this.movie_control.mediaStartTime = -1;
+ }
+
+
+ if (state == this.GF_STATE_PLAY) {
+ if (this.controlled_renderer) this.controlled_renderer.Play();
+ this.state = state;
+ this.controler.play.switch_icon(this.icon_pause);
+ if (this.movie_control.mediaSpeed != 1)
+ this.movie_control.mediaStartTime = -1;
+
+ if (this.timeshift_depth && (this.movie_control.mediaSpeed < 0)) {
+ this.movie_control.mediaStopTime = -this.root_odm.timeshift_time;
+ }
+
+ this.set_speed(1);
+			var e = {};
+			e.type = GF_JS_EVENT_PLAYBACK;
+			e.is_playing = true;
+			e.index = this.playlist_idx;
+			gwlib_filter_event(e);
+ return;
+ }
+ if (state == this.GF_STATE_TRICK) {
+ this.state = state;
+ this.controler.play.switch_icon(this.icon_play);
+ this.movie_control.mediaStartTime = -1;
+ return;
+ }
+ },
+
+
+ set_speed: function (value) {
+ this.movie_control.mediaSpeed = value;
+
+ if (!this.duration && this.timeshift_depth && !value) {
+ this.movie_control.mediaStopTime = -0.1;
+ //
+ this.movie_control.mediaStartTime = -1;
+ }
+ if (value && value != 1) {
+ if (value > 1)
+ this.controler.forward.set_label('x' + value);
+ else
+ this.controler.forward.set_label('x' + Math.round(100 * value) / 100);
+ } else {
+ this.controler.forward.set_label('');
+ }
+ this.controler.layout();
+ },
+
+ set_movie_url: function (url) {
+ this.initial_play_done = false;
+
+ gwskin.media_url = url;
+ gwskin.pvr_url = '';
+
+ if ((url == '') || (url == this.current_url)) {
+ this.movie.children[0].url[0] = url;
+ this.movie_control.url[0] = url;
+ this.movie_sensor.url[0] = url;
+ if (this.UPnP_Enabled) UPnP.MovieURL = url;
+ this.movie_connected = (url == '') ? false : true;
+ gpac.caption = url;
+			this.controler.layout();
+
+ } else if (this.controlled_renderer == null) {
+ //resume from stop 
+ if ((arguments.length == 2) && (arguments[1] == true)) {
+ this.current_url = url;
+ this.set_speed(1);
+ this.movie_control.mediaStartTime = 0;
+ this.movie_control.url[0] = url;
+ this.movie_sensor.url[0] = url;
+ this.movie.children[0].url[0] = url;
+ return;
+ }
+
+ this.default_addon = null;
+ this.root_odm = null;
+
+ /*create a temp inline holding the previous scene, use it as the main movie and use the old inline to test the resource. 
+ This avoids messing up with event targets already setup*/
+ var movie_inline = this.movie.children[0];
+ var temp_inline = new SFNode('Inline');
+ if (typeof movie_inline.url[0] != 'undefined')
+ temp_inline.url[0] = movie_inline.url[0];
+
+ this.movie.children[0] = temp_inline;
+
+ movie_inline.callback_done = false;
+ this.movie_connected = false;
+
+ /*handle navigation between local files*/
+ if ((this.current_url && this.current_url.indexOf('gpac://') >= 0) && (url.indexOf('://') < 0)) {
+ movie_inline.url[0] = "gpac://" + url;
+ } else {
+ movie_inline.url[0] = url;
+ }
+
+ if (!movie_inline.callback_done) {
+ gw_add_child(this.dictionary, movie_inline);
+ }
+
+ return;
+
+ } else {
+ var uri = UPnP.ShareResource(url);
+ this.controlled_renderer.Open(uri);
+ }
+ this.current_url = url;
+
+		if (this.disabled) return;
+ if (url == '') this.controler.show();
+ else this.controler.hide();
+
+ },
+
+
+ show_buffer: function (level) {
+ if (level < 0) return;
+ if (level >= 98) {
+ if (this.buffer_wnd) {
+ this.buffer_wnd.close();
+ this.buffer_wnd = null;
+ }
+ return;
+ }
+
+ if (!this.buffer_wnd) {
+ this.buffer_wnd = gw_new_window(null, true, true);
+ this.buffer_wnd.show_effect = 'notif';
+ this.buffer_wnd.txt = gw_new_text(this.buffer_wnd, '');
+ this.buffer_wnd.on_display_size = function (w, h) {
+ this.set_size(20 * gwskin.default_text_font_size, 2 * gwskin.default_text_font_size);
+ this.txt.set_width(20 * gwskin.default_text_font_size);
+ this.move(0, h / 2 - gwskin.default_text_font_size);
+ }
+ this.buffer_wnd.on_display_size(gw_display_width, gw_display_height);
+ this.buffer_wnd.set_alpha(0.9);
+ this.buffer_wnd.show();
+
+ this.buffer_wnd.timer = gw_new_timer(false);
+ this.buffer_wnd.timer.wnd = this.buffer_wnd;
+ this.buffer_wnd.timer.set_timeout(gwskin.default_message_timeout, false);
+ this.buffer_wnd.timer.start(0);
+ this.buffer_wnd.ext = this;
+ this.buffer_wnd.timer.on_active = function (val) {
+ if (!val) {
+ this.wnd.ext.buffer_wnd = null;
+ this.wnd.close();
+ }
+ }
+ }
+ this.buffer_wnd.timer.stop(gwskin.default_message_timeout);
+ this.buffer_wnd.txt.set_label('Buffering ' + level + ' %');
+ },
+
+ select_navigation_type: function () {
+ var nb_items = 0;
+ var type = gpac.navigation;
+ if (this.navigation_wnd) {
+ this.navigation_wnd.close();
+ return;
+ }
+ var wnd = gw_new_popup(this.controler.navigate, 'up');
+ this.navigation_wnd = wnd;
+ wnd.extension = this;
+
+ wnd.on_close = function () {
+ this.extension.navigation_wnd = null;
+ }
+
+ wnd.select = function (type) {
+ this.extension.navigation_wnd = null;
+ if (type == 'reset') {
+ gpac.navigation_type = 0;
+ } else {
+ gpac.navigation = type;
+ }
+ }
+ wnd.make_select_item = function (text, type, current_type) {
+ if (current_type == type) text = '* ' + text;
+ if (gpac.navigation_supported(type)) {
+ wnd.add_menu_item(text, function () { this.select(type); });
+ }
+ }
+ wnd.add_menu_item('Reset', function () { this.select('reset'); });
+
+ wnd.make_select_item('None', GF_NAVIGATE_NONE, type);
+ wnd.make_select_item('Slide', GF_NAVIGATE_SLIDE, type);
+ wnd.make_select_item('Examine', GF_NAVIGATE_EXAMINE, type);
+
+ if (gpac.navigation_type == GF_NAVIGATE_TYPE_3D) {
+ wnd.make_select_item('Walk', GF_NAVIGATE_WALK, type);
+ wnd.make_select_item('Fly', GF_NAVIGATE_FLY, type);
+ wnd.make_select_item('Pan', GF_NAVIGATE_PAN, type);
+ wnd.make_select_item('Game', GF_NAVIGATE_GAME, type);
+ wnd.make_select_item('Orbit', GF_NAVIGATE_ORBIT, type);
+ wnd.make_select_item('VR', GF_NAVIGATE_VR, type);
+ }
+ wnd.on_display_size(gw_display_width, gw_display_height);
+ wnd.show();
+ },
+
+ streamlist_changed: function () {
+ this.services = [];
+
+ var root_odm = this.root_odm;
+
+ if (root_odm) {
+ for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
+ var m = root_odm.get_resource(res_i);
+ if (!m || !m.service_id) continue;
+ var res = null;
+ for (var k = 0; k < this.services.length; k++) {
+ if (this.services[k].service_id == m.service_id) {
+ res = this.services[k];
+ break;
+ }
+ }
+ if (res == null) {
+ this.services.push(m);
+ }
+ }
+ }
+
+ if (this.services.length <= 1) {
+ this.controler.channels.hide();
+ this.controler.channels.on_click = function () { }
+ this.controler.layout();
+		} else {
+			if (!this.controler.channels.visible) {
+				this.controler.channels.show();
+				this.controler.layout();
+			}
+
+			this.controler.channels.on_click = function () {
+
+				if (this.extension.channels_wnd) {
+					this.extension.channels_wnd.close();
+					return;
+				}
+				var wnd = gw_new_popup(this.extension.controler.channels, 'up');
+				this.extension.channels_wnd = wnd;
+				wnd.extension = this.extension;
+
+				wnd.on_close = function () {
+					this.extension.channels_wnd = null;
+				}
+
+				wnd.make_item = function (text, i) {
+					wnd.add_menu_item(text, function () {
+						this.extension.root_odm.select_service(this.extension.services[i].service_id);
+					});
+				}
+				for (var i = 0; i < this.extension.services.length; i++) {
+					var text = '';
+					var n = this.extension.services[i].service_name;
+					if (this.extension.root_odm.selected_service == this.extension.services[i].service_id) text += '* ';
+					if (n == null) n = 'Service ' + this.extension.services[i].service_id;
+					text += n;
+					wnd.make_item(text, i);
+				}
+				wnd.on_display_size(gw_display_width, gw_display_height);
+				wnd.show();
+			}
+		}
+		this.update_media_list();
+ },
+	
+	update_media_list: function() {
+		var root_odm = this.root_odm;
+		var nb_video = 0, nb_audio = 0, nb_subs = 0;
+		if (root_odm && this.dynamic_scene) {
+			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
+				var m = root_odm.get_resource(res_i);
+				if (root_odm.selected_service != m.service_id) continue;
+				
+				if (m.type == 'Video') nb_video++;
+				else if (m.type == 'Audio') nb_audio++;
+				else if (m.type == 'Text') nb_subs++;
+			}
+		}
+		if ((nb_video > 1) || (nb_audio > 1) || (nb_subs > 1)) {
+			this.controler.media_list.show();
+		} else {
+			this.controler.media_list.hide();
+			this.controler.layout();
+			return;
+		}
+
+		this.controler.media_list.on_click = function () {
+			
+			if (this.extension.medialist_wnd) {
+				this.extension.medialist_wnd.close();
+				return;
+			}
+			var wnd = gw_new_popup(this.extension.controler.media_list, 'up');
+			this.extension.medialist_wnd = wnd;
+			wnd.extension = this.extension;
+			
+			wnd.on_close = function () {
+				this.extension.medialist_wnd = null;
+			}
+			
+			wnd.make_item = function (text, obj) {
+				wnd.add_menu_item(text, function () {
+								 obj.select()
+								 });
+			}
+			
+			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
+				var m = root_odm.get_resource(res_i);
+				if (root_odm.selected_service != m.service_id) continue;
+
+				if ((m.type == 'Video') && (nb_video>1)) {
+					var text = 'Video #'+m.id;
+					wnd.make_item(text, m);
+				} else if (m.type=='Audio' && (nb_audio>1)) {
+					var text = 'Audio '+m.lang;
+					wnd.make_item(text, m);
+				} else if (m.type=='Text' && (nb_subs>1)) {
+					var text = 'Subtitle '+m.lang;
+					wnd.make_item(text, m);
+				}
+			}
+			wnd.on_display_size(gw_display_width, gw_display_height);
+			wnd.show();
+		}
+	
+	}
+
+
+};
+

v0.5.2.tar.gz/gui/extensions/player/playlist.js -> v0.6.1.tar.gz/gui/extensions/player/playlist.js Changed

@@ -1,16 +1,42 @@
 
 extension.playlist_wnd = null;
 
+extension.playlist_filter_event = function(evt) {
+	switch (evt.type) {
+	case GF_JS_EVENT_PLAYLIST_ADD:
+		this.add_playlist_item(evt.url);
+		return true;
+	case GF_JS_EVENT_PLAYLIST_RESET:
+		this.reset_playlist();
+		return true;
+	case GF_JS_EVENT_PLAYLIST_PLAY:
+		this.playlist_idx = evt.index - 1;
+		this.start();
+			this.playlist_next();
+		return true;
+	default:
+		return false;
+	}
+}
+
+extension.create_playlist_event_filter = function (__anobj) {
+	return function (evt) {
+		return __anobj.playlist_filter_event(evt);
+	}
+}
+
+extension.pl_event_filter = null;
+
 
 extension.playlist = [];
-var plist = gpac.get_option('GUI', 'Playlist');
+var plist = extension.get_option('Playlist');
 
 if ((plist != null) && (plist != '')) {
 extension.playlist = gwskin.parse(plist);
 }
 
 extension.playlist_idx = 0;
-var plistidx = gpac.get_option('GUI', 'PlaylistIndex');
+var plistidx = extension.get_option('PlaylistIndex');
 if (plistidx != null) {
 extension.playlist_idx = parseInt(plistidx);
 }
@@ -80,6 +106,7 @@
 popup.area.break_at_line = true;
 
 popup.set_size(0.9 * this.width, 0.9 * this.height);
+ popup.move(this.translation.x, this.translation.y);
 
 if (directory) {
 var item = gw_new_icon_button(popup.area, 'scan_directory', 'Add directory', true, 'listitem');
@@ -120,7 +147,7 @@
 }
 }
 popup.area.layout();
- //popup.set_alpha(this.get_alpha());
+ popup.set_alpha(1);
 
 popup.on_close = function () {
 this.fb.enable();
@@ -198,7 +225,7 @@
 }
 this.area.layout();
 
- gpac.set_option('GUI', 'Playlist', gwskin.stringify(this.extension.playlist));
+ this.extension.set_option('Playlist', gwskin.stringify(this.extension.playlist));
 }
 
 plist._sort_type = 0;
@@ -213,7 +240,7 @@
 wnd.extension.playlist.sort( function (a, b) { return a.name < b.name;} );
 wnd._sort_type = 0;
 }
- gpac.set_option('GUI', 'Playlist', gwskin.stringify(wnd.extension.playlist));
+ wnd.extension.set_option('Playlist', gwskin.stringify(wnd.extension.playlist));
 wnd.refresh_items();
 }
 
@@ -228,9 +255,9 @@
 plist.trash = plist.add_tool('trash');
 plist.trash.on_click = function () {
 this.dlg.area.reset_children();
- this.dlg.extension.playlist = []; 
- gpac.set_option('GUI', 'Playlist', gwskin.stringify(this.dlg.extension.playlist));
- gpac.set_option('GUI', 'PlaylistIndex', '0');
+ this.dlg.extension.playlist = [];
+ this.dlg.extension.set_option('Playlist', gwskin.stringify(this.dlg.extension.playlist));
+ this.dlg.extension.set_option('PlaylistIndex', '0');
 this.dlg.extension.set_playlist_mode(true);
 
 this.disable();
@@ -275,17 +302,21 @@
 extension.playlist_mode = false;
 extension.set_playlist_mode = function(value)
 {
+	
+	if (!this.pl_event_filter) {
+		this.pl_event_filter = this.create_playlist_event_filter(this);
+		gwlib_add_event_filter(this.pl_event_filter);
+	}
+	
 if (!value || (this.playlist.length<=1)) {
 if (this.controler.playlist_next.visible) {
 this.controler.playlist_next.hide();
 this.controler.playlist_prev.hide();
- extension.controler.layout();
 }
 } else {
 if (!this.controler.playlist_next.visible) {
 this.controler.playlist_next.show();
 this.controler.playlist_prev.show();
- extension.controler.layout();
 }
 if (this.playlist_idx == 0) {
 this.controler.playlist_next.enable();
@@ -297,30 +328,56 @@
 }
 
 extension.playlist_mode = value;
-}
-
-extension.playlist_play = function (pl_item) {
- this.set_playlist_mode(true);
- this.set_movie_url(pl_item.path + pl_item.name);
-
- //save current index
- this.playlist_idx = this.playlist.indexOf(pl_item);
- gpac.set_option('GUI', 'PlaylistIndex', '' + this.playlist_idx);
+	this.controler.layout();
+}
+
+extension.playlist_play = function (pl_item) {
+ this.set_playlist_mode(true);
+ this.set_movie_url(pl_item.path + pl_item.name);
+
+ //save current index
+ this.playlist_idx = this.playlist.indexOf(pl_item);
+ this.set_option('PlaylistIndex', '' + this.playlist_idx);
+
+
+	var e = {};
+	e.type = GF_JS_EVENT_PLAYBACK;
+	e.is_playing = true;
+	e.index = this.playlist_idx;
+	gwlib_filter_event(e);
 }
 
 extension.playlist_next = function()
 {
 if (this.playlist_idx + 1 == this.playlist.length) return;
 this.playlist_idx++;
- this.playlist_play( this.playlist[extension.playlist_idx] );
+ this.playlist_play( this.playlist[this.playlist_idx] );
 }
 
 extension.playlist_prev = function()
 {
 if (!this.playlist_idx) return;
 this.playlist_idx--;
- this.playlist_play( this.playlist[extension.playlist_idx] );
+ this.playlist_play( this.playlist[this.playlist_idx] );
 }
 
+extension.add_playlist_item = function(file)
+{
+	var obj = {};
+	var names = file.split('/');
+	if (names.length == 0) names = file.split('\\');
+	obj.name = names.pop();
+	var len = file.length - obj.name.length;
+	obj.path = file.slice(0, len);
+	this.playlist.push(obj);
+	
+	this.set_playlist_mode(true);
+}
+
+extension.reset_playlist = function()
+{
+	this.playlist = [];
+	this.playlist_idx = -1;
+}
 
 
\ No newline at end of file

v0.5.2.tar.gz/gui/extensions/player/stats.js -> v0.6.1.tar.gz/gui/extensions/player/stats.js Changed

@@ -1,573 +1,606 @@
-
-extension.view_stats = function () {
- if (this.stat_wnd) {
- this.stat_wnd.close();
- this.stat_wnd = null;
- return;
- }
-
- var wnd = gw_new_window_full(null, true, 'Stats');
- gw_object_set_dragable(wnd);
- this.stat_wnd = wnd;
- wnd.extension = this;
-
- wnd.area = gw_new_grid_container(wnd);
- wnd.area.break_at_hidden = true;
- wnd.area.spread_h = false;
- wnd.area.spread_v = true;
-
- var root_odm = this.root_odm;
- var nb_http = root_odm.nb_http;
- var nb_buffering = 0;
- var nb_ntp_diff = 0;
-
- wnd.has_select = false;
- wnd.objs = [];
-
- wnd.gather_res = function (root, selected_service) {
- //if not dynamic scene, add main OD to satts
- if (!root.dynamic_scene)
- this.objs.push(root);
-
- for (var res_i = 0; res_i < root.nb_resources; res_i++) {
- var m = root.get_resource(res_i);
- if (!m) continue;
- if (m.service_id && (m.service_id != selected_service)) continue;
-
- if (!m.dynamic_scene) {
- this.objs.push(m);
- }
-
- if (m.type == 'Scene' || m.type == 'Subscene') {
- this.gather_res(m);
- }
- }
- }
-
- wnd.gather_res(root_odm, root_odm.selected_service);
-
- for (var res_i = 0; res_i < wnd.objs.length; res_i++) {
- var m = wnd.objs[res_i];
- m.gui = {};
-
- var label = '' + m.type;
- label += ' ID ' + m.ID;
- if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
- else if (m.samplerate) label += ' (' + m.samplerate + ' Hz ' + m.channels + ' channels)';
-
- m.gui.txt = gw_new_text(wnd.area, label, 'lefttext');
-
-
- m.gui.info = gw_new_icon(wnd.area, 'information');
-
- m.gui.info.odm = m;
- m.gui.info.on_click = function () {
- if (this.odm.gui.info_wnd) {
- this.odm.gui.info_wnd.close();
- return;
- }
- var odm = this.odm;
- var iw = gw_new_window_full(null, true, '' + odm.type + ' ' + odm.ID + ' statistics:');
- odm.gui.info_wnd = iw;
- gw_object_set_dragable(iw);
- iw.odm = odm;
-
- iw.on_close = function (width, height) {
- this.timer.stop();
- this.odm.gui.info_wnd = null;
- }
-
- iw.area = gw_new_text_area(iw, '');
-
- iw.on_display_size = function (width, height) {
- var w = 30 * gwskin.default_text_font_size;
- var h = 2 * gwskin.default_icon_height + 11 * gwskin.default_text_font_size;
- this.set_size(w, h);
- }
-
- iw.timer = gw_new_timer(false);
- iw.timer.wnd = iw;
- iw.timer.set_timeout(0.1, true);
- iw.timer.on_event = function (val) {
- var bw;
- var m = this.wnd.odm;
- if (!m) return;
- var label = '';
-
- this.wnd.children[0].spacing = 1.2;
-
- if (m.width) {
- var fps = m.frame_duration;
- label += 'Size:' + m.width + 'x' + m.height;
- if (m.pixelformat) label += ' (' + m.par + ' ' + m.pixelformat + ')';
- } else {
- label += '' + m.samplerate + 'Hz ' + m.channels + ' channels';
- }
- label += '\n'
- label += 'Status: ' + m.status + ' - clock time: ' + m.clock_time + ' (drift ' + m.clock_drift + ')';
-
- label += '\n'
- label += 'Composition Memory: ' + m.cb_unit_count + '/' + m.cb_capacity;
-
- label += '\n'
- label += 'Buffer: ' + m.buffer + ' ms (min ' + m.min_buffer + ' - max ' + m.max_buffer + ') ' + m.db_unit_count + ' AUs in DB';
-
- label += '\n'
- var dec_time = m.total_dec_time / m.dec_frames / 1000;
- var max_time = m.max_dec_time / 1000;
- label += '' + m.dec_frames + ' frames (' + m.drop_frames + ' dropped) - ' + Math.round(100 * dec_time) / 100 + ' ms/frame (max ' + Math.round(m.max_dec_time / 10) / 100 + ') ';
-
- if (m.irap_frames && (m.dec_frames != m.irap_frames)) {
- label += '\n'
- dec_time = m.irap_dec_time / m.irap_frames / 1000;
- label += 'Average GOP size: ' + Math.round(m.dec_frames / m.irap_frames) + ' - ' + Math.round(100 * dec_time) / 100 + ' ms/irap (max ' + Math.round(m.irap_max_time / 10) / 100 + ') ';
- }
- label += '\n'
- label += 'Average bitrate: ';
- bw = m.avg_bitrate;
- if (bw < 8000000) label += '' + Math.round(bw / 1024) + ' kbps';
- else label += '' + Math.round(bw / 1024 / 1024) + ' mbps';
-
- label += ' - Maximum ';
- bw = m.max_bitrate;
- if (bw < 8000000) label += '' + Math.round(bw / 1024) + ' kbps';
- else label += '' + Math.round(bw / 1024 / 1024) + ' mbps';
-
- label += '\n'
- label += 'Download bandwidth: ';
- var bw = m.bandwidth_down;
- if (bw < 8000000) label += '' + Math.round(bw / 1024) + ' kbps';
- else label += '' + Math.round(bw / 1024 / 1024) + ' mbps';
-
- label += '\n'
- label += 'Codec: ' + m.codec;
-
- label += '\n'
-
- var myurl;
- if (m.service_url.indexOf('\\') >= 0) {
- myurl = m.service_url.split('\\');
- } else {
- myurl = m.service_url.split('/');
- }
-
- label += 'Service: ' + myurl.pop();
- if (m.service_id)
- label += ' - ID ' + m.service_id;
-
- this.wnd.area.set_content(label);
- }
-
- odm.gui.info_wnd.on_display_size(gw_display_width, gw_display_height);
- odm.gui.info_wnd.set_alpha(0.9);
- odm.gui.info_wnd.show();
-
- }
-
- m.gui.buffer = null;
- m.gui.play = null;
-
- if (m.selected_service == m.service_id) {
- if (m.max_buffer) {
- nb_buffering++;
- m.gui.buffer = gw_new_gauge(wnd.area, 'Buffer');
- }
- if (m.ntp_diff) nb_ntp_diff++;
- } else if (!m.is_addon) {
- m.gui.play = gw_new_icon(wnd.area, 'play');
- m.gui.play.odm = m;
- m.gui.play.wnd = wnd;
- m.gui.play.on_click = function () {
- this.odm.select_service(this.odm.service_id);
- this.wnd.close_all();
- }
- }
-
- if (m.nb_qualities > 1) {
- wnd.has_select = true;
- m.gui.select_label = gw_new_button(wnd.area, 'Quality');
- m.gui.select_label.odm = m;
- m.gui.select_label.on_click = function () {
- var idx = this.odm.gui.select.value;
- if (this.odm.gui.selected_idx == idx) {
- this.on_long_click();
- return;
- }
-
- if (idx) {
- if (this.odm.gui.qualities[idx - 1].disabled) {
- var notif = gw_new_message(null, 'Cannot select representation', 'Representation has been disabled');
- notif.set_size(20 * gwskin.default_text_font_size, (2 * gwskin.default_icon_height + gwskin.default_text_font_size));
- notif.show();
- return;
- }
- this.odm.select_quality(this.odm.gui.qualities[idx - 1].ID);
- } else {
- this.odm.select_quality('auto');
-
- this.odm.update_qualities();
- }
- }
- m.gui.select_label.on_long_click = function () {
- var idx = this.odm.gui.select.value;
- if (!idx) return;
- var q = this.odm.gui.qualities[idx - 1];
-
- var iw = gw_new_window_full(null, true, 'Representation ' + q.ID + ' info');
- gw_object_set_dragable(iw);
- iw.area = gw_new_text_area(iw, '');
-
- var label = 'Mime ' + q.mime + ' - codecs ' + q.codec;
- label += '\n';
- label += 'Bandwidth: ' + q.bandwidth;
- label += '\n';
- label += 'Enabled: ' + !q.disabled;
- label += '\n';
- if (q.width) {
- label += 'Size ' + q.width + 'x' + q.height + (q.interlaced ? ' interlaced @' : ' progressive @') + q.fps + ' FPS - SAR ' + q.par_num + '/' + q.par_den;
- } else {
- label += 'Samplerate ' + q.samplerate + ' Hz - ' + q.channels + ' channels';
- }
-
- iw.area.set_content(label);
-
- iw.on_display_size = function (width, height) {
- var w = 25 * gwskin.default_text_font_size;
- var h = 2 * gwskin.default_icon_height + 5 * gwskin.default_text_font_size;
- this.set_size(w, h);
- }
-
- iw.on_display_size(gw_display_width, gw_display_height);
- iw.set_alpha(0.9);
- iw.show();
- }
-
- m.gui.select = gw_new_spincontrol(wnd.area, true);
- m.gui.select.odm = m;
- m.gui.select.on_click = function (val) {
- this.odm.show_select(val);
- }
-
-
- m.update_qualities = function () {
- var sel_idx = 0;
- this.gui.qualities = [];
- for (i = 0; i < this.nb_qualities; i++) {
- var q = this.get_quality(i);
- if (q) {
- this.gui.qualities.push(q);
- }
- }
- this.gui.qualities.sort(function (a, b) { return a.bandwidth - b.bandwidth });
-
- for (i = 0; i < this.gui.qualities.length; i++) {
- if (this.gui.qualities[i].is_selected)
- sel_idx = i + 1;
- }
-
- this.gui.select.min = 0;
- this.gui.select.max = m.nb_qualities;
- if (this.gui.selected_idx != sel_idx) {
- this.show_select(sel_idx);
- this.gui.selected_idx = sel_idx;
- this.gui.select.value = sel_idx;
- }
- }
-
- m.show_select = function (idx) {
- if (!idx) {
- this.gui.select_label.set_label('Auto');
- } else {
- var label = '';
- var q = this.gui.qualities[idx - 1];
- if (!q) return;
-
- if (q.is_selected) label += '*';
-
- if (q.width) {
- label += q.height + (q.interlaced ? 'i' : 'p');
- } else if (q.samplerate) {
- label += q.samplerate;
- if (q.channels) label += '/' + q.channels;
- }
- if (q.bandwidth < 1000000) label += '@' + Math.round(q.bandwidth / 1000) + 'K';
- else label += '@' + Math.round(q.bandwidth / 10000) / 100 + 'M';
-
- this.gui.select_label.set_label(label);
- }
- }
- m.update_qualities();
-
- } else {
- m.gui.select = null;
- m.gui.select_label = null;
- }
-
- nb_http += m.nb_http;
-
- gw_new_separator(wnd.area);
- }
-
- wnd.http_control = null;
- if (nb_http) {
- wnd.http_text = gw_new_text(wnd.area, 'HTTP rate', 'lefttext');
- wnd.http_control = gw_new_slider(wnd.area);
-
- if (gpac.http_max_bitrate) {
- var br = Math.round(100 * gpac.http_max_bitrate / 1024 / 1024) / 100;
- if (br > 200) bt = 200;
- if (br <= 1) {
- v = 30 * br;
- } else if (br <= 10) {
- v = 30 + 30 * br / 10;
- } else if (br < 50) {
- v = 60 + 20 * (br - 10) / 40;
- } else {
- v = 80 + 20 * (br - 50) / 150;
- }
- wnd.http_control.set_value(v);
-
- wnd.http_text.set_label('HTTP cap ' + Math.round(100 * gpac.http_max_bitrate / 1024 / 1024) / 100 + ' Mbps');
-
- } else {
- wnd.http_control.set_value(0);
- wnd.http_text.set_label('HTTP cap off');
- }
-
- wnd.http_control.text = wnd.http_text;
- wnd.http_control.on_slide = function (val) {
- var br = 0;
- if (val <= 30) {
- br = val / 30;
- } else if (val <= 60) {
- br = 1 + 10 * (val - 30) / 30;
- } else if (val < 80) {
- br = 10 + 40 * (val - 60) / 20;
- } else {
- br = 50 + 150 * (val - 80) / 20;
- }
- if (br) {
- this.text.set_label('HTTP cap ' + Math.round(100 * br) / 100 + ' Mbps');
- } else {
- this.text.set_label('HTTP cap off');
- }
- gpac.http_max_bitrate = Math.round(br * 1024 * 1024);
- }
-
- gw_new_separator(wnd.area);
- }
-
- wnd.plot = gw_new_plotter(wnd.area);
-
-
- wnd.on_display_size = function (width, height) {
- var w;
- var h = 2 * gwskin.default_icon_height;
-
- w = 20 * gwskin.default_text_font_size;
- w += 4 * gwskin.default_icon_height;
- if (this.has_select)
- w += 4 * gwskin.default_icon_height;
-
- for (var i = 0; i < this.objs.length; i++) {
- var aw = w;
-
- this.objs[i].gui.info.set_size(1.5 * gwskin.default_icon_height, gwskin.default_icon_height);
- aw -= this.objs[i].gui.info.width;
-
- if (this.objs[i].gui.buffer) {
- this.objs[i].gui.buffer.set_size(3 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
- }
- if (this.objs[i].gui.play) {
- this.objs[i].gui.play.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
- }
- aw -= 4 * gwskin.default_icon_height;
-
- if (this.objs[i].gui.select) {
- this.objs[i].gui.select.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
- aw -= gwskin.default_icon_height;
- this.objs[i].gui.select_label.set_size(4 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
- aw -= 4 * gwskin.default_icon_height;
- }
-
-
- this.objs[i].gui.txt.set_size(aw, gwskin.default_icon_height);
- this.objs[i].gui.txt.set_width(aw);
- h += gwskin.default_icon_height;
- }
-
- if (this.plot) {
- this.plot.set_size(w, 8 * gwskin.default_icon_height);
- h += 8 * gwskin.default_icon_height;
- }
-
- if (wnd.http_control) {
- wnd.http_text.set_size(11 * gwskin.default_text_font_size, gwskin.default_icon_height);
- wnd.http_control.set_size(w - 11 * gwskin.default_text_font_size, 0.2 * gwskin.default_icon_height);
- h += gwskin.default_icon_height;
- }
-
- this.set_size(w, h);
- this.move((w - width) / 2, (height - h) / 2);
- }
- wnd.on_close = function () {
- this.timer.stop();
- this.objs = [];
- this.extension.stat_wnd = null;
- }
-
- wnd.timer = gw_new_timer(false);
- wnd.timer.wnd = wnd;
- wnd.timer.set_timeout(0.25, true);
-
- var label = 'Statistics (' + gpac.nb_cores + ' cores - ';
- if (gpac.system_memory > 1000000000) label += '' + Math.round(gpac.system_memory / 1024 / 1024 / 1024) + ' GB RAM)';
- else label += '' + Math.round(gpac.system_memory / 1024 / 1024) + ' MB RAM)';
-
- wnd.set_label(label);
-
- wnd.stats = [];
- wnd.stats_window = 32;
-
- if (wnd.plot) {
- wnd.s_fps = wnd.plot.add_serie('FPS', 'Hz', 0.8, 0, 0);
- if (nb_http) {
- wnd.s_bw = wnd.plot.add_serie('BW', 'Mbps', 0.8, 0, 0.8);
- } else {
- wnd.s_bw = null;
- }
- wnd.s_bitrate = wnd.plot.add_serie('Rate', 'Mbps', 0, 0.8, 0);
- if (nb_buffering)
- wnd.s_buf = wnd.plot.add_serie('Buffer', 's', 0, 0, 0.8);
- else
- wnd.s_buf = null;
-
- if (nb_ntp_diff)
- wnd.s_ntp = wnd.plot.add_serie('NTP diff', 'ms', 0, 0.3, 0.8);
- else
- wnd.s_ntp = null;
-
- wnd.s_cpu = wnd.plot.add_serie('CPU', '%', 0, 0.5, 0.5);
- wnd.s_mem = wnd.plot.add_serie('MEM', 'MB', 0.5, 0.5, 0);
-
- }
-
- wnd.timer.on_event = function (val) {
- var wnd = this.wnd;
- var nb_buff = 0;
- 
- var stat_obj = null;
- //stats every second
- if (!(val % 4)) {
- if (wnd.stats.length >= wnd.stats_window) {
- wnd.stats.splice(0, 1);
- }
- stat_obj = {};
- wnd.stats.push(stat_obj);
-
- var t = new Date()
- stat_obj.time = Math.round(t.getTime() / 1000);
- stat_obj.fps = Math.round(100 * gpac.fps) / 100;
- stat_obj.cpu = gpac.cpu;
- stat_obj.memory = Math.round(100 * gpac.memory / 1024 / 1024) / 100;
- stat_obj.bitrate = 0;
- if (wnd.s_bw) {
- var b = gpac.http_bitrate / 1024 / 1024;
- stat_obj.http_bandwidth = Math.round(100 * b) / 100;
- }
- stat_obj.buffer = 0;
- stat_obj.cumulated_bandwidth = 0;
- stat_obj.ntp_diff = 0;
- }
-
- for (var i = 0; i < wnd.objs.length; i++) {
- var m = wnd.objs[i];
- 
- if (m.gui.buffer) {
- var label = ' ' + m.type;
- label += ' ID ' + m.ID;
- if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
- else if (m.samplerate) label += ' (' + m.samplerate + ' Hz ' + m.channels + ' channels)';
- m.gui.txt.set_label(label);
-
- var bl;
- if (m.max_buffer) {
- var speed = wnd.extension.movie_control.mediaSpeed;
- if (speed < 0) speed = 1;
- else if (speed == 0) speed = 1;
- var buf = m.buffer / speed;
- bl = 100 * buf / m.max_buffer;
-
- if (stat_obj) {
-// if (stat_obj.buffer < buf) {
-// stat_obj.buffer = buf;
-// }
-
- stat_obj.buffer += buf;
- nb_buff++;
- }
- }
- else bl = 100;
- m.gui.buffer.set_value(bl);
-
- m.gui.buffer.set_label('' + Math.round(m.buffer / 10) / 100 + ' s');
-
- if (stat_obj) {
- bl = m.ntp_diff;
- if (bl > stat_obj.ntp_diff) 
- stat_obj.ntp_diff = bl;
- }
- }
-
- if (stat_obj) {
- stat_obj.bitrate += Math.round(100 * m.avg_bitrate / 1024 / 1024) / 100;
- stat_obj.cumulated_bandwidth += m.bandwidth_down;
- }
- }
-
- if (stat_obj && wnd.stats.length) {
- wnd.s_fps.refresh_serie(wnd.stats, 'time', 'fps', wnd.stats_window, 4);
- if (wnd.s_bw) {
- wnd.s_bw.refresh_serie(this.wnd.stats, 'time', 'http_bandwidth', wnd.stats_window, 1);
- }
- if (wnd.s_buf) {
- if (nb_buff) {
- stat_obj.buffer /= nb_buff;
- }
- wnd.s_buf.refresh_serie(this.wnd.stats, 'time', 'buffer', wnd.stats_window, 1.5);
- }
- if (stat_obj.bitrate) {
- wnd.s_bitrate.refresh_serie(this.wnd.stats, 'time', 'bitrate', wnd.stats_window, 2);
- } else {
- wnd.s_bitrate.hide();
- }
- if (wnd.s_ntp) {
- wnd.s_ntp.refresh_serie(this.wnd.stats, 'time', 'ntp_diff', wnd.stats_window, 3);
- }
- 
- wnd.s_cpu.refresh_serie(wnd.stats, 'time', 'cpu', wnd.stats_window, 10);
- wnd.s_mem.refresh_serie(wnd.stats, 'time', 'memory', wnd.stats_window, 6);
- }
- }
-
- wnd.quality_changed = function () {
- for (var i = 0; i < this.objs.length; i++) {
- var m = this.objs[i];
- m.update_qualities();
- }
- }
- wnd.close_all = function () {
- for (var i = 0; i < this.objs.length; i++) {
- if (this.objs[i].gui.info_wnd) {
- this.objs[i].gui.info_wnd.odm = null;
- this.objs[i].gui.info_wnd.close();
- }
- }
- this.objs.length = 0;
- this.close();
- }
- wnd.on_display_size(gw_display_width, gw_display_height);
- wnd.set_alpha(0.9);
- wnd.show();
-};
+
+extension.reload_stats = function () {
+ if (this.stat_wnd) {
+ this.stat_wnd.reload_request = true;
+ this.stat_wnd.close();
+ }
+}
+
+extension.view_stats = function () {
+ if (this.stat_wnd) {
+ this.stat_wnd.close();
+ this.stat_wnd = null;
+ return;
+ }
+
+ var wnd = gw_new_window_full(null, true, 'Stats');
+ gw_object_set_dragable(wnd);
+ this.stat_wnd = wnd;
+ wnd.extension = this;
+ wnd.reload_request = false;
+
+ wnd.area = gw_new_grid_container(wnd);
+ wnd.area.break_at_hidden = true;
+ wnd.area.spread_h = false;
+ wnd.area.spread_v = true;
+
+ var root_odm = this.root_odm;
+ var nb_http = root_odm.nb_http;
+ var nb_buffering = 0;
+ var nb_ntp_diff = 0;
+
+ wnd.has_select = false;
+ wnd.objs = [];
+
+ wnd.gather_res = function (root, selected_service) {
+ //if not dynamic scene, add main OD to stats
+ if (!root.dynamic_scene)
+ this.objs.push(root);
+
+ for (var res_i = 0; res_i < root.nb_resources; res_i++) {
+ var m = root.get_resource(res_i);
+ if (!m) continue;
+ if (m.service_id && (m.service_id != selected_service)) continue;
+
+ if (!m.dynamic_scene) {
+ this.objs.push(m);
+ }
+
+ if (m.type == 'Scene' || m.type == 'Subscene') {
+ this.gather_res(m);
+ }
+ }
+ }
+
+ wnd.gather_res(root_odm, root_odm.selected_service);
+
+ for (var res_i = 0; res_i < wnd.objs.length; res_i++) {
+ var m = wnd.objs[res_i];
+ m.gui = {};
+
+ var label = '' + m.type;
+
+ if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
+ else if (m.samplerate) label += ' (' + m.samplerate + ' Hz ' + m.channels + ' channels)';
+ else if (m.scalable_enhancement) label += ' (Enhancement Layer)';
+
+ m.gui.txt = gw_new_text(wnd.area, label, 'lefttext');
+
+
+ if (m.nb_qualities > 1) {
+ wnd.has_select = true;
+ m.gui.select_label = gw_new_button(wnd.area, 'Quality');
+ m.gui.select_label.odm = m;
+ m.gui.select_label.on_click = function () {
+ var idx = this.odm.gui.select.value;
+ if (this.odm.gui.selected_idx == idx) {
+ this.on_long_click();
+ return;
+ }
+
+ if (idx) {
+ if (this.odm.gui.qualities[idx - 1].disabled) {
+ var notif = gw_new_message(null, 'Cannot select representation', 'Representation has been disabled');
+ notif.set_size(20 * gwskin.default_text_font_size, (2 * gwskin.default_icon_height + gwskin.default_text_font_size));
+ notif.show();
+ return;
+ }
+ this.odm.select_quality(this.odm.gui.qualities[idx - 1].ID);
+ } else {
+ this.odm.select_quality('auto');
+
+ this.odm.update_qualities();
+ }
+ }
+ m.gui.select_label.on_long_click = function () {
+ var idx = this.odm.gui.select.value;
+ if (!idx) return;
+ var q = this.odm.gui.qualities[idx - 1];
+
+ var iw = gw_new_window_full(null, true, 'Representation ' + q.ID + ' info');
+ gw_object_set_dragable(iw);
+ iw.area = gw_new_text_area(iw, '');
+
+ var label = 'Mime ' + q.mime + ' - codecs ' + q.codec;
+ label += '\n';
+ label += 'Bandwidth: ' + q.bandwidth;
+ label += '\n';
+ label += 'Enabled: ' + !q.disabled;
+ label += '\n';
+ if (q.width) {
+ label += 'Size ' + q.width + 'x' + q.height + (q.interlaced ? ' interlaced @' : ' progressive @') + q.fps + ' FPS - SAR ' + q.par_num + '/' + q.par_den;
+ } else if (q.samplerate) {
+ label += 'Samplerate ' + q.samplerate + ' Hz - ' + q.channels + ' channels';
+ }
+
+ iw.area.set_content(label);
+
+ iw.on_display_size = function (width, height) {
+ var w = 25 * gwskin.default_text_font_size;
+ var h = 2 * gwskin.default_icon_height + 5 * gwskin.default_text_font_size;
+ this.set_size(w, h);
+ }
+
+ iw.on_display_size(gw_display_width, gw_display_height);
+ iw.set_alpha(0.9);
+ iw.show();
+ }
+
+ m.gui.select = gw_new_spincontrol(wnd.area, true);
+ m.gui.select.odm = m;
+ m.gui.select.on_click = function (val) {
+ this.odm.show_select(val);
+ }
+
+
+ m.update_qualities = function () {
+ var sel_idx = 0;
+ this.gui.qualities = [];
+ for (i = 0; i < this.nb_qualities; i++) {
+ var q = this.get_quality(i);
+ if (q) {
+ this.gui.qualities.push(q);
+ }
+ }
+ this.gui.qualities.sort(function (a, b) { return a.bandwidth - b.bandwidth });
+
+ for (i = 0; i < this.gui.qualities.length; i++) {
+ if (this.gui.qualities[i].is_selected)
+ sel_idx = i + 1;
+ }
+
+ this.gui.select.min = 0;
+ this.gui.select.max = m.nb_qualities;
+ if (this.gui.selected_idx != sel_idx) {
+ this.show_select(sel_idx);
+ this.gui.selected_idx = sel_idx;
+ this.gui.select.value = sel_idx;
+ }
+ }
+
+ m.show_select = function (idx) {
+ if (!idx) {
+ this.gui.select_label.set_label('Auto');
+ } else {
+ var label = '';
+ var q = this.gui.qualities[idx - 1];
+ if (!q) return;
+
+ if (q.is_selected) label += '*';
+
+ if (q.width) {
+ label += q.height + (q.interlaced ? 'i' : 'p');
+ } else if (q.samplerate) {
+ label += q.samplerate;
+ if (q.channels) label += '/' + q.channels;
+ }
+ if (q.bandwidth < 1000000) label += '@' + Math.round(q.bandwidth / 1000) + 'K';
+ else label += '@' + Math.round(q.bandwidth / 10000) / 100 + 'M';
+
+ this.gui.select_label.set_label(label);
+ }
+ }
+ m.update_qualities();
+
+ } else {
+ m.gui.select = null;
+ m.gui.select_label = null;
+ m.update_qualities = function () { }
+ }
+
+
+ m.gui.info = gw_new_icon(wnd.area, 'information');
+
+ m.gui.info.odm = m;
+ m.gui.info.on_click = function () {
+ if (this.odm.gui.info_wnd) {
+ this.odm.gui.info_wnd.close();
+ return;
+ }
+ var odm = this.odm;
+ var iw = gw_new_window_full(null, true, '' + odm.type + ' ' + odm.ID + ' statistics:');
+ odm.gui.info_wnd = iw;
+ gw_object_set_dragable(iw);
+ iw.odm = odm;
+
+ iw.on_close = function (width, height) {
+ this.timer.stop();
+ this.odm.gui.info_wnd = null;
+ }
+
+ iw.area = gw_new_text_area(iw, '');
+
+ iw.on_display_size = function (width, height) {
+ var w = 30 * gwskin.default_text_font_size;
+ var h = 2 * gwskin.default_icon_height + 11 * gwskin.default_text_font_size;
+ this.set_size(w, h);
+ }
+
+ iw.timer = gw_new_timer(false);
+ iw.timer.wnd = iw;
+ iw.timer.set_timeout(0.1, true);
+ iw.timer.on_event = function (val) {
+ var bw;
+ var m = this.wnd.odm;
+ if (!m) return;
+ var label = '';
+
+ this.wnd.children[0].spacing = 1.2;
+
+ if (m.width) {
+ var fps = m.frame_duration;
+ label += 'Size:' + m.width + 'x' + m.height;
+ if (m.pixelformat) label += ' (' + m.par + ' ' + m.pixelformat + ')';
+ } else if (m.samplerate) {
+ label += '' + m.samplerate + 'Hz ' + m.channels + ' channels';
+ }
+ label += '\n'
+ label += 'Status: ' + m.status + ' - clock time: ' + m.clock_time + ' (drift ' + m.clock_drift + ')';
+
+ label += '\n'
+ label += 'Composition Memory: ' + m.cb_unit_count + '/' + m.cb_capacity;
+
+ label += '\n'
+ label += 'Buffer: ' + m.buffer + ' ms (min ' + m.min_buffer + ' - max ' + m.max_buffer + ') ' + m.db_unit_count + ' AUs in DB';
+
+ label += '\n'
+ var dec_time = m.total_dec_time / m.dec_frames / 1000;
+ var max_time = m.max_dec_time / 1000;
+ label += '' + m.dec_frames + ' frames (' + m.drop_frames + ' dropped) - ' + Math.round(100 * dec_time) / 100 + ' ms/frame (max ' + Math.round(m.max_dec_time / 10) / 100 + ') ';
+
+ if (m.irap_frames && (m.dec_frames != m.irap_frames)) {
+ label += '\n'
+ dec_time = m.irap_dec_time / m.irap_frames / 1000;
+ label += 'Average GOP size: ' + Math.round(m.dec_frames / m.irap_frames) + ' - ' + Math.round(100 * dec_time) / 100 + ' ms/irap (max ' + Math.round(m.irap_max_time / 10) / 100 + ') ';
+ }
+ label += '\n'
+ label += 'Average bitrate: ';
+ bw = m.avg_bitrate;
+ if (bw < 8000000) label += '' + Math.round(bw / 1000) + ' kbps';
+ else label += '' + Math.round(bw / 1000 / 1000) + ' mbps';
+
+ label += ' - Maximum ';
+ bw = m.max_bitrate;
+ if (bw < 8000000) label += '' + Math.round(bw / 1000) + ' kbps';
+ else label += '' + Math.round(bw / 1000 / 1000) + ' mbps';
+
+ label += '\n'
+ label += 'Download bandwidth: ';
+ var bw = m.bandwidth_down;
+ if (bw < 8000) label += '' + bw + ' kbps';
+ else label += '' + Math.round(bw / 1000) + ' mbps';
+
+ label += '\n'
+ label += 'Codec: ' + m.codec;
+
+ label += '\n'
+
+ var myurl;
+ if (m.service_url.indexOf('\\') >= 0) {
+ myurl = m.service_url.split('\\');
+ } else {
+ myurl = m.service_url.split('/');
+ }
+
+ label += 'Service: ' + myurl.pop();
+ if (m.service_id)
+ label += ' - ID ' + m.service_id;
+
+ this.wnd.area.set_content(label);
+ }
+
+ odm.gui.info_wnd.on_display_size(gw_display_width, gw_display_height);
+ odm.gui.info_wnd.set_alpha(0.9);
+ odm.gui.info_wnd.show();
+
+ }
+
+ m.gui.buffer = null;
+ m.gui.play = null;
+
+ if (m.selected_service == m.service_id) {
+ if (m.max_buffer) {
+ nb_buffering++;
+ m.gui.buffer = gw_new_gauge(wnd.area, 'Buffer');
+ }
+ if (m.ntp_diff) nb_ntp_diff++;
+ } else if (!m.is_addon) {
+ m.gui.play = gw_new_icon(wnd.area, 'play');
+ m.gui.play.odm = m;
+ m.gui.play.wnd = wnd;
+ m.gui.play.on_click = function () {
+ this.odm.select_service(this.odm.service_id);
+ this.wnd.close_all();
+ }
+ }
+
+ nb_http += m.nb_http;
+
+ gw_new_separator(wnd.area);
+ }
+
+ wnd.http_control = null;
+ if (nb_http) {
+ wnd.http_text = gw_new_text(wnd.area, 'HTTP rate', 'lefttext');
+
+ wnd.http_control = gw_new_slider(wnd.area);
+
+ if (gpac.http_max_bitrate) {
+ var br = Math.round(100 * gpac.http_max_bitrate / 1000 / 1000) / 100;
+ if (br > 200) bt = 200;
+ if (br <= 1) {
+ v = 30 * br;
+ } else if (br <= 10) {
+ v = 30 + 30 * br / 10;
+ } else if (br < 50) {
+ v = 60 + 20 * (br - 10) / 40;
+ } else {
+ v = 80 + 20 * (br - 50) / 150;
+ }
+ wnd.http_control.set_value(v);
+
+ wnd.http_text.set_label('HTTP cap ' + Math.round(100 * gpac.http_max_bitrate / 1000 / 1000) / 100 + ' Kbps');
+
+ } else {
+ wnd.http_control.set_value(100);
+ wnd.http_text.set_label('HTTP cap off');
+ }
+
+ wnd.http_control.text = wnd.http_text;
+ wnd.http_control.on_slide = function (val) {
+ var br = 0;
+ if (val <= 30) {
+ br = val / 30;
+ } else if (val <= 60) {
+ br = 1 + 10 * (val - 30) / 30;
+ } else if (val < 80) {
+ br = 10 + 40 * (val - 60) / 20;
+ } else {
+ br = 50 + 150 * (val - 80) / 20;
+ }
+ if (br == 200) {
+ this.text.set_label('HTTP cap off');
+ gpac.http_max_bitrate = Math.round(0);
+ } else if (br == 0) {
+ this.text.set_label('HTTP disable');
+ gpac.http_max_bitrate = -1;
+ } else {
+ this.text.set_label('HTTP cap ' + Math.round(100 * br) / 100 + ' Mbps');
+ gpac.http_max_bitrate = Math.round(br * 1000000);
+ }
+ }
+
+ gw_new_separator(wnd.area);
+ }
+
+ wnd.plot = gw_new_plotter(wnd.area);
+
+
+ wnd.on_display_size = function (width, height) {
+ var w;
+ var h = 2 * gwskin.default_icon_height;
+
+ w = 20 * gwskin.default_text_font_size;
+ w += 4 * gwskin.default_icon_height;
+ if (this.has_select)
+ w += 4 * gwskin.default_icon_height;
+
+ for (var i = 0; i < this.objs.length; i++) {
+ var aw = w;
+
+ this.objs[i].gui.info.set_size(1.5 * gwskin.default_icon_height, gwskin.default_icon_height);
+ aw -= this.objs[i].gui.info.width;
+
+ if (this.objs[i].gui.buffer) {
+ this.objs[i].gui.buffer.set_size(2 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
+ }
+ if (this.objs[i].gui.play) {
+ this.objs[i].gui.play.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+ }
+ aw -= 4 * gwskin.default_icon_height;
+
+ if (this.objs[i].gui.select) {
+ this.objs[i].gui.select.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+ aw -= gwskin.default_icon_height;
+ this.objs[i].gui.select_label.set_size(4 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
+ aw -= 4 * gwskin.default_icon_height;
+ }
+
+
+ this.objs[i].gui.txt.set_size(aw, gwskin.default_icon_height);
+ this.objs[i].gui.txt.set_width(aw);
+ h += gwskin.default_icon_height;
+ }
+
+ if (this.plot) {
+ this.plot.set_size(w, 8 * gwskin.default_icon_height);
+ h += 8 * gwskin.default_icon_height;
+ }
+
+ if (wnd.http_control) {
+ wnd.http_text.set_size(11 * gwskin.default_text_font_size, gwskin.default_icon_height);
+ wnd.http_control.set_size(w - 11 * gwskin.default_text_font_size, 0.2 * gwskin.default_icon_height);
+ h += gwskin.default_icon_height;
+ }
+
+ this.set_size(w, h);
+ this.move((w - width) / 2, (height - h) / 2);
+ }
+ wnd.on_close = function () {
+ this.timer.stop();
+ this.objs = [];
+ if (this.reload_request) {
+ var translation = this.extension.stat_wnd.translation;
+ this.extension.stat_wnd = null;
+ this.extension.view_stats();
+ this.extension.stat_wnd.translation = translation;
+ } else {
+ this.extension.stat_wnd = null;
+ }
+ }
+
+ wnd.timer = gw_new_timer(false);
+ wnd.timer.wnd = wnd;
+ wnd.timer.set_timeout(0.25, true);
+
+ var label = 'Statistics (' + gpac.nb_cores + ' cores - ';
+ if (gpac.system_memory > 1000000000) label += '' + Math.round(gpac.system_memory / 1000 / 1000 / 1000) + ' GB RAM)';
+ else label += '' + Math.round(gpac.system_memory / 1000 / 1000) + ' MB RAM)';
+
+ wnd.set_label(label);
+
+ wnd.stats = [];
+ wnd.stats_window = 32;
+
+ if (wnd.plot) {
+ wnd.s_fps = wnd.plot.add_serie('FPS', 'Hz', 0.8, 0, 0);
+ if (nb_http) {
+ wnd.s_bw = wnd.plot.add_serie('BW', 'Mbps', 0.8, 0, 0.8);
+ } else {
+ wnd.s_bw = null;
+ }
+ wnd.s_bitrate = wnd.plot.add_serie('Rate', 'Kbps', 0, 0.8, 0);
+ if (nb_buffering)
+ wnd.s_buf = wnd.plot.add_serie('Buffer', 'ms', 0, 0, 0.8);
+ else
+ wnd.s_buf = null;
+
+ if (nb_ntp_diff)
+ wnd.s_ntp = wnd.plot.add_serie('NTP diff', 'ms', 0, 0.3, 0.8);
+ else
+ wnd.s_ntp = null;
+
+ wnd.s_cpu = wnd.plot.add_serie('CPU', '%', 0, 0.5, 0.5);
+ wnd.s_mem = wnd.plot.add_serie('MEM', 'MB', 0.5, 0.5, 0);
+
+ }
+
+ wnd.timer.on_event = function (val) {
+ var wnd = this.wnd;
+ var nb_buff = 0;
+
+ var stat_obj = null;
+ //stats every second
+ if (!(val % 4)) {
+ if (wnd.stats.length >= wnd.stats_window) {
+ wnd.stats.splice(0, 1);
+ }
+ stat_obj = {};
+ wnd.stats.push(stat_obj);
+
+ var t = new Date()
+ stat_obj.time = Math.round(t.getTime() / 1000);
+ stat_obj.fps = Math.round(100 * gpac.fps) / 100;
+ stat_obj.cpu = gpac.cpu;
+ stat_obj.memory = Math.round(100 * gpac.memory / 1000 / 1000) / 100;
+ stat_obj.bitrate = 0;
+ if (wnd.s_bw) {
+ var b = gpac.http_bitrate;
+ if (b < 50000) stat_obj.http_bandwidth = Math.round(gpac.http_bitrate / 10) / 100;
+ else stat_obj.http_bandwidth = Math.round(gpac.http_bitrate / 1000);
+ }
+ // stat_obj.buffer = 0;
+ stat_obj.buffer = 0;
+ stat_obj.ntp_diff = 0;
+ }
+
+ for (var i = 0; i < wnd.objs.length; i++) {
+ var m = wnd.objs[i];
+
+ if (m.gui.buffer) {
+ var label = ' ' + m.type;
+
+ if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
+ else if (m.samplerate) label += ' (' + Math.round(m.samplerate / 10) / 100 + ' kHz ' + m.channels + ' ch)';
+ else if (m.scalable_enhancement) label += ' (Enh. Layer)';
+
+ var url = m.service_url;
+ if ((url.indexOf('udp://') >= 0) || (url.indexOf('rtp://') >= 0) || (url.indexOf('dvb://') >= 0))
+ label += ' Broadcast';
+ else if ((url.indexOf('file://') >= 0) || (url.indexOf('://') < 0))
+ label += ' File';
+ else
+ label += ' Broadband';
+
+ m.gui.txt.set_label(label);
+
+ var bl;
+ if (m.max_buffer) {
+ var speed = wnd.extension.movie_control.mediaSpeed;
+ if (speed < 0) speed = 1;
+ else if (speed == 0) speed = 1;
+ var buf = m.buffer / speed;
+ bl = 100 * buf / m.max_buffer;
+
+ if (stat_obj) {
+ if (!stat_obj.buffer || (buf && buf < stat_obj.buffer)) {
+ stat_obj.buffer = buf;
+ }
+ //stat_obj.buffer += buf;
+ //nb_buff++;
+ }
+ }
+ else bl = 100;
+ m.gui.buffer.set_value(bl);
+
+ m.gui.buffer.set_label('' + Math.round(m.buffer / 10) / 100 + ' s');
+
+ if (stat_obj) {
+ bl = m.ntp_diff;
+ if (bl > stat_obj.ntp_diff)
+ stat_obj.ntp_diff = bl;
+ }
+ }
+
+ if (stat_obj) {
+ if (m.status != 'Stopped')
+ stat_obj.bitrate += Math.round(m.avg_bitrate / 1000);
+ }
+ }
+
+ if (stat_obj && wnd.stats.length) {
+ wnd.s_fps.refresh_serie(wnd.stats, 'time', 'fps', wnd.stats_window, 4);
+ if (wnd.s_bw) {
+ wnd.s_bw.refresh_serie(this.wnd.stats, 'time', 'http_bandwidth', wnd.stats_window, 1);
+ }
+ if (wnd.s_buf) {
+ if (nb_buff) {
+ // stat_obj.buffer /= nb_buff;
+ }
+ wnd.s_buf.refresh_serie(this.wnd.stats, 'time', 'buffer', wnd.stats_window, 1.5);
+ }
+ if (stat_obj.bitrate) {
+ wnd.s_bitrate.refresh_serie(this.wnd.stats, 'time', 'bitrate', wnd.stats_window, 2);
+ } else {
+ wnd.s_bitrate.hide();
+ }
+ if (wnd.s_ntp) {
+ wnd.s_ntp.refresh_serie(this.wnd.stats, 'time', 'ntp_diff', wnd.stats_window, 3);
+ }
+
+ wnd.s_cpu.refresh_serie(wnd.stats, 'time', 'cpu', wnd.stats_window, 10);
+ wnd.s_mem.refresh_serie(wnd.stats, 'time', 'memory', wnd.stats_window, 6);
+ }
+ }
+
+ wnd.quality_changed = function () {
+ for (var i = 0; i < this.objs.length; i++) {
+ var m = this.objs[i];
+ m.update_qualities();
+ }
+ }
+ wnd.close_all = function () {
+ for (var i = 0; i < this.objs.length; i++) {
+ if (this.objs[i].gui.info_wnd) {
+ this.objs[i].gui.info_wnd.odm = null;
+ this.objs[i].gui.info_wnd.close();
+ }
+ }
+ this.objs.length = 0;
+ this.close();
+ }
+ wnd.on_display_size(gw_display_width, gw_display_height);
+ wnd.set_alpha(0.9);
+ wnd.show();
+};
 
\ No newline at end of file

v0.6.1.tar.gz/gui/extensions/showroom Added

v0.6.1.tar.gz/gui/extensions/showroom/init.js Added

v0.6.1.tar.gz/gui/extensions/showroom/osmo.bt Added

@@ -0,0 +1,107 @@
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ sceneProfileLevelIndication 254
+ graphicsProfileLevelIndication 254
+ ODProfileLevelIndication 254
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 2038
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 4
+     isCommandStream true
+     pixelMetric true
+    }
+   }
+   slConfigDescr SLConfigDescriptor {
+    useAccessUnitStartFlag true
+    useAccessUnitEndFlag true
+    useTimeStampsFlag true
+    timeStampResolution 1000
+    timeStampLength 32
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+  DEF N0 Viewport {
+   size 140 140
+   fit 1
+  }
+
+  Transform2D {
+   scale 0.5 0.5
+   children [
+    Transform2D {
+     translation 0 -30
+     children [
+      Shape {
+       appearance DEF N3 Appearance {
+        texture RadialGradient {
+         focalPoint 0.45 0.8
+         key [0 1]
+         keyValue [0.5 0.5 0.5 0 0 0]
+        }
+        material Material2D {
+         filled TRUE
+        }
+       }
+       geometry Circle {
+        radius 60
+       }
+      }
+     ]
+    }
+    Transform2D {
+     translation 0 90
+     children [
+      Shape {
+       appearance Appearance {
+        material Material2D {
+         filled true
+        }
+        texture RadialGradient {
+         focalPoint 0.45 0.2
+         key [0 1]
+         keyValue [0.2 0.2 0.2 0 0 0]
+        }
+       }
+       geometry IndexedFaceSet2D {
+        colorPerVertex false
+        coord Coordinate2D {
+         point [-40 5 40 5 0 -60]
+        }
+       }
+      }
+     ]
+    }
+    Shape {
+     appearance Appearance {
+      material DEF N4 Material2D {
+       lineProps DEF N5 XLineProperties {
+        lineColor 1 0 0
+        width 20
+        texture RadialGradient {
+         focalPoint 0.5 0.5
+         key [0 0.8 0.9 1]
+         keyValue [0 0 0 0.5 0 0 1 0 0 0.5 0 0]
+        }
+       }
+      }
+     }
+     geometry Circle {
+      radius 100
+     }
+    }
+   ]
+  }
+
+ ]
+}
+
+

v0.6.1.tar.gz/gui/extensions/showroom/showroom.js Added

@@ -0,0 +1,180 @@
+extension = {
+ setup: false,
+	dialog: null,
+	sequence_index: 0,
+	sequences: [],
+
+	showroom_url: 'http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/showroom/',
+
+	ext_filter_event: function (evt) {
+		if (!this.dialog ) return;
+		
+		switch (evt.type) {
+		default:
+			return false;
+		}
+	},
+	
+	create_event_filter: function (__anobj) {
+		return function (evt) {
+			return __anobj.ext_filter_event(evt);
+		}
+	},
+
+	load_description: function () {
+		if (this.setup) return;
+
+		var xhr = new XMLHttpRequest();
+		xhr.open('GET', this.showroom_url + '00_showroom.json', false);
+		xhr.send('');
+
+		if ((xhr.status != 200) || (xhr.readyState != 4)) {
+			if (xhr.status) {
+				gwlog(l_err, '[ShowRoom] Failed to query server: ' + xhr.responseText);
+			} else {
+				gwlog(l_err, '[ShowRoom] Failed to send request');
+			}
+			var msg = gw_new_message(null, 'Error loading showroom', 'HTTP status '+xhr.status);
+			msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+			msg.show();
+			return null;
+		}
+
+		var obj = gwskin.parse(xhr.responseText);
+
+		if (typeof obj.length == 'undefined') {
+			gwlog(l_err, '[ShowRoom] Non conformant response object ' + xhr.responseText);
+			return null;
+		}
+		this.sequences = obj;
+		this.setup = true;
+	},
+	
+	start: function () {
+ gw_hide_dock();
+		
+		if (!this._evt_filter) {
+			this._evt_filter = this.create_event_filter(this);
+			gwlib_add_event_filter(this._evt_filter);
+		}
+
+		this.image = gw_new_image(null, '');
+		this.image.extension = this;
+		this.image.on_click = function() {
+			this.extension.launch_sequence();
+		}
+		
+		var wnd = gw_new_window(null, true, false);
+		wnd.show_effect = 'none';
+
+		wnd.area = gw_new_grid_container(wnd);
+		wnd.area.spread_h = false;
+ wnd.area.break_at_hidden = true;
+
+		this.dialog = wnd;
+		this.dialog.extension = this;
+		
+		wnd.btn_close = gw_new_icon(wnd.area, 'close');
+		wnd.btn_close.on_click = function () {
+			var ext = this.parent.parent.extension;
+			ext.image.close();
+			ext.desc.close();
+			ext.dialog.close();
+			if (arguments.length==0) gw_show_dock();
+		};
+		
+		wnd.prev = gw_new_icon(wnd.area, 'previous');
+		wnd.prev.on_click = function() {
+			var ext = this.parent.parent.extension;
+			if (ext.sequence_index)
+				ext.sequence_index--;
+			else
+				ext.sequence_index = ext.sequences.length-1;
+			ext.load_sequence();
+		}
+
+		wnd.next = gw_new_icon(wnd.area, 'next');
+		wnd.next.on_click = function() {
+			var ext = this.parent.parent.extension;
+			if (ext.sequence_index<ext.sequences.length-1)
+				ext.sequence_index++;
+			else
+				ext.sequence_index = 0;
+			ext.load_sequence();
+		}
+		this.desc = gw_new_text_area(wnd.area, '', 'float_text');
+
+ wnd.on_display_size = function (width, height) {
+			h = height/2 - gwskin.default_control_height;
+			this.extension.image.set_size(width, h);
+			this.extension.image.move(0, gwskin.default_control_height + h/2 - height/2);
+
+			this.extension.desc.set_size(width, h);
+			this.set_size(width, gwskin.default_control_height + h);
+			this.move(0, height/2 - this.height/2);
+ }
+		
+		wnd.on_event = function (evt) {
+			switch (evt.type) {
+			case GF_EVENT_KEYDOWN:
+				if (evt.keycode == 'Right') {
+					this.next.on_click();
+					return true;
+				}
+				if (evt.keycode == 'Left') {
+					this.prev.on_click();
+					return true;
+				}
+				if (evt.keycode == gwskin.keys.close) {
+					this.btn_close.on_click();
+					return true;
+				}
+				if (evt.keycode == gwskin.keys.validate) {
+					this.extension.image.on_click();
+					return true;
+				}
+				return 0;
+			default:
+				return 0;
+			}
+		}
+
+ wnd.on_display_size(gw_display_width, gw_display_height);
+		wnd.show();
+
+		this.load_description();
+
+		this.sequence_index = parseInt( this.get_option('SequenceIndex', '0') );
+		if (this.sequence_index >= this.sequences.length) this.sequence_index = 0;
+		else if (this.sequence_index < 0) this.sequence_index = 0;
+		
+		this.load_sequence();
+
+ },
+	
+	load_sequence : function () {
+		if (!this.setup) return;
+		var o = this.sequences[this.sequence_index];
+		var desc = o.name + '\n\n' + o.description;
+		this.desc.set_content(desc);
+		var res = o.icon.indexOf('://');
+		if (res>=0) {
+			this.image.set_image(o.icon);
+		} else {
+			this.image.set_image(this.showroom_url + o.icon);
+		}
+	},
+	launch_sequence: function() {
+		var o = this.sequences[this.sequence_index];
+		this.set_option('SequenceIndex', '' + this.sequence_index);
+		var res = o.path.indexOf('://');
+
+		if (res >= 0) {
+			gwskin.restore_session(o.path, 0, 0);
+		} else {
+			gwskin.restore_session(this.showroom_url + o.path, 0, 0);
+		}
+		this.dialog.btn_close.on_click(false);
+	}
+
+};

v0.5.2.tar.gz/gui/extensions/widget_manager/init.js -> v0.6.1.tar.gz/gui/extensions/widget_manager/init.js Changed

@@ -1,927 +1,927 @@
-/*container for widgets*/
-widget_display = gw_new_container();
-widget_display.on_event = function(evt) 
-{
- if(!widget_display.children.length) return false;
- return widget_display.children[widget_display.children.length-1].on_event(evt);
-}
-
-widget_tool_size = 18;
-widget_min_size = 5*widget_tool_size;
-widget_default_size = 100;
-
-
-function check_widget_display(width, height) 
-{
-	var count = WidgetManager.num_widgets;
-	for (var i=0; i<count; i++) {
-	 var x, y;
-		var wid = WidgetManager.get(i);
-		if (wid == null) continue;
-		if (!wid.visible) continue;
-		
-	 x = wid.x;
- y = wid.y;
-		if (x-wid.width/2 <= -width/2) x = wid.width/2-width/2;
-		else if (x+wid.width/2 >= width/2) x = width/2 - wid.width/2;
-		
-		if (y + wid.height/2 >= height/2) y = height/2 - wid.height/2;
-		else if (y - wid.height/2 <= - height/2) y = -height/2 + wid.height/2;
-
-		if (wid.widget_control) wid.widget_control.move(x, y);
-	}
-}
-
-function scan_directory(dir)
-{
-	var i, j, count, list, new_wid, uri;
-	list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
-	for (i=0; i<list.length; i++) {
-		uri = list[i].path + list[i].name;
-		if (list[i].directory) {
-			scan_directory(uri);
-		} else {
-			count = WidgetManager.num_widgets;
-			for (j=0; j<count; j++) {
-				var wid = WidgetManager.get(j);
-				if (wid.url==uri) break;
-			}
-			if (j==count) {
-				new_wid = WidgetManager.open(uri, null);
-				if (new_wid!=null) {
-					widget_insert_icon(new_wid);
-				}
-			}
-		}
-	}
-}
-
-widman_cfg_dlg = null; 
-
-function open_widget_manager(extension)
-{
- if (widman_cfg_dlg) return;
-
- widman_cfg_dlg = gw_new_window_full(null, true, 'Widget Manager');
- widman_cfg_dlg.area = gw_new_grid_container(widman_cfg_dlg);
-
- var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.add, 'Add widget', 'icon_label');
- icon.on_click = function() {
- widman_cfg_dlg.close();
- widman_cfg_dlg = null;
- 
- var filebrowse = gw_new_file_open();
- filebrowse.show_directory = true;
- filebrowse.filter = '*.xml;*.wgt;*.mgt';
- filebrowse.browse(WidgetManager.last_widget_dir); 
- 
- filebrowse.on_browse = function(value, directory) {
- 		var new_wid = WidgetManager.open(value, null);
-	 	if (new_wid==null) return;
-		 WidgetManager.last_widget_dir = directory;
-		 widget_insert_icon(new_wid);
-		 dock.layout(dock.width, dock.height);
-		 show_dock(true);
- }
- filebrowse.on_directory = function(directory) {
- 		WidgetManager.last_widget_dir = directory;
- 		scan_directory(directory);
-		 show_dock(true);
- }
- filebrowse.set_size(320 , 240);
- gpacui_show_window(filebrowse);
- }
-var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.trash, 'Remove all widgets', 'icon_label');
- icon.on_click = function() {
-		while (1) {
-			var wid = WidgetManager.get(0);
-			if (wid==null) break;
-			widget_remove(wid);
-		}
- widman_cfg_dlg.close();
- widman_cfg_dlg = null;
-	 dock.layout(dock.width, dock.height);
-	 show_dock(true);
- }
- widman_cfg_dlg.on_close = function() {
- widman_cfg_dlg = null;
- }
- widman_cfg_dlg.set_size(320 , 240);
- gpacui_show_window(widman_cfg_dlg);
-}
-
-function widget_insert_icon(new_wid) {
-	var icon = gpacui_insert_dock_icon(new_wid.name, widget_get_icon(new_wid) );
-	new_wid.in_panel = true;
-	new_wid.visible = false;
-	new_wid.icon_dock = icon;
-	icon.on_click = on_widget_launch;
-	icon.widget = new_wid;
-}
-
-function collapsable_list(info_dlg, title)
-{
-	var info = gw_new_button(info_dlg.area, title, 'button');
-	var children = info_dlg.area.get_children();
-	
-	info.first_idx = children.length;
-	info.dlg = info_dlg;
-	info.displayed = true;
- info.on_click = function() {
- var children = this.dlg.area.get_children();
- this.displayed = !this.displayed;
-	 for (var i=this.first_idx; i<this.last_idx; i++) {
- if (this.displayed) children[i].show();
- else children[i].hide();
- 	
- if (typeof children[i].last_idx != 'undefined') {
- if (!children[i].displayed) children[i].on_click();
- }
- }
- this.dlg.area.layout_changed();
- }
- return info;
-}
-
-//widget information dialog
-function display_widget_info(wid)
-{
-	var i, j, k, info;
-	var y, txt, pref;
-
-	var info_dlg = gw_new_window_full(null, true, 'Widget ' + wid.name + ' Information', 'window', null);
-// info_dlg.area = gw_new_grid_container(info_dlg);
- info_dlg.area = gw_new_listbox(info_dlg);
- 
-	var info = collapsable_list(info_dlg, 'Widget Metadata');
-	
- gw_new_text(info_dlg.area, 'id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'text');
- gw_new_text(info_dlg.area, 'version: '+wid.version, 'text');
- gw_new_text(info_dlg.area, 'content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'text');
- gw_new_text(info_dlg.area, 'default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'text');
- gw_new_text(info_dlg.area, 'license: '+wid.license, 'text');
- gw_new_text(info_dlg.area, 'license ref: '+wid.licenseHref, 'text');
- gw_new_text(info_dlg.area, 'description: '+wid.description, 'text');
- gw_new_text(info_dlg.area, 'author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'text');
- gw_new_text(info_dlg.area, 'author href: '+wid.authorHref, 'text');
- gw_new_text(info_dlg.area, 'view modes: '+wid.viewmodes, 'text');
- gw_new_text(info_dlg.area, 'UUID: '+wid.uuid, 'text');
- gw_new_text(info_dlg.area, 'Discardable: '+wid.discardable, 'text');
- gw_new_text(info_dlg.area, 'Muliple Instances: '+wid.discardable, 'text');
-	var icons = wid.icons;
-	for (j=0; j<icons.length; j++) {
- gw_new_text(info_dlg.area, 'Icon #'+(j+1)+': ' + icons[j].src, 'text');
-	}
-	info.last_idx = info_dlg.area.get_children().length;
-	info.on_click();
-
-	info = collapsable_list(info_dlg, 'Widget Manager Info');
-
-	gw_new_text(info_dlg.area, 'nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'text' );
-	gw_new_text(info_dlg.area, 'Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'text' );
-	if (wid.is_component) {
-		gw_new_text(info_dlg.area, 'parent widget name' + wid.parent.name, 'text');
-	}
-	if (wid.originating_device_ip) {
-		gw_new_text(info_dlg.area, 'Widget was pushed from device IP '+wid.originating_device_ip, 'text' );
-	}
-	gw_new_text(info_dlg.area, 'Section name in GPAC config file: '+wid.section, 'text' );
-	gw_new_text(info_dlg.area, 'UA Locale: ' + gpac.getOption('Systems', 'LanguageName') + ' ('+ gpac.getOption('Systems', 'Language2CC')+ ')', 'text' );
-	gw_new_text(info_dlg.area, 'widget src: ' + wid.url , 'text');
-	gw_new_text(info_dlg.area, 'config src: ' + wid.manifest , 'text');
-	gw_new_text(info_dlg.area, 'content src : '+wid.localizedSrc, 'text' );
-	info.last_idx = info_dlg.area.get_children().length;
-	info.on_click();
-
-	pref = wid.features;
-	if (pref.length) {
- 	info = collapsable_list(info_dlg, 'Features');
- 	for (j=0; j<pref.length; j++) {
- 		gw_new_text(info_dlg.area, 'Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'text');
- 	}
- 	info.last_idx = info_dlg.area.get_children().length;
- 	info.on_click();
- }
-
-	pref = wid.preferences;
-	if (pref.length) {
- 	info = collapsable_list(info_dlg, 'Preferences');
- 	for (j=0; j<pref.length; j++) {
- 		var val = pref[j].value;
- 		if (val=='') val = gpac.getOption(wid.section, pref[j].name);
- 		gw_new_text(info_dlg.area, 'Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'text');
- 	}
- 	info.last_idx = info_dlg.area.get_children().length;
- 	info.on_click();
- }
-
-	info = collapsable_list(info_dlg, 'MPEG-U Migration Context');
-	txt=wid.get_context();
-	if (!txt) txt='';
-
-	while (1) {
-		var idx = txt.indexOf('\n', 0);
-		if (idx>0) {
-			gw_new_text(info_dlg.area, txt.substring(0, idx), 'text');
-			txt = txt.substring(idx+1, txt.length);
-		} else {
-			gw_new_text(info_dlg.area, txt, 'text');
-			break;
-		}
-	}
-	info.last_idx = info_dlg.area.get_children().length;
-	info.on_click();
-
- if (wid.num_interfaces) {
- 	info = collapsable_list(info_dlg, 'MPEG-U Interfaces', 'button');
- 		var spacer = gw_new_text(info_dlg.area, '', 'text');
- 	spacer.hide();
- 	info.first_idx = info_dlg.area.get_children().length;
- for (j=0; j<wid.num_interfaces; j++) {
- 		var idx;
- 		var ifce = wid.get_interface(j);
- 	var item = collapsable_list(info_dlg, 'Interface #' + (j+1) + ' type: '+ifce.type);
- item.sublist = true;
- 		gw_new_text(info_dlg.area, 'Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'text');
- 		for (k=0; k<ifce.num_messages; k++) {
- 			var string, l;
- 			var msg = ifce.get_message(k);
- 			string = ' Message #'+ (k+1) + ': ' + msg.name + '(';
- 			for (l=0; l<msg.num_params; l++) {
- 				par = msg.get_param(l);
- 				string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
- 			}
- 			string += ')';
- 			gw_new_text(info_dlg.area, string, 'text');
- 		}
- 	 item.last_idx = info_dlg.area.get_children().length;
- 	item.on_click();
- 	item.hide();
- 	}
- 	info.last_idx = info_dlg.area.get_children().length;
- 	info.on_click();
- }
-
- info_dlg.area.spread_h = true;
- info_dlg.area.break_at_hidden = true;
- 
- info_dlg.on_size = function(width, height) {
- var i;
- var children = this.area.get_children();
- for (i=0; i<children.length; i++) {
- if ((typeof children[i].first_idx != 'undefined') && (typeof children[i].sublist== 'undefined')) {
- children[i].set_size( (width>200) ? 200 : width, 20);
- } else {
- children[i].set_size(width, 16);
- }
- }
- }
- 
- info_dlg.on_event = function(evt) {
- if (this.area && this.area.on_event(evt)) return true;
- return false;
- }
-
- info_dlg.set_size(320, 240);
- gpacui_show_window(info_dlg);
-}
-
-
-//widget close function
-function widget_close(widget, force_remove)
-{
-	var is_comp = widget.is_component;
-
-	if (widget.visible) {
-		widget.visible = false;
-		WidgetManager.corein_message(widget, 'hide');
-		WidgetManager.corein_message(widget, 'deactivate');
-		widget.deactivate();
-		/*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
-		if (widget.widget_control) {
-			widget.widget_control.set_url('');
-			widget.widget_control.close();
-		}
-	}
-	if (!is_comp && (!widget.permanent || force_remove)) {
-		WidgetManager.unload(widget, force_remove ? true : false);
-	}
-}
-
-//widget remove function (close and unregister)
-function widget_remove(wid) {
-	if (typeof(wid.icon_dock) != 'undefined') {
-		wid.icon_dock.close();
- wid.icon_dock = null;
-	}		
-	widget_close(wid, 1);
-}
-
-function new_migrate_callback(widget) {
- return function(renderer) {
- WidgetManager.migrate_widget(renderer, widget);
-	widget_close(widget, 0);
- }
-}
-
-function on_widget_load() 
-{
-	WidgetManager.corein_message(this, 'activate');
-	WidgetManager.corein_message(this, 'show');
-	WidgetManager.corein_message(this, 'setSize', 'width', this.width, 'height', this.height, 'dpi', screen_dpi);
-}
-
-
-mpegu_targets = null;
-
-function select_mpegu_target(callback)
-{ 
- if (mpegu_targets) return;
- mpegu_targets = gw_new_file_open();
- mpegu_targets.set_label('Select Remote Display');
- mpegu_targets.callback = callback;
-
- mpegu_targets.on_close = function() {
- mpegu_targets = null;
- }
- /*override browse function*/
- mpegu_targets._on_mpegu_click = function() {
- 	var target = (this.render_idx<0) ? null : WidgetManager.get_mpegu_service_providers(this.render_idx);
-
-		mpegu_targets.callback(target);
-		mpegu_targets.callback = null;
- mpegu_targets.close();
- mpegu_targets = null;
- }
- mpegu_targets._browse = function(dir, up) {
- var w, h, i, y;
- this.area.reset_children();
- 
- for (i=0; ; i++) {
-		var target = WidgetManager.get_mpegu_service_providers(i);
-		if (!target) break;
-		var	icon = 'icons/applications-internet.svg';
- var item = gw_new_icon_button(this.area, icon, target.Name);
- item.set_size(item.width, item.height);
- item.render_idx = i;
- item.on_click = this._on_mpegu_click;
- } 
- this.layout(this.width, this.height);
- }
- mpegu_targets.browse(''); 
- mpegu_targets.go_up.hide();
- mpegu_targets.set_size(display_width, display_height);
- gpacui_show_window(mpegu_targets);
-}
-
-
-function new_widget_control(widget)
-{
- var ctrl;
- 
-
- var inline = gw_new_subscene(null);
- ctrl = gw_new_window_full(widget_display, true, null, 'offscreen', inline);
-	ctrl.set_size(widget.width, widget.height);
-
- ctrl.inline = inline;
- ctrl.tools.spread_h = true;
- 
-	ctrl.component_bound = false;
-	ctrl.widget = widget;
-	widget.widget_control = ctrl; 
-	widget.visible = true;
- 
- ctrl.on_close = function() {
- 	this.inline.url[0] = '';
- 	this.widget.widget_control = null; 
-		if (this.widget.discardable) widget_remove(this.widget);
-		else widget_close(this.widget, 0);
-		this.widget = null;
- }
-
- ctrl.tools.hide();
- gw_object_set_dragable(ctrl);
-
- gw_object_set_hitable(ctrl);
- ctrl.controls_visible = false;
-
-	this.maximized = false;
- ctrl.on_double_click = function() {
- if (this.maximized) {
-		this.maximized = false;
-		this.move(this.widget.x, this.widget.y);
-		this.set_size(this.prev_width, this.prev_height);
- } else {
-		this.maximized = true;
-		this.prev_width = this.widget.width;
-		this.prev_height = this.widget.height;
-		this.move(0, 0);
-		this.set_size(display_width, display_height);
- } 
- this.controls_visible = false;
- this.tools.hide();
- }
-
- ctrl.on_click = function() {
- this.controls_visible = ! this.controls_visible;
- if (this.controls_visible) this.tools.show();
- else this.tools.hide();
- }
- /*push on top*/
- ctrl.on_down = function(value) {
-		if (value) return;
-		if (this.widget==null) return;
-
-		//widget is a component, do not push on top but hide some controls
-		if (this.widget.is_component) {
-			if (this.component_bound) {
-			 var chldren = this.tools.get_children();
-				children[0].hide(); //close
-				children[1].hide(); //remove
-				children[4].hide(); //resize
-			}
-			return;
-		}
-		//otherwise push widget on top
-		widget_display.push_to_top(this);
-		//and push components
-		comps = this.widget.components;
-		for (i=0; i<comps.length; i++) {
-			if (comps[i].widget_control && comps[i].widget_control.component_bound) {
-				widget_display.push_to_top(comps[i].widget_control);
-			}
-		}
- }
-
- ctrl._orig_move = ctrl.move;
- ctrl.move = function(x, y) {
- this.widget.x = x;
-		this.widget.y = y;
-		this._orig_move(x, y);
-	}
-
- ctrl.on_drag = function(x, y) {
-		if (this.maximized) return;
- this.move(x, y);
- }
- ctrl.on_event = function(evt) {
- var x, y;
- if (evt.type != GF_EVENT_KEYDOWN) return false;
- if (!this.controls_visible) return false;
-
- x = this.widget.x;
- y = this.widget.y;
- if (evt.keycode=='Up') y += 10;
- else if (evt.keycode=='Down') y -= 10;
- else if (evt.keycode=='Left') x -= 10;
- else if (evt.keycode=='Right') x += 10;
- else return false;
- this.move(x, y);
- return true;
- }
- 
- /*widget is not temporary*/
-	if (!widget.discardable && widget.icon_dock) {
- var icon = ctrl.add_tool(gwskin.images.trash, gwskin.labels.trash);
- icon.on_click = function() { widget_remove(this.dlg.widget); }; 
- }
- 
- if (UPnP_Enabled) {
- ctrl.remote = ctrl.add_tool(gwskin.images.remote_display, gwskin.labels.remote_display);
- ctrl.remote.on_click = function() { 
- var dlg = select_mpegu_target(new_migrate_callback(this.dlg.widget) ); 
- }; 
- 	
- ctrl.show_remote = function(show) {
- if (show) this.remote.show();
- else this.remote.hide();
- }
- } 
-
- var icon = ctrl.add_tool(gwskin.images.information, gwskin.labels.information);
- icon.on_click = function() { 
- display_widget_info(this.dlg.widget); 
- }; 
-
- var icon = ctrl.add_tool(gwskin.images.resize, gwskin.labels.resize);
- gw_object_set_dragable(icon);
-	ctrl.prev_x=0;
-	ctrl.prev_y=0;
- icon.begin_drag = function() {
- 	this.dlg.prev_x=this.startx;
-	 this.dlg.prev_y=this.starty;
- }
- icon.on_drag = function(valx, valy) {
- var _dlg = this.dlg;
-		if (_dlg.widget.width + 2*(valx - _dlg.prev_x) < widget_min_size) return;
-		if (_dlg.widget.height + 2*(valy-_dlg.prev_y) < widget_min_size) return;
-
-		_dlg.widget.width += 2*(valx - _dlg.prev_x);
-		_dlg.prev_x = valx;
-		_dlg.widget.height += 2*(valy - _dlg.prev_y);
-		_dlg.prev_y = valy;
-		_dlg.set_size(_dlg.widget.width, _dlg.widget.height);
- }
- 
- ctrl.set_url = function(url) {
- 	 ctrl.inline.url[0] = url;
- }
- ctrl.predestroy = function() {
- this.inline = null;
- this.remote = null;
- this.widget = null;
- }
-		
-	ctrl.sub_w = 0;
-	ctrl.sub_h = 0;
-	ctrl.sub_x = 0;
-	ctrl.sub_y = 0;
-	ctrl.sub_vp_w = 0;
-	ctrl.sub_vp_h = 0;
-
- ctrl.on_widget_vp_changed = function(evt) {
-		this.sub_vp_w = evt.width;
-		this.sub_vp_h = evt.height;
-		this.sub_vp_x = evt.offset_x;
-		this.sub_vp_y = evt.offset_y;
-		this.sub_w = evt.vp_width;
-		this.sub_h = evt.vp_height;
- }
-	ctrl.inline.addEventListener('gpac_vp_changed', ctrl.on_widget_vp_changed, 0);
-		
-// ctrl.set_tool_size(widget_tool_size); 
-	ctrl.set_size(widget.width, widget.height);
-	if (widget.x < -display_width/2) widget.x = 0;
-	else if (widget.x > display_width/2) widget.x = 0;
-	if (widget.y < -display_height/2) widget.y = 0;
-	else if (widget.y > display_height/2) widget.y = 0;
-	ctrl.move(widget.x, widget.y);
-
-	/*this will setup the scene graph for the widget in order to filter input and output communication pins*/
-	widget.activate(ctrl.inline);
-
-	ctrl.set_url(widget.main);
-
-	/*send notifications once the widget scene is loaded*/
-	widget.on_load = on_widget_load;
-
- ctrl.show();
- return ctrl;
-}
-
-function flash_window(wnd) {
-	wnd.time = gw_new_timer(true);
-	wnd.time.set_timeout(0.25, true);
-	wnd.time.ctrl = wnd;
-	wnd.time.on_fraction = function(val) {
-		var scale = (val<0.5) ? 1+val/2 : 1.5-val/2;
-		this.ctrl.scale.x = this.ctrl.scale.y = scale;
-	}
-	wnd.time.on_active = function (val) {
-		 if (!val) {
- this.ctrl.time = null;
- this.ctrl = null;
- }
- }
-	wnd.time.stop(1);
-	wnd.time.start(0);
-}
-
-//widget launcher function
-function widget_launch(wid) {
-	var widg_ctrl;
-
-	//assign default size to the widget
-	if (wid.width == undefined) {
-		wid.width = wid.defaultWidth;
-		if (wid.width == 0) wid.width = widget_default_size;
-	}
-	if (wid.height == undefined) {
-		wid.height = wid.defaultHeight;
-		if (wid.height == 0) wid.height = widget_default_size;
-	}
-	if (wid.x== undefined) wid.x = 0;
-	if (wid.y== undefined) wid.y = 0;
-
-	widg_ctrl = new_widget_control(wid);
-}
-
-
-//starts a widget
-function on_widget_launch() {
-	if (this.widget.visible) {
-		var awid;
-		if (!this.widget.multipleInstances) return;
-		awid = WidgetManager.open(this.widget.manifest, null);
-		widget_launch(awid);
-	} else {
-		widget_launch(this.widget);
-	}
- show_dock(false);
-}
-
-
-function widget_get_icon(widget)
-{
-	var icon = 'icons/image-missing.svg';
-	var preferredIconType = '.svg';
-
-	for (var i = 0; i < widget.icons.length; i++) {
-		icon = widget.icons[i].relocated_src;
-		if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
-			break;
-		}
-	}
-	return icon;
-}
-
-function widget_insert(widget)
-{
-	/*insert the widget icon*/
-	if (widget.permanent && !widget.is_component)
-		widget_insert_icon(widget);
-
-	/*and load the widget - comment this line to disable auto load of widget*/
-	widget_launch(widget);
-}
-
-function __get_int(arg)
-{
-		return (typeof arg == 'string') ? parseInt(arg) : arg;
-}
-
-function widget_request_size(widget, args)
-{
-	if (args.length==2) {
-		w = __get_int(args[0]);
-		h = __get_int(args[1]);
-		widget.widget_control.set_size(w, h);
-	}
-}
-
-function widget_request_show(widget, args)
-{
-	widget.widget_control.show();
-}
-function widget_request_hide(widget, args)
-{
-	widget.widget_control.hide();
-}
-function widget_request_activate(widget, args)
-{
-	if (!widget.visible)
-		widget_launch(widget);
-}
-function widget_request_deactivate(widget, args)
-{
-	if (widget.visible)
-		widget_close(widget, 0);
-}
-
-function widget_request_attention(widget, args)
-{
-	if (widget.visible) {
-		widget_display.push_to_top(widget.widget_control);
-		flash_window(widget.widget_control);
-	}
-}
-
-function widget_request_notification(widget, args)
-{
- var notif = gw_new_message(null, ''+widget.name+' Alert!', args[0]);
-//	widget_display.push_to_top(notif);
- gpacui_show_window(notif);
-	notif.set_size(240, 120);
-}
-
-function widget_refresh_components_layout(ctrl, send_resize, comp_target)
-{
-	var i;
-	var x, y, w, h, scale_x, scale_y;
-	var comps;
-
-	/*local to subscene transformation not known*/
-	if (!ctrl.sub_w) return;
-	if (!ctrl.sub_h) return;
-
-	comps = ctrl.widget.components;
-	for (i=0; i<comps.length; i++) {
-		var comp = comps[i];
-		if (!comp.widget_control || !comp.widget_control.component_bound) continue;
-
-		//compute scale from Widget Manager coord system to widget internal coordinate system
-		scale_x = ctrl.sub_vp_w / ctrl.sub_w;
-		scale_y = ctrl.sub_vp_h / ctrl.sub_h;
-
-		w = comp.widget_control.place_w * scale_x;
-		h = comp.widget_control.place_h * scale_y;
-
-		x = ctrl.translation.x - ctrl.widget.width/2 + ctrl.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
-		comp.widget_control.translation.x = x;
-
-		y = ctrl.widget.height/2 + ctrl.translation.y - h/2 - ctrl.sub_vp_y - comp.widget_control.place_y * scale_y;
-		comp.widget_control.translation.y = y;
-
-		if (send_resize || (comp_target==comp))
-			comp.widget_control.set_size(w, h);
-	}
-}
-
-function widget_place_component(widget, args)
-{
-	var comp = widget.get_component(args[0]);
-
-	if (comp==null) {
-		log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
-		return;
-	}
-	comp.widget_control.place_x = __get_int(args[1]);
-	comp.widget_control.place_y = __get_int(args[2]);
-	comp.widget_control.place_w = __get_int(args[3]);
-	comp.widget_control.place_h = __get_int(args[4]);
-	comp.widget_control.place_z = __get_int(args[5]);
-	comp.widget_control.component_bound = true;
-	widget_refresh_components_layout(widget.widget_control, false, comp);
-}
-
-
-
-//
-// implementation of core:out install widget
-//
-function widget_request_install(wid, args)
-{
-	var wid_url = args[0];
-	/*locate widget with same URL*/
-	var j, count = WidgetManager.num_widgets;
-	for (j = 0; j < count; j++) {
-		var wid = WidgetManager.get(j);
-		if (wid.url == wid_url) {
-			if (!wid.in_panel) {
-				widget_insert_icon(wid);
-			}
-			break;
-		}
-	}
-	alert('opening widget '+wid_url);
-	/*not found, install new widget*/
-	if (j == count) {
-		var new_wid = WidgetManager.open(wid_url, null, wid);
-		if (new_wid==null) return;
-		widget_insert_icon(new_wid);
-	}
-
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"), wid, 1); // send return code 1 = success
-	}
-}
-function widget_migrate_component(wid, args)
-{
-	var comp = wid.get_component(args[0], true);
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-
-	if (comp==null) {
-		log(l_err, 'Component '+args[0]+' cannot be found in widget '+wid.name);
-		if (ifce != null) {
-			wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
-		}
-		return;
-	}
-	comp.widget_control = null;
-	if (args.length > 1 && args[1] != null) {
-		alert('Migrating component to ' + UPnP.GetMediaRenderer(parseInt(args[1])).Name);
-		WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
-		widget_close(comp);
-	} else {
- var dlg = select_mpegu_target(new_migrate_callback(comp) ); 
-	}
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
-	}
-}
-
-function widget_migration_targets(wid, args)
-{
-	var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i, i;
-
-	for (i = 0; i < count; i++) {
-		var render = UPnP.GetMediaRenderer(i);
-		codes.push(""+i);
-		names.push(render.Name);
-		descriptions.push(render.HostName +" "+ render.UUID);
-	}
-	i = null;
-	var ifce_count = wid.num_interfaces, j;
-	for (j = 0; j < ifce_count; j++) {
-		var ifce = wid.get_interface(j);
-		if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
-			i = ifce;
-			break;
-		}
-	}
-	if (i != null) {
-		wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
-			wid, codes, names, descriptions);
-	}
-}
-
-
-//
-// implementation of core:out activate temporary widget
-//
-function widget_activate_temporary_widget(wid, args) {
-	var w = WidgetManager.open(args[0], null);
-	if (w != null) widget_launch(w);
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
-			wid, (w != null ? 1 : 0)); // send return code 1 = success
-	}
-}
-
-function setup_extension(extension)
-{ 
- var count, i;
-
- /*WidgetManager module not present*/ 
- if (typeof(WidgetManager) == 'undefined') return 0;
- 
- /*load MPEG-U*/ 
- Browser.loadScript('mpegu-core.js', true); 
- widget_manager_init();
- 
- extension.icon = 'applications-system.svg';
- extension.label = 'Widget Manager';
- extension.desc = 'Configure Widgets';
- extension.launch = open_widget_manager;
- 
- extension.initialize = function(extension) {
-		WidgetManager.on_widget_remove = widget_remove;
-		WidgetManager.on_widget_add = widget_insert;
-		WidgetManager.coreOutSetSize = widget_request_size;
-		WidgetManager.coreOutShow = widget_request_show;
-		WidgetManager.coreOutHide = widget_request_hide;
-		WidgetManager.coreOutRequestActivate = widget_request_activate;
-		WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
-		WidgetManager.coreOutShowNotification = widget_request_notification;
-		WidgetManager.coreOutPlaceComponent = widget_place_component;
-		WidgetManager.coreOutGetAttention = widget_request_attention;
-		WidgetManager.coreOutInstallWidget = widget_request_install;
-		WidgetManager.coreOutMigrateComponent = widget_migrate_component;
-		WidgetManager.coreOutRequestMigrationTargets = widget_migration_targets;
-		WidgetManager.coreOutActivateTemporaryWidget = widget_activate_temporary_widget;
-
-
- 	gpacui_show_window(widget_display);
- 	
- 	/*restore our widgets*/
- 	count = WidgetManager.num_widgets;
- 	for (i=0; i<count; i++) {
- 		var wid = WidgetManager.get(i);
- 		if (wid == null) continue;
- 		wid.device = null;
- 		wid.device_ip = null;
-
- 		if (wid.in_panel == true) {
- var icon = gpacui_insert_dock_icon(wid.name, widget_get_icon(wid));
- 			icon.widget = wid;
- 			icon.on_click = on_widget_launch;
- 			wid.icon_dock = icon;
- 		}
-
- 		if (wid.visible) {
- 			widget_launch(wid);
- 		}
- 	}
- 	check_widget_display(display_width, display_height);
- }	
-
- if (UPnP_Enabled) { 
- extension.on_upnp_add = function(name, uuid, is_add) {
- 	var i, count;
- 	var show = UPnP.MediaRenderersCount ? 1 : 0;
- 	count = WidgetManager.num_widgets;
- 	for (i=0; i<count; i++) {
- 		wid = WidgetManager.get(i);
- 		if (wid == null) continue;
- 		if (!wid.widget_control) continue;
- 		wid.widget_control.show_remote(show);
- 	}
- }
- extension.on_media_open = function(url, src_ip) {
- 	if (! WidgetManager.probe(url)) return 0;
- 		var new_wid = WidgetManager.open(url, src_ip);
- 		if (new_wid!=null) {
- 	 widget_insert(new_wid);
- 		}
- 		return 1;
- }
- }
- extension.on_resize = check_widget_display;
- 
- /*setup all widgets*/
- return 1;
-}
-
+/*container for widgets*/
+widget_display = gw_new_container();
+widget_display.on_event = function(evt) 
+{
+ if(!widget_display.children.length) return false;
+ return widget_display.children[widget_display.children.length-1].on_event(evt);
+}
+
+widget_tool_size = 18;
+widget_min_size = 5*widget_tool_size;
+widget_default_size = 100;
+
+
+function check_widget_display(width, height) 
+{
+	var count = WidgetManager.num_widgets;
+	for (var i=0; i<count; i++) {
+	 var x, y;
+		var wid = WidgetManager.get(i);
+		if (wid == null) continue;
+		if (!wid.visible) continue;
+		
+	 x = wid.x;
+ y = wid.y;
+		if (x-wid.width/2 <= -width/2) x = wid.width/2-width/2;
+		else if (x+wid.width/2 >= width/2) x = width/2 - wid.width/2;
+		
+		if (y + wid.height/2 >= height/2) y = height/2 - wid.height/2;
+		else if (y - wid.height/2 <= - height/2) y = -height/2 + wid.height/2;
+
+		if (wid.widget_control) wid.widget_control.move(x, y);
+	}
+}
+
+function scan_directory(dir)
+{
+	var i, j, count, list, new_wid, uri;
+	list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
+	for (i=0; i<list.length; i++) {
+		uri = list[i].path + list[i].name;
+		if (list[i].directory) {
+			scan_directory(uri);
+		} else {
+			count = WidgetManager.num_widgets;
+			for (j=0; j<count; j++) {
+				var wid = WidgetManager.get(j);
+				if (wid.url==uri) break;
+			}
+			if (j==count) {
+				new_wid = WidgetManager.open(uri, null);
+				if (new_wid!=null) {
+					widget_insert_icon(new_wid);
+				}
+			}
+		}
+	}
+}
+
+widman_cfg_dlg = null; 
+
+function open_widget_manager(extension)
+{
+ if (widman_cfg_dlg) return;
+
+ widman_cfg_dlg = gw_new_window_full(null, true, 'Widget Manager');
+ widman_cfg_dlg.area = gw_new_grid_container(widman_cfg_dlg);
+
+ var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.add, 'Add widget', 'icon_label');
+ icon.on_click = function() {
+ widman_cfg_dlg.close();
+ widman_cfg_dlg = null;
+ 
+ var filebrowse = gw_new_file_open();
+ filebrowse.show_directory = true;
+ filebrowse.filter = '*.xml;*.wgt;*.mgt';
+ filebrowse.browse(WidgetManager.last_widget_dir); 
+ 
+ filebrowse.on_browse = function(value, directory) {
+ 		var new_wid = WidgetManager.open(value, null);
+	 	if (new_wid==null) return;
+		 WidgetManager.last_widget_dir = directory;
+		 widget_insert_icon(new_wid);
+		 dock.layout(dock.width, dock.height);
+		 show_dock(true);
+ }
+ filebrowse.on_directory = function(directory) {
+ 		WidgetManager.last_widget_dir = directory;
+ 		scan_directory(directory);
+		 show_dock(true);
+ }
+ filebrowse.set_size(320 , 240);
+ gpacui_show_window(filebrowse);
+ }
+var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.trash, 'Remove all widgets', 'icon_label');
+ icon.on_click = function() {
+		while (1) {
+			var wid = WidgetManager.get(0);
+			if (wid==null) break;
+			widget_remove(wid);
+		}
+ widman_cfg_dlg.close();
+ widman_cfg_dlg = null;
+	 dock.layout(dock.width, dock.height);
+	 show_dock(true);
+ }
+ widman_cfg_dlg.on_close = function() {
+ widman_cfg_dlg = null;
+ }
+ widman_cfg_dlg.set_size(320 , 240);
+ gpacui_show_window(widman_cfg_dlg);
+}
+
+function widget_insert_icon(new_wid) {
+	var icon = gpacui_insert_dock_icon(new_wid.name, widget_get_icon(new_wid) );
+	new_wid.in_panel = true;
+	new_wid.visible = false;
+	new_wid.icon_dock = icon;
+	icon.on_click = on_widget_launch;
+	icon.widget = new_wid;
+}
+
+function collapsable_list(info_dlg, title)
+{
+	var info = gw_new_button(info_dlg.area, title, 'button');
+	var children = info_dlg.area.get_children();
+	
+	info.first_idx = children.length;
+	info.dlg = info_dlg;
+	info.displayed = true;
+ info.on_click = function() {
+ var children = this.dlg.area.get_children();
+ this.displayed = !this.displayed;
+	 for (var i=this.first_idx; i<this.last_idx; i++) {
+ if (this.displayed) children[i].show();
+ else children[i].hide();
+ 	
+ if (typeof children[i].last_idx != 'undefined') {
+ if (!children[i].displayed) children[i].on_click();
+ }
+ }
+ this.dlg.area.layout_changed();
+ }
+ return info;
+}
+
+//widget information dialog
+function display_widget_info(wid)
+{
+	var i, j, k, info;
+	var y, txt, pref;
+
+	var info_dlg = gw_new_window_full(null, true, 'Widget ' + wid.name + ' Information', 'window', null);
+// info_dlg.area = gw_new_grid_container(info_dlg);
+ info_dlg.area = gw_new_listbox(info_dlg);
+ 
+	var info = collapsable_list(info_dlg, 'Widget Metadata');
+	
+ gw_new_text(info_dlg.area, 'id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'text');
+ gw_new_text(info_dlg.area, 'version: '+wid.version, 'text');
+ gw_new_text(info_dlg.area, 'content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'text');
+ gw_new_text(info_dlg.area, 'default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'text');
+ gw_new_text(info_dlg.area, 'license: '+wid.license, 'text');
+ gw_new_text(info_dlg.area, 'license ref: '+wid.licenseHref, 'text');
+ gw_new_text(info_dlg.area, 'description: '+wid.description, 'text');
+ gw_new_text(info_dlg.area, 'author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'text');
+ gw_new_text(info_dlg.area, 'author href: '+wid.authorHref, 'text');
+ gw_new_text(info_dlg.area, 'view modes: '+wid.viewmodes, 'text');
+ gw_new_text(info_dlg.area, 'UUID: '+wid.uuid, 'text');
+ gw_new_text(info_dlg.area, 'Discardable: '+wid.discardable, 'text');
+ gw_new_text(info_dlg.area, 'Muliple Instances: '+wid.discardable, 'text');
+	var icons = wid.icons;
+	for (j=0; j<icons.length; j++) {
+ gw_new_text(info_dlg.area, 'Icon #'+(j+1)+': ' + icons[j].src, 'text');
+	}
+	info.last_idx = info_dlg.area.get_children().length;
+	info.on_click();
+
+	info = collapsable_list(info_dlg, 'Widget Manager Info');
+
+	gw_new_text(info_dlg.area, 'nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'text' );
+	gw_new_text(info_dlg.area, 'Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'text' );
+	if (wid.is_component) {
+		gw_new_text(info_dlg.area, 'parent widget name' + wid.parent.name, 'text');
+	}
+	if (wid.originating_device_ip) {
+		gw_new_text(info_dlg.area, 'Widget was pushed from device IP '+wid.originating_device_ip, 'text' );
+	}
+	gw_new_text(info_dlg.area, 'Section name in GPAC config file: '+wid.section, 'text' );
+	gw_new_text(info_dlg.area, 'UA Locale: ' + gpac.get_option('Systems', 'LanguageName') + ' (' + gpac.get_option('Systems', 'Language2CC') + ')', 'text');
+	gw_new_text(info_dlg.area, 'widget src: ' + wid.url , 'text');
+	gw_new_text(info_dlg.area, 'config src: ' + wid.manifest , 'text');
+	gw_new_text(info_dlg.area, 'content src : '+wid.localizedSrc, 'text' );
+	info.last_idx = info_dlg.area.get_children().length;
+	info.on_click();
+
+	pref = wid.features;
+	if (pref.length) {
+ 	info = collapsable_list(info_dlg, 'Features');
+ 	for (j=0; j<pref.length; j++) {
+ 		gw_new_text(info_dlg.area, 'Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'text');
+ 	}
+ 	info.last_idx = info_dlg.area.get_children().length;
+ 	info.on_click();
+ }
+
+	pref = wid.preferences;
+	if (pref.length) {
+ 	info = collapsable_list(info_dlg, 'Preferences');
+ 	for (j=0; j<pref.length; j++) {
+ 		var val = pref[j].value;
+ 		if (val == '') val = gpac.get_option(wid.section, pref[j].name);
+ 		gw_new_text(info_dlg.area, 'Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'text');
+ 	}
+ 	info.last_idx = info_dlg.area.get_children().length;
+ 	info.on_click();
+ }
+
+	info = collapsable_list(info_dlg, 'MPEG-U Migration Context');
+	txt=wid.get_context();
+	if (!txt) txt='';
+
+	while (1) {
+		var idx = txt.indexOf('\n', 0);
+		if (idx>0) {
+			gw_new_text(info_dlg.area, txt.substring(0, idx), 'text');
+			txt = txt.substring(idx+1, txt.length);
+		} else {
+			gw_new_text(info_dlg.area, txt, 'text');
+			break;
+		}
+	}
+	info.last_idx = info_dlg.area.get_children().length;
+	info.on_click();
+
+ if (wid.num_interfaces) {
+ 	info = collapsable_list(info_dlg, 'MPEG-U Interfaces', 'button');
+ 		var spacer = gw_new_text(info_dlg.area, '', 'text');
+ 	spacer.hide();
+ 	info.first_idx = info_dlg.area.get_children().length;
+ for (j=0; j<wid.num_interfaces; j++) {
+ 		var idx;
+ 		var ifce = wid.get_interface(j);
+ 	var item = collapsable_list(info_dlg, 'Interface #' + (j+1) + ' type: '+ifce.type);
+ item.sublist = true;
+ 		gw_new_text(info_dlg.area, 'Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'text');
+ 		for (k=0; k<ifce.num_messages; k++) {
+ 			var string, l;
+ 			var msg = ifce.get_message(k);
+ 			string = ' Message #'+ (k+1) + ': ' + msg.name + '(';
+ 			for (l=0; l<msg.num_params; l++) {
+ 				par = msg.get_param(l);
+ 				string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
+ 			}
+ 			string += ')';
+ 			gw_new_text(info_dlg.area, string, 'text');
+ 		}
+ 	 item.last_idx = info_dlg.area.get_children().length;
+ 	item.on_click();
+ 	item.hide();
+ 	}
+ 	info.last_idx = info_dlg.area.get_children().length;
+ 	info.on_click();
+ }
+
+ info_dlg.area.spread_h = true;
+ info_dlg.area.break_at_hidden = true;
+ 
+ info_dlg.on_size = function(width, height) {
+ var i;
+ var children = this.area.get_children();
+ for (i=0; i<children.length; i++) {
+ if ((typeof children[i].first_idx != 'undefined') && (typeof children[i].sublist== 'undefined')) {
+ children[i].set_size( (width>200) ? 200 : width, 20);
+ } else {
+ children[i].set_size(width, 16);
+ }
+ }
+ }
+ 
+ info_dlg.on_event = function(evt) {
+ if (this.area && this.area.on_event(evt)) return true;
+ return false;
+ }
+
+ info_dlg.set_size(320, 240);
+ gpacui_show_window(info_dlg);
+}
+
+
+//widget close function
+function widget_close(widget, force_remove)
+{
+	var is_comp = widget.is_component;
+
+	if (widget.visible) {
+		widget.visible = false;
+		WidgetManager.corein_message(widget, 'hide');
+		WidgetManager.corein_message(widget, 'deactivate');
+		widget.deactivate();
+		/*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
+		if (widget.widget_control) {
+			widget.widget_control.set_url('');
+			widget.widget_control.close();
+		}
+	}
+	if (!is_comp && (!widget.permanent || force_remove)) {
+		WidgetManager.unload(widget, force_remove ? true : false);
+	}
+}
+
+//widget remove function (close and unregister)
+function widget_remove(wid) {
+	if (typeof(wid.icon_dock) != 'undefined') {
+		wid.icon_dock.close();
+ wid.icon_dock = null;
+	}		
+	widget_close(wid, 1);
+}
+
+function new_migrate_callback(widget) {
+ return function(renderer) {
+ WidgetManager.migrate_widget(renderer, widget);
+	widget_close(widget, 0);
+ }
+}
+
+function on_widget_load() 
+{
+	WidgetManager.corein_message(this, 'activate');
+	WidgetManager.corein_message(this, 'show');
+	WidgetManager.corein_message(this, 'setSize', 'width', this.width, 'height', this.height, 'dpi', screen_dpi);
+}
+
+
+mpegu_targets = null;
+
+function select_mpegu_target(callback)
+{ 
+ if (mpegu_targets) return;
+ mpegu_targets = gw_new_file_open();
+ mpegu_targets.set_label('Select Remote Display');
+ mpegu_targets.callback = callback;
+
+ mpegu_targets.on_close = function() {
+ mpegu_targets = null;
+ }
+ /*override browse function*/
+ mpegu_targets._on_mpegu_click = function() {
+ 	var target = (this.render_idx<0) ? null : WidgetManager.get_mpegu_service_providers(this.render_idx);
+
+		mpegu_targets.callback(target);
+		mpegu_targets.callback = null;
+ mpegu_targets.close();
+ mpegu_targets = null;
+ }
+ mpegu_targets._browse = function(dir, up) {
+ var w, h, i, y;
+ this.area.reset_children();
+ 
+ for (i=0; ; i++) {
+		var target = WidgetManager.get_mpegu_service_providers(i);
+		if (!target) break;
+		var	icon = 'icons/applications-internet.svg';
+ var item = gw_new_icon_button(this.area, icon, target.Name);
+ item.set_size(item.width, item.height);
+ item.render_idx = i;
+ item.on_click = this._on_mpegu_click;
+ } 
+ this.layout(this.width, this.height);
+ }
+ mpegu_targets.browse(''); 
+ mpegu_targets.go_up.hide();
+ mpegu_targets.set_size(display_width, display_height);
+ gpacui_show_window(mpegu_targets);
+}
+
+
+function new_widget_control(widget)
+{
+ var ctrl;
+ 
+
+ var inline = gw_new_subscene(null);
+ ctrl = gw_new_window_full(widget_display, true, null, 'offscreen', inline);
+	ctrl.set_size(widget.width, widget.height);
+
+ ctrl.inline = inline;
+ ctrl.tools.spread_h = true;
+ 
+	ctrl.component_bound = false;
+	ctrl.widget = widget;
+	widget.widget_control = ctrl; 
+	widget.visible = true;
+ 
+ ctrl.on_close = function() {
+ 	this.inline.url[0] = '';
+ 	this.widget.widget_control = null; 
+		if (this.widget.discardable) widget_remove(this.widget);
+		else widget_close(this.widget, 0);
+		this.widget = null;
+ }
+
+ ctrl.tools.hide();
+ gw_object_set_dragable(ctrl);
+
+ gw_object_set_hitable(ctrl);
+ ctrl.controls_visible = false;
+
+	this.maximized = false;
+ ctrl.on_double_click = function() {
+ if (this.maximized) {
+		this.maximized = false;
+		this.move(this.widget.x, this.widget.y);
+		this.set_size(this.prev_width, this.prev_height);
+ } else {
+		this.maximized = true;
+		this.prev_width = this.widget.width;
+		this.prev_height = this.widget.height;
+		this.move(0, 0);
+		this.set_size(display_width, display_height);
+ } 
+ this.controls_visible = false;
+ this.tools.hide();
+ }
+
+ ctrl.on_click = function() {
+ this.controls_visible = ! this.controls_visible;
+ if (this.controls_visible) this.tools.show();
+ else this.tools.hide();
+ }
+ /*push on top*/
+ ctrl.on_down = function(value) {
+		if (value) return;
+		if (this.widget==null) return;
+
+		//widget is a component, do not push on top but hide some controls
+		if (this.widget.is_component) {
+			if (this.component_bound) {
+			 var chldren = this.tools.get_children();
+				children[0].hide(); //close
+				children[1].hide(); //remove
+				children[4].hide(); //resize
+			}
+			return;
+		}
+		//otherwise push widget on top
+		widget_display.push_to_top(this);
+		//and push components
+		comps = this.widget.components;
+		for (i=0; i<comps.length; i++) {
+			if (comps[i].widget_control && comps[i].widget_control.component_bound) {
+				widget_display.push_to_top(comps[i].widget_control);
+			}
+		}
+ }
+
+ ctrl._orig_move = ctrl.move;
+ ctrl.move = function(x, y) {
+ this.widget.x = x;
+		this.widget.y = y;
+		this._orig_move(x, y);
+	}
+
+ ctrl.on_drag = function(x, y) {
+		if (this.maximized) return;
+ this.move(x, y);
+ }
+ ctrl.on_event = function(evt) {
+ var x, y;
+ if (evt.type != GF_EVENT_KEYDOWN) return false;
+ if (!this.controls_visible) return false;
+
+ x = this.widget.x;
+ y = this.widget.y;
+ if (evt.keycode=='Up') y += 10;
+ else if (evt.keycode=='Down') y -= 10;
+ else if (evt.keycode=='Left') x -= 10;
+ else if (evt.keycode=='Right') x += 10;
+ else return false;
+ this.move(x, y);
+ return true;
+ }
+ 
+ /*widget is not temporary*/
+	if (!widget.discardable && widget.icon_dock) {
+ var icon = ctrl.add_tool(gwskin.images.trash, gwskin.labels.trash);
+ icon.on_click = function() { widget_remove(this.dlg.widget); }; 
+ }
+ 
+ if (UPnP_Enabled) {
+ ctrl.remote = ctrl.add_tool(gwskin.images.remote_display, gwskin.labels.remote_display);
+ ctrl.remote.on_click = function() { 
+ var dlg = select_mpegu_target(new_migrate_callback(this.dlg.widget) ); 
+ }; 
+ 	
+ ctrl.show_remote = function(show) {
+ if (show) this.remote.show();
+ else this.remote.hide();
+ }
+ } 
+
+ var icon = ctrl.add_tool(gwskin.images.information, gwskin.labels.information);
+ icon.on_click = function() { 
+ display_widget_info(this.dlg.widget); 
+ }; 
+
+ var icon = ctrl.add_tool(gwskin.images.resize, gwskin.labels.resize);
+ gw_object_set_dragable(icon);
+	ctrl.prev_x=0;
+	ctrl.prev_y=0;
+ icon.begin_drag = function() {
+ 	this.dlg.prev_x=this.startx;
+	 this.dlg.prev_y=this.starty;
+ }
+ icon.on_drag = function(valx, valy) {
+ var _dlg = this.dlg;
+		if (_dlg.widget.width + 2*(valx - _dlg.prev_x) < widget_min_size) return;
+		if (_dlg.widget.height + 2*(valy-_dlg.prev_y) < widget_min_size) return;
+
+		_dlg.widget.width += 2*(valx - _dlg.prev_x);
+		_dlg.prev_x = valx;
+		_dlg.widget.height += 2*(valy - _dlg.prev_y);
+		_dlg.prev_y = valy;
+		_dlg.set_size(_dlg.widget.width, _dlg.widget.height);
+ }
+ 
+ ctrl.set_url = function(url) {
+ 	 ctrl.inline.url[0] = url;
+ }
+ ctrl.predestroy = function() {
+ this.inline = null;
+ this.remote = null;
+ this.widget = null;
+ }
+		
+	ctrl.sub_w = 0;
+	ctrl.sub_h = 0;
+	ctrl.sub_x = 0;
+	ctrl.sub_y = 0;
+	ctrl.sub_vp_w = 0;
+	ctrl.sub_vp_h = 0;
+
+ ctrl.on_widget_vp_changed = function(evt) {
+		this.sub_vp_w = evt.width;
+		this.sub_vp_h = evt.height;
+		this.sub_vp_x = evt.offset_x;
+		this.sub_vp_y = evt.offset_y;
+		this.sub_w = evt.vp_width;
+		this.sub_h = evt.vp_height;
+ }
+	ctrl.inline.addEventListener('gpac_vp_changed', ctrl.on_widget_vp_changed, 0);
+		
+// ctrl.set_tool_size(widget_tool_size); 
+	ctrl.set_size(widget.width, widget.height);
+	if (widget.x < -display_width/2) widget.x = 0;
+	else if (widget.x > display_width/2) widget.x = 0;
+	if (widget.y < -display_height/2) widget.y = 0;
+	else if (widget.y > display_height/2) widget.y = 0;
+	ctrl.move(widget.x, widget.y);
+
+	/*this will setup the scene graph for the widget in order to filter input and output communication pins*/
+	widget.activate(ctrl.inline);
+
+	ctrl.set_url(widget.main);
+
+	/*send notifications once the widget scene is loaded*/
+	widget.on_load = on_widget_load;
+
+ ctrl.show();
+ return ctrl;
+}
+
+function flash_window(wnd) {
+	wnd.time = gw_new_timer(true);
+	wnd.time.set_timeout(0.25, true);
+	wnd.time.ctrl = wnd;
+	wnd.time.on_fraction = function(val) {
+		var scale = (val<0.5) ? 1+val/2 : 1.5-val/2;
+		this.ctrl.scale.x = this.ctrl.scale.y = scale;
+	}
+	wnd.time.on_active = function (val) {
+		 if (!val) {
+ this.ctrl.time = null;
+ this.ctrl = null;
+ }
+ }
+	wnd.time.stop(1);
+	wnd.time.start(0);
+}
+
+//widget launcher function
+function widget_launch(wid) {
+	var widg_ctrl;
+
+	//assign default size to the widget
+	if (wid.width == undefined) {
+		wid.width = wid.defaultWidth;
+		if (wid.width == 0) wid.width = widget_default_size;
+	}
+	if (wid.height == undefined) {
+		wid.height = wid.defaultHeight;
+		if (wid.height == 0) wid.height = widget_default_size;
+	}
+	if (wid.x== undefined) wid.x = 0;
+	if (wid.y== undefined) wid.y = 0;
+
+	widg_ctrl = new_widget_control(wid);
+}
+
+
+//starts a widget
+function on_widget_launch() {
+	if (this.widget.visible) {
+		var awid;
+		if (!this.widget.multipleInstances) return;
+		awid = WidgetManager.open(this.widget.manifest, null);
+		widget_launch(awid);
+	} else {
+		widget_launch(this.widget);
+	}
+ show_dock(false);
+}
+
+
+function widget_get_icon(widget)
+{
+	var icon = 'icons/image-missing.svg';
+	var preferredIconType = '.svg';
+
+	for (var i = 0; i < widget.icons.length; i++) {
+		icon = widget.icons[i].relocated_src;
+		if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
+			break;
+		}
+	}
+	return icon;
+}
+
+function widget_insert(widget)
+{
+	/*insert the widget icon*/
+	if (widget.permanent && !widget.is_component)
+		widget_insert_icon(widget);
+
+	/*and load the widget - comment this line to disable auto load of widget*/
+	widget_launch(widget);
+}
+
+function __get_int(arg)
+{
+		return (typeof arg == 'string') ? parseInt(arg) : arg;
+}
+
+function widget_request_size(widget, args)
+{
+	if (args.length==2) {
+		w = __get_int(args[0]);
+		h = __get_int(args[1]);
+		widget.widget_control.set_size(w, h);
+	}
+}
+
+function widget_request_show(widget, args)
+{
+	widget.widget_control.show();
+}
+function widget_request_hide(widget, args)
+{
+	widget.widget_control.hide();
+}
+function widget_request_activate(widget, args)
+{
+	if (!widget.visible)
+		widget_launch(widget);
+}
+function widget_request_deactivate(widget, args)
+{
+	if (widget.visible)
+		widget_close(widget, 0);
+}
+
+function widget_request_attention(widget, args)
+{
+	if (widget.visible) {
+		widget_display.push_to_top(widget.widget_control);
+		flash_window(widget.widget_control);
+	}
+}
+
+function widget_request_notification(widget, args)
+{
+ var notif = gw_new_message(null, ''+widget.name+' Alert!', args[0]);
+//	widget_display.push_to_top(notif);
+ gpacui_show_window(notif);
+	notif.set_size(240, 120);
+}
+
+function widget_refresh_components_layout(ctrl, send_resize, comp_target)
+{
+	var i;
+	var x, y, w, h, scale_x, scale_y;
+	var comps;
+
+	/*local to subscene transformation not known*/
+	if (!ctrl.sub_w) return;
+	if (!ctrl.sub_h) return;
+
+	comps = ctrl.widget.components;
+	for (i=0; i<comps.length; i++) {
+		var comp = comps[i];
+		if (!comp.widget_control || !comp.widget_control.component_bound) continue;
+
+		//compute scale from Widget Manager coord system to widget internal coordinate system
+		scale_x = ctrl.sub_vp_w / ctrl.sub_w;
+		scale_y = ctrl.sub_vp_h / ctrl.sub_h;
+
+		w = comp.widget_control.place_w * scale_x;
+		h = comp.widget_control.place_h * scale_y;
+
+		x = ctrl.translation.x - ctrl.widget.width/2 + ctrl.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
+		comp.widget_control.translation.x = x;
+
+		y = ctrl.widget.height/2 + ctrl.translation.y - h/2 - ctrl.sub_vp_y - comp.widget_control.place_y * scale_y;
+		comp.widget_control.translation.y = y;
+
+		if (send_resize || (comp_target==comp))
+			comp.widget_control.set_size(w, h);
+	}
+}
+
+function widget_place_component(widget, args)
+{
+	var comp = widget.get_component(args[0]);
+
+	if (comp==null) {
+		log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
+		return;
+	}
+	comp.widget_control.place_x = __get_int(args[1]);
+	comp.widget_control.place_y = __get_int(args[2]);
+	comp.widget_control.place_w = __get_int(args[3]);
+	comp.widget_control.place_h = __get_int(args[4]);
+	comp.widget_control.place_z = __get_int(args[5]);
+	comp.widget_control.component_bound = true;
+	widget_refresh_components_layout(widget.widget_control, false, comp);
+}
+
+
+
+//
+// implementation of core:out install widget
+//
+function widget_request_install(wid, args)
+{
+	var wid_url = args[0];
+	/*locate widget with same URL*/
+	var j, count = WidgetManager.num_widgets;
+	for (j = 0; j < count; j++) {
+		var wid = WidgetManager.get(j);
+		if (wid.url == wid_url) {
+			if (!wid.in_panel) {
+				widget_insert_icon(wid);
+			}
+			break;
+		}
+	}
+	alert('opening widget '+wid_url);
+	/*not found, install new widget*/
+	if (j == count) {
+		var new_wid = WidgetManager.open(wid_url, null, wid);
+		if (new_wid==null) return;
+		widget_insert_icon(new_wid);
+	}
+
+	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+	if (ifce != null) {
+		wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"), wid, 1); // send return code 1 = success
+	}
+}
+function widget_migrate_component(wid, args)
+{
+	var comp = wid.get_component(args[0], true);
+	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+
+	if (comp==null) {
+		log(l_err, 'Component '+args[0]+' cannot be found in widget '+wid.name);
+		if (ifce != null) {
+			wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
+		}
+		return;
+	}
+	comp.widget_control = null;
+	if (args.length > 1 && args[1] != null) {
+		alert('Migrating component to ' + UPnP.GetMediaRenderer(parseInt(args[1])).Name);
+		WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
+		widget_close(comp);
+	} else {
+ var dlg = select_mpegu_target(new_migrate_callback(comp) ); 
+	}
+	if (ifce != null) {
+		wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
+	}
+}
+
+function widget_migration_targets(wid, args)
+{
+	var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i, i;
+
+	for (i = 0; i < count; i++) {
+		var render = UPnP.GetMediaRenderer(i);
+		codes.push(""+i);
+		names.push(render.Name);
+		descriptions.push(render.HostName +" "+ render.UUID);
+	}
+	i = null;
+	var ifce_count = wid.num_interfaces, j;
+	for (j = 0; j < ifce_count; j++) {
+		var ifce = wid.get_interface(j);
+		if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
+			i = ifce;
+			break;
+		}
+	}
+	if (i != null) {
+		wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
+			wid, codes, names, descriptions);
+	}
+}
+
+
+//
+// implementation of core:out activate temporary widget
+//
+function widget_activate_temporary_widget(wid, args) {
+	var w = WidgetManager.open(args[0], null);
+	if (w != null) widget_launch(w);
+	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+	if (ifce != null) {
+		wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
+			wid, (w != null ? 1 : 0)); // send return code 1 = success
+	}
+}
+
+function setup_extension(extension)
+{ 
+ var count, i;
+
+ /*WidgetManager module not present*/ 
+ if (typeof(WidgetManager) == 'undefined') return 0;
+ 
+ /*load MPEG-U*/ 
+ Browser.loadScript('mpegu-core.js', true); 
+ widget_manager_init();
+ 
+ extension.icon = 'applications-system.svg';
+ extension.label = 'Widget Manager';
+ extension.desc = 'Configure Widgets';
+ extension.launch = open_widget_manager;
+ 
+ extension.initialize = function(extension) {
+		WidgetManager.on_widget_remove = widget_remove;
+		WidgetManager.on_widget_add = widget_insert;
+		WidgetManager.coreOutSetSize = widget_request_size;
+		WidgetManager.coreOutShow = widget_request_show;
+		WidgetManager.coreOutHide = widget_request_hide;
+		WidgetManager.coreOutRequestActivate = widget_request_activate;
+		WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
+		WidgetManager.coreOutShowNotification = widget_request_notification;
+		WidgetManager.coreOutPlaceComponent = widget_place_component;
+		WidgetManager.coreOutGetAttention = widget_request_attention;
+		WidgetManager.coreOutInstallWidget = widget_request_install;
+		WidgetManager.coreOutMigrateComponent = widget_migrate_component;
+		WidgetManager.coreOutRequestMigrationTargets = widget_migration_targets;
+		WidgetManager.coreOutActivateTemporaryWidget = widget_activate_temporary_widget;
+
+
+ 	gpacui_show_window(widget_display);
+ 	
+ 	/*restore our widgets*/
+ 	count = WidgetManager.num_widgets;
+ 	for (i=0; i<count; i++) {
+ 		var wid = WidgetManager.get(i);
+ 		if (wid == null) continue;
+ 		wid.device = null;
+ 		wid.device_ip = null;
+
+ 		if (wid.in_panel == true) {
+ var icon = gpacui_insert_dock_icon(wid.name, widget_get_icon(wid));
+ 			icon.widget = wid;
+ 			icon.on_click = on_widget_launch;
+ 			wid.icon_dock = icon;
+ 		}
+
+ 		if (wid.visible) {
+ 			widget_launch(wid);
+ 		}
+ 	}
+ 	check_widget_display(display_width, display_height);
+ }	
+
+ if (UPnP_Enabled) { 
+ extension.on_upnp_add = function(name, uuid, is_add) {
+ 	var i, count;
+ 	var show = UPnP.MediaRenderersCount ? 1 : 0;
+ 	count = WidgetManager.num_widgets;
+ 	for (i=0; i<count; i++) {
+ 		wid = WidgetManager.get(i);
+ 		if (wid == null) continue;
+ 		if (!wid.widget_control) continue;
+ 		wid.widget_control.show_remote(show);
+ 	}
+ }
+ extension.on_media_open = function(url, src_ip) {
+ 	if (! WidgetManager.probe(url)) return 0;
+ 		var new_wid = WidgetManager.open(url, src_ip);
+ 		if (new_wid!=null) {
+ 	 widget_insert(new_wid);
+ 		}
+ 		return 1;
+ }
+ }
+ extension.on_resize = check_widget_display;
+ 
+ /*setup all widgets*/
+ return 1;
+}
+

v0.5.2.tar.gz/gui/gui.bt -> v0.6.1.tar.gz/gui/gui.bt Changed

v0.5.2.tar.gz/gui/gui.js -> v0.6.1.tar.gz/gui/gui.js Changed

@@ -8,44 +8,7 @@
 
 all_extensions = [];
 
-
-in_drag = 0;
-start_drag_x=start_drag_y=0;
-
-function my_filter_event(evt)
-{
- switch (evt.type) {
- case GF_EVENT_MOUSEDOWN:
- if (evt.picked) return false;
- start_drag_x = evt.mouse_x;
- start_drag_y = evt.mouse_y;
- if (gpac.navigation != GF_NAVIGATE_NONE) return false;
- if (!gpac.fullscreen) in_drag = 1;
- return true;
- case GF_EVENT_DBLCLICK:
- return true;
-case GF_EVENT_MOUSEMOVE:
- if (in_drag) {
- in_drag = 2;
- gpac.move_window(evt.mouse_x - start_drag_x, evt.mouse_y - start_drag_y);
- return true;
- }
- return false;
-
-case GF_EVENT_MOUSEUP:
- if (in_drag == 2) {
- in_drag = 0;
- return true;
- } 
- in_drag = 0;
- return false;
- default:
- return false;
- } 
- return false;
-}
-
-function gw_insert_media_node(node) 
+function gw_insert_media_node(node)
 {
 media_root.children[media_root.children.length] = node;
 }
@@ -73,9 +36,9 @@
 return function (key_name, value) {
 }
 } else {
- var ext_section = 'GUI.' + _ext.config_id;
 return function (key_name, value) {
- gpac.set_option(ext_section, key_name, value);
+ this.__gpac_storage.set_option('Config', key_name, value);
+ this.__gpac_storage.save();
 }
 }
 }
@@ -85,11 +48,11 @@
 return function (key_name, default_val) {
 }
 } else {
- var ext_section = 'GUI.' + _ext.config_id;
 return function (key_name, default_val) {
- var value = gpac.get_option(ext_section, key_name);
+			if (key_name=='path') return _ext.path;
+ var value = this.__gpac_storage.get_option('Config', key_name);
 if (value == null) {
- gpac.set_option(ext_section, key_name, default_val);
+ this.set_option(key_name, default_val);
 value = default_val;
 }
 return value;
@@ -97,6 +60,16 @@
 }
 }
 
+function setup_extension_storage(extension) {
+ var storage_name = 'config:' + extension.path + '' + extension.name;
+ gwlog(l_inf, 'loading storage for extension ' + storage_name);
+
+ extension.jsobj.__gpac_storage = gpac.new_storage(storage_name);
+
+ extension.jsobj.get_option = extension_option_getter(extension);
+ extension.jsobj.set_option = extension_option_setter(extension);
+}
+
 //Initialize our GUI
 function initialize() {
 //var icon;
@@ -106,8 +79,8 @@
 
 min_width = 160;
 min_height = 80;
- gw_display_width = parseInt(gpac.getOption('General', 'LastWidth'));
- gw_display_height = parseInt(gpac.getOption('General', 'LastHeight'));
+ gw_display_width = parseInt(gpac.get_option('General', 'LastWidth'));
+ gw_display_height = parseInt(gpac.get_option('General', 'LastHeight'));
 if (!gpac.fullscreen && (!gw_display_width || !gw_display_height)) {
 gw_display_width = 320;
 gw_display_height = 240;
@@ -115,8 +88,8 @@
 if (!gpac.fullscreen && gw_display_width && gw_display_height) {
 gpac.set_size(gw_display_width, gw_display_height);
 } else {
- gw_display_width = gpac.get_screen_width();
- gw_display_height = gpac.get_screen_height();
+ gw_display_width = gpac.screen_width;
+ gw_display_height = gpac.screen_height;
 }
 //request event listeners on the window - GPAC specific BIFS extensions !!! We don't allow using the event proc for size events
 root.addEventListener('resize', on_resize, 0);
@@ -126,11 +99,7 @@
 Browser.loadScript('gwlib.js', false);
 gwlib_init(ui_root);
 
- //set background color
- root.children[0].backColor = gwskin.back_color;
-
- //register custom event filter
- gwlib_add_event_filter(my_filter_event);
+	gwskin.enable_background(true);
 
 //what do we do with tooltips ?
 // gwskin.tooltip_callback = function(over, label) { alert('' + over ? label : ''); };
@@ -170,53 +139,52 @@
 if ( (typeof extension.requires_gl == 'boolean') && extension.requires_gl && !gwskin.has_opengl) continue;
 
 extension.path = 'extensions/' + list[i].name + '/';
+ extension.jsobj = null;
+
+ gwlog(l_deb, 'Loading UI extension ' + extension.name + ' ' + ' icon ' + extension.path + extension.icon + ' Author ' + extension.author);
 
- gwlog(l_deb, 'Loading UI extension ' + extension.name + ' ' + ' icon ' + extension.path + extension.icon + ' Author ' + extension.author);
-
- if (extension.name == 'Player') {
- all_extensions.unshift(extension);
- } else {
- all_extensions.push(extension);
+ if (extension.name == 'Player') {
+ all_extensions.unshift(extension);
+ } else {
+ all_extensions.push(extension);
 }
- }
-
- for (i = 0; i < all_extensions.length; i++) {
- var extension = all_extensions[i];
+ }
+
+ for (i = 0; i < all_extensions.length; i++) {
+ var extension = all_extensions[i];
 
 extension.icon = insert_dock_icon(extension.name, extension.path + extension.icon);
 extension.icon.ext_description = extension;
- extension.icon.extension_obj = null;
 extension.icon.on_close = function () {
 this.ext_description.icon = null;
 this.ext_description = null;
 }
 extension.icon.on_click = function () {
- if (!this.extension_obj) {
- for (var i=0; i<this.ext_description.execjs.length; i++) {
- gwlog(l_deb, 'Loading UI extension ' + this.ext_description.name + ' - Executing JS ' + this.ext_description.path + this.ext_description.execjs[i]);
- if (!i) {
- this.extension_obj = Browser.loadScript(this.ext_description.path + this.ext_description.execjs[i]);
- this.compatible = (this.extension_obj != null) ? true : false;
- if (!this.compatible) break;
- } else {
- Browser.loadScript(this.ext_description.path + this.ext_description.execjs[i]);
- }
+ var extension = this.ext_description;
+ if (!extension.jsobj) {
+ for (var i = 0; i < extension.execjs.length; i++) {
+ gwlog(l_deb, 'Loading UI extension ' + extension.name + ' - Executing JS ' + extension.path + extension.execjs[i]);
+ if (!i) {
+ extension.jsobj = Browser.loadScript(extension.path + extension.execjs[i]);
+ extension.compatible = (extension.jsobj != null) ? true : false;
+ if (!extension.compatible) break;
+
+ setup_extension_storage(extension);
+ } else {
+ Browser.loadScript(extension.path + extension.execjs[i]);
+ }
 }
 
- if (this.compatible) {
- this.extension_obj.get_option = extension_option_getter(this.ext_description);
- this.extension_obj.set_option = extension_option_setter(this.ext_description);
- }
 }
- if (!this.compatible) {
- var w = gw_new_message(null, 'Error', 'Extension ' + this.ext_description.name + ' is not compatible');
+ if (!extension.compatible) {
+ var w = gw_new_message(null, 'Error', 'Extension ' + extension.name + ' is not compatible');
 w.show();
 alert('Error');
 this.parent.disable();
 return;
 }
 
- if (this.extension_obj && (typeof this.extension_obj.start != 'undefined')) this.extension_obj.start();
+ if (extension.jsobj && (typeof extension.jsobj.start != 'undefined')) extension.jsobj.start();
 } 
 }
 
@@ -258,8 +226,8 @@
 gw_display_width = evt.width;
 gw_display_height = evt.height;
 if (!gpac.fullscreen) {
- gpac.setOption('General', 'LastWidth', '' + gw_display_width);
- gpac.setOption('General', 'LastHeight', '' + gw_display_height);
+ gpac.set_option('General', 'LastWidth', '' + gw_display_width);
+ gpac.set_option('General', 'LastHeight', '' + gw_display_height);
 }
 /*
 var v = 12;
@@ -283,6 +251,3 @@
 layout();
 }
 
-function gw_background_control(enable) {
- root.children[0].set_bind = enable ? true : false;
-}

v0.5.2.tar.gz/gui/gui_old.js -> v0.6.1.tar.gz/gui/gui_old.js Changed

@@ -40,8 +40,8 @@
 	gpac.caption = 'Osmo4';
 	current_time = 0;
 
-	display_width = parseInt( gpac.getOption('General', 'LastWidth') );
-	display_height = parseInt( gpac.getOption('General', 'LastHeight') );
+	display_width = parseInt(gpac.get_option('General', 'LastWidth'));
+	display_height = parseInt(gpac.get_option('General', 'LastHeight'));
 
 	if (!gpac.fullscreen && display_width && display_height) {
 		gpac.set_size(display_width, display_height);
@@ -845,7 +845,7 @@
 		info.children[i++] = text_label('Widget was pushed from device IP '+wid.originating_device_ip, 'BEGIN' );
 	}
 	info.children[i++] = text_label('Section name in GPAC config file: '+wid.section, 'BEGIN' );
-	info.children[i++] = text_label('UA Locale: ' + gpac.getOption('Systems', 'LanguageName') + ' ('+ gpac.getOption('Systems', 'Language2CC')+ ')', 'BEGIN' );
+	info.children[i++] = text_label('UA Locale: ' + gpac.get_option('Systems', 'LanguageName') + ' (' + gpac.get_option('Systems', 'Language2CC') + ')', 'BEGIN');
 	info.children[i++] = text_label('widget src: ' + wid.url , 'BEGIN');
 	info.children[i++] = text_label('config src: ' + wid.manifest , 'BEGIN');
 	info.children[i++] = text_label('content src : '+wid.localizedSrc, 'BEGIN' );
@@ -875,7 +875,7 @@
 	i=3;
 	for (j=0; j<pref.length; j++) {
 		var val = pref[j].value;
-		if (val=='') val = gpac.getOption(wid.section, pref[j].name);
+		if (val == '') val = gpac.get_option(wid.section, pref[j].name);
 		info.children[i++] = text_label('Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'BEGIN');
 	}
 
@@ -1175,8 +1175,8 @@
 function layout() {
 	var i, list, start_x;
 
-	gpac.setOption('General', 'LastWidth', ''+display_width);
-	gpac.setOption('General', 'LastHeight', ''+display_height);
+	gpac.set_option('General', 'LastWidth', ''+display_width);
+	gpac.set_option('General', 'LastHeight', '' + display_height);
 
 	if (dlg_display.children.length) {
 		widget_display.scale.x = 0;
@@ -2008,7 +2008,7 @@
 							} else {
 								log(l_err, 'GPAC Media Server is disabled - Cannot share '+current_url);
 							}
-						} else if (gpac.getOption('Network', 'MobileIPEnabled')=='yes') {
+						} else if (gpac.get_option('Network', 'MobileIPEnabled')=='yes') {
 							uri = gpac.migrate_url(movie.children[0].url[0]);
 							log(l_inf, 'Migrating '+current_url+' to renderer '+item.render.Name + ' as Mobile IP resource '+uri);
 							set_movie_url('', true, false);

v0.5.2.tar.gz/gui/gwlib.js -> v0.6.1.tar.gz/gui/gwlib.js Changed

@@ -1,401 +1,472 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:	
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-/*log function*/
-function gwlog(lev, str) {
- if (lev <= gw_log_level) {
- if (str.charAt(0) != '[') {
- alert('[GUI] ' + str);
- } else {
- alert(str);
- }
- }
-}
-
-/*log levels*/
-l_err = 0;
-l_war = 1;
-l_inf = 2;
-l_deb = 3;
-
-/*default log level*/
-gw_log_level = l_inf;
-
-
-function gw_new_timer(progressive) {
- var obj = new SFNode('TimeSensor');
-
- obj.set_timeout = function (time, loop) {
- this.cycleInterval = time ? time : 1;
- this.loop = loop;
- }
- this.startTime = -1;
- obj.start = function (when) {
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:	
+//					Jean Le Feuvre, Telecom ParisTech
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+/*log function*/
+function gwlog(lev, str) {
+ alert(lev, str);
+}
+
+/*log levels*/
+l_err = 1;
+l_war = 2;
+l_inf = 3;
+l_deb = 4;
+
+/*default log level*/
+gw_log_level = l_inf;
+
+GF_JS_EVENT_BASE = 20000;
+
+//playback event
+//@param is_playing boolean giving the playback status;
+GF_JS_EVENT_PLAYBACK = GF_JS_EVENT_BASE;
+
+//playlist insert event
+//@param url string giving URL to append
+GF_JS_EVENT_PLAYLIST_ADD = GF_JS_EVENT_BASE + 1;
+
+//playlist reset event
+//@param none
+GF_JS_EVENT_PLAYLIST_RESET = GF_JS_EVENT_BASE + 2;
+
+
+//playlist reset event
+//@param index item index in playlist
+GF_JS_EVENT_PLAYLIST_PLAY = GF_JS_EVENT_BASE + 3;
+
+function gw_new_timer(progressive) {
+ var obj = new SFNode('TimeSensor');
+
+ obj.set_timeout = function (time, loop) {
+ this.cycleInterval = time ? time : 1;
+ this.loop = loop;
+ }
+ this.startTime = -1;
+ obj.start = function (when) {
 if (arguments.length==0) this.startTime = this.getTime();
- else this.startTime = when + this.getTime();
- }
+ else this.startTime = when + this.getTime();
+ }
 obj.stop = function (when) {
- if (arguments.length==0) this.stopTime = this.getTime();
- else this.stopTime = when + this.getTime();
- }
- obj.on_event = function (val) { };
- obj._event = function (val) {
- this.on_event(Math.floor(val / this.cycleInterval));
- }
- Browser.addRoute(obj, 'cycleTime', obj, obj._event);
-
- if (progressive) {
- obj.on_fraction = function (val) { }
- obj._fraction = function (frac) {
- this.on_fraction(frac);
- }
- Browser.addRoute(obj, 'fraction_changed', obj, obj._fraction);
- }
- obj.on_active = function (val) { }
- obj._active = function (val) {
- this.on_active(val);
- }
- Browser.addRoute(obj, 'isActive', obj, obj._active);
- return obj;
-}
-
-//static
-function setup_gw_object(obj, name) {
- obj._name = name;
- obj.set_color = function () { }
- obj.set_size = function (width, height) {
- this.width = width;
- this.height = height;
- }
- obj.hide = function () {
- this.scale.x = this.scale.y = 0;
- this.visible = false;
- if (arguments.length == 1) {
- arguments[0].apply(this);
- }
- }
- obj.show = function () { this.scale.x = this.scale.y = 1; this.visible = true; }
- obj.visible = true;
- obj.set_size = function (width, height) {
- this.width = width;
- this.height = height;
- }
- obj.move = function (x, y) {
- this.translation.x = x;
- this.translation.y = y;
- }
- obj.width = obj.height = 0;
-
- obj.close = function () {
- if (typeof this._pre_destroy != 'undefined') this._pre_destroy();
- gw_detach_child(this);
- };
-}
-
-function gw_object_set_dragable(obj) {
- if (typeof (obj.on_drag) != 'undefined') return;
-
- var ps2d = new SFNode('PlaneSensor2D');
- obj._ps2d_idx = obj.children.length;
- obj.children[obj.children.length] = ps2d;
- ps2d.maxPosition.x = ps2d.maxPosition.y = -1;
- ps2d.autoOffset = FALSE;
- obj._drag = false;
- obj.begin_drag = null;
- obj.end_drag = null;
- obj._drag_active = function (val) {
- if (val) {
- this.startx = this.translation.x;
- this.starty = this.translation.y;
- if (this.begin_drag) this.begin_drag();
- } else {
- if (this.end_drag) this.end_drag();
- }
- }
- obj.on_drag = null;
- obj._on_drag = function (val) {
- if (this.on_drag) {
- this.on_drag(this.startx + val.x, this.starty + val.y);
- } else {
- this.translation.x = this.startx + val.x;
- this.translation.y = this.starty + val.y;
- }
- if (!this._drag && (val.x || val.y)) this._drag = true;
- }
- Browser.addRoute(ps2d, 'isActive', obj, obj._drag_active);
- Browser.addRoute(ps2d, 'translation_changed', obj, obj._on_drag);
-}
-
-//static
-function gw_object_set_hitable(obj) {
- if (typeof (obj._active) != 'undefined') return;
-
- var ts = new SFNode('TouchSensor');
- obj._ts_idx = obj.children.length;
- obj.children[obj.children.length] = ts;
- obj._drag = false;
- obj._over = false;
- obj.on_over = null;
- obj._on_over = function (val) {
- this._over = val;
- gw_reset_hit(this, val);
- if (this.on_over) this.on_over(val);
- }
- obj.last_click = 0;
- obj._nb_click = 0;
- obj.on_long_click = null;
- obj.on_click = null;
- obj.on_down = null;
- obj._on_active = function (val, timestamp) {
- if (!this._over) return;
-
- if (this.on_down) this.on_down(val);
-
- if (!val) {
- if (this._drag) {
- this._drag = false;
- return;
- }
- if (this.on_long_click && (timestamp - this.last_click > gwskin.long_click_delay)) this.on_long_click();
- else if (this.on_click && this._over) this.on_click();
- } else {
- this.last_click = timestamp;
- }
- }
- Browser.addRoute(ts, 'isOver', obj, obj._on_over);
- Browser.addRoute(ts, 'isActive', obj, obj._on_active);
-
- obj._disable_touch = function () {
- this.children[this._ts_idx].enabled = false;
- }
- obj._enable_touch = function () {
- this.children[this._ts_idx].enabled = true;
+ if (arguments.length==0) this.stopTime = this.getTime();
+ else this.stopTime = when + this.getTime();
+ }
+ obj.on_event = function (val) { };
+ obj._event = function (val) {
+ this.on_event(Math.floor(val / this.cycleInterval));
+ }
+ Browser.addRoute(obj, 'cycleTime', obj, obj._event);
+
+ if (progressive) {
+ obj.on_fraction = function (val) { }
+ obj._fraction = function (frac) {
+ this.on_fraction(frac);
+ }
+ Browser.addRoute(obj, 'fraction_changed', obj, obj._fraction);
+ }
+ obj.on_active = function (val) { }
+ obj._active = function (val) {
+ this.on_active(val);
+ }
+ Browser.addRoute(obj, 'isActive', obj, obj._active);
+ return obj;
+}
+
+//static
+function setup_gw_object(obj, name) {
+ obj._name = name;
+ obj.set_color = function () { }
+ obj.set_size = function (width, height) {
+ this.width = width;
+ this.height = height;
+ }
+ obj.hide = function () {
+ this.scale.x = this.scale.y = 0;
+ this.visible = false;
+ if (arguments.length == 1) {
+ arguments[0].apply(this);
+ }
+ }
+ obj.show = function () { this.scale.x = this.scale.y = 1; this.visible = true; }
+ obj.visible = true;
+ obj.set_size = function (width, height) {
+ this.width = width;
+ this.height = height;
+ }
+ obj.move = function (x, y) {
+ this.translation.x = x;
+ this.translation.y = y;
+ }
+ obj.width = obj.height = 0;
+
+ obj.close = function () {
+ if (typeof this._pre_destroy != 'undefined') this._pre_destroy();
+ gw_detach_child(this);
+ };
+}
+
+function gw_object_set_dragable(obj) {
+ if (typeof (obj.on_drag) != 'undefined') return;
+
+ var ps2d = new SFNode('PlaneSensor2D');
+ obj._ps2d_idx = obj.children.length;
+ obj.children[obj.children.length] = ps2d;
+ ps2d.maxPosition.x = ps2d.maxPosition.y = -1;
+ ps2d.autoOffset = FALSE;
+ obj._drag = false;
+ obj.begin_drag = null;
+ obj.end_drag = null;
+ obj._drag_active = function (val) {
+ if (val) {
+ this.startx = this.translation.x;
+ this.starty = this.translation.y;
+ if (this.begin_drag) this.begin_drag();
+ } else {
+ if (this.end_drag) this.end_drag();
+ }
+ }
+ obj.on_drag = null;
+ obj._on_drag = function (val) {
+ if (this.on_drag) {
+ this.on_drag(this.startx + val.x, this.starty + val.y);
+ } else {
+ this.translation.x = this.startx + val.x;
+ this.translation.y = this.starty + val.y;
+ }
+ if (!this._drag && (val.x || val.y)) this._drag = true;
+ }
+ Browser.addRoute(ps2d, 'isActive', obj, obj._drag_active);
+ Browser.addRoute(ps2d, 'translation_changed', obj, obj._on_drag);
+}
+
+//static
+function gw_object_set_hitable(obj) {
+ if (typeof (obj._active) != 'undefined') return;
+
+ var ts = new SFNode('TouchSensor');
+ obj._ts_idx = obj.children.length;
+ obj.children[obj.children.length] = ts;
+ obj._drag = false;
+ obj._over = false;
+ obj.on_over = null;
+ obj._on_over = function (val) {
+ this._over = val;
+ gw_reset_hit(this, val);
+ if (this.on_over) this.on_over(val);
+ }
+ obj.last_click = 0;
+ obj._nb_click = 0;
+ obj.on_long_click = null;
+ obj.on_click = null;
+ obj.on_down = null;
+ obj._on_active = function (val, timestamp) {
+ if (!this._over) return;
+
+ if (this.on_down) this.on_down(val);
+
+ if (!val) {
+ if (this._drag) {
+ this._drag = false;
+ return;
+ }
+ if (this.on_long_click && (timestamp - this.last_click > gwskin.long_click_delay)) this.on_long_click();
+ else if (this.on_click && this._over) this.on_click();
+ } else {
+ this.last_click = timestamp;
+ }
+ }
+ Browser.addRoute(ts, 'isOver', obj, obj._on_over);
+ Browser.addRoute(ts, 'isActive', obj, obj._on_active);
+
+ obj._disable_touch = function () {
+ this.children[this._ts_idx].enabled = false;
+ }
+ obj._enable_touch = function () {
+ this.children[this._ts_idx].enabled = true;
 }
 obj.new_over_handler = function(callback) {
 Browser.addRoute(this.children[this._ts_idx], 'isOver', this, callback);
- }
-}
-
-//static
-function gw_new_appearance(r, g, b) {
- var appearance = new SFNode('Appearance');
- appearance.material = new SFNode('Material2D');
- appearance.material.filled = TRUE;
- appearance.material.emissiveColor = new SFColor(r, g, b);
- return appearance;
-}
-//static
-function gw_new_lineprops(red, green, blue) {
- var lineProps = new SFNode('LineProperties');
- lineProps.lineColor.r = red;
- lineProps.lineColor.g = green;
- lineProps.lineColor.b = blue;
- return lineProps;
-}
-
-//static
-function gw_make_gradient(type, keys, colors, opacities) {
- var i;
- var obj = new SFNode(type == 'radial' ? 'RadialGradient' : 'LinearGradient');
- for (i = 0; i < keys.length; i++) {
- obj.key[i] = keys[i];
- }
- for (i = 0; i < colors.length / 3; i++) {
- obj.keyValue[i] = new SFColor(colors[3 * i], colors[3 * i + 1], colors[3 * i + 2]);
- if (arguments.length == 4) {
- obj.opacity[i] = opacities[i];
- }
- }
- if (type == 'vertical') {
- obj.endPoint.x = 0;
- obj.endPoint.y = 1;
- }
- return obj;
-}
-
-//static
-function gw_new_fontstyle(size, align) {
- var fs = new SFNode('FontStyle');
- fs.size = size;
- fs.family[0] = gwskin.default_font_family;
- switch (align) {
- case 0:
- fs.justify[0] = 'BEGIN';
- break;
- case 1:
- fs.justify[0] = 'MIDDLE';
- break;
- case 2:
- fs.justify[0] = 'END';
- break;
- default:
- fs.justify[0] = 'MIDDLE';
- break;
- }
- fs.justify[1] = 'MIDDLE';
- return fs;
-}
-
-gw_resources_bank = [];
-
-//static
-function gw_load_resource(url, is_icon) {
- var new_res;
-
- if (gwskin.use_resource_bank) {
- for (var i in gw_resources_bank) {
- if (gw_resources_bank[i].res_url == url) {
- gw_resources_bank[i].nb_instances++;
- return gw_resources_bank[i];
- }
- }
- }
-
- if (is_icon) {
- new_res = new SFNode('StyleGroup');
- new_res.children[0] = new SFNode('Inline');
- new_res.children[0].url[0] = url;
- new_res.set_style = function (app) {
- this.appearance = app;
- };
- new_res.set_style(gwskin.styles[0].normal);
- } else {
-// new_res = new SFNode('OffscreenGroup');
-// new_res.offscreen_mode = 2;
-// new_res.children[0] = new SFNode('Inline');
-// new_res.children[0].url[0] = url;
- new_res = new SFNode('Inline');
- new_res.url[0] = url;
-
- new_res.set_style = function () { };
- }
-
- new_res.nb_instances = 1;
- if (gwskin.use_resource_bank) {
- new_res.res_url = url;
- gw_resources_bank.push(new_res);
- }
- return new_res;
-}
-
-//static
-function gw_unload_resource(res) {
- if (!gwskin.use_resource_bank) return;
-
- if (!res.nb_instances) return;
- res.nb_instances--;
- if (res.nb_instances) return;
-
- for (var i in gw_resources_bank) {
- if (gw_resources_bank[i] == res) {
- gw_resources_bank.splice(i, 1);
- return;
- }
- }
- alert('Unloading resource for url ' + res.children[0].url[0] + ' not found in resource bank');
-}
-
-
-//static
-function gw_window_show_hide() {
- if (typeof this._wnd_timer == 'undefined') {
- this._wnd_timer = gw_new_timer(1);
- this._wnd_timer.wnd = null;
- this._wnd_timer.set_timeout(0.25, false);
- this._wnd_timer.on_fraction = function (val) {
- if (!this.wnd) return;
- if (!this.wnd.visible) {
- this.wnd.scale.x = 1 - val;
- this.wnd.scale.y = 1 - val;
- this.wnd.set_alpha((1 - val) * this.wnd.alpha);
- } else {
- this.wnd.scale.x = val;
- this.wnd.scale.y = val;
- this.wnd.set_alpha(val * this.wnd.alpha);
- }
- }
- this._wnd_timer.on_active = function (val) {
- var fun;
- if (val || !this.wnd) return;
- var wnd = this.wnd;
- this.wnd = null;
- wnd.scale.x = wnd.visible ? 1 : 0;
- wnd.scale.y = wnd.visible ? 1 : 0;
- wnd.set_alpha(wnd.alpha);
+ }
+}
+
+//static
+function gw_new_appearance(r, g, b) {
+ var appearance = new SFNode('Appearance');
+ appearance.material = new SFNode('Material2D');
+ appearance.material.filled = TRUE;
+ appearance.material.emissiveColor = new SFColor(r, g, b);
+ return appearance;
+}
+//static
+function gw_new_lineprops(red, green, blue) {
+ var lineProps = new SFNode('LineProperties');
+ lineProps.lineColor.r = red;
+ lineProps.lineColor.g = green;
+ lineProps.lineColor.b = blue;
+ return lineProps;
+}
+
+//static
+function gw_make_gradient(type, keys, colors, opacities) {
+ var i;
+ var obj = new SFNode(type == 'radial' ? 'RadialGradient' : 'LinearGradient');
+ for (i = 0; i < keys.length; i++) {
+ obj.key[i] = keys[i];
+ }
+ for (i = 0; i < colors.length / 3; i++) {
+ obj.keyValue[i] = new SFColor(colors[3 * i], colors[3 * i + 1], colors[3 * i + 2]);
+ if (arguments.length == 4) {
+ obj.opacity[i] = opacities[i];
+ }
+ }
+ if (type == 'vertical') {
+ obj.endPoint.x = 0;
+ obj.endPoint.y = 1;
+ }
+ return obj;
+}
+
+//static
+function gw_new_fontstyle(size, align) {
+ var fs = new SFNode('FontStyle');
+ fs.size = size;
+ fs.family[0] = gwskin.default_font_family;
+ switch (align) {
+ case 0:
+ fs.justify[0] = 'BEGIN';
+ break;
+ case 1:
+ fs.justify[0] = 'MIDDLE';
+ break;
+ case 2:
+ fs.justify[0] = 'END';
+ break;
+ default:
+ fs.justify[0] = 'MIDDLE';
+ break;
+ }
+ fs.justify[1] = 'MIDDLE';
+ return fs;
+}
+
+gw_resources_bank = [];
+
+//static
+function gw_load_resource(url, is_icon) {
+ var new_res;
+
+ if (gwskin.use_resource_bank) {
+ for (var i in gw_resources_bank) {
+ if (gw_resources_bank[i].res_url == url) {
+ gw_resources_bank[i].nb_instances++;
+ return gw_resources_bank[i];
+ }
+ }
+ }
+
+ if (is_icon) {
+ new_res = new SFNode('StyleGroup');
+ new_res.children[0] = new SFNode('Inline');
+ new_res.children[0].url[0] = url;
+ new_res.set_style = function (app) {
+ this.appearance = app;
+ };
+ new_res.set_style(gwskin.styles[0].normal);
+ } else {
+// new_res = new SFNode('OffscreenGroup');
+// new_res.offscreen_mode = 2;
+// new_res.children[0] = new SFNode('Inline');
+// new_res.children[0].url[0] = url;
+ new_res = new SFNode('Inline');
+ new_res.url[0] = url;
+
+ new_res.set_style = function () { };
+ }
+
+ new_res.nb_instances = 1;
+ if (gwskin.use_resource_bank) {
+ new_res.res_url = url;
+ gw_resources_bank.push(new_res);
+ }
+ return new_res;
+}
+
+//static
+function gw_unload_resource(res) {
+ if (!gwskin.use_resource_bank) return;
+
+ if (!res.nb_instances) return;
+ res.nb_instances--;
+ if (res.nb_instances) return;
+
+ for (var i in gw_resources_bank) {
+ if (gw_resources_bank[i] == res) {
+ gw_resources_bank.splice(i, 1);
+ return;
+ }
+ }
+ gwlog(l_err, 'Unloading resource for url ' + res.children[0].url[0] + ' not found in resource bank');
+}
+
+//static
+function gw_appy_effect_scale(timer, val) {
+ if (!timer.wnd.visible) {
+ timer.wnd.scale.x = 1 - val;
+ timer.wnd.scale.y = 1 - val;
+ timer.wnd.set_alpha((1 - val) * timer.target_alpha);
+ } else {
+ timer.wnd.scale.x = val;
+ timer.wnd.scale.y = val;
+ timer.wnd.set_alpha(val * timer.target_alpha);
+ }
+}
+
+//static
+function gw_appy_effect_notif(timer, val) {
+ var final_x = gw_display_width / 2 - timer.wnd.width / 2;
+ var final_y = gw_display_height / 2 - timer.wnd.height/2;
+ if (!timer.wnd.visible) {
+ timer.wnd.translation.x = final_x;
+ timer.wnd.translation.y = final_y + val * timer.wnd.height;
+ timer.wnd.set_alpha((1 - val) * timer.target_alpha);
+ } else {
+ timer.wnd.translation.x = final_x;
+ timer.wnd.translation.y = final_y + (1-val) * timer.wnd.height;
+ timer.wnd.set_alpha(val * timer.target_alpha);
+ }
+}
+
+//static
+function gw_window_show_hide() {
+
+	if (typeof this.show_effect == 'string') {
+		if (this.show_effect == 'none') {
+			this.visible = !this.visible;
+			this.scale.x = this.visible ? 1 : 0;
+			this.scale.y = this.visible ? 1 : 0;
+			return;
+		}
+	}
+
+ if (typeof this._wnd_timer == 'undefined') {
+ this._wnd_timer = gw_new_timer(1);
+ this._wnd_timer.wnd = null;
+
+ this._wnd_timer.effect = 0;
+ this._wnd_timer.set_timeout(0.25, false);
+ this._wnd_timer.on_fraction = function (val) {
+ if (!this.wnd) return;
+
+ switch (this.effect) {
+ case 0:
+ gw_appy_effect_scale(this, val);
+ break;
+ case 1:
+ gw_appy_effect_notif(this, val);
+ break;
+ }
+ }
+ this._wnd_timer.on_active = function (val) {
+ var fun;
+ if (val || !this.wnd) return;
+ var wnd = this.wnd;
+ this.wnd = null;
+ wnd.scale.x = wnd.visible ? 1 : 0;
+ wnd.scale.y = wnd.visible ? 1 : 0;
+ wnd.set_alpha(this.target_alpha);
 if (wnd.visible) {
 gw_ui_root.set_focus(wnd);
 } else {
 gw_ui_root.remove_focus(wnd);
 }
- fun = this.call_on_end;
- this.call_on_end = null;
- if (fun) {
- fun.apply(wnd);
- }
- }
- }
- /*not done yet! This can happen when the function is called faster than the animation duration*/
- if (this._wnd_timer.wnd) return;
-
- this.visible = !this.visible;
- this.alpha = this.get_alpha();
- this.set_alpha(1.0);
- this._wnd_timer.wnd = this;
- this._wnd_timer.start(0);
- this._wnd_timer.call_on_end = null;
- if (arguments.length) {
- this._wnd_timer.call_on_end = arguments[0];
- }
-}
-
-//static
+ fun = this.call_on_end;
+ this.call_on_end = null;
+ if (fun) {
+ fun.apply(wnd);
+ }
+ }
+ }
+ /*not done yet! This can happen when the function is called faster than the animation duration*/
+ if (this._wnd_timer.wnd) return;
+
+ this.visible = !this.visible;
+ if (this.visible) {
+ this._wnd_timer.target_alpha = this.get_alpha();
+ this._wnd_timer.target_x = this.translation.x;
+ this._wnd_timer.target_y = this.translation.y;
+ this._wnd_timer.target_w = this.width;
+ this._wnd_timer.target_h = this.height;
+ }
+
+ if (typeof this.show_effect == 'string') {
+ if (this.show_effect == 'notif') this._wnd_timer.effect = 1;
+ }
+ this._wnd_timer.wnd = this;
+ this._wnd_timer.start(0);
+ this._wnd_timer.call_on_end = null;
+ if (arguments.length) {
+ this._wnd_timer.call_on_end = arguments[0];
+ }
+}
+
+//static
 function gw_window_show() {
- if (this.visible) return;
- gw_window_show_hide.call(this);
-}
-
-//static
-function gw_window_hide() {
- if (!this.visible) return;
- gw_window_show_hide.apply(this, arguments);
-}
-
-//Skin definition
-var gwskin = new Object();
-gwskin.back_color = new SFColor(0.2, 0.2, 0.2);
-gwskin.pointing_device = true;
-gwskin.long_click_delay = 0.5;
-gwskin.use_resource_bank = false;
-gwskin.default_window_alpha = 0.8;
-gwskin.default_message_timeout = 2.0;
-gwskin.default_tooltip_timeout = 0.75;
-
-gwskin.appearance_transparent = gw_new_appearance(0, 0, 0);
-gwskin.appearance_transparent.material.transparency = 1;
-gwskin.appearance_transparent.skin = true;
-
-gwskin.no_gl_window_back = new SFNode('Background2D')
-gwskin.no_gl_window_back.backColor = new SFColor(0, 0, 0);
-
-
-//static
-function gw_get_abs_pos(child) {
- var pos = new SFVec2f(0, 0);
- while (1) {
- if (typeof (child.translation) != 'undefined') {
- pos.x += child.translation.x;
- pos.y += child.translation.y;
- }
- if (typeof (child.parent) == 'undefined') break;
- if (typeof (child._is_window) == 'boolean') break;
- child = child.parent;
- }
- return pos;
-}
+ if (this.visible) return;
+ gw_window_show_hide.call(this);
+}
+
+//static
+function gw_window_hide() {
+ if (!this.visible) return;
+ gw_window_show_hide.apply(this, arguments);
+}
+
+//Skin definition
+var gwskin = new Object();
+gwskin.back_color = new SFColor(0.2, 0.2, 0.2);
+gwskin.pointing_device = true;
+gwskin.long_click_delay = 0.5;
+gwskin.use_resource_bank = false;
+gwskin.default_window_alpha = 0.5;
+gwskin.default_message_timeout = 3.0;
+gwskin.default_tooltip_timeout = 0.75;
+gwskin.default_tooltip_delay = 1;
+
+gwskin.appearance_transparent = gw_new_appearance(0, 0, 0);
+gwskin.appearance_transparent.material.transparency = 1;
+gwskin.appearance_transparent.skin = true;
+
+gwskin.no_gl_window_back = new SFNode('Background2D')
+gwskin.no_gl_window_back.backColor = new SFColor(0, 0, 0);
+
+gwskin.last_hit_x = 0;
+gwskin.last_hit_y = 0;
+
+gwskin.enable_background = function(do_enable) {
+ if (do_enable) {
+ gpac.set_back_color(gwskin.back_color.r, gwskin.back_color.g, gwskin.back_color.b, 1.0);
+ } else {
+ gpac.set_back_color(0, 0, 0, 1.0);
+ }
+}
+
+//static
+function gw_get_abs_pos(child) {
+ var pos = new SFVec2f(0, 0);
+ while (child != null) {
+ if (typeof (child.translation) != 'undefined') {
+ pos.x += child.translation.x;
+ pos.y += child.translation.y;
+ }
+ if (typeof (child.parent) == 'undefined') break;
+ if (typeof (child._is_window) == 'boolean') break;
+ child = child.parent;
+ }
+ return pos;
+}
 
 function gw_get_adjusted_abs_pos(child, width, height, type)
 {
@@ -429,293 +500,318 @@
 }
 
 return pos;
-}
+}
+
+
+gwskin.tooltip_wnd = null;
+gwskin.tooltip_timeout = gw_new_timer(false);
+
+gwskin.tooltip_exec = function (obj, show) {
 
-
-gwskin.tooltip_wnd = null;
-
-gwskin.tooltip_callback = function (obj, show) {
-
 if (!show) return;
- 
- if (typeof obj.tooltip_shown == 'boolean') return;
- obj.tooltip_shown = true;
- 
- if (!gwskin.tooltip_wnd) {
- wnd = gw_new_window(null, true, true, 'tooltip', true);
- gwskin.tooltip_wnd = wnd;
+
+ if (!gwskin.tooltip_wnd) {
+ wnd = gw_new_window(null, true, true, 'tooltip', true);
+ wnd.label = '';
+ gwskin.tooltip_wnd = wnd;
 wnd.txt = gw_new_text(gwskin.tooltip_wnd, '');
- wnd.label = '';
 wnd.on_display_size = function (w, h) {
- width = this.label.length * gwskin.default_text_font_size;
- this.set_size(width, 2 * gwskin.default_text_font_size);
- this.txt.set_width(width);
- this.move(-w / 2 + width / 2, h / 2 - gwskin.default_text_font_size);
- }
- wnd.on_close = function () {
- this.timer = null;
- gwskin.tooltip_wnd = null;
- }
- wnd.on_display_size(gw_display_width, gw_display_height);
- wnd.set_alpha(0.9);
- wnd.show();
-
- wnd.timer = gw_new_timer(false);
- wnd.timer.set_timeout(gwskin.default_tooltip_timeout, false);
- wnd.timer.start(0);
- wnd.timer.on_active = function (val) {
- if (!val) gwskin.tooltip_wnd.close();
- }
+ if (! this.label) return;
+
+ width = this.label.length * gwskin.default_text_font_size;
+ this.set_size(width, 2 * gwskin.default_text_font_size);
+ this.txt.set_width(width);
+ this.move(-w / 2 + width / 2, h / 2 - gwskin.default_text_font_size);
+ }
+ wnd.on_close = function () {
+ this.timer = null;
+ gwskin.tooltip_wnd = null;
+ }
+ wnd.on_display_size(gw_display_width, gw_display_height);
+ wnd.set_alpha(0.9);
+ wnd.show();
+
+ wnd.timer = gw_new_timer(false);
+ wnd.timer.set_timeout(gwskin.default_tooltip_timeout, false);
+ wnd.timer.start(0);
+ wnd.timer.on_active = function (val) {
+ if (!val) gwskin.tooltip_wnd.close();
+ }
 }
- 
+
 gwskin.tooltip_wnd.label = obj.get_label();
 gwskin.tooltip_wnd.txt.set_label(gwskin.tooltip_wnd.label);
 gwskin.tooltip_wnd.on_display_size(gw_display_width, gw_display_height);
- 
+
 
 var tt = gwskin.tooltip_wnd;
 var dy = 1.2 * tt.height;
- var pos = gw_get_adjusted_abs_pos(obj, tt.width, 1.2*tt.height, 0);
- tt.move(pos.x, pos.y);
-}
-
-gwskin.default_label_font_size = 18;
-gwskin.default_text_font_size = 18;
-gwskin.default_font_family = 'SANS';
-gwskin.default_icon_text_spacing = 8;
-gwskin.default_control_height = 64;
-gwskin.default_icon_height = 48;
-
-
-//create styles
-gwskin.styles = [];
-var s = { name: 'default' };
-gwskin.styles.push(s);
-
-s.normal = gw_new_appearance(0.4, 0.6, 1);
-s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.4, 0.6]);
-s.normal.skin = true;
-if (gwskin.pointing_device) {
- s.over = gw_new_appearance(0.0, 1.0, 1);
- s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
- s.over.skin = true;
-} else {
- s.over = null;
-}
-s.down = gw_new_appearance(0, 0, 1);
-s.down.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 1, 1]);
-s.down.skin = true;
-s.disable = gw_new_appearance(0.4, 0.4, 0.4);
-s.disable.skin = true;
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
-s.font.skin = true;
-
-
-//overrite style for button to have its own text color
-var s = { name: 'button' };
-gwskin.styles.push(s);
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-
-//override style for checkbox to have text alignment to 'begin'
-s = { name: 'checkbox' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
-s.font.skin = true;
-s.over = gw_new_appearance(0.0, 1.0, 1);
-s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
-s.over.skin = true;
-
-//override style for icon to have no text not fonts
-s = { name: 'icon' };
-gwskin.styles.push(s);
-s.text = null;
+ var pos = gw_get_adjusted_abs_pos(obj, tt.width, 1.2 * tt.height, 0);
+ tt.move(pos.x, pos.y);
+}
+
+gwskin.tooltip_callback = function (obj, show) {
+
+ if (!show) {
+ gwskin.tooltip_timeout.obj = null;
+ gwskin.tooltip_timeout.stop(0);
+ return;
+ }
+ gwskin.tooltip_timeout.set_timeout(gwskin.default_tooltip_delay, false);
+ gwskin.tooltip_timeout.obj = obj;
+ gwskin.tooltip_timeout.on_active = function (val) {
+ if (!val && gwskin.tooltip_timeout.obj) {
+ gwskin.tooltip_exec(gwskin.tooltip_timeout.obj, true);
+ }
+ }
+ gwskin.tooltip_timeout.start(0);
+}
+
+gwskin.default_label_font_size = 18;
+gwskin.default_text_font_size = 18;
+gwskin.default_font_family = 'SANS';
+gwskin.default_icon_text_spacing = 8;
+gwskin.default_control_height = 64;
+gwskin.default_icon_height = 48;
+
+
+//create styles
+gwskin.styles = [];
+var s = { name: 'default' };
+gwskin.styles.push(s);
+
+s.normal = gw_new_appearance(0.4, 0.6, 1);
+s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.4, 0.6]);
+s.normal.skin = true;
+if (gwskin.pointing_device) {
+ s.over = gw_new_appearance(0.0, 1.0, 1);
+ s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+ s.over.skin = true;
+} else {
+ s.over = null;
+}
+s.down = gw_new_appearance(0, 0, 1);
+s.down.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 1, 1]);
+s.down.skin = true;
+s.disable = gw_new_appearance(0.4, 0.4, 0.4);
+s.disable.skin = true;
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
+s.font.skin = true;
+
+
+//overrite style for button to have its own text color
+var s = { name: 'button' };
+gwskin.styles.push(s);
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+
+//override style for checkbox to have text alignment to 'begin'
+s = { name: 'checkbox' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
+s.font.skin = true;
+s.over = gw_new_appearance(0.0, 1.0, 1);
+s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
+s.over.skin = true;
+
+//override style for icon to have no text not fonts
+s = { name: 'icon' };
+gwskin.styles.push(s);
+s.text = null;
 s.font = null;
 
 s = { name: 'root_icon' };
 gwskin.styles.push(s);
 s.text = gw_new_appearance(1, 1, 1);
 s.text.skin = true;
-
-
-//override listitems to have text alignment to 'begin'
-s = { name: 'listitem' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
-s.font.skin = true;
-
-s = { name: 'edit' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(1, 1, 1);
-s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-s.over = gw_new_appearance(1, 1, 1);
-s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
-s.text = gw_new_appearance(0, 0, 0);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.style += ' SIMPLE_EDIT';
-s.font.skin = true;
-
-s = { name: 'window' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(0.6, 0.6, 0.6);
-s.normal.texture = gw_make_gradient('vertical', [0, 0.05, 0.95, 1], [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6]);
-s.normal.skin = true;
-//override font to have middle alignment
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
-s.font.skin = true;
-s.hide = gw_window_hide;
+
+
+//override listitems to have text alignment to 'begin'
+s = { name: 'listitem' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
+s.font.skin = true;
+
+s = { name: 'edit' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(1, 1, 1);
+s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+s.over = gw_new_appearance(1, 1, 1);
+s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
+s.text = gw_new_appearance(0, 0, 0);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.style += ' SIMPLE_EDIT';
+s.font.skin = true;
+
+s = { name: 'window' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(0.6, 0.6, 0.6);
+s.normal.texture = gw_make_gradient('vertical', [0, 0.1, 0.9, 1], [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6]);
+s.normal.skin = true;
+//override font to have middle alignment
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
+s.font.skin = true;
+s.hide = gw_window_hide;
 s.show = gw_window_show;
 
 tt_s = { name: 'tooltip' };
 gwskin.styles.push(tt_s);
 tt_s.normal = gw_new_appearance(0.6, 0.6, 0.6);
 tt_s.normal.texture = s.normal.texture;
-tt_s.normal.material.lineProps = gw_new_lineprops(0, 0, 0);
-tt_s.normal.material.lineProps.width = 0.5;
-tt_s.font = s.font;
+//tt_s.normal.material.lineProps = gw_new_lineprops(0, 0, 0);
+//tt_s.normal.material.lineProps.width = 0.5;
+tt_s.font = s.font;
 //tt_s.hide = gw_window_hide;
 //tt_s.show = gw_window_show;
-
-s = { name: 'progress' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(0.6, 0.6, 0.6);
-s.normal.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6]);
-s.normal.skin = true;
-s.over = gw_new_appearance(0.7, 0.7, 0.8);
-s.over.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1]);
-s.over.skin = true;
-s.down = gw_new_appearance(0.7, 0.7, 0.8);
-s.down.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.8, 1, 1, 0, 0.4, 0.6, 0.8, 1, 1]);
-s.down.skin = true;
-//for gauge
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
-s.font.skin = true;
-
-
-s = { name: 'plot' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(0.9, 0.9, 0.9);
-s.normal.skin = true;
-s.text = gw_new_appearance(0, 0, 0);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.skin = true;
-
-
-s = { name: 'text' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.justify[1] = 'END';
-s.font.skin = true;
-
-s = { name: 'lefttext' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.skin = true;
-
-s = { name: 'righttext' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.skin = true;
-
-gwskin.images = new Object();
-gwskin.labels = new Object();
-
-gwskin.images.trash = 'icons/trash.svg';
-gwskin.labels.trash = 'Delete';
-gwskin.images.add = 'icons/add.svg';
-gwskin.labels.add = 'Add';
-gwskin.images.remove = 'icons/remove.svg';
-gwskin.labels.remove = 'Remove';
-gwskin.images.remote_display = 'icons/monitor.svg';
-gwskin.labels.remote_display = 'Push to remote device';
-gwskin.images.information = 'icons/info.svg';
-gwskin.labels.information = 'Information';
-gwskin.images.resize = 'icons/resize.svg';
-gwskin.labels.resize = 'Resize';
-gwskin.images.cancel = 'icons/cross.svg';
-gwskin.labels.cancel = 'Cancel';
-gwskin.images.close = 'icons/cross.svg';
-gwskin.labels.close = 'Close';
-gwskin.images.previous = 'icons/previous.svg';
-gwskin.labels.previous = 'Previous';
-gwskin.images.next = 'icons/next.svg';
-gwskin.labels.next = 'Next';
-gwskin.images.left = 'icons/left.svg';
-gwskin.labels.left = 'Left';
-gwskin.images.right = 'icons/right.svg';
-gwskin.labels.right = 'Right';
-gwskin.images.up = 'icons/up.svg';
-gwskin.labels.up = 'Up';
-gwskin.images.down = 'icons/down.svg';
-gwskin.labels.down = 'Down';
-gwskin.images.scan_directory = 'icons/overflowing.svg';
-gwskin.labels.scan_directory = 'Select directory';
-gwskin.images.history = 'icons/overflowing.svg';
-gwskin.labels.history = 'History';
-gwskin.images.media_next = 'icons/media_next.svg';
-gwskin.labels.media_next = 'Next Item';
-gwskin.images.media_prev = 'icons/media_prev.svg';
-gwskin.labels.media_prev = 'Previous Clip';
-gwskin.images.seek_forward = 'icons/seek_forward.svg';
-gwskin.labels.seek_forward = 'Fast Forward';
-gwskin.images.rewind = 'icons/seek_forward.svg';
-gwskin.labels.rewind = 'Rewind';
-gwskin.images.folder = 'icons/folder.svg';
-gwskin.labels.folder = 'Directory';
-gwskin.images.check = 'icons/check.svg';
-gwskin.labels.check = 'Check';
-gwskin.images.drive = 'icons/harddrive.svg';
-gwskin.labels.drive = 'Storage Drive';
-gwskin.images.device = 'icons/laptop.svg';
-gwskin.labels.device = 'Device';
-gwskin.images.home = 'icons/home.svg';
-gwskin.labels.home = 'Home';
+
+s = { name: 'progress' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(0.6, 0.6, 0.6);
+s.normal.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6]);
+s.normal.skin = true;
+s.over = gw_new_appearance(0.7, 0.7, 0.8);
+s.over.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1]);
+s.over.skin = true;
+s.down = gw_new_appearance(0.7, 0.7, 0.8);
+s.down.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.8, 1, 1, 0, 0.4, 0.6, 0.8, 1, 1]);
+s.down.skin = true;
+//for gauge
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
+s.font.skin = true;
+
+
+s = { name: 'plot' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(0.9, 0.9, 0.9);
+s.normal.skin = true;
+s.text = gw_new_appearance(0, 0, 0);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.skin = true;
+
+
+s = { name: 'text' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.justify[1] = 'END';
+s.font.skin = true;
+
+s = { name: 'lefttext' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.skin = true;
+
+s = { name: 'righttext' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.skin = true;
+
+s = { name: 'float_text' };
+gwskin.styles.push(s);
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.justify[1] = 'END';
+s.font.skin = true;
+
+gwskin.images = new Object();
+gwskin.labels = new Object();
+
+gwskin.images.trash = 'icons/trash.svg';
+gwskin.labels.trash = 'Delete';
+gwskin.images.add = 'icons/add.svg';
+gwskin.labels.add = 'Add';
+gwskin.images.remove = 'icons/remove.svg';
+gwskin.labels.remove = 'Remove';
+gwskin.images.remote_display = 'icons/monitor.svg';
+gwskin.labels.remote_display = 'Push to remote device';
+gwskin.images.information = 'icons/info.svg';
+gwskin.labels.information = 'Information';
+gwskin.images.resize = 'icons/resize.svg';
+gwskin.labels.resize = 'Resize';
+gwskin.images.cancel = 'icons/cross.svg';
+gwskin.labels.cancel = 'Cancel';
+gwskin.images.close = 'icons/cross.svg';
+gwskin.labels.close = 'Close';
+gwskin.images.previous = 'icons/previous.svg';
+gwskin.labels.previous = 'Previous';
+gwskin.images.next = 'icons/next.svg';
+gwskin.labels.next = 'Next';
+gwskin.images.left = 'icons/left.svg';
+gwskin.labels.left = 'Left';
+gwskin.images.right = 'icons/right.svg';
+gwskin.labels.right = 'Right';
+gwskin.images.up = 'icons/up.svg';
+gwskin.labels.up = 'Up';
+gwskin.images.down = 'icons/down.svg';
+gwskin.labels.down = 'Down';
+gwskin.images.scan_directory = 'icons/overflowing.svg';
+gwskin.labels.scan_directory = 'Select directory';
+gwskin.images.history = 'icons/overflowing.svg';
+gwskin.labels.history = 'History';
+gwskin.images.media_next = 'icons/media_next.svg';
+gwskin.labels.media_next = 'Next Item';
+gwskin.images.media_prev = 'icons/media_prev.svg';
+gwskin.labels.media_prev = 'Previous Clip';
+gwskin.images.seek_forward = 'icons/seek_forward.svg';
+gwskin.labels.seek_forward = 'Fast Forward';
+gwskin.images.rewind = 'icons/rewind.svg';
+gwskin.labels.rewind = 'Rewind';
+gwskin.images.folder = 'icons/folder.svg';
+gwskin.labels.folder = 'Directory';
+gwskin.images.check = 'icons/check.svg';
+gwskin.labels.check = 'Check';
+gwskin.images.drive = 'icons/harddrive.svg';
+gwskin.labels.drive = 'Storage Drive';
+gwskin.images.device = 'icons/laptop.svg';
+gwskin.labels.device = 'Device';
+gwskin.images.home = 'icons/home.svg';
+gwskin.labels.home = 'Home';
 gwskin.images.osmo = 'icons/osmo.svg';
 gwskin.labels.osmo = 'Home';
 gwskin.images.media = 'icons/more.svg';
 gwskin.labels.media = 'Media';
-gwskin.images.favorite = 'icons/heart.svg';
-gwskin.labels.favorite = 'Favorites';
-gwskin.images.audio = 'icons/audio.svg';
-gwskin.labels.audio = 'Audio On';
-gwskin.images.audio_mute = 'icons/audio_mute.svg';
-gwskin.labels.audio_mute = 'Audio Mute';
-gwskin.images.play = 'icons/play.svg';
-gwskin.labels.play = 'Play';
-gwskin.images.pause = 'icons/pause.svg';
-gwskin.labels.pause = 'Pause';
-gwskin.images.stop = 'icons/stop2.svg';
-gwskin.labels.stop = 'Stop';
+gwskin.images.favorite = 'icons/heart.svg';
+gwskin.labels.favorite = 'Favorites';
+gwskin.images.audio = 'icons/audio.svg';
+gwskin.labels.audio = 'Audio On';
+gwskin.images.audio_mute = 'icons/audio_mute.svg';
+gwskin.labels.audio_mute = 'Audio Mute';
+gwskin.images.play = 'icons/play.svg';
+gwskin.labels.play = 'Play';
+gwskin.images.pause = 'icons/pause.svg';
+gwskin.labels.pause = 'Pause';
+gwskin.images.stop = 'icons/stop2.svg';
+gwskin.labels.stop = 'Stop';
 gwskin.images.fullscreen = 'icons/expand.svg';
 gwskin.labels.fullscreen = 'Fullscreen';
 gwskin.images.fullscreen_back = 'icons/shrink.svg';
 gwskin.labels.fullscreen_back = 'Exit Fullscreen';
-gwskin.images.play_once = 'icons/play_single.svg';
-gwskin.labels.play_once = 'Play once';
-gwskin.images.play_loop = 'icons/play_loop.svg';
-gwskin.labels.play_loop = 'Loop';
-gwskin.images.play_shuffle = 'icons/play_shuffle.svg';
-gwskin.labels.play_shuffle = 'Shuffle';
-gwskin.images.navigation = 'icons/navigation.svg';
-gwskin.labels.navigation = 'Navigation';
-gwskin.images.network = 'icons/network.svg';
-gwskin.labels.network = 'Network';
-gwskin.images.file_open = 'icons/tray.svg';
-gwskin.labels.file_open = 'Open';
-gwskin.images.exit = 'icons/power.svg';
-gwskin.labels.exit = 'Exit';
-gwskin.images.remote_location = 'icons/world.svg';
-gwskin.labels.remote_location = 'Enter URL';
-gwskin.images.statistics = 'icons/speed.svg';
-gwskin.labels.statistics = 'Statistics';
+gwskin.images.play_once = 'icons/play_single.svg';
+gwskin.labels.play_once = 'Play once';
+gwskin.images.play_loop = 'icons/play_loop.svg';
+gwskin.labels.play_loop = 'Loop';
+gwskin.images.play_shuffle = 'icons/play_shuffle.svg';
+gwskin.labels.play_shuffle = 'Shuffle';
+gwskin.images.navigation = 'icons/navigation.svg';
+gwskin.labels.navigation = 'Navigation';
+gwskin.images.network = 'icons/network.svg';
+gwskin.labels.network = 'Network';
+gwskin.images.file_open = 'icons/tray.svg';
+gwskin.labels.file_open = 'Open';
+gwskin.images.exit = 'icons/power.svg';
+gwskin.labels.exit = 'Exit';
+gwskin.images.remote_location = 'icons/world.svg';
+gwskin.labels.remote_location = 'Enter URL';
+gwskin.images.statistics = 'icons/speed.svg';
+gwskin.labels.statistics = 'Statistics';
 gwskin.images.live = 'icons/live.svg';
 gwskin.labels.live = 'Back to live';
 gwskin.images.sort = 'icons/sort.svg';
@@ -723,123 +819,140 @@
 gwskin.images.playlist = 'icons/list.svg';
 gwskin.labels.playlist = 'Playlist';
 gwskin.images.playlist_next = 'icons/pl_next.svg';
-gwskin.labels.playlist_next = 'Next';
-gwskin.images.playlist_prev = 'icons/pl_prev.svg';
-gwskin.labels.playlist_prev = 'Previous';
-gwskin.images.channels = 'icons/tv.svg';
+gwskin.labels.playlist_next = 'Next';
+gwskin.images.playlist_prev = 'icons/pl_prev.svg';
+gwskin.labels.playlist_prev = 'Previous';
+gwskin.images.channels = 'icons/tv.svg';
 gwskin.labels.channels = 'TV Channels';
-
-
-gwskin.mime_video_default_ext = " mp4 mp4s m4s 3gp 3gpp m2ts ts trp m3u8 mpd avi mov ";
-gwskin.mime_audio_default_ext = " m4a mp3 aac wav ";
-gwskin.mime_image_default_ext = " jpg jpeg png ";
-gwskin.mime_model_default_ext = " bt xmt svg ";
-
-gwskin.images.mime_video = 'icons/film.svg';
-gwskin.images.mime_audio = 'icons/musical.svg';
-gwskin.images.mime_model = 'icons/app.svg';
-gwskin.images.mime_generic = 'icons/file.svg';
-gwskin.images.mime_image = 'icons/image.svg';
-
-
-
-gwskin.keys = new Object();
-gwskin.keys.close = 'U+0008';
-gwskin.keys.validate = 'Enter';
-
-gwskin.last_hitable_obj = null;
-
-//static
-function gwskin_set_white_blue()
-{
-	var s = gwskin.get_class('default');
-
- 	//s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.4, 0.6];
-	//if (s.over && s.over.texture) s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-	//s.down.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 1, 1];
-
-	s.text.material.emissiveColor = new SFColor(0, 0, 0);
-
-	//override style for checkbox to have text alignment to 'begin'
-	s = gwskin.get_class('checkbox');
-//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-
-	s = gwskin.get_class('edit');
-//	s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-	s.over.material.lineProps.lineColor = new SFColor(0.0, 0.8, 1);
-	s.text.material.emissiveColor = new SFColor(0, 0, 0);
-
-	s = gwskin.get_class('window');
-	s.normal.material.emissiveColor = new SFColor(1, 1, 1);
-	gwskin.no_gl_window_back.backColor = new SFColor(1, 1, 1);
-//	s.normal.texture.keyValue = [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6];
-	if (s.normal.texture) {
-		s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
+gwskin.images.view360 = 'icons/image.svg';
+gwskin.labels.view360 = '360°';
+
+
+gwskin.mime_video_default_ext = " mp4 mp4s m4s 3gp 3gpp m2ts ts trp m3u8 mpd avi mov ";
+gwskin.mime_audio_default_ext = " m4a mp3 aac wav ";
+gwskin.mime_image_default_ext = " jpg jpeg png ";
+gwskin.mime_model_default_ext = " bt xmt svg ";
+
+gwskin.images.mime_video = 'icons/film.svg';
+gwskin.images.mime_audio = 'icons/musical.svg';
+gwskin.images.mime_model = 'icons/app.svg';
+gwskin.images.mime_generic = 'icons/file.svg';
+gwskin.images.mime_image = 'icons/image.svg';
+
+
+
+gwskin.keys = new Object();
+gwskin.keys.close = 'U+0008';
+gwskin.keys.validate = 'Enter';
+
+gwskin.last_hitable_obj = null;
+
+//static
+function gwskin_set_white_blue()
+{
+	var s = gwskin.get_class('default');
+
+ 	//s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.4, 0.6];
+	//if (s.over && s.over.texture) s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+	//s.down.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 1, 1];
+
+	s.text.material.emissiveColor = new SFColor(0, 0, 0);
+
+	//override style for checkbox to have text alignment to 'begin'
+	s = gwskin.get_class('checkbox');
+//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+
+	s = gwskin.get_class('edit');
+//	s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+	s.over.material.lineProps.lineColor = new SFColor(0.0, 0.8, 1);
+	s.text.material.emissiveColor = new SFColor(0, 0, 0);
+
+	s = gwskin.get_class('window');
+	s.normal.material.emissiveColor = new SFColor(1, 1, 1);
+	gwskin.no_gl_window_back.backColor = new SFColor(1, 1, 1);
+//	s.normal.texture.keyValue = [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6];
+	if (s.normal.texture) {
+		s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
 		s.normal.texture.keyValue[2] = new SFColor(1, 1, 1);
-	}
-
-	s = gwskin.get_class('progress');
-//	s.normal.texture.keyValue = [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6];
-//	s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
-//	s.over.texture.keyValue = [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1];
-//	s.over.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
-//	s.down.texture.keyValue = [0.0, 0.4, 0.6, 0, 0.2, 0.4, 0.0, 0.4, 0.6];
-//	s.down.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
-	s.text.material.emissiveColor = new SFColor(1, 1, 1);
+	}
+
+	s = gwskin.get_class('progress');
+//	s.normal.texture.keyValue = [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6];
+//	s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
+//	s.over.texture.keyValue = [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1];
+//	s.over.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
+//	s.down.texture.keyValue = [0.0, 0.4, 0.6, 0, 0.2, 0.4, 0.0, 0.4, 0.6];
+//	s.down.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
+	s.text.material.emissiveColor = new SFColor(1, 1, 1);
 
 	s = gwskin.get_class('root_icon');
 	s.text.material.emissiveColor = new SFColor(1, 1, 1);
-
-}
-
-
-function gwskin_set_default_control_height(value) {
- gwskin.default_control_height = value;
-}
-
-function gwskin_set_default_icon_height(value) {
- gwskin.default_icon_height = value;
- for (var i = 0; i < gwskin.styles.length; i++) {
- if ((typeof gwskin.styles[i].font != 'undefined') && gwskin.styles[i].font) {
- gwskin.styles[i].font.size = (value > 10) ? value - 10 : 1;
- }
- }
-}
-
-
-//static
-function gwlib_filter_event(evt) {
-
- if (gw_ui_root.has_popup && (evt.type == GF_EVENT_MOUSEDOWN)) {
- //close all open popups
- var count = gw_ui_root.children.length;
- for (var i = count; i > 0; i--) {
- var c = gw_ui_root.children[i - 1];
- if (typeof c._popup != 'undefined') {
- c.close();
- if (count>gw_ui_root.children.length) i--;
- }
- }
- gw_ui_root.has_popup = false;
- }
-
- if (gw_ui_top_wnd && gw_ui_top_wnd.on_event(evt)) return true;
-
- if ((evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')))
- return false;
-
- for (var i = 0; i < gw_event_filters.length; i++) {
- if (gw_event_filters[i](evt)) return true;
- }
- return false;
-}
-
-function gwlib_init(root_node) {
- gw_ui_root = gw_new_container();
- gw_ui_root._name = 'Root Display';
+
+}
+
+
+function gwskin_set_default_control_height(value) {
+ gwskin.default_control_height = value;
+}
+
+function gwskin_set_default_icon_height(value) {
+ gwskin.default_icon_height = value;
+ 
+ var fsize = 1;
+ if (value>50) fsize = 32;
+ else if (value>30) fsize = 22;
+ else if (value > 10) fsize = value - 10;
+ 
+ gwskin.default_label_font_size = fsize;
+ gwskin.default_text_font_size = fsize;
+ 
+ for (var i = 0; i < gwskin.styles.length; i++) {
+ if ((typeof gwskin.styles[i].font != 'undefined') && gwskin.styles[i].font) {
+ gwskin.styles[i].font.size = fsize;
+ }
+ }
+}
+
+
+//static
+function gwlib_filter_event(evt) {
+
+	if (evt.type == GF_EVENT_MOUSEDOWN) {
+		if (gw_ui_root.has_popup) {
+			//close all open popups
+			var count = gw_ui_root.children.length;
+			for (var i = count; i > 0; i--) {
+				var c = gw_ui_root.children[i - 1];
+				if (typeof c._popup != 'undefined') {
+					c.close();
+					if (count>gw_ui_root.children.length) i--;
+				}
+			}
+			gw_ui_root.has_popup = false;
+		}
+		gwskin.last_hit_x = evt.mouse_x;
+		gwskin.last_hit_y = evt.mouse_y;
+	}
+
+ if (gw_ui_top_wnd && gw_ui_top_wnd.on_event(evt)) return true;
+
+/*
+ if ((evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')))
+ return false;
+*/
+	
+ for (var i = 0; i < gw_event_filters.length; i++) {
+ if (gw_event_filters[i](evt) == true) return true;
+ }
+ return false;
+}
+
+function gwlib_init(root_node) {
+ gw_ui_root = gw_new_container();
+ gw_ui_root._name = 'Root Display';
 gw_ui_root.has_popup = false;
- gw_add_child(root_node, gw_ui_root);
+ gw_add_child(root_node, gw_ui_root);
 
 gw_ui_root.set_focus = function(wnd) {
 gw_ui_top_wnd = null;
@@ -866,1522 +979,1613 @@
 gpac.set_focus(gw_ui_top_wnd);
 }
 
- gw_ui_root.add_child = function (child) {
+ gw_ui_root.add_child = function (child) {
 this.children[this.children.length] = child;
- this.set_focus(child);
- }
-
- gw_ui_root.remove_child = function (child) {
- this.remove_focus(child);
+ this.set_focus(child);
+ }
+
+ gw_ui_root.remove_child = function (child) {
+ this.remove_focus(child);
 this.removeChildren[0] = child;
- }
- gw_ui_top_wnd = null;
- gw_event_filters = [];
-
- gpac.set_event_filter(gwlib_filter_event);
- gwskin.has_opengl = (gpac.get_option('Compositor', 'OpenGLMode') != 'disable') ? true : false;
-
- gwskin.browser_mode = (gpac.getOption('Temp', 'BrowserMode') == 'yes') ? true : false;
-
- gpac.focus_highlight = false;
-
- gwskin.disable_transparency = false;
- //remove window gradients 
- if (!gwskin.has_opengl) {
- s = gwskin.get_style('window', 'normal');
- s.texture = null;
- gwskin.disable_transparency = true;
- gwskin.default_window_alpha = 1;
- }
-
-	gwskin_set_white_blue();
-
- gwskin._to_string = function (obj) {
- var res = '';
- if (obj instanceof Array) {
- res = '[';
- for (var i = 0; i < obj.length; i++) {
- if (i) res += ', ';
- res += gwskin._to_string(obj[i]);
- }
- res += ']';
- } else {
- var first = true;
- res = '{';
- for (var prop in obj) {
- if (!first) res += ', ';
- res += '' + prop;
- res += ': ';
- if (typeof obj[prop] == 'string') {
- res += '"';
- res += obj[prop];
- res += '"';
- } else if (typeof obj[prop] == 'function') {
- } else if (typeof obj[prop] == 'object') {
- res += gwskin._to_string(obj[prop]);
- } else {
- res += obj[prop];
- }
- first = false;
- }
- res += '}';
- }
- return res;
- }
-
- gwskin.stringify = function (obj) {
- return this._to_string(obj);
- }
- gwskin.parse = function (serial_obj) {
- if (serial_obj.charAt(0) != '(') {
- return eval('(' + serial_obj + ')' );
- }
- return eval(serial_obj);
- }
- 
-}
-
-function gwlib_add_event_filter(evt_filter) {
- gw_event_filters.push(evt_filter);
-}
-
-function gwlib_remove_event_filter(evt_filter) {
- var idx = gw_event_filters.indexOf(evt_filter);
- if (idx > -1) gw_event_filters.splice(idx, 1);
-}
-
-function gwlib_notify_display_size(width, height) {
- for (var i = 0; i < gw_ui_root.children.length; i++) {
- if (typeof gw_ui_root.children[i].on_display_size != 'undefined') {
- gw_ui_root.children[i].on_display_size(width, height);
- }
- }
-}
-
-function gwlib_refresh_layout() {
- for (var i = 0; i < gw_ui_root.children.length; i++) {
- if (typeof gw_ui_root.children[i].layout != 'undefined') {
- gw_ui_root.children[i].layout(gw_ui_root.children[i].width, gw_ui_root.children[i].height);
- }
- }
-}
-
-
-//static
-function gw_reset_hit(obj, is_over) {
- if (is_over) {
- if (gwskin.last_hitable_obj && (gwskin.last_hitable_obj != obj)) {
- //reset isOver value of previous touch sensor
- if (typeof (gwskin.last_hitable_obj._ts_idx) != 'undefined') {
- gwskin.last_hitable_obj.children[gwskin.last_hitable_obj._ts_idx].isOver = false;
- }
- gwskin.last_hitable_obj._on_over(false);
- }
- gwskin.last_hitable_obj = obj;
- } else if (gwskin.last_hitable_obj == obj) {
- gwskin.last_hitable_obj = null;
- }
-}
-
-//static
-function gw_add_child(container, child) {
- if (container == null) container = gw_ui_root;
-
- if (typeof (container.add_child) != 'undefined') {
- container.add_child(child);
- } else {
- container.children[container.children.length] = child;
- }
- child.parent = container;
-}
-
-//static
-function gw_detach_child(child) {
- /*detach all default routes*/
- Browser.deleteRoute(child, 'ALL', null, null);
- if (typeof (child._ps2d_idx) != 'undefined') {
- Browser.deleteRoute(child.children[child._ps2d_idx], 'ALL', null, null);
- }
- if (typeof (child._ts_idx) != 'undefined') {
- Browser.deleteRoute(child.children[child._ts_idx], 'ALL', null, null);
- }
- if (typeof (child.dlg) != 'undefined') child.dlg = null;
- if (typeof (child.parent) == 'undefined') return;
-
- var p = child.parent;
- child.parent = null;
- if (typeof (p.remove_child) != 'undefined') {
- p.remove_child(child);
- } else {
- p.removeChildren[0] = child;
- }
- if (gwskin.last_hitable_obj == child) gwskin.last_hitable_obj = null;
-}
-
-//static
-function gw_close_child_list(list) {
- var count = list.length;
- if (!count) return;
- for (var i = 0; i < count; i++) {
- var child = list[i];
- if (typeof child.close != 'undefined') child.close();
- else gw_detach_child(child);
-
- if (list.length < count) {
- i -= (count - list.length);
- count = list.length;
- }
- }
- //trigger GC whenever we have closed a child list
- gpac.trigger_gc();
-}
-
-
-//static
-gwskin.get_class = function (class_name) {
- if (arguments.length < 1) class_name = 'default';
-
- var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
- if (styles.length > 0) {
- return styles[0];
-	}
-	return null;
-}
-
-//static
-gwskin.get_style = function (class_name, style_name) {
- if (arguments.length < 1) class_name = 'default';
- if (arguments.length < 2) style_name = 'normal';
- if (style_name == 'invisible') return gwskin.appearance_transparent;
-
- var style = null;
- var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
- if (styles.length > 0) {
- if (typeof styles[0][style_name] != 'undefined')
- return styles[0][style_name];
- } else {
- alert('Non-existing class ' + class_name);
- }
-
- style = gwskin.styles[0];
- if (typeof style[style_name] != 'undefined')
- return style[style_name];
-
- alert('Non-existing style ' + style_name + ' in default class');
- return null;
-}
-
-//static
-gwskin.get_font = function (class_name) {
- if (arguments.length < 1) class_name = 'default';
-
- var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
- if (styles.length > 0) {
- if (typeof styles[0].font != 'undefined') {
- return styles[0].font;
- }
- } else {
- alert('Non-existing class ' + class_name);
- }
- return gwskin.styles[0].font;
-}
-
-function gw_new_container() {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Container');
- obj.push_to_top = function (wnd) {
- this.removeChildren[0] = wnd;
- this.addChildren[0] = wnd;
- }
- return obj;
-}
-
-function gw_new_curve2d(class_name) 
-{
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Curve2D');
- var shape = new SFNode('Shape');
- obj.children[0] = shape;
- shape.appearance = gw_new_appearance(0, 0, 0);
- obj.children[0].appearance.material.filled = false;
- obj.children[0].appearance.material.lineProps = new SFNode('LineProperties');
-
- obj.set_color = function (r, g, b) {
- this.children[0].appearance.material.lineProps.lineColor.r = r;
- this.children[0].appearance.material.lineProps.lineColor.g = g;
- this.children[0].appearance.material.lineProps.lineColor.b = b;
- }
- obj.set_line_width = function (width) {
- if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
- this.children[0].appearance.material.lineProps.width = width;
- }
- shape.geometry = new SFNode('Curve2D');
- shape.geometry.point = new SFNode('Coordinate2D');
-
- obj.reset = function () {
- this.children[0].geometry.point.point.length = 0;
- this.children[0].geometry.type.length = 0;
- }
- obj._add_coord = function (x, y) {
- var pts = this.children[0].geometry.point.point;
- pts[pts.length] = new SFVec2f(x, y);
- }
- obj.add_move_to = function (x, y) {
- this._add_coord(x, y);
- //first moveto is implicit
- if (this.children[0].geometry.type.length)
- this.children[0].geometry.type[this.children[0].geometry.type.length] = 0;
- }
- obj.add_line_to = function (x, y) {
- this._add_coord(x, y);
- this.children[0].geometry.type[this.children[0].geometry.type.length] = 1;
- }
- obj.remove_first = function () {
- var pts = this.children[0].geometry.point.point;
- if (pts.length < 2) pts.length = 0;
- else {
- for (var i = 0; i < pts.length - 1; i++) {
- pts[i] = pts[i + 1];
- }
- pts.length = i;
- 
- pts = this.children[0].geometry.type;
-
- for (var i = 0; i < pts.length - 1; i++) {
- pts[i] = pts[i + 1];
- }
- pts.length = i;
- }
- }
- obj.get_num_points = function() {
- return this.children[0].geometry.point.point.length;
- }
- return obj;
-}
-
-
-function gw_new_rectangle(class_name, style) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Rectangle');
- var shape = new SFNode('Shape');
- obj.children[0] = shape;
- if (arguments.length == 1) style = 'normal';
-
- shape.appearance = gwskin.get_style(class_name, style);
-
- if (shape.appearance && (typeof (shape.appearance.skin) == 'undefined')) {
- obj.set_alpha = function (alpha) {
- this.children[0].appearance.material.transparency = 1 - alpha;
- }
- obj.get_alpha = function () {
- return 1 - this.children[0].appearance.material.transparency;
- }
- obj.set_fill_color = function (r, g, b) {
- this.children[0].appearance.material.emissiveColor.r = r;
- this.children[0].appearance.material.emissiveColor.g = g;
- this.children[0].appearance.material.emissiveColor.b = b;
- }
- obj.set_strike_color = function (r, g, b) {
- if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
- this.children[0].appearance.material.lineProps.lineColor.r = r;
- this.children[0].appearance.material.lineProps.lineColor.g = g;
- this.children[0].appearance.material.lineProps.lineColor.b = b;
- }
- obj.set_line_width = function (width) {
- if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
- this.children[0].appearance.material.lineProps.width = width;
- }
- } else {
- obj.set_alpha = function (alpha) { }
- obj.set_fill_color = function (r, g, b) { }
- obj.set_strike_color = function (r, g, b) { }
- obj.set_line_width = function (width) { }
- obj.get_alpha = function () { return 1; }
- }
-
- obj.set_style = function (classname, style) {
- var app = gwskin.get_style(classname, style);
- if (app) this.children[0].appearance = app;
- }
-
-
- shape.geometry = new SFNode('Curve2D');
- shape.geometry.point = new SFNode('Coordinate2D');
-
- obj.corner_tl = true;
- obj.corner_tr = true;
- obj.corner_bl = true;
- obj.corner_br = true;
- obj.set_corners = function (tl, tr, br, bl) {
- this.corner_tl = tl;
- this.corner_tr = tr;
- this.corner_bl = bl;
- this.corner_br = br;
- }
-
- obj.set_size = function (w, h) {
- var hw, hh, rx_bl, ry_bl, rx_br, ry_br, rx_tl, ry_tl, rx_tr, ry_tr, rx, ry;
- var temp;
- hw = w / 2;
- hh = h / 2;
- this.width = w;
- this.height = h;
- temp = this.children[0].geometry.type;
- temp[0] = 7;
- temp[1] = 1;
- temp[2] = 7;
- temp[3] = 1;
- temp[4] = 7;
- temp[5] = 1;
- temp[6] = 7;
- temp[7] = 6; /*close*/
-
- /*compute default rx/ry*/
- ry = rx = 10;
- if (rx >= hw) rx = hw;
- if (ry >= hh) ry = hh;
- rx_bl = rx_br = rx_tl = rx_tr = rx;
- ry_bl = ry_br = ry_tl = ry_tr = ry;
- if (!this.corner_tl) rx_tl = ry_tl = 0;
- if (!this.corner_tr) rx_tr = ry_tr = 0;
- if (!this.corner_bl) rx_bl = ry_bl = 0;
- if (!this.corner_br) rx_br = ry_br = 0;
-
- temp = this.children[0].geometry.point.point;
- temp[0] = new SFVec2f(hw - rx_tr, hh);
- temp[1] = new SFVec2f(hw, hh); /*bezier ctrl point or line-to*/
- temp[2] = new SFVec2f(hw, hh - ry_tr);
- temp[3] = new SFVec2f(hw, -hh + ry_br);
- temp[4] = new SFVec2f(hw, -hh); /*bezier control point*/
- temp[5] = new SFVec2f(hw - rx_br, -hh);
- temp[6] = new SFVec2f(-hw + rx_bl, -hh);
- temp[7] = new SFVec2f(-hw, -hh); /*bezier control point*/
- temp[8] = new SFVec2f(-hw, -hh + ry_bl);
- temp[9] = new SFVec2f(-hw, hh - ry_tl);
- temp[10] = new SFVec2f(-hw, hh); /*bezier control point*/
- temp[11] = new SFVec2f(-hw + rx_tl, hh);
- }
- return obj;
-}
-
-function gw_new_text(parent, label, class_name) {
- var obj = new SFNode('Transform2D');
- if (arguments.length < 3) class_name = 'default';
-
- setup_gw_object(obj, 'Text');
- gw_add_child(parent, obj);
- obj.children[0] = new SFNode('Transform2D');
- obj.children[0].children[0] = new SFNode('Shape');
- obj.children[0].children[0].geometry = new SFNode('Text');
-
- if (class_name == 'custom') {
- class_name = 'default';
- obj.children[0].children[0].appearance = gw_new_appearance(0, 0, 0);
- obj.children[0].children[0].geometry.fontStyle = gw_new_fontstyle(gwskin.default_label_font_size, 1);
- } else {
- obj.children[0].children[0].appearance = gwskin.get_style(class_name, 'text');
- obj.children[0].children[0].geometry.fontStyle = gwskin.get_font(class_name);
- }
-
-
-
- obj.set_label = function (value) {
- this.children[0].children[0].geometry.string.length = 0;
- this.children[0].children[0].geometry.string[0] = value;
- }
-
- obj.set_labels = function () {
- this.children[0].children[0].geometry.string.length = 0;
- for (var i = 0; i < arguments.length; i++) {
- this.children[0].children[0].geometry.string[i] = '' + arguments[i];
- }
- }
+ }
+ gw_ui_top_wnd = null;
+ gw_event_filters = [];
+
+ gpac.set_event_filter(gwlib_filter_event);
+ gwskin.has_opengl = (gpac.get_option('Compositor', 'OpenGLMode') != 'disable') ? true : false;
+
+ gwskin.browser_mode = (gpac.get_option('Temp', 'BrowserMode') == 'yes') ? true : false;
+
+ gpac.focus_highlight = false;
+
+ gwskin.disable_transparency = false;
+ //remove window gradients 
+ if (!gwskin.has_opengl && !gpac.hardware_rgba) {
+ s = gwskin.get_style('window', 'normal');
+ s.texture = null;
+ gwskin.disable_transparency = true;
+ gwskin.default_window_alpha = 1;
+ }
+
+ var device = gpac.get_option('General', 'DeviceType');
+
+ if ((device == 'iOS') || (device == 'Android')) gwskin.mobile_device = true;
+ else gwskin.mobile_device = false;
+ 
+ if (gwskin.mobile_device) {
+ var size = gw_display_width;
+ if (size> gw_display_height) size = gw_display_height;
+ gwskin_set_default_control_height(size/3);
+ gwskin_set_default_icon_height(size/3);
+ }
+ 
+	gwskin_set_white_blue();
+
+ gwskin._to_string = function (obj) {
+ var res = '';
+ if (obj instanceof Array) {
+ res = '[';
+ for (var i = 0; i < obj.length; i++) {
+ if (i) res += ', ';
+ res += gwskin._to_string(obj[i]);
+ }
+ res += ']';
+ } else {
+ var first = true;
+ res = '{';
+ for (var prop in obj) {
+ if (!first) res += ', ';
+ res += '' + prop;
+ res += ': ';
+ if (typeof obj[prop] == 'string') {
+ res += '"';
+ res += obj[prop];
+ res += '"';
+ } else if (typeof obj[prop] == 'function') {
+ } else if (typeof obj[prop] == 'object') {
+ res += gwskin._to_string(obj[prop]);
+ } else {
+ res += obj[prop];
+ }
+ first = false;
+ }
+ res += '}';
+ }
+ return res;
+ }
+
+ gwskin.stringify = function (obj) {
+ return this._to_string(obj);
+ }
+ gwskin.parse = function (serial_obj) {
+ if (serial_obj.charAt(0) != '(') {
+ return eval('(' + serial_obj + ')' );
+ }
+ return eval(serial_obj);
+ }
+ 
+}
+
+function gwlib_add_event_filter(evt_filter) {
+	if ((arguments.length==2) && (arguments[1]==true)) {
+		gw_event_filters.unshift(evt_filter);
+	} else {
+		gw_event_filters.push(evt_filter);
+	}
+}
+
+function gwlib_remove_event_filter(evt_filter) {
+ var idx = gw_event_filters.indexOf(evt_filter);
+ if (idx > -1) gw_event_filters.splice(idx, 1);
+}
+
+function gwlib_notify_display_size(width, height) {
+ for (var i = 0; i < gw_ui_root.children.length; i++) {
+ if (typeof gw_ui_root.children[i].on_display_size != 'undefined') {
+ gw_ui_root.children[i].on_display_size(width, height);
+ }
+ }
+}
+
+function gwlib_refresh_layout() {
+ for (var i = 0; i < gw_ui_root.children.length; i++) {
+ if (typeof gw_ui_root.children[i].layout != 'undefined') {
+ gw_ui_root.children[i].layout(gw_ui_root.children[i].width, gw_ui_root.children[i].height);
+ }
+ }
+}
+
+
+//static
+function gw_reset_hit(obj, is_over) {
+ if (is_over) {
+ if (gwskin.last_hitable_obj && (gwskin.last_hitable_obj != obj)) {
+ //reset isOver value of previous touch sensor
+ if (typeof (gwskin.last_hitable_obj._ts_idx) != 'undefined') {
+ gwskin.last_hitable_obj.children[gwskin.last_hitable_obj._ts_idx].isOver = false;
+ }
+ gwskin.last_hitable_obj._on_over(false);
+ }
+ gwskin.last_hitable_obj = obj;
+ } else if (gwskin.last_hitable_obj == obj) {
+ gwskin.last_hitable_obj = null;
+ }
+}
+
+//static
+function gw_add_child(container, child) {
+ if (container == null) container = gw_ui_root;
+
+ if (typeof (container.add_child) != 'undefined') {
+ container.add_child(child);
+ } else {
+ container.children[container.children.length] = child;
+ }
+ child.parent = container;
+}
+
+//static
+function gw_detach_child(child) {
+ /*detach all default routes*/
+ Browser.deleteRoute(child, 'ALL', null, null);
+ if (typeof (child._ps2d_idx) != 'undefined') {
+ Browser.deleteRoute(child.children[child._ps2d_idx], 'ALL', null, null);
+ }
+ if (typeof (child._ts_idx) != 'undefined') {
+ Browser.deleteRoute(child.children[child._ts_idx], 'ALL', null, null);
+ }
+ if (typeof (child.dlg) != 'undefined') child.dlg = null;
+ if (typeof (child.parent) == 'undefined') return;
+
+ var p = child.parent;
+ child.parent = null;
+ if (typeof (p.remove_child) != 'undefined') {
+ p.remove_child(child);
+ } else {
+ p.removeChildren[0] = child;
+ }
+ if (gwskin.last_hitable_obj == child) gwskin.last_hitable_obj = null;
+}
+
+//static
+function gw_close_child_list(list) {
+ var count = list.length;
+ if (!count) return;
+ for (var i = 0; i < count; i++) {
+ var child = list[i];
+ if (typeof child.close != 'undefined') child.close();
+ else gw_detach_child(child);
+
+ if (list.length < count) {
+ i -= (count - list.length);
+ count = list.length;
+ }
+ }
+ //trigger GC whenever we have closed a child list
+ gpac.trigger_gc();
+}
+
+
+//static
+gwskin.get_class = function (class_name) {
+ if (arguments.length < 1) class_name = 'default';
+
+ var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
+ if (styles.length > 0) {
+ return styles[0];
+	}
+	return null;
+}
+
+//static
+gwskin.get_style = function (class_name, style_name) {
+ if (arguments.length < 1) class_name = 'default';
+ if (arguments.length < 2) style_name = 'normal';
+ if (style_name == 'invisible') return gwskin.appearance_transparent;
+
+ var style = null;
+ var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
+ if (styles.length > 0) {
+ if (typeof styles[0][style_name] != 'undefined')
+ return styles[0][style_name];
+ } else {
+ gwlog(l_err, 'Non-existing class ' + class_name);
+ }
+
+ style = gwskin.styles[0];
+ if (typeof style[style_name] != 'undefined')
+ return style[style_name];
+
+ gwlog(l_err, 'Non-existing style ' + style_name + ' in default class');
+ return null;
+}
+
+//static
+gwskin.get_font = function (class_name) {
+ if (arguments.length < 1) class_name = 'default';
+
+ var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
+ if (styles.length > 0) {
+ if (typeof styles[0].font != 'undefined') {
+ return styles[0].font;
+ }
+ } else {
+ gwlog(l_err, 'Non-existing class ' + class_name);
+ }
+ return gwskin.styles[0].font;
+}
+
+function gw_new_container() {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Container');
+ obj.push_to_top = function (wnd) {
+ this.removeChildren[0] = wnd;
+ this.addChildren[0] = wnd;
+ }
+ return obj;
+}
+
+function gw_new_curve2d(class_name) 
+{
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Curve2D');
+ var shape = new SFNode('Shape');
+ obj.children[0] = shape;
+ shape.appearance = gw_new_appearance(0, 0, 0);
+ obj.children[0].appearance.material.filled = false;
+ obj.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+
+ obj.set_color = function (r, g, b) {
+ this.children[0].appearance.material.lineProps.lineColor.r = r;
+ this.children[0].appearance.material.lineProps.lineColor.g = g;
+ this.children[0].appearance.material.lineProps.lineColor.b = b;
+ }
+ obj.set_line_width = function (width) {
+ if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+ this.children[0].appearance.material.lineProps.width = width;
+ }
+ shape.geometry = new SFNode('Curve2D');
+ shape.geometry.point = new SFNode('Coordinate2D');
+
+ obj.reset = function () {
+ this.children[0].geometry.point.point.length = 0;
+ this.children[0].geometry.type.length = 0;
+ }
+ obj._add_coord = function (x, y) {
+ var pts = this.children[0].geometry.point.point;
+ pts[pts.length] = new SFVec2f(x, y);
+ }
+ obj.add_move_to = function (x, y) {
+ this._add_coord(x, y);
+ //first moveto is implicit
+ if (this.children[0].geometry.type.length)
+ this.children[0].geometry.type[this.children[0].geometry.type.length] = 0;
+ }
+ obj.add_line_to = function (x, y) {
+ this._add_coord(x, y);
+ this.children[0].geometry.type[this.children[0].geometry.type.length] = 1;
+ }
+ obj.remove_first = function () {
+ var pts = this.children[0].geometry.point.point;
+ if (pts.length < 2) pts.length = 0;
+ else {
+ for (var i = 0; i < pts.length - 1; i++) {
+ pts[i] = pts[i + 1];
+ }
+ pts.length = i;
+ 
+ pts = this.children[0].geometry.type;
+
+ for (var i = 0; i < pts.length - 1; i++) {
+ pts[i] = pts[i + 1];
+ }
+ pts.length = i;
+ }
+ }
+ obj.get_num_points = function() {
+ return this.children[0].geometry.point.point.length;
+ }
+ return obj;
+}
+
+
+function gw_new_rectangle(class_name, style) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Rectangle');
+ var shape = new SFNode('Shape');
+ obj.children[0] = shape;
+ if (arguments.length == 1) style = 'normal';
+
+ shape.appearance = gwskin.get_style(class_name, style);
+
+ if (shape.appearance && (typeof (shape.appearance.skin) == 'undefined')) {
+ obj.set_alpha = function (alpha) {
+ this.children[0].appearance.material.transparency = 1 - alpha;
+ }
+ obj.get_alpha = function () {
+ return 1 - this.children[0].appearance.material.transparency;
+ }
+ obj.set_fill_color = function (r, g, b) {
+ this.children[0].appearance.material.emissiveColor.r = r;
+ this.children[0].appearance.material.emissiveColor.g = g;
+ this.children[0].appearance.material.emissiveColor.b = b;
+ }
+ obj.set_strike_color = function (r, g, b) {
+ if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+ this.children[0].appearance.material.lineProps.lineColor.r = r;
+ this.children[0].appearance.material.lineProps.lineColor.g = g;
+ this.children[0].appearance.material.lineProps.lineColor.b = b;
+ }
+ obj.set_line_width = function (width) {
+ if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+ this.children[0].appearance.material.lineProps.width = width;
+ }
+ } else {
+ obj.set_alpha = function (alpha) { }
+ obj.set_fill_color = function (r, g, b) { }
+ obj.set_strike_color = function (r, g, b) { }
+ obj.set_line_width = function (width) { }
+ obj.get_alpha = function () { return 1; }
+ }
+
+ obj.set_style = function (classname, style) {
+ var app = gwskin.get_style(classname, style);
+ if (app) this.children[0].appearance = app;
+ }
+
+
+ shape.geometry = new SFNode('Curve2D');
+ shape.geometry.point = new SFNode('Coordinate2D');
+
+ obj.corner_tl = true;
+ obj.corner_tr = true;
+ obj.corner_bl = true;
+ obj.corner_br = true;
+ obj.set_corners = function (tl, tr, br, bl) {
+ this.corner_tl = tl;
+ this.corner_tr = tr;
+ this.corner_bl = bl;
+ this.corner_br = br;
+ }
+ obj.sfv = new SFVec2f(0, 0);
+
+ obj.set_size = function (w, h) {
+ var hw, hh, rx_bl, ry_bl, rx_br, ry_br, rx_tl, ry_tl, rx_tr, ry_tr, rx, ry;
+ var temp;
+ hw = w / 2;
+ hh = h / 2;
+ this.width = w;
+ this.height = h;
+ temp = this.children[0].geometry.type;
+ temp[0] = 7;
+ temp[1] = 1;
+ temp[2] = 7;
+ temp[3] = 1;
+ temp[4] = 7;
+ temp[5] = 1;
+ temp[6] = 7;
+ temp[7] = 6; /*close*/
+
+ /*compute default rx/ry*/
+ ry = rx = 10;
+ if (rx >= hw) rx = hw;
+ if (ry >= hh) ry = hh;
+ rx_bl = rx_br = rx_tl = rx_tr = rx;
+ ry_bl = ry_br = ry_tl = ry_tr = ry;
+ if (!this.corner_tl) rx_tl = ry_tl = 0;
+ if (!this.corner_tr) rx_tr = ry_tr = 0;
+ if (!this.corner_bl) rx_bl = ry_bl = 0;
+ if (!this.corner_br) rx_br = ry_br = 0;
+
+ if (shape.geometry.point.point.length < 12) {
+ shape.geometry.point.point.length = 12;
+ for (var i = 0; i < 12; i++) {
+ shape.geometry.point.point[i].x = 0;
+ }
+ }
+ temp = this.children[0].geometry.point.point;
+
+ this.sfv.x = hw - rx_tr;
+ this.sfv.y = hh;
+ temp[0] = this.sfv;
+ this.sfv.x = hw; 
+ this.sfv.y = hh; /*bezier ctrl point or line-to*/
+ temp[1] = this.sfv;
+ this.sfv.x = hw;
+ this.sfv.y = hh - ry_tr;
+ temp[2] = this.sfv;
+ this.sfv.x = hw; 
+ this.sfv.y = -hh + ry_br;
+ temp[3] = this.sfv;
+ this.sfv.x = hw;
+ this.sfv.y = -hh; /*bezier control point*/
+ temp[4] = this.sfv;
+ this.sfv.x = hw - rx_br;
+ this.sfv.y = -hh;
+ temp[5] = this.sfv;
+ this.sfv.x = -hw + rx_bl;
+ this.sfv.y = -hh;
+ temp[6] = this.sfv;
+ this.sfv.x = -hw;
+ this.sfv.y = -hh; /*bezier control point*/
+ temp[7] = this.sfv;
+ this.sfv.x = -hw;
+ this.sfv.y = -hh + ry_bl;
+ temp[8] = this.sfv;
+ this.sfv.x = -hw;
+ this.sfv.y = hh - ry_tl;
+ temp[9] = this.sfv;
+ this.sfv.x = -hw;
+ this.sfv.y = hh; /*bezier control point*/
+ temp[10] = this.sfv;
+ this.sfv.x = -hw + rx_tl;
+ this.sfv.y = hh;
+ temp[11] = this.sfv;
+ }
+ return obj;
+}
+
+function gw_new_text(parent, label, class_name) {
+ var obj = new SFNode('Transform2D');
+ if (arguments.length < 3) class_name = 'default';
+
+ setup_gw_object(obj, 'Text');
+ gw_add_child(parent, obj);
+ obj.children[0] = new SFNode('Transform2D');
+ obj.children[0].children[0] = new SFNode('Shape');
+ obj.children[0].children[0].geometry = new SFNode('Text');
+
+ if (class_name == 'custom') {
+ class_name = 'default';
+ obj.children[0].children[0].appearance = gw_new_appearance(0, 0, 0);
+ obj.children[0].children[0].geometry.fontStyle = gw_new_fontstyle(gwskin.default_label_font_size, 1);
+ } else {
+ obj.children[0].children[0].appearance = gwskin.get_style(class_name, 'text');
+ obj.children[0].children[0].geometry.fontStyle = gwskin.get_font(class_name);
+ }
+
+
+
+ obj.set_label = function (value) {
+ this.children[0].children[0].geometry.string.length = 0;
+ this.children[0].children[0].geometry.string[0] = value;
+ }
+
+ obj.set_labels = function () {
+ this.children[0].children[0].geometry.string.length = 0;
+ for (var i = 0; i < arguments.length; i++) {
+ this.children[0].children[0].geometry.string[i] = '' + arguments[i];
+ }
+ }
 obj.get_label = function () {
- var mfs = this.children[0].children[0].geometry.string;
- return mfs.length ? this.children[0].children[0].geometry.string[0] : '';
- }
- obj.set_width = function (value) {
- this.children[0].children[0].geometry.maxExtent = -value;
- this.width = value;
- }
- obj.font_size = function (value) {
- return this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.size : 1;
- }
-
- if (obj.children[0].children[0].appearance && (typeof (obj.children[0].children[0].appearance.skin) == 'undefined')) {
- obj.set_color = function (r, g, b) {
- this.children[0].children[0].appearance.material.emissiveColor = new SFColor(r, g, b);
- }
- obj.children[0].set_alpha = function (a) {
- this.children[0].children[0].appearance.material.transparency = 1 - a;
- }
- obj.set_align = function (val) {
- this.children[0].children[0].geometry.fontStyle.justify[0] = val;
- }
- obj.set_font_size = function (val) {
- this.children[0].children[0].geometry.fontStyle.size = val;
- }
- } else {
- obj.set_color = function (r, g, b) { }
- obj.set_alpha = function (a) { }
- obj.set_align = function (a) { }
- obj.set_font_size = function (a) { }
- }
- obj.set_size = function (width, height) {
- var justify = this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.justify[0] : '';
- if (justify == 'BEGIN') {
- this.children[0].translation.x = -width / 2;
- } else if (justify == 'END') {
- this.children[0].translation.x = width / 2;
- } else {
- this.children[0].translation.x = 0;
- }
- this.children[0].children[0].geometry.maxExtent = -width;
- this.width = width;
- this.height = height;
- }
- if (label) obj.set_label(label);
- return obj;
-}
-
-
-function gw_new_window(parent, offscreen, background, class_name, no_focus) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Window');
- obj.background = null;
- obj._is_window = true;
-
- if (arguments.length < 4) class_name = 'window';
- else if ((arguments.length == 4) && typeof (arguments[3]) == 'boolean') {
- obj._no_focus = true;
- class_name = 'window';
- }
- else if (arguments.length == 5) obj._no_focus = true;
-
- if (class_name == 'popup') {
- class_name = 'window';
- obj._popup = true;
- }
-
- if (background)
- obj.background = gw_new_rectangle(class_name);
- obj.visible = false;
- obj.scale.x = obj.scale.y = 0;
- obj._disable_rect = gw_new_rectangle(class_name, 'invisible');
-
- obj.on_event = function (evt) { return 0; }
-
- obj.set_style = function (classname, style) {
- if (this.background)
- this.background.set_style(classname, style);
- }
- if (!offscreen) {
- if (obj.background) gw_add_child(obj, obj.background);
- var item = new SFNode('Layer2D');
- setup_gw_object(item, 'Layer');
- gw_add_child(obj, item);
- obj.set_size = function (width, height) {
- this.width = width;
- this.height = height;
- var idx = 0;
- if (this.background) {
- this.children[0].set_size(width, height);
- idx++;
- }
- this.children[idx].size.x = width;
- this.children[idx].size.y = height;
- this.layout(width, height);
- }
- obj.set_alpha = function (alpha) {
- if (this.background) {
- this.children[0].set_alpha(alpha);
- }
- }
- obj.get_alpha = function () {
- if (this.background) {
- return this.children[0].get_alpha();
- }
- return 0.0;
- }
- obj.add_child = function (child) {
- var idx = this.background ? 1 : 0;
- this.children[idx].children[this.children[idx].children.length] = child;
- }
- obj.remove_child = function (child) {
- var idx = this.background ? 1 : 0;
- this.children[idx].removeChildren[0] = child;
- }
- obj._wnd_close = function () {
- obj.background = null;
- obj._disable_rect = null;
- gw_close_child_list(this.children);
- }
- } else {
- var shape = new SFNode('Shape');
- shape.appearance = new SFNode('Appearance');
- shape.appearance.material = new SFNode('Material2D');
- shape.appearance.material.filled = TRUE;
- shape.appearance.texture = new SFNode('CompositeTexture2D');
-
- if (obj.background) {
- //use background to make sure the underlying texture is RGB, not RGBA
- if (!gwskin.disable_transparency) {
- shape.appearance.texture.children[0] = obj.background;
- } else {
- shape.appearance.texture.background = gwskin.no_gl_window_back;
-
- }
- }
- shape.geometry = new SFNode('Bitmap');
- obj.children[0] = shape;
-
- obj.set_size = function (width, height) {
- this.width = width;
- this.height = height;
- this.children[0].appearance.texture.pixelWidth = width;
- this.children[0].appearance.texture.pixelHeight = height;
- this.children[0].appearance.texture.children[0].set_size(width, height);
- this.layout(width, height);
- }
-
- obj.set_alpha = function (alpha) {
- //disable image blending for offscreens with backgrounds
- if (this.background && gwskin.disable_transparency) alpha = 1;
-
- this.children[0].appearance.material.transparency = 1 - alpha;
- }
- obj.get_alpha = function () {
- return 1 - this.children[0].appearance.material.transparency;
- }
-
- obj.add_child = function (child) {
- this.children[0].appearance.texture.children[this.children[0].appearance.texture.children.length] = child;
- }
- obj.remove_child = function (child) {
- this.children[0].appearance.texture.removeChildren[0] = child;
- }
- obj._wnd_close = function () {
- obj.background = null;
- obj._disable_rect = null;
- gw_close_child_list(this.children[0].appearance.texture.children);
- }
- }
- obj._pre_destroy = obj._wnd_close;
- obj.set_corners = function (tl, tr, br, bl) {
- if (this.background)
- this.background.set_corners(tl, tr, br, bl);
- }
-
- obj._is_disable = false;
- obj.disable = function () {
- if (this._is_disable) return;
- this._is_disable = true;
- this._disable_rect.set_size(this.width, this.height);
- this.add_child(this._disable_rect);
- }
- obj.enable = function () {
- if (!this._is_disable) return;
- this._is_disable = false;
- this.remove_child(this._disable_rect);
- }
-
- if (typeof obj._popup != 'boolean') {
- var s = gwskin.get_class(class_name);
-
- if (s) {
- if (typeof s.show != 'undefined') obj.show = s.show;
- if (typeof s.hide != 'undefined') obj.hide = s.hide;
- }
- }
-
- obj.on_close = null;
- obj._orig_close = obj.close;
+ var mfs = this.children[0].children[0].geometry.string;
+ return mfs.length ? this.children[0].children[0].geometry.string[0] : '';
+ }
+ obj.set_width = function (value) {
+ this.children[0].children[0].geometry.maxExtent = -value;
+ this.width = value;
+ }
+ obj.font_size = function (value) {
+ return this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.size : 1;
+ }
+
+ if (obj.children[0].children[0].appearance && (typeof (obj.children[0].children[0].appearance.skin) == 'undefined')) {
+ obj.set_color = function (r, g, b) {
+ this.children[0].children[0].appearance.material.emissiveColor = new SFColor(r, g, b);
+ }
+ obj.children[0].set_alpha = function (a) {
+ this.children[0].children[0].appearance.material.transparency = 1 - a;
+ }
+ obj.set_align = function (val) {
+ this.children[0].children[0].geometry.fontStyle.justify[0] = val;
+ }
+ obj.set_font_size = function (val) {
+ this.children[0].children[0].geometry.fontStyle.size = val;
+ }
+ } else {
+ obj.set_color = function (r, g, b) { }
+ obj.set_alpha = function (a) { }
+ obj.set_align = function (a) { }
+ obj.set_font_size = function (a) { }
+ }
+ obj.set_size = function (width, height) {
+ var justify = this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.justify[0] : '';
+ if (justify == 'BEGIN') {
+ this.children[0].translation.x = -width / 2;
+ } else if (justify == 'END') {
+ this.children[0].translation.x = width / 2;
+ } else {
+ this.children[0].translation.x = 0;
+ }
+ this.children[0].children[0].geometry.maxExtent = -width;
+ this.width = width;
+ this.height = height;
+ }
+ if (label) obj.set_label(label);
+ return obj;
+}
+
+
+function gw_new_window(parent, offscreen, background, class_name, no_focus) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Window');
+ obj.background = null;
+ obj._is_window = true;
+
+ if (arguments.length < 4) class_name = 'window';
+ else if ((arguments.length == 4) && typeof (arguments[3]) == 'boolean') {
+ obj._no_focus = true;
+ class_name = 'window';
+ }
+ else if (arguments.length == 5) obj._no_focus = true;
+
+ if (class_name == 'popup') {
+ class_name = 'window';
+ obj._popup = true;
+ }
+
+ if (background)
+ obj.background = gw_new_rectangle(class_name);
+ obj.visible = false;
+ obj.scale.x = obj.scale.y = 0;
+ obj._disable_rect = gw_new_rectangle(class_name, 'invisible');
+
+ obj.on_event = function (evt) { return 0; }
+
+ obj.set_style = function (classname, style) {
+ if (this.background)
+ this.background.set_style(classname, style);
+ }
+ if (!offscreen) {
+ if (obj.background) gw_add_child(obj, obj.background);
+ var item = new SFNode('Layer2D');
+ setup_gw_object(item, 'Layer');
+ gw_add_child(obj, item);
+ obj.set_size = function (width, height) {
+ this.width = width;
+ this.height = height;
+ var idx = 0;
+ if (this.background) {
+ this.children[0].set_size(width, height);
+ idx++;
+ }
+ this.children[idx].size.x = width;
+ this.children[idx].size.y = height;
+ this.layout(width, height);
+ }
+ obj.set_alpha = function (alpha) {
+ if (this.background) {
+ this.children[0].set_alpha(alpha);
+ }
+ }
+ obj.get_alpha = function () {
+ if (this.background) {
+ return this.children[0].get_alpha();
+ }
+ return 0.0;
+ }
+ obj.add_child = function (child) {
+ var idx = this.background ? 1 : 0;
+ this.children[idx].children[this.children[idx].children.length] = child;
+ }
+ obj.remove_child = function (child) {
+ var idx = this.background ? 1 : 0;
+ this.children[idx].removeChildren[0] = child;
+ }
+ obj._wnd_close = function () {
+ obj.background = null;
+ obj._disable_rect = null;
+ gw_close_child_list(this.children);
+ }
+ } else {
+ var shape = new SFNode('Shape');
+ shape.appearance = new SFNode('Appearance');
+ shape.appearance.material = new SFNode('Material2D');
+ shape.appearance.material.filled = TRUE;
+ shape.appearance.texture = new SFNode('CompositeTexture2D');
+
+ if (obj.background) {
+ //use background to make sure the underlying texture is RGB, not RGBA
+ if (!gwskin.disable_transparency) {
+ shape.appearance.texture.children[0] = obj.background;
+ } else {
+ shape.appearance.texture.background = gwskin.no_gl_window_back;
+
+ }
+ }
+ shape.geometry = new SFNode('Bitmap');
+ obj.children[0] = shape;
+
+ obj.set_size = function (width, height) {
+ this.width = width;
+ this.height = height;
+ this.children[0].appearance.texture.pixelWidth = width;
+ this.children[0].appearance.texture.pixelHeight = height;
+ this.children[0].appearance.texture.children[0].set_size(width, height);
+ this.layout(width, height);
+ }
+
+ obj.set_alpha = function (alpha) {
+ //disable image blending for offscreens with backgrounds
+ if (this.background && gwskin.disable_transparency) alpha = 1;
+
+ this.children[0].appearance.material.transparency = 1 - alpha;
+ }
+ obj.get_alpha = function () {
+ return 1 - this.children[0].appearance.material.transparency;
+ }
+
+ obj.add_child = function (child) {
+ this.children[0].appearance.texture.children[this.children[0].appearance.texture.children.length] = child;
+ }
+ obj.remove_child = function (child) {
+ this.children[0].appearance.texture.removeChildren[0] = child;
+ }
+ obj._wnd_close = function () {
+ obj.background = null;
+ obj._disable_rect = null;
+ gw_close_child_list(this.children[0].appearance.texture.children);
+ }
+ }
+ obj._pre_destroy = obj._wnd_close;
+ obj.set_corners = function (tl, tr, br, bl) {
+ if (this.background)
+ this.background.set_corners(tl, tr, br, bl);
+ }
+
+ obj._is_disable = false;
+ obj.disable = function () {
+ if (this._is_disable) return;
+ this._is_disable = true;
+ this._disable_rect.set_size(this.width, this.height);
+ this.add_child(this._disable_rect);
+ }
+ obj.enable = function () {
+ if (!this._is_disable) return;
+ this._is_disable = false;
+ this.remove_child(this._disable_rect);
+ }
+
+ if (typeof obj._popup != 'boolean') {
+ var s = gwskin.get_class(class_name);
+
+ if (s) {
+ if (typeof s.show != 'undefined') obj.show = s.show;
+ if (typeof s.hide != 'undefined') obj.hide = s.hide;
+ }
+ }
+
+ obj.on_close = null;
+ obj._orig_close = obj.close;
 obj._on_wnd_close = function () {
- if (this.on_close != null) this.on_close();
- this._orig_close();
- }
- obj.close = function () {
- this.hide(this._on_wnd_close);
- }
- obj.layout = function (w, h) { }
-
- obj.set_alpha(gwskin.default_window_alpha);
- gw_add_child(parent, obj);
- return obj;
-}
-
-function gw_new_icon_button(parent, icon_url, label, horizontal, class_name) {
- var touch;
- 
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'IconButton');
-
- if (arguments.length == 3) {
- horizontal = false;
- class_name = 'default';
- }
- else if (arguments.length == 4) {
- if (typeof arguments[3] == 'string') {
- class_name = arguments[3];
- horizontal = false;
- } else {
- class_name = 'default';
- }
- }
-
- obj._icon_root = new SFNode('Transform2D');
- obj._icon_root.children[0] = new SFNode('Layer2D');
- obj._touch = new SFNode('TouchSensor');
- obj._highlight = gw_new_rectangle(class_name, 'invisible');
-
- obj._show_highlight = false;
- obj._is_icon = false;
- obj._tooltip = true;
- if (class_name == 'icon') {
- obj._is_icon = true;
- }
- else if (class_name == 'icon_label') {
- obj._is_icon = true;
- obj._show_highlight = false;
- class_name = 'checkbox';
- }
- else if (class_name == 'listitem') {
- obj._is_icon = true;
- obj._show_highlight = true;
+ if (this.on_close != null) this.on_close();
+ this._orig_close();
+ }
+ obj.close = function () {
+ this.hide(this._on_wnd_close);
+ }
+ obj.layout = function (w, h) { }
+
+ obj.set_alpha(gwskin.default_window_alpha);
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+function gw_new_image(parent, src_url) {
+	var obj = new SFNode('Transform2D');
+	setup_gw_object(obj, 'Image');
+	obj.children[0] = new SFNode('Layer2D');
+	obj.children[0].children[0] = new SFNode('Inline');
+	obj.children[1] = gw_new_rectangle('default', 'invisible');
+	gw_object_set_hitable(obj.children[1]);
+
+	obj.on_click = null;
+	obj.children[1]._par = obj;
+	obj.children[1].on_click = function() {
+		if (this._par.on_click) this._par.on_click();
+	}
+	obj.set_image = function(src_url) {
+		var inl = gw_load_resource(src_url, false);
+		this.children[0].children[0] = inl;
+	}
+	obj.set_size = function(width, height) {
+		this.children[0].size.x = width;
+		this.children[0].size.y = height;
+		this.width = width;
+		this.height = height;
+		this.children[1].set_size(width, height);
+	}
+	obj._pre_destroy = function () {
+		this.children[0].children.length = 0;
+	}
+	obj.on_event = function () { return false; }
+
+	obj.set_image(src_url);
+	
+	gw_add_child(parent, obj);
+	return obj;
+}
+
+
+function gw_new_icon_button(parent, icon_url, label, horizontal, class_name) {
+ var touch;
+ 
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'IconButton');
+
+ if (arguments.length == 3) {
+ horizontal = false;
+ class_name = 'default';
+ }
+ else if (arguments.length == 4) {
+ if (typeof arguments[3] == 'string') {
+ class_name = arguments[3];
+ horizontal = false;
+ } else {
+ class_name = 'default';
+ }
+ }
+
+ obj._icon_root = new SFNode('Transform2D');
+ obj._icon_root.children[0] = new SFNode('Layer2D');
+ obj._touch = new SFNode('TouchSensor');
+
+ obj._show_highlight = false;
+ obj._is_icon = false;
+ obj._tooltip = true;
+ if (class_name == 'image') {
+		obj._is_icon = false;
+		obj._tooltip = false;
+		class_name = 'default';
+ }
+	else if (class_name == 'icon') {
+		obj._is_icon = true;
+		obj._highlight = gw_new_rectangle(class_name, 'invisible');
+	}
+ else if (class_name == 'icon_label') {
+ obj._is_icon = true;
+ obj._show_highlight = false;
+ class_name = 'checkbox';
+ }
+ else if (class_name == 'listitem') {
+ obj._is_icon = true;
+ obj._show_highlight = true;
+		obj._highlight = gw_new_rectangle(class_name, 'invisible');
 obj._tooltip = false;
- } else {
- obj._highlight = gw_new_rectangle(class_name, 'invisible');
- obj._show_highlight = true;
- }
-
- if (obj._highlight)
- obj.children[0] = obj._highlight;
-
- obj.children[obj.children.length] = obj._icon_root;
- obj.children[obj.children.length] = obj._touch;
- obj._label = null;
-
- var skip_label = (label == null) ? true : false;
-
- if (!skip_label && gwskin.get_font(class_name) != null) {
- obj._label = gw_new_text(obj, label, class_name);
- if (horizontal) {
- obj.set_size = function (width, height) {
- this._icon_root.children[0].size.x = height;
- this._icon_root.children[0].size.y = height;
- this._icon_root.translation.x = (height - width) / 2;
- if (this._highlight)
- this._highlight.set_size(width, height);
- this._label.set_width(width - height);
- this._label.translation.x = height - width / 2;
- this.width = width;
- this.height = height;
- };
- } else {
- obj.set_size = function (width, height) {
- var fsize = this._label.font_size();
-
- var h = height - fsize - gwskin.default_icon_text_spacing;
- this._icon_root.children[0].size.x = h;
- this._icon_root.children[0].size.y = h;
- this._icon_root.translation.y = (height - h) / 2;
- var w = width;
- if (this._highlight)
- this._highlight.set_size(w, height);
- this._label.set_width(w);
- this._label.translation.y = -height / 2 + fsize / 2;
- this.width = w;
- this.height = height;
- };
- }
- obj.set_label = function (label) {
- this._label.set_label(label);
- }
- obj.get_label = function () {
- return this._label.get_label();
- }
- } else {
- obj.set_size = function (width, height) {
- this._icon_root.children[0].size.x = width;
- this._icon_root.children[0].size.y = height;
- if (this._highlight)
- this._highlight.set_size(width, height);
- this.width = width;
- this.height = height;
- };
- obj.set_label = function (label) {
- this.label = label;
- }
- obj.get_label = function () {
- return this.label;
- }
- }
-
- obj._last_ts = 0;
- obj.on_long_click = NULL;
- obj.on_click = NULL;
- obj.on_over = null;
- obj.down = false;
- obj.over = false;
- obj._on_active = function (value, timestamp) {
- if (value) {
- this.down = true;
- if (this._is_icon) {
- var app = gwskin.get_style(class_name, 'down');
- this._icon_root.children[0].children[0].set_style(app);
- }
-
- if (this._show_highlight) {
- this._highlight.set_style(class_name, 'down');
- }
-
- this._last_ts = timestamp;
- } else {
- if (this._is_icon) {
- var app = gwskin.get_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'normal');
- this._icon_root.children[0].children[0].set_style(app);
- }
-
- if (this._show_highlight) {
- this._highlight.set_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'invisible');
- }
-
- if (this.down) {
- if (this.on_long_click && (timestamp - this._last_ts > gwskin.long_click_delay)) this.on_long_click();
- else if (this.on_click) this.on_click();
- }
- this.down = false;
- }
- };
- obj._on_over = function (value) {
- this.over = value;
- gw_reset_hit(this, value);
-
- if (gwskin.pointing_device) {
- if (this._is_icon) {
- var app = gwskin.get_style(class_name, value ? 'over' : 'normal');
- if (app) {
- this._icon_root.children[0].children[0].set_style(app);
- }
- }
-
- if (this._show_highlight) {
- this._highlight.set_style(class_name, value ? 'over' : 'invisible');
- }
-
- if (this.on_over) this.on_over(value);
- if (this._tooltip && gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
- }
- };
- Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
- Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
-
- obj.icons = [];
- obj.add_icon = function (url) {
-
- if (typeof url == 'string') {
- var inl;
- if (typeof gwskin.images[url] != 'undefined') {
- inl = gw_load_resource(gwskin.images[url], this._is_icon);
- } else {
- inl = gw_load_resource(url, this._is_icon);
- }
- } else {
- var inl = url;
- }
- this.icons[this.icons.length] = inl;
-
- if (this._icon_root.children[0].children.length == 0) {
- this._icon_root.children[0].children[0] = this.icons[0];
- }
- }
- obj.switch_icon = function (idx) {
- while (idx > this.icons.length) idx -= this.icons.length;
- this._icon_root.children[0].children[0] = this.icons[idx];
- }
- obj._pre_destroy = function () {
- for (var i in this.icons) {
- gw_unload_resource(this.icons[i]);
- }
- this.icons.length = 0;
- this._highlight = null;
- this._icons = null;
- this._label = null;
- Browser.deleteRoute(this._touch, 'ALL', null, null);
- this._touch = null;
- }
-
- if (icon_url) obj.add_icon(icon_url);
- obj.set_label(label);
-
- obj.enable = function() {
-		this._touch.enabled = true;
-		this._on_over(false);
-	}
- obj.disable = function() {
-		this._touch.enabled = false;
-		var app = gwskin.get_style(class_name, 'disable');
-		if (app) {
-			this._icon_root.children[0].children[0].set_style(app);
-		}
-	}
-
-
- obj.on_event = function () { return false; }
-
- if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
- obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
- } else {
- obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
- }
- gw_add_child(parent, obj);
- return obj;
-}
-
-function gw_new_icon(parent, icon_name) {
- return gw_new_icon_button(parent, gwskin.images[icon_name], gwskin.labels[icon_name], false, 'icon');
-}
-
-function gw_new_checkbox(parent, label) {
- var touch;
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'CheckBox');
-
- obj._icon_root = new SFNode('Transform2D');
- obj._icon_root.children[0] = new SFNode('Layer2D');
- obj._touch = new SFNode('TouchSensor');
-
- var class_name = 'checkbox';
-
- obj.children[0] = gw_new_rectangle(class_name, 'invisible');
- obj.children[1] = obj._icon_root;
- gw_new_text(obj, label, class_name);
- obj.children[3] = obj._touch;
-
- obj.set_size = function (width, height) {
- this._icon_root.children[0].size.x = height;
- this._icon_root.children[0].size.y = height;
- this._icon_root.translation.x = (height - width) / 2;
- this.children[0].set_size(width, height);
- this.children[2].set_width(width - height);
- this.children[2].translation.x = (height - width) / 2 + height;
- this.width = width;
- this.height = height;
- };
-
- obj.set_label = function (label) {
- this.children[2].set_label(label);
- }
- obj.get_label = function () {
- return this.children[2].get_label();
- }
- obj.on_check = NULL;
- obj.down = false;
- obj.over = false;
- obj._checked = false;
- obj._on_active = function (value, timestamp) {
- if (value) {
- this.down = true;
- } else {
- if (this.down && this.over) {
- this._set_checked(!this._checked);
- if (this.on_check) this.on_check(this._checked);
- }
- this.down = false;
- }
- };
- obj._on_over = function (value) {
- this.over = value;
- gw_reset_hit(this, value);
-
- if (gwskin.pointing_device) {
- var app = gwskin.get_style(class_name, value ? 'over' : (this._checked ? 'down' : 'normal') );
- if (app) {
- this._icon_root.children[0].children[0].set_style(app);
- }
- if (this.on_over) this.on_over(value);
- if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
- }
- };
- Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
- Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
-
-
- obj._set_checked = function (value) {
- this._checked = value;
- var app = gwskin.get_style(class_name, value ? 'down' : 'normal');
- this._icon_root.children[0].children[0].set_style(app);
- }
- obj.set_checked = function (value) {
- this._set_checked(value);
- }
- obj._icon_root.children[0].children[0] = gw_load_resource(gwskin.images.check, true);
-
- obj._pre_destroy = function () {
- for (var i in this.icons) {
- gw_unload_resource(this.icons[i]);
- }
- Browser.deleteRoute(this._touch, 'ALL', null, null);
- this._touch = null;
- this._icon_root = null;
- }
- obj.set_label(label);
-
- obj.on_event = function () { return false; }
-
- if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
- obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
- } else {
- obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
- }
- gw_add_child(parent, obj);
- return obj;
-}
-
-
-
-function gw_new_spincontrol(parent, horizontal) {
- var touch;
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'SpinControl');
-
- obj.value = 0;
- if (arguments.length < 2) horizontal = false;
- obj._horizontal = horizontal;
- obj.on_click = function () { }
- var tool = gw_new_icon(obj, horizontal ? 'right' : 'up');
-
- obj.min = 0;
- obj.max = -1;
- tool.on_click = function () {
- if (this.parent.min < this.parent.max) {
- if (this.parent.value >= this.parent.max) {
- return;
- }
- }
- this.parent.value++;
- this.parent.on_click(this.parent.value);
- }
- tool = gw_new_icon(obj, horizontal ? 'left' : 'down');
- tool.on_click = function () {
- if (this.parent.min < this.parent.max) {
- if (this.parent.value <= this.parent.min) {
- return;
- }
- }
- this.parent.value--;
- this.parent.on_click(this.parent.value);
- }
-
- obj.set_size = function (width, height) {
- if (this._horizontal) {
- this.children[0].set_size(width / 2, height);
- this.children[1].set_size(width / 2, height);
- this.children[0].translation.x = width / 4;
- this.children[1].translation.x = -width / 4;
- } else {
- this.children[0].set_size(width, height / 2);
- this.children[1].set_size(width, height / 2);
- this.children[0].translation.y = height / 4;
- this.children[1].translation.y = -height / 4;
- }
- this.width = width;
- this.height = height;
- };
- obj._idx = 0;
- obj.on_event = function (evt) {
- if (evt.type == GF_EVENT_KEYDOWN) {
- var idx = this._idx;
- if (this._horizontal) {
- if (evt.keycode == 'Left') idx--;
- else if (evt.keycode == 'Right') idx++;
- else return false;
- } else {
- if (evt.keycode == 'Up') idx--;
- else if (evt.keycode == 'Down') idx++;
- else return false;
- }
- if (idx < 0) {
- return false;
- }
- if (idx > 1) {
- return false;
- }
- this._idx = idx;
- gpac.set_focus(this.children[idx]);
- return true;
- }
- return false;
- }
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-
-
-
-function gw_new_subscene(parent) {
- var inline = new SFNode('Inline');
- inline._name = 'Subscene';
- inline._pre_destroy = function () {
- this.url[0] = '';
- this.url.length = 0;
- }
- inline.connect = function (url) {
- this.url.length = 0;
- this.url[0] = url;
- }
- gw_add_child(parent, inline);
- return inline;
-}
-
-function gw_new_button(parent, text, class_name) {
- var label;
- if (arguments.length < 3) class_name = 'button';
- obj = gw_new_rectangle(class_name, 'normal');
- label = gw_new_text(obj, text, class_name);
- gw_object_set_hitable(obj);
- obj.on_over = function (value) {
- if (gwskin.pointing_device) {
- this.set_style(class_name, value ? 'over' : 'normal');
- }
- //if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
- }
- obj.on_down = function (val) {
- this.set_style(class_name, val ? 'down' : (this._over ? 'over' : 'normal'));
- }
-
- obj._set_size = obj.set_size;
- obj.set_size = function (width, height) {
- this._set_size(width, height);
- this.children[1].set_size(width, height);
- this.children[1].set_width(width);
- };
- obj.set_label = function (label) {
- this.children[1].set_label(label);
- }
- obj.get_label = function () {
- return this.children[1].get_label();
- }
- obj.set_labels = function () {
- this.children[1].set_labels.apply(this.children[1], arguments);
- }
- obj.on_event = function (x, y) { return false; }
-
- obj.disable = function () {
- this._disable_touch();
- }
- obj.enable = function () {
- this._enable_touch();
- }
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-
-function gw_new_gauge(parent, text) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'ProgressBar');
-
- if (arguments.length <= 3) class_name = 'progress';
-
- obj.children[0] = gw_new_rectangle(class_name, 'normal');
- obj.children[1] = gw_new_rectangle(class_name, 'over');
- gw_new_text(obj, text, class_name);
-
-
- obj._value = 75;
- obj._set_size = obj.set_size;
- obj.set_size = function (width, height) {
- this._set_size(width, height);
- this.children[0].set_size(width, height);
-
- this.children[1].set_size(this._value * width / 100, height);
- this.children[1].move((this._value - 100) * width / 200, 0);
-
- this.children[2].set_size(width, height);
- this.children[2].set_width(width);
- };
- obj.set_label = function (label) {
- this.children[2].set_label(label);
- }
- obj.get_label = function () {
- return this.children[2].get_label();
- }
-
- obj.set_value = function (val) {
- this._value = (val > 100) ? 100 : ((val < 0) ? 0 : val);
- this.set_size(this.width, this.height);
- }
-
- obj.on_event = function (x, y) { return false; }
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-
-
-function grid_event_navigate(dlg, children, type) {
- var i;
- if (dlg.current_focus == -1) {
- if (type == 'Left') return false;
- dlg.current_focus = 0;
- gpac.set_focus(children[0]);
- return true;
- }
-
- if (type == 'Right') {
- var orig_focus = dlg.current_focus;
- var switch_page = 0;
- var tr = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
- if (dlg.current_focus + 1 == children.length) {
- dlg.current_focus = orig_focus;
- gpac.set_focus(children[dlg.current_focus]);
- return false;
- }
- /*goto right item*/
- dlg.current_focus++;
- /*check we are not going down*/
- while (1) {
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > tr))
- break;
- if (dlg.current_focus + 1 == children.length) {
- dlg.current_focus = orig_focus;
- gpac.set_focus(children[dlg.current_focus]);
- return false;
- }
- dlg.current_focus++;
- switch_page = 1;
- }
- /*check we haven't move to a new page*/
- if (children[orig_focus].translation.y + children[orig_focus].height / 2 <= children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2) {
- switch_page = 1;
- }
-
- }
- else if (type == 'Left') {
- var orig_focus = dlg.current_focus;
- var switch_page = 0;
- var tr = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
- if (!dlg.current_focus) {
- dlg.current_focus = -1;
- gpac.set_focus(null);
- return false;
- }
- /*goto left item*/
- dlg.current_focus--;
- /*check we are not going up*/
- while (1) {
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < tr))
- break;
- if (!dlg.current_focus) {
- dlg.current_focus = orig_focus;
- return false;
- }
- dlg.current_focus--;
- switch_page = -1;
- }
- /*check we haven't move to a new page*/
- if (children[orig_focus].translation.y - children[orig_focus].height / 2 >= children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2) {
- switch_page = -1;
- }
- }
- else if (type == 'Down') {
- var orig_focus = dlg.current_focus;
- var switch_page = 0;
- var bottom_y = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
- var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
- if (dlg.current_focus + 1 == children.length) return false;
- dlg.current_focus++;
- /*goto next line*/
- while (1) {
- //next child below current
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < bottom_y))
- break;
- //next child above current - we need a page swicth
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y)) {
- switch_page = 1;
- break;
- }
- //not found
- if (dlg.current_focus + 1 == children.length) {
- dlg.current_focus = orig_focus;
- return false;
- }
- dlg.current_focus++;
- }
- /*find closest item on the left*/
- var tx = children[orig_focus].translation.x - children[orig_focus].width / 2;
- while (1) {
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x + children[dlg.current_focus].width / 2 > tx))
- break;
- if (dlg.current_focus + 1 == children.length) break;
- dlg.current_focus++;
- }
- }
- else if (type == 'Up') {
- var orig_focus = dlg.current_focus;
- var switch_page = 0;
- var bottom_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
- var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
- if (!dlg.current_focus) return false;
- dlg.current_focus--;
- /*goto previous line*/
- while (1) {
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y))
- break;
- //next child below current - we need a page swicth
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 < bottom_y)) {
- switch_page = -1;
- break;
- }
- if (!dlg.current_focus) {
- dlg.current_focus = orig_focus;
- return false;
- }
- dlg.current_focus--;
- }
- /*goto above child*/
- var tx = children[orig_focus].translation.x + children[orig_focus].width / 2;
- while (1) {
- if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x - children[dlg.current_focus].width / 2 < tx))
- break;
- if (!dlg.current_focus) {
- dlg.current_focus = orig_focus;
- return false;
- }
- dlg.current_focus--;
- }
- } else {
- return false;
- }
- if (switch_page == 1) return dlg.on_next_page();
- else if (switch_page == -1) return dlg.on_prev_page();
- if (typeof children[dlg.current_focus].on_event == 'undefined') {
- return grid_event_navigate(dlg, children, type);
- }
-
- gpac.set_focus(children[dlg.current_focus]);
- return true;
-}
-
-
-
-function gw_new_grid_container(parent) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Layout');
-
- obj.children[0] = new SFNode('Layer2D');
- obj._container = new SFNode('Transform2D');
- obj.children[0].children[0] = obj._container;
- obj._all_children = [];
- obj._pages = [];
-
- obj.on_page_changed = null;
-
- obj.on_prev_page = function () {
- this._move_page(-1);
- return true;
- };
- obj.on_next_page = function () {
- this._move_page(1);
- return true;
- };
-
- obj.is_first_page = function () {
- return this._page_idx == 0 ? true : false;
- }
- obj.is_last_page = function () {
- return this._page_idx == (this._pages.length - 1) ? true : false;
- }
- obj._page_idx = 0;
- obj._max_page_idx = 0;
- obj._move_page = function (value) {
- this._page_idx += value;
- var i, child, last_child = 0;
-
- if (this._page_idx <= 0) {
- this._page_idx = 0;
- }
-
- if (this._page_idx * this.width >= this.max_width) {
- this._page_idx = this.max_width / this.width;
- }
-
- this._container.translation.x = -this._page_idx * this.width;
- this._container.children.length = 0;
- if (this._page_idx + 1 >= this._pages.length) {
- last_child = this._all_children.length;
- } else {
- last_child = this._pages[this._page_idx + 1];
- }
-
- i = 0;
- child = this._pages[this._page_idx];
- if (this.current_focus >= 0) {
- if (this.current_focus < child) this.current_focus = child;
- else if (this.current_focus >= last_child) this.current_focus = last_child - 1;
- gpac.set_focus(this._all_children[this.current_focus]);
- }
-
-
- while (child < last_child) {
- this._container.children[i] = this._all_children[child];
- child++;
- i++;
- }
- if (this.on_page_changed) this.on_page_changed();
-
- }
-
- obj.spread_h = false;
- obj.spread_v = false;
- obj.break_at_hidden = false;
- obj.break_at_line = 0;
-
- obj.set_focus_last = function () {
- this._page_idx = this._pages.length ? this._pages.length - 1 : 0;
- this.current_focus = this._all_children.length;
- this._move_page(0);
- }
- obj.set_focus_first = function () {
- this._page_idx = 0;
- this.current_focus = 0;
- this._move_page(0);
- }
-
- obj.set_size = function (width, height) {
- this.width = width;
- this.height = height;
- this.children[0].size.x = width;
- this.children[0].size.y = height;
- this.nb_visible = 0;
- this.current_focus = -1;
- this.layout();
- }
- obj.max_width = 0;
- obj.layout = function () {
- var spread_x, nb_wid_h, start_x, start_y, maxh, width, height, page_x, nb_on_line;
- var children = this._all_children;
- var width = this.width;
- var height = this.height;
-
- if (width <= 0) return;
- if (height <= 0) return;
-
- if (typeof this.on_size != 'undefined')
- this.on_size(width, height);
-
- var page_x = 0;
- var maxh = 0;
- var spread_x = -1;
- var start_x = -width / 2;
- var init_y = this.height / 2;
- var start_y = init_y;
- var nb_on_line = 0;
-
- this._pages = [0];
-
- for (var i = 0; i < children.length; i++) {
+ } else {
+ obj._highlight = gw_new_rectangle(class_name, 'invisible');
+ obj._show_highlight = true;
+ }
+
+ if (obj._highlight)
+ obj.children[0] = obj._highlight;
+
+ obj.children[obj.children.length] = obj._icon_root;
+ obj.children[obj.children.length] = obj._touch;
+ obj._label = null;
+
+ var skip_label = (label == null) ? true : false;
+
+ if (!skip_label && gwskin.get_font(class_name) != null) {
+ obj._label = gw_new_text(obj, label, class_name);
+ if (horizontal) {
+ obj.set_size = function (width, height) {
+ this._icon_root.children[0].size.x = height;
+ this._icon_root.children[0].size.y = height;
+ this._icon_root.translation.x = (height - width) / 2;
+ if (this._highlight)
+ this._highlight.set_size(width, height);
+ this._label.set_width(width - height);
+ this._label.translation.x = height - width / 2;
+ this.width = width;
+ this.height = height;
+ };
+ } else {
+ obj.set_size = function (width, height) {
+ var fsize = this._label.font_size();
+
+ var h = height - fsize - gwskin.default_icon_text_spacing;
+ this._icon_root.children[0].size.x = h;
+ this._icon_root.children[0].size.y = h;
+ this._icon_root.translation.y = (height - h) / 2;
+ var w = width;
+ if (this._highlight)
+ this._highlight.set_size(w, height);
+ this._label.set_width(w);
+ this._label.translation.y = -height / 2 + fsize / 2;
+ this.width = w;
+ this.height = height;
+ };
+ }
+ obj.set_label = function (label) {
+ this._label.set_label(label);
+ }
+ obj.get_label = function () {
+			return this._label ? this._label.get_label() : null;
+ }
+ } else {
+ obj.set_size = function (width, height) {
+ this._icon_root.children[0].size.x = width;
+ this._icon_root.children[0].size.y = height;
+ if (this._highlight)
+ this._highlight.set_size(width, height);
+ this.width = width;
+ this.height = height;
+ };
+ obj.set_label = function (label) {
+ this.label = label;
+ }
+ obj.get_label = function () {
+ return this.label;
+ }
+ }
+
+ obj._last_ts = 0;
+ obj.on_long_click = NULL;
+ obj.on_click = NULL;
+ obj.on_over = null;
+ obj.down = false;
+ obj.over = false;
+ obj._on_active = function (value, timestamp) {
+ if (value) {
+ this.down = true;
+ if (this._is_icon) {
+ var app = gwskin.get_style(class_name, 'down');
+ this._icon_root.children[0].children[0].set_style(app);
+ }
+
+ if (this._show_highlight) {
+ this._highlight.set_style(class_name, 'down');
+ }
+
+ this._last_ts = timestamp;
+ } else {
+ if (this._is_icon) {
+ var app = gwskin.get_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'normal');
+ this._icon_root.children[0].children[0].set_style(app);
+ }
+
+ if (this._show_highlight) {
+ this._highlight.set_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'invisible');
+ }
+
+ if (this.down) {
+ if (this.on_long_click && (timestamp - this._last_ts > gwskin.long_click_delay)) this.on_long_click();
+ else if (this.on_click) this.on_click();
+ }
+ this.down = false;
+ }
+ };
+ obj._on_over = function (value) {
+ this.over = value;
+ gw_reset_hit(this, value);
+
+ if (gwskin.pointing_device) {
+ if (this._is_icon) {
+ var app = gwskin.get_style(class_name, value ? 'over' : 'normal');
+ if (app) {
+ this._icon_root.children[0].children[0].set_style(app);
+ }
+ }
+
+ if (this._show_highlight) {
+ this._highlight.set_style(class_name, value ? 'over' : 'invisible');
+ }
+
+ if (this.on_over) this.on_over(value);
+ if (this._tooltip && gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+ }
+ };
+ Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
+ Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
+
+ obj.icons = [];
+ obj.add_icon = function (url) {
+
+ if (typeof url == 'string') {
+ var inl;
+ if (typeof gwskin.images[url] != 'undefined') {
+ inl = gw_load_resource(gwskin.images[url], this._is_icon);
+ } else {
+ inl = gw_load_resource(url, this._is_icon);
+ }
+ } else {
+ var inl = url;
+ }
+ this.icons[this.icons.length] = inl;
+
+ if (this._icon_root.children[0].children.length == 0) {
+ this._icon_root.children[0].children[0] = this.icons[0];
+ }
+ }
+ obj.switch_icon = function (idx) {
+ while (idx > this.icons.length) idx -= this.icons.length;
+ this._icon_root.children[0].children[0] = this.icons[idx];
+ }
+		
+ obj._pre_destroy = function () {
+ for (var i in this.icons) {
+ gw_unload_resource(this.icons[i]);
+ }
+ this.icons.length = 0;
+ this._highlight = null;
+ this._icons = null;
+ this._label = null;
+ Browser.deleteRoute(this._touch, 'ALL', null, null);
+ this._touch = null;
+ }
+
+ if (icon_url) obj.add_icon(icon_url);
+ obj.set_label(label);
+
+ obj.enable = function() {
+		this._touch.enabled = true;
+		this._on_over(false);
+	}
+ obj.disable = function() {
+		this._touch.enabled = false;
+		var app = gwskin.get_style(class_name, 'disable');
+		if (app) {
+			this._icon_root.children[0].children[0].set_style(app);
+		}
+	}
+
+
+ obj.on_event = function () { return false; }
+
+ if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
+ obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
+ } else {
+ obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
+ }
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+function gw_new_icon(parent, icon_name) {
+ return gw_new_icon_button(parent, gwskin.images[icon_name], gwskin.labels[icon_name], false, 'icon');
+}
+
+function gw_new_checkbox(parent, label) {
+ var touch;
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'CheckBox');
+
+ obj._icon_root = new SFNode('Transform2D');
+ obj._icon_root.children[0] = new SFNode('Layer2D');
+ obj._touch = new SFNode('TouchSensor');
+
+ var class_name = 'checkbox';
+
+ obj.children[0] = gw_new_rectangle(class_name, 'invisible');
+ obj.children[1] = obj._icon_root;
+ gw_new_text(obj, label, class_name);
+ obj.children[3] = obj._touch;
+
+ obj.set_size = function (width, height) {
+ this._icon_root.children[0].size.x = height;
+ this._icon_root.children[0].size.y = height;
+ this._icon_root.translation.x = (height - width) / 2;
+ this.children[0].set_size(width, height);
+ this.children[2].set_width(width - height);
+ this.children[2].translation.x = (height - width) / 2 + height;
+ this.width = width;
+ this.height = height;
+ };
+
+ obj.set_label = function (label) {
+ this.children[2].set_label(label);
+ }
+ obj.get_label = function () {
+ return this.children[2].get_label();
+ }
+ obj.on_check = NULL;
+ obj.down = false;
+ obj.over = false;
+ obj._checked = false;
+ obj._on_active = function (value, timestamp) {
+ if (value) {
+ this.down = true;
+ } else {
+ if (this.down && this.over) {
+ this._set_checked(!this._checked);
+ if (this.on_check) this.on_check(this._checked);
+ }
+ this.down = false;
+ }
+ };
+ obj._on_over = function (value) {
+ this.over = value;
+ gw_reset_hit(this, value);
+
+ if (gwskin.pointing_device) {
+ var app = gwskin.get_style(class_name, value ? 'over' : (this._checked ? 'down' : 'normal') );
+ if (app) {
+ this._icon_root.children[0].children[0].set_style(app);
+ }
+ if (this.on_over) this.on_over(value);
+ if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+ }
+ };
+ Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
+ Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
+
+
+ obj._set_checked = function (value) {
+ this._checked = value;
+ var app = gwskin.get_style(class_name, value ? 'down' : 'normal');
+ this._icon_root.children[0].children[0].set_style(app);
+ }
+ obj.set_checked = function (value) {
+ this._set_checked(value);
+ }
+ obj._icon_root.children[0].children[0] = gw_load_resource(gwskin.images.check, true);
+
+ obj._pre_destroy = function () {
+ for (var i in this.icons) {
+ gw_unload_resource(this.icons[i]);
+ }
+ Browser.deleteRoute(this._touch, 'ALL', null, null);
+ this._touch = null;
+ this._icon_root = null;
+ }
+ obj.set_label(label);
+
+ obj.on_event = function () { return false; }
+
+ if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
+ obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
+ } else {
+ obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
+ }
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+
+
+function gw_new_spincontrol(parent, horizontal) {
+ var touch;
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'SpinControl');
+
+ obj.value = 0;
+ if (arguments.length < 2) horizontal = false;
+ obj._horizontal = horizontal;
+ obj.on_click = function () { }
+ var tool = gw_new_icon(obj, horizontal ? 'right' : 'up');
+
+ obj.min = 0;
+ obj.max = -1;
+ tool.on_click = function () {
+ if (this.parent.min < this.parent.max) {
+ if (this.parent.value >= this.parent.max) {
+ return;
+ }
+ }
+ this.parent.value++;
+ this.parent.on_click(this.parent.value);
+ }
+ tool = gw_new_icon(obj, horizontal ? 'left' : 'down');
+ tool.on_click = function () {
+ if (this.parent.min < this.parent.max) {
+ if (this.parent.value <= this.parent.min) {
+ return;
+ }
+ }
+ this.parent.value--;
+ this.parent.on_click(this.parent.value);
+ }
+
+ obj.set_size = function (width, height) {
+ if (this._horizontal) {
+ this.children[0].set_size(width / 2, height);
+ this.children[1].set_size(width / 2, height);
+ this.children[0].translation.x = width / 4;
+ this.children[1].translation.x = -width / 4;
+ } else {
+ this.children[0].set_size(width, height / 2);
+ this.children[1].set_size(width, height / 2);
+ this.children[0].translation.y = height / 4;
+ this.children[1].translation.y = -height / 4;
+ }
+ this.width = width;
+ this.height = height;
+ };
+ obj._idx = 0;
+ obj.on_event = function (evt) {
+ if (evt.type == GF_EVENT_KEYDOWN) {
+ var idx = this._idx;
+ if (this._horizontal) {
+ if (evt.keycode == 'Left') idx--;
+ else if (evt.keycode == 'Right') idx++;
+ else return false;
+ } else {
+ if (evt.keycode == 'Up') idx--;
+ else if (evt.keycode == 'Down') idx++;
+ else return false;
+ }
+ if (idx < 0) {
+ return false;
+ }
+ if (idx > 1) {
+ return false;
+ }
+ this._idx = idx;
+ gpac.set_focus(this.children[idx]);
+ return true;
+ }
+ return false;
+ }
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+
+
+
+function gw_new_subscene(parent) {
+ var inline = new SFNode('Inline');
+ inline._name = 'Subscene';
+ inline._pre_destroy = function () {
+ this.url[0] = '';
+ this.url.length = 0;
+ }
+ inline.connect = function (url) {
+ this.url.length = 0;
+ this.url[0] = url;
+ }
+ gw_add_child(parent, inline);
+ return inline;
+}
+
+function gw_new_button(parent, text, class_name) {
+ var label;
+ if (arguments.length < 3) class_name = 'button';
+ obj = gw_new_rectangle(class_name, 'normal');
+ label = gw_new_text(obj, text, class_name);
+ gw_object_set_hitable(obj);
+ obj.on_over = function (value) {
+ if (gwskin.pointing_device) {
+ this.set_style(class_name, value ? 'over' : 'normal');
+ }
+ //if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+ }
+ obj.on_down = function (val) {
+ this.set_style(class_name, val ? 'down' : (this._over ? 'over' : 'normal'));
+ }
+
+ obj._set_size = obj.set_size;
+ obj.set_size = function (width, height) {
+ this._set_size(width, height);
+ this.children[1].set_size(width, height);
+ this.children[1].set_width(width);
+ };
+ obj.set_label = function (label) {
+ this.children[1].set_label(label);
+ }
+ obj.get_label = function () {
+ return this.children[1].get_label();
+ }
+ obj.set_labels = function () {
+ this.children[1].set_labels.apply(this.children[1], arguments);
+ }
+ obj.on_event = function (x, y) { return false; }
+
+ obj.disable = function () {
+ this._disable_touch();
+ }
+ obj.enable = function () {
+ this._enable_touch();
+ }
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+
+function gw_new_gauge(parent, text) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'ProgressBar');
+
+ if (arguments.length <= 3) class_name = 'progress';
+
+ obj.children[0] = gw_new_rectangle(class_name, 'normal');
+ obj.children[1] = gw_new_rectangle(class_name, 'over');
+ gw_new_text(obj, text, class_name);
+
+
+ obj._value = 75;
+ obj._set_size = obj.set_size;
+ obj.set_size = function (width, height) {
+ this._set_size(width, height);
+ this.children[0].set_size(width, height);
+
+ this.children[1].set_size(this._value * width / 100, height);
+ this.children[1].move((this._value - 100) * width / 200, 0);
+
+ this.children[2].set_size(width, height);
+ this.children[2].set_width(width);
+ };
+ obj.set_label = function (label) {
+ this.children[2].set_label(label);
+ }
+ obj.get_label = function () {
+ return this.children[2].get_label();
+ }
+
+ obj.set_value = function (val) {
+ this._value = (val > 100) ? 100 : ((val < 0) ? 0 : val);
+ this.set_size(this.width, this.height);
+ }
+
+ obj.on_event = function (x, y) { return false; }
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+
+
+function grid_event_navigate(dlg, children, type) {
+ var i;
+ if (dlg.current_focus == -1) {
+ if (type == 'Left') return false;
+ dlg.current_focus = 0;
+ gpac.set_focus(children[0]);
+ return true;
+ }
+
+ if (type == 'Right') {
+ var orig_focus = dlg.current_focus;
+ var switch_page = 0;
+ var tr = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
+ if (dlg.current_focus + 1 == children.length) {
+ dlg.current_focus = orig_focus;
+ gpac.set_focus(children[dlg.current_focus]);
+ return false;
+ }
+ /*goto right item*/
+ dlg.current_focus++;
+ /*check we are not going down*/
+ while (1) {
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > tr))
+ break;
+ if (dlg.current_focus + 1 == children.length) {
+ dlg.current_focus = orig_focus;
+ gpac.set_focus(children[dlg.current_focus]);
+ return false;
+ }
+ dlg.current_focus++;
+ switch_page = 1;
+ }
+ /*check we haven't move to a new page*/
+ if (children[orig_focus].translation.y + children[orig_focus].height / 2 <= children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2) {
+ switch_page = 1;
+ }
+
+ }
+ else if (type == 'Left') {
+ var orig_focus = dlg.current_focus;
+ var switch_page = 0;
+ var tr = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+ if (!dlg.current_focus) {
+ dlg.current_focus = -1;
+ gpac.set_focus(null);
+ return false;
+ }
+ /*goto left item*/
+ dlg.current_focus--;
+ /*check we are not going up*/
+ while (1) {
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < tr))
+ break;
+ if (!dlg.current_focus) {
+ dlg.current_focus = orig_focus;
+ return false;
+ }
+ dlg.current_focus--;
+ switch_page = -1;
+ }
+ /*check we haven't move to a new page*/
+ if (children[orig_focus].translation.y - children[orig_focus].height / 2 >= children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2) {
+ switch_page = -1;
+ }
+ }
+ else if (type == 'Down') {
+ var orig_focus = dlg.current_focus;
+ var switch_page = 0;
+ var bottom_y = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
+ var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+ if (dlg.current_focus + 1 == children.length) return false;
+ dlg.current_focus++;
+ /*goto next line*/
+ while (1) {
+ //next child below current
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < bottom_y))
+ break;
+ //next child above current - we need a page swicth
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y)) {
+ switch_page = 1;
+ break;
+ }
+ //not found
+ if (dlg.current_focus + 1 == children.length) {
+ dlg.current_focus = orig_focus;
+ return false;
+ }
+ dlg.current_focus++;
+ }
+ /*find closest item on the left*/
+ var tx = children[orig_focus].translation.x - children[orig_focus].width / 2;
+ while (1) {
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x + children[dlg.current_focus].width / 2 > tx))
+ break;
+ if (dlg.current_focus + 1 == children.length) break;
+ dlg.current_focus++;
+ }
+ }
+ else if (type == 'Up') {
+ var orig_focus = dlg.current_focus;
+ var switch_page = 0;
+ var bottom_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+ var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+ if (!dlg.current_focus) return false;
+ dlg.current_focus--;
+ /*goto previous line*/
+ while (1) {
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y))
+ break;
+ //next child below current - we need a page swicth
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 < bottom_y)) {
+ switch_page = -1;
+ break;
+ }
+ if (!dlg.current_focus) {
+ dlg.current_focus = orig_focus;
+ return false;
+ }
+ dlg.current_focus--;
+ }
+ /*goto above child*/
+ var tx = children[orig_focus].translation.x + children[orig_focus].width / 2;
+ while (1) {
+ if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x - children[dlg.current_focus].width / 2 < tx))
+ break;
+ if (!dlg.current_focus) {
+ dlg.current_focus = orig_focus;
+ return false;
+ }
+ dlg.current_focus--;
+ }
+ } else {
+ return false;
+ }
+ if (switch_page == 1) return dlg.on_next_page();
+ else if (switch_page == -1) return dlg.on_prev_page();
+ if (typeof children[dlg.current_focus].on_event == 'undefined') {
+ return grid_event_navigate(dlg, children, type);
+ }
+
+ gpac.set_focus(children[dlg.current_focus]);
+ return true;
+}
+
+
+
+function gw_new_grid_container(parent) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Layout');
+
+ obj.children[0] = new SFNode('Layer2D');
+ obj._container = new SFNode('Transform2D');
+ obj.children[0].children[0] = obj._container;
+ obj._all_children = [];
+ obj._pages = [];
+
+ obj.on_page_changed = null;
+
+ obj.on_prev_page = function () {
+ this._move_page(-1);
+ return true;
+ };
+ obj.on_next_page = function () {
+ this._move_page(1);
+ return true;
+ };
+
+ obj.is_first_page = function () {
+ return this._page_idx == 0 ? true : false;
+ }
+ obj.is_last_page = function () {
+ return this._page_idx == (this._pages.length - 1) ? true : false;
+ }
+ obj._page_idx = 0;
+ obj._max_page_idx = 0;
+ obj._move_page = function (value) {
+ this._page_idx += value;
+ var i, child, last_child = 0;
+
+ if (this._page_idx <= 0) {
+ this._page_idx = 0;
+ }
+
+ if (this._page_idx * this.width >= this.max_width) {
+ this._page_idx = this.max_width / this.width;
+ }
+
+ this._container.translation.x = -this._page_idx * this.width;
+ this._container.children.length = 0;
+ if (this._page_idx + 1 >= this._pages.length) {
+ last_child = this._all_children.length;
+ } else {
+ last_child = this._pages[this._page_idx + 1];
+ }
+
+ i = 0;
+ child = this._pages[this._page_idx];
+ if (this.current_focus >= 0) {
+ if (this.current_focus < child) this.current_focus = child;
+ else if (this.current_focus >= last_child) this.current_focus = last_child - 1;
+ gpac.set_focus(this._all_children[this.current_focus]);
+ }
+
+
+ while (child < last_child) {
+ this._container.children[i] = this._all_children[child];
+ child++;
+ i++;
+ }
+ if (this.on_page_changed) this.on_page_changed();
+
+ }
+
+ obj.spread_h = false;
+ obj.spread_v = false;
+ obj.break_at_hidden = false;
+ obj.break_at_line = 0;
+
+ obj.set_focus_last = function () {
+ this._page_idx = this._pages.length ? this._pages.length - 1 : 0;
+ this.current_focus = this._all_children.length;
+ this._move_page(0);
+ }
+ obj.set_focus_first = function () {
+ this._page_idx = 0;
+ this.current_focus = 0;
+ this._move_page(0);
+ }
+
+ obj.set_size = function (width, height) {
+ this.width = width;
+ this.height = height;
+ this.children[0].size.x = width;
+ this.children[0].size.y = height;
+ this.nb_visible = 0;
+ this.current_focus = -1;
+ this.layout();
+ }
+ obj.max_width = 0;
+ obj.layout = function () {
+ var spread_x, nb_wid_h, start_x, start_y, maxh, width, height, page_x, nb_on_line;
+ var children = this._all_children;
+ var width = this.width;
+ var height = this.height;
+
+ if (width <= 0) return;
+ if (height <= 0) return;
+
+ if (typeof this.on_size != 'undefined')
+ this.on_size(width, height);
+
+ var page_x = 0;
+ var maxh = 0;
+ var spread_x = -1;
+ var start_x = -width / 2;
+ var init_y = this.height / 2;
+ var start_y = init_y;
+ var nb_on_line = 0;
+
+ this._pages = [0];
+
+ for (var i = 0; i < children.length; i++) {
 
- //start of line: compute H spread and max V size
- if (spread_x == -1) {
- var j = 0, len = 0, maxh = 0, nb_child = 0, nb_spread_child = 0;
- start_x = -width / 2 + page_x;
- while (1) {
- if (!children[i + j].visible) {
- j++;
- if (i + j == children.length) break;
+ //start of line: compute H spread and max V size
+ if (spread_x == -1) {
+ var j = 0, len = 0, maxh = 0, nb_child = 0, nb_spread_child = 0;
+ start_x = -width / 2 + page_x;
+ while (1) {
+ if (!children[i + j].visible) {
+ j++;
+ if (i + j == children.length) break;
 if (this.break_at_hidden) break;
- if (typeof (children[i+j-1].__separator) == 'boolean') break;
- continue;
- }
- if (len + children[i + j].width > width) break;
- len += children[i + j].width;
- if (maxh < children[i + j].height) maxh = children[i + j].height;
- j++;
- nb_child++;
- if ((i + j < children.length) && (typeof children[i+j].stick_to_previous == 'boolean') && children[i+j].stick_to_previous) {
- } else {
- nb_spread_child++;
- }
-
- if (this.break_at_line) break;
- if (i + j == children.length) break;
+ if (typeof (children[i+j-1].__separator) == 'boolean') break;
+ continue;
+ }
+ if (len + children[i + j].width > width) break;
+ len += children[i + j].width;
+ if (maxh < children[i + j].height) maxh = children[i + j].height;
+ j++;
+ nb_child++;
+ if ((i + j < children.length) && (typeof children[i+j].stick_to_previous == 'boolean') && children[i+j].stick_to_previous) {
+ } else {
+ nb_spread_child++;
+ }
+
+ if (this.break_at_line) break;
+ if (i + j == children.length) break;
+ }
+ if (nb_child <= 1) {
+ maxh = children[i].height;
+ if (this.spread_h && !this.break_at_line) start_x = -len / 2;
+ }
+ else if (this.spread_h && nb_spread_child) {
+ spread_x = (width - len) / (nb_spread_child);
+ start_x += spread_x / 2;
+ } else {
+ spread_x = 0;
 }
- if (nb_child <= 1) {
- maxh = children[i].height;
- if (this.spread_h && !this.break_at_line) start_x = -len / 2;
- }
- else if (this.spread_h && nb_spread_child) {
- spread_x = (width - len) / (nb_spread_child);
- start_x += spread_x / 2;
- } else {
- spread_x = 0;
- }
- }
-
- if (!children[i].visible) {
- if (nb_on_line && ( this.break_at_hidden || (typeof (children[i].__separator) == 'boolean')) ) {
-
- nb_on_line = 0;
- spread_x = -1;
- start_y -= maxh / 2;
+ }
+
+ if (!children[i].visible) {
+ if (nb_on_line && ( this.break_at_hidden || (typeof (children[i].__separator) == 'boolean')) ) {
+
+ nb_on_line = 0;
+ spread_x = -1;
+ start_y -= maxh / 2;
 start_x = -width / 2;
- }
- continue;
- }
- if (start_y - maxh < -height / 2) {
- //push new page only if not empty! (otherwise we've been asked to layout in a too small grid ...)
- if (!this._pages.length || this._pages[this._pages.length - 1] < i) {
- nb_on_line = 0;
- page_x += width;
- spread_x = -1;
- start_y = init_y;
- this._pages.push(i);
- i--;
- continue;
- }
- }
- children[i].translation.x = start_x + children[i].width / 2;
- children[i].translation.y = start_y - maxh / 2;
-
- if ((i + 1 < children.length) && (typeof children[i + 1].stick_to_previous == 'boolean') && children[i+1].stick_to_previous) {
- start_x += children[i].width;
- } else {
- start_x += children[i].width + spread_x;
- }
-
- nb_on_line++;
-
- if (i + 1 == children.length) {
- break;
- }
- if ((nb_on_line == nb_child) || (start_x - page_x + children[i + 1].width > width / 2)) {
- nb_on_line = 0;
- spread_x = -1;
- start_y -= maxh;
- start_x = -width / 2;
- }
- }
- this.max_width = page_x;
- this._move_page(0);
- }
-
- obj.add_child = function (child) {
- this._all_children.push(child);
- }
- obj.remove_child = function (child) {
- var index = this._all_children.indexOf(child);
- if (index > -1) this._all_children.splice(index, 1);
- }
-
- obj.get_children = function () {
- return this._all_children;
- }
+ }
+ continue;
+ }
+ if (start_y - maxh < -height / 2) {
+ //push new page only if not empty! (otherwise we've been asked to layout in a too small grid ...)
+ if (!this._pages.length || this._pages[this._pages.length - 1] < i) {
+ nb_on_line = 0;
+ page_x += width;
+ spread_x = -1;
+ start_y = init_y;
+ this._pages.push(i);
+ i--;
+ continue;
+ }
+ }
+ children[i].translation.x = start_x + children[i].width / 2;
+ children[i].translation.y = start_y - maxh / 2;
+
+ if ((i + 1 < children.length) && (typeof children[i + 1].stick_to_previous == 'boolean') && children[i+1].stick_to_previous) {
+ start_x += children[i].width;
+ } else {
+ start_x += children[i].width + spread_x;
+ }
+
+ nb_on_line++;
+
+ if (i + 1 == children.length) {
+ break;
+ }
+ if ((nb_on_line == nb_child) || (start_x - page_x + children[i + 1].width > width / 2)) {
+ nb_on_line = 0;
+ spread_x = -1;
+ start_y -= maxh;
+ start_x = -width / 2;
+ }
+ }
+ this.max_width = page_x;
+ this._move_page(0);
+ }
+
+ obj.add_child = function (child) {
+ this._all_children.push(child);
+ }
+ obj.remove_child = function (child) {
+ var index = this._all_children.indexOf(child);
+ if (index > -1) this._all_children.splice(index, 1);
+ }
+
+ obj.get_children = function () {
+ return this._all_children;
+ }
 obj.reset_children = function () {
 gw_close_child_list(this._all_children);
 this._all_children.length = 0;
@@ -2389,574 +2593,579 @@
 this._page_idx = 0;
 this._max_page_idx = 0;
 }
-
-
- obj.on_event = function (evt) {
- switch (evt.type) {
- case GF_EVENT_MOUSEWHEEL:
-		var inc = -evt.wheel;
- if (this._pages.length <= 1) return 0;
- if ((inc < 0) && (this._page_idx == 0)) return 0;
- if ((inc > 0) && (this._page_idx >= this._pages.length - 1)) return 0;
- this._move_page((inc < 0) ? -1 : 1);
- return 1;
- case GF_EVENT_KEYDOWN:
- if ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')) {
-
- if ((this.current_focus >= 0) && typeof this._all_children[this.current_focus].on_event != 'undefined') {
- var res = this._all_children[this.current_focus].on_event(evt);
- if (res) return res;
- }
-
- return grid_event_navigate(this, this._all_children, evt.keycode);
- }
- if ((evt.keycode == 'PageUp') && (this._page_idx > 0)) {
- return this.on_prev_page();
- }
- if ((evt.keycode == 'PageDown') && (this._page_idx < this._pages.length)) {
- return this.on_next_page();
- }
- return 0;
- }
- return 0;
- }
-
- obj._pre_destroy = function () {
- this.reset_children();
- this._container = null;
- this._all_children.length = 0;
- }
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-function gw_new_separator(parent) {
- var obj = gw_new_container();
+
+
+ obj.on_event = function (evt) {
+ switch (evt.type) {
+ case GF_EVENT_MOUSEWHEEL:
+		var inc = -evt.wheel;
+ if (this._pages.length <= 1) return 0;
+ if ((inc < 0) && (this._page_idx == 0)) return 0;
+ if ((inc > 0) && (this._page_idx >= this._pages.length - 1)) return 0;
+ this._move_page((inc < 0) ? -1 : 1);
+ return 1;
+ case GF_EVENT_KEYDOWN:
+ if ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')) {
+
+ if ((this.current_focus >= 0) && typeof this._all_children[this.current_focus].on_event != 'undefined') {
+ var res = this._all_children[this.current_focus].on_event(evt);
+ if (res) return res;
+ }
+
+ return grid_event_navigate(this, this._all_children, evt.keycode);
+ }
+ if ((evt.keycode == 'PageUp') && (this._page_idx > 0)) {
+ if (this._pages.length <= 1) return 0;
+ return this.on_prev_page();
+ }
+ if ((evt.keycode == 'PageDown') && (this._page_idx < this._pages.length)) {
+ if (this._pages.length <= 1) return 0;
+ return this.on_next_page();
+ }
+ return 0;
+ }
+ return 0;
+ }
+
+ obj._pre_destroy = function () {
+ this.reset_children();
+ this._container = null;
+ this._all_children.length = 0;
+ }
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+function gw_new_separator(parent) {
+ var obj = gw_new_container();
 obj.hide();
 obj.show = function() {};
 obj.__separator = true;
- gw_add_child(parent, obj);
- return obj;
-}
-
-function gw_new_progress_bar(parent, vertical, with_progress, class_name) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'ProgressBar');
- var ps2d;
-
- if (arguments.length <= 3) class_name = 'progress';
- if (arguments.length <= 2) with_progress = false;
- if (arguments.length <= 1) vertical = false;
-
- obj.children[0] = gw_new_rectangle(class_name, 'normal');
-
- if (with_progress) {
- obj.children[1] = gw_new_rectangle(class_name, 'down');
- if (vertical) {
- obj.children[1].set_corners(true, false, false, true);
- } else {
- obj.children[1].set_corners(true, false, false, true);
- }
- obj.set_progress = function (prog) {
- if (prog < 0) prog = 0;
- else if (prog > 100) prog = 100;
- this.prog = prog;
- prog /= 100;
- if (this.vertical) {
- var pheight = prog * this.height;
- this.children[1].set_size(this.width, pheight);
- this.children[1].move(0, (this.height - pheight) / 2, 0);
- } else {
- var pwidth = prog * this.width;
- this.children[1].set_size(pwidth, this.height);
- this.children[1].move((pwidth - this.width) / 2, 0);
- }
- }
- } else {
- obj.set_progress = function (prog) { }
- }
- obj.slide_idx = obj.children.length;
- obj.children[obj.slide_idx] = gw_new_rectangle(class_name, 'over');
- if (vertical) {
- obj.children[obj.slide_idx].set_corners(true, false, false, true);
- } else {
- obj.children[obj.slide_idx].set_corners(true, false, false, true);
- }
- obj.children[obj.slide_idx + 1] = gw_new_rectangle(class_name, 'invisible');
- ps2d = new SFNode('PlaneSensor2D');
- obj.children[obj.slide_idx + 1].children[1] = ps2d;
- ps2d.maxPosition.x = -1;
- ps2d.maxPosition.y = -1;
-
- obj.on_slide = function (value, type) { }
-
- obj._with_progress = with_progress;
- obj._sliding = false;
- obj._slide_active = function (val) {
- obj._sliding = val;
- this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
- }
- Browser.addRoute(ps2d, 'isActive', obj, obj._slide_active);
-
- obj._set_trackpoint = function (value) {
- if (this.vertical) {
- this.frac = value.y / this.height;
- } else {
- this.frac = value.x / this.width;
- }
- this.frac += 0.5;
- if (this.frac > 1) this.frac = 1;
- else if (this.frac < 0) this.frac = 0;
-
- this._set_frac();
- this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
- }
- Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj._set_trackpoint);
-
- obj._set_frac = function () {
- if (this.vertical) {
- var pheight = this.frac * this.height;
- if (pheight < this.width) pheight = this.width;
- this.children[this.slide_idx].set_size(this.width, pheight);
- this.children[this.slide_idx].move(0, (this.height - pheight) / 2, 0);
- } else {
- var pwidth = this.frac * this.width;
- if (pwidth < this.height) pwidth = this.height;
- this.children[this.slide_idx].set_size(pwidth, this.height);
- this.children[this.slide_idx].move((pwidth - this.width) / 2, 0);
- }
- }
-
- obj.set_value = function (value) {
- if (this._sliding) return;
-
- value -= this.min;
- if (value < 0) value = 0;
- else if (value > this.max - this.min) value = this.max - this.min;
- if (this.max == this.min) value = 0;
- else value /= (this.max - this.min);
-
- this.frac = value;
- this._set_frac();
- }
-
-
- obj.vertical = vertical;
- obj.set_size = function (w, h) {
- this.width = w;
- this.height = h;
- this.children[0].set_size(w, h);
- if (this._with_progress) {
- this.children[3].set_size(w, h);
- } else {
- this.children[2].set_size(w, h);
- }
- this._set_frac();
- this.set_progress(this.prog);
- }
- obj.min = 0;
- obj.max = 100;
-
- obj.move = function (x, y) {
- this.translation.x = x;
- this.translation.y = y;
- }
- obj.on_event = function (x, y) { return false; }
-
- obj.prog = 0;
- obj.frac = 0;
- obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10);
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-function gw_new_slider(parent, vertical, class_name) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Slider');
-
- if (arguments.length <= 2) class_name = 'progress';
- if (arguments.length <= 1) vertical = false;
-
- obj.children[0] = gw_new_rectangle(class_name, 'normal');
- obj.children[1] = gw_new_rectangle(class_name, 'over');
- obj.children[2] = gw_new_rectangle(class_name, 'invisible');
-
- var ps2d = new SFNode('PlaneSensor2D');
- obj.children[2].children[1] = ps2d;
- ps2d.maxPosition.x = -1;
- ps2d.maxPosition.y = -1;
- obj.on_slide = function (value, type) { }
- 
- obj.slide_active = function (val) {
- this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
- }
- Browser.addRoute(ps2d, 'isActive', obj, obj.slide_active);
- obj.set_trackpoint = function (value) {
- if (vertical) {
- if (this.height == this.children[1].height) return;
- this.frac = value.y / (this.height - this.children[1].height);
- } else {
- if (this.width == this.children[1].width) return;
-
- this.frac = value.x / (this.width - this.children[1].width);
- }
- this.frac += 0.5;
- if (this.frac > 1) this.frac = 1;
- else if (this.frac < 0) this.frac = 0;
- if (vertical) {
- value.y = (this.frac - 0.5) * (this.height - this.children[1].height);
- value.x = 0;
- } else {
- value.x = (this.frac - 0.5) * (this.width - this.children[1].width);
- value.y = 0;
- }
- this.children[1].translation = value;
- this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
- }
- Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj.set_trackpoint);
-
- obj.set_value = function (value) {
- if (this.children[2].isActive) return;
-
- value -= this.min;
- if (value < 0) value = 0;
- else if (value > this.max - this.min) value = this.max - this.min;
- if (this.max == this.min) value = 0;
- else value /= (this.max - this.min);
-
- this.frac = value;
-
- value -= 0.5;
- value *= (vertical ? this.height : this.width);
-
- if (vertical) {
- this.children[1].translation.y = value;
- } else {
- this.children[1].translation.x = value;
- }
- }
- obj.vertical = vertical;
- obj.set_size = function (w, h, cursor_w, cursor_h) {
- if (this.height && this.width) {
- if (this.vertical) {
- this.children[1].translation.y *= h;
- this.children[1].translation.y /= this.height;
- } else {
- this.children[1].translation.x *= w;
- this.children[1].translation.x /= this.width;
- }
- }
-
- this.width = w;
- this.height = h;
- this.children[0].set_size(w, h);
-
- if (typeof (cursor_w) == 'undefined') cursor_w = this.children[1].width;
- if (typeof (cursor_h) == 'undefined') cursor_h = this.children[1].height;
- this.children[1].set_size(cursor_w, cursor_h);
-
- if (this.vertical) {
- this.children[2].set_size(this.children[1].width, h);
- } else {
- this.children[2].set_size(w, this.children[1].height);
- }
- }
- obj.set_cursor_size = function (w, h) {
- this.children[1].set_size(w, h);
- }
- obj.min = 0;
- obj.max = 100;
- obj.frac = 0.0;
- obj.height = 0;
- obj.width = 0;
- obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10, 10, 10);
-
- obj.set_trackpoint(0);
-
- obj.move = function (x, y) {
- this.translation.x = x;
- this.translation.y = y;
- }
- obj.on_event = function (x, y) { return false; }
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-
-function gw_new_text_edit(parent, text_data) {
- var obj = new SFNode('Transform2D');
- var rect, edit;
- setup_gw_object(obj, 'TextEdit');
- rect = gw_new_rectangle('edit');
- gw_add_child(obj, rect);
- gw_object_set_hitable(rect);
- rect.on_down = function (val) {
- if (val) gpac.set_focus(this.parent.children[1]);
- }
-
- edit = gw_new_text(obj, text_data, 'edit')
- // gw_add_child(obj, edit);
- obj.on_text = null;
- obj._text_edited = function (val) {
- if (this.on_text) this.on_text(val[0]);
- };
- Browser.addRoute(obj.children[1].children[0].children[0].geometry, 'string', obj, obj._text_edited);
-
- obj.set_size = function (w, h) {
- this.width = w;
- this.height = h;
- this.children[0].set_size(w, h);
- this.children[1].move(5 - w / 2, 0);
- };
- obj.on_event = function (x, y) { return false; }
-
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-function gw_new_text_area(parent, text_data) {
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'TextArea');
-
- obj.children[0] = new SFNode('Layout');
- obj.children[0].parent = obj;
- obj.children[0].wrap = true;
- obj.children[0].spacing = 1.1;
- obj.children[0].justify[0] = "JUSTIFY";
- obj.children[0].justify[1] = "FIRST";
-
- gw_new_text(obj.children[0], text_data, 'text');
- obj.set_size = function (width, height) {
- this.children[0].size.x = width;
- this.children[0].size.y = height;
- this.width = width;
- this.height = height;
- }
- obj.set_content = function (text) {
- this.children[0].children[0].set_label(text);
- }
-
- obj.on_event = function (x, y) { return false; }
-
- gw_add_child(parent, obj);
- return obj;
-}
-
-
-
-function gw_new_scrolltext_area(parent, text_data) {
- var obj = gw_new_text_area(parent, text_data);
- /*erase the resize routine*/
- obj._orig_set_size = obj.set_size;
- obj.set_size = function (width, height) {
- var bounds = this._bounds;
- this.width = width;
- this.height = Math.ceil(bounds.height);
- this._orig_set_size(width, height);
- }
-
- obj.set_content = function (text) {
- this.set_label(text);
- }
- return obj;
-}
-
-function gw_new_window_full(parent, offscreen, the_label, child_to_insert) {
- var wnd = gw_new_window(parent, offscreen, true);
-
- if (arguments.length <= 3) child_to_insert = null;
- if (child_to_insert) {
- gw_add_child(wnd, child_to_insert);
- }
-
- wnd.area = null;
-
- wnd.tools = gw_new_grid_container(wnd);
- wnd.tools._name = 'ToolBar';
- wnd._has_extra_tools = false;
-
- wnd.label = null;
- if (the_label) {
- wnd.label = gw_new_text(wnd.tools, the_label, 'window');
- wnd.label._name = 'Label';
- }
-
- wnd.set_label = function (label) {
- if (wnd.label) wnd.label.set_label(label);
- }
-
-
- wnd.add_tool = function (icon, name) {
- var tool;
- if (typeof gwskin.images[icon] != 'undefined') {
- tool = gw_new_icon(this.tools, icon);
- } else {
- tool = gw_new_icon_button(this.tools, icon, name, false, 'icon');
- }
- if (this.label) {
- this.tools.remove_child(this.label);
- this.tools.add_child(this.label);
- }
- tool.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
- tool._name = name;
- tool.dlg = this;
- this._has_extra_tools = true;
- return tool;
- }
-
-
- var icon = wnd.add_tool('close');
- icon.on_click = function () {
- this.dlg.close();
- }
- wnd._has_extra_tools = false;
-
- wnd._pre_destroy = function () {
- if (typeof this.predestroy != 'undefined') this.predestroy();
- this.tools = null;
- this.label = null;
- this.area = null;
- this._wnd_close();
- }
-
- wnd.on_size = null;
- wnd.layout = function (width, height) {
- var i;
- var tools = this.tools.get_children();
- var tool_size = gwskin.default_icon_height;
-
- if (this.on_size) this.on_size(width, height - tool_size);
-
- if (this.area) {
- this.area.set_size(width, height - tool_size);
- this.area.move(0, (this.area.height - height) / 2);
- }
- for (i = 0; i < tools.length; i++) {
- tools[i].set_size(tool_size, tool_size);
- }
-
- if (this.label) {
- var textw = width;
- for (i = 0; i < tools.length; i++) {
- if ((tools[i] != this.label) && tools[i].visible)
- textw -= tools[i].width;
- }
- textw -= tool_size;
- if (textw < 0) textw = 0;
- this.label.set_size(textw, tool_size);
- this.label.set_width(textw);
- }
-
- this.tools.move(0, (height - tool_size) / 2);
- this.tools.set_size(width, tool_size);
- }
-
- wnd.on_event = function (evt) {
- if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.close)) {
- this.close();
- return 1;
- }
- if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.validate)) {
-			if (typeof this.on_validate == 'function') {
-				this.on_validate();
-				return 1;
-			}
-			return 0;
- }
- if (!this._has_extra_tools) {
- if (this.area) return this.area.on_event(evt);
- return false;
- }
-
- if (!this.area) {
- return this.tools.on_event(evt);
- }
-
- var is_left_or_right = (evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Left') || (evt.keycode == 'Right')) ? 1 : 0;
- if (this._focus_is_tools) {
- if (this.tools.on_event(evt)) return 1;
- if (this.area.on_event(evt)) {
- //focus no longer on toolbar but on main content (means this is 'right'), switch order 
- if (is_left_or_right) {
- this._focus_is_tools = false;
- }
- return 1;
- }
- } else {
- if (this.area.on_event(evt)) return 1;
- if (this.tools.on_event(evt)) {
- //focus no longer on main but on toolbar content (means this is 'left'), switch order 
- if (is_left_or_right) {
- this._focus_is_tools = true;
- }
- return 1;
- }
- }
- return 0;
- }
- wnd._focus_is_tools = true;
- return wnd;
-}
-
-function gw_new_message(container, label, content) {
- var notif = gw_new_window_full(container, true, label);
- notif.area = gw_new_text_area(notif, content);
- notif.on_size = function (width, height) {
- this.area.set_size(width - 10, height);
- }
- notif.set_size(0.8 * gw_display_width, 120);
-
- notif.timer = gw_new_timer(false);
- notif.timer.wnd = notif;
- notif.timer.set_timeout(gwskin.default_message_timeout, false);
- notif.timer.start(0);
- notif.timer.on_active = function (val) {
- if (!val) this.wnd.close();
- }
- return notif;
-}
-
-function gw_new_confirm_wnd(container, label, confirm_yes, confirm_no) {
- if (arguments.length < 4) confirm_no = 'no';
- if (arguments.length < 3) confirm_yes = 'yes';
-
- var notif = gw_new_window_full(container, true, label);
- notif.area = gw_new_grid_container(notif);
- notif.area.spread_h = true;
- 
- notif.on_confirm = null;
- notif.btn_yes = gw_new_button(notif.area, confirm_yes);
- notif.btn_yes.dlg = notif;
- notif.btn_yes.on_click = function () {
- if (this.dlg.on_confirm) this.dlg.on_confirm(true);
- this.dlg.close();
- }
-
- notif.btn_no = gw_new_button(notif.area, confirm_no);
- notif.btn_no.dlg = notif;
- notif.btn_no.on_click = function () {
- if (this.dlg.on_confirm) this.dlg.on_confirm(false);
- this.dlg.close();
- }
- notif.on_close = function () {
- if (this.on_confirm) this.on_confirm(false);
- }
-
- notif.on_display_size = function (width, height) {
- var w = 0.9*width;
- if (w>500) w=500;
- this.btn_yes.set_size(w / 3, gwskin.default_control_height);
- this.btn_no.set_size(w / 3, gwskin.default_control_height);
- this.set_size(w, 2 * gwskin.default_control_height);
- }
- notif.on_display_size(gw_display_width, gw_display_height);
- return notif;
-}
-
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+function gw_new_progress_bar(parent, vertical, with_progress, class_name) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'ProgressBar');
+ var ps2d;
+
+ if (arguments.length <= 3) class_name = 'progress';
+ if (arguments.length <= 2) with_progress = false;
+ if (arguments.length <= 1) vertical = false;
+
+ obj.children[0] = gw_new_rectangle(class_name, 'normal');
+
+ if (with_progress) {
+ obj.children[1] = gw_new_rectangle(class_name, 'down');
+ if (vertical) {
+ obj.children[1].set_corners(true, false, false, true);
+ } else {
+ obj.children[1].set_corners(true, false, false, true);
+ }
+ obj.set_progress = function (prog) {
+ if (prog < 0) prog = 0;
+ else if (prog > 100) prog = 100;
+ this.prog = prog;
+ prog /= 100;
+ if (this.vertical) {
+ var pheight = prog * this.height;
+ this.children[1].set_size(this.width, pheight);
+ this.children[1].move(0, (this.height - pheight) / 2, 0);
+ } else {
+ var pwidth = prog * this.width;
+ this.children[1].set_size(pwidth, this.height);
+ this.children[1].move((pwidth - this.width) / 2, 0);
+ }
+ }
+ } else {
+ obj.set_progress = function (prog) { }
+ }
+ obj.slide_idx = obj.children.length;
+ obj.children[obj.slide_idx] = gw_new_rectangle(class_name, 'over');
+ if (vertical) {
+ obj.children[obj.slide_idx].set_corners(true, false, false, true);
+ } else {
+ obj.children[obj.slide_idx].set_corners(true, false, false, true);
+ }
+ obj.children[obj.slide_idx + 1] = gw_new_rectangle(class_name, 'invisible');
+ ps2d = new SFNode('PlaneSensor2D');
+ obj.children[obj.slide_idx + 1].children[1] = ps2d;
+ ps2d.maxPosition.x = -1;
+ ps2d.maxPosition.y = -1;
+
+ obj.on_slide = function (value, type) { }
+
+ obj._with_progress = with_progress;
+ obj._sliding = false;
+ obj._slide_active = function (val) {
+ obj._sliding = val;
+ this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
+ }
+ Browser.addRoute(ps2d, 'isActive', obj, obj._slide_active);
+
+ obj._set_trackpoint = function (value) {
+ if (this.vertical) {
+ this.frac = value.y / this.height;
+ } else {
+ this.frac = value.x / this.width;
+ }
+ this.frac += 0.5;
+ if (this.frac > 1) this.frac = 1;
+ else if (this.frac < 0) this.frac = 0;
+
+ this._set_frac();
+ this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
+ }
+ Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj._set_trackpoint);
+
+ obj._set_frac = function () {
+ if (this.vertical) {
+ var pheight = this.frac * this.height;
+ if (pheight < this.width) pheight = this.width;
+ this.children[this.slide_idx].set_size(this.width, pheight);
+ this.children[this.slide_idx].move(0, (this.height - pheight) / 2, 0);
+ } else {
+ var pwidth = this.frac * this.width;
+ if (pwidth < this.height) pwidth = this.height;
+ this.children[this.slide_idx].set_size(pwidth, this.height);
+ this.children[this.slide_idx].move((pwidth - this.width) / 2, 0);
+ }
+ }
+
+ obj.set_value = function (value) {
+ if (this._sliding) return;
+
+ value -= this.min;
+ if (value < 0) value = 0;
+ else if (value > this.max - this.min) value = this.max - this.min;
+ if (this.max == this.min) value = 0;
+ else value /= (this.max - this.min);
+
+ this.frac = value;
+ this._set_frac();
+ }
+
+
+ obj.vertical = vertical;
+ obj.set_size = function (w, h) {
+ this.width = w;
+ this.height = h;
+ this.children[0].set_size(w, h);
+ if (this._with_progress) {
+ this.children[3].set_size(w, h);
+ } else {
+ this.children[2].set_size(w, h);
+ }
+ this._set_frac();
+ this.set_progress(this.prog);
+ }
+ obj.min = 0;
+ obj.max = 100;
+
+ obj.move = function (x, y) {
+ this.translation.x = x;
+ this.translation.y = y;
+ }
+ obj.on_event = function (x, y) { return false; }
+
+ obj.prog = 0;
+ obj.frac = 0;
+ obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10);
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+function gw_new_slider(parent, vertical, class_name) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Slider');
+
+ if (arguments.length <= 2) class_name = 'progress';
+ if (arguments.length <= 1) vertical = false;
+
+ obj.children[0] = gw_new_rectangle(class_name, 'normal');
+ obj.children[1] = gw_new_rectangle(class_name, 'over');
+ obj.children[2] = gw_new_rectangle(class_name, 'invisible');
+
+ var ps2d = new SFNode('PlaneSensor2D');
+ obj.children[2].children[1] = ps2d;
+ ps2d.maxPosition.x = -1;
+ ps2d.maxPosition.y = -1;
+ obj.on_slide = function (value, type) { }
+ 
+ obj.slide_active = function (val) {
+ this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
+ }
+ Browser.addRoute(ps2d, 'isActive', obj, obj.slide_active);
+ obj.set_trackpoint = function (value) {
+ if (vertical) {
+ if (this.height == this.children[1].height) return;
+ this.frac = value.y / (this.height - this.children[1].height);
+ } else {
+ if (this.width == this.children[1].width) return;
+
+ this.frac = value.x / (this.width - this.children[1].width);
+ }
+ this.frac += 0.5;
+ if (this.frac > 1) this.frac = 1;
+ else if (this.frac < 0) this.frac = 0;
+ if (vertical) {
+ value.y = (this.frac - 0.5) * (this.height - this.children[1].height);
+ value.x = 0;
+ } else {
+ value.x = (this.frac - 0.5) * (this.width - this.children[1].width);
+ value.y = 0;
+ }
+ this.children[1].translation = value;
+ this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
+ }
+ Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj.set_trackpoint);
+
+ obj.set_value = function (value) {
+ if (this.children[2].isActive) return;
+
+ value -= this.min;
+ if (value < 0) value = 0;
+ else if (value > this.max - this.min) value = this.max - this.min;
+ if (this.max == this.min) value = 0;
+ else value /= (this.max - this.min);
+
+ this.frac = value;
+
+ value -= 0.5;
+ value *= (vertical ? this.height : this.width);
+
+ if (vertical) {
+ this.children[1].translation.y = value;
+ } else {
+ this.children[1].translation.x = value;
+ }
+ }
+ obj.vertical = vertical;
+ obj.set_size = function (w, h, cursor_w, cursor_h) {
+ if (this.height && this.width) {
+ if (this.vertical) {
+ this.children[1].translation.y *= h;
+ this.children[1].translation.y /= this.height;
+ } else {
+ this.children[1].translation.x *= w;
+ this.children[1].translation.x /= this.width;
+ }
+ }
+
+ this.width = w;
+ this.height = h;
+ this.children[0].set_size(w, h);
+
+ if (typeof (cursor_w) == 'undefined') cursor_w = this.children[1].width;
+ if (typeof (cursor_h) == 'undefined') cursor_h = this.children[1].height;
+ this.children[1].set_size(cursor_w, cursor_h);
+
+ if (this.vertical) {
+ this.children[2].set_size(this.children[1].width, h);
+ } else {
+ this.children[2].set_size(w, this.children[1].height);
+ }
+ }
+ obj.set_cursor_size = function (w, h) {
+ this.children[1].set_size(w, h);
+ }
+ obj.min = 0;
+ obj.max = 100;
+ obj.frac = 0.0;
+ obj.height = 0;
+ obj.width = 0;
+ obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10, 10, 10);
+
+ obj.set_trackpoint(0);
+
+ obj.move = function (x, y) {
+ this.translation.x = x;
+ this.translation.y = y;
+ }
+ obj.on_event = function (x, y) { return false; }
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+
+function gw_new_text_edit(parent, text_data) {
+ var obj = new SFNode('Transform2D');
+ var rect, edit;
+ setup_gw_object(obj, 'TextEdit');
+ rect = gw_new_rectangle('edit');
+ gw_add_child(obj, rect);
+ gw_object_set_hitable(rect);
+ rect.on_down = function (val) {
+ if (val) gpac.set_focus(this.parent.children[1]);
+ }
+
+ edit = gw_new_text(obj, text_data, 'edit')
+ // gw_add_child(obj, edit);
+ obj.on_text = null;
+ obj._text_edited = function (val) {
+ if (this.on_text) this.on_text(val[0]);
+ };
+ Browser.addRoute(obj.children[1].children[0].children[0].geometry, 'string', obj, obj._text_edited);
+
+ obj.set_size = function (w, h) {
+ this.width = w;
+ this.height = h;
+ this.children[0].set_size(w, h);
+ this.children[1].move(5 - w / 2, 0);
+ };
+ obj.on_event = function (x, y) { return false; }
+
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+function gw_new_text_area(parent, text_data, class_name) {
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'TextArea');
+
+ obj.children[0] = new SFNode('Layout');
+ obj.children[0].parent = obj;
+ obj.children[0].wrap = true;
+ obj.children[0].spacing = 1.1;
+ obj.children[0].justify[0] = "JUSTIFY";
+ obj.children[0].justify[1] = "FIRST";
+
+	if (arguments.length==2) class_name = 'text';
+ gw_new_text(obj.children[0], text_data, class_name);
+ obj.set_size = function (width, height) {
+ this.children[0].size.x = width;
+ this.children[0].size.y = height;
+ this.width = width;
+ this.height = height;
+ }
+ obj.set_content = function (text) {
+ this.children[0].children[0].set_label(text);
+ }
+
+ obj.on_event = function (x, y) { return false; }
+
+ gw_add_child(parent, obj);
+ return obj;
+}
+
+
+
+function gw_new_scrolltext_area(parent, text_data) {
+ var obj = gw_new_text_area(parent, text_data);
+ /*erase the resize routine*/
+ obj._orig_set_size = obj.set_size;
+ obj.set_size = function (width, height) {
+ var bounds = this._bounds;
+ this.width = width;
+ this.height = Math.ceil(bounds.height);
+ this._orig_set_size(width, height);
+ }
+
+ obj.set_content = function (text) {
+ this.set_label(text);
+ }
+ return obj;
+}
+
+function gw_new_window_full(parent, offscreen, the_label, child_to_insert) {
+ var wnd = gw_new_window(parent, offscreen, true);
+
+ if (arguments.length <= 3) child_to_insert = null;
+ if (child_to_insert) {
+ gw_add_child(wnd, child_to_insert);
+ }
+
+ wnd.area = null;
+
+ wnd.tools = gw_new_grid_container(wnd);
+ wnd.tools._name = 'ToolBar';
+ wnd._has_extra_tools = false;
+
+ wnd.label = null;
+ if (the_label) {
+ wnd.label = gw_new_text(wnd.tools, the_label, 'window');
+ wnd.label._name = 'Label';
+ }
+
+ wnd.set_label = function (label) {
+ if (wnd.label) wnd.label.set_label(label);
+ }
+
+
+ wnd.add_tool = function (icon, name) {
+ var tool;
+ if (typeof gwskin.images[icon] != 'undefined') {
+ tool = gw_new_icon(this.tools, icon);
+ } else {
+ tool = gw_new_icon_button(this.tools, icon, name, false, 'icon');
+ }
+ if (this.label) {
+ this.tools.remove_child(this.label);
+ this.tools.add_child(this.label);
+ }
+ tool.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+ tool._name = name;
+ tool.dlg = this;
+ this._has_extra_tools = true;
+ return tool;
+ }
+
+
+ var icon = wnd.add_tool('close');
+ icon.on_click = function () {
+ this.dlg.close();
+ }
+ wnd._has_extra_tools = false;
+
+ wnd._pre_destroy = function () {
+ if (typeof this.predestroy != 'undefined') this.predestroy();
+ this.tools = null;
+ this.label = null;
+ this.area = null;
+ this._wnd_close();
+ }
+
+ wnd.on_size = null;
+ wnd.layout = function (width, height) {
+ var i;
+ var tools = this.tools.get_children();
+ var tool_size = gwskin.default_icon_height;
+
+ if (this.on_size) this.on_size(width, height - tool_size);
+
+ if (this.area) {
+ this.area.set_size(width, height - tool_size);
+ this.area.move(0, (this.area.height - height) / 2);
+ }
+ for (i = 0; i < tools.length; i++) {
+ tools[i].set_size(tool_size, tool_size);
+ }
+
+ if (this.label) {
+ var textw = width;
+ for (i = 0; i < tools.length; i++) {
+ if ((tools[i] != this.label) && tools[i].visible)
+ textw -= tools[i].width;
+ }
+ textw -= tool_size;
+ if (textw < 0) textw = 0;
+ this.label.set_size(textw, tool_size);
+ this.label.set_width(textw);
+ }
+
+ this.tools.move(0, (height - tool_size) / 2);
+ this.tools.set_size(width, tool_size);
+ }
+
+ wnd.on_event = function (evt) {
+ if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.close)) {
+ this.close();
+ return 1;
+ }
+ if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.validate)) {
+			if (typeof this.on_validate == 'function') {
+				this.on_validate();
+				return 1;
+			}
+			return 0;
+ }
+ if (!this._has_extra_tools) {
+ if (this.area) return this.area.on_event(evt);
+ return false;
+ }
+
+ if (!this.area) {
+ return this.tools.on_event(evt);
+ }
+
+ var is_left_or_right = (evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Left') || (evt.keycode == 'Right')) ? 1 : 0;
+ if (this._focus_is_tools) {
+ if (this.tools.on_event(evt)) return 1;
+ if (this.area.on_event(evt)) {
+ //focus no longer on toolbar but on main content (means this is 'right'), switch order 
+ if (is_left_or_right) {
+ this._focus_is_tools = false;
+ }
+ return 1;
+ }
+ } else {
+ if (this.area.on_event(evt)) return 1;
+ if (this.tools.on_event(evt)) {
+ //focus no longer on main but on toolbar content (means this is 'left'), switch order 
+ if (is_left_or_right) {
+ this._focus_is_tools = true;
+ }
+ return 1;
+ }
+ }
+ return 0;
+ }
+ wnd._focus_is_tools = true;
+ return wnd;
+}
+
+function gw_new_message(container, label, content) {
+ var notif = gw_new_window_full(container, true, label);
+ notif.area = gw_new_text_area(notif, content);
+ notif.on_size = function (width, height) {
+ this.area.set_size(width - 10, height);
+ }
+ notif.set_size(0.8 * gw_display_width, 120);
+
+ notif.timer = gw_new_timer(false);
+ notif.timer.wnd = notif;
+ notif.timer.set_timeout(gwskin.default_message_timeout, false);
+ notif.timer.start(0);
+ notif.timer.on_active = function (val) {
+ if (!val) this.wnd.close();
+ }
+ notif.show_effect = 'notif';
+ notif._no_focus = true;
+ return notif;
+}
+
+function gw_new_confirm_wnd(container, label, confirm_yes, confirm_no) {
+ if (arguments.length < 4) confirm_no = 'no';
+ if (arguments.length < 3) confirm_yes = 'yes';
+
+ var notif = gw_new_window_full(container, true, label);
+ notif.area = gw_new_grid_container(notif);
+ notif.area.spread_h = true;
+ 
+ notif.on_confirm = null;
+ notif.btn_yes = gw_new_button(notif.area, confirm_yes);
+ notif.btn_yes.dlg = notif;
+ notif.btn_yes.on_click = function () {
+ if (this.dlg.on_confirm) this.dlg.on_confirm(true);
+ this.dlg.close();
+ }
+
+ notif.btn_no = gw_new_button(notif.area, confirm_no);
+ notif.btn_no.dlg = notif;
+ notif.btn_no.on_click = function () {
+ if (this.dlg.on_confirm) this.dlg.on_confirm(false);
+ this.dlg.close();
+ }
+ notif.on_close = function () {
+ if (this.on_confirm) this.on_confirm(false);
+ }
+
+ notif.on_display_size = function (width, height) {
+ var w = 0.9*width;
+ if (w>500) w=500;
+ this.btn_yes.set_size(w / 3, gwskin.default_control_height);
+ this.btn_no.set_size(w / 3, gwskin.default_control_height);
+ this.set_size(w, 2 * gwskin.default_control_height);
+ }
+ notif.on_display_size(gw_display_width, gw_display_height);
+ return notif;
+}
+
 
 function gw_guess_mime_icon(name)
 {
@@ -2971,10 +3180,10 @@
 
 var idx = 0;
 while (1) {
- var mime = gpac.getOption('MimeTypes', idx);
+ var mime = gpac.get_option('MimeTypes', idx);
 if (mime == null) break;
 idx++;
- var mime_ext = gpac.getOption('MimeTypes', mime).split('"')[1];
+ var mime_ext = gpac.get_option('MimeTypes', mime).split('"')[1];
 if (!mime_ext.match(reg)) continue;
 
 if (mime.indexOf('video') != -1) return gwskin.images.mime_video;
@@ -2988,75 +3197,85 @@
 return gwskin.images.mime_generic;
 }
 
-
-function gw_new_file_dialog(container, label) {
- var dlg = gw_new_window_full(container, true, label);
-
- dlg.area = gw_new_grid_container(dlg);
- dlg.area.break_at_line = true;
- dlg.area.dlg = dlg;
-
+
+function gw_new_file_dialog(container, label) {
+ var dlg = gw_new_window_full(container, true, label);
+
+ dlg.area = gw_new_grid_container(dlg);
+ dlg.area.break_at_line = true;
+	dlg.area.dlg = dlg;
+
 dlg.on_close = function () {
 if (this.do_sort_wnd) {
 this.do_sort_wnd.close();
 }
- if (this.on_browse) {
- this.on_browse(null, false);
- }
- }
-
+ if (this.on_browse) {
+ this.on_browse(null, false);
+ }
+ }
+
 
+	dlg._name_sort_only = false;
 dlg._sort_type = 0;
- dlg.do_sort = function(value) { 
+ dlg.do_sort = function (value) {
 this._page_idx = 0;
 this._max_page_idx = 0;
- 
+
 switch (value) {
- case 0:
- this.area._all_children.sort( function(a, b) { return a.filename > b.filename} );
- break;
- case 1:
- this.area._all_children.sort( function(a, b) { return a.filename < b.filename} );
- break;
- case 2:
- this.area._all_children.sort( function(a, b) { return a.size > b.size} );
- break;
- case 3:
- this.area._all_children.sort( function(a, b) { return a.size < b.size} );
- break;
- case 4:
- this.area._all_children.sort( function(a, b) { return a.date > b.date} );
- break;
- case 5:
- this.area._all_children.sort( function(a, b) { return a.date < b.date} );
- break;
- } 
+ case 0:
+ this.area._all_children.sort(function (a, b) { var A = a.filename.toLowerCase(); var B = b.filename.toLowerCase(); if (A > B) { return 1; } else if (A < B) { return -1; } else return 0; });
+ break;
+ case 1:
+ this.area._all_children.sort(function (b, a) { var A = a.filename.toLowerCase(); var B = b.filename.toLowerCase(); if (A > B) { return 1; } else if (A < B) { return -1; } else return 0; });
+ break;
+ case 2:
+ this.area._all_children.sort(function (a, b) { return a.size - b.size });
+ break;
+ case 3:
+ this.area._all_children.sort(function (a, b) { return b.size - a.size });
+ break;
+ case 4:
+ this.area._all_children.sort(function (a, b) { return a.date - b.date });
+ break;
+ case 5:
+ this.area._all_children.sort(function (a, b) { return b.date - a.date });
+ break;
+ }
 this.area.layout();
 }
 
- dlg.go_up = dlg.add_tool('up');
- dlg.go_up.on_click = function () {
- this.dlg._browse(null, true);
- }
-
- dlg.go_prev = dlg.add_tool('previous');
- dlg.go_prev.on_click = function () {
- this.dlg.area._move_page(-1);
- }
-
- dlg.go_next = dlg.add_tool('next');
- dlg.go_next.on_click = function () {
- this.dlg.area._move_page(1);
- }
-
- dlg.go_root = dlg.add_tool('device');
- dlg.go_root.on_click = function () {
- this.dlg._browse('/');
- }
+ dlg.go_up = dlg.add_tool('up');
+ dlg.go_up.on_click = function () {
+ this.dlg._browse(null, true);
+ }
+
+ dlg.go_prev = dlg.add_tool('previous');
+ dlg.go_prev.on_click = function () {
+ this.dlg.area._move_page(-1);
+ }
+
+ dlg.go_next = dlg.add_tool('next');
+ dlg.go_next.on_click = function () {
+ this.dlg.area._move_page(1);
+ }
+
+ dlg.go_root = dlg.add_tool('device');
+ dlg.go_root.on_click = function () {
+ this.dlg._browse('/');
+ }
 
 dlg.sort = dlg.add_tool('sort');
 dlg.sort_wnd = null;
 dlg.sort.on_click = function() {
+		
+		if (this.dlg._name_sort_only) {
+			var wnd = this.dlg;
+			if (wnd._sort_type==0) wnd._sort_type = 1;
+			else wnd._sort_type = 0;
+			wnd.do_sort(wnd._sort_type);
+			return;
+		}
+		
 if (this.dlg.sort_wnd) {
 this.dlg.sort_wnd.close();
 this.dlg.sort_wnd = null;
@@ -3093,242 +3312,256 @@
 wnd.on_display_size(gw_display_width, gw_display_height);
 wnd.show();
 }
-
- dlg.predestroy = function () {
- this.go_up = null;
- this.go_next = null;
- this.go_prev = null;
- this.go_root = null;
- this.area.dlg = null;
- }
-
- dlg.directory = '';
- dlg.show_directory = false;
- dlg.filter = '*';
-
- dlg._on_dir_browse = function () {
-		if (this.path) {
-			this.dlg._browse(this.path, false);
-		} else {
-			this.dlg._browse(this.dlg.path + this.filename, false);
-		}
- }
- dlg._on_file_select = function () {
- if (this.dlg.on_browse) {
-			if (this.path) {
-				this.dlg.on_browse(this.path, null);
-			} else {
-				this.dlg.on_browse(this.dlg.path + this.filename, this.dlg.directory);
-			}
- }
- this.dlg.close();
- }
-
- dlg.area.on_page_changed = function () {
- if (this.is_first_page()) this.dlg.go_prev.disable();
- else this.dlg.go_prev.enable();
-
- if (this.is_last_page()) this.dlg.go_next.disable();
- else this.dlg.go_next.enable();
-
- this.dlg.tools.layout(this.dlg.tools.width, this.dlg.tools.height);
- }
-
- dlg.on_long_click = null;
-
- dlg.browse = function (dir) {
-		if (typeof dir == 'string') this.directory = dir;
-		
- this._browse(dir, false);
- }
- dlg._browse = function (dir, up) {
- var w, h, i, y;
- var filelist;
- var is_listing = ((dir==null) || (typeof dir == 'string')) ? false : true;
-
- if (is_listing) {
- filelist = dir;
- this.path = null;
- } else {
- if (dir) this.directory = dir;
- if (up && !this.path) up = false;
- filelist = gpac.enum_directory(this.directory, this.filter, up);
-
- if (filelist.length) {
- this.directory = filelist[0].path;
- this.set_label(this.directory);
- } else {
- this.set_label('');
- }
- this.path = filelist.length ? filelist[0].path : '';
- }
-
- this.area.reset_children();
-
- for (i = 0; i < filelist.length; i++) {
- if (!is_listing && (filelist[i].hidden || filelist[i].system)) continue;
-
- var icon_name = gwskin.images.mime_generic;
-
- if ( (!is_listing || (typeof filelist[i].directory == 'boolean')) && (filelist[i].directory || (filelist[i].name.indexOf('.') < 0))) {
- if (filelist[i].drive) icon_name = gwskin.images.drive;
- else icon_name = gwskin.images.folder;
+
+ dlg.predestroy = function () {
+ this.go_up = null;
+ this.go_next = null;
+ this.go_prev = null;
+ this.go_root = null;
+ this.area.dlg = null;
+ }
+
+ dlg.directory = '';
+ dlg.show_directory = false;
+ dlg.filter = '*';
+
+ dlg._on_dir_browse = function () {
+		if (this.path) {
+			this.dlg._browse(this.path, false);
+		} else {
+			this.dlg._browse(this.dlg.path + this.filename, false);
+		}
+ }
+ dlg._on_file_select = function () {
+ if (this.dlg.on_browse) {
+			if (this.path) {
+				this.dlg.on_browse(this.path, null);
+			} else {
+				this.dlg.on_browse(this.dlg.path + this.filename, this.dlg.directory);
+			}
+ }
+ this.dlg.close();
+ }
+
+ dlg.area.on_page_changed = function () {
+ if (this.is_first_page()) this.dlg.go_prev.disable();
+ else this.dlg.go_prev.enable();
+
+ if (this.is_last_page()) this.dlg.go_next.disable();
+ else this.dlg.go_next.enable();
+
+ this.dlg.tools.layout(this.dlg.tools.width, this.dlg.tools.height);
+ }
+
+ dlg.on_long_click = null;
+
+ dlg.browse = function (dir) {
+		if (typeof dir == 'string') this.directory = dir;
+		
+ this._browse(dir, false);
+ }
+ dlg._browse = function (dir, up) {
+ var w, h, i, y;
+ var filelist;
+ var is_listing = ((dir==null) || (typeof dir == 'string')) ? false : true;
+
+ if (is_listing) {
+ filelist = dir;
+ this.path = null;
+ } else {
+ if (dir) this.directory = dir;
+ if (up && !this.path) up = false;
+ filelist = gpac.enum_directory(this.directory, this.filter, up);
+
+ if (filelist.length) {
+ this.directory = filelist[0].path;
+ this.set_label(this.directory);
+ } else {
+ this.set_label('');
+ }
+ this.path = filelist.length ? filelist[0].path : '';
+ }
+
+ this.area.reset_children();
+
+ for (i = 0; i < filelist.length; i++) {
+			var f_path, f_name;
+ if (!is_listing && (filelist[i].hidden || filelist[i].system)) continue;
+
+			var icon_name = gwskin.images.mime_generic;
+			if (is_listing && typeof filelist[i].icon == 'string') {
+				if (filelist[i].icon != '') {
+					icon_name = filelist[i].icon;
+				}
+			}
+
+			if (is_listing && typeof filelist[i] == 'string') {
+				f_path = f_name = filelist[i];
+				this._name_sort_only = true;
+			} else {
+				f_path = filelist[i].path;
+				f_name = filelist[i].name;
+			}
+			
+ if ( (!is_listing || (typeof filelist[i].directory == 'boolean')) && (filelist[i].directory || (filelist[i].name.indexOf('.') < 0))) {
+ if (filelist[i].drive) icon_name = gwskin.images.drive;
+ else icon_name = gwskin.images.folder;
 } else {
- icon_name = gw_guess_mime_icon(is_listing ? filelist[i].path : filelist[i].name);
- }
-
- var item = gw_new_icon_button(this.area, icon_name, filelist[i].name, true, 'listitem');
- item.dlg = this;
- item.filename = filelist[i].name;
- item.directory = filelist[i].directory;
- item.set_size(this.width, gwskin.default_control_height);
- item.path = is_listing ? filelist[i].path : null;
+ icon_name = gw_guess_mime_icon(is_listing ? f_path : f_name);
+ }
+
+ var item = gw_new_icon_button(this.area, icon_name, f_name, true, 'listitem');
+ item.dlg = this;
+ item.filename = f_name;
+			item.directory = typeof filelist[i].directory != 'undefined' ? filelist[i].directory : false;
+ item.set_size(this.width, gwskin.default_control_height);
+ item.path = is_listing ? f_path : null;
 item.size = typeof filelist[i].size != 'undefined' ? filelist[i].size : 0;
 item.date = typeof filelist[i].last_modified != 'undefined' ? filelist[i].last_modified : 0;
-
- if (filelist[i].directory) {
- item.on_click = this._on_dir_browse;
- } else {
- item.on_click = this._on_file_select;
- }
- item.on_long_click = function () {
- if (this.dlg.on_long_click) {
-					var path = this.path ? this.path : (this.dlg.directory + this.filename);
- this.dlg.on_long_click(this.filename, path, this.directory);
-				}
- }
-
- }
- this.do_sort(this._sort_type);
-
- if (this.directory == '/') this.go_up.disable();
- else this.go_up.enable();
-
- this.tools.layout(this.tools.width, this.tools.height);
- }
-
- dlg.on_size = function (width, height) {
- var __children = this.area.get_children();
- for (var i = 0; i < __children.length; i++) {
- __children[i].set_size(width, gwskin.default_control_height);
- }
- this.area.set_size(width, height);
- }
-
- return dlg;
-}
-
-
-
-function gw_new_plotter(parent) {
- var touch;
- var obj = new SFNode('Transform2D');
- setup_gw_object(obj, 'Plotter');
-
- obj.children[0] = new SFNode('Layer2D');
-
- var class_name = 'plot';
-
- obj.children[0].children[0] = gw_new_rectangle(class_name, 'normal');
-
- obj.set_size = function (width, height) {
- this.children[0].size.x = width;
- this.children[0].size.y = height;
- this.children[0].children[0].set_size(width, height);
-
- var w = 1;
- var h = 1;
-
- for (var i = 0; i < this.series.length; i++) {
- var s = this.series[i];
- s.scale = new SFVec2f(width - this.label_width, height);
- s.but.set_size(this.label_width, 0.9*gwskin.default_text_font_size);
- s.but.set_font_size(0.9 * gwskin.default_text_font_size);
- s.translation.x = -this.label_width / 2;
- }
- this.width = width;
- this.height = height;
- }
-
- obj.label_width = 100;
-
- obj.series = [];
- obj.add_serie = function (legend, units, r, g, b) {
- var s = gw_new_curve2d('plot');
- s.set_color(r, g, b);
-
- s.dlg = this;
- s.legend = legend;
- s.units = units;
- s.max_y = 0;
- s.nb_refresh = 0;
-
- s.refresh_serie = function (serie, name_x, name_y, nb_x, factor) {
- var s = serie[0];
- var count = serie.length;
-
- var first_x = s[name_x];
- 
- this.nb_refresh += 1;
- if (this.nb_refresh == 50) {
- this.max_y = 0;
- this.nb_refresh += 1;
- }
- var max_y = this.max_y;
- 
-
- if (!factor) factor = 1;
- for (var i = 0; i < serie.length; i++) {
- var s = serie[i];
- if (max_y < s[name_y]) max_y = s[name_y];
- }
- s = serie[0];
-
- this.reset();
- for (var i = 0; i < count; i++) {
- s = serie[i];
- //get x and y between -0.5 and 0.5, and scale to width
- var x = s[name_x] - first_x;
- x /= nb_x;
- x -= 0.5;
- //x *= 0.9;
-
- var y = s[name_y];
- if (max_y) y /= max_y;
- y = -0.9 / 2 + 0.9 * y / factor;
-
- if (i) {
- this.add_line_to(x, y);
- } else {
- this.add_move_to(x, y);
- }
-
- if (i + 1 == count) {
- this.but.move(0.5 * this.dlg.width - this.but.width / 2, (-0.9 / 2 + 0.9 / factor) * this.dlg.height);
- this.but.set_label('' + this.legend + ':' + s[name_y] + ' ' + units);
- this.but.show();
- }
- }
- }
- this.children[0].children[this.children[0].children.length] = s;
- this.series.push(s);
-
- s.scale.x = this.width;
- s.scale.y = this.height;
-
-
- s.but = gw_new_text(this, '' + legend, 'custom');
- s.but.set_align('END');
- s.but.set_color(r, g, b);
- s.but.set_size(this.label_width, gwskin.default_text_font_size);
- s.but.hide();
- return s;
-
- }
-
-
- gw_add_child(parent, obj);
- return obj;
+
+ if (item.directory) {
+ item.on_click = this._on_dir_browse;
+ } else {
+ item.on_click = this._on_file_select;
+ }
+ item.on_long_click = function () {
+ if (this.dlg.on_long_click) {
+					var path = this.path ? this.path : (this.dlg.directory + this.filename);
+					this.dlg.on_long_click(this.filename, path, this.dlg.directory);
+				}
+ }
+
+ }
+ this.do_sort(this._sort_type);
+
+ if (this.directory == '/') this.go_up.disable();
+ else this.go_up.enable();
+
+ this.tools.layout(this.tools.width, this.tools.height);
+ }
+
+ dlg.on_size = function (width, height) {
+ var __children = this.area.get_children();
+ for (var i = 0; i < __children.length; i++) {
+ __children[i].set_size(width, gwskin.default_control_height);
+ }
+ this.area.set_size(width, height);
+ }
+
+ return dlg;
+}
+
+
+
+function gw_new_plotter(parent) {
+ var touch;
+ var obj = new SFNode('Transform2D');
+ setup_gw_object(obj, 'Plotter');
+
+ obj.children[0] = new SFNode('Layer2D');
+
+ var class_name = 'plot';
+
+ obj.children[0].children[0] = gw_new_rectangle(class_name, 'normal');
+
+ obj.set_size = function (width, height) {
+ this.children[0].size.x = width;
+ this.children[0].size.y = height;
+ this.children[0].children[0].set_size(width, height);
+
+ var w = 1;
+ var h = 1;
+
+ for (var i = 0; i < this.series.length; i++) {
+ var s = this.series[i];
+ s.scale = new SFVec2f(width - this.label_width, height);
+ s.but.set_size(2*this.label_width, 0.9*gwskin.default_text_font_size);
+ s.but.set_font_size(0.9 * gwskin.default_text_font_size);
+ s.translation.x = -this.label_width / 2;
+ }
+ this.width = width;
+ this.height = height;
+ }
+
+ obj.label_width = 120;
+
+ obj.series = [];
+ obj.add_serie = function (legend, units, r, g, b) {
+ var s = gw_new_curve2d('plot');
+ s.set_color(r, g, b);
+
+ s.dlg = this;
+ s.legend = legend;
+ s.units = units;
+ s.max_y = 0;
+ s.nb_refresh = 0;
+
+ s.refresh_serie = function (serie, name_x, name_y, nb_x, factor) {
+ var s = serie[0];
+ var count = serie.length;
+
+ var first_x = s[name_x];
+ 
+ this.nb_refresh += 1;
+ if (this.nb_refresh == 50) {
+ this.max_y = 0;
+ this.nb_refresh += 1;
+ }
+ var max_y = this.max_y;
+ 
+
+ if (!factor) factor = 1;
+ for (var i = 0; i < serie.length; i++) {
+ var s = serie[i];
+ if (max_y < s[name_y]) max_y = s[name_y];
+ }
+ s = serie[0];
+
+ this.reset();
+ for (var i = 0; i < count; i++) {
+ s = serie[i];
+ //get x and y between -0.5 and 0.5, and scale to width
+ var x = s[name_x] - first_x;
+ x /= nb_x;
+ x -= 0.5;
+ //x *= 0.9;
+
+ var y = s[name_y];
+ if (max_y) y /= max_y;
+ y = -0.9 / 2 + 0.9 * y / factor;
+
+ if (i) {
+ this.add_line_to(x, y);
+ } else {
+ this.add_move_to(x, y);
+ }
+
+ if (i + 1 == count) {
+ this.but.move(0.5 * this.dlg.width - this.but.width / 2, (-0.9 / 2 + 0.9 / factor) * this.dlg.height);
+ this.but.set_label('' + this.legend + ':' + s[name_y] + ' ' + units);
+ this.but.show();
+ }
+ }
+ }
+ this.children[0].children[this.children[0].children.length] = s;
+ this.series.push(s);
+
+ s.scale.x = this.width;
+ s.scale.y = this.height;
+
+
+ s.but = gw_new_text(this, '' + legend, 'custom');
+ s.but.set_align('END');
+ s.but.set_color(r, g, b);
+ s.but.set_size(2*this.label_width, gwskin.default_text_font_size);
+ s.but.hide();
+ return s;
+
+ }
+
+
+ gw_add_child(parent, obj);
+ return obj;
 }
 
 function gw_new_popup(anchor, type)
@@ -3338,21 +3571,21 @@
 popup.anchor = anchor;
 popup.type = (type=='up') ? 0 : 1;
 
- popup._nb_over = 0;
- popup.add_menu_item = function (label, callback) {
- var item = gw_new_button(this.area, label, 'window');
- item.wnd = this;
- item.on_click = function () {
- callback.call(this.wnd);
- this.wnd.close();
- }
- item.on_over_ex = function (value) {
- this.wnd.update_visibility();
- }
- item.new_over_handler(item.on_over_ex);
-
- item.set_corners(false, false, false, false);
- return item;
+ popup._nb_over = 0;
+ popup.add_menu_item = function (label, callback) {
+ var item = gw_new_button(this.area, label, 'window');
+ item.wnd = this;
+ item.on_click = function () {
+ callback.call(this.wnd);
+ this.wnd.close();
+ }
+ item.on_over_ex = function (value) {
+ this.wnd.update_visibility();
+ }
+ item.new_over_handler(item.on_over_ex);
+
+ item.set_corners(false, false, false, false);
+ return item;
 }
 popup.reposition = function() {
 var pos = gw_get_adjusted_abs_pos(this.anchor, this.width, this.height, this.type);
@@ -3376,12 +3609,12 @@
 var s = children[i].get_label().length;
 if (s>max_s) max_s = s;
 }
- 
+
 for (var i=0; i<children.length; i++) {
- children[i].set_size(s * 0.9*gwskin.default_text_font_size, gwskin.default_icon_height);
+ children[i].set_size(max_s * gwskin.default_text_font_size, gwskin.default_icon_height);
 }
- this.area.set_size(s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
- this.set_size(s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
+ this.area.set_size(max_s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
+ this.set_size(max_s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
 this.reposition();
 }
 gw_ui_root.has_popup = true;
@@ -3390,5 +3623,5 @@
 popup.set_alpha(0.9);
 return popup;
 }
-
-
+
+

v0.5.2.tar.gz/gui/icons/add.svg -> v0.6.1.tar.gz/gui/icons/add.svg Changed

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M86.25,37.686l-24.27,0V13.416c0-3.054-2.476-5.53-5.53-5.53H43.549c-3.054,0-5.53,2.476-5.53,5.53
-		v24.269l-24.27,0c-3.054,0-5.53,2.476-5.53,5.53v12.903c0,3.054,2.476,5.53,5.53,5.53l24.27,0v24.269c0,3.054,2.476,5.53,5.53,5.53
-		h12.902c3.054,0,5.53-2.476,5.53-5.53V61.648l24.27,0c3.054,0,5.53-2.476,5.53-5.53V43.215
-		C91.78,40.161,89.305,37.686,86.25,37.686z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M86.25,37.686l-24.27,0V13.416c0-3.054-2.476-5.53-5.53-5.53H43.549c-3.054,0-5.53,2.476-5.53,5.53
+		v24.269l-24.27,0c-3.054,0-5.53,2.476-5.53,5.53v12.903c0,3.054,2.476,5.53,5.53,5.53l24.27,0v24.269c0,3.054,2.476,5.53,5.53,5.53
+		h12.902c3.054,0,5.53-2.476,5.53-5.53V61.648l24.27,0c3.054,0,5.53-2.476,5.53-5.53V43.215
+		C91.78,40.161,89.305,37.686,86.25,37.686z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/app.svg -> v0.6.1.tar.gz/gui/icons/app.svg Changed

@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M92.65,40.824l-5.183,0l3.665-3.665c1.528-1.528,1.528-4.005,0-5.533l-6.456-6.456
-		c-1.528-1.528-4.005-1.528-5.533,0l-3.666,3.665v-5.184c0-2.161-1.752-3.913-3.913-3.913h-9.129c-2.161,0-3.913,1.752-3.913,3.913
-		v5.183l-3.665-3.665c-1.528-1.528-4.005-1.528-5.533,0l-6.456,6.456c-1.528,1.528-1.528,4.005,0,5.533l3.665,3.665H41.35
-		c-2.161,0-3.913,1.752-3.913,3.913v9.129c0,2.161,1.752,3.913,3.913,3.913h5.183l-3.665,3.665c-1.528,1.528-1.528,4.005,0,5.533
-		l6.456,6.456c1.528,1.528,4.005,1.528,5.533,0l3.666-3.665v5.184c0,2.161,1.752,3.913,3.913,3.913h9.129
-		c2.161,0,3.913-1.752,3.913-3.913v-5.183l3.665,3.665c1.528,1.528,4.005,1.528,5.533,0l6.456-6.456
-		c1.528-1.528,1.528-4.005,0-5.533l-3.665-3.665h5.183c2.161,0,3.913-1.752,3.913-3.913v-9.13
-		C96.562,42.576,94.811,40.824,92.65,40.824z M67,58.776c-5.233,0-9.475-4.242-9.475-9.475s4.242-9.475,9.475-9.475
-		s9.475,4.242,9.475,9.475S72.233,58.776,67,58.776z"/>
-	<path style="fill:#000100;" d="M9.847,26.553h2.692l-1.904,1.904c-0.794,0.794-0.794,2.08,0,2.874l3.353,3.353
-		c0.793,0.794,2.081,0.794,2.874,0l1.904-1.904v2.692c0,1.122,0.91,2.032,2.032,2.032h4.742c1.122,0,2.032-0.91,2.032-2.032V32.78
-		l1.904,1.904c0.794,0.794,2.081,0.794,2.874,0l3.353-3.353c0.794-0.794,0.794-2.08,0-2.874L33.8,26.553h2.692
-		c1.122,0,2.032-0.91,2.032-2.032v-4.742c0-1.122-0.91-2.032-2.032-2.032H33.8l1.904-1.904c0.794-0.794,0.794-2.08,0-2.874
-		l-3.353-3.353c-0.793-0.794-2.08-0.794-2.874,0l-1.904,1.904V8.827c0-1.122-0.91-2.032-2.032-2.032h-4.742
-		c-1.122,0-2.032,0.91-2.032,2.032v2.692l-1.904-1.904c-0.793-0.794-2.081-0.794-2.874,0l-3.353,3.353
-		c-0.794,0.794-0.794,2.08,0,2.874l1.904,1.904H9.847c-1.123,0-2.032,0.91-2.032,2.032v4.742
-		C7.814,25.643,8.724,26.553,9.847,26.553z M23.169,17.228c2.718,0,4.922,2.203,4.922,4.922c0,2.718-2.203,4.922-4.922,4.922
-		s-4.922-2.203-4.922-4.922C18.248,19.432,20.451,17.228,23.169,17.228z"/>
-	<path style="fill:#000100;" d="M36.492,72.746H33.8l1.904-1.904c0.794-0.794,0.794-2.08,0-2.874l-3.353-3.353
-		c-0.793-0.794-2.08-0.794-2.874,0l-1.904,1.904v-2.692c0-1.122-0.91-2.032-2.032-2.032h-4.742c-1.122,0-2.032,0.91-2.032,2.032
-		v2.692l-1.904-1.904c-0.793-0.794-2.081-0.794-2.874,0l-3.353,3.353c-0.794,0.794-0.794,2.08,0,2.874l1.904,1.904H9.847
-		c-1.123,0-2.032,0.91-2.032,2.032v4.742c0,1.122,0.91,2.032,2.032,2.032h2.692l-1.904,1.904c-0.794,0.794-0.794,2.08,0,2.874
-		l3.353,3.353c0.793,0.794,2.081,0.794,2.874,0l1.904-1.904v2.692c0,1.122,0.91,2.032,2.032,2.032h4.742
-		c1.122,0,2.032-0.91,2.032-2.032V87.78l1.904,1.904c0.794,0.794,2.081,0.794,2.874,0l3.353-3.353c0.794-0.794,0.794-2.08,0-2.874
-		L33.8,81.553h2.692c1.122,0,2.032-0.91,2.032-2.032v-4.742C38.525,73.656,37.615,72.746,36.492,72.746z M23.169,82.071
-		c-2.718,0-4.922-2.203-4.922-4.922c0-2.718,2.203-4.922,4.922-4.922s4.922,2.203,4.922,4.922
-		C28.091,79.868,25.888,82.071,23.169,82.071z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M92.65,40.824l-5.183,0l3.665-3.665c1.528-1.528,1.528-4.005,0-5.533l-6.456-6.456
+		c-1.528-1.528-4.005-1.528-5.533,0l-3.666,3.665v-5.184c0-2.161-1.752-3.913-3.913-3.913h-9.129c-2.161,0-3.913,1.752-3.913,3.913
+		v5.183l-3.665-3.665c-1.528-1.528-4.005-1.528-5.533,0l-6.456,6.456c-1.528,1.528-1.528,4.005,0,5.533l3.665,3.665H41.35
+		c-2.161,0-3.913,1.752-3.913,3.913v9.129c0,2.161,1.752,3.913,3.913,3.913h5.183l-3.665,3.665c-1.528,1.528-1.528,4.005,0,5.533
+		l6.456,6.456c1.528,1.528,4.005,1.528,5.533,0l3.666-3.665v5.184c0,2.161,1.752,3.913,3.913,3.913h9.129
+		c2.161,0,3.913-1.752,3.913-3.913v-5.183l3.665,3.665c1.528,1.528,4.005,1.528,5.533,0l6.456-6.456
+		c1.528-1.528,1.528-4.005,0-5.533l-3.665-3.665h5.183c2.161,0,3.913-1.752,3.913-3.913v-9.13
+		C96.562,42.576,94.811,40.824,92.65,40.824z M67,58.776c-5.233,0-9.475-4.242-9.475-9.475s4.242-9.475,9.475-9.475
+		s9.475,4.242,9.475,9.475S72.233,58.776,67,58.776z"/>
+	<path style="fill:#000100;" d="M9.847,26.553h2.692l-1.904,1.904c-0.794,0.794-0.794,2.08,0,2.874l3.353,3.353
+		c0.793,0.794,2.081,0.794,2.874,0l1.904-1.904v2.692c0,1.122,0.91,2.032,2.032,2.032h4.742c1.122,0,2.032-0.91,2.032-2.032V32.78
+		l1.904,1.904c0.794,0.794,2.081,0.794,2.874,0l3.353-3.353c0.794-0.794,0.794-2.08,0-2.874L33.8,26.553h2.692
+		c1.122,0,2.032-0.91,2.032-2.032v-4.742c0-1.122-0.91-2.032-2.032-2.032H33.8l1.904-1.904c0.794-0.794,0.794-2.08,0-2.874
+		l-3.353-3.353c-0.793-0.794-2.08-0.794-2.874,0l-1.904,1.904V8.827c0-1.122-0.91-2.032-2.032-2.032h-4.742
+		c-1.122,0-2.032,0.91-2.032,2.032v2.692l-1.904-1.904c-0.793-0.794-2.081-0.794-2.874,0l-3.353,3.353
+		c-0.794,0.794-0.794,2.08,0,2.874l1.904,1.904H9.847c-1.123,0-2.032,0.91-2.032,2.032v4.742
+		C7.814,25.643,8.724,26.553,9.847,26.553z M23.169,17.228c2.718,0,4.922,2.203,4.922,4.922c0,2.718-2.203,4.922-4.922,4.922
+		s-4.922-2.203-4.922-4.922C18.248,19.432,20.451,17.228,23.169,17.228z"/>
+	<path style="fill:#000100;" d="M36.492,72.746H33.8l1.904-1.904c0.794-0.794,0.794-2.08,0-2.874l-3.353-3.353
+		c-0.793-0.794-2.08-0.794-2.874,0l-1.904,1.904v-2.692c0-1.122-0.91-2.032-2.032-2.032h-4.742c-1.122,0-2.032,0.91-2.032,2.032
+		v2.692l-1.904-1.904c-0.793-0.794-2.081-0.794-2.874,0l-3.353,3.353c-0.794,0.794-0.794,2.08,0,2.874l1.904,1.904H9.847
+		c-1.123,0-2.032,0.91-2.032,2.032v4.742c0,1.122,0.91,2.032,2.032,2.032h2.692l-1.904,1.904c-0.794,0.794-0.794,2.08,0,2.874
+		l3.353,3.353c0.793,0.794,2.081,0.794,2.874,0l1.904-1.904v2.692c0,1.122,0.91,2.032,2.032,2.032h4.742
+		c1.122,0,2.032-0.91,2.032-2.032V87.78l1.904,1.904c0.794,0.794,2.081,0.794,2.874,0l3.353-3.353c0.794-0.794,0.794-2.08,0-2.874
+		L33.8,81.553h2.692c1.122,0,2.032-0.91,2.032-2.032v-4.742C38.525,73.656,37.615,72.746,36.492,72.746z M23.169,82.071
+		c-2.718,0-4.922-2.203-4.922-4.922c0-2.718,2.203-4.922,4.922-4.922s4.922,2.203,4.922,4.922
+		C28.091,79.868,25.888,82.071,23.169,82.071z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/audio.svg -> v0.6.1.tar.gz/gui/icons/audio.svg Changed

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M62.414,9.2c-1.439,0-2.684,0.526-3.734,1.576L31.049,28.46H9.311c-1.439,0-2.684,0.526-3.734,1.576
-		C4.525,31.087,4,32.332,4,33.77v31.862c0,1.439,0.525,2.684,1.577,3.734c1.05,1.051,2.294,1.576,3.734,1.576h21.739l27.63,17.683
-		c1.05,1.051,2.294,1.576,3.734,1.576c1.438,0,2.682-0.525,3.733-1.576c1.05-1.05,1.577-2.295,1.577-3.734V14.511
-		c0-1.438-0.526-2.682-1.577-3.734C65.096,9.727,63.851,9.2,62.414,9.2z"/>
-	<path style="fill:#1D1D1B;" d="M82.873,30.202c-0.554-0.276-1.245-0.415-2.074-0.415c-1.439,0-2.684,0.512-3.734,1.535
-		c-1.051,1.024-1.576,2.282-1.576,3.776c0,1.162,0.332,2.144,0.995,2.945c0.664,0.803,1.465,1.493,2.406,2.074
-		c0.94,0.581,1.88,1.217,2.821,1.908c0.94,0.692,1.743,1.674,2.406,2.946c0.664,1.273,0.996,2.849,0.996,4.729
-		c0,1.881-0.332,3.458-0.996,4.73c-0.664,1.273-1.466,2.255-2.406,2.945c-0.941,0.692-1.881,1.328-2.821,1.909
-		c-0.941,0.581-1.742,1.273-2.406,2.074c-0.664,0.803-0.995,1.784-0.995,2.945c0,1.494,0.525,2.753,1.576,3.776
-		c1.05,1.024,2.295,1.535,3.734,1.535c0.83,0,1.521-0.137,2.074-0.415c3.872-1.548,6.983-4.134,9.334-7.758
-		c2.351-3.622,3.526-7.536,3.526-11.741c0-4.203-1.176-8.131-3.526-11.782C89.855,34.268,86.744,31.695,82.873,30.202z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M62.414,9.2c-1.439,0-2.684,0.526-3.734,1.576L31.049,28.46H9.311c-1.439,0-2.684,0.526-3.734,1.576
+		C4.525,31.087,4,32.332,4,33.77v31.862c0,1.439,0.525,2.684,1.577,3.734c1.05,1.051,2.294,1.576,3.734,1.576h21.739l27.63,17.683
+		c1.05,1.051,2.294,1.576,3.734,1.576c1.438,0,2.682-0.525,3.733-1.576c1.05-1.05,1.577-2.295,1.577-3.734V14.511
+		c0-1.438-0.526-2.682-1.577-3.734C65.096,9.727,63.851,9.2,62.414,9.2z"/>
+	<path style="fill:#1D1D1B;" d="M82.873,30.202c-0.554-0.276-1.245-0.415-2.074-0.415c-1.439,0-2.684,0.512-3.734,1.535
+		c-1.051,1.024-1.576,2.282-1.576,3.776c0,1.162,0.332,2.144,0.995,2.945c0.664,0.803,1.465,1.493,2.406,2.074
+		c0.94,0.581,1.88,1.217,2.821,1.908c0.94,0.692,1.743,1.674,2.406,2.946c0.664,1.273,0.996,2.849,0.996,4.729
+		c0,1.881-0.332,3.458-0.996,4.73c-0.664,1.273-1.466,2.255-2.406,2.945c-0.941,0.692-1.881,1.328-2.821,1.909
+		c-0.941,0.581-1.742,1.273-2.406,2.074c-0.664,0.803-0.995,1.784-0.995,2.945c0,1.494,0.525,2.753,1.576,3.776
+		c1.05,1.024,2.295,1.535,3.734,1.535c0.83,0,1.521-0.137,2.074-0.415c3.872-1.548,6.983-4.134,9.334-7.758
+		c2.351-3.622,3.526-7.536,3.526-11.741c0-4.203-1.176-8.131-3.526-11.782C89.855,34.268,86.744,31.695,82.873,30.202z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/audio_full.svg -> v0.6.1.tar.gz/gui/icons/audio_full.svg Changed

@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M49.43,22.2c-1.013,0-1.889,0.37-2.628,1.109L27.359,35.754H12.061c-1.013,0-1.889,0.37-2.628,1.109
-		c-0.74,0.74-1.109,1.615-1.109,2.627v22.421c0,1.013,0.37,1.889,1.109,2.628c0.739,0.74,1.615,1.109,2.628,1.109h15.298
-		l19.444,12.444c0.739,0.74,1.615,1.109,2.628,1.109c1.012,0,1.887-0.37,2.627-1.109c0.739-0.739,1.109-1.615,1.109-2.628V25.937
-		c0-1.012-0.37-1.888-1.109-2.628C51.317,22.571,50.442,22.2,49.43,22.2z"/>
-	<path style="fill:#1D1D1B;" d="M70.396,58.963c1.654-2.549,2.481-5.303,2.481-8.262c0-2.958-0.827-5.722-2.481-8.291
-		c-1.655-2.569-3.844-4.379-6.569-5.43c-0.39-0.194-0.876-0.292-1.46-0.292c-1.013,0-1.888,0.36-2.627,1.08
-		c-0.74,0.721-1.109,1.606-1.109,2.657c0,0.817,0.234,1.509,0.701,2.073c0.467,0.565,1.031,1.051,1.693,1.46
-		c0.661,0.409,1.323,0.857,1.985,1.343c0.661,0.487,1.226,1.178,1.693,2.073c0.467,0.896,0.701,2.005,0.701,3.328
-		c0,1.324-0.234,2.433-0.701,3.328c-0.467,0.896-1.032,1.587-1.693,2.073c-0.662,0.487-1.324,0.934-1.985,1.343
-		c-0.662,0.409-1.226,0.896-1.693,1.46c-0.467,0.565-0.701,1.255-0.701,2.073c0,1.051,0.37,1.937,1.109,2.657
-		c0.739,0.721,1.615,1.08,2.627,1.08c0.584,0,1.07-0.097,1.46-0.292C66.552,63.333,68.741,61.513,70.396,58.963z"/>
-	<path style="fill:#1D1D1B;" d="M69.725,23.2c-0.506-0.194-1.013-0.292-1.518-0.292c-1.013,0-1.889,0.37-2.628,1.109
-		c-0.74,0.74-1.109,1.616-1.109,2.628c0,1.518,0.759,2.667,2.277,3.445c2.18,1.13,3.658,1.985,4.438,2.569
-		c2.88,2.102,5.128,4.739,6.744,7.912c1.615,3.173,2.423,6.549,2.423,10.13c0,3.582-0.808,6.958-2.423,10.131
-		c-1.616,3.173-3.864,5.81-6.744,7.912c-0.779,0.584-2.258,1.44-4.438,2.569c-1.518,0.779-2.277,1.927-2.277,3.445
-		c0,1.013,0.37,1.889,1.109,2.628c0.739,0.74,1.635,1.109,2.686,1.109c0.467,0,0.953-0.097,1.46-0.292
-		c5.449-2.296,9.828-5.965,13.137-11.006c3.308-5.041,4.963-10.539,4.963-16.495c0-5.956-1.655-11.453-4.963-16.495
-		C79.553,29.165,75.174,25.497,69.725,23.2z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M49.43,22.2c-1.013,0-1.889,0.37-2.628,1.109L27.359,35.754H12.061c-1.013,0-1.889,0.37-2.628,1.109
+		c-0.74,0.74-1.109,1.615-1.109,2.627v22.421c0,1.013,0.37,1.889,1.109,2.628c0.739,0.74,1.615,1.109,2.628,1.109h15.298
+		l19.444,12.444c0.739,0.74,1.615,1.109,2.628,1.109c1.012,0,1.887-0.37,2.627-1.109c0.739-0.739,1.109-1.615,1.109-2.628V25.937
+		c0-1.012-0.37-1.888-1.109-2.628C51.317,22.571,50.442,22.2,49.43,22.2z"/>
+	<path style="fill:#1D1D1B;" d="M70.396,58.963c1.654-2.549,2.481-5.303,2.481-8.262c0-2.958-0.827-5.722-2.481-8.291
+		c-1.655-2.569-3.844-4.379-6.569-5.43c-0.39-0.194-0.876-0.292-1.46-0.292c-1.013,0-1.888,0.36-2.627,1.08
+		c-0.74,0.721-1.109,1.606-1.109,2.657c0,0.817,0.234,1.509,0.701,2.073c0.467,0.565,1.031,1.051,1.693,1.46
+		c0.661,0.409,1.323,0.857,1.985,1.343c0.661,0.487,1.226,1.178,1.693,2.073c0.467,0.896,0.701,2.005,0.701,3.328
+		c0,1.324-0.234,2.433-0.701,3.328c-0.467,0.896-1.032,1.587-1.693,2.073c-0.662,0.487-1.324,0.934-1.985,1.343
+		c-0.662,0.409-1.226,0.896-1.693,1.46c-0.467,0.565-0.701,1.255-0.701,2.073c0,1.051,0.37,1.937,1.109,2.657
+		c0.739,0.721,1.615,1.08,2.627,1.08c0.584,0,1.07-0.097,1.46-0.292C66.552,63.333,68.741,61.513,70.396,58.963z"/>
+	<path style="fill:#1D1D1B;" d="M69.725,23.2c-0.506-0.194-1.013-0.292-1.518-0.292c-1.013,0-1.889,0.37-2.628,1.109
+		c-0.74,0.74-1.109,1.616-1.109,2.628c0,1.518,0.759,2.667,2.277,3.445c2.18,1.13,3.658,1.985,4.438,2.569
+		c2.88,2.102,5.128,4.739,6.744,7.912c1.615,3.173,2.423,6.549,2.423,10.13c0,3.582-0.808,6.958-2.423,10.131
+		c-1.616,3.173-3.864,5.81-6.744,7.912c-0.779,0.584-2.258,1.44-4.438,2.569c-1.518,0.779-2.277,1.927-2.277,3.445
+		c0,1.013,0.37,1.889,1.109,2.628c0.739,0.74,1.635,1.109,2.686,1.109c0.467,0,0.953-0.097,1.46-0.292
+		c5.449-2.296,9.828-5.965,13.137-11.006c3.308-5.041,4.963-10.539,4.963-16.495c0-5.956-1.655-11.453-4.963-16.495
+		C79.553,29.165,75.174,25.497,69.725,23.2z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/audio_mute.svg -> v0.6.1.tar.gz/gui/icons/audio_mute.svg Changed

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M77.152,8.897c-1.486,0-2.77,0.543-3.854,1.627l-28.52,18.252H22.339
-		c-1.485,0-2.77,0.543-3.854,1.627c-1.085,1.085-1.627,2.369-1.627,3.854v32.888c0,1.485,0.542,2.77,1.627,3.854
-		c1.084,1.085,2.369,1.627,3.854,1.627h22.439l28.52,18.253c1.084,1.085,2.368,1.627,3.854,1.627c1.484,0,2.769-0.542,3.854-1.627
-		c1.083-1.084,1.627-2.369,1.627-3.854V14.378c0-1.484-0.543-2.769-1.627-3.854C79.92,9.44,78.636,8.897,77.152,8.897z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M77.152,8.897c-1.486,0-2.77,0.543-3.854,1.627l-28.52,18.252H22.339
+		c-1.485,0-2.77,0.543-3.854,1.627c-1.085,1.085-1.627,2.369-1.627,3.854v32.888c0,1.485,0.542,2.77,1.627,3.854
+		c1.084,1.085,2.369,1.627,3.854,1.627h22.439l28.52,18.253c1.084,1.085,2.368,1.627,3.854,1.627c1.484,0,2.769-0.542,3.854-1.627
+		c1.083-1.084,1.627-2.369,1.627-3.854V14.378c0-1.484-0.543-2.769-1.627-3.854C79.92,9.44,78.636,8.897,77.152,8.897z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/check.svg -> v0.6.1.tar.gz/gui/icons/check.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M84.468,15.882c-2.095-2.095-5.491-2.095-7.586,0L33.261,59.502L23.118,49.36
-		c-2.095-2.095-5.491-2.095-7.586,0l-7.586,7.586c-2.095,2.095-2.095,5.491,0,7.586l13.936,13.936l7.586,7.586
-		c2.095,2.095,5.492,2.095,7.586,0l7.586-7.586l47.414-47.414c2.095-2.095,2.095-5.491,0-7.586L84.468,15.882z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M84.468,15.882c-2.095-2.095-5.491-2.095-7.586,0L33.261,59.502L23.118,49.36
+		c-2.095-2.095-5.491-2.095-7.586,0l-7.586,7.586c-2.095,2.095-2.095,5.491,0,7.586l13.936,13.936l7.586,7.586
+		c2.095,2.095,5.492,2.095,7.586,0l7.586-7.586l47.414-47.414c2.095-2.095,2.095-5.491,0-7.586L84.468,15.882z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/close.svg -> v0.6.1.tar.gz/gui/icons/close.svg Changed

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M27.269,66.651l6.081,6.081c1.439,1.439,3.772,1.439,5.212,0L50,61.294l11.438,11.438
-		c1.439,1.439,3.772,1.439,5.212,0l6.081-6.081c1.439-1.439,1.439-3.773,0-5.212L61.293,50l11.438-11.438
-		c1.439-1.439,1.439-3.773,0-5.212l-6.081-6.081c-1.439-1.439-3.772-1.439-5.212,0L50,38.706L38.562,27.268
-		c-1.439-1.439-3.772-1.439-5.212,0l-6.081,6.081c-1.439,1.439-1.439,3.773,0,5.212L38.707,50L27.269,61.438
-		C25.829,62.878,25.829,65.211,27.269,66.651z"/>
-	<path style="fill:#1D1D1B;" d="M83.032,4.856H16.968c-6.611,0-11.989,5.378-11.989,11.989v66.064
-		c0,6.611,5.378,11.989,11.989,11.989h66.064c6.611,0,11.989-5.378,11.989-11.989V16.845C95.021,10.234,89.644,4.856,83.032,4.856z
-		 M80.021,79.898H19.979V19.856h60.043V79.898z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M27.269,66.651l6.081,6.081c1.439,1.439,3.772,1.439,5.212,0L50,61.294l11.438,11.438
+		c1.439,1.439,3.772,1.439,5.212,0l6.081-6.081c1.439-1.439,1.439-3.773,0-5.212L61.293,50l11.438-11.438
+		c1.439-1.439,1.439-3.773,0-5.212l-6.081-6.081c-1.439-1.439-3.772-1.439-5.212,0L50,38.706L38.562,27.268
+		c-1.439-1.439-3.772-1.439-5.212,0l-6.081,6.081c-1.439,1.439-1.439,3.773,0,5.212L38.707,50L27.269,61.438
+		C25.829,62.878,25.829,65.211,27.269,66.651z"/>
+	<path style="fill:#1D1D1B;" d="M83.032,4.856H16.968c-6.611,0-11.989,5.378-11.989,11.989v66.064
+		c0,6.611,5.378,11.989,11.989,11.989h66.064c6.611,0,11.989-5.378,11.989-11.989V16.845C95.021,10.234,89.644,4.856,83.032,4.856z
+		 M80.021,79.898H19.979V19.856h60.043V79.898z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/cross.svg -> v0.6.1.tar.gz/gui/icons/cross.svg Changed

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M89.233,21.263L78.737,10.767c-2.484-2.484-6.512-2.484-8.996,0L50,30.508L30.258,10.767
-		c-2.484-2.484-6.512-2.484-8.996,0L10.767,21.263c-2.484,2.484-2.484,6.512,0,8.996L30.509,50L10.767,69.741
-		c-2.484,2.484-2.484,6.512,0,8.996l10.496,10.495c2.484,2.484,6.512,2.484,8.996,0L50,69.491l19.742,19.741
-		c2.484,2.484,6.512,2.484,8.996,0l10.496-10.495c2.484-2.484,2.484-6.512,0-8.996L69.491,50l19.742-19.741
-		C91.717,27.774,91.717,23.747,89.233,21.263z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M89.233,21.263L78.737,10.767c-2.484-2.484-6.512-2.484-8.996,0L50,30.508L30.258,10.767
+		c-2.484-2.484-6.512-2.484-8.996,0L10.767,21.263c-2.484,2.484-2.484,6.512,0,8.996L30.509,50L10.767,69.741
+		c-2.484,2.484-2.484,6.512,0,8.996l10.496,10.495c2.484,2.484,6.512,2.484,8.996,0L50,69.491l19.742,19.741
+		c2.484,2.484,6.512,2.484,8.996,0l10.496-10.495c2.484-2.484,2.484-6.512,0-8.996L69.491,50l19.742-19.741
+		C91.717,27.774,91.717,23.747,89.233,21.263z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/down.svg -> v0.6.1.tar.gz/gui/icons/down.svg Changed

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="22.062px" height="13.725px" viewBox="0 0 22.062 13.725" enable-background="new 0 0 22.062 13.725" xml:space="preserve">
-<path d="M21.453,1.345l-0.737-0.737c-0.808-0.81-2.134-0.81-2.943,0L11.03,7.35L4.288,0.608c-0.809-0.81-2.135-0.81-2.944,0
-	L0.607,1.345c-0.811,0.809-0.811,2.135,0,2.945l8.835,8.835c0.435,0.435,1.018,0.628,1.587,0.597
-	c0.571,0.031,1.154-0.162,1.588-0.597l8.836-8.835C22.263,3.481,22.263,2.155,21.453,1.345z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="22.062px" height="13.725px" viewBox="0 0 22.062 13.725" enable-background="new 0 0 22.062 13.725" xml:space="preserve">
+<path d="M21.453,1.345l-0.737-0.737c-0.808-0.81-2.134-0.81-2.943,0L11.03,7.35L4.288,0.608c-0.809-0.81-2.135-0.81-2.944,0
+	L0.607,1.345c-0.811,0.809-0.811,2.135,0,2.945l8.835,8.835c0.435,0.435,1.018,0.628,1.587,0.597
+	c0.571,0.031,1.154-0.162,1.588-0.597l8.836-8.835C22.263,3.481,22.263,2.155,21.453,1.345z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/expand.svg -> v0.6.1.tar.gz/gui/icons/expand.svg Changed

@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28.36px"
-	 height="27.443px" viewBox="0 0 28.36 27.443" style="enable-background:new 0 0 28.36 27.443;" xml:space="preserve">
-<g id="c115_arrows">
-	<path style="fill:#000000;" d="M28.36,19.136c0-0.868-0.665-1.57-1.491-1.57c-0.819,0.002-1.492,0.702-1.492,1.57v3.25
-		l-6.018-6.021c-0.582-0.583-1.524-0.583-2.106,0c-0.582,0.582-0.582,1.527,0,2.109l5.989,5.987h-3.235
-		c-0.881,0.002-1.591,0.669-1.591,1.491c0,0.824,0.71,1.49,1.591,1.49h6.761c0.881,0,1.59-0.665,1.593-1.49
-		c-0.003-0.022-0.006-0.039-0.009-0.061c0.003-0.028,0.009-0.058,0.009-0.087V19.136z"/>
-	<path style="fill:#000000;" d="M9,16.365l-6.015,6.021v-3.25c0-0.868-0.672-1.568-1.493-1.57c-0.824,0-1.49,0.702-1.49,1.57
-		L0,25.806c0,0.029,0.008,0.059,0.01,0.087c-0.002,0.021-0.006,0.038-0.008,0.061c0.002,0.825,0.712,1.49,1.592,1.49h6.762
-		c0.879,0,1.59-0.666,1.59-1.49c0-0.822-0.711-1.489-1.59-1.491H5.121l5.989-5.987c0.58-0.582,0.58-1.527,0-2.109
-		C10.527,15.782,9.584,15.782,9,16.365z"/>
-	<path style="fill:#000000;" d="M19.359,11.076l6.018-6.017v3.25c0,0.865,0.673,1.565,1.492,1.568c0.826,0,1.491-0.703,1.491-1.568
-		V1.638c0-0.029-0.006-0.059-0.009-0.085c0.003-0.021,0.006-0.041,0.009-0.062C28.357,0.665,27.648,0,26.768,0h-6.761
-		c-0.881,0-1.591,0.665-1.591,1.491c0,0.821,0.71,1.49,1.591,1.492h3.235l-5.989,5.987c-0.582,0.581-0.582,1.524,0,2.105
-		C17.835,11.661,18.777,11.661,19.359,11.076z"/>
-	<path style="fill:#000000;" d="M5.121,2.983h3.234c0.879-0.002,1.59-0.671,1.59-1.492C9.945,0.665,9.234,0,8.355,0H1.594
-		c-0.88,0-1.59,0.665-1.592,1.491C0.004,1.512,0.008,1.532,0.01,1.553C0.008,1.579,0,1.608,0,1.638L0.002,8.31
-		c0,0.865,0.666,1.568,1.49,1.568C2.313,9.875,2.985,9.175,2.985,8.31V5.06L9,11.076c0.584,0.585,1.527,0.585,2.11,0
-		c0.58-0.581,0.58-1.524,0-2.105L5.121,2.983z"/>
-</g>
-<g id="Capa_1">
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28.36px"
+	 height="27.443px" viewBox="0 0 28.36 27.443" style="enable-background:new 0 0 28.36 27.443;" xml:space="preserve">
+<g id="c115_arrows">
+	<path style="fill:#000000;" d="M28.36,19.136c0-0.868-0.665-1.57-1.491-1.57c-0.819,0.002-1.492,0.702-1.492,1.57v3.25
+		l-6.018-6.021c-0.582-0.583-1.524-0.583-2.106,0c-0.582,0.582-0.582,1.527,0,2.109l5.989,5.987h-3.235
+		c-0.881,0.002-1.591,0.669-1.591,1.491c0,0.824,0.71,1.49,1.591,1.49h6.761c0.881,0,1.59-0.665,1.593-1.49
+		c-0.003-0.022-0.006-0.039-0.009-0.061c0.003-0.028,0.009-0.058,0.009-0.087V19.136z"/>
+	<path style="fill:#000000;" d="M9,16.365l-6.015,6.021v-3.25c0-0.868-0.672-1.568-1.493-1.57c-0.824,0-1.49,0.702-1.49,1.57
+		L0,25.806c0,0.029,0.008,0.059,0.01,0.087c-0.002,0.021-0.006,0.038-0.008,0.061c0.002,0.825,0.712,1.49,1.592,1.49h6.762
+		c0.879,0,1.59-0.666,1.59-1.49c0-0.822-0.711-1.489-1.59-1.491H5.121l5.989-5.987c0.58-0.582,0.58-1.527,0-2.109
+		C10.527,15.782,9.584,15.782,9,16.365z"/>
+	<path style="fill:#000000;" d="M19.359,11.076l6.018-6.017v3.25c0,0.865,0.673,1.565,1.492,1.568c0.826,0,1.491-0.703,1.491-1.568
+		V1.638c0-0.029-0.006-0.059-0.009-0.085c0.003-0.021,0.006-0.041,0.009-0.062C28.357,0.665,27.648,0,26.768,0h-6.761
+		c-0.881,0-1.591,0.665-1.591,1.491c0,0.821,0.71,1.49,1.591,1.492h3.235l-5.989,5.987c-0.582,0.581-0.582,1.524,0,2.105
+		C17.835,11.661,18.777,11.661,19.359,11.076z"/>
+	<path style="fill:#000000;" d="M5.121,2.983h3.234c0.879-0.002,1.59-0.671,1.59-1.492C9.945,0.665,9.234,0,8.355,0H1.594
+		c-0.88,0-1.59,0.665-1.592,1.491C0.004,1.512,0.008,1.532,0.01,1.553C0.008,1.579,0,1.608,0,1.638L0.002,8.31
+		c0,0.865,0.666,1.568,1.49,1.568C2.313,9.875,2.985,9.175,2.985,8.31V5.06L9,11.076c0.584,0.585,1.527,0.585,2.11,0
+		c0.58-0.581,0.58-1.524,0-2.105L5.121,2.983z"/>
+</g>
+<g id="Capa_1">
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/file.svg -> v0.6.1.tar.gz/gui/icons/file.svg Changed

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M21.75,91.25H50.5V66.5c0-1.657,1.343-3,3-3h24.75V8.75h-56.5V91.25z"/>
-	<polygon style="fill:#1D1D1B;" points="53.5,91.168 53.5,91.25 61.685,83.066 78.25,66.5 53.5,66.5 	"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M21.75,91.25H50.5V66.5c0-1.657,1.343-3,3-3h24.75V8.75h-56.5V91.25z"/>
+	<polygon style="fill:#1D1D1B;" points="53.5,91.168 53.5,91.25 61.685,83.066 78.25,66.5 53.5,66.5 	"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/film.svg -> v0.6.1.tar.gz/gui/icons/film.svg Changed

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M92.682,9.424c0,0-0.417,0-0.932,0s-0.932,0.437-0.932,0.977v0.977c0,1.765-1.431,3.196-3.196,3.196
-		h-8.523c-1.765,0-3.196-1.431-3.196-3.196c0,0,0-0.437,0-0.977c0-0.539-0.417-0.977-0.932-0.977h-0.932h-47.41c0,0-0.417,0-0.932,0
-		c-0.515,0-0.932,0.437-0.932,0.977v0.977c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196
-		c0,0,0-0.437,0-0.977c0-0.539-0.417-0.977-0.932-0.977H7.984c-1.765,0-3.196,1.431-3.196,3.196v74.755
-		c0,1.765,1.431,3.196,3.196,3.196c0,0,0.417,0,0.932,0s0.932-0.437,0.932-0.977v-0.977c0-1.765,1.431-3.196,3.196-3.196h8.523
-		c0.726,0,1.394,0.243,1.93,0.652c0.439,0.335,0.689,1.167,0.689,1.719v1.867c0,0.552,0.448,1,1,1H75.48c0.552,0,1-0.448,1-1v-1.867
-		c0-0.552,0.25-1.384,0.689-1.719c0.536-0.409,1.204-0.652,1.93-0.652h8.523c1.765,0,3.196,1.431,3.196,3.196c0,0,0,0.437,0,0.977
-		s0.417,0.977,0.932,0.977h0.932c1.765,0,3.196-1.431,3.196-3.196V12.62C95.879,10.855,94.448,9.424,92.682,9.424z M24.764,75.3
-		c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523
-		c1.765,0,3.196,1.431,3.196,3.196V75.3z M24.764,53.992c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196
-		v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V53.992z M24.764,32.685
-		c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523
-		c1.765,0,3.196,1.431,3.196,3.196V32.685z M70.753,79.361c0,0.552-0.448,1-1,1h-38.84c-0.552,0-1-0.448-1-1V57.034
-		c0-0.552,0.448-1,1-1h38.84c0.552,0,1,0.448,1,1V79.361z M70.753,42.25c0,0.552-0.448,1-1,1h-38.84c-0.552,0-1-0.448-1-1V20.811
-		c0-0.552,0.448-1,1-1h38.84c0.552,0,1,0.448,1,1V42.25z M90.818,75.3c0,1.765-1.431,3.196-3.196,3.196h-8.523
-		c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V75.3z
-		 M90.818,53.992c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196
-		h8.523c1.765,0,3.196,1.431,3.196,3.196V53.992z M90.818,32.685c0,1.765-1.431,3.196-3.196,3.196h-8.523
-		c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V32.685z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M92.682,9.424c0,0-0.417,0-0.932,0s-0.932,0.437-0.932,0.977v0.977c0,1.765-1.431,3.196-3.196,3.196
+		h-8.523c-1.765,0-3.196-1.431-3.196-3.196c0,0,0-0.437,0-0.977c0-0.539-0.417-0.977-0.932-0.977h-0.932h-47.41c0,0-0.417,0-0.932,0
+		c-0.515,0-0.932,0.437-0.932,0.977v0.977c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196
+		c0,0,0-0.437,0-0.977c0-0.539-0.417-0.977-0.932-0.977H7.984c-1.765,0-3.196,1.431-3.196,3.196v74.755
+		c0,1.765,1.431,3.196,3.196,3.196c0,0,0.417,0,0.932,0s0.932-0.437,0.932-0.977v-0.977c0-1.765,1.431-3.196,3.196-3.196h8.523
+		c0.726,0,1.394,0.243,1.93,0.652c0.439,0.335,0.689,1.167,0.689,1.719v1.867c0,0.552,0.448,1,1,1H75.48c0.552,0,1-0.448,1-1v-1.867
+		c0-0.552,0.25-1.384,0.689-1.719c0.536-0.409,1.204-0.652,1.93-0.652h8.523c1.765,0,3.196,1.431,3.196,3.196c0,0,0,0.437,0,0.977
+		s0.417,0.977,0.932,0.977h0.932c1.765,0,3.196-1.431,3.196-3.196V12.62C95.879,10.855,94.448,9.424,92.682,9.424z M24.764,75.3
+		c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523
+		c1.765,0,3.196,1.431,3.196,3.196V75.3z M24.764,53.992c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196
+		v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V53.992z M24.764,32.685
+		c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523
+		c1.765,0,3.196,1.431,3.196,3.196V32.685z M70.753,79.361c0,0.552-0.448,1-1,1h-38.84c-0.552,0-1-0.448-1-1V57.034
+		c0-0.552,0.448-1,1-1h38.84c0.552,0,1,0.448,1,1V79.361z M70.753,42.25c0,0.552-0.448,1-1,1h-38.84c-0.552,0-1-0.448-1-1V20.811
+		c0-0.552,0.448-1,1-1h38.84c0.552,0,1,0.448,1,1V42.25z M90.818,75.3c0,1.765-1.431,3.196-3.196,3.196h-8.523
+		c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V75.3z
+		 M90.818,53.992c0,1.765-1.431,3.196-3.196,3.196h-8.523c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196
+		h8.523c1.765,0,3.196,1.431,3.196,3.196V53.992z M90.818,32.685c0,1.765-1.431,3.196-3.196,3.196h-8.523
+		c-1.765,0-3.196-1.431-3.196-3.196v-8.523c0-1.765,1.431-3.196,3.196-3.196h8.523c1.765,0,3.196,1.431,3.196,3.196V32.685z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/folder.svg -> v0.6.1.tar.gz/gui/icons/folder.svg Changed

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M92.535,30.884H44.106c0.703,1.063,1.306,2.162,1.776,3.098h26.731c3.738,0,7.907,2.961,8.098,6.968
-		l5.71,34.744l0.04,0.242v0.15l9.431-40.986C96.427,32.772,94.925,30.884,92.535,30.884z"/>
-	<path style="fill:#000100;" d="M72.613,36.982H43.974c-0.434-1.004-0.958-2.034-1.511-2.998c-0.325-0.565-0.659-1.107-0.994-1.606
-		c-0.358-0.533-0.716-1.02-1.06-1.434C39.673,30.058,39,29.5,38.525,29.5H9.365c-2.662,0-4.82,1.905-4.82,4.254l6.594,42.427
-		c0,2.349,1.905,4.254,4.254,4.254h63.813c0.697,0,1.345-0.184,1.926-0.481c0.678-0.347,1.253-0.86,1.659-1.5
-		c0.286-0.451,0.491-0.955,0.592-1.5c0.046-0.252,0.078-0.508,0.078-0.773l-5.743-34.945C77.718,38.887,74.962,36.982,72.613,36.982
-		z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M92.535,30.884H44.106c0.703,1.063,1.306,2.162,1.776,3.098h26.731c3.738,0,7.907,2.961,8.098,6.968
+		l5.71,34.744l0.04,0.242v0.15l9.431-40.986C96.427,32.772,94.925,30.884,92.535,30.884z"/>
+	<path style="fill:#000100;" d="M72.613,36.982H43.974c-0.434-1.004-0.958-2.034-1.511-2.998c-0.325-0.565-0.659-1.107-0.994-1.606
+		c-0.358-0.533-0.716-1.02-1.06-1.434C39.673,30.058,39,29.5,38.525,29.5H9.365c-2.662,0-4.82,1.905-4.82,4.254l6.594,42.427
+		c0,2.349,1.905,4.254,4.254,4.254h63.813c0.697,0,1.345-0.184,1.926-0.481c0.678-0.347,1.253-0.86,1.659-1.5
+		c0.286-0.451,0.491-0.955,0.592-1.5c0.046-0.252,0.078-0.508,0.078-0.773l-5.743-34.945C77.718,38.887,74.962,36.982,72.613,36.982
+		z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/harddrive.svg -> v0.6.1.tar.gz/gui/icons/harddrive.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M82.881,63.906c1.82,0,3.513,0.556,4.918,1.506l-9.692-46.196c-0.567-2.703-3.265-4.893-6.027-4.893
-		H27.918c-2.761,0-5.46,2.191-6.027,4.893L12.2,65.412c1.405-0.951,3.098-1.506,4.918-1.506H82.881z"/>
-	<path style="fill:#000100;" d="M17.119,87.011h65.763c3.203,0,5.8-2.597,5.8-5.8v-8.506c0-1.139-0.333-2.197-0.9-3.093
-		c-1.028-1.625-2.836-2.706-4.9-2.706H17.119c-2.064,0-3.872,1.082-4.9,2.706c-0.567,0.896-0.9,1.955-0.9,3.093v8.506
-		C11.319,84.415,13.916,87.011,17.119,87.011z M78.667,76.167H66.034c-0.829,0-1.5-0.671-1.5-1.5s0.671-1.5,1.5-1.5h12.633
-		c0.829,0,1.5,0.671,1.5,1.5S79.495,76.167,78.667,76.167z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M82.881,63.906c1.82,0,3.513,0.556,4.918,1.506l-9.692-46.196c-0.567-2.703-3.265-4.893-6.027-4.893
+		H27.918c-2.761,0-5.46,2.191-6.027,4.893L12.2,65.412c1.405-0.951,3.098-1.506,4.918-1.506H82.881z"/>
+	<path style="fill:#000100;" d="M17.119,87.011h65.763c3.203,0,5.8-2.597,5.8-5.8v-8.506c0-1.139-0.333-2.197-0.9-3.093
+		c-1.028-1.625-2.836-2.706-4.9-2.706H17.119c-2.064,0-3.872,1.082-4.9,2.706c-0.567,0.896-0.9,1.955-0.9,3.093v8.506
+		C11.319,84.415,13.916,87.011,17.119,87.011z M78.667,76.167H66.034c-0.829,0-1.5-0.671-1.5-1.5s0.671-1.5,1.5-1.5h12.633
+		c0.829,0,1.5,0.671,1.5,1.5S79.495,76.167,78.667,76.167z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/heart.svg -> v0.6.1.tar.gz/gui/icons/heart.svg Changed

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24.628px" height="23.411px" viewBox="0 0 24.628 23.411" enable-background="new 0 0 24.628 23.411" xml:space="preserve">
-<path d="M17.746,0c-2.334,0-4.443,1.223-5.424,3.128C11.34,1.223,9.205,0,6.871,0C3.224,0-1.667,2.94,0.56,10.962
-	c2.545,7.839,11.761,12.451,11.761,12.449c0,0.002,9.203-4.607,11.748-12.449C26.296,2.94,21.392,0,17.746,0z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24.628px" height="23.411px" viewBox="0 0 24.628 23.411" enable-background="new 0 0 24.628 23.411" xml:space="preserve">
+<path d="M17.746,0c-2.334,0-4.443,1.223-5.424,3.128C11.34,1.223,9.205,0,6.871,0C3.224,0-1.667,2.94,0.56,10.962
+	c2.545,7.839,11.761,12.451,11.761,12.449c0,0.002,9.203-4.607,11.748-12.449C26.296,2.94,21.392,0,17.746,0z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/home.svg -> v0.6.1.tar.gz/gui/icons/home.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M54.492,9.299c-2.481-2.481-6.503-2.481-8.984,0L13.927,40.88c-2.481,2.481-1.648,4.492,1.861,4.492
-		h2.379v42.461c0,1.105,0.895,2,2,2h20.667v-22c0-1.105,0.896-2,2-2h14.333c1.104,0,2,0.895,2,2v22h20.667c1.105,0,2-0.895,2-2
-		V45.372h2.379c3.508,0,4.342-2.011,1.861-4.492L54.492,9.299z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M54.492,9.299c-2.481-2.481-6.503-2.481-8.984,0L13.927,40.88c-2.481,2.481-1.648,4.492,1.861,4.492
+		h2.379v42.461c0,1.105,0.895,2,2,2h20.667v-22c0-1.105,0.896-2,2-2h14.333c1.104,0,2,0.895,2,2v22h20.667c1.105,0,2-0.895,2-2
+		V45.372h2.379c3.508,0,4.342-2.011,1.861-4.492L54.492,9.299z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/image.svg -> v0.6.1.tar.gz/gui/icons/image.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M89.5,20h-79c-2.761,0-5,2.239-5,5v50c0,2.761,2.239,5,5,5h79c2.761,0,5-2.239,5-5V25
-		C94.5,22.239,92.261,20,89.5,20z M49.288,73.572H32.383h-15.05c-2.761,0-3.417-1.583-1.464-3.536L29.775,56.13
-		c0.976-0.976,2.256-1.464,3.536-1.464c1.28,0,2.559,0.488,3.536,1.464l3.989,3.989l9.917,9.917
-		C52.705,71.989,52.05,73.572,49.288,73.572z M22.333,29.5c4.418,0,8,3.582,8,8s-3.582,8-8,8c-4.418,0-8-3.582-8-8
-		S17.915,29.5,22.333,29.5z M86.239,73.572H54.603c0.355-0.94,0.77-3.158-1.729-5.657l-9.917-9.917L55.775,45.18
-		c1.953-1.953,5.118-1.953,7.071,0l24.857,24.857C89.656,71.989,89,73.572,86.239,73.572z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M89.5,20h-79c-2.761,0-5,2.239-5,5v50c0,2.761,2.239,5,5,5h79c2.761,0,5-2.239,5-5V25
+		C94.5,22.239,92.261,20,89.5,20z M49.288,73.572H32.383h-15.05c-2.761,0-3.417-1.583-1.464-3.536L29.775,56.13
+		c0.976-0.976,2.256-1.464,3.536-1.464c1.28,0,2.559,0.488,3.536,1.464l3.989,3.989l9.917,9.917
+		C52.705,71.989,52.05,73.572,49.288,73.572z M22.333,29.5c4.418,0,8,3.582,8,8s-3.582,8-8,8c-4.418,0-8-3.582-8-8
+		S17.915,29.5,22.333,29.5z M86.239,73.572H54.603c0.355-0.94,0.77-3.158-1.729-5.657l-9.917-9.917L55.775,45.18
+		c1.953-1.953,5.118-1.953,7.071,0l24.857,24.857C89.656,71.989,89,73.572,86.239,73.572z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/info.svg -> v0.6.1.tar.gz/gui/icons/info.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M62.87,81.493h-3.06V32.951c0-0.827-0.303-1.545-0.908-2.152c-0.606-0.605-1.323-0.908-2.151-0.908
-		H38.39c-0.829,0-1.546,0.303-2.152,0.908c-0.606,0.607-0.909,1.324-0.909,2.152v6.12c0,0.829,0.303,1.546,0.909,2.152
-		c0.605,0.607,1.322,0.91,2.152,0.91h3.06v39.36h-3.06c-0.829,0-1.546,0.303-2.152,0.908c-0.606,0.607-0.909,1.324-0.909,2.152v6.12
-		c0,0.829,0.303,1.546,0.909,2.152c0.605,0.607,1.322,0.91,2.152,0.91h24.48c0.829,0,1.546-0.303,2.152-0.91
-		c0.605-0.605,0.909-1.322,0.909-2.152v-6.12c0-0.827-0.303-1.545-0.909-2.152C64.416,81.795,63.698,81.493,62.87,81.493z"/>
-	<circle style="fill:#1D1D1B;" cx="50" cy="15.281" r="10.281"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M62.87,81.493h-3.06V32.951c0-0.827-0.303-1.545-0.908-2.152c-0.606-0.605-1.323-0.908-2.151-0.908
+		H38.39c-0.829,0-1.546,0.303-2.152,0.908c-0.606,0.607-0.909,1.324-0.909,2.152v6.12c0,0.829,0.303,1.546,0.909,2.152
+		c0.605,0.607,1.322,0.91,2.152,0.91h3.06v39.36h-3.06c-0.829,0-1.546,0.303-2.152,0.908c-0.606,0.607-0.909,1.324-0.909,2.152v6.12
+		c0,0.829,0.303,1.546,0.909,2.152c0.605,0.607,1.322,0.91,2.152,0.91h24.48c0.829,0,1.546-0.303,2.152-0.91
+		c0.605-0.605,0.909-1.322,0.909-2.152v-6.12c0-0.827-0.303-1.545-0.909-2.152C64.416,81.795,63.698,81.493,62.87,81.493z"/>
+	<circle style="fill:#1D1D1B;" cx="50" cy="15.281" r="10.281"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/laptop.svg -> v0.6.1.tar.gz/gui/icons/laptop.svg Changed

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M16.871,71.484h65.644c2.655,0,4.927-0.945,6.818-2.836c1.89-1.889,2.836-4.163,2.836-6.817V19.355
-		c0-2.655-0.946-4.927-2.836-6.818c-1.891-1.889-4.163-2.835-6.818-2.835H16.871c-2.655,0-4.927,0.946-6.818,2.835
-		c-1.891,1.891-2.836,4.163-2.836,6.818V61.83c0,2.654,0.945,4.928,2.836,6.817C11.943,70.539,14.216,71.484,16.871,71.484z
-		 M13.776,18.072H85.61v43.801H13.776V18.072z"/>
-	<path style="fill:#1D1D1B;" d="M9.537,84.75h80.312c2.42,0,4.381-1.962,4.381-4.381v-1.031c0-2.42-1.962-4.381-4.381-4.381H9.537
-		c-2.42,0-4.381,1.962-4.381,4.381v1.031C5.156,82.788,7.117,84.75,9.537,84.75z M77.071,77.791h9.278
-		c0.854,0,1.546,0.692,1.546,1.546c0,0.854-0.692,1.546-1.546,1.546h-9.278c-0.854,0-1.546-0.692-1.546-1.546
-		C75.524,78.484,76.217,77.791,77.071,77.791z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M16.871,71.484h65.644c2.655,0,4.927-0.945,6.818-2.836c1.89-1.889,2.836-4.163,2.836-6.817V19.355
+		c0-2.655-0.946-4.927-2.836-6.818c-1.891-1.889-4.163-2.835-6.818-2.835H16.871c-2.655,0-4.927,0.946-6.818,2.835
+		c-1.891,1.891-2.836,4.163-2.836,6.818V61.83c0,2.654,0.945,4.928,2.836,6.817C11.943,70.539,14.216,71.484,16.871,71.484z
+		 M13.776,18.072H85.61v43.801H13.776V18.072z"/>
+	<path style="fill:#1D1D1B;" d="M9.537,84.75h80.312c2.42,0,4.381-1.962,4.381-4.381v-1.031c0-2.42-1.962-4.381-4.381-4.381H9.537
+		c-2.42,0-4.381,1.962-4.381,4.381v1.031C5.156,82.788,7.117,84.75,9.537,84.75z M77.071,77.791h9.278
+		c0.854,0,1.546,0.692,1.546,1.546c0,0.854-0.692,1.546-1.546,1.546h-9.278c-0.854,0-1.546-0.692-1.546-1.546
+		C75.524,78.484,76.217,77.791,77.071,77.791z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/left.svg -> v0.6.1.tar.gz/gui/icons/left.svg Changed

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13.725px" height="22.062px" viewBox="0 0 13.725 22.062" enable-background="new 0 0 13.725 22.062" xml:space="preserve">
-<path d="M6.375,11.03l6.742-6.742c0.81-0.809,0.81-2.135,0-2.944L12.38,0.607c-0.81-0.811-2.135-0.811-2.945,0L0.6,9.442
-	c-0.435,0.434-0.628,1.017-0.597,1.589c-0.031,0.571,0.162,1.154,0.597,1.588l8.835,8.834c0.81,0.811,2.135,0.811,2.945,0
-	l0.737-0.737c0.81-0.808,0.81-2.134,0-2.943L6.375,11.03z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.725px" height="22.062px" viewBox="0 0 13.725 22.062" enable-background="new 0 0 13.725 22.062" xml:space="preserve">
+<path d="M6.375,11.03l6.742-6.742c0.81-0.809,0.81-2.135,0-2.944L12.38,0.607c-0.81-0.811-2.135-0.811-2.945,0L0.6,9.442
+	c-0.435,0.434-0.628,1.017-0.597,1.589c-0.031,0.571,0.162,1.154,0.597,1.588l8.835,8.834c0.81,0.811,2.135,0.811,2.945,0
+	l0.737-0.737c0.81-0.808,0.81-2.134,0-2.943L6.375,11.03z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/list.svg -> v0.6.1.tar.gz/gui/icons/list.svg Changed

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M89.5,12.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
-		c2.347,0,4.25-1.903,4.25-4.25C93.75,14.028,91.847,12.125,89.5,12.125z"/>
-	<path style="fill:#1D1D1B;" d="M89.5,34.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
-		c2.347,0,4.25-1.903,4.25-4.25C93.75,36.028,91.847,34.125,89.5,34.125z"/>
-	<path style="fill:#1D1D1B;" d="M89.5,56.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
-		c2.347,0,4.25-1.903,4.25-4.25C93.75,58.028,91.847,56.125,89.5,56.125z"/>
-	<path style="fill:#1D1D1B;" d="M89.5,79.375h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
-		c2.347,0,4.25-1.903,4.25-4.25C93.75,81.278,91.847,79.375,89.5,79.375z"/>
-	<circle style="fill:#1D1D1B;" cx="10.333" cy="16.375" r="4.25"/>
-	<circle style="fill:#1D1D1B;" cx="10.333" cy="38.375" r="4.25"/>
-	<circle style="fill:#1D1D1B;" cx="10.333" cy="60.375" r="4.25"/>
-	<circle style="fill:#1D1D1B;" cx="10.333" cy="83.625" r="4.25"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M89.5,12.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,14.028,91.847,12.125,89.5,12.125z"/>
+	<path style="fill:#1D1D1B;" d="M89.5,34.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,36.028,91.847,34.125,89.5,34.125z"/>
+	<path style="fill:#1D1D1B;" d="M89.5,56.125h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,58.028,91.847,56.125,89.5,56.125z"/>
+	<path style="fill:#1D1D1B;" d="M89.5,79.375h-57c-2.347,0-4.25,1.903-4.25,4.25c0,2.347,1.903,4.25,4.25,4.25h57
+		c2.347,0,4.25-1.903,4.25-4.25C93.75,81.278,91.847,79.375,89.5,79.375z"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="16.375" r="4.25"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="38.375" r="4.25"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="60.375" r="4.25"/>
+	<circle style="fill:#1D1D1B;" cx="10.333" cy="83.625" r="4.25"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/live.svg -> v0.6.1.tar.gz/gui/icons/live.svg Changed

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<path d="M31.104,20.789H25.52v-4.483h4.617C30.73,17.754,31.057,19.261,31.104,20.789z M31.094,21.827H25.52v4.483h4.502
-	C30.654,24.854,31.016,23.347,31.094,21.827z M24.48,16.306h-4.617c-0.594,1.449-0.919,2.957-0.967,4.483h5.584V16.306z
-	 M24.48,15.267v-5.258c-1.808,1.635-3.199,3.402-4.139,5.258H24.48z M34.673,15.267c-1.696-2.713-4.435-4.582-7.563-5.167
-	c1.621,1.626,2.865,3.363,3.705,5.167H34.673z M32.143,20.789h4.25c-0.072-1.573-0.455-3.08-1.142-4.483h-4
-	C31.799,17.759,32.1,19.267,32.143,20.789z M31.148,26.31h4.103c0.687-1.403,1.069-2.91,1.142-4.483h-4.259
-	C32.061,23.347,31.729,24.854,31.148,26.31z M24.48,26.31v-4.483h-5.575c0.08,1.52,0.44,3.027,1.073,4.483H24.48z M25.52,9.992
-	v5.275h4.14C28.711,13.396,27.307,11.617,25.52,9.992z M22.89,10.1c-3.129,0.585-5.866,2.454-7.563,5.167h3.858
-	C20.025,13.462,21.27,11.727,22.89,10.1z M18.852,26.31c-0.581-1.456-0.912-2.963-0.985-4.483h-4.258
-	c0.07,1.573,0.454,3.08,1.14,4.483H18.852z M37.371,29.498v10.51H12.629v-10.51h4.448c-0.658-0.64-1.251-1.353-1.75-2.149h3.986
-	c0.357,0.731,0.798,1.446,1.284,2.149h1.277c-0.528-0.701-1.005-1.416-1.395-2.149h4.002v2.149h1.039v-2.149h4.002
-	c-0.39,0.733-0.867,1.448-1.395,2.149h1.275c0.486-0.703,0.927-1.418,1.285-2.149h3.985c-0.499,0.797-1.092,1.51-1.75,2.149H37.371z
-	 M20.237,36.963h-3.41v-5.641h-0.718h-0.714v6.859h4.843v-0.612L20.237,36.963L20.237,36.963z M22.26,31.322h-0.718h-0.714v6.859
-	h0.719h0.713V31.322z M28.775,31.322h-0.74h-0.737l-1.502,5.234l-1.507-5.234h-0.761h-0.761l2.324,6.859h0.681h0.683L28.775,31.322z
-	 M34.605,36.963h-3.773v-1.787h3.354v-0.592v-0.588h-3.354v-1.455h3.616v-0.613v-0.605H29.4v6.858h5.207v-0.612v-0.605H34.605z
-	 M18.749,16.306h-4c-0.686,1.403-1.07,2.91-1.14,4.483h4.249C17.901,19.267,18.201,17.759,18.749,16.306z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path d="M31.104,20.789H25.52v-4.483h4.617C30.73,17.754,31.057,19.261,31.104,20.789z M31.094,21.827H25.52v4.483h4.502
+	C30.654,24.854,31.016,23.347,31.094,21.827z M24.48,16.306h-4.617c-0.594,1.449-0.919,2.957-0.967,4.483h5.584V16.306z
+	 M24.48,15.267v-5.258c-1.808,1.635-3.199,3.402-4.139,5.258H24.48z M34.673,15.267c-1.696-2.713-4.435-4.582-7.563-5.167
+	c1.621,1.626,2.865,3.363,3.705,5.167H34.673z M32.143,20.789h4.25c-0.072-1.573-0.455-3.08-1.142-4.483h-4
+	C31.799,17.759,32.1,19.267,32.143,20.789z M31.148,26.31h4.103c0.687-1.403,1.069-2.91,1.142-4.483h-4.259
+	C32.061,23.347,31.729,24.854,31.148,26.31z M24.48,26.31v-4.483h-5.575c0.08,1.52,0.44,3.027,1.073,4.483H24.48z M25.52,9.992
+	v5.275h4.14C28.711,13.396,27.307,11.617,25.52,9.992z M22.89,10.1c-3.129,0.585-5.866,2.454-7.563,5.167h3.858
+	C20.025,13.462,21.27,11.727,22.89,10.1z M18.852,26.31c-0.581-1.456-0.912-2.963-0.985-4.483h-4.258
+	c0.07,1.573,0.454,3.08,1.14,4.483H18.852z M37.371,29.498v10.51H12.629v-10.51h4.448c-0.658-0.64-1.251-1.353-1.75-2.149h3.986
+	c0.357,0.731,0.798,1.446,1.284,2.149h1.277c-0.528-0.701-1.005-1.416-1.395-2.149h4.002v2.149h1.039v-2.149h4.002
+	c-0.39,0.733-0.867,1.448-1.395,2.149h1.275c0.486-0.703,0.927-1.418,1.285-2.149h3.985c-0.499,0.797-1.092,1.51-1.75,2.149H37.371z
+	 M20.237,36.963h-3.41v-5.641h-0.718h-0.714v6.859h4.843v-0.612L20.237,36.963L20.237,36.963z M22.26,31.322h-0.718h-0.714v6.859
+	h0.719h0.713V31.322z M28.775,31.322h-0.74h-0.737l-1.502,5.234l-1.507-5.234h-0.761h-0.761l2.324,6.859h0.681h0.683L28.775,31.322z
+	 M34.605,36.963h-3.773v-1.787h3.354v-0.592v-0.588h-3.354v-1.455h3.616v-0.613v-0.605H29.4v6.858h5.207v-0.612v-0.605H34.605z
+	 M18.749,16.306h-4c-0.686,1.403-1.07,2.91-1.14,4.483h4.249C17.901,19.267,18.201,17.759,18.749,16.306z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/media_next.svg -> v0.6.1.tar.gz/gui/icons/media_next.svg Changed

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M89.353,10.911H80.22c-1.681,0-3.044,1.363-3.044,3.044v27.847l-29.18-29.18
-		c-2.972-2.972-5.382-1.974-5.382,2.229v27.4L12.985,12.622c-2.972-2.972-5.382-1.974-5.382,2.229v70.887
-		c0,4.203,2.41,5.201,5.382,2.229l29.629-29.629v27.4c0,4.203,2.41,5.201,5.382,2.229l29.18-29.18v27.847
-		c0,1.681,1.363,3.044,3.044,3.044h9.133c1.681,0,3.044-1.363,3.044-3.044V13.955C92.397,12.274,91.034,10.911,89.353,10.911z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M89.353,10.911H80.22c-1.681,0-3.044,1.363-3.044,3.044v27.847l-29.18-29.18
+		c-2.972-2.972-5.382-1.974-5.382,2.229v27.4L12.985,12.622c-2.972-2.972-5.382-1.974-5.382,2.229v70.887
+		c0,4.203,2.41,5.201,5.382,2.229l29.629-29.629v27.4c0,4.203,2.41,5.201,5.382,2.229l29.18-29.18v27.847
+		c0,1.681,1.363,3.044,3.044,3.044h9.133c1.681,0,3.044-1.363,3.044-3.044V13.955C92.397,12.274,91.034,10.911,89.353,10.911z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/media_prev.svg -> v0.6.1.tar.gz/gui/icons/media_prev.svg Changed

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M87.368,12.622L57.739,42.251v-27.4c0-4.204-2.41-5.202-5.382-2.229l-29.18,29.18V13.955
-		c0-1.681-1.363-3.044-3.044-3.044H11c-1.681,0-3.044,1.363-3.044,3.044v72.679c0,1.681,1.363,3.044,3.044,3.044h9.133
-		c1.681,0,3.044-1.363,3.044-3.044V58.788l29.18,29.18c2.972,2.972,5.382,1.974,5.382-2.229v-27.4l29.629,29.629
-		c2.972,2.972,5.382,1.974,5.382-2.229V14.851C92.75,10.648,90.34,9.65,87.368,12.622z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M87.368,12.622L57.739,42.251v-27.4c0-4.204-2.41-5.202-5.382-2.229l-29.18,29.18V13.955
+		c0-1.681-1.363-3.044-3.044-3.044H11c-1.681,0-3.044,1.363-3.044,3.044v72.679c0,1.681,1.363,3.044,3.044,3.044h9.133
+		c1.681,0,3.044-1.363,3.044-3.044V58.788l29.18,29.18c2.972,2.972,5.382,1.974,5.382-2.229v-27.4l29.629,29.629
+		c2.972,2.972,5.382,1.974,5.382-2.229V14.851C92.75,10.648,90.34,9.65,87.368,12.622z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/monitor.svg -> v0.6.1.tar.gz/gui/icons/monitor.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M61.5,89.25c1.657,0,3-1.343,3-3L63,81H37l-1.5,5.25c0,1.657,1.343,3,3,3H61.5z"/>
-	<path style="fill:#000100;" d="M91.333,12H8.667c-1.657,0-3,1.343-3,3v60c0,1.657,1.343,3,3,3H37.78H62.22h29.114
-		c1.657,0,3-1.343,3-3V15C94.333,13.343,92.99,12,91.333,12z M88.25,63h-76.5V18h76.5V63z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M61.5,89.25c1.657,0,3-1.343,3-3L63,81H37l-1.5,5.25c0,1.657,1.343,3,3,3H61.5z"/>
+	<path style="fill:#000100;" d="M91.333,12H8.667c-1.657,0-3,1.343-3,3v60c0,1.657,1.343,3,3,3H37.78H62.22h29.114
+		c1.657,0,3-1.343,3-3V15C94.333,13.343,92.99,12,91.333,12z M88.25,63h-76.5V18h76.5V63z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/more.svg -> v0.6.1.tar.gz/gui/icons/more.svg Changed

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path d="M15,12c0,1.656-1.344,3-3,3c-1.657,0-3-1.344-3-3c0-1.657,1.343-3,3-3C13.656,9,15,10.343,15,12z M21,9
-	c-1.656,0-3,1.343-3,3c0,1.656,1.344,3,3,3s3-1.344,3-3C24,10.343,22.656,9,21,9z M3,9c-1.657,0-3,1.343-3,3c0,1.656,1.343,3,3,3
-	s3-1.344,3-3C6,10.343,4.657,9,3,9z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path d="M15,12c0,1.656-1.344,3-3,3c-1.657,0-3-1.344-3-3c0-1.657,1.343-3,3-3C13.656,9,15,10.343,15,12z M21,9
+	c-1.656,0-3,1.343-3,3c0,1.656,1.344,3,3,3s3-1.344,3-3C24,10.343,22.656,9,21,9z M3,9c-1.657,0-3,1.343-3,3c0,1.656,1.343,3,3,3
+	s3-1.344,3-3C6,10.343,4.657,9,3,9z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/musical.svg -> v0.6.1.tar.gz/gui/icons/musical.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M91.897,10.873H27.891c-1.208,0-2.188,0.98-2.188,2.188v6.018v14.224v25.133
-		c-1.551-0.506-3.203-0.789-4.924-0.789c-8.762,0-15.865,7.103-15.865,15.865s7.103,15.865,15.865,15.865
-		s15.865-7.103,15.865-15.865c0-0.067-0.009-0.132-0.01-0.199c0.001-0.025,0.01-0.049,0.01-0.075V35.491h46.5v22.945
-		c-1.551-0.506-3.203-0.789-4.924-0.789c-8.762,0-15.865,7.103-15.865,15.865s7.103,15.865,15.865,15.865
-		s15.865-7.103,15.865-15.865c0-0.067-0.009-0.132-0.01-0.199c0.001-0.025,0.01-0.049,0.01-0.075V33.303V19.079v-6.018
-		C94.086,11.853,93.106,10.873,91.897,10.873z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M91.897,10.873H27.891c-1.208,0-2.188,0.98-2.188,2.188v6.018v14.224v25.133
+		c-1.551-0.506-3.203-0.789-4.924-0.789c-8.762,0-15.865,7.103-15.865,15.865s7.103,15.865,15.865,15.865
+		s15.865-7.103,15.865-15.865c0-0.067-0.009-0.132-0.01-0.199c0.001-0.025,0.01-0.049,0.01-0.075V35.491h46.5v22.945
+		c-1.551-0.506-3.203-0.789-4.924-0.789c-8.762,0-15.865,7.103-15.865,15.865s7.103,15.865,15.865,15.865
+		s15.865-7.103,15.865-15.865c0-0.067-0.009-0.132-0.01-0.199c0.001-0.025,0.01-0.049,0.01-0.075V33.303V19.079v-6.018
+		C94.086,11.853,93.106,10.873,91.897,10.873z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/navigation.svg -> v0.6.1.tar.gz/gui/icons/navigation.svg Changed

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M51.763,5.879c-0.974-1.706-2.552-1.706-3.525,0L36.032,27.271
-		c-0.974,1.706-0.171,3.089,1.794,3.089h24.348c1.965,0,2.768-1.383,1.794-3.089L51.763,5.879z"/>
-	<path style="fill:#1D1D1B;" d="M62.174,69.225H37.826c-1.965,0-2.768,1.383-1.794,3.089l12.205,21.392
-		c0.974,1.706,2.552,1.706,3.525,0l12.205-21.392C64.941,70.608,64.139,69.225,62.174,69.225z"/>
-	<path style="fill:#1D1D1B;" d="M93.913,48.03L72.521,35.824c-1.706-0.973-3.089-0.17-3.089,1.794v24.348
-		c0,1.964,1.383,2.767,3.089,1.794l21.392-12.206C95.619,50.581,95.619,49.003,93.913,48.03z"/>
-	<path style="fill:#1D1D1B;" d="M27.479,35.824L6.087,48.03c-1.706,0.973-1.706,2.552,0,3.525L27.479,63.76
-		c1.706,0.973,3.089,0.17,3.089-1.794V37.618C30.567,35.654,29.185,34.851,27.479,35.824z"/>
-	<circle style="fill:#1D1D1B;" cx="50" cy="49.792" r="12.374"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M51.763,5.879c-0.974-1.706-2.552-1.706-3.525,0L36.032,27.271
+		c-0.974,1.706-0.171,3.089,1.794,3.089h24.348c1.965,0,2.768-1.383,1.794-3.089L51.763,5.879z"/>
+	<path style="fill:#1D1D1B;" d="M62.174,69.225H37.826c-1.965,0-2.768,1.383-1.794,3.089l12.205,21.392
+		c0.974,1.706,2.552,1.706,3.525,0l12.205-21.392C64.941,70.608,64.139,69.225,62.174,69.225z"/>
+	<path style="fill:#1D1D1B;" d="M93.913,48.03L72.521,35.824c-1.706-0.973-3.089-0.17-3.089,1.794v24.348
+		c0,1.964,1.383,2.767,3.089,1.794l21.392-12.206C95.619,50.581,95.619,49.003,93.913,48.03z"/>
+	<path style="fill:#1D1D1B;" d="M27.479,35.824L6.087,48.03c-1.706,0.973-1.706,2.552,0,3.525L27.479,63.76
+		c1.706,0.973,3.089,0.17,3.089-1.794V37.618C30.567,35.654,29.185,34.851,27.479,35.824z"/>
+	<circle style="fill:#1D1D1B;" cx="50" cy="49.792" r="12.374"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/network.svg -> v0.6.1.tar.gz/gui/icons/network.svg Changed

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M92.202,63.505h-5.064V53.376c0-1.828-0.668-3.41-2.004-4.748c-1.337-1.335-2.919-2.004-4.748-2.004
-		h-27.01V36.495h5.064c1.406,0,2.602-0.49,3.587-1.476c0.984-0.984,1.478-2.179,1.478-3.588V14.55c0-1.406-0.493-2.602-1.478-3.587
-		c-0.985-0.985-2.181-1.477-3.587-1.477H41.56c-1.407,0-2.603,0.492-3.587,1.477c-0.985,0.985-1.478,2.18-1.478,3.587v16.881
-		c0,1.409,0.492,2.604,1.478,3.588c0.984,0.986,2.18,1.476,3.587,1.476h5.064v10.129h-27.01c-1.829,0-3.412,0.669-4.748,2.004
-		c-1.337,1.337-2.004,2.92-2.004,4.748v10.129H7.798c-1.407,0-2.604,0.492-3.587,1.476c-0.985,0.986-1.477,2.181-1.477,3.588V85.45
-		c0,1.406,0.492,2.602,1.477,3.588c0.984,0.984,2.18,1.476,3.587,1.476h16.881c1.406,0,2.602-0.492,3.587-1.476
-		c0.984-0.986,1.478-2.181,1.478-3.588V68.569c0-1.406-0.493-2.602-1.478-3.588c-0.985-0.984-2.181-1.476-3.587-1.476h-5.064V53.376
-		h27.01v10.129H41.56c-1.407,0-2.603,0.492-3.587,1.476c-0.985,0.986-1.478,2.181-1.478,3.588V85.45
-		c0,1.406,0.492,2.602,1.478,3.588c0.984,0.984,2.18,1.476,3.587,1.476H58.44c1.406,0,2.602-0.492,3.587-1.476
-		c0.984-0.986,1.478-2.181,1.478-3.588V68.569c0-1.406-0.493-2.602-1.478-3.588c-0.985-0.984-2.181-1.476-3.587-1.476h-5.064V53.376
-		h27.01v10.129h-5.064c-1.407,0-2.603,0.492-3.587,1.476c-0.985,0.986-1.478,2.181-1.478,3.588V85.45
-		c0,1.406,0.492,2.602,1.478,3.588c0.984,0.984,2.18,1.476,3.587,1.476h16.881c1.406,0,2.603-0.492,3.587-1.476
-		c0.984-0.986,1.477-2.181,1.477-3.588V68.569c0-1.406-0.493-2.602-1.477-3.588C94.805,63.997,93.608,63.505,92.202,63.505z
-		 M22.891,67.521c1.556,0,2.817,1.261,2.817,2.817v13.616c0,1.556-1.261,2.817-2.817,2.817H9.275c-1.556,0-2.817-1.261-2.817-2.817
-		V70.338c0-1.556,1.261-2.817,2.817-2.817H22.891z M56.808,67.521c1.556,0,2.817,1.261,2.817,2.817v13.616
-		c0,1.556-1.261,2.817-2.817,2.817H43.192c-1.556,0-2.817-1.261-2.817-2.817V70.338c0-1.556,1.261-2.817,2.817-2.817H56.808z
-		 M43.192,32.521c-1.556,0-2.817-1.261-2.817-2.817V16.088c0-1.556,1.261-2.817,2.817-2.817h13.616c1.556,0,2.817,1.261,2.817,2.817
-		v13.616c0,1.556-1.261,2.817-2.817,2.817H43.192z M93.542,83.954c0,1.556-1.261,2.817-2.817,2.817H77.109
-		c-1.556,0-2.817-1.261-2.817-2.817V70.338c0-1.556,1.261-2.817,2.817-2.817h13.616c1.556,0,2.817,1.261,2.817,2.817V83.954z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M92.202,63.505h-5.064V53.376c0-1.828-0.668-3.41-2.004-4.748c-1.337-1.335-2.919-2.004-4.748-2.004
+		h-27.01V36.495h5.064c1.406,0,2.602-0.49,3.587-1.476c0.984-0.984,1.478-2.179,1.478-3.588V14.55c0-1.406-0.493-2.602-1.478-3.587
+		c-0.985-0.985-2.181-1.477-3.587-1.477H41.56c-1.407,0-2.603,0.492-3.587,1.477c-0.985,0.985-1.478,2.18-1.478,3.587v16.881
+		c0,1.409,0.492,2.604,1.478,3.588c0.984,0.986,2.18,1.476,3.587,1.476h5.064v10.129h-27.01c-1.829,0-3.412,0.669-4.748,2.004
+		c-1.337,1.337-2.004,2.92-2.004,4.748v10.129H7.798c-1.407,0-2.604,0.492-3.587,1.476c-0.985,0.986-1.477,2.181-1.477,3.588V85.45
+		c0,1.406,0.492,2.602,1.477,3.588c0.984,0.984,2.18,1.476,3.587,1.476h16.881c1.406,0,2.602-0.492,3.587-1.476
+		c0.984-0.986,1.478-2.181,1.478-3.588V68.569c0-1.406-0.493-2.602-1.478-3.588c-0.985-0.984-2.181-1.476-3.587-1.476h-5.064V53.376
+		h27.01v10.129H41.56c-1.407,0-2.603,0.492-3.587,1.476c-0.985,0.986-1.478,2.181-1.478,3.588V85.45
+		c0,1.406,0.492,2.602,1.478,3.588c0.984,0.984,2.18,1.476,3.587,1.476H58.44c1.406,0,2.602-0.492,3.587-1.476
+		c0.984-0.986,1.478-2.181,1.478-3.588V68.569c0-1.406-0.493-2.602-1.478-3.588c-0.985-0.984-2.181-1.476-3.587-1.476h-5.064V53.376
+		h27.01v10.129h-5.064c-1.407,0-2.603,0.492-3.587,1.476c-0.985,0.986-1.478,2.181-1.478,3.588V85.45
+		c0,1.406,0.492,2.602,1.478,3.588c0.984,0.984,2.18,1.476,3.587,1.476h16.881c1.406,0,2.603-0.492,3.587-1.476
+		c0.984-0.986,1.477-2.181,1.477-3.588V68.569c0-1.406-0.493-2.602-1.477-3.588C94.805,63.997,93.608,63.505,92.202,63.505z
+		 M22.891,67.521c1.556,0,2.817,1.261,2.817,2.817v13.616c0,1.556-1.261,2.817-2.817,2.817H9.275c-1.556,0-2.817-1.261-2.817-2.817
+		V70.338c0-1.556,1.261-2.817,2.817-2.817H22.891z M56.808,67.521c1.556,0,2.817,1.261,2.817,2.817v13.616
+		c0,1.556-1.261,2.817-2.817,2.817H43.192c-1.556,0-2.817-1.261-2.817-2.817V70.338c0-1.556,1.261-2.817,2.817-2.817H56.808z
+		 M43.192,32.521c-1.556,0-2.817-1.261-2.817-2.817V16.088c0-1.556,1.261-2.817,2.817-2.817h13.616c1.556,0,2.817,1.261,2.817,2.817
+		v13.616c0,1.556-1.261,2.817-2.817,2.817H43.192z M93.542,83.954c0,1.556-1.261,2.817-2.817,2.817H77.109
+		c-1.556,0-2.817-1.261-2.817-2.817V70.338c0-1.556,1.261-2.817,2.817-2.817h13.616c1.556,0,2.817,1.261,2.817,2.817V83.954z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/next.svg -> v0.6.1.tar.gz/gui/icons/next.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M75.92,45.33L34.602,12.84c-0.904-0.634-2.518-1.319-3.614-1.457
-		c-3.552-0.447-10.65-0.802-10.65,3.504v71.194c0,4.306,7.094,3.953,10.645,3.507c1.096-0.138,2.708-0.823,3.613-1.457L75.92,55.638
-		C80.908,52.792,80.908,48.177,75.92,45.33z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M75.92,45.33L34.602,12.84c-0.904-0.634-2.518-1.319-3.614-1.457
+		c-3.552-0.447-10.65-0.802-10.65,3.504v71.194c0,4.306,7.094,3.953,10.645,3.507c1.096-0.138,2.708-0.823,3.613-1.457L75.92,55.638
+		C80.908,52.792,80.908,48.177,75.92,45.33z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/overflowing.svg -> v0.6.1.tar.gz/gui/icons/overflowing.svg Changed

@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path d="M25.856,82.795h0.004l31.031-0.044c1.378-0.002,2.5-1.125,2.5-2.503v-3.48c0-1.377-1.12-2.498-2.5-2.498l-31.031,0.043
-		c-1.378,0.002-2.5,1.125-2.5,2.503v3.482C23.36,81.675,24.48,82.795,25.856,82.795z"/>
-	<path d="M12.434,89.779c0.012,4.781,0.012,4.812,0.502,4.812c0.003,0,0.006,0,0.009,0l1.734,0.048c0.005,0,0.009,0,0.014,0
-		c0,0,14.022,0,28.044-0.006c7.012-0.003,14.023-0.008,19.281-0.015c2.629-0.003,4.821-0.007,6.354-0.012
-		c2.909-0.009,2.909-0.009,2.909-0.502l0.049-1.748V59.623c0-1.378-1.122-2.5-2.5-2.5h-1.946c-1.378,0-2.5,1.122-2.5,2.5v26.621
-		c0,0.827-0.673,1.5-1.5,1.5H20.905c-0.827,0-1.5-0.673-1.5-1.5V59.623c0-1.378-1.122-2.5-2.5-2.5H14.91c-1.378,0-2.5,1.121-2.5,2.5
-		c0,3.814,0.002,12.432,0.009,20.095C12.422,83.549,12.427,87.143,12.434,89.779z"/>
-	<path d="M26.103,70.097l30.948,2.854c0.078,0.007,0.155,0.01,0.231,0.01c1.3,0,2.364-0.978,2.477-2.274l0.299-3.447
-		c0.119-1.372-0.9-2.59-2.271-2.717l-30.899-2.853c-1.404-0.13-2.593,0.889-2.721,2.259l-0.322,3.449
-		c-0.062,0.665,0.138,1.314,0.564,1.827C24.836,69.719,25.438,70.036,26.103,70.097z"/>
-	<path d="M74.357,39.288c0.208,1.2,1.243,2.071,2.459,2.071c0.143,0,0.287-0.012,0.432-0.038l3.442-0.601
-		c1.358-0.237,2.271-1.535,2.035-2.893L77.414,7.234c-0.232-1.341-1.505-2.274-2.891-2.034l-3.442,0.601
-		c-1.358,0.237-2.271,1.535-2.035,2.893L74.357,39.288z"/>
-	<path d="M33.948,36.923L60.68,52.725c0.385,0.228,0.825,0.349,1.271,0.349c0.881,0,1.707-0.47,2.154-1.227l1.777-3
-		c0.34-0.575,0.437-1.247,0.271-1.894c-0.166-0.646-0.574-1.19-1.149-1.529L38.272,29.621c-1.146-0.678-2.751-0.261-3.426,0.878
-		l-1.776,3c-0.34,0.575-0.437,1.248-0.271,1.894C32.965,36.04,33.374,36.583,33.948,36.923z"/>
-	<path d="M66.169,44.46c0.466,0.682,1.237,1.088,2.063,1.088c0.505,0,0.993-0.151,1.411-0.438l2.844-1.95
-		c1.136-0.779,1.43-2.339,0.656-3.479l-17.47-25.678c-0.749-1.1-2.369-1.409-3.47-0.651l-2.898,1.995
-		c-1.135,0.781-1.426,2.341-0.649,3.479L66.169,44.46z"/>
-	<path d="M28.09,54.561l29.978,8.032c0.212,0.057,0.43,0.086,0.648,0.086c1.128,0,2.121-0.763,2.412-1.854l0.9-3.37
-		c0.356-1.332-0.438-2.705-1.769-3.062L30.281,46.36c-1.31-0.351-2.713,0.466-3.06,1.769l-0.9,3.371
-		C25.965,52.83,26.759,54.204,28.09,54.561z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path d="M25.856,82.795h0.004l31.031-0.044c1.378-0.002,2.5-1.125,2.5-2.503v-3.48c0-1.377-1.12-2.498-2.5-2.498l-31.031,0.043
+		c-1.378,0.002-2.5,1.125-2.5,2.503v3.482C23.36,81.675,24.48,82.795,25.856,82.795z"/>
+	<path d="M12.434,89.779c0.012,4.781,0.012,4.812,0.502,4.812c0.003,0,0.006,0,0.009,0l1.734,0.048c0.005,0,0.009,0,0.014,0
+		c0,0,14.022,0,28.044-0.006c7.012-0.003,14.023-0.008,19.281-0.015c2.629-0.003,4.821-0.007,6.354-0.012
+		c2.909-0.009,2.909-0.009,2.909-0.502l0.049-1.748V59.623c0-1.378-1.122-2.5-2.5-2.5h-1.946c-1.378,0-2.5,1.122-2.5,2.5v26.621
+		c0,0.827-0.673,1.5-1.5,1.5H20.905c-0.827,0-1.5-0.673-1.5-1.5V59.623c0-1.378-1.122-2.5-2.5-2.5H14.91c-1.378,0-2.5,1.121-2.5,2.5
+		c0,3.814,0.002,12.432,0.009,20.095C12.422,83.549,12.427,87.143,12.434,89.779z"/>
+	<path d="M26.103,70.097l30.948,2.854c0.078,0.007,0.155,0.01,0.231,0.01c1.3,0,2.364-0.978,2.477-2.274l0.299-3.447
+		c0.119-1.372-0.9-2.59-2.271-2.717l-30.899-2.853c-1.404-0.13-2.593,0.889-2.721,2.259l-0.322,3.449
+		c-0.062,0.665,0.138,1.314,0.564,1.827C24.836,69.719,25.438,70.036,26.103,70.097z"/>
+	<path d="M74.357,39.288c0.208,1.2,1.243,2.071,2.459,2.071c0.143,0,0.287-0.012,0.432-0.038l3.442-0.601
+		c1.358-0.237,2.271-1.535,2.035-2.893L77.414,7.234c-0.232-1.341-1.505-2.274-2.891-2.034l-3.442,0.601
+		c-1.358,0.237-2.271,1.535-2.035,2.893L74.357,39.288z"/>
+	<path d="M33.948,36.923L60.68,52.725c0.385,0.228,0.825,0.349,1.271,0.349c0.881,0,1.707-0.47,2.154-1.227l1.777-3
+		c0.34-0.575,0.437-1.247,0.271-1.894c-0.166-0.646-0.574-1.19-1.149-1.529L38.272,29.621c-1.146-0.678-2.751-0.261-3.426,0.878
+		l-1.776,3c-0.34,0.575-0.437,1.248-0.271,1.894C32.965,36.04,33.374,36.583,33.948,36.923z"/>
+	<path d="M66.169,44.46c0.466,0.682,1.237,1.088,2.063,1.088c0.505,0,0.993-0.151,1.411-0.438l2.844-1.95
+		c1.136-0.779,1.43-2.339,0.656-3.479l-17.47-25.678c-0.749-1.1-2.369-1.409-3.47-0.651l-2.898,1.995
+		c-1.135,0.781-1.426,2.341-0.649,3.479L66.169,44.46z"/>
+	<path d="M28.09,54.561l29.978,8.032c0.212,0.057,0.43,0.086,0.648,0.086c1.128,0,2.121-0.763,2.412-1.854l0.9-3.37
+		c0.356-1.332-0.438-2.705-1.769-3.062L30.281,46.36c-1.31-0.351-2.713,0.466-3.06,1.769l-0.9,3.371
+		C25.965,52.83,26.759,54.204,28.09,54.561z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/pause.svg -> v0.6.1.tar.gz/gui/icons/pause.svg Changed

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M38.667,7.559H26.333c-2.761,0-5,2.239-5,5v74.882c0,2.761,2.239,5,5,5h12.334c2.761,0,5-2.239,5-5
-		V12.559C43.667,9.798,41.428,7.559,38.667,7.559z"/>
-	<path style="fill:#1D1D1B;" d="M72.667,7.559H60.333c-2.761,0-5,2.239-5,5v74.882c0,2.761,2.239,5,5,5h12.334c2.761,0,5-2.239,5-5
-		V12.559C77.667,9.798,75.428,7.559,72.667,7.559z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M38.667,7.559H26.333c-2.761,0-5,2.239-5,5v74.882c0,2.761,2.239,5,5,5h12.334c2.761,0,5-2.239,5-5
+		V12.559C43.667,9.798,41.428,7.559,38.667,7.559z"/>
+	<path style="fill:#1D1D1B;" d="M72.667,7.559H60.333c-2.761,0-5,2.239-5,5v74.882c0,2.761,2.239,5,5,5h12.334c2.761,0,5-2.239,5-5
+		V12.559C77.667,9.798,75.428,7.559,72.667,7.559z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/pl_next.svg -> v0.6.1.tar.gz/gui/icons/pl_next.svg Changed

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13.373px" height="17.804px" viewBox="0 0 13.373 17.804" style="enable-background:new 0 0 13.373 17.804;"
-	 xml:space="preserve">
-<g id="c93_stop">
-	<path style="fill:#000000;" d="M0.224,0.043c0.14-0.071,0.304-0.051,0.425,0.044l10.777,8.502c0.094,0.074,0.152,0.191,0.152,0.312
-		c0,0.118-0.059,0.24-0.152,0.314L0.648,17.718c-0.072,0.056-0.162,0.086-0.25,0.086l-0.175-0.04C0.086,17.699,0,17.558,0,17.402
-		V0.403C0,0.249,0.086,0.106,0.224,0.043z"/>
-	<path style="fill:#000000;" d="M10.4,0.034h2.656c0.175,0,0.316,0.181,0.316,0.399v16.935c0,0.222-0.142,0.403-0.316,0.403H10.4
-		c-0.174,0-0.316-0.182-0.316-0.403V0.434C10.084,0.215,10.227,0.034,10.4,0.034z"/>
-</g>
-<g id="Capa_1">
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.373px" height="17.804px" viewBox="0 0 13.373 17.804" style="enable-background:new 0 0 13.373 17.804;"
+	 xml:space="preserve">
+<g id="c93_stop">
+	<path style="fill:#000000;" d="M0.224,0.043c0.14-0.071,0.304-0.051,0.425,0.044l10.777,8.502c0.094,0.074,0.152,0.191,0.152,0.312
+		c0,0.118-0.059,0.24-0.152,0.314L0.648,17.718c-0.072,0.056-0.162,0.086-0.25,0.086l-0.175-0.04C0.086,17.699,0,17.558,0,17.402
+		V0.403C0,0.249,0.086,0.106,0.224,0.043z"/>
+	<path style="fill:#000000;" d="M10.4,0.034h2.656c0.175,0,0.316,0.181,0.316,0.399v16.935c0,0.222-0.142,0.403-0.316,0.403H10.4
+		c-0.174,0-0.316-0.182-0.316-0.403V0.434C10.084,0.215,10.227,0.034,10.4,0.034z"/>
+</g>
+<g id="Capa_1">
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/pl_prev.svg -> v0.6.1.tar.gz/gui/icons/pl_prev.svg Changed

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13.373px" height="17.803px" viewBox="0 0 13.373 17.803" style="enable-background:new 0 0 13.373 17.803;"
-	 xml:space="preserve">
-<g id="c92_stop">
-	<path style="fill:#000000;" d="M13.148,0.042c-0.139-0.07-0.303-0.051-0.424,0.043L1.948,8.587C1.854,8.664,1.795,8.78,1.795,8.9
-		c0,0.119,0.059,0.24,0.153,0.314l10.776,8.502c0.071,0.057,0.162,0.086,0.249,0.086l0.175-0.039
-		c0.139-0.064,0.225-0.207,0.225-0.361V0.403C13.373,0.249,13.287,0.107,13.148,0.042z"/>
-	<path style="fill:#000000;" d="M2.973,0.033H0.315C0.143,0.033,0,0.215,0,0.434v16.936c0,0.221,0.143,0.403,0.315,0.403h2.657
-		c0.174,0,0.315-0.183,0.315-0.403V0.434C3.288,0.215,3.146,0.033,2.973,0.033z"/>
-</g>
-<g id="Capa_1">
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.373px" height="17.803px" viewBox="0 0 13.373 17.803" style="enable-background:new 0 0 13.373 17.803;"
+	 xml:space="preserve">
+<g id="c92_stop">
+	<path style="fill:#000000;" d="M13.148,0.042c-0.139-0.07-0.303-0.051-0.424,0.043L1.948,8.587C1.854,8.664,1.795,8.78,1.795,8.9
+		c0,0.119,0.059,0.24,0.153,0.314l10.776,8.502c0.071,0.057,0.162,0.086,0.249,0.086l0.175-0.039
+		c0.139-0.064,0.225-0.207,0.225-0.361V0.403C13.373,0.249,13.287,0.107,13.148,0.042z"/>
+	<path style="fill:#000000;" d="M2.973,0.033H0.315C0.143,0.033,0,0.215,0,0.434v16.936c0,0.221,0.143,0.403,0.315,0.403h2.657
+		c0.174,0,0.315-0.183,0.315-0.403V0.434C3.288,0.215,3.146,0.033,2.973,0.033z"/>
+</g>
+<g id="Capa_1">
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/play.svg -> v0.6.1.tar.gz/gui/icons/play.svg Changed

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M88.242,41.78L28.754,7.712c-8.65-4.954-15.662-0.889-15.662,9.079v67.917
-		c0,9.968,7.012,14.033,15.662,9.079L88.242,59.72C96.892,54.766,96.892,46.734,88.242,41.78z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M88.242,41.78L28.754,7.712c-8.65-4.954-15.662-0.889-15.662,9.079v67.917
+		c0,9.968,7.012,14.033,15.662,9.079L88.242,59.72C96.892,54.766,96.892,46.734,88.242,41.78z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/play_loop.svg -> v0.6.1.tar.gz/gui/icons/play_loop.svg Changed

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M94.353,39.789h-6.51c0-0.5-0.067-1.008-0.215-1.512C82.677,21.439,66.949,9.679,49.382,9.679
-		c-17.563,0-33.29,11.757-38.244,28.591c-0.835,2.839,0.789,5.818,3.628,6.653c2.836,0.834,5.817-0.789,6.653-3.628
-		c3.621-12.305,15.12-20.9,27.963-20.9c12.31,0,23.362,7.903,27.451,19.393h-6.21c-2.466,0-3.052,1.414-1.308,3.157L79.33,52.962
-		c1.744,1.744,4.571,1.744,6.315,0l10.016-10.016C97.404,41.203,96.819,39.789,94.353,39.789z"/>
-	<path style="fill:#1D1D1B;" d="M83.898,58.321c-2.838-0.832-5.818,0.788-6.652,3.628c-3.621,12.305-15.121,20.899-27.963,20.899
-		c-12.31,0-23.362-7.904-27.451-19.393h6.21c2.466,0,3.051-1.414,1.308-3.157L19.334,50.282c-1.744-1.744-4.571-1.744-6.315,0
-		L3.004,60.298c-1.744,1.744-1.158,3.157,1.308,3.157h6.509c0,0.5,0.067,1.007,0.216,1.511
-		c4.951,16.838,20.678,28.598,38.246,28.598c17.564,0,33.291-11.757,38.244-28.591C88.362,62.135,86.738,59.156,83.898,58.321z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M94.353,39.789h-6.51c0-0.5-0.067-1.008-0.215-1.512C82.677,21.439,66.949,9.679,49.382,9.679
+		c-17.563,0-33.29,11.757-38.244,28.591c-0.835,2.839,0.789,5.818,3.628,6.653c2.836,0.834,5.817-0.789,6.653-3.628
+		c3.621-12.305,15.12-20.9,27.963-20.9c12.31,0,23.362,7.903,27.451,19.393h-6.21c-2.466,0-3.052,1.414-1.308,3.157L79.33,52.962
+		c1.744,1.744,4.571,1.744,6.315,0l10.016-10.016C97.404,41.203,96.819,39.789,94.353,39.789z"/>
+	<path style="fill:#1D1D1B;" d="M83.898,58.321c-2.838-0.832-5.818,0.788-6.652,3.628c-3.621,12.305-15.121,20.899-27.963,20.899
+		c-12.31,0-23.362-7.904-27.451-19.393h6.21c2.466,0,3.051-1.414,1.308-3.157L19.334,50.282c-1.744-1.744-4.571-1.744-6.315,0
+		L3.004,60.298c-1.744,1.744-1.158,3.157,1.308,3.157h6.509c0,0.5,0.067,1.007,0.216,1.511
+		c4.951,16.838,20.678,28.598,38.246,28.598c17.564,0,33.291-11.757,38.244-28.591C88.362,62.135,86.738,59.156,83.898,58.321z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/play_shuffle.svg -> v0.6.1.tar.gz/gui/icons/play_shuffle.svg Changed

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M85.39,46.171l9.202-9.202c0.825-0.825,0.825-2.162,0-2.987L85.39,24.78
-		c-1.237-1.237-2.24-0.822-2.24,0.928v4.768H72.228c-10.57,0-17.933,5.566-23.784,11.844c-5.05-6.14-10.472-11.844-18.146-11.844
-		H10.335c-2.761,0-5,2.238-5,5s2.239,5,5,5h12.57h7.391c2.873,0,5.886,2.853,9.034,6.534c0.838,0.979,1.686,2.017,2.543,3.076
-		c-0.857,1.058-1.705,2.096-2.542,3.075c-3.149,3.68-6.161,6.534-9.035,6.534h-7.392H10.335c-2.761,0-5,2.238-5,5s2.239,5,5,5
-		h19.961c7.674,0,13.097-5.704,18.146-11.844c5.851,6.277,13.214,11.844,23.784,11.844H83.15v4.768c0,1.75,1.003,2.165,2.24,0.928
-		l9.202-9.202c0.825-0.825,0.825-2.162,0-2.987l-9.202-9.202c-1.237-1.237-2.24-0.822-2.24,0.928v4.768H72.228
-		c-0.392,0-0.769-0.033-1.149-0.057c-4.026-0.259-7.447-1.852-10.509-4.18c-2.022-1.537-3.894-3.38-5.679-5.372
-		c1.786-1.993,3.658-3.836,5.68-5.373c3.061-2.327,6.481-3.919,10.506-4.179c0.381-0.025,0.759-0.057,1.151-0.057H83.15v4.768
-		C83.15,46.993,84.153,47.408,85.39,46.171z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M85.39,46.171l9.202-9.202c0.825-0.825,0.825-2.162,0-2.987L85.39,24.78
+		c-1.237-1.237-2.24-0.822-2.24,0.928v4.768H72.228c-10.57,0-17.933,5.566-23.784,11.844c-5.05-6.14-10.472-11.844-18.146-11.844
+		H10.335c-2.761,0-5,2.238-5,5s2.239,5,5,5h12.57h7.391c2.873,0,5.886,2.853,9.034,6.534c0.838,0.979,1.686,2.017,2.543,3.076
+		c-0.857,1.058-1.705,2.096-2.542,3.075c-3.149,3.68-6.161,6.534-9.035,6.534h-7.392H10.335c-2.761,0-5,2.238-5,5s2.239,5,5,5
+		h19.961c7.674,0,13.097-5.704,18.146-11.844c5.851,6.277,13.214,11.844,23.784,11.844H83.15v4.768c0,1.75,1.003,2.165,2.24,0.928
+		l9.202-9.202c0.825-0.825,0.825-2.162,0-2.987l-9.202-9.202c-1.237-1.237-2.24-0.822-2.24,0.928v4.768H72.228
+		c-0.392,0-0.769-0.033-1.149-0.057c-4.026-0.259-7.447-1.852-10.509-4.18c-2.022-1.537-3.894-3.38-5.679-5.372
+		c1.786-1.993,3.658-3.836,5.68-5.373c3.061-2.327,6.481-3.919,10.506-4.179c0.381-0.025,0.759-0.057,1.151-0.057H83.15v4.768
+		C83.15,46.993,84.153,47.408,85.39,46.171z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/play_single.svg -> v0.6.1.tar.gz/gui/icons/play_single.svg Changed

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path d="M76.466,26.832c-0.6-0.488-1.257-0.583-1.971-0.282c-0.713,0.299-1.07,0.845-1.07,1.632v7.666H3.15
-		c-0.525,0-0.957,0.169-1.295,0.506c-0.338,0.339-0.507,0.77-0.507,1.296v19.72c0,0.526,0.169,0.957,0.507,1.296
-		s0.77,0.506,1.295,0.506h70.276v8.655c0,0.75,0.357,1.296,1.07,1.632c0.713,0.299,1.371,0.187,1.971-0.337l21.623-19.935
-		c0.376-0.376,0.563-0.827,0.563-1.351c0-0.49-0.188-0.922-0.563-1.296L76.466,26.832z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path d="M76.466,26.832c-0.6-0.488-1.257-0.583-1.971-0.282c-0.713,0.299-1.07,0.845-1.07,1.632v7.666H3.15
+		c-0.525,0-0.957,0.169-1.295,0.506c-0.338,0.339-0.507,0.77-0.507,1.296v19.72c0,0.526,0.169,0.957,0.507,1.296
+		s0.77,0.506,1.295,0.506h70.276v8.655c0,0.75,0.357,1.296,1.07,1.632c0.713,0.299,1.371,0.187,1.971-0.337l21.623-19.935
+		c0.376-0.376,0.563-0.827,0.563-1.351c0-0.49-0.188-0.922-0.563-1.296L76.466,26.832z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/power.svg -> v0.6.1.tar.gz/gui/icons/power.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M69.766,10.121c-2.966-1.473-6.568-0.263-8.042,2.706c-1.474,2.968-0.262,6.568,2.706,8.042
-		C75.576,26.403,82.5,37.565,82.5,50c0,17.921-14.58,32.5-32.5,32.5S17.5,67.921,17.5,50c0-12.437,6.926-23.6,18.075-29.133
-		c2.969-1.473,4.181-5.073,2.708-8.042s-5.072-4.179-8.042-2.708C14.98,17.691,5.5,32.973,5.5,50c0,24.537,19.962,44.5,44.5,44.5
-		S94.5,74.537,94.5,50C94.5,32.976,85.022,17.696,69.766,10.121z"/>
-	<path style="fill:#1D1D1B;" d="M50,60.5c3.313,0,6-2.687,6-6V10c0-3.313-2.687-6-6-6s-6,2.687-6,6v44.5
-		C44,57.813,46.687,60.5,50,60.5z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M69.766,10.121c-2.966-1.473-6.568-0.263-8.042,2.706c-1.474,2.968-0.262,6.568,2.706,8.042
+		C75.576,26.403,82.5,37.565,82.5,50c0,17.921-14.58,32.5-32.5,32.5S17.5,67.921,17.5,50c0-12.437,6.926-23.6,18.075-29.133
+		c2.969-1.473,4.181-5.073,2.708-8.042s-5.072-4.179-8.042-2.708C14.98,17.691,5.5,32.973,5.5,50c0,24.537,19.962,44.5,44.5,44.5
+		S94.5,74.537,94.5,50C94.5,32.976,85.022,17.696,69.766,10.121z"/>
+	<path style="fill:#1D1D1B;" d="M50,60.5c3.313,0,6-2.687,6-6V10c0-3.313-2.687-6-6-6s-6,2.687-6,6v44.5
+		C44,57.813,46.687,60.5,50,60.5z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/previous.svg -> v0.6.1.tar.gz/gui/icons/previous.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M25.214,55.509l41.318,32.49c0.904,0.634,2.518,1.319,3.613,1.457
-		c3.552,0.447,10.65,0.802,10.65-3.504V14.758c0-4.306-7.094-3.953-10.645-3.507c-1.096,0.138-2.708,0.823-3.613,1.457
-		L25.214,45.202C20.226,48.048,20.226,52.663,25.214,55.509z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M25.214,55.509l41.318,32.49c0.904,0.634,2.518,1.319,3.613,1.457
+		c3.552,0.447,10.65,0.802,10.65-3.504V14.758c0-4.306-7.094-3.953-10.645-3.507c-1.096,0.138-2.708,0.823-3.613,1.457
+		L25.214,45.202C20.226,48.048,20.226,52.663,25.214,55.509z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/remove.svg -> v0.6.1.tar.gz/gui/icons/remove.svg Changed

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M85.345,38.641H14.691c-2.376,0-4.303,1.926-4.303,4.302v11.473c0,2.376,1.926,4.302,4.303,4.302
-		h70.654c2.376,0,4.302-1.926,4.302-4.302V42.943C89.648,40.567,87.722,38.641,85.345,38.641z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M85.345,38.641H14.691c-2.376,0-4.303,1.926-4.303,4.302v11.473c0,2.376,1.926,4.302,4.303,4.302
+		h70.654c2.376,0,4.302-1.926,4.302-4.302V42.943C89.648,40.567,87.722,38.641,85.345,38.641z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/resize.svg -> v0.6.1.tar.gz/gui/icons/resize.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#000100;" d="M40.148,44.242c-0.558-0.558-1.464-0.558-2.022,0L20.351,62.017l-4.797-4.797
-		c-1.396-1.396-2.528-0.927-2.528,1.047l0,25.132c0,1.974,1.6,3.575,3.575,3.575l25.131,0c1.974,0,2.443-1.132,1.047-2.528
-		l-4.797-4.797l17.775-17.775c0.558-0.558,0.558-1.464,0-2.022L40.148,44.242z"/>
-	<path style="fill:#000100;" d="M83.399,13.026l-25.132,0c-1.974,0-2.443,1.132-1.047,2.528l4.797,4.797L44.242,38.126
-		c-0.558,0.558-0.558,1.464,0,2.022l15.61,15.61c0.558,0.558,1.464,0.558,2.022,0l17.775-17.775l4.797,4.797
-		c1.396,1.396,2.528,0.927,2.528-1.047l0-25.131C86.974,14.627,85.373,13.026,83.399,13.026z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#000100;" d="M40.148,44.242c-0.558-0.558-1.464-0.558-2.022,0L20.351,62.017l-4.797-4.797
+		c-1.396-1.396-2.528-0.927-2.528,1.047l0,25.132c0,1.974,1.6,3.575,3.575,3.575l25.131,0c1.974,0,2.443-1.132,1.047-2.528
+		l-4.797-4.797l17.775-17.775c0.558-0.558,0.558-1.464,0-2.022L40.148,44.242z"/>
+	<path style="fill:#000100;" d="M83.399,13.026l-25.132,0c-1.974,0-2.443,1.132-1.047,2.528l4.797,4.797L44.242,38.126
+		c-0.558,0.558-0.558,1.464,0,2.022l15.61,15.61c0.558,0.558,1.464,0.558,2.022,0l17.775-17.775l4.797,4.797
+		c1.396,1.396,2.528,0.927,2.528-1.047l0-25.131C86.974,14.627,85.373,13.026,83.399,13.026z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/rewind.svg -> v0.6.1.tar.gz/gui/icons/rewind.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M86.953,18.853L54.72,39.891V22.854c0-4.38-3.084-6.171-6.888-4L6.132,46.07
-		c-3.804,2.171-3.804,5.69,0,7.861l41.7,27.216c3.804,2.171,6.888,0.38,6.888-4V60.109l32.233,21.038
-		c3.804,2.171,6.888,0.38,6.888-4V22.854C93.841,18.474,90.757,16.683,86.953,18.853z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M86.953,18.853L54.72,39.891V22.854c0-4.38-3.084-6.171-6.888-4L6.132,46.07
+		c-3.804,2.171-3.804,5.69,0,7.861l41.7,27.216c3.804,2.171,6.888,0.38,6.888-4V60.109l32.233,21.038
+		c3.804,2.171,6.888,0.38,6.888-4V22.854C93.841,18.474,90.757,16.683,86.953,18.853z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/right.svg -> v0.6.1.tar.gz/gui/icons/right.svg Changed

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="13.725px" height="22.062px" viewBox="0 0 13.725 22.062" enable-background="new 0 0 13.725 22.062" xml:space="preserve">
-<path d="M13.125,9.442L4.29,0.607c-0.811-0.811-2.137-0.811-2.945,0L0.607,1.344c-0.81,0.81-0.81,2.136,0,2.944l6.742,6.742
-	l-6.742,6.742c-0.81,0.81-0.81,2.136,0,2.943l0.737,0.737c0.81,0.811,2.136,0.811,2.945,0l8.835-8.836
-	c0.435-0.434,0.628-1.017,0.597-1.588C13.753,10.459,13.56,9.876,13.125,9.442z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.725px" height="22.062px" viewBox="0 0 13.725 22.062" enable-background="new 0 0 13.725 22.062" xml:space="preserve">
+<path d="M13.125,9.442L4.29,0.607c-0.811-0.811-2.137-0.811-2.945,0L0.607,1.344c-0.81,0.81-0.81,2.136,0,2.944l6.742,6.742
+	l-6.742,6.742c-0.81,0.81-0.81,2.136,0,2.943l0.737,0.737c0.81,0.811,2.136,0.811,2.945,0l8.835-8.836
+	c0.435-0.434,0.628-1.017,0.597-1.588C13.753,10.459,13.56,9.876,13.125,9.442z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/seek_forward.svg -> v0.6.1.tar.gz/gui/icons/seek_forward.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M92.429,46.07l-41.7-27.216c-3.805-2.171-6.889-0.38-6.889,4v17.037L11.606,18.853
-		c-3.804-2.171-6.888-0.38-6.888,4v54.293c0,4.38,3.084,6.171,6.888,4L43.84,60.109v17.038c0,4.38,3.084,6.171,6.889,4l41.7-27.216
-		C96.232,51.76,96.232,48.24,92.429,46.07z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M92.429,46.07l-41.7-27.216c-3.805-2.171-6.889-0.38-6.889,4v17.037L11.606,18.853
+		c-3.804-2.171-6.888-0.38-6.888,4v54.293c0,4.38,3.084,6.171,6.888,4L43.84,60.109v17.038c0,4.38,3.084,6.171,6.889,4l41.7-27.216
+		C96.232,51.76,96.232,48.24,92.429,46.07z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/shrink.svg -> v0.6.1.tar.gz/gui/icons/shrink.svg Changed

@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="25.94px" height="25.875px" viewBox="0 0 25.94 25.875" style="enable-background:new 0 0 25.94 25.875;"
-	 xml:space="preserve">
-<path d="M10.632,11.016l-6.527-0.617c0,0-0.869,0.023-0.385-0.461c0.488-0.486,1.664-1.664,1.664-1.664S5.097,7.988,4.66,7.547
-	C3.404,6.291,1.119,4.006,0.189,3.076c0,0-0.322-0.188,0.064-0.57C0.638,2.117,2.32,0.434,2.595,0.162
-	c0.271-0.275,0.479-0.053,0.479-0.053c0.904,0.9,3.27,3.264,4.482,4.479C7.951,4.982,8.208,5.24,8.208,5.24s0.943-0.945,1.539-1.539
-	c0.592-0.592,0.588,0.301,0.588,0.301s0.826,5.848,0.826,6.547C11.162,11.059,10.632,11.016,10.632,11.016z"/>
-<path d="M15.371,14.871l6.525,0.617c0,0,0.871-0.025,0.387,0.459c-0.486,0.486-1.666,1.67-1.666,1.67s0.285,0.281,0.727,0.723
-	c1.258,1.256,3.541,3.541,4.473,4.475c0,0,0.318,0.182-0.064,0.564c-0.385,0.387-2.07,2.074-2.348,2.348
-	c-0.27,0.271-0.475,0.055-0.475,0.055c-0.904-0.906-3.27-3.268-4.484-4.482c-0.393-0.393-0.646-0.648-0.646-0.648
-	s-0.945,0.941-1.543,1.535c-0.592,0.594-0.592-0.299-0.592-0.299s-0.82-5.852-0.82-6.547C14.843,14.83,15.371,14.871,15.371,14.871z
-	"/>
-<path d="M10.994,15.305l-0.615,6.529c0,0,0.025,0.873-0.461,0.385c-0.488-0.49-1.668-1.666-1.668-1.666s-0.287,0.287-0.721,0.727
-	c-1.258,1.258-3.547,3.541-4.477,4.475c0,0-0.186,0.314-0.57-0.068s-2.066-2.072-2.344-2.34c-0.275-0.273-0.055-0.482-0.055-0.482
-	c0.904-0.9,3.266-3.268,4.482-4.482c0.395-0.393,0.652-0.65,0.652-0.65s-0.943-0.945-1.539-1.535
-	c-0.596-0.596,0.297-0.592,0.297-0.592s5.852-0.822,6.553-0.822C11.037,14.781,10.994,15.305,10.994,15.305z"/>
-<path d="M14.849,10.568l0.615-6.531c0,0-0.023-0.867,0.461-0.383c0.488,0.488,1.666,1.668,1.666,1.668s0.287-0.287,0.729-0.727
-	c1.256-1.258,3.539-3.541,4.471-4.471c0,0,0.186-0.32,0.57,0.066c0.385,0.381,2.068,2.066,2.342,2.338
-	c0.277,0.275,0.057,0.482,0.057,0.482c-0.902,0.904-3.268,3.268-4.48,4.482c-0.396,0.391-0.656,0.648-0.656,0.648
-	s0.947,0.943,1.541,1.537c0.592,0.598-0.297,0.592-0.297,0.592s-5.852,0.824-6.553,0.824C14.808,11.096,14.849,10.568,14.849,10.568
-	z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="25.94px" height="25.875px" viewBox="0 0 25.94 25.875" style="enable-background:new 0 0 25.94 25.875;"
+	 xml:space="preserve">
+<path d="M10.632,11.016l-6.527-0.617c0,0-0.869,0.023-0.385-0.461c0.488-0.486,1.664-1.664,1.664-1.664S5.097,7.988,4.66,7.547
+	C3.404,6.291,1.119,4.006,0.189,3.076c0,0-0.322-0.188,0.064-0.57C0.638,2.117,2.32,0.434,2.595,0.162
+	c0.271-0.275,0.479-0.053,0.479-0.053c0.904,0.9,3.27,3.264,4.482,4.479C7.951,4.982,8.208,5.24,8.208,5.24s0.943-0.945,1.539-1.539
+	c0.592-0.592,0.588,0.301,0.588,0.301s0.826,5.848,0.826,6.547C11.162,11.059,10.632,11.016,10.632,11.016z"/>
+<path d="M15.371,14.871l6.525,0.617c0,0,0.871-0.025,0.387,0.459c-0.486,0.486-1.666,1.67-1.666,1.67s0.285,0.281,0.727,0.723
+	c1.258,1.256,3.541,3.541,4.473,4.475c0,0,0.318,0.182-0.064,0.564c-0.385,0.387-2.07,2.074-2.348,2.348
+	c-0.27,0.271-0.475,0.055-0.475,0.055c-0.904-0.906-3.27-3.268-4.484-4.482c-0.393-0.393-0.646-0.648-0.646-0.648
+	s-0.945,0.941-1.543,1.535c-0.592,0.594-0.592-0.299-0.592-0.299s-0.82-5.852-0.82-6.547C14.843,14.83,15.371,14.871,15.371,14.871z
+	"/>
+<path d="M10.994,15.305l-0.615,6.529c0,0,0.025,0.873-0.461,0.385c-0.488-0.49-1.668-1.666-1.668-1.666s-0.287,0.287-0.721,0.727
+	c-1.258,1.258-3.547,3.541-4.477,4.475c0,0-0.186,0.314-0.57-0.068s-2.066-2.072-2.344-2.34c-0.275-0.273-0.055-0.482-0.055-0.482
+	c0.904-0.9,3.266-3.268,4.482-4.482c0.395-0.393,0.652-0.65,0.652-0.65s-0.943-0.945-1.539-1.535
+	c-0.596-0.596,0.297-0.592,0.297-0.592s5.852-0.822,6.553-0.822C11.037,14.781,10.994,15.305,10.994,15.305z"/>
+<path d="M14.849,10.568l0.615-6.531c0,0-0.023-0.867,0.461-0.383c0.488,0.488,1.666,1.668,1.666,1.668s0.287-0.287,0.729-0.727
+	c1.256-1.258,3.539-3.541,4.471-4.471c0,0,0.186-0.32,0.57,0.066c0.385,0.381,2.068,2.066,2.342,2.338
+	c0.277,0.275,0.057,0.482,0.057,0.482c-0.902,0.904-3.268,3.268-4.48,4.482c-0.396,0.391-0.656,0.648-0.656,0.648
+	s0.947,0.943,1.541,1.537c0.592,0.598-0.297,0.592-0.297,0.592s-5.852,0.824-6.553,0.824C14.808,11.096,14.849,10.568,14.849,10.568
+	z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/sort.svg -> v0.6.1.tar.gz/gui/icons/sort.svg Changed

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="216px" height="146px" viewBox="0 0 216 146" enable-background="new 0 0 216 146" xml:space="preserve">
-<g>
-	<path d="M130.193,125.143h-20.856c-0.761,0-1.385,0.244-1.874,0.734c-0.488,0.488-0.733,1.113-0.733,1.873v15.643
-		c0,0.762,0.244,1.385,0.733,1.875c0.489,0.488,1.113,0.732,1.874,0.732h20.856c0.761,0,1.386-0.244,1.873-0.732
-		c0.49-0.49,0.732-1.113,0.732-1.875V127.75c0-0.76-0.242-1.385-0.732-1.873C131.579,125.387,130.954,125.143,130.193,125.143z"/>
-	<path d="M91.086,114.714H75.443V2.607c0-0.76-0.244-1.386-0.733-1.874C74.221,0.245,73.597,0,72.836,0H57.193
-		c-0.76,0-1.386,0.244-1.874,0.733c-0.488,0.489-0.733,1.114-0.733,1.874v112.107H38.943c-1.194,0-2.009,0.543-2.444,1.629
-		c-0.435,1.033-0.244,1.983,0.57,2.853l26.071,26.072c0.598,0.487,1.222,0.731,1.874,0.731c0.706,0,1.331-0.244,1.874-0.731
-		l25.99-25.99c0.544-0.651,0.815-1.305,0.815-1.954c0-0.763-0.245-1.386-0.733-1.878C92.471,114.958,91.847,114.714,91.086,114.714z
-		"/>
-	<path d="M145.836,83.43h-36.5c-0.761,0-1.385,0.244-1.874,0.732c-0.488,0.488-0.733,1.113-0.733,1.873v15.645
-		c0,0.76,0.244,1.385,0.733,1.873c0.489,0.488,1.113,0.732,1.874,0.732h36.5c0.76,0,1.385-0.244,1.873-0.732
-		c0.489-0.488,0.734-1.113,0.734-1.873V86.035c0-0.76-0.245-1.385-0.734-1.873C147.221,83.674,146.596,83.43,145.836,83.43z"/>
-	<path d="M178.996,0.733C178.507,0.245,177.883,0,177.122,0h-67.785c-0.761,0-1.385,0.244-1.874,0.733
-		c-0.488,0.489-0.733,1.114-0.733,1.874V18.25c0,0.761,0.244,1.385,0.733,1.874c0.489,0.488,1.113,0.733,1.874,0.733h67.785
-		c0.761,0,1.385-0.244,1.874-0.733c0.488-0.489,0.732-1.113,0.732-1.874V2.607C179.729,1.847,179.484,1.221,178.996,0.733z"/>
-	<path d="M161.479,41.715h-52.143c-0.761,0-1.385,0.244-1.874,0.733c-0.488,0.489-0.733,1.113-0.733,1.874v15.643
-		c0,0.761,0.244,1.385,0.733,1.874c0.489,0.488,1.113,0.733,1.874,0.733h52.143c0.76,0,1.385-0.244,1.875-0.733
-		c0.488-0.489,0.732-1.113,0.732-1.874V44.322c0-0.761-0.244-1.386-0.732-1.874C162.863,41.96,162.238,41.715,161.479,41.715z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="216px" height="146px" viewBox="0 0 216 146" enable-background="new 0 0 216 146" xml:space="preserve">
+<g>
+	<path d="M130.193,125.143h-20.856c-0.761,0-1.385,0.244-1.874,0.734c-0.488,0.488-0.733,1.113-0.733,1.873v15.643
+		c0,0.762,0.244,1.385,0.733,1.875c0.489,0.488,1.113,0.732,1.874,0.732h20.856c0.761,0,1.386-0.244,1.873-0.732
+		c0.49-0.49,0.732-1.113,0.732-1.875V127.75c0-0.76-0.242-1.385-0.732-1.873C131.579,125.387,130.954,125.143,130.193,125.143z"/>
+	<path d="M91.086,114.714H75.443V2.607c0-0.76-0.244-1.386-0.733-1.874C74.221,0.245,73.597,0,72.836,0H57.193
+		c-0.76,0-1.386,0.244-1.874,0.733c-0.488,0.489-0.733,1.114-0.733,1.874v112.107H38.943c-1.194,0-2.009,0.543-2.444,1.629
+		c-0.435,1.033-0.244,1.983,0.57,2.853l26.071,26.072c0.598,0.487,1.222,0.731,1.874,0.731c0.706,0,1.331-0.244,1.874-0.731
+		l25.99-25.99c0.544-0.651,0.815-1.305,0.815-1.954c0-0.763-0.245-1.386-0.733-1.878C92.471,114.958,91.847,114.714,91.086,114.714z
+		"/>
+	<path d="M145.836,83.43h-36.5c-0.761,0-1.385,0.244-1.874,0.732c-0.488,0.488-0.733,1.113-0.733,1.873v15.645
+		c0,0.76,0.244,1.385,0.733,1.873c0.489,0.488,1.113,0.732,1.874,0.732h36.5c0.76,0,1.385-0.244,1.873-0.732
+		c0.489-0.488,0.734-1.113,0.734-1.873V86.035c0-0.76-0.245-1.385-0.734-1.873C147.221,83.674,146.596,83.43,145.836,83.43z"/>
+	<path d="M178.996,0.733C178.507,0.245,177.883,0,177.122,0h-67.785c-0.761,0-1.385,0.244-1.874,0.733
+		c-0.488,0.489-0.733,1.114-0.733,1.874V18.25c0,0.761,0.244,1.385,0.733,1.874c0.489,0.488,1.113,0.733,1.874,0.733h67.785
+		c0.761,0,1.385-0.244,1.874-0.733c0.488-0.489,0.732-1.113,0.732-1.874V2.607C179.729,1.847,179.484,1.221,178.996,0.733z"/>
+	<path d="M161.479,41.715h-52.143c-0.761,0-1.385,0.244-1.874,0.733c-0.488,0.489-0.733,1.113-0.733,1.874v15.643
+		c0,0.761,0.244,1.385,0.733,1.874c0.489,0.488,1.113,0.733,1.874,0.733h52.143c0.76,0,1.385-0.244,1.875-0.733
+		c0.488-0.489,0.732-1.113,0.732-1.874V44.322c0-0.761-0.244-1.386-0.732-1.874C162.863,41.96,162.238,41.715,161.479,41.715z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/speed.svg -> v0.6.1.tar.gz/gui/icons/speed.svg Changed

@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M14.026,87.661h71.346c1.187,0,2.103-0.493,2.748-1.476c4.783-7.531,7.175-15.724,7.175-24.579
-		c0-6.173-1.204-12.077-3.613-17.71c-2.409-5.631-5.649-10.483-9.72-14.554c-4.071-4.071-8.923-7.31-14.554-9.72
-		c-5.632-2.408-11.535-3.613-17.709-3.613c-6.175,0-12.078,1.205-17.709,3.613c-5.632,2.409-10.483,5.648-14.554,9.72
-		c-4.071,4.071-7.311,8.923-9.72,14.554c-2.409,5.633-3.613,11.536-3.613,17.71c0,8.89,2.392,17.083,7.175,24.579
-		C11.922,87.168,12.838,87.661,14.026,87.661z M88.199,60.667c1.086,0,1.967,0.881,1.967,1.968s-0.881,1.968-1.967,1.968H77.801
-		c-1.086,0-1.967-0.881-1.967-1.968s0.881-1.968,1.967-1.968H88.199z M68.563,41.403l7.552-7.148
-		c0.789-0.747,2.035-0.713,2.781,0.077c0.747,0.789,0.713,2.035-0.077,2.781l-7.552,7.148c-0.79,0.747-2.035,0.713-2.782-0.077
-		S67.774,42.15,68.563,41.403z M49.051,64.65l1.423-0.119l0.349-1.385l3.132-12.409c0.101-0.374,0.283-0.615,0.609-0.806
-		c0.27-0.158,0.456-0.177,0.572-0.177c0.1,0,0.205,0.016,0.315,0.047c0.356,0.1,0.591,0.281,0.786,0.606
-		c0.19,0.317,0.234,0.613,0.157,0.949l-3.14,12.439l-0.342,1.356l1.156,0.787c1.366,0.93,2.322,2.14,2.924,3.699
-		c0.595,1.543,0.673,3.086,0.235,4.731c-0.544,2.094-1.72,3.639-3.596,4.726c-1.262,0.732-2.525,1.087-3.86,1.087
-		c-0.667,0-1.361-0.092-2.065-0.275c-2.092-0.542-3.637-1.718-4.725-3.595c-1.093-1.885-1.359-3.823-0.816-5.912
-		c0.436-1.635,1.267-2.937,2.541-3.98C45.993,65.365,47.414,64.787,49.051,64.65z M47.731,24.134c0-1.087,0.881-1.968,1.968-1.968
-		c1.086,0,1.967,0.881,1.967,1.968v10.398c0,1.087-0.881,1.968-1.967,1.968c-1.087,0-1.968-0.881-1.968-1.968V24.134z
-		 M21.436,34.332c0.747-0.789,1.993-0.823,2.782-0.077l7.552,7.148c0.789,0.747,0.823,1.992,0.077,2.781
-		c-0.747,0.789-1.993,0.823-2.782,0.077l-7.552-7.148C20.724,36.366,20.689,35.121,21.436,34.332z M10.167,62.634
-		c0-1.087,0.881-1.968,1.968-1.968h10.398c1.087,0,1.968,0.881,1.968,1.968s-0.881,1.968-1.968,1.968H12.134
-		C11.047,64.602,10.167,63.721,10.167,62.634z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M14.026,87.661h71.346c1.187,0,2.103-0.493,2.748-1.476c4.783-7.531,7.175-15.724,7.175-24.579
+		c0-6.173-1.204-12.077-3.613-17.71c-2.409-5.631-5.649-10.483-9.72-14.554c-4.071-4.071-8.923-7.31-14.554-9.72
+		c-5.632-2.408-11.535-3.613-17.709-3.613c-6.175,0-12.078,1.205-17.709,3.613c-5.632,2.409-10.483,5.648-14.554,9.72
+		c-4.071,4.071-7.311,8.923-9.72,14.554c-2.409,5.633-3.613,11.536-3.613,17.71c0,8.89,2.392,17.083,7.175,24.579
+		C11.922,87.168,12.838,87.661,14.026,87.661z M88.199,60.667c1.086,0,1.967,0.881,1.967,1.968s-0.881,1.968-1.967,1.968H77.801
+		c-1.086,0-1.967-0.881-1.967-1.968s0.881-1.968,1.967-1.968H88.199z M68.563,41.403l7.552-7.148
+		c0.789-0.747,2.035-0.713,2.781,0.077c0.747,0.789,0.713,2.035-0.077,2.781l-7.552,7.148c-0.79,0.747-2.035,0.713-2.782-0.077
+		S67.774,42.15,68.563,41.403z M49.051,64.65l1.423-0.119l0.349-1.385l3.132-12.409c0.101-0.374,0.283-0.615,0.609-0.806
+		c0.27-0.158,0.456-0.177,0.572-0.177c0.1,0,0.205,0.016,0.315,0.047c0.356,0.1,0.591,0.281,0.786,0.606
+		c0.19,0.317,0.234,0.613,0.157,0.949l-3.14,12.439l-0.342,1.356l1.156,0.787c1.366,0.93,2.322,2.14,2.924,3.699
+		c0.595,1.543,0.673,3.086,0.235,4.731c-0.544,2.094-1.72,3.639-3.596,4.726c-1.262,0.732-2.525,1.087-3.86,1.087
+		c-0.667,0-1.361-0.092-2.065-0.275c-2.092-0.542-3.637-1.718-4.725-3.595c-1.093-1.885-1.359-3.823-0.816-5.912
+		c0.436-1.635,1.267-2.937,2.541-3.98C45.993,65.365,47.414,64.787,49.051,64.65z M47.731,24.134c0-1.087,0.881-1.968,1.968-1.968
+		c1.086,0,1.967,0.881,1.967,1.968v10.398c0,1.087-0.881,1.968-1.967,1.968c-1.087,0-1.968-0.881-1.968-1.968V24.134z
+		 M21.436,34.332c0.747-0.789,1.993-0.823,2.782-0.077l7.552,7.148c0.789,0.747,0.823,1.992,0.077,2.781
+		c-0.747,0.789-1.993,0.823-2.782,0.077l-7.552-7.148C20.724,36.366,20.689,35.121,21.436,34.332z M10.167,62.634
+		c0-1.087,0.881-1.968,1.968-1.968h10.398c1.087,0,1.968,0.881,1.968,1.968s-0.881,1.968-1.968,1.968H12.134
+		C11.047,64.602,10.167,63.721,10.167,62.634z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/star.svg -> v0.6.1.tar.gz/gui/icons/star.svg Changed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M92.361,35.955L67.95,30.352L52.814,7.012c-1.554-2.397-4.074-2.397-5.628,0L32.05,30.352
-		L7.639,35.955c-2.784,0.639-3.523,2.906-1.651,5.063l18.019,20.759l-2.757,25.916c-0.302,2.841,1.669,4.471,4.402,3.641L50,83.945
-		l24.347,7.39c2.733,0.83,4.704-0.801,4.402-3.641l-2.757-25.916l18.019-20.759C95.884,38.861,95.145,36.594,92.361,35.955z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M92.361,35.955L67.95,30.352L52.814,7.012c-1.554-2.397-4.074-2.397-5.628,0L32.05,30.352
+		L7.639,35.955c-2.784,0.639-3.523,2.906-1.651,5.063l18.019,20.759l-2.757,25.916c-0.302,2.841,1.669,4.471,4.402,3.641L50,83.945
+		l24.347,7.39c2.733,0.83,4.704-0.801,4.402-3.641l-2.757-25.916l18.019-20.759C95.884,38.861,95.145,36.594,92.361,35.955z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/stop.svg -> v0.6.1.tar.gz/gui/icons/stop.svg Changed

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M69.5,11.25h-39c-11.046,0-20,8.954-20,20v39c0,11.046,8.954,20,20,20h39c11.046,0,20-8.954,20-20
-		v-39C89.5,20.204,80.546,11.25,69.5,11.25z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M69.5,11.25h-39c-11.046,0-20,8.954-20,20v39c0,11.046,8.954,20,20,20h39c11.046,0,20-8.954,20-20
+		v-39C89.5,20.204,80.546,11.25,69.5,11.25z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/stop2.svg -> v0.6.1.tar.gz/gui/icons/stop2.svg Changed

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
-<g id="Layer_8">
-	<path d="M82.188,80.809c0,0.762-0.617,1.379-1.379,1.379H19.19c-0.761,0-1.378-0.617-1.378-1.379V19.191
-		c0-0.761,0.617-1.378,1.378-1.378h61.619c0.76,0,1.377,0.617,1.377,1.378v61.618H82.188z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<g id="Layer_8">
+	<path d="M82.188,80.809c0,0.762-0.617,1.379-1.379,1.379H19.19c-0.761,0-1.378-0.617-1.378-1.379V19.191
+		c0-0.761,0.617-1.378,1.378-1.378h61.619c0.76,0,1.377,0.617,1.377,1.378v61.618H82.188z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/trash.svg -> v0.6.1.tar.gz/gui/icons/trash.svg Changed

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M79,22.167H67.932C67.243,12.312,59.026,4.5,49,4.5s-18.243,7.812-18.932,17.667H19
-		c-1.657,0-3,1.343-3,3v1.667c0,1.657,1.343,3,3,3h2.526L23.5,92.667c0,1.657,1.343,3,3,3h45c1.657,0,3-1.343,3-3l1.974-62.833H79
-		c1.657,0,3-1.343,3-3v-1.667C82,23.51,80.657,22.167,79,22.167z M35.569,83.992c-1.012,0.027-1.855-0.772-1.882-1.784l-1.04-38.986
-		c-0.027-1.012,0.772-1.855,1.784-1.882c1.012-0.027,1.855,0.772,1.882,1.784l1.04,38.986C37.38,83.123,36.581,83.965,35.569,83.992
-		z M51.833,82.167C51.833,83.179,51.013,84,50,84s-1.833-0.821-1.833-1.833v-39c0-1.013,0.821-1.833,1.833-1.833
-		s1.833,0.821,1.833,1.833V82.167z M36.068,22.167C36.738,15.622,42.282,10.5,49,10.5s12.262,5.122,12.932,11.667H36.068z
-		 M65.646,82.209c-0.027,1.012-0.869,1.811-1.882,1.784c-1.012-0.027-1.811-0.869-1.784-1.882l1.04-38.986
-		c0.027-1.012,0.869-1.811,1.882-1.784c1.012,0.027,1.811,0.869,1.784,1.882L65.646,82.209z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M79,22.167H67.932C67.243,12.312,59.026,4.5,49,4.5s-18.243,7.812-18.932,17.667H19
+		c-1.657,0-3,1.343-3,3v1.667c0,1.657,1.343,3,3,3h2.526L23.5,92.667c0,1.657,1.343,3,3,3h45c1.657,0,3-1.343,3-3l1.974-62.833H79
+		c1.657,0,3-1.343,3-3v-1.667C82,23.51,80.657,22.167,79,22.167z M35.569,83.992c-1.012,0.027-1.855-0.772-1.882-1.784l-1.04-38.986
+		c-0.027-1.012,0.772-1.855,1.784-1.882c1.012-0.027,1.855,0.772,1.882,1.784l1.04,38.986C37.38,83.123,36.581,83.965,35.569,83.992
+		z M51.833,82.167C51.833,83.179,51.013,84,50,84s-1.833-0.821-1.833-1.833v-39c0-1.013,0.821-1.833,1.833-1.833
+		s1.833,0.821,1.833,1.833V82.167z M36.068,22.167C36.738,15.622,42.282,10.5,49,10.5s12.262,5.122,12.932,11.667H36.068z
+		 M65.646,82.209c-0.027,1.012-0.869,1.811-1.882,1.784c-1.012-0.027-1.811-0.869-1.784-1.882l1.04-38.986
+		c0.027-1.012,0.869-1.811,1.882-1.784c1.012,0.027,1.811,0.869,1.784,1.882L65.646,82.209z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/tray.svg -> v0.6.1.tar.gz/gui/icons/tray.svg Changed

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path style="fill:#1D1D1B;" d="M70.851,17.701c-0.352-0.426-1.085-0.771-1.637-0.771H30.786c-0.552,0-1.285,0.345-1.637,0.771
-		L7.637,43.718C7.285,44.143,7,44.936,7,45.488v35.581c0,0.552,0.448,1,1,1h84c0.552,0,1-0.448,1-1V45.488
-		c0-0.552-0.285-1.345-0.637-1.771L70.851,17.701z M82.115,44.488H71.214c-0.552,0-1.062,0.443-1.138,0.99l-2.057,14.739
-		c-0.076,0.547-0.586,0.99-1.138,0.99H33.119c-0.552,0-1.062-0.443-1.138-0.99l-2.057-14.739c-0.076-0.547-0.586-0.99-1.138-0.99
-		H17.033c-0.552,0-0.719-0.349-0.373-0.779L32.769,23.67c0.346-0.43,1.074-0.779,1.627-0.779h30.356
-		c0.552,0,1.281,0.349,1.627,0.779l16.109,20.039C82.835,44.14,82.667,44.488,82.115,44.488z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<path style="fill:#1D1D1B;" d="M70.851,17.701c-0.352-0.426-1.085-0.771-1.637-0.771H30.786c-0.552,0-1.285,0.345-1.637,0.771
+		L7.637,43.718C7.285,44.143,7,44.936,7,45.488v35.581c0,0.552,0.448,1,1,1h84c0.552,0,1-0.448,1-1V45.488
+		c0-0.552-0.285-1.345-0.637-1.771L70.851,17.701z M82.115,44.488H71.214c-0.552,0-1.062,0.443-1.138,0.99l-2.057,14.739
+		c-0.076,0.547-0.586,0.99-1.138,0.99H33.119c-0.552,0-1.062-0.443-1.138-0.99l-2.057-14.739c-0.076-0.547-0.586-0.99-1.138-0.99
+		H17.033c-0.552,0-0.719-0.349-0.373-0.779L32.769,23.67c0.346-0.43,1.074-0.779,1.627-0.779h30.356
+		c0.552,0,1.281,0.349,1.627,0.779l16.109,20.039C82.835,44.14,82.667,44.488,82.115,44.488z"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/tv.svg -> v0.6.1.tar.gz/gui/icons/tv.svg Changed

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="55px" height="54.01px" viewBox="0 0 55 54.01" enable-background="new 0 0 55 54.01" xml:space="preserve">
-<g>
-	<path id="path3378" fill="#040606" d="M47.47,27.216c-2.453,0-4.447-1.992-4.447-4.446c0-2.456,1.994-4.446,4.447-4.446
-		c2.458,0,4.446,1.99,4.446,4.446C51.916,25.224,49.928,27.216,47.47,27.216z M47.47,38.332c-2.453,0-4.447-1.99-4.447-4.447
-		c0-2.456,1.994-4.447,4.447-4.447c2.458,0,4.446,1.991,4.446,4.447S49.928,38.332,47.47,38.332z M40.977,45
-		c0,2.456-2.165,4.798-4.624,4.798H9.673c-2.451,0-4.226-2.342-4.226-4.798V22.768c0-2.454,1.775-4.825,4.226-4.825h26.679
-		c2.459,0,4.624,2.371,4.624,4.825V45z M49.692,14.268H33.214c-1.353,0-1.748-1.04-0.88-2.079l4.332-5.294
-		c0.867-1.04,1.646-1.913,1.739-1.891c0.054,0.016,0.109,0.002,0.172,0.002c1.229,0,2.224-1.005,2.224-2.236
-		c0-1.225-0.994-2.228-2.224-2.228c-1.226,0-2.224,0.995-2.224,2.22c0,0.132,0.016,0.259,0.043,0.382
-		c0.045,0.209-0.59,1.211-1.456,2.25l-5.501,6.598c-0.865,1.04-1.751,1.882-1.976,1.882c-0.225,0-1.108-0.842-1.975-1.883
-		L19.99,5.396c-0.867-1.041-1.508-2.045-1.464-2.254c0.026-0.124,0.041-0.251,0.041-0.382c0-1.225-0.994-2.222-2.224-2.222
-		c-1.225,0-2.224,0.997-2.224,2.222c0,1.23,0.999,2.224,2.224,2.224c0.064,0,0.121-0.012,0.176-0.026
-		c0.095-0.022,0.875,0.801,1.742,1.842l4.329,5.392c0.866,1.04,0.471,2.079-0.881,2.079H5.228c-2.452-0.002-4.681,1.596-4.681,4.051
-		v31.125c0,2.459,2.229,4.027,4.681,4.027h44.465c2.458,0,4.761-1.569,4.761-4.027V18.321C54.453,15.866,52.15,14.268,49.692,14.268
-		"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="54.01px" viewBox="0 0 55 54.01" enable-background="new 0 0 55 54.01" xml:space="preserve">
+<g>
+	<path id="path3378" fill="#040606" d="M47.47,27.216c-2.453,0-4.447-1.992-4.447-4.446c0-2.456,1.994-4.446,4.447-4.446
+		c2.458,0,4.446,1.99,4.446,4.446C51.916,25.224,49.928,27.216,47.47,27.216z M47.47,38.332c-2.453,0-4.447-1.99-4.447-4.447
+		c0-2.456,1.994-4.447,4.447-4.447c2.458,0,4.446,1.991,4.446,4.447S49.928,38.332,47.47,38.332z M40.977,45
+		c0,2.456-2.165,4.798-4.624,4.798H9.673c-2.451,0-4.226-2.342-4.226-4.798V22.768c0-2.454,1.775-4.825,4.226-4.825h26.679
+		c2.459,0,4.624,2.371,4.624,4.825V45z M49.692,14.268H33.214c-1.353,0-1.748-1.04-0.88-2.079l4.332-5.294
+		c0.867-1.04,1.646-1.913,1.739-1.891c0.054,0.016,0.109,0.002,0.172,0.002c1.229,0,2.224-1.005,2.224-2.236
+		c0-1.225-0.994-2.228-2.224-2.228c-1.226,0-2.224,0.995-2.224,2.22c0,0.132,0.016,0.259,0.043,0.382
+		c0.045,0.209-0.59,1.211-1.456,2.25l-5.501,6.598c-0.865,1.04-1.751,1.882-1.976,1.882c-0.225,0-1.108-0.842-1.975-1.883
+		L19.99,5.396c-0.867-1.041-1.508-2.045-1.464-2.254c0.026-0.124,0.041-0.251,0.041-0.382c0-1.225-0.994-2.222-2.224-2.222
+		c-1.225,0-2.224,0.997-2.224,2.222c0,1.23,0.999,2.224,2.224,2.224c0.064,0,0.121-0.012,0.176-0.026
+		c0.095-0.022,0.875,0.801,1.742,1.842l4.329,5.392c0.866,1.04,0.471,2.079-0.881,2.079H5.228c-2.452-0.002-4.681,1.596-4.681,4.051
+		v31.125c0,2.459,2.229,4.027,4.681,4.027h44.465c2.458,0,4.761-1.569,4.761-4.027V18.321C54.453,15.866,52.15,14.268,49.692,14.268
+		"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/icons/up.svg -> v0.6.1.tar.gz/gui/icons/up.svg Changed

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="22.062px" height="13.725px" viewBox="0 0 22.062 13.725" enable-background="new 0 0 22.062 13.725" xml:space="preserve">
-<path d="M21.455,9.435L12.62,0.6c-0.434-0.434-1.017-0.628-1.589-0.597C10.46-0.028,9.877,0.165,9.443,0.6L0.607,9.435
-	c-0.811,0.81-0.811,2.135,0,2.945l0.739,0.737c0.808,0.81,2.134,0.81,2.943,0l6.742-6.742l6.742,6.742
-	c0.809,0.81,2.135,0.81,2.943,0l0.737-0.737C22.265,11.571,22.265,10.245,21.455,9.435z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="22.062px" height="13.725px" viewBox="0 0 22.062 13.725" enable-background="new 0 0 22.062 13.725" xml:space="preserve">
+<path d="M21.455,9.435L12.62,0.6c-0.434-0.434-1.017-0.628-1.589-0.597C10.46-0.028,9.877,0.165,9.443,0.6L0.607,9.435
+	c-0.811,0.81-0.811,2.135,0,2.945l0.739,0.737c0.808,0.81,2.134,0.81,2.943,0l6.742-6.742l6.742,6.742
+	c0.809,0.81,2.135,0.81,2.943,0l0.737-0.737C22.265,11.571,22.265,10.245,21.455,9.435z"/>
+</svg>

v0.5.2.tar.gz/gui/icons/world.svg -> v0.6.1.tar.gz/gui/icons/world.svg Changed

@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="28.335px" height="28.333px" viewBox="0 0 28.335 28.333" enable-background="new 0 0 28.335 28.333" xml:space="preserve">
-<g>
-	<path d="M14.167,0C6.356,0,0,6.355,0,14.167s6.356,14.167,14.167,14.167c7.812,0,14.168-6.354,14.168-14.167
-		C28.335,6.355,21.979,0,14.167,0z M11.443,5.072l0.662,0.188V4.389l0.258-0.243l0.276,0.536l0.526,0.635l-0.213,0.292l-0.848,0.195
-		V5.288l-0.662,0.516L11.25,5.511L11.443,5.072z M1.239,13.851c0.066-2.742,0.989-5.269,2.513-7.336
-		c0.051,0.007,0.087,0.02,0.087,0.02c0,0.195-0.266,0.242,0,0.732c0.34,0.634,0.048,0.927,0.048,0.927s-0.83,0.585-0.976,0.683
-		C2.765,8.974,2.375,9.511,2.618,9.364c0.244-0.146,0.536-0.292,0.293,0.098c-0.244,0.391-0.683,1.024-0.78,1.269
-		c-0.097,0.245-0.585,0.829-0.585,1.122S1.351,12.732,1.4,12.976C1.433,13.145,1.324,13.646,1.239,13.851z M6.277,21.999
-		l-0.196,0.73l0.196,0.585c0,0-0.294,0.245-0.487,0.245c-0.18,0-0.241,0.113-0.438,0.061c-1.86-1.738-3.21-4.01-3.795-6.576
-		c0.063,0.016,0.153,0.062,0.28,0.174c0.184,0.16,0.293,0.242,0.537,0.341c0.243,0.099,0.341,0.243,0.634,0.389
-		c0.293,0.148,0.196,0.05,0.585,0.489c0.391,0.438,0.342,0.438,0.439,0.682c0.097,0.244,0.244,0.488,0.342,0.635
-		s0.39,0.244,0.536,0.342c0.146,0.097,0.39,0.195,0.536,0.195c0.147,0,0.586,0.439,0.83,0.487c0.244,0.05,0.244,0.538,0.244,0.538
-		L6.277,21.999z M8.228,3.171C7.594,3.853,7.74,3.658,7.594,3.853c-0.146,0.195-0.098,0.243-0.44,0.488
-		C6.813,4.584,6.667,4.877,6.667,4.877L6.13,5.072L5.692,4.877c0,0-0.392,0.147-0.343-0.049c0.014-0.051,0.034-0.105,0.057-0.162
-		C6.6,3.564,7.997,2.687,9.539,2.093C9.387,2.288,9.203,2.488,9.203,2.488S8.862,2.487,8.228,3.171z M23.105,20.681
-		c-0.051,0.194-0.146,0.536-0.195,0.731s-0.293,0.586-0.438,0.683c-0.146,0.098-0.391,0.391-0.536,0.44
-		c-0.146,0.049-0.245-0.343-0.196-0.537c0.051-0.197,0.293-0.732,0.293-0.732s0.049-0.292,0.098-0.488
-		c0.05-0.193,0.635-0.438,0.635-0.438l0.391-0.732c0,0,0.049,0.196,0.049,0.342C23.203,20.095,23.154,20.486,23.105,20.681z
-		 M23.251,16.096c-0.098,0.146-0.391,0.535-0.537,0.73s-0.34,0.488-0.633,0.732s-0.295,0.486-0.439,0.684
-		c-0.146,0.195-0.342,0.633-0.342,0.633s0.098,0.977,0.146,1.172c0.05,0.195-0.341,0.73-0.341,0.73l-0.439,0.439l-0.588,0.781
-		l0.047,0.73c0,0-0.443,0.342-0.688,0.537c-0.242,0.195-0.204,0.341-0.399,0.537c-0.193,0.193-0.711,0.535-0.906,0.585
-		c-0.194,0.049-1.023,0.194-1.023,0.194v-0.438l-0.27-0.488c0,0-0.271-0.584-0.418-0.781c-0.146-0.194-0.145-0.488-0.389-0.731
-		c-0.244-0.244-0.363-0.438-0.412-0.586c-0.05-0.146,0.036-0.584,0.036-0.584s0.188-0.537,0.286-0.731
-		c0.098-0.195-0.003-0.488-0.102-0.684c-0.098-0.196-0.146-0.684-0.146-0.829s-0.394-0.392-0.539-0.537
-		c-0.146-0.147-0.098-0.342-0.098-0.536c0-0.195-0.146-0.635-0.099-0.976c0.049-0.341-0.438-0.099-0.73,0
-		c-0.293,0.097-0.487-0.099-0.487-0.392c0-0.291-0.536-0.047-0.878,0.146c-0.343,0.195-0.732,0.195-1.124,0.341
-		c-0.389,0.146-0.583-0.146-0.583-0.146s-0.343-0.293-0.585-0.439c-0.245-0.146-0.489-0.438-0.685-0.682
-		c-0.194-0.245-0.683-0.977-0.73-1.268c-0.049-0.294,0-0.49,0-0.831c0-0.341,0-0.536,0.048-0.78
-		c0.049-0.244,0.195-0.537,0.342-0.781c0.146-0.244,0.683-0.536,0.828-0.634c0.146-0.097,0.488-0.389,0.488-0.585
-		c0-0.195,0.196-0.292,0.292-0.488c0.099-0.195,0.44-0.682,0.879-0.487c0,0,0.389-0.048,0.535-0.097
-		c0.146-0.049,0.536-0.194,0.729-0.292c0.195-0.098,0.681-0.144,0.681-0.144s0.384,0.153,0.53,0.153s0.623-0.085,0.623-0.085
-		s0.22,0.707,0.22,0.854s0.146,0.292,0.392,0.39c0.242,0.097,1.365,0.341,1.854-0.049c0.113-0.09,0.486,0.146,0.486,0.146
-		s1.219,0.244,1.414,0.39c0.196,0.147,0.537,0.245,0.635,0.392c0.099,0.146,0.438,0.585,0.486,0.731
-		c0.051,0.146,0.295,0.684,0.344,0.878c0.049,0.195,0.194,0.683,0.34,0.927c0.146,0.245,0.977,1.316,1.269,1.805l0.88-0.146
-		C23.447,15.511,23.349,15.95,23.251,16.096z M26.812,14.244c-0.048-0.196-0.341-0.879-0.341-0.879s-0.293-0.39-0.488-0.488
-		c-0.194-0.098-0.341-0.342-0.683-0.536c-0.342-0.196-0.487-0.293-0.779-0.293c-0.294,0-0.585-0.391-0.928-0.586
-		c-0.342-0.194-0.391-0.097-0.391-0.097s0.391,0.585,0.391,0.731s0.438,0.39,0.879,0.292c0,0,0.292,0.537,0.438,0.683
-		c0.146,0.146-0.049,0.293-0.341,0.488c-0.293,0.194-0.243,0.146-0.392,0.292c-0.146,0.146-0.633,0.392-0.78,0.488
-		c-0.146,0.097-0.731,0.39-1.022,0.097c-0.144-0.141-0.1-0.438-0.195-0.634c-0.098-0.195-1.122-1.707-1.61-2.389
-		c-0.085-0.12-0.293-0.49-0.438-0.585c-0.146-0.099,0.343-0.099,0.343-0.099s0-0.342-0.05-0.585c-0.049-0.244,0.05-0.585,0.05-0.585
-		s-0.488,0.292-0.636,0.39c-0.146,0.098-0.293-0.194-0.486-0.439c-0.195-0.243-0.391-0.537-0.439-0.781
-		c-0.049-0.243,0.244-0.341,0.244-0.341l0.438-0.243c0,0,0.537-0.097,0.88-0.049c0.341,0.049,0.877,0.098,0.877,0.098
-		s0.146-0.342-0.05-0.488c-0.193-0.146-0.635-0.39-0.829-0.341c-0.194,0.048,0.097-0.244,0.34-0.439l-0.54-0.098
-		c0,0-0.491,0.244-0.639,0.293c-0.146,0.048-0.399,0.146-0.596,0.39c-0.193,0.244,0.078,0.585-0.117,0.683
-		c-0.193,0.098-0.326,0.146-0.473,0.194c-0.146,0.049-0.609,0-0.609,0c-0.504,0-0.182,0.46-0.051,0.623l-0.39-0.476l-0.289-0.684
-		c0,0-0.416-0.292-0.61-0.389c-0.197-0.097-0.797-0.439-0.797-0.439l0.041,0.439l0.565,0.572l0.05,0.013l0.346,0.39l-0.598,0.049
-		V8.101c-1-0.148-0.504-0.3-0.572-0.347c-0.145-0.097-0.51-0.342-0.51-0.342s-0.588,0.098-0.734,0.147
-		c-0.147,0.049-0.193,0.195-0.485,0.292c-0.294,0.098-0.43,0.244-0.527,0.39c-0.097,0.146-0.416,0.585-0.609,0.78
-		c-0.196,0.196-0.562,0.146-0.708,0.146c-0.147,0-0.854-0.195-0.854-0.195V8.145c0,0,0.098-0.464,0.049-0.61l0.429-0.072
-		l0.713-0.147l0.21-0.147l0.3-0.39c0,0-0.337-0.244-0.094-0.585c0.117-0.164,0.538-0.195,0.733-0.341
-		c0.194-0.146,0.489-0.244,0.489-0.244s0.342-0.292,0.683-0.634c0,0,0.244-0.147,0.536-0.245c0,0,0.83,0.732,0.977,0.732
-		c0.147,0,0.684-0.341,0.684-0.341s0.146-0.438,0.098-0.585c-0.049-0.146-0.293-0.634-0.293-0.634s-0.146,0.244-0.291,0.439
-		c-0.146,0.195-0.246,0.439-0.246,0.439s-0.684-0.047-0.731-0.193c-0.05-0.147-0.146-0.388-0.196-0.533
-		c-0.047-0.147-0.438-0.142-0.729-0.044c-0.294,0.098,0.047-0.526,0.047-0.526s0.294-0.368,0.488-0.368
-		c0.193,0,0.635-0.25,0.828-0.298c0.195-0.049,0.782-0.424,1.024-0.424c0.244,0,0.537-0.046,0.685-0.046c0.146,0,0.73,0,0.73,0
-		l1.023,0.069c0,0,0.879,0.4,0.584,0.596c0,0,0.344,0.25,0.49,0.396c0.137,0.138,0.49-0.108,0.693-0.221
-		c3.65,2.292,6.091,6.352,6.091,10.971c0,0.248-0.022,0.495-0.036,0.74C26.982,14.667,26.845,14.372,26.812,14.244z"/>
-	<polygon points="11.722,5.26 11.722,5.288 11.738,5.268 	"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="28.335px" height="28.333px" viewBox="0 0 28.335 28.333" enable-background="new 0 0 28.335 28.333" xml:space="preserve">
+<g>
+	<path d="M14.167,0C6.356,0,0,6.355,0,14.167s6.356,14.167,14.167,14.167c7.812,0,14.168-6.354,14.168-14.167
+		C28.335,6.355,21.979,0,14.167,0z M11.443,5.072l0.662,0.188V4.389l0.258-0.243l0.276,0.536l0.526,0.635l-0.213,0.292l-0.848,0.195
+		V5.288l-0.662,0.516L11.25,5.511L11.443,5.072z M1.239,13.851c0.066-2.742,0.989-5.269,2.513-7.336
+		c0.051,0.007,0.087,0.02,0.087,0.02c0,0.195-0.266,0.242,0,0.732c0.34,0.634,0.048,0.927,0.048,0.927s-0.83,0.585-0.976,0.683
+		C2.765,8.974,2.375,9.511,2.618,9.364c0.244-0.146,0.536-0.292,0.293,0.098c-0.244,0.391-0.683,1.024-0.78,1.269
+		c-0.097,0.245-0.585,0.829-0.585,1.122S1.351,12.732,1.4,12.976C1.433,13.145,1.324,13.646,1.239,13.851z M6.277,21.999
+		l-0.196,0.73l0.196,0.585c0,0-0.294,0.245-0.487,0.245c-0.18,0-0.241,0.113-0.438,0.061c-1.86-1.738-3.21-4.01-3.795-6.576
+		c0.063,0.016,0.153,0.062,0.28,0.174c0.184,0.16,0.293,0.242,0.537,0.341c0.243,0.099,0.341,0.243,0.634,0.389
+		c0.293,0.148,0.196,0.05,0.585,0.489c0.391,0.438,0.342,0.438,0.439,0.682c0.097,0.244,0.244,0.488,0.342,0.635
+		s0.39,0.244,0.536,0.342c0.146,0.097,0.39,0.195,0.536,0.195c0.147,0,0.586,0.439,0.83,0.487c0.244,0.05,0.244,0.538,0.244,0.538
+		L6.277,21.999z M8.228,3.171C7.594,3.853,7.74,3.658,7.594,3.853c-0.146,0.195-0.098,0.243-0.44,0.488
+		C6.813,4.584,6.667,4.877,6.667,4.877L6.13,5.072L5.692,4.877c0,0-0.392,0.147-0.343-0.049c0.014-0.051,0.034-0.105,0.057-0.162
+		C6.6,3.564,7.997,2.687,9.539,2.093C9.387,2.288,9.203,2.488,9.203,2.488S8.862,2.487,8.228,3.171z M23.105,20.681
+		c-0.051,0.194-0.146,0.536-0.195,0.731s-0.293,0.586-0.438,0.683c-0.146,0.098-0.391,0.391-0.536,0.44
+		c-0.146,0.049-0.245-0.343-0.196-0.537c0.051-0.197,0.293-0.732,0.293-0.732s0.049-0.292,0.098-0.488
+		c0.05-0.193,0.635-0.438,0.635-0.438l0.391-0.732c0,0,0.049,0.196,0.049,0.342C23.203,20.095,23.154,20.486,23.105,20.681z
+		 M23.251,16.096c-0.098,0.146-0.391,0.535-0.537,0.73s-0.34,0.488-0.633,0.732s-0.295,0.486-0.439,0.684
+		c-0.146,0.195-0.342,0.633-0.342,0.633s0.098,0.977,0.146,1.172c0.05,0.195-0.341,0.73-0.341,0.73l-0.439,0.439l-0.588,0.781
+		l0.047,0.73c0,0-0.443,0.342-0.688,0.537c-0.242,0.195-0.204,0.341-0.399,0.537c-0.193,0.193-0.711,0.535-0.906,0.585
+		c-0.194,0.049-1.023,0.194-1.023,0.194v-0.438l-0.27-0.488c0,0-0.271-0.584-0.418-0.781c-0.146-0.194-0.145-0.488-0.389-0.731
+		c-0.244-0.244-0.363-0.438-0.412-0.586c-0.05-0.146,0.036-0.584,0.036-0.584s0.188-0.537,0.286-0.731
+		c0.098-0.195-0.003-0.488-0.102-0.684c-0.098-0.196-0.146-0.684-0.146-0.829s-0.394-0.392-0.539-0.537
+		c-0.146-0.147-0.098-0.342-0.098-0.536c0-0.195-0.146-0.635-0.099-0.976c0.049-0.341-0.438-0.099-0.73,0
+		c-0.293,0.097-0.487-0.099-0.487-0.392c0-0.291-0.536-0.047-0.878,0.146c-0.343,0.195-0.732,0.195-1.124,0.341
+		c-0.389,0.146-0.583-0.146-0.583-0.146s-0.343-0.293-0.585-0.439c-0.245-0.146-0.489-0.438-0.685-0.682
+		c-0.194-0.245-0.683-0.977-0.73-1.268c-0.049-0.294,0-0.49,0-0.831c0-0.341,0-0.536,0.048-0.78
+		c0.049-0.244,0.195-0.537,0.342-0.781c0.146-0.244,0.683-0.536,0.828-0.634c0.146-0.097,0.488-0.389,0.488-0.585
+		c0-0.195,0.196-0.292,0.292-0.488c0.099-0.195,0.44-0.682,0.879-0.487c0,0,0.389-0.048,0.535-0.097
+		c0.146-0.049,0.536-0.194,0.729-0.292c0.195-0.098,0.681-0.144,0.681-0.144s0.384,0.153,0.53,0.153s0.623-0.085,0.623-0.085
+		s0.22,0.707,0.22,0.854s0.146,0.292,0.392,0.39c0.242,0.097,1.365,0.341,1.854-0.049c0.113-0.09,0.486,0.146,0.486,0.146
+		s1.219,0.244,1.414,0.39c0.196,0.147,0.537,0.245,0.635,0.392c0.099,0.146,0.438,0.585,0.486,0.731
+		c0.051,0.146,0.295,0.684,0.344,0.878c0.049,0.195,0.194,0.683,0.34,0.927c0.146,0.245,0.977,1.316,1.269,1.805l0.88-0.146
+		C23.447,15.511,23.349,15.95,23.251,16.096z M26.812,14.244c-0.048-0.196-0.341-0.879-0.341-0.879s-0.293-0.39-0.488-0.488
+		c-0.194-0.098-0.341-0.342-0.683-0.536c-0.342-0.196-0.487-0.293-0.779-0.293c-0.294,0-0.585-0.391-0.928-0.586
+		c-0.342-0.194-0.391-0.097-0.391-0.097s0.391,0.585,0.391,0.731s0.438,0.39,0.879,0.292c0,0,0.292,0.537,0.438,0.683
+		c0.146,0.146-0.049,0.293-0.341,0.488c-0.293,0.194-0.243,0.146-0.392,0.292c-0.146,0.146-0.633,0.392-0.78,0.488
+		c-0.146,0.097-0.731,0.39-1.022,0.097c-0.144-0.141-0.1-0.438-0.195-0.634c-0.098-0.195-1.122-1.707-1.61-2.389
+		c-0.085-0.12-0.293-0.49-0.438-0.585c-0.146-0.099,0.343-0.099,0.343-0.099s0-0.342-0.05-0.585c-0.049-0.244,0.05-0.585,0.05-0.585
+		s-0.488,0.292-0.636,0.39c-0.146,0.098-0.293-0.194-0.486-0.439c-0.195-0.243-0.391-0.537-0.439-0.781
+		c-0.049-0.243,0.244-0.341,0.244-0.341l0.438-0.243c0,0,0.537-0.097,0.88-0.049c0.341,0.049,0.877,0.098,0.877,0.098
+		s0.146-0.342-0.05-0.488c-0.193-0.146-0.635-0.39-0.829-0.341c-0.194,0.048,0.097-0.244,0.34-0.439l-0.54-0.098
+		c0,0-0.491,0.244-0.639,0.293c-0.146,0.048-0.399,0.146-0.596,0.39c-0.193,0.244,0.078,0.585-0.117,0.683
+		c-0.193,0.098-0.326,0.146-0.473,0.194c-0.146,0.049-0.609,0-0.609,0c-0.504,0-0.182,0.46-0.051,0.623l-0.39-0.476l-0.289-0.684
+		c0,0-0.416-0.292-0.61-0.389c-0.197-0.097-0.797-0.439-0.797-0.439l0.041,0.439l0.565,0.572l0.05,0.013l0.346,0.39l-0.598,0.049
+		V8.101c-1-0.148-0.504-0.3-0.572-0.347c-0.145-0.097-0.51-0.342-0.51-0.342s-0.588,0.098-0.734,0.147
+		c-0.147,0.049-0.193,0.195-0.485,0.292c-0.294,0.098-0.43,0.244-0.527,0.39c-0.097,0.146-0.416,0.585-0.609,0.78
+		c-0.196,0.196-0.562,0.146-0.708,0.146c-0.147,0-0.854-0.195-0.854-0.195V8.145c0,0,0.098-0.464,0.049-0.61l0.429-0.072
+		l0.713-0.147l0.21-0.147l0.3-0.39c0,0-0.337-0.244-0.094-0.585c0.117-0.164,0.538-0.195,0.733-0.341
+		c0.194-0.146,0.489-0.244,0.489-0.244s0.342-0.292,0.683-0.634c0,0,0.244-0.147,0.536-0.245c0,0,0.83,0.732,0.977,0.732
+		c0.147,0,0.684-0.341,0.684-0.341s0.146-0.438,0.098-0.585c-0.049-0.146-0.293-0.634-0.293-0.634s-0.146,0.244-0.291,0.439
+		c-0.146,0.195-0.246,0.439-0.246,0.439s-0.684-0.047-0.731-0.193c-0.05-0.147-0.146-0.388-0.196-0.533
+		c-0.047-0.147-0.438-0.142-0.729-0.044c-0.294,0.098,0.047-0.526,0.047-0.526s0.294-0.368,0.488-0.368
+		c0.193,0,0.635-0.25,0.828-0.298c0.195-0.049,0.782-0.424,1.024-0.424c0.244,0,0.537-0.046,0.685-0.046c0.146,0,0.73,0,0.73,0
+		l1.023,0.069c0,0,0.879,0.4,0.584,0.596c0,0,0.344,0.25,0.49,0.396c0.137,0.138,0.49-0.108,0.693-0.221
+		c3.65,2.292,6.091,6.352,6.091,10.971c0,0.248-0.022,0.495-0.036,0.74C26.982,14.667,26.845,14.372,26.812,14.244z"/>
+	<polygon points="11.722,5.26 11.722,5.288 11.738,5.268 	"/>
+</g>
+</svg>

v0.5.2.tar.gz/gui/iphone_wm_gui.js -> v0.6.1.tar.gz/gui/iphone_wm_gui.js Changed

@@ -40,8 +40,8 @@
 if (l_deb < log_level) {
 alert("[UI] adaptLayoutToSize");
 }
- display_width = parseInt( gpac.getOption('General', 'LastWidth') );
- display_height = parseInt( gpac.getOption('General', 'LastHeight') );
+ display_width = parseInt(gpac.get_option('General', 'LastWidth'));
+ display_height = parseInt(gpac.get_option('General', 'LastHeight'));
 alert("display "+display_width+" "+display_height);
 if (!gpac.fullscreen && display_width && display_height) {
 gpac.set_size(display_width, display_height);
@@ -485,8 +485,8 @@
 alert("[UI] initialize");
 }
 init = false;
- var display_width = parseInt(gpac.getOption('Widgets', 'LastWMWidth'));
- var display_height = parseInt(gpac.getOption('Widgets', 'LastWMHeight'));
+ var display_width = parseInt(gpac.get_option('Widgets', 'LastWMWidth'));
+ var display_height = parseInt(gpac.get_option('Widgets', 'LastWMHeight'));
 if (display_width && display_height) {
 gpac.set_size(display_width, display_height);
 }
@@ -834,8 +834,8 @@
 adjustWhereWidgets(false);
 previousWidth = document.documentElement.viewport.width;
 previousHeight = document.documentElement.viewport.height;
- gpac.setOption("Widgets", "LastWMWidth", '' + previousWidth);
- gpac.setOption("Widgets", "LastWMHeight", '' + previousHeight);
+ gpac.set_option("Widgets", "LastWMWidth", '' + previousWidth);
+ gpac.set_option("Widgets", "LastWMHeight", '' + previousHeight);
 }
 
 //

v0.5.2.tar.gz/gui/mpegu-core.js -> v0.6.1.tar.gz/gui/mpegu-core.js Changed

v0.5.2.tar.gz/gui/mpegu-wm.js -> v0.6.1.tar.gz/gui/mpegu-wm.js Changed

@@ -41,8 +41,8 @@
 
 gpac.caption = 'MPEG-U @ Osmo4';
 
- display_width = parseInt( gpac.getOption('Widgets', 'LastWMWidth') );
- display_height = parseInt( gpac.getOption('Widgets', 'LastWMHeight') );
+ display_width = parseInt(gpac.get_option('Widgets', 'LastWMWidth'));
+ display_height = parseInt(gpac.get_option('Widgets', 'LastWMHeight'));
 
 if (display_width && display_height) {
 gpac.set_size(display_width, display_height);
@@ -633,7 +633,7 @@
 info.children[i++] = text_label('Widget was pushed from device IP '+wid.originating_device_ip, 'BEGIN' );
 }
 info.children[i++] = text_label('Section name in GPAC config file: '+wid.section, 'BEGIN' );
- info.children[i++] = text_label('UA Locale: ' + gpac.getOption('Systems', 'LanguageName') + ' ('+ gpac.getOption('Systems', 'Language2CC')+ ')', 'BEGIN' );
+ info.children[i++] = text_label('UA Locale: ' + gpac.get_option('Systems', 'LanguageName') + ' (' + gpac.get_option('Systems', 'Language2CC') + ')', 'BEGIN');
 info.children[i++] = text_label('widget src: ' + wid.url , 'BEGIN');
 info.children[i++] = text_label('config src: ' + wid.manifest , 'BEGIN');
 info.children[i++] = text_label('content src : '+wid.localizedSrc, 'BEGIN' );
@@ -663,7 +663,7 @@
 i=3;
 for (j=0; j<pref.length; j++) {
 var val = pref[j].value;
- if (val=='') val = gpac.getOption(wid.section, pref[j].name);
+ if (val == '') val = gpac.get_option(wid.section, pref[j].name);
 info.children[i++] = text_label('Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'BEGIN');
 }
 
@@ -922,8 +922,8 @@
 function layout() {
 var i, list, start_x;
 
- gpac.setOption('Widgets', 'LastWMWidth', ''+display_width);
- gpac.setOption('Widgets', 'LastWMHeight', ''+display_height);
+ gpac.set_option('Widgets', 'LastWMWidth', '' + display_width);
+ gpac.set_option('Widgets', 'LastWMHeight', '' + display_height);
 
 
 if (WidgetManager.num_widgets) {

v0.5.2.tar.gz/gui/webvtt-renderer.js -> v0.6.1.tar.gz/gui/webvtt-renderer.js Changed

@@ -1,281 +1,285 @@
-/* JavaScript Renderer for WebVTT tracks
- Generates GPAC Scene Graph (SVG, BIFS) to display WebVTT cues */
-alert("WebVTT Rendered Loaded");
-
-var DEBUG = false;
-
-var rect = document.documentElement.getRectPresentationTrait("viewBox");
-var width = rect.width;
-var height = rect.height;
-var xOffset = 5;
-var yOffset = 5;
-var fontSize = 20;
-var textColor = "red";
-var fontFamily = "SANS";
-var lineIncrement = fontSize;
-var nbCues = 0;
-
-var cueArea = document.createElement("g");
-document.documentElement.appendChild(cueArea);
-
-function reportMessage(msg) {
-	if (DEBUG) {
-		alert(msg);
-	}
-}
-
-function createTextArea(settingsObj) {
-	reportMessage("Creating textArea with settings: "+settingsObj);
-	var t = document.createElement("textArea");
-	t.setAttribute("x", xOffset+settingsObj.xPosition);
-	t.setAttribute("y", yOffset);
-	if (settingsObj.fromTop) {
-		t.setAttribute("display-align", "before");
-		t.setAttribute("height", height-2*yOffset);
-	} else {
-		t.setAttribute("display-align", "after");
-		t.setAttribute("height", height-2*yOffset-settingsObj.linePosition);
-	}
-	t.setAttribute("width", settingsObj.size-2*xOffset);
-	t.setAttribute("fill", textColor);
-	t.setAttribute("font-size", fontSize);
-	t.setAttribute("font-family", fontFamily);
-	t.setAttribute("text-align", settingsObj.align);
-	t.setAttribute("line-increment", lineIncrement);
-	cueArea.appendChild(t);
-	reportMessage("textArea created: "+t);
-	return t;
-}
-
-function printObj(o) {
- for (var p in o) {
-	if (o.hasOwnProperty(p)) {
-	 alert(""+p+": "+o[p]);
- }
- }
-}
-
-function addSpan(parent, cuePart) {
-	reportMessage("adding tspan to "+parent+" with cuePart: "+ cuePart);
-	var i;
-	var span = document.createElement('tspan');
-	//alert('adding span for '+parent+': '+cuePart+' token:'+cuePart.token);
-	if (cuePart.token === undefined) {
-		span.textContent = cuePart;
-	} else {
-		if (cuePart.token === 'i') {
-			span.setAttribute("font-style", "italic");
-		} else if (cuePart.token === 'u') {
-			span.setAttribute("text-decoration", "underline");
-		} else if (cuePart.token === 'b') {
-			span.setAttribute("font-weight", "bold");
-		}
-		for (i in cuePart.children) {
-			addSpan(span, cuePart.children[i]);
-		}
-	}
-	parent.appendChild(span);
-	reportMessage("tspan created "+span);
-	return span;
-}
-
-function parseCueSettings(cueSettings){
-	reportMessage("Parsing cue settings: "+cueSettings);
-	var obj = {};
-	var settingsArray = cueSettings.split(/\s/g);
-	//.filter(function(set) { return set && !!set.length; });
-
-	// Convert the Array into an object 
-	var compositeCueSettings = {};
-	for (var settingsIndex in settingsArray) {
-		var nvArray = settingsArray[settingsIndex].split(":");
-		compositeCueSettings[nvArray[0]] = nvArray[1];
-	}
-
-	// Compute real values
-	if (compositeCueSettings.line !== undefined) {
-		if (compositeCueSettings.line.match(/\%/)) {
-			obj.linePosition = parseFloat(compositeCueSettings.line.replace(/\%/ig,""));
-			if (isNaN(obj.linePosition)) {
-				obj.linePosition = nbCues*lineIncrement;
-			} else {
-				obj.linePosition *= height/100;
-			}
-		} else {
-			obj.linePosition = parseFloat(compositeCueSettings.line)*lineIncrement;
-			if (isNaN(obj.linePosition)) {
-				obj.linePosition = nbCues*lineIncrement;
-			} else {
-				if (obj.linePosition > 0) {
-					obj.fromTop = true;
-				} else {
-					obj.fromTop = false;
-					obj.linePosition = -obj.linePosition;
-				}
-			}
-		}
-	} else {
-		obj.linePosition = nbCues*lineIncrement;
-	}
-	reportMessage("linePosition: "+obj.linePosition);
-	if (compositeCueSettings.position !== undefined) {
-		obj.xPosition = parseFloat(compositeCueSettings.position.replace(/\%/ig,""));
-		if (isNaN(obj.xPosition)) {
-			obj.xPosition = 50;
-		} else {
-			obj.xPosition *= width/100;
-		}
-	} else {
-		obj.xPosition = 50;
-	}
-	reportMessage("xPosition: "+obj.xPosition);
-	if (compositeCueSettings.size !== undefined) {
-		obj.size = parseFloat(compositeCueSettings.size.replace(/\%/ig,""));
-		if (isNaN(obj.size)) {
-			obj.size = 100;
-		} else {
-			obj.size *= width/100;
-		}
-	} else {
-		obj.size = 100;
-	}
-	reportMessage("size: "+obj.size);
-	if (compositeCueSettings.align !== undefined) {
-		if (compositeCueSettings.align === "middle") {
-			obj.align = "center";
-		} else if (compositeCueSettings.align === "left") {
-			obj.align = "start";
-		} else if (compositeCueSettings.align === "right") {
-			obj.align = "end";
-		} else if (compositeCueSettings.align === "start") {
-			obj.align = "start";
-		} else if (compositeCueSettings.align === "end") {
-			obj.align = "end";
-		} else {
-			obj.align = "center";
-		}
-	} else {
-		obj.align = "center";
-	}
-	reportMessage("align: "+obj.align);
-	reportMessage("cue settings parsed: "+obj);
-	return obj;
-}
-
-function removeCues() {
-	cueArea.textContent = '';
-	nbCues = 0;
-}
-
-function addCue(id, start, end, settings, payload) {
-	reportMessage("adding cue: "+id+","+start+","+end+","+settings+","+payload);
-	var lines = payload.split('\n');
-	var settingObj = parseCueSettings(settings);
-	var tA = createTextArea(settingObj);
-	for (var lineIndex in lines) {
-		var parsedCue = parseCue(lines[lineIndex]);
-		for (var cuePartIndex in parsedCue) {
-			addSpan(tA, parsedCue[cuePartIndex]);
-		}
-		tA.appendChild(document.createElement('tbreak'));
-	}
-	nbCues++;
-	reportMessage("cue added: "+tA);
-}
-
-/* Code adapted from https://raw.github.com/cgiffard/Captionator/master/js/captionator.js */
-var SRTChunkTimestampParser		= /(\d{2})?:?(\d{2}):(\d{2})[\.\,](\d+)/; 
-function parseCue(cueText) {
-	reportMessage("Parsing cue text: "+cueText);
-
-	var cueStructure = new Array,
-		cueSplit = [],
-		splitIndex,
-		currentToken,
-		currentContext,
-		stack = [],
-		stackIndex = 0,
-		chunkTimestamp,
-		timeData,
-		lastCueTime;
-					
-	cueSplit = cueText.split(/(<\/?[^>]+>)/ig);
-				
-	currentContext = cueStructure;
-	for (splitIndex in cueSplit) {
-		if (cueSplit.hasOwnProperty(splitIndex)) {
-			currentToken = cueSplit[splitIndex];
-			
-			if (currentToken.substr(0,1) === "<") {
-				if (currentToken.substr(1,1) === "/") {
-					// Closing tag
-					var TagName = currentToken.substr(2).split(/[\s>]+/g)[0];
-					if (stack.length > 0) {
-						// Scan backwards through the stack to determine whether we've got an open tag somewhere to close.
-						var stackScanDepth = 0;
-						for (stackIndex = stack.length-1; stackIndex >= 0; stackIndex --) {
-							var parentContext = stack[stackIndex][stack[stackIndex].length-1];
-							stackScanDepth = stackIndex;
-							if (parentContext.token === TagName) { break; }
-						}
-					
-						currentContext = stack[stackScanDepth];
-						stack = stack.slice(0,stackScanDepth);
-					} else {
-						// Tag mismatch!
-						alert("Tag mismatch when parsing WebVTT cue: "+cueText);
-					}
-				} else {
-					// Opening Tag
-					// Check whether the tag is valid according to the WebVTT specification
-					// If not, don't allow it (unless the sanitiseCueHTML option is explicitly set to false)
-				
-					if ((	currentToken.substr(1).match(SRTChunkTimestampParser)	||
-							currentToken.match(/^<v\s+[^>]+>/i)						||
-							currentToken.match(/^<c[a-z0-9\-\_\.]+>/)				||
-							currentToken.match(/^<(b|i|u|ruby|rt)>/))				) {
-						
-						var tmpObject = {
-							"token":	currentToken.replace(/[<\/>]+/ig,"").split(/[\s\.]+/)[0],
-							"rawToken":	currentToken,
-							"children":	[]
-						};
-						
-						if (tmpObject.token === "v") {
-							tmpObject.voice = currentToken.match(/^<v\s*([^>]+)>/i)[1];
-						} else if (tmpObject.token === "c") {
-							tmpObject.classes = currentToken
-													.replace(/[<\/>\s]+/ig,"")
-													.split(/[\.]+/ig)
-													.slice(1)
-													.filter(hasRealTextContent);
-						} else if (!!(chunkTimestamp = tmpObject.rawToken.match(SRTChunkTimestampParser))) {
-							cueStructure.isTimeDependent = true;
-							timeData = chunkTimestamp.slice(1);
-							tmpObject.timeIn =	parseInt((timeData[0]||0) * 60 * 60,10) +	// Hours
-												parseInt((timeData[1]||0) * 60,10) +		// Minutes
-												parseInt((timeData[2]||0),10) +				// Seconds
-												parseFloat("0." + (timeData[3]||0));		// MS
-						}
-					
-						currentContext.push(tmpObject);
-						stack.push(currentContext);
-						currentContext = tmpObject.children;
-					}
-				}
-			} else {
-				// Text string
-				currentToken = currentToken
-								.replace(/</g,"&lt;")
-								.replace(/>/g,"&gt;")
-								.replace(/\&/g,"&amp;");
-					
-				currentToken = currentToken.replace(/\n+/g," ");
-			
-				currentContext.push(currentToken);
-			}
-		}
-	}
-	reportMessage("cue text parsed: "+cueStructure);
-	return cueStructure;
-}
+/* JavaScript Renderer for WebVTT tracks
+ Generates GPAC Scene Graph (SVG, BIFS) to display WebVTT cues */
+alert("WebVTT Rendered Loaded");
+
+var DEBUG = false;
+
+var rect = document.documentElement.getRectPresentationTrait("viewBox");
+var width = rect.width;
+var height = rect.height;
+var xOffset = 5;
+var yOffset = 5;
+var fontSize = 20;
+var textColor = "white";
+var fontFamily = "SANS";
+var lineIncrement = fontSize;
+var nbCues = 0;
+
+var cueArea = document.createElement("g");
+document.documentElement.appendChild(cueArea);
+
+function reportMessage(msg) {
+	if (DEBUG) {
+		alert(msg);
+	}
+}
+
+function createTextArea(settingsObj) {
+	var t = document.createElement("textArea");
+	t.setAttribute("x", xOffset+settingsObj.xPosition);
+	t.setAttribute("y", yOffset);
+	var w, h;
+	if (settingsObj.fromTop) {
+		t.setAttribute("display-align", "before");
+		h=height-2*yOffset;
+	} else {
+		t.setAttribute("display-align", "after");
+		h = height-2*yOffset-settingsObj.linePosition;
+	}
+	w = settingsObj.size-2*xOffset;
+	t.setAttribute("height", h);
+	t.setAttribute("width", w);
+	reportMessage("Creating textArea size " + w + " x " + h);
+	
+	t.setAttribute("fill", textColor);
+	t.setAttribute("font-size", fontSize);
+	t.setAttribute("font-family", fontFamily);
+	t.setAttribute("text-align", settingsObj.align);
+	t.setAttribute("line-increment", lineIncrement);
+	cueArea.appendChild(t);
+	reportMessage("textArea created: "+t);
+	return t;
+}
+
+function printObj(o) {
+ for (var p in o) {
+	if (o.hasOwnProperty(p)) {
+	 alert(""+p+": "+o[p]);
+ }
+ }
+}
+
+function addSpan(parent, cuePart) {
+	reportMessage("adding tspan to "+parent+" with cuePart: "+ cuePart);
+	var i;
+	var span = document.createElement('tspan');
+	//alert('adding span for '+parent+': '+cuePart+' token:'+cuePart.token);
+	if (cuePart.token === undefined) {
+		span.textContent = cuePart;
+	} else {
+		if (cuePart.token === 'i') {
+			span.setAttribute("font-style", "italic");
+		} else if (cuePart.token === 'u') {
+			span.setAttribute("text-decoration", "underline");
+		} else if (cuePart.token === 'b') {
+			span.setAttribute("font-weight", "bold");
+		}
+		for (i in cuePart.children) {
+			addSpan(span, cuePart.children[i]);
+		}
+	}
+	parent.appendChild(span);
+	reportMessage("tspan created "+span);
+	return span;
+}
+
+function parseCueSettings(cueSettings){
+	reportMessage("Parsing cue settings: "+cueSettings);
+	var obj = {};
+	var settingsArray = cueSettings.split(/\s/g);
+	//.filter(function(set) { return set && !!set.length; });
+
+	// Convert the Array into an object 
+	var compositeCueSettings = {};
+	for (var settingsIndex in settingsArray) {
+		var nvArray = settingsArray[settingsIndex].split(":");
+		compositeCueSettings[nvArray[0]] = nvArray[1];
+	}
+
+	// Compute real values
+	if (compositeCueSettings.line !== undefined) {
+		if (compositeCueSettings.line.match(/\%/)) {
+			obj.linePosition = parseFloat(compositeCueSettings.line.replace(/\%/ig,""));
+			if (isNaN(obj.linePosition)) {
+				obj.linePosition = nbCues*lineIncrement;
+			} else {
+				obj.linePosition *= height/100;
+			}
+		} else {
+			obj.linePosition = parseFloat(compositeCueSettings.line)*lineIncrement;
+			if (isNaN(obj.linePosition)) {
+				obj.linePosition = nbCues*lineIncrement;
+			} else {
+				if (obj.linePosition > 0) {
+					obj.fromTop = true;
+				} else {
+					obj.fromTop = false;
+					obj.linePosition = -obj.linePosition;
+				}
+			}
+		}
+	} else {
+		obj.linePosition = nbCues*lineIncrement;
+	}
+	reportMessage("linePosition: "+obj.linePosition);
+	if (compositeCueSettings.position !== undefined) {
+		obj.xPosition = parseFloat(compositeCueSettings.position.replace(/\%/ig,""));
+		if (isNaN(obj.xPosition)) {
+			obj.xPosition = 50;
+		} else {
+			obj.xPosition *= width/100;
+		}
+	} else {
+		obj.xPosition = 50;
+	}
+	reportMessage("xPosition: "+obj.xPosition);
+	if (compositeCueSettings.size !== undefined) {
+		obj.size = parseFloat(compositeCueSettings.size.replace(/\%/ig,""));
+		if (isNaN(obj.size)) {
+			obj.size = 100;
+		}
+	} else {
+		obj.size = 100;
+	}
+	obj.size *= width/100;
+	
+	reportMessage("size: "+obj.size);
+	if (compositeCueSettings.align !== undefined) {
+		if (compositeCueSettings.align === "middle") {
+			obj.align = "center";
+		} else if (compositeCueSettings.align === "left") {
+			obj.align = "start";
+		} else if (compositeCueSettings.align === "right") {
+			obj.align = "end";
+		} else if (compositeCueSettings.align === "start") {
+			obj.align = "start";
+		} else if (compositeCueSettings.align === "end") {
+			obj.align = "end";
+		} else {
+			obj.align = "center";
+		}
+	} else {
+		obj.align = "center";
+	}
+	reportMessage("align: "+obj.align);
+	reportMessage("cue settings parsed: "+obj);
+	return obj;
+}
+
+function removeCues() {
+	cueArea.textContent = '';
+	nbCues = 0;
+}
+
+function addCue(id, start, end, settings, payload) {
+	reportMessage("adding cue: "+id+","+start+","+end+","+settings+","+payload);
+	var lines = payload.split('\n');
+	var settingObj = parseCueSettings(settings);
+	var tA = createTextArea(settingObj);
+	for (var lineIndex in lines) {
+		var parsedCue = parseCue(lines[lineIndex]);
+		for (var cuePartIndex in parsedCue) {
+			addSpan(tA, parsedCue[cuePartIndex]);
+		}
+		tA.appendChild(document.createElement('tbreak'));
+	}
+	nbCues++;
+	reportMessage("cue added: "+tA);
+}
+
+/* Code adapted from https://raw.github.com/cgiffard/Captionator/master/js/captionator.js */
+var SRTChunkTimestampParser		= /(\d{2})?:?(\d{2}):(\d{2})[\.\,](\d+)/; 
+function parseCue(cueText) {
+	reportMessage("Parsing cue text: "+cueText);
+
+	var cueStructure = new Array,
+		cueSplit = [],
+		splitIndex,
+		currentToken,
+		currentContext,
+		stack = [],
+		stackIndex = 0,
+		chunkTimestamp,
+		timeData,
+		lastCueTime;
+					
+	cueSplit = cueText.split(/(<\/?[^>]+>)/ig);
+				
+	currentContext = cueStructure;
+	for (splitIndex in cueSplit) {
+		if (cueSplit.hasOwnProperty(splitIndex)) {
+			currentToken = cueSplit[splitIndex];
+			
+			if (currentToken.substr(0,1) === "<") {
+				if (currentToken.substr(1,1) === "/") {
+					// Closing tag
+					var TagName = currentToken.substr(2).split(/[\s>]+/g)[0];
+					if (stack.length > 0) {
+						// Scan backwards through the stack to determine whether we've got an open tag somewhere to close.
+						var stackScanDepth = 0;
+						for (stackIndex = stack.length-1; stackIndex >= 0; stackIndex --) {
+							var parentContext = stack[stackIndex][stack[stackIndex].length-1];
+							stackScanDepth = stackIndex;
+							if (parentContext.token === TagName) { break; }
+						}
+					
+						currentContext = stack[stackScanDepth];
+						stack = stack.slice(0,stackScanDepth);
+					} else {
+						// Tag mismatch!
+						alert("Tag mismatch when parsing WebVTT cue: "+cueText);
+					}
+				} else {
+					// Opening Tag
+					// Check whether the tag is valid according to the WebVTT specification
+					// If not, don't allow it (unless the sanitiseCueHTML option is explicitly set to false)
+				
+					if ((	currentToken.substr(1).match(SRTChunkTimestampParser)	||
+							currentToken.match(/^<v\s+[^>]+>/i)						||
+							currentToken.match(/^<c[a-z0-9\-\_\.]+>/)				||
+							currentToken.match(/^<(b|i|u|ruby|rt)>/))				) {
+						
+						var tmpObject = {
+							"token":	currentToken.replace(/[<\/>]+/ig,"").split(/[\s\.]+/)[0],
+							"rawToken":	currentToken,
+							"children":	[]
+						};
+						
+						if (tmpObject.token === "v") {
+							tmpObject.voice = currentToken.match(/^<v\s*([^>]+)>/i)[1];
+						} else if (tmpObject.token === "c") {
+							tmpObject.classes = currentToken
+													.replace(/[<\/>\s]+/ig,"")
+													.split(/[\.]+/ig)
+													.slice(1)
+													.filter(hasRealTextContent);
+						} else if (!!(chunkTimestamp = tmpObject.rawToken.match(SRTChunkTimestampParser))) {
+							cueStructure.isTimeDependent = true;
+							timeData = chunkTimestamp.slice(1);
+							tmpObject.timeIn =	parseInt((timeData[0]||0) * 60 * 60,10) +	// Hours
+												parseInt((timeData[1]||0) * 60,10) +		// Minutes
+												parseInt((timeData[2]||0),10) +				// Seconds
+												parseFloat("0." + (timeData[3]||0));		// MS
+						}
+					
+						currentContext.push(tmpObject);
+						stack.push(currentContext);
+						currentContext = tmpObject.children;
+					}
+				}
+			} else {
+				// Text string
+				currentToken = currentToken
+								.replace(/</g,"&lt;")
+								.replace(/>/g,"&gt;")
+								.replace(/\&/g,"&amp;");
+					
+				currentToken = currentToken.replace(/\n+/g," ");
+			
+				currentContext.push(currentToken);
+			}
+		}
+	}
+	reportMessage("cue text parsed: "+cueStructure);
+	return cueStructure;
+}

v0.5.2.tar.gz/include/gpac/avparse.h -> v0.6.1.tar.gz/include/gpac/avparse.h Changed

@@ -195,7 +195,22 @@
 	Bool has_ps;
 	/*PL indication*/
 	u8 audioPL;
+
+	/*program config element*/
+	Bool program_config_element_present, mono_mixdown_present, stereo_mixdown_present, matrix_mixdown_idx_present, pseudo_surround_enable ;
+	u8 element_instance_tag, object_type, sampling_frequency_index, num_front_channel_elements, num_side_channel_elements, num_back_channel_elements, num_lfe_channel_elements, num_assoc_data_elements, num_valid_cc_elements;
+	u8 mono_mixdown_element_number, stereo_mixdown_element_number, matrix_mixdown_idx;
+
+	u8 front_element_is_cpe[15], front_element_tag_select[15];
+	u8 side_element_is_cpe[15], side_element_tag_select[15];
+	u8 back_element_is_cpe[15], back_element_tag_select[15];
+	u8 lfe_element_tag_select[15];
+	u8 assoc_data_element_tag_select[15];
+	u8 cc_element_is_ind_sw[15], valid_cc_element_tag_select[15];
+	u8 comment_field_bytes;
+	u8 comments[255];
 } GF_M4ADecSpecInfo;
+
 /*parses dsi and updates audioPL*/
 GF_Err gf_m4a_get_config(char *dsi, u32 dsi_size, GF_M4ADecSpecInfo *cfg);
 /*gets audioPL for given cfg*/

v0.5.2.tar.gz/include/gpac/base_coding.h -> v0.6.1.tar.gz/include/gpac/base_coding.h Changed

v0.5.2.tar.gz/include/gpac/bitstream.h -> v0.6.1.tar.gz/include/gpac/bitstream.h Changed

@@ -236,7 +236,7 @@
 /*!
  *	\brief variable length integer reading
  *
- *	Reads an integer coded on a variable number of 4-bits chunks. The number of chunks is given by the number of non-0 bits at the begining.
+ *	Reads an integer coded on a variable number of 4-bits chunks. The number of chunks is given by the number of non-0 bits at the beginning.
  *	\param bs the target bitstream
  *	\return the integer value read.
  */
@@ -433,7 +433,7 @@
 /*!
  *\brief bitstream seeking
  *
- *Seeks the bitstream to a given offset after the begining of the stream. This will perform alignment of the bitstream in all modes.
+ *Seeks the bitstream to a given offset after the beginning of the stream. This will perform alignment of the bitstream in all modes.
  *\warning Results are unpredictable if seeking beyond the bitstream end is performed.
  *\param bs the target bitstream
  *\param offset buffer/file offset to seek to
@@ -459,7 +459,7 @@
 	* otherwise, bitstream is not aligned and bits are peeked from current state
  *\return the integer value read
 */
-u32 gf_bs_peek_bits(GF_BitStream *bs, u32 numBits, u32 byte_offset);
+u32 gf_bs_peek_bits(GF_BitStream *bs, u32 numBits, u64 byte_offset);
 
 /*!
  *\brief bit reservoir query

v0.5.2.tar.gz/include/gpac/cache.h -> v0.6.1.tar.gz/include/gpac/cache.h Changed

v0.5.2.tar.gz/include/gpac/color.h -> v0.6.1.tar.gz/include/gpac/color.h Changed

v0.5.2.tar.gz/include/gpac/compositor.h -> v0.6.1.tar.gz/include/gpac/compositor.h Changed

@@ -54,8 +54,9 @@
 /*set the root scene graph of the compositor - if NULL remove current and reset simulation time*/
 GF_Err gf_sc_set_scene(GF_Compositor *sr, GF_SceneGraph *scene_graph);
 
-/*if the compositor doesn't use its own thread for visual, this will perform a render pass*/
-Bool gf_sc_draw_frame(GF_Compositor *sr, Bool no_video_flush, u32 *ms_till_next);
+/*if the compositor doesn't use its own thread for visual, this will perform a render pass
+return 1 if there are pending tasks (frame late, fonts pending, etc) or 0 if everything was ready while drawing the frame*/
+Bool gf_sc_draw_frame(GF_Compositor *sr, Bool no_video_flush, s32 *ms_till_next);
 
 /*flushes the video to screen - typically used after @gf_sc_draw_frame without flush*/
 void gf_sc_flush_video(GF_Compositor *compositor);
@@ -121,7 +122,7 @@
 GF_Err gf_sc_release_screen_buffer(GF_Compositor *sr, GF_VideoSurface *framebuffer);
 
 /*renders one frame*/
-void gf_sc_simulation_tick(GF_Compositor *sr);
+void gf_sc_render_frame(GF_Compositor *sr);
 
 /*forces graphics cache recompute*/
 void gf_sc_reset_graphics(GF_Compositor *sr);

v0.5.2.tar.gz/include/gpac/configuration.h -> v0.6.1.tar.gz/include/gpac/configuration.h Changed

@@ -32,129 +32,137 @@
 /*this file defines all common macros for libgpac compilation
   except for symbian32 which uses .mmp directives ... */
 
+/*Configuration for visual studio, 32/64 bits */
+#if defined(WIN32) && !defined(_WIN32_WCE)
 
-/*visual studio and xcode*/
-#if defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_ANDROID)
+#ifndef GPAC_MP4BOX_MINI
 
-/*enables GPAC memory tracking in debug mode only*/
-#if defined(DEBUG) || defined(_DEBUG)
-#define GPAC_MEMORY_TRACKING
-#endif
-
-/*SSL enabled*/
-#if defined(WIN32)
 #define GPAC_HAS_SSL
-#endif
 
-/*spidermonkey enabled*/
 #define GPAC_HAS_SPIDERMONKEY
-#ifdef GPAC_CONFIG_DARWIN
-#define MOZILLA_1_8_BRANCH
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-#endif
-
-/*libjpeg enabled*/
 #define GPAC_HAS_JPEG
-/*pnj enabled*/
 #define GPAC_HAS_PNG
 
 /*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/
 
+#define GPAC_MEMORY_TRACKING
 
-//iOS compilation
-#if defined(GPAC_CONFIG_DARWIN) && defined(GPAC_IPHONE)
+/*Win32 IPv6 is evaluated at compile time, !! do not uncomment !!*/
+//#define GPAC_HAS_IPV6
 
-#define GPAC_USE_OGL_ES
-//#define GPAC_FIXED_POINT
 #define GPAC_HAS_GLU
 
-/*lazy definition of extra libs for iOS*/
-#define GPAC_HAS_FAAD
-#define GPAC_HAS_MAD
-#define GPAC_HAS_FFMPEG
-#define GPAC_HAS_SDL
-#define GPAC_HAS_FREETYPE
+#endif /*GPAC_MP4BOX_MINI*/
 
-#ifndef XP_UNIX
-#define XP_UNIX
+/*Configuration for WindowsCE 32 bits */
+#elif defined(_WIN32_WCE)
+
+#ifndef GPAC_FIXED_POINT
+#define GPAC_FIXED_POINT
 #endif
 
-#endif //end iOS flags
+/*use intel fixed-point*/
+//#define GPAC_USE_IGPP
+/*use intel fixed-point with high precision*/
+//#define GPAC_USE_IGPP_HP
+
+#if defined(GPAC_USE_IGPP) && defined(GPAC_USE_IGPP_HP)
+#error "Only one of GPAC_USE_IGPP and GPAC_USE_IGPP_HP can be defined"
+#endif
 
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+#define GPAC_USE_GLES1X
+#endif
 
-//OSX compilation
-#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
 
-#define GPAC_HAS_IPV6
-#define GPAC_HAS_SSL
+#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_JPEG
+#define GPAC_HAS_PNG
 
-#ifdef __LP64__
-#define GPAC_64_BITS
-#endif
+/*comment this line if you don't have a GLU32 version for Windows Mobile*/
+//#define GPAC_HAS_GLU
 
-#endif  //end OSX flags
 
+/*Configuration for Android */
+#elif defined(GPAC_CONFIG_ANDROID)
 
-//Android test compilation without any extra lib
-#if defined(GPAC_CONFIG_ANDROID)
+#ifndef GPAC_ANDROID
 #define GPAC_ANDROID
+#endif
 
 #define GPAC_HAS_IPV6
-#define GPAC_USE_OGL_ES
-#define GPAC_FIXED_POINT
-
-#undef GPAC_HAS_SPIDERMONKEY
-#undef GPAC_HAS_PNG
-#undef GPAC_HAS_JPEG
-
-#endif  //end OSX flags
+#define GPAC_USE_GLES1X
+/*don't use fixed-point version on Android, not needed*/
+//#define GPAC_FIXED_POINT
 
+#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_JPEG
+#define GPAC_HAS_PNG
 
+/*Configuration for XCode OSX (not iOS) */
+#elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
 
-//WinCE flags
-#if defined(_WIN32_WCE)
+#define GPAC_HAS_IPV6
+#define GPAC_HAS_SSL
 
-#ifndef GPAC_FIXED_POINT
-#define GPAC_FIXED_POINT
+//64-bits OSX
+#ifdef __LP64__
+#define GPAC_64_BITS
 #endif
 
-/*use intel fixed-point*/
-//#define GPAC_USE_IGPP
-/*use intel fixed-point with high precision*/
-//#define GPAC_USE_IGPP_HP
+#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_JPEG
+#define GPAC_HAS_PNG
+#define GPAC_HAS_GLU
 
-#if defined(GPAC_USE_IGPP) && defined(GPAC_USE_IGPP_HP)
-#error "Only one of GPAC_USE_IGPP and GPAC_USE_IGPP_HP can be defined"
-#endif
+/*Configuration for XCode iOS*/
+#elif defined(GPAC_CONFIG_DARWIN) && defined(GPAC_IPHONE)
 
-#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
-#define GPAC_USE_OGL_ES
+//64-bits iOS
+#ifdef __LP64__
+#define GPAC_64_BITS
 #endif
 
-#endif //WinCE flags
+#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_JPEG
+#define GPAC_HAS_PNG
+
+/*don't use fixed-point version on iOS, not needed*/
+//#define GPAC_FIXED_POINT
 
+//#define GPAC_USE_GLES1X
+#define GPAC_USE_GLES2
 
+// glu port available in gpac extra libs
+#define GPAC_HAS_GLU
 
-#endif /*defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN)*/
+/*extra libs supported on iOS*/
+#define GPAC_HAS_FAAD
+#define GPAC_HAS_MAD
+#define GPAC_HAS_FFMPEG
+#define GPAC_HAS_SDL
+#define GPAC_HAS_FREETYPE
+
+#define GPAC_HAS_IPV6
+#define GPAC_HAS_SSL
 
 
-#if defined(__SYMBIAN32__)
+/*Configuration for Symbian*/
+#elif defined(__SYMBIAN32__)
 
 #ifndef GPAC_FIXED_POINT
 #define GPAC_FIXED_POINT
 #endif
 
-#endif
+#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_JPEG
+#define GPAC_HAS_PNG
 
-#if defined(_WIN32_WCE)
-/*comment this line if you don't have a GLU32 version for Windows Mobile*/
-//#define GPAC_HAS_GLU
-#elif defined(WIN32)
-#define GPAC_HAS_GLU
+#else
+#error "Unknown target platform used with static configuration file"
 #endif
 
+
 /*disables player */
 //#define GPAC_DISABLE_PLAYER
 
@@ -164,8 +172,12 @@
 /*disables core tools */
 //#define GPAC_DISABLE_CORE_TOOLS
 
-/*disables core tools */
+/*disables zlib */
+#ifndef GPAC_MP4BOX_MINI
 //#define GPAC_DISABLE_ZLIB
+#else
+#define GPAC_DISABLE_ZLIB
+#endif
 
 /*disables SVG scene graph*/
 //#define GPAC_DISABLE_SVG
@@ -282,5 +294,6 @@
 /*disables VOBSUB */
 //#define GPAC_DISABLE_VOBSUB
 
+
 #endif		/*_GF_CONFIG_H_*/

v0.5.2.tar.gz/include/gpac/dash.h -> v0.6.1.tar.gz/include/gpac/dash.h Changed

@@ -38,12 +38,12 @@
 /*!
  * All the possible Mime-types for MPD files
  */
-static const char * GF_DASH_MPD_MIME_TYPES[] = { "application/dash+xml", "video/vnd.3gpp.mpd", "audio/vnd.3gpp.mpd", NULL };
+static const char * const GF_DASH_MPD_MIME_TYPES[] = { "application/dash+xml", "video/vnd.3gpp.mpd", "audio/vnd.3gpp.mpd", "video/vnd.mpeg.dash.mpd", "audio/vnd.mpeg.dash.mpd", NULL };
 
 /*!
  * All the possible Mime-types for M3U8 files
  */
-static const char * GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegurl", "application/vnd.apple.mpegurl", NULL};
+static const char * const GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegurl", "application/vnd.apple.mpegurl", NULL};
 
 typedef enum
 {
@@ -68,8 +68,10 @@
 
 	/*position in timeshift buffer has changed (eg, paused)*/
 	GF_DASH_EVENT_TIMESHIFT_UPDATE,
-	/*event sent when timeshift buffer is overflown - the group_idx param contains the max number of droped segments of all representations droped by the client, or -1 if play pos is ahead of live */
+	/*event sent when timeshift buffer is overflown - the group_idx param contains the max number of dropped segments of all representations droped by the client, or -1 if play pos is ahead of live */
 	GF_DASH_EVENT_TIMESHIFT_OVERFLOW,
+	/*event send when we need the decoding statistics*/
+	GF_DASH_EVENT_CODEC_STAT_QUERY,
 } GF_DASHEventType;
 
 /*structure used for all IO operations for DASH*/
@@ -84,7 +86,7 @@
 	/*signals errors or specific actions to perform*/
 	GF_Err (*on_dash_event)(GF_DASHFileIO *dashio, GF_DASHEventType evt, s32 group_idx, GF_Err setup_error);
 
-	/*used to check whether a representation is supported or not. Function returns 1 if supported, 0 otheriwse
+	/*used to check whether a representation is supported or not. Function returns 1 if supported, 0 otherwise
 	if this callback is not set, the representation is assumed to be supported*/
 	Bool (*dash_codec_supported)(GF_DASHFileIO *dashio, const char *codec, u32 width, u32 height, Bool is_interlaced, u32 fps_num, u32 fps_denum, u32 sample_rate);
 
@@ -129,16 +131,22 @@
 
 typedef enum
 {
+	//selects the lowest quality when starting - if one of the representation does not have video (HLS), it may be selected
 	GF_DASH_SELECT_QUALITY_LOWEST,
+	//selects the highest quality when starting
 	GF_DASH_SELECT_QUALITY_HIGHEST,
+	//selects the lowest bandwidth when starting - if one of the representation does not have video (HLS), it will NOT be selected
 	GF_DASH_SELECT_BANDWIDTH_LOWEST,
-	GF_DASH_SELECT_BANDWIDTH_HIGHEST
+	//selects the highest bandwidth when starting - for tiles all low priority tiles will have the lower (below max) bandwidth selected
+	GF_DASH_SELECT_BANDWIDTH_HIGHEST,
+	//selects the highest bandwidth when starting - for tiles all low priority tiles will have their lowest bandwidth selected
+	GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES
 } GF_DASHInitialSelectionMode;
 
 /*create a new DASH client:
 	@dash_io: DASH callbacks to the user
 	@max_cache_duration: maximum duration in milliseconds for the cached media. If less than mpd@minBufferTime, mpd@minBufferTime is used
-	@auto_switch_count: forces representation switching every auto_switch_count segments
+	@auto_switch_count: forces representation switching every auto_switch_count segments, set to 0 to disable
 	@keep_files: do not delete files from the cache
 	@disable_switching: turn off bandwidth switching algorithm
 	@first_select_mode: indicates which representation to select upon startup
@@ -194,6 +202,9 @@
 /*indicates whether a group is selected for playback or not. Currently groups cannot be selected during playback*/
 Bool gf_dash_is_group_selected(GF_DashClient *dash, u32 group_index);
 
+/*indicates whether this group is dependent on another group (because representations are). If this is the case, all representations of this group will be made available through the base group (and @has_next_segment flag) if the group is selected.*/
+Bool gf_dash_group_has_dependent_group(GF_DashClient *dash, u32 idx);
+
 /*indicates whether a group can be selected for playback or not. Some groups may have been disabled because of non supported features*/
 Bool gf_dash_is_group_selectable(GF_DashClient *dash, u32 idx);
 
@@ -205,9 +216,12 @@
 
 /*returns the mime type of the media resources in this group*/
 const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 idx);
-/*returns the URL of tyhe first media resource to play (init segment or first media segment depending on format). start_range and end_range are optional*/
+/*returns the URL of the first media resource to play (init segment or first media segment depending on format). start_range and end_range are optional*/
 const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range);
 
+/*returns the URL and IV associated with the first media segment if any (init segment or first media segment depending on format). key_IV is optional*/
+const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 idx, bin128 *key_IV);
+
 /*returns the language of the group, or NULL if none associated*/
 const char *gf_dash_group_get_language(GF_DashClient *dash, u32 idx);
 
@@ -219,7 +233,13 @@
 
 /*get current time in time shift buffer in seconds - 0 means 'live point'
 this gets the maximum value (further in the past) of all representations playing*/
-u32 gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash);
+Double gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash);
+
+/*sets codec statistics for playback rate adjustment*/
+void gf_dash_set_codec_stat(GF_DashClient *dash, u32 idx, u32 avg_dec_time, u32 max_dec_time, u32 irap_avg_dec_time, u32 irap_max_dec_time, Bool codec_reset, Bool decode_only_rap);
+
+/*sets buffer levels*/
+void gf_dash_set_buffer_levels(GF_DashClient *dash, u32 idx, u32 buffer_min_ms, u32 buffer_max_ms, u32 buffer_occupancy_ms);
 
 typedef enum
 {
@@ -248,7 +268,7 @@
 */
 GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, u32 dependent_representation_index, const char **url, u64 *start_range, u64 *end_range,
         s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range,
-        const char **original_url, Bool *has_next_segment);
+        const char **original_url, Bool *has_next_segment, const char **key_url, bin128 *key_IV);
 
 /*same as gf_dash_group_get_next_segment_location but query the current downloaded segment*/
 GF_EXPORT
@@ -277,7 +297,7 @@
 Bool gf_dash_in_last_period(GF_DashClient *dash);
 /*return value:
 	1 if the period switching has been requested (due to seeking),
-	2 if the switching is in progress (all groups will soon be destroyed and plyback will be stoped and restarted)
+	2 if the switching is in progress (all groups will soon be destroyed and plyback will be stopped and restarted)
 	0 if no switching is requested
 */
 u32 gf_dash_get_period_switch_status(GF_DashClient *dash);
@@ -308,7 +328,7 @@
 /*gets media buffering info for all active representations*/
 void gf_dash_get_buffer_info(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered);
 
-/*updates media bandwidth for the given group*/
+/*updates media bandwidth for the given group. Only allowed for groups without dependencies to other groups*/
 GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 idx);
 
 /*resync the downloader so that the next downloaded segment falls into the indicated range - used for error recovery*/
@@ -358,6 +378,8 @@
 //returns number of quality available for the given group
 u32 gf_dash_group_get_num_qualities(GF_DashClient *dash, u32 idx);
 
+void gf_dash_disable_speed_adaptation(GF_DashClient *dash, Bool disable);
+
 
 typedef struct
 {
@@ -392,6 +414,42 @@
 //gets download rate in bytes per second for the given group
 u32 gf_dash_group_get_download_rate(GF_DashClient *dash, u32 idx);
 
+//forces NTP of the DASH client to be the given NTP
+void gf_dash_override_ntp(GF_DashClient *dash, u64 server_ntp);
+
+//specifies how bitrate is allocated accross tiles of the same video
+typedef enum
+{
+	//each tile receives the same amount of bitrate (default strategy)
+	GF_DASH_ADAPT_TILE_NONE=0,
+	//bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row
+	GF_DASH_ADAPT_TILE_ROWS,
+	//bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row
+	GF_DASH_ADAPT_TILE_ROWS_REVERSE,
+	//bitrate decreased for top and bottom rows only, same rate for each tile on the row
+	GF_DASH_ADAPT_TILE_ROWS_MIDDLE,
+	//bitrate decreases for each column of tiles starting from the left, same rate for each tile on the column
+	GF_DASH_ADAPT_TILE_COLUMNS,
+	//bitrate decreases for each column of tiles starting from the right, same rate for each tile on the column
+	GF_DASH_ADAPT_TILE_COLUMNS_REVERSE,
+	//bitrate decreased for left and right columns only, same rate for each tile on the column
+	GF_DASH_ADAPT_TILE_COLUMNS_MIDDLE,
+	//bitrate decreased for all tiles on the edge of the picture
+	GF_DASH_ADAPT_TILE_CENTER,
+	//bitrate decreased for all tiles on the center of the picture
+	GF_DASH_ADAPT_TILE_EDGES,
+} GF_DASHTileAdaptationMode;
+
+//sets type of tile adaptation.
+// @tile_rate_decrease: percentage (0->100) of global bandwidth to use at each level (recursive rate decrease for all level). If 0% or 100%, automatic rate allocation among tiles is performed (default mode)
+void gf_dash_set_tile_adaptation_mode(GF_DashClient *dash, GF_DASHTileAdaptationMode mode, u32 tile_rate_decrease);
+
+//gets max width and height in pixels of the SRD this group belongs to, if any
+Bool gf_dash_group_get_srd_max_size_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height);
+
+//gets SRD info, in SRD coordinate, of the SRD this group belongs to, if any
+Bool gf_dash_group_get_srd_info(GF_DashClient *dash, u32 idx, u32 *srd_id, u32 *srd_x, u32 *srd_y, u32 *srd_w, u32 *srd_h, u32 *srd_width, u32 *srd_height);
+
 #endif //GPAC_DISABLE_DASH_CLIENT

v0.5.2.tar.gz/include/gpac/download.h -> v0.6.1.tar.gz/include/gpac/download.h Changed

@@ -159,28 +159,28 @@
 } GF_NetIOStatus;
 
 /*!session download flags*/
-enum
+typedef enum
 {
 	/*!session is not threaded, the user must explicitely fetch the data , either with the function gf_dm_sess_fetch_data
 	or the function gf_dm_sess_process- if the session is threaded, the user must call gf_dm_sess_process to start the session*/
-	GF_NETIO_SESSION_NOT_THREADED	=	1,
-	/*! session data is live, e.g. data will be sent to the user if threaded mode (live streams like radios & co)
-			Whether the data is cached or not to disk cannot be controlled by the user at the current time.
-	*/
-	GF_NETIO_SESSION_NOT_CACHED	=	1<<1,
+	GF_NETIO_SESSION_NOT_THREADED = 1,
+	/*! session data is cached or not */
+	GF_NETIO_SESSION_NOT_CACHED = 1<<1,
+	/*! forces data notification even when session is threaded*/
+	GF_NETIO_SESSION_NOTIFY_DATA = 1<<2,
 	/*indicates that the connection to the server should be kept once the download is successfully completed*/
-	GF_NETIO_SESSION_PERSISTENT =	1<<2,
+	GF_NETIO_SESSION_PERSISTENT = 1<<3,
 	/*file is stored in memory, and the cache name is set to gpac://%u@%p, where %d is the size in bytes and %d is the the pointer to the memory.
 	Memory cached files are destroyed upon downloader destruction*/
-	GF_NETIO_SESSION_MEMORY_CACHE	=	1<<3,
-};
+	GF_NETIO_SESSION_MEMORY_CACHE = 1<<4,
+} GF_NetIOFlags;
 
 
 /*!protocol I/O parameter*/
 typedef struct
 {
 	/*!parameter message type*/
-	u32 msg_type;
+	GF_NetIOStatus msg_type;
 	/*error code if any. Valid for all message types.*/
 	GF_Err error;
 	/*!data received or data to send. Only valid for GF_NETIO_GET_CONTENT and GF_NETIO_DATA_EXCHANGE (when no cache is setup) messages*/
@@ -392,10 +392,10 @@
 /*!
 *\brief fetch session object
 *
- *Fetch the session object (process all headers and data transfer). This is only usable if the session is not threaded
+ *Fetches the session object (process all headers and data transfer). This is only usable if the session is not threaded
 *\param sess the download session
 *\return the last error in the session or 0 if none*/
-GF_Err gf_dm_sess_process(GF_DownloadSession * sess);
+GF_Err gf_dm_sess_process(GF_DownloadSession *sess);
 
 /*!
 *\brief fetch session object headers
@@ -412,6 +412,7 @@
 *\param sess the download session
 *\return the session status*/
 u32 gf_dm_sess_get_status(GF_DownloadSession * sess);
+
 /*!
 *\brief Get session resource url
 *
@@ -420,6 +421,7 @@
 *\return the associated URL
 */
 const char *gf_dm_sess_get_resource_name(GF_DownloadSession *sess);
+
 /*!
 *\brief Get session original resource url
 *
@@ -429,18 +431,18 @@
 */
 const char *gf_dm_sess_get_original_resource_name(GF_DownloadSession *sess);
 
-
+#ifndef GPAC_DISABLE_CORE_TOOLS
 /*!
 * \brief Download a file over the network using a download manager
- * \param dm The downlaod manager to use, function will use all associated cache ressources
+ * \param dm The download manager to use, function will use all associated cache ressources
 * \param url The url to download
 * \param filename The filename to download
 * \param start_range start position of a byte range
 * \param end_range end position of a byte range
+ * \param redirected_url If not NULL, @redirected_url will be allocated and filled with the URL after redirection. Caller takes ownership
 * \return GF_OK if everything went fine, an error otherwise
 */
-GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm,
- const char *url, const char *filename, u64 start_range, u64 end_range);
+GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm, const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url);
 
 /*!
 * \brief Same as gf_dm_wget_with_cache, but initializes the GF_DownloadManager by itself.
@@ -449,9 +451,12 @@
 * \param filename The filename to download
 * \param start_range start position of a byte range
 * \param end_range end position of a byte range
+ * \param redirected_url If not NULL, @redirected_url will be allocated and filled with the URL after redirection. Caller takes ownership
 * \return GF_OK if everything went fine, an error otherwise
 */
-GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range);
+GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url);
+
+#endif /* GPAC_DISABLE_CORE_TOOLS */
 
 /*!
 *\brief Reset session
@@ -533,7 +538,7 @@
 *
 *Gets the cumultated bitrate in of all active sessions.
 *\param dm the download manager object
- *\return the cumulated rate in bits per sec. If 0, HTTP rate is not limited
+ *\return the cumulated rate in bits per sec.
 */
 u32 gf_dm_get_global_rate(GF_DownloadManager *dm);
 
@@ -541,7 +546,7 @@
 /*
 *\brief fetches remote file in memory
 *
- *Fetches remote file in memory .
+ *Fetches remote file in memory.
 *\param url the data to fetch
 *\param out_data output data (allocated by function)
 *\param out_size output data size
@@ -559,7 +564,7 @@
 *\param req_hdr_size request header size in bytes. May be NULL.
 *\param rsp_hdr_size response header size in bytes. May be NULL.
 *\param connect_time connection time in micro seconds. May be NULL.
- *\param reply_time ellapsed time between request sent and response header received, in micro seconds. May be NULL.
+ *\param reply_time elapsed time between request sent and response header received, in micro seconds. May be NULL.
 *\param download_time download time since request sent, in micro seconds. May be NULL.
 *\return error code if any
 */

v0.5.2.tar.gz/include/gpac/events_constants.h -> v0.6.1.tar.gz/include/gpac/events_constants.h Changed

v0.5.2.tar.gz/include/gpac/html5_mse.h -> v0.6.1.tar.gz/include/gpac/html5_mse.h Changed

v0.5.2.tar.gz/include/gpac/ietf.h -> v0.6.1.tar.gz/include/gpac/ietf.h Changed

@@ -512,6 +512,9 @@
 	u32 SSRC;
 	/*in our basic client, CSRC should always be NULL*/
 	u32 CSRC[16];
+
+	/*internal to out lib*/
+	u64 recomputed_ntp_ts;
 } GF_RTPHeader;
 
 
@@ -602,7 +605,7 @@
 u32 gf_rtp_read_rtp(GF_RTPChannel *ch, char *buffer, u32 buffer_size);
 u32 gf_rtp_read_rtcp(GF_RTPChannel *ch, char *buffer, u32 buffer_size);
 
-/*decodes an RTP packet and gets the begining of the RTP payload*/
+/*decodes an RTP packet and gets the beginning of the RTP payload*/
 GF_Err gf_rtp_decode_rtp(GF_RTPChannel *ch, char *pck, u32 pck_size, GF_RTPHeader *rtp_hdr, u32 *PayloadStart);
 
 /*decodes an RTCP packet and update timing info, send RR too*/
@@ -1092,7 +1095,7 @@
 	You should ONLY modify the GF_SLHeader while packetizing, all the rest is private
 	to the tool.
 	Also note that AU start/end is automatically updated, therefore you should only
-	set CTS-DTS-OCR-sequenceNumber (which is automatically incremented when spliting a payload)
+	set CTS-DTS-OCR-sequenceNumber (which is automatically incremented when splitting a payload)
 	-padding-idle infos
 	SL flags are computed on the fly, but you may wish to modify them in case of
 	packet drop/... at the encoder side
@@ -1195,7 +1198,7 @@
 		@offset_from_orig: start offset in input buffer
 	@OnData: to call each time data is added to current RTP packet (either extra data from payload or
 		data from input when not using referencing)
-		@is_head: signal the data added MUST be inserted at the begining of the payload. Otherwise data
+		@is_head: signal the data added MUST be inserted at the beginning of the payload. Otherwise data
 		is concatenated as received
 */
 GP_RTPPacketizer *gf_rtp_builder_new(u32 rtp_payt,

v0.5.2.tar.gz/include/gpac/internal/camera.h -> v0.6.1.tar.gz/include/gpac/internal/camera.h Changed

v0.5.2.tar.gz/include/gpac/internal/compositor_dev.h -> v0.6.1.tar.gz/include/gpac/internal/compositor_dev.h Changed

@@ -107,7 +107,7 @@
 
 #endif
 
-#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL)
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 # define OPENGL_RASTER
 #else
 # ifdef OPENGL_RASTER
@@ -211,9 +211,10 @@
 	u32 last_frame_time, caret_next_draw_time;
 	Bool show_caret;
 	Bool text_edit_changed;
+	//sampled value of audio clock used in bench mode only
 	u32 scene_sampled_clock;
 	u32 last_click_time;
-	u32 next_frame_delay;
+	s32 ms_until_next_frame;
 	s32 frame_delay;
 	Bool video_frame_pending;
 	Bool fullscreen_postponed;
@@ -289,7 +290,7 @@
 	u32 new_width, new_height;
 
 	/*current background color*/
-	u32 back_color;
+	u32 back_color, default_back_color;
 
 	/*bounding box draw type: none, unit box/rect and sphere (3D only)*/
 	u32 draw_bvol;
@@ -480,7 +481,7 @@
 	Bool disable_gl_cull;
 	/*YUV textures in OpenGL are disabled (soft YUV->RGB )*/
 	Bool disable_yuvgl;
-	//use PBO to start pushing textures at the begining of the render pass
+	//use PBO to start pushing textures at the beginning of the render pass
 	Bool enable_pbo;
 
 	u32 default_navigation_mode;
@@ -495,7 +496,10 @@
 
 	u32 offscreen_width, offscreen_height;
 
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	Bool shader_only_mode;
+#endif
+
 
 #ifdef GPAC_USE_TINYGL
 	void *tgl_ctx;
@@ -512,6 +516,9 @@
 	struct _gf_sc_texture_handler *hybgl_txh;
 	GF_Mesh *hybgl_mesh;
 	GF_Mesh *hybgl_mesh_background;
+
+	char *screen_buffer;
+	u32 screen_buffer_alloc_size;
 #endif
 
 	Bool texture_from_decoder_memory;
@@ -798,6 +805,9 @@
 	/* Contains the viewbox transform, used for svg ref() transform */
 	GF_Matrix2D vb_transform;
 
+	/*only used for bitmap drawing*/
+	GF_ColorKey *col_key;
+
 	/*if set all nodes shall be redrawn - set only at specific places in the tree*/
 	Bool invalidate_all;
 
@@ -1028,6 +1038,7 @@
 void gf_afc_unload(GF_AudioFilterChain *afc);
 void gf_afc_reset(GF_AudioFilterChain *afc);
 
+
 /*the audio renderer*/
 typedef struct _audio_render
 {
@@ -1035,18 +1046,26 @@
 
 	Bool disable_resync;
 	Bool disable_multichannel;
+	Bool clock_use_audio_out;
 
-	/*startup time (the audio renderer is used when present as the system clock)*/
-	u32 startTime;
 	/*frozen time counter if set*/
 	Bool Frozen;
-	u32 FreezeTime;
+	/*startup time, used when no audio output is set*/
+	u64 start_time;
+	/*freeze time, used when no audio output is set*/
+	u64 freeze_time;
+
+	/*system clock compute when audio output is present*/
+	u32 current_time, bytes_per_second, time_at_last_config;
+	//number of bytes requested by sound card since last reconfig
+	u64 bytes_requested;
 
 	/*final output*/
 	GF_AudioMixer *mixer;
 	Bool need_reconfig;
 	/*client*/
 	GF_User *user;
+	u32 config_forced;
 
 	GF_List *audio_listeners;
 	/*audio thread if output not self-threaded*/
@@ -1060,17 +1079,21 @@
 	u32 nb_filled, nb_used;
 
 	Bool step_mode;
+
 } GF_AudioRenderer;
 
 /*creates audio renderer*/
 GF_AudioRenderer *gf_sc_ar_load(GF_User *user);
 /*deletes audio renderer*/
 void gf_sc_ar_del(GF_AudioRenderer *ar);
-/*control audio renderer - CtrlType:
-	0: pause
-	1: resume
-	2: clean HW buffer and play
-*/
+
+enum
+{
+	GF_SC_AR_PAUSE=0,
+	GF_SC_AR_RESUME,
+	GF_SC_AR_RESET_HW_AND_PLAY,
+};
+/*control audio renderer*/
 void gf_sc_ar_control(GF_AudioRenderer *ar, u32 CtrlType);
 /*set volume and pan*/
 void gf_sc_ar_set_volume(GF_AudioRenderer *ar, u32 Volume);
@@ -1093,6 +1116,7 @@
 u32 gf_sc_ar_get_delay(GF_AudioRenderer *ar);
 
 void gf_sc_flush_next_audio(GF_Compositor *compositor);
+Bool gf_sc_check_audio_pending(GF_Compositor *compositor);
 
 /*the sound node interface for intensity & spatialization*/
 typedef struct _soundinterface
@@ -1169,6 +1193,8 @@
 void compositor_2d_release_video_access(GF_VisualManager *surf);
 void compositor_2d_init_callbacks(GF_Compositor *compositor);
 GF_Rect compositor_2d_update_clipper(GF_TraverseState *tr_state, GF_Rect this_clip, Bool *need_restore, GF_Rect *original, Bool for_layer);
+Bool compositor_2d_check_attached(GF_VisualManager *visual);
+void compositor_2d_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool is_offscreen);
 
 #ifndef GPAC_DISABLE_3D
 void compositor_2d_reset_gl_auto(GF_Compositor *compositor);
@@ -1428,6 +1454,9 @@
 
 Bool gf_sc_is_over(GF_Compositor *compositor, GF_SceneGraph *scene_graph);
 
+/*returns true if scene or current layer accepts tghe requested navigation type, false otherwise*/
+Bool gf_sc_navigation_supported(GF_Compositor *compositor, u32 type);
+
 #ifdef __cplusplus
 }
 #endif

v0.5.2.tar.gz/include/gpac/internal/isomedia_dev.h -> v0.6.1.tar.gz/include/gpac/internal/isomedia_dev.h Changed

@@ -35,6 +35,10 @@
 #ifndef GPAC_DISABLE_ISOM
 
 
+#if defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_ADOBE)
+#define GPAC_DISABLE_ISOM_ADOBE
+#endif
+
 /*the default size is 64, cause we need to handle large boxes...
 
 the other_boxes container is by default NOT created. When parsing a box and adding
@@ -93,6 +97,7 @@
 GF_Err gf_isom_read_box_list(GF_Box *s, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b));
 GF_Err gf_isom_read_box_list_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type);
 GF_Err gf_isom_box_add_default(GF_Box *a, GF_Box *subbox);
+GF_Err gf_isom_parse_box_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box);
 
 #define gf_isom_full_box_init(__pre)
 
@@ -391,10 +396,20 @@
 	GF_ISOM_BOX_TYPE_SBTT	= GF_4CC( 's', 'b', 't', 't' ),
 
 	GF_ISOM_BOX_TYPE_STXT	= GF_4CC( 's', 't', 'x', 't' ),
-	GF_ISOM_BOX_TYPE_STTC	= GF_4CC( 's', 't', 't', 'C' ),
+	GF_ISOM_BOX_TYPE_TXTC	= GF_4CC( 't', 'x', 't', 'C' ),
 
 	GF_ISOM_BOX_TYPE_PRFT   = GF_4CC( 'p', 'r', 'f', 't' ),
 
+	/* Image File Format Boxes */
+	GF_ISOM_BOX_TYPE_ISPE   = GF_4CC( 'i', 's', 'p', 'e' ),
+	GF_ISOM_BOX_TYPE_COLR   = GF_4CC( 'c', 'o', 'l', 'r' ),
+	GF_ISOM_BOX_TYPE_PIXI   = GF_4CC( 'p', 'i', 'x', 'i' ),
+	GF_ISOM_BOX_TYPE_RLOC   = GF_4CC( 'r', 'l', 'o', 'c' ),
+	GF_ISOM_BOX_TYPE_IROT   = GF_4CC( 'i', 'r', 'o', 't' ),
+	GF_ISOM_BOX_TYPE_IPCO   = GF_4CC( 'i', 'p', 'c', 'o' ),
+	GF_ISOM_BOX_TYPE_IPRP   = GF_4CC( 'i', 'p', 'r', 'p' ),
+	GF_ISOM_BOX_TYPE_IPMA   = GF_4CC( 'i', 'p', 'm', 'a' ),
+
 	/*ALL INTERNAL BOXES - NEVER WRITTEN TO FILE!!*/
 
 	/*generic handlers*/
@@ -447,6 +462,7 @@
 	u64 modificationTime;
 	u32 timeScale;
 	u64 duration;
+	u64 original_duration;
 	u32 nextTrackID;
 	u32 preferredRate;
 	u16 preferredVolume;
@@ -591,7 +607,7 @@
 	u64 creationTime;
 	u64 modificationTime;
 	u32 timeScale;
-	u64 duration;
+	u64 duration, original_duration;
 	char packedLanguage[4];
 	u16 reserved;
 } GF_MediaHeaderBox;
@@ -812,7 +828,9 @@
 	u32 bufferSizeDB;
 	u32 maxBitrate;
 	u32 avgBitrate;
-} GF_MPEG4BitRateBox;
+} GF_BitRateBox;
+
+GF_BitRateBox *gf_isom_sample_entry_get_bitrate(GF_SampleEntryBox *ent, Bool create);
 
 typedef struct
 {
@@ -842,7 +860,6 @@
 	GF_ISOM_SAMPLE_ENTRY_FIELDS
 
 	GF_LASERConfigurationBox *lsr_config;
-	GF_MPEG4BitRateBox *bitrate;
 	GF_MPEG4ExtensionDescriptorsBox *descr;
 
 	/*used for hinting when extracting the OD stream...*/
@@ -923,7 +940,6 @@
 	GF_HEVCConfigurationBox *hevc_config;
 	GF_HEVCConfigurationBox *shvc_config;
 
-	GF_MPEG4BitRateBox *bitrate;
 	/*ext descriptors*/
 	GF_MPEG4ExtensionDescriptorsBox *descr;
 	/*internally emulated esd*/
@@ -1048,21 +1064,28 @@
 {
 	GF_ISOM_SAMPLE_ENTRY_FIELDS
 	GF_DIMSSceneConfigBox *config;
-	GF_MPEG4BitRateBox *bitrate;
 	GF_DIMSScriptTypesBox *scripts;
 } GF_DIMSSampleEntryBox;
 
 
-/*base sample entry box (never used but for typecasting)*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char *config;
+} GF_TextConfigBox;
+
+/*base metadata sample entry box for METT, METX, SBTT, STXT and STPP*/
 typedef struct
 {
 	GF_ISOM_SAMPLE_ENTRY_FIELDS
 	char *content_encoding;	//optional
-	char *mime_type_or_namespace;	//not optional
-	char *xml_schema_loc;	// optional
-	GF_MPEG4BitRateBox *bitrate; // optional
+	char *mime_type; //for anything except metx
+	char *xml_namespace;	//for metx and sttp only
+	char *xml_schema_loc;	// for metx and sttp only
+	GF_TextConfigBox *config; //optional for anything except metx and sttp
 } GF_MetaDataSampleEntryBox;
 
+
 typedef struct
 {
 	GF_ISOM_FULL_BOX
@@ -1257,6 +1280,8 @@
 
 	GF_List *sampleGroups;
 	GF_List *sampleGroupsDescription;
+	u32 nb_sgpd_in_stbl;
+	u32 nb_other_boxes_in_stbl;
 
 	GF_List *sai_sizes;
 	GF_List *sai_offsets;
@@ -1604,6 +1629,14 @@
 	GF_List *descriptors;
 } GF_IPMPControlBox;
 
+typedef struct {
+	GF_ISOM_BOX
+} GF_ItemPropertyContainerBox;
+
+typedef struct {
+	GF_ISOM_BOX
+	GF_ItemPropertyContainerBox *property_container;
+} GF_ItemPropertiesBox;
 
 typedef struct __tag_meta_box
 {
@@ -1615,6 +1648,7 @@
 	GF_ItemProtectionBox *protections;
 	GF_ItemInfoBox *item_infos;
 	GF_IPMPControlBox *IPMP_control;
+	GF_ItemPropertiesBox *item_props;
 } GF_MetaBox;
 
 
@@ -2343,12 +2377,12 @@
 void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID);
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr);
 #else
 GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *ptr);
 #endif
 
-GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr);
-
 /*
 	Boxes for Adobe's protection scheme
 */
@@ -2408,6 +2442,51 @@
 	u64 ntp, timestamp;
 } GF_ProducerReferenceTimeBox;
 
+/* Image File Format Structures */
+typedef struct {
+	GF_ISOM_FULL_BOX
+	u32 image_width;
+	u32 image_height;
+} GF_ImageSpatialExtentsPropertyBox;
+
+typedef struct {
+	GF_ISOM_BOX
+	u32 colour_type;
+	u16 colour_primaries;
+	u16 transfer_characteristics;
+	u16 matrix_coefficients;
+	Bool full_range_flag;
+	u8 *opaque;
+	u32 opaque_size;
+} GF_ColourInformationBox;
+
+typedef struct {
+	GF_ISOM_FULL_BOX
+	u8 num_channels;
+	u8 *bits_per_channel;
+} GF_PixelInformationPropertyBox;
+
+typedef struct {
+	GF_ISOM_FULL_BOX
+	u32 horizontal_offset;
+	u32 vertical_offset;
+} GF_RelativeLocationPropertyBox;
+
+typedef struct {
+	GF_ISOM_BOX
+	u8 angle;
+} GF_ImageRotationBox;
+
+typedef struct {
+	u32 item_id;
+	GF_List *essential;
+	GF_List *property_index;
+} GF_ItemPropertyAssociationEntry;
+
+typedef struct {
+	GF_ISOM_FULL_BOX
+	GF_List *entries;
+} GF_ItemPropertyAssociationBox;
 
 /*
 		Data Map (media storage) stuff
@@ -2556,6 +2635,7 @@
 	/*if true 3GPP text streams are read as MPEG-4 StreamingText*/
 	u8 convert_streaming_text;
 	u8 is_jp2;
+	u8 force_co64;
 
 	Bool keep_utc;
 	/*main boxes for fast access*/
@@ -2672,6 +2752,7 @@
 
 /*unpack sample2chunk and chunk offset so that we have 1 sample per chunk (edition mode only)*/
 GF_Err stbl_UnpackOffsets(GF_SampleTableBox *stbl);
+GF_Err stbl_unpackCTS(GF_SampleTableBox *stbl);
 GF_Err SetTrackDuration(GF_TrackBox *trak);
 GF_Err Media_SetDuration(GF_TrackBox *trak);
 
@@ -2739,15 +2820,19 @@
 GF_Err stbl_RemovePaddingBits(GF_SampleTableBox *stbl, u32 SampleNumber);
 GF_Err stbl_RemoveSampleFragments(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_RemoveRedundant(GF_SampleTableBox *stbl, u32 SampleNumber);
-
-GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf);
+GF_Err stbl_RemoveSubSample(GF_SampleTableBox *stbl, u32 SampleNumber);
+GF_Err stbl_RemoveSampleGroup(GF_SampleTableBox *stbl, u32 SampleNumber);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie);
+GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf);
 #endif
 
+Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type);
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+GF_DefaultSampleGroupDescriptionEntry * gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp);
 
 GF_Err GetNextMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
 GF_Err GetPrevMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
@@ -2786,9 +2871,13 @@
 GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, u32 trackID, u16 *outRefIndex);
 
 GF_XMLBox *gf_isom_get_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool *is_binary);
+Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl);
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf);
 void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox  *traf, u32 len);
-void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 offset, u32 len);
-Bool gf_isom_cenc_has_saiz_saio(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf);
+#endif
+void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u64 offset, u32 len);
 
 void gf_isom_parse_trif_info(const char *data, u32 size, u32 *id, u32 *independent, Bool *full_frame, u32 *x, u32 *y, u32 *w, u32 *h);
 
@@ -3243,6 +3332,7 @@
 GF_Err void_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err stsf_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err pdin_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err gnra_Read(GF_Box *s, GF_BitStream *bs);
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
@@ -3558,6 +3648,7 @@
 #ifndef GPAC_DISABLE_VTT
 /*WebVTT boxes*/
 GF_Box *boxstring_New(u32 type);
+GF_Box *boxstring_new_with_data(u32 type, const char *string);
 GF_Box *vtcu_New();
 GF_Box *vtte_New();
 GF_Box *wvtt_New();
@@ -3604,23 +3695,7 @@
 	GF_StringBox *config;
 } GF_WebVTTSampleEntryBox;
 
-typedef struct
-{
-	GF_ISOM_SAMPLE_ENTRY_FIELDS
-	char *xmlnamespace;			// not optional
-	char *schema_location;		// optional
-	char *auxiliary_mime_types;	// optional
-	GF_MPEG4BitRateBox *bitrate;// not optional
-} GF_XMLSubtitleSampleEntryBox;
-
-typedef struct
-{
-	GF_ISOM_SAMPLE_ENTRY_FIELDS
-	char *content_encoding;			//optional
-	char *mime_type;				//not optional
-	GF_MPEG4BitRateBox *bitrate;	// optional
-	GF_StringBox *config;
-} GF_SimpleTextSampleEntryBox;
+GF_WebVTTSampleEntryBox *gf_webvtt_isom_get_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex);
 
 GF_List *gf_webvtt_parse_cues_from_data(const char *data, u32 dataLength, u64 start);
 
@@ -3970,19 +4045,12 @@
 GF_Err metx_Size(GF_Box *s);
 GF_Err metx_dump(GF_Box *a, FILE * trace);
 
-GF_Box *stxt_New();
-void stxt_del(GF_Box *s);
-GF_Err stxt_Read(GF_Box *s, GF_BitStream *bs);
-GF_Err stxt_Write(GF_Box *s, GF_BitStream *bs);
-GF_Err stxt_Size(GF_Box *s);
-GF_Err stxt_dump(GF_Box *a, FILE * trace);
-
-GF_Box *stpp_New();
-void stpp_del(GF_Box *s);
-GF_Err stpp_Read(GF_Box *s, GF_BitStream *bs);
-GF_Err stpp_Write(GF_Box *s, GF_BitStream *bs);
-GF_Err stpp_Size(GF_Box *s);
-GF_Err stpp_dump(GF_Box *a, FILE * trace);
+GF_Box *txtc_New();
+void txtc_del(GF_Box *s);
+GF_Err txtc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err txtc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err txtc_Size(GF_Box *s);
+GF_Err txtc_dump(GF_Box *a, FILE * trace);
 
 GF_Box *tsel_New();
 void tsel_del(GF_Box *s);
@@ -4247,6 +4315,64 @@
 GF_Err elng_Size(GF_Box *s);
 GF_Err elng_dump(GF_Box *a, FILE * trace);
 
+/* Image File Format declarations */
+GF_Box *ispe_New();
+void ispe_del(GF_Box *s);
+GF_Err ispe_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ispe_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ispe_Size(GF_Box *s);
+GF_Err ispe_dump(GF_Box *a, FILE * trace);
+
+GF_Box *colr_New();
+void colr_del(GF_Box *s);
+GF_Err colr_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err colr_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err colr_Size(GF_Box *s);
+GF_Err colr_dump(GF_Box *a, FILE * trace);
+
+GF_Box *pixi_New();
+void pixi_del(GF_Box *s);
+GF_Err pixi_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err pixi_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err pixi_Size(GF_Box *s);
+GF_Err pixi_dump(GF_Box *a, FILE * trace);
+
+GF_Box *rloc_New();
+void rloc_del(GF_Box *s);
+GF_Err rloc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err rloc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err rloc_Size(GF_Box *s);
+GF_Err rloc_dump(GF_Box *a, FILE * trace);
+
+GF_Box *irot_New();
+void irot_del(GF_Box *s);
+GF_Err irot_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err irot_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err irot_Size(GF_Box *s);
+GF_Err irot_dump(GF_Box *a, FILE * trace);
+
+GF_Box *ipco_New();
+void ipco_del(GF_Box *s);
+GF_Err ipco_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ipco_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ipco_Size(GF_Box *s);
+GF_Err ipco_dump(GF_Box *a, FILE * trace);
+
+GF_Box *iprp_New();
+void iprp_del(GF_Box *s);
+GF_Err iprp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err iprp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err iprp_Size(GF_Box *s);
+GF_Err iprp_dump(GF_Box *a, FILE * trace);
+
+GF_Box *ipma_New();
+void ipma_del(GF_Box *s);
+GF_Err ipma_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ipma_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ipma_Size(GF_Box *s);
+GF_Err ipma_dump(GF_Box *a, FILE * trace);
+
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 #ifdef __cplusplus

v0.5.2.tar.gz/include/gpac/internal/m3u8.h -> v0.6.1.tar.gz/include/gpac/internal/m3u8.h Changed

v0.5.2.tar.gz/include/gpac/internal/media_dev.h -> v0.6.1.tar.gz/include/gpac/internal/media_dev.h Changed

v0.5.2.tar.gz/include/gpac/internal/mesh.h -> v0.6.1.tar.gz/include/gpac/internal/mesh.h Changed

v0.5.2.tar.gz/include/gpac/internal/mpd.h -> v0.6.1.tar.gz/include/gpac/internal/mpd.h Changed

@@ -29,6 +29,8 @@
 #include <gpac/xml.h>
 #include <gpac/media_tools.h>
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 /*TODO*/
 typedef struct
 {
@@ -47,7 +49,7 @@
 #define MPD_EXTENSIBLE	\
 	GF_List *attributes;	\
 	GF_List *children;	\
-
+ 
 typedef struct
 {
 	MPD_EXTENSIBLE
@@ -99,6 +101,9 @@
 {
 	char *sourceURL;
 	GF_MPD_ByteRange *byte_range;
+
+	//GPAC internal - indicates the URL has already been solved
+	Bool is_resolved;
 } GF_MPD_URL;
 
 typedef struct
@@ -149,6 +154,8 @@
 	char *index;
 	GF_MPD_ByteRange *index_range;
 	u64 duration;
+	char *key_url;
+	bin128 key_iv;
 } GF_MPD_SegmentURL;
 
 typedef struct
@@ -159,6 +166,8 @@
 
 	char *xlink_href;
 	Bool xlink_actuate_on_load;
+
+	u32 consecutive_xlink_count;
 } GF_MPD_SegmentList;
 
 typedef struct
@@ -224,6 +233,12 @@
 	u32 probe_switch_count;
 	char *init_segment_data;
 	u32 init_segment_size;
+	char *key_url;
+	bin128 key_IV;
+	/*previous maximum speed that this representation can be played, or 0 if it has never been played*/
+	Double prev_max_available_speed;
+	/*after switch we may have some buffered segments of the previous representation; so codec stats at this moment is unreliable. we should wait after the codec reset*/
+	Bool waiting_codec_reset;
 } GF_DASH_RepresentationPlayback;
 
 typedef struct {
@@ -247,6 +262,7 @@
 
 	/*GPAC playback implementation*/
 	GF_DASH_RepresentationPlayback playback;
+	u32 m3u8_media_seq_min, m3u8_media_seq_max;
 } GF_MPD_Representation;
 
 
@@ -386,9 +402,16 @@
 };
 
 /*converts M3U8 to MPD - getter is optional (download will still be processed if NULL)*/
-GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url, const char *mpd_file, u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter);
+GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url, const char *mpd_file, u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates,
+ GF_FileDownload *getter, GF_MPD *mpd, Bool parse_sub_playlist);
 
+GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u32 *duration);
 
+GF_MPD_SegmentList *gf_mpd_solve_segment_list_xlink(GF_MPD *mpd, GF_XMLNode *root);
+
+void gf_mpd_delete_segment_list(GF_MPD_SegmentList *segment_list);
+
+void gf_mpd_getter_del_session(GF_FileDownload *getter);
 
 typedef enum
 {
@@ -399,13 +422,13 @@
 	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE,
 } GF_MPD_URLResolveType;
 
-/*resolves a URL based for a given segment, based on the MPD url, the type of resolution 
+/*resolves a URL based for a given segment, based on the MPD url, the type of resolution
 	item_index: current downloading index of the segment
 	nb_segments_removed: number of segments removed when pruging the MPD after updates (can be 0). The start number will be offset by this value
 */
-GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url);
-
+GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed,
+ char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *key_iv);
 
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
 
 #endif // _MPD_H_
-

v0.5.2.tar.gz/include/gpac/internal/odf_parse_common.h -> v0.6.1.tar.gz/include/gpac/internal/odf_parse_common.h Changed

@@ -33,7 +33,7 @@
 #define GET_S16(field) { s16 d; if (strstr(val, "0x")) { ret += sscanf(val, "%hx", (u16*)&d); if (ret) field = d; } else { ret += sscanf(val, "%hd", &d); if (ret) field = d; }	}
 #define GET_U32(field) { u32 d; if (strstr(val, "0x")) { ret += sscanf(val, "%x", &d); if (ret) field = d; } else { ret += sscanf(val, "%ud", &d); if (ret) field = d; }	}
 #define GET_S32(field) { s32 d; if (strstr(val, "0x")) { ret += sscanf(val, "%x", (u32*)&d); if (ret) field = d; } else { ret += sscanf(val, "%d", &d); if (ret) field = d; }	}
-#define GET_BOOL(field) { ret = 1; field = (!stricmp(val, "true") || !stricmp(val, "1")) ? 1 : 0; }
+#define GET_BOOL(field) { ret = 1; field = (!stricmp(val, "true") || !stricmp(val, "1")) ? GF_TRUE : GF_FALSE; }
 #define GET_U64(field) { u64 d; if (strstr(val, "0x")) { ret += sscanf(val, LLX, &d); if (ret) field = d; } else { ret += sscanf(val, LLU, &d); if (ret) field = d; }	}
 
 #define GET_DOUBLE(field) { Float v; ret = 1; sscanf(val, "%f", &v); field = (Double) v;}

v0.5.2.tar.gz/include/gpac/internal/scenegraph_dev.h -> v0.6.1.tar.gz/include/gpac/internal/scenegraph_dev.h Changed

v0.5.2.tar.gz/include/gpac/internal/smjs_api.h -> v0.6.1.tar.gz/include/gpac/internal/smjs_api.h Changed

@@ -28,12 +28,52 @@
 
 #include <gpac/setup.h>
 
+/*WIN32 and WinCE config (no configure script)*/
+#if defined(WIN32) || defined(_WIN32_WCE) || defined(__SYMBIAN32__)
+# ifndef XP_PC
+# define XP_PC
+# endif
+# ifndef XP_WIN
+# define XP_WIN
+# endif
+/*WINCE specific config*/
+# if defined(_WIN32_WCE)
+# include <windows.h>
+# define XP_WINCE
+# endif
+#endif
+
+//Android config
 #ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
+# ifndef XP_UNIX
+# define XP_UNIX
+# endif
 #endif
+
+//iOS config
+#ifdef GPAC_IPHONE
+# ifndef XP_UNIX
+# define XP_UNIX
+# endif
+# ifndef IPHONE_OS
+# define IPHONE_OS
+# endif
+# ifndef DARWIN
+# define DARWIN
+# endif
 #endif
 
+/*OSX config*/
+#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
+# define MOZILLA_1_8_BRANCH
+# ifndef XP_UNIX
+# define XP_UNIX
+# endif
+#endif
+
+
+/*other platforms should be setup through ./configure and have appropriated defines in config.h*/
+
 #if defined(DEBUG) && defined(GPAC_CONFIG_DARWIN)
 #undef DEBUG
 #endif

v0.5.2.tar.gz/include/gpac/internal/swf_dev.h -> v0.6.1.tar.gz/include/gpac/internal/swf_dev.h Changed

v0.5.2.tar.gz/include/gpac/internal/terminal_dev.h -> v0.6.1.tar.gz/include/gpac/internal/terminal_dev.h Changed

@@ -52,7 +52,7 @@
 
 struct _net_service
 {
-	/*the module handling this service - must be declared first to typecast with GF_DownlaodSession upon deletion*/
+	/*the module handling this service - must be declared first to typecast with GF_DownloadSession upon deletion*/
 	GF_InputService *ifce;
 
 	//function table of service
@@ -207,6 +207,8 @@
 	/*URLs of current video, audio and subs (we can't store objects since they may be destroyed when seeking)*/
 	SFURL visual_url, audio_url, text_url, dims_url;
 
+	Bool is_srd;
+
 	Bool end_of_scene;
 #ifndef GPAC_DISABLE_VRML
 	/*list of externproto libraries*/
@@ -228,11 +230,17 @@
 	GF_List *keynavigators;
 #endif
 
+	Bool disable_hitcoord_notif;
+
 	u32 addon_position, addon_size_factor;
 
 	GF_List *declared_addons;
 	//set when content is replaced by an addon (DASH PVR mode)
 	Bool main_addon_selected;
+	u32 sys_clock_at_main_activation, obj_clock_at_main_activation;
+
+	Bool pause_at_first_frame;
+	Bool is_live360;
 };
 
 GF_Scene *gf_scene_new(GF_Scene *parentScene);
@@ -264,14 +272,14 @@
 void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm);
 /*restarts dynamic scene from given time: scene graph is not reseted, objects are just restarted
 instead of closed and reopened. If a media control is present on inline, from_time is overriden by MC range*/
-void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only);
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check);
 
 /*exported for compositor: handles filtering of "self" parameter indicating anchor only acts on container inline scene
 not root one. Returns 1 if handled (cf user.h, navigate event)*/
 Bool gf_scene_process_anchor(GF_Node *caller, GF_Event *evt);
 void gf_scene_force_size_to_video(GF_Scene *scene, GF_MediaObject *mo);
 
-//check clock status. 
+//check clock status.
 //If @check_buffering is 0, returns 1 if all clocks have seen eos, 0 otherwise
 //If @check_buffering is 1, returns 1 if no clock is buffering, 0 otheriwse
 Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene, Bool check_buffering);
@@ -282,7 +290,8 @@
 
 GF_Node *gf_scene_get_subscene_root(GF_Node *inline_node);
 
-void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on);
+void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time);
+void gf_scene_reset_addons(GF_Scene *scene);
 
 #ifndef GPAC_DISABLE_VRML
 
@@ -453,6 +462,11 @@
 	u32 bench_mode;
 
 	u32 prefered_audio_codec_oti;
+
+	u32 low_latency_buffer_max;
+
+	u32 nb_calls_in_event_proc;
+	u32 disconnect_request_status;
 };
 
 
@@ -549,6 +563,8 @@
 	//media time in ms corresponding to the init tmiestamp of the clock
 	u32 media_time_at_init;
 	Bool has_media_time_shift;
+
+	u16 ocr_on_esid;
 };
 
 /*destroys clock*/
@@ -661,6 +677,8 @@
 	u32 stream_state;
 	/*the AU in reception is RAP*/
 	Bool IsRap;
+	/*the AU in reception is only need for seeking*/
+	Bool SeekFlag;
 	/*signal that next AU is an AU start*/
 	Bool NextIsAUStart;
 	/*if codec resilient, packet drops are not considered as fatal for AU reconstruction (eg no wait for RAP)*/
@@ -764,8 +782,9 @@
 void gf_es_dispatch_raw_media_au(GF_Channel *ch, char *payload, u32 payload_size, u32 cts);
 /*returns true if this stream owns its clock, false if it simply refers to it*/
 Bool gf_es_owns_clock(GF_Channel *ch);
-void gf_es_reset_timing(GF_Channel *ch);
-/*reset all timestamps in CB*/
+/*reset all timestamps in decoder buffer to 0*/
+void gf_es_reset_timing(GF_Channel *ch, Bool reset_buffer);
+/*reset all timestamps in CB to 0*/
 void gf_cm_reset_timing(GF_CompositionMemory *cb);
 /*reset timing of all objects associated with this clock*/
 void gf_clock_discontinuity(GF_Clock *ck, GF_Scene *scene, Bool is_pcr_discontinuity);
@@ -809,6 +828,9 @@
 	/*set when codec is identified as RAW, meaning all AU comming from the network are directly
 	dispatched to the composition memory*/
 	GF_ESM_CODEC_IS_RAW_MEDIA = 1<<3,
+
+	/*set when input channels have very low buffering requirement, in which case the codec has to discard all possible late data*/
+	GF_ESM_CODEC_IS_LOW_LATENCY = 1<<4,
 };
 
 struct _generic_codec
@@ -864,8 +886,9 @@
 	u64 total_dec_time, total_iframes_time;
 	u32 max_dec_time, max_iframes_time;
 	u32 first_frame_time, last_frame_time;
+	Bool codec_reset;
 	/*number of frames dropped at the presentation*/
-	u32 nb_droped;
+	u32 nb_dropped;
 	/*we detect if the same image is sent again and again to the decoder (using last_unit_signature)*/
 	u32 nb_repeted_frames;
 	/*min frame duration based on DTS diff*/
@@ -1139,6 +1162,13 @@
 	Reset upon creation of the decoder.
 	*/
 	void *node_ptr;
+
+
+	/*currently valid properties of the object*/
+	u32 width, height, stride, pixel_ar, pixelformat;
+	Bool is_flipped;
+	u32 sample_rate, num_channels, bits_per_sample, channel_config;
+	u32 srd_x, srd_y, srd_w, srd_h;
 };
 
 GF_MediaObject *gf_mo_new();
@@ -1160,8 +1190,6 @@
 void gf_term_attach_service(GF_Terminal *term, GF_InputService *service_hdl);
 
 
-Bool gf_term_send_event(GF_Terminal *term, GF_Event *evt);
-
 /*media access events */
 void gf_term_service_media_event(GF_ObjectManager *odm, GF_EventType event_type);
 void gf_term_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec);
@@ -1178,10 +1206,12 @@
 void gf_scene_register_associated_media(GF_Scene *scene, GF_AssociatedContentLocation *addon_info);
 void gf_scene_notify_associated_media_timeline(GF_Scene *scene, GF_AssociatedContentTiming *addon_time);
 //returns media time in sec for the addon - timestamp_based is set to 1 if no timeline has been found (eg sync is based on direct timestamp comp)
-Double gf_scene_adjust_time_for_addon(GF_Scene *scene, Double clock_time, GF_AddonMedia *addon, u32 *timestamp_based);
-u64 gf_scene_adjust_timestamp_for_addon(GF_Scene *scene, u64 orig_ts, GF_AddonMedia *addon);
+Double gf_scene_adjust_time_for_addon(GF_AddonMedia *addon, Double clock_time, u32 *timestamp_based);
+s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts);
 void gf_scene_select_scalable_addon(GF_Scene *scene, GF_ObjectManager *odm);
-void gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts);
+/*check if the associated addon has to be restarted, based on the timestamp of the main media (used for scalable addons only). Returns 1 if the addon has been restarted*/
+Bool gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts);
+
 
 //exported for gpac.js, resumes to main content
 void gf_scene_resume_live(GF_Scene *subscene);
@@ -1225,13 +1255,16 @@
 	u32 addon_type;
 };
 
+void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons);
+
+
+
 GF_Err gf_codec_process_private_media(GF_Codec *codec, u32 TimeAvailable);
 
 
 Bool gf_codec_is_scene_or_image(GF_Codec *codec);
 
 void gf_scene_set_service_id(GF_Scene *scene, u32 service_id);
-void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons);
 
 #ifdef __cplusplus
 }

v0.5.2.tar.gz/include/gpac/isomedia.h -> v0.6.1.tar.gz/include/gpac/isomedia.h Changed

@@ -72,9 +72,9 @@
 /*Movie Options for file writing*/
 enum
 {
-	/*FLAT: the MediaData (MPEG4 ESs) is stored at the begining of the file*/
+	/*FLAT: the MediaData (MPEG4 ESs) is stored at the beginning of the file*/
 	GF_ISOM_STORE_FLAT = 1,
-	/*STREAMABLE: the MetaData (File Info) is stored at the begining of the file
+	/*STREAMABLE: the MetaData (File Info) is stored at the beginning of the file
 	for fast access during download*/
 	GF_ISOM_STORE_STREAMABLE,
 	/*INTERLEAVED: Same as STREAMABLE, plus the media data is mixed by chunk of fixed duration*/
@@ -108,7 +108,8 @@
 	/*ref type for the SVC tracks*/
 	GF_ISOM_REF_BASE = GF_4CC( 's', 'b', 'a', 's' ),
 	GF_ISOM_REF_SCAL = GF_4CC( 's', 'c', 'a', 'l' ),
-	GF_ISOM_REF_TBAS = GF_4CC( 't', 'b', 'a', 's' )
+	GF_ISOM_REF_TBAS = GF_4CC( 't', 'b', 'a', 's' ),
+	GF_ISOM_REF_SABT = GF_4CC( 's', 'a', 'b', 't' )
 };
 
 /*Track Edition flag*/
@@ -202,10 +203,10 @@
 	GF_ISOM_SUBTYPE_HVT1			= GF_4CC( 'h', 'v', 't', '1' ),
 
 	/*3GPP(2) extension subtypes*/
-	GF_ISOM_SUBTYPE_3GP_H263		= GF_4CC( 's', '2', '6', '3' ),
+	GF_ISOM_SUBTYPE_3GP_H263	= GF_4CC( 's', '2', '6', '3' ),
 	GF_ISOM_SUBTYPE_3GP_AMR		= GF_4CC( 's', 'a', 'm', 'r' ),
 	GF_ISOM_SUBTYPE_3GP_AMR_WB	= GF_4CC( 's', 'a', 'w', 'b' ),
-	GF_ISOM_SUBTYPE_3GP_EVRC		= GF_4CC( 's', 'e', 'v', 'c' ),
+	GF_ISOM_SUBTYPE_3GP_EVRC	= GF_4CC( 's', 'e', 'v', 'c' ),
 	GF_ISOM_SUBTYPE_3GP_QCELP	= GF_4CC( 's', 'q', 'c', 'p' ),
 	GF_ISOM_SUBTYPE_3GP_SMV		= GF_4CC( 's', 's', 'm', 'v' ),
 
@@ -220,6 +221,8 @@
 	GF_ISOM_SUBTYPE_STXT		= GF_4CC( 's', 't', 'x', 't' ),
 	GF_ISOM_SUBTYPE_STPP		= GF_4CC( 's', 't', 'p', 'p' ),
 	GF_ISOM_SUBTYPE_SBTT		= GF_4CC( 's', 'b', 't', 't' ),
+	GF_ISOM_SUBTYPE_METT		= GF_4CC( 'm', 'e', 't', 't' ),
+	GF_ISOM_SUBTYPE_METX		= GF_4CC( 'm', 'e', 't', 'x' ),
 };
 
 
@@ -450,9 +453,12 @@
 /*return the timescale of the movie, 0 if error*/
 u32 gf_isom_get_timescale(GF_ISOFile *the_file);
 
-/*return the duration of the movie, 0 if error*/
+/*return the computed duration of the movie given the media in the sample tables, 0 if error*/
 u64 gf_isom_get_duration(GF_ISOFile *the_file);
 
+/*return the duration of the movie as written in the file, regardless of the media data*/
+u64 gf_isom_get_original_duration(GF_ISOFile *movie);
+
 /*return the creation info of the movie*/
 GF_Err gf_isom_get_creation_time(GF_ISOFile *the_file, u64 *creationTime, u64 *modificationTime);
 
@@ -499,9 +505,12 @@
 0 otherwise*/
 Bool gf_isom_is_self_contained(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*get the media duration (without edit) return 0 if no samples (URL streams)*/
+/*get the media duration (without edit) based on sample table return 0 if no samples (URL streams)*/
 u64 gf_isom_get_media_duration(GF_ISOFile *the_file, u32 trackNumber);
 
+/*get the media duration (without edit) as indicated in the file (regardless of sample tables)*/
+u64 gf_isom_get_media_original_duration(GF_ISOFile *movie, u32 trackNumber);
+
 /*Get the timeScale of the media. */
 u32 gf_isom_get_media_timescale(GF_ISOFile *the_file, u32 trackNumber);
 
@@ -924,6 +933,9 @@
 are of same sizes (typically in 3GP speech tracks)*/
 GF_Err gf_isom_refresh_size_info(GF_ISOFile *file, u32 trackNumber);
 
+/*return the duration of the movie, 0 if error*/
+GF_Err gf_isom_update_duration(GF_ISOFile *the_file);
+
 /*Update Sample functions*/
 
 /*update a given sample of the media.
@@ -956,6 +968,9 @@
 GF_Err gf_isom_set_interleave_time(GF_ISOFile *the_file, u32 InterleaveTime);
 u32 gf_isom_get_interleave_time(GF_ISOFile *the_file);
 
+/*forces usage of 64 bit chunk offsets*/
+void gf_isom_force_64bit_chunk_offset(GF_ISOFile *the_file, Bool set_on);
+
 /*set the copyright in one language.*/
 GF_Err gf_isom_set_copyright(GF_ISOFile *the_file, const char *threeCharCode, char *notice);
 
@@ -1015,6 +1030,9 @@
 is updated to maintain a continous timeline*/
 GF_Err gf_isom_remove_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 seg_index);
 
+/*Updates edit list after track edition: all edit entries with aduration or media starttime larger than the media duration are clamped to media duration*/
+GF_Err gf_isom_update_edit_list_duration(GF_ISOFile *file, u32 track);
+
 /*
 				User Data Manipulation
 
@@ -1157,6 +1175,9 @@
 /*Add a system descriptor to the ESD of a stream - you have to delete the descriptor*/
 GF_Err gf_isom_add_desc_to_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_Descriptor *theDesc);
 
+/*updates average and max bitrate - if 0 for max, removes bitrate info*/
+GF_Err gf_isom_update_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, u32 average_bitrate, u32 max_bitrate, u32 decode_buffer_size);
+
 
 /*Default extensions*/
 
@@ -1180,7 +1201,7 @@
 /*clones all sampleDescription entries in new track, after an optional reset of existing entries*/
 GF_Err gf_isom_clone_sample_descriptions(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, Bool reset_existing);
 
-/*special shortcut: clones a track (everything except media data and sample info (DTS? CTS, RAPs, etc...)
+/*special shortcut: clones a track (everything except media data and sample info (DTS, CTS, RAPs, etc...)
 also clones sampleDescriptions
 @keep_data_ref: if set, external data references are kept, otherwise they are removed (track media data will be self-contained)
 @dest_track: track number of cloned track*/
@@ -1218,7 +1239,7 @@
 /*Flags for gf_isom_open_segment*/
 enum
 {
-	/*FLAT: the MediaData (MPEG4 ESs) is stored at the begining of the file*/
+	/*FLAT: the MediaData (MPEG4 ESs) is stored at the beginning of the file*/
 	GF_ISOM_SEGMENT_NO_ORDER_FLAG = 1,
 	GF_ISOM_SEGMENT_SCALABLE_FLAG = 1<<1,
 };
@@ -1342,7 +1363,7 @@
 	GF_ISOM_TRAF_DATA_CACHE
 };
 
-/*set options. Options can be set at the begining of each new fragment only, and for the
+/*set options. Options can be set at the beginning of each new fragment only, and for the
 lifetime of the fragment*/
 GF_Err gf_isom_set_fragment_option(GF_ISOFile *the_file, u32 TrackID, u32 Code, u32 param);
 
@@ -1479,7 +1500,7 @@
 /******************************************************************
 		PacketHandling functions
 		Data can be added at the end or at the beginning of the current packet
-		by setting AtBegin to 1 the data will be added at the begining
+		by setting AtBegin to 1 the data will be added at the beginning
 		This allows constructing the packet payload before any meta-data
 ******************************************************************/
 
@@ -1631,7 +1652,7 @@
 currently only RTP reader is supported
 @pck_data, @pck_size: output packet data (must be freed by caller) - contains all info to be sent
 	on the wire, eg for RTP contains the RTP header and the data
-@disposable (optional): indicates that the packet can be droped when late (B-frames & co)
+@disposable (optional): indicates that the packet can be dropped when late (B-frames & co)
 @repeated (optional): indicates this is a repeated packet (same one has already been sent)
 @trans_ts (optional): indicates the transmission time of the packet, expressed in hint timescale, taking into account
 the ts_offset specified in gf_isom_reset_hint_reader. Depending on packets this may not be the same
@@ -1714,7 +1735,8 @@
 /*gets SHVC config - user is responsible for deleting it*/
 GF_HEVCConfig *gf_isom_shvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
-Bool gf_isom_has_scalable_layer(GF_ISOFile *file);
+/*return true if track dependencies implying extractors or implicit reconstruction are found*/
+Bool gf_isom_needs_layer_reconstruction(GF_ISOFile *file);
 
 enum
 {
@@ -1726,7 +1748,7 @@
 	GF_ISOM_NALU_EXTRACT_INSPECT,
 	/*above mode is applied and PPS/SPS/... are appended in the front of every IDR*/
 	GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG = 1<<16,
-	/*above mode is applied and all start codes are rewritten*/
+	/*above mode is applied and all start codes are rewritten (xPS inband as well)*/
 	GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG = 2<<16,
 	/*above mode is applied and VDRD NAL unit is inserted before SVC slice*/
 	GF_ISOM_NALU_EXTRACT_VDRD_FLAG = 1<<18,
@@ -1826,7 +1848,19 @@
 GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
 GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config);
 
-GF_Err gf_isom_stxt_info_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char **mime, char **config);
+GF_Err gf_isom_stxt_get_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const char **mime, const char **encoding, const char **config);
+GF_Err gf_isom_new_stxt_description(GF_ISOFile *movie, u32 trackNumber, u32 type, const char *mime, const char *encoding, const char *config, u32 *outDescriptionIndex);
+GF_Err gf_isom_update_stxt_description(GF_ISOFile *movie, u32 trackNumber, const char *encoding, const char *config, u32 DescriptionIndex);
+
+GF_Err gf_isom_xml_subtitle_get_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex,
+ const char **xmlnamespace, const char **xml_schema_loc, const char **mimes);
+GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile *movie, u32 trackNumber,
+ const char *xmlnamespace, const char *xml_schema_loc, const char *auxiliary_mimes,
+ u32 *outDescriptionIndex);
+GF_Err gf_isom_update_xml_subtitle_description(GF_ISOFile *movie, u32 trackNumber,
+ u32 descriptionIndex, GF_GenericSubtitleSampleDescriptor *desc);
+
+
 
 typedef enum
 {
@@ -1904,14 +1938,10 @@
 GF_ISOSample *gf_isom_text_to_sample(GF_TextSample * tx_samp);
 
 
-GF_Err gf_isom_generic_subtitle_reset(GF_GenericSubtitleSample *samp);
-GF_ISOSample *gf_isom_generic_subtitle_to_sample(GF_GenericSubtitleSample * tx_samp);
-GF_Err gf_isom_generic_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len);
 
 GF_GenericSubtitleSample *gf_isom_new_xml_subtitle_sample();
 void gf_isom_delete_xml_subtitle_sample(GF_GenericSubtitleSample * samp);
 GF_Err gf_isom_xml_subtitle_reset(GF_GenericSubtitleSample *samp);
-GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile *movie, u32 trackNumber, char *xmlnamespace, char *xml_schema_loc, char *mimes, u32 *outDescriptionIndex);
 GF_ISOSample *gf_isom_xml_subtitle_to_sample(GF_GenericSubtitleSample * tx_samp);
 GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len);
 
@@ -2050,9 +2080,7 @@
 Bool gf_isom_is_cenc_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
 GF_Err gf_isom_get_cenc_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, u32 *outIVLength);
 
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp_aux_info);
-#endif
 
 /*boxType is type of box which contains the sample auxiliary information. Now we have two type: GF_ISOM_BOX_UUID_PSEC and GF_ISOM_BOX_TYPE_SENC*/
 GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_CENCSampleAuxInfo **sai, u32 *container_type);
@@ -2162,7 +2190,15 @@
 	@content_encoding: content encoding type - if NULL, none specified
 	@URL, @URN: if set, resource will be remote (same as stream descriptions)
 */
-GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN);
+typedef struct
+{
+	u32 width, height;
+	u32 hSpacing, vSpacing;
+	u32 hOffset, vOffset;
+	u32 angle;
+} GF_ImageItemProperties;
+
+GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN, GF_ImageItemProperties *imgprop);
 /*same as above excepts take the item directly in memory*/
 GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, char *data, u32 data_len);
 
@@ -2179,11 +2215,11 @@
 				Timed Meta-Data extensions
 ********************************************************************/
 
-GF_Err gf_isom_get_timed_meta_data_info(GF_ISOFile *file, u32 track, u32 sampleDescription, Bool *is_xml, const char **mime_or_namespace, const char **content_encoding, const char **schema_loc);
+GF_Err gf_isom_get_xml_metadata_description(GF_ISOFile *file, u32 track, u32 sampleDescription, const char **_namespace, const char **schema_loc, const char **content_encoding);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*create a new timed metat data sample description for this track*/
-GF_Err gf_isom_timed_meta_data_config_new(GF_ISOFile *movie, u32 trackNumber, Bool is_xml, char *mime_or_namespace, char *content_encoding, char *schema_loc, char *URLname, char *URNname, u32 *outDescriptionIndex);
+GF_Err gf_isom_new_xml_metadata_description(GF_ISOFile *movie, u32 trackNumber, const char *_namespace, const char *schema_loc, const char *content_encoding, u32 *outDescriptionIndex);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/

v0.5.2.tar.gz/include/gpac/maths.h -> v0.6.1.tar.gz/include/gpac/maths.h Changed

v0.5.2.tar.gz/include/gpac/media_tools.h -> v0.6.1.tar.gz/include/gpac/media_tools.h Changed

@@ -47,7 +47,7 @@
 * \brief Get RFC 6381 description for @track from @movie.
 * \parama szCodec a pointer to an already allocated string.
 */
-GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec);
+GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec, Bool force_inband_xps, Bool force_sbr);
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -119,8 +119,11 @@
 	/*keep trailing 0 bytes in AU payloads when any*/
 	GF_IMPORT_KEEP_TRAILING = 1<<17,
 
+	/*forces inband parameter sets*/
+	GF_IMPORT_FORCE_XPS_INBAND = 1<<18,
+
 	/*do not compute edit list for B-frames video tracks*/
-	GF_IMPORT_NO_EDIT_LIST = 1<<18,
+	GF_IMPORT_NO_EDIT_LIST = 1<<19,
 
 	/*when set, only updates tracks info and return*/
 	GF_IMPORT_PROBE_ONLY	= 1<<20,
@@ -132,6 +135,8 @@
 	GF_IMPORT_NO_DURATION = 1<<23,
 	/*when set IP packets found in MPE sections will be sent to the local network */
 	GF_IMPORT_MPE_DEMUX = 1<<24,
+
+
 	/*when set by user during import, will abort*/
 	GF_IMPORT_DO_ABORT = 1<<31
 };
@@ -242,6 +247,10 @@
 	u32 nb_progs;
 	struct __program_import_info pg_info[GF_IMPORT_MAX_TRACKS];
 
+	//for hevc import
+	u8 max_temporal_id_plus_one;
+	u8 max_layer_id_plus_one;
+
 	GF_Err last_error;
 } GF_MediaImporter;
 
@@ -280,18 +289,22 @@
 /* Split SHVC layers */
 GF_Err gf_media_split_shvc(GF_ISOFile *file, u32 track, Bool splitAll, Bool use_extractors);
 
-GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file);
+GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file, Bool use_extractors);
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 
+
 typedef struct
 {
 	char *file_name;
-	char representationID[100];
-	char periodID[100];
-	char xlink[100];
-	char role[100];
+	char *representationID;
+	char *periodID;
+	Double media_duration;
+	u32 nb_baseURL;
+	char **baseURL;
+	char *xlink;
+	char *role;
 	u32 nb_rep_descs;
 	char **rep_descs;
 	u32 nb_p_descs;
@@ -301,6 +314,7 @@
 	u32 nb_as_c_descs;
 	char **as_c_descs;
 	u32 bandwidth;
+	Double period_duration;
 } GF_DashSegmenterInput;
 
 typedef enum
@@ -310,7 +324,8 @@
 	GF_DASH_PROFILE_ONDEMAND,
 	GF_DASH_PROFILE_MAIN,
 
-	/* DASH-AVC/264 profiles */
+	/* industry profiles */
+	GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE,
 	GF_DASH_PROFILE_AVC264_LIVE,
 	GF_DASH_PROFILE_AVC264_ONDEMAND,
 
@@ -321,35 +336,225 @@
 
 typedef enum
 {
-	GF_DASH_BSMODE_NONE = 0,
+	GF_DASH_BSMODE_DEFAULT, //=inband for live profile and none for onDemand
+	GF_DASH_BSMODE_NONE,
 	GF_DASH_BSMODE_INBAND,
 	GF_DASH_BSMODE_MERGED,
+	GF_DASH_BSMODE_MULTIPLE_ENTRIES,
 	GF_DASH_BSMODE_SINGLE
 } GF_DashSwitchingMode;
 
-GF_Err gf_dasher_segment_files(const char *mpd_name, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile profile,
- const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
- const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls,
- u32 use_url_template, Bool use_segment_timeline, Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching_mode,
- Bool segments_start_with_rap, Double dash_duration_sec, char *seg_rad_name, char *seg_ext, u32 segment_marker_4cc,
- Double frag_duration_sec, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool fragments_start_with_rap, const char *tmp_dir,
- GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer,
- u32 ast_shift_sec, u32 dash_scale, Bool fragments_in_memory, u32 initial_moof_sn, u64 initial_tfdt, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof);
 
-/*returns time to wait until end of currently generated segments*/
-u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time);
+typedef enum
+{
+	GF_DASH_STATIC = 0,
+	GF_DASH_DYNAMIC,
+	//can only be used when DASH segmenter context is used, will close the period
+	GF_DASH_DYNAMIC_LAST,
+	GF_DASH_DYNAMIC_DEBUG,
+} GF_DashDynamicMode;
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+typedef enum
+{
+	GF_DASH_CPMODE_ADAPTATION_SET=0,
+	GF_DASH_CPMODE_REPRESENTATION,
+	GF_DASH_CPMODE_BOTH,
+} GF_DASH_ContentLocationMode;
+
+typedef struct __gf_dash_segmenter GF_DASHSegmenter;
+
+/*Create a new DASH segmenter
+ *	\param mpdName target MPD file name, cannot be changed
+ *	\param profile target DASH profile, cannot be changed
+ *	\param tmp_dir temp dir for file generation, OS NULL for default
+ *	\param timescale timescale used to specif most of the dash timings. If 0, 1000 is used
+ *	\param dasher_context_file config file used to store the context of the DASH segmenter. This allows destroying the segmenter and restarting it later on with the right DASH segquence numbers, MPD and and timing info
+ *	\return the DASH segmenter object
+*/
+GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile profile, const char *tmp_dir, u32 timescale, GF_Config *dasher_context_file);
+/*Deletes a DASH segmenter
+ *	\param dasher the DASH segmenter object
+*/
+void gf_dasher_del(GF_DASHSegmenter *dasher);
+/*Removes the DASH inputs. Re-add new ones with gf_dasher_add_input()
+ *	\param dasher the DASH segmenter object
+*/
+void gf_dasher_clean_inputs(GF_DASHSegmenter *dasher);
+/*Sets MPD info
+ *	\param dasher the DASH segmenter object
+ *	\param title MPD title
+ *	\param copyright MPD copyright
+ *	\param moreInfoURL MPD "more info" URL
+ *	\param sourceInfo MPD source info
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_info(GF_DASHSegmenter *dasher, const char *title, const char *copyright, const char *moreInfoURL, const char *sourceInfo);
+/*Sets MPD Location. This is useful to distrubute a dynamic MPD by mail or any non-HTTP mean
+ *	\param dasher the DASH segmenter object
+ *	\param location the URL where this MPD can be found
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_location(GF_DASHSegmenter *dasher, const char *location);
+/*Adds a base URL to the MPD
+ *	\param dasher the DASH segmenter object
+ *	\param base_url base url to add
+ *	\return error code if any
+*/
+GF_Err gf_dasher_add_base_url(GF_DASHSegmenter *dasher, const char *base_url);
+/*Enable URL template - - may be overriden by the current profile
+ *	\param dasher the DASH segmenter object
+ *	\param enable enable usage of URL template
+ *	\param default_template template for the segment name
+ *	\param default_extension extension for the segment name
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension);
+/*Enable Segment Timeline template - may be overriden by the current profile
+ *	\param dasher the DASH segmenter object
+ *	\param enable enable or disable
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_segment_timeline(GF_DASHSegmenter *dasher, Bool enable);
+/*Enables single segment - may be overriden by the current profile
+ *	\param dasher the DASH segmenter object
+ *	\param enable enable or disable
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_single_segment(GF_DASHSegmenter *dasher, Bool enable);
+/*Enable single file (with multiple segments) - may be overriden by the current profile
+ *	\param dasher the DASH segmenter object
+ *	\param enable enable or disable
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_single_file(GF_DASHSegmenter *dasher, Bool enable);
+/*Sets bitstream switching mode - may be overriden by the current profile
+ *	\param dasher the DASH segmenter object
+ *	\param bitstream_switching mode to use for bitstream switching
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_switch_mode(GF_DASHSegmenter *dasher, GF_DashSwitchingMode bitstream_switching);
+/*Sets segment and fragment durations.
+ *	\param dasher the DASH segmenter object
+ *	\param default_segment_duration the duration of a dash segment
+ *	\param segment_duration_strict indicated is the duration is strict (otherwise we consider the mean duration)
+ *	\param default_fragment_duration the duration of a dash fragment - if 0, same as default_segment_duration
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Bool segment_duration_strict, Double default_fragment_duration);
+/*Enables spliting at RAP boundaries
+ *	\param dasher the DASH segmenter object
+ *	\param segments_start_with_rap segments will be split at RAP boundaries
+ *	\param fragments_start_with_rap fragments will be split at RAP boundaries
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_rap_splitting(GF_DASHSegmenter *dasher, Bool segments_start_with_rap, Bool fragments_start_with_rap);
+/*Enables segment marker
+ *	\param dasher the DASH segmenter object
+ *	\param dasher the DASH segmenter object
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_segment_marker(GF_DASHSegmenter *dasher, u32 segment_marker_4cc);
+/*Enables segment indexes
+ *	\param dasher the DASH segmenter object
+ *	\param enable_sidx enable or disable
+ *	\param subsegs_per_sidx number of subsegments per segment
+ *	\param daisy_chain_sidx enable daisy chaining of sidx
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx);
+/*Sets mode for the dash segmenter.
+ *	\param dasher the DASH segmenter object
+ *	\param dash_mode the mode to use. Currently switching from static mode to dynamic mode is not well supported and may produce non-compliant MPDs
+ *	\param mpd_update_time time between MPD refresh, in seconds. Used for dynamic mode, may be 0 if @mpd_live_duration is set
+ *	\param time_shift_depth the depth of the time shift buffer in seconds, -1 for infinite time shift.
+ *	\param mpd_live_duration total duration of the DASH session in dynamic mode, in seconds. May be set to 0 if @mpd_update_time is set
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_dynamic_mode(GF_DASHSegmenter *dasher, GF_DashDynamicMode dash_mode, Double mpd_update_time, s32 time_shift_depth, Double mpd_live_duration);
+/*Sets the minimal buffer desired.
+ *	\param dasher the DASH segmenter object
+ *	\param min_buffer min buffer time in seconds for the DASH session. Currently the minimal buffer is NOT computed from the source material and must be set to an appropriate value.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_min_buffer(GF_DASHSegmenter *dasher, Double min_buffer);
+/*Sets the availability start time offset.
+ *	\param dasher the DASH segmenter object
+ *	\param ast_offset ast offset in milliseconds. If >0, the DASH session availabilityStartTime will be earlier than UTC by the amount of seconds specified. If <0, the media representation will have an availabilityTimeOffset of the amount of seconds specified, instructing the client that segments may be accessed earlier.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_ast_offset(GF_DASHSegmenter *dasher, s32 ast_offset);
+/*Enables memory fragmenting: fragments will be written to disk only once completed
+ *	\param dasher the DASH segmenter object
+ *	\param enable Enables or disables. Default is disabled.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_memory_fragmenting(GF_DASHSegmenter *dasher, Bool enable);
+/*Sets initial values for ISOBMFF sequence number and TFDT in movie fragments.
+ *	\param dasher the DASH segmenter object
+ *	\param initial_moof_sn sequence number of the first moof to be generated. Default value is 1.
+ *	\param initial_tfdt initial tfdt of the first traf to be generated, in DASH segmenter timescale units. Default value is 0.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_initial_isobmf(GF_DASHSegmenter *dasher, u32 initial_moof_sn, u64 initial_tfdt);
+/*Configure how default values for ISOBMFF are stored
+ *	\param dasher the DASH segmenter object
+ *	\param no_fragments_defaults if set, fragments default values are repeated in each traf and not set in trex. Default value is GF_FALSE
+ *	\param pssh_moof if set, PSSH is stored in each moof, and not set in init segment. Default value is GF_FALSE
+ *	\param samplegroups_in_traf if set, all sample group definitions are stored in each traf and not set in init segment. Default value is GF_FALSE
+ *	\param single_traf_per_moof if set, each moof will contain a single traf, even if source media is multiplexed. Default value is GF_FALSE
+ *	\return error code if any
+*/
+GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof);
+/*Enables insertion of UTC reference in the begining of segments
+ *	\param dasher the DASH segmenter object
+ *	\param insert_utc if set, UTC will be inserted. Default value is disabled.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_utc_ref(GF_DASHSegmenter *dasher, Bool insert_utc);
+/*Enables real-time generation of media segments.
+ *	\param dasher the DASH segmenter object
+ *	\param dasher real_time if set, segemnts are generated in real time. Only supported for single representation (potentially multiplexed) DASH session. Default is disabled.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_real_time(GF_DASHSegmenter *dasher, Bool real_time);
+/*Sets where the ContentProtection element is inserted in an adaptation set.
+*	\param dasher the DASH segmenter object
+*	\param ContentProtection element location mode.
+*	\return error code if any
+*/
+GF_Err gf_dasher_set_content_protection_location_mode(GF_DASHSegmenter *dasher, GF_DASH_ContentLocationMode mode);
+/*Sets profile extension as used by DASH-IF and DVB.
+ *	\param dasher the DASH segmenter object
+ *	\param dash_profile_extension specifies a string of profile extensions, as used by DASH-IF and DVB.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_profile_extension(GF_DASHSegmenter *dasher, const char *dash_profile_extension);
+/*Adds a media input to the DASHer
+ *	\param dasher the DASH segmenter object
+ *	\param input media source to add
+ *	\return error code if any
+*/
+GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, GF_DashSegmenterInput *input);
+/*Process the media source and generate segments
+ *	\param dasher the DASH segmenter object
+ *	\param sub_duration the duration in seconds of media to DASH. If 0, the whole sources will be processed.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_process(GF_DASHSegmenter *dasher, Double sub_duration);
 
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-/*save file as fragmented movie*/
-GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec);
+/*returns time to wait until end of currently generated segments
+ *	\param dasher the DASH segmenter object
+ *	\return time to wait in milliseconds
+*/
+u32 gf_dasher_next_update_time(GF_DASHSegmenter *dasher);
 
 
-#endif
 
-#endif
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+/*save file as fragmented movie*/
+GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec);
+#endif
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 
@@ -377,8 +582,6 @@
 	GF_EXPORT_WEBVTT_META = (1<<8),
 	/*WebVTT metadata format: media data will be embedded in webvtt*/
 	GF_EXPORT_WEBVTT_META_EMBEDDED = (1<<9),
-	/* Experimental Streaming Instructions */
-	GF_EXPORT_SIX = (1<<14),
 
 	/*following ones are real flags*/
 	/*
@@ -394,6 +597,13 @@
 	GF_EXPORT_SVC_LAYER = (1<<12),
 	/* Don't merge identical cues in consecutive samples */
 	GF_EXPORT_WEBVTT_NOMERGE = (1<<13),
+
+	/* Experimental Streaming Instructions */
+	GF_EXPORT_SIX = (1<<14),
+
+	/* Experimental Streaming Instructions */
+	GF_EXPORT_FORCE_EXT = (1<<15),
+
 	/*ony probes extraction format*/
 	GF_EXPORT_PROBE_ONLY = (1<<30),
 	/*when set by user during export, will abort*/

v0.5.2.tar.gz/include/gpac/mediaobject.h -> v0.6.1.tar.gz/include/gpac/mediaobject.h Changed

@@ -99,7 +99,7 @@
 u32 gf_mo_get_min_frame_dur(GF_MediaObject *mo);
 
 typedef enum
-{	
+{
 	//never resync the content of the decoded media buffer (used fo audio)
 	//if clock is paused do not fetch
 	GF_MO_FETCH = 0,
@@ -117,8 +117,8 @@
 
 /*release given amount of media data - nb_bytes is used for audio  - drop_mode can take the following values:
 -1: do not drop
-0: do not force drop: the unlocked frame it will be droped based on object time (typically video)
-1: force drop : the unlocked frame will be droped if all bytes are consumed (typically audio)
+0: do not force drop: the unlocked frame it will be dropped based on object time (typically video)
+1: force drop : the unlocked frame will be dropped if all bytes are consumed (typically audio)
 2: the frame will be stated as a discraded frame
 */
 void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 drop_mode);
@@ -151,6 +151,8 @@
 /*set destination window for harware codecs directly outputing to video out - returns 1 if video size has changed*/
 Bool gf_mo_set_position(GF_MediaObject *mo, GF_Window *src, GF_Window *dst);
 
+s32 gf_mo_get_clock_drift(GF_MediaObject *mo);
+
 enum
 {
 	/*this is set to 0 by the OD manager whenever a change occur in the media (w/h change, SR change, etc)

v0.5.2.tar.gz/include/gpac/module.h -> v0.6.1.tar.gz/include/gpac/module.h Changed

@@ -182,6 +182,77 @@
  *\param pm the module manager
  */
 void gf_modules_del(GF_ModuleManager *pm);
+
+/*!
+ *\brief load a static module given its interface function
+ *
+ *\param pm the module manager
+ *\param register_module the register interface function
+ */
+GF_Err gf_module_load_static(GF_ModuleManager *pm, GF_InterfaceRegister *(*register_module)());
+
+/*!
+ *\brief declare a module for loading
+ *
+ * When using GPAC as a static library, if GPAC_MODULE_CUSTOM_LOAD is
+ * defined, this macro can be used with GF_MODULE_STATIC_DECLARE() and
+ * gf_module_refresh() to load individual modules.
+ *
+ * It's first needed to call GF_MODULE_STATIC_DECLARE() with the name
+ * of the module you need to load outside of any function. This macro
+ * will declare the prototype of the module registration function so
+ * it should only be used outside functions.
+ *
+ * Then in your GPAC initialization code, you need to call
+ * GF_MODULE_LOAD_STATIC() with your GPAC module manager and the
+ * module name.
+ *
+ * Finally, you'll need to call gf_modules_refresh() with your module
+ * manager.
+ *
+ * \code
+ * GF_MODULE_STATIC_DECLARE(aac_in);
+ * GF_MODULE_STATIC_DECLARE(audio_filter);
+ * GF_MODULE_STATIC_DECLARE(ffmpeg);
+ * ...
+ *
+ * void prepare() {
+ *     GF_User user;
+ *     ...
+ *     user.modules = gf_modules_new("/data/gpac/modules", user.config);
+ *
+ *     GF_MODULE_LOAD_STATIC(user.modules, aac_in);
+ *     GF_MODULE_LOAD_STATIC(user.modules, audio_filter);
+ *     GF_MODULE_LOAD_STATIC(user.modules, ffmpeg);
+ *     ...
+ *     gf_modules_refresh(user.modules);
+ *    ...
+ * }
+ * \endcode
+ * \see GF_MODULE_LOAD_STATIC() gf_modules_refresh()
+ */
+#ifdef __cplusplus
+#define GF_MODULE_STATIC_DECLARE(_name)				\
+	extern "C" GF_InterfaceRegister *gf_register_module_##_name()
+#else
+#define GF_MODULE_STATIC_DECLARE(_name)				\
+	GF_InterfaceRegister *gf_register_module_##_name()
+#endif
+/*!
+ *\brief load a static module given its name
+ *
+ * Use this function to load a statically compiled
+ * module. GF_MODULE_STATIC_DECLARE() should be called before and
+ * gf_modules_refresh() after loading all the needed modules.
+ *
+ *\param _pm the module manager
+ *\param _name the module name
+ *\see GF_MODULE_STATIC_DECLARE() gf_modules_refresh()
+ */
+#define GF_MODULE_LOAD_STATIC(_pm, _name)			\
+	gf_module_load_static(_pm,gf_register_module_##_name)
+
+
 /*!
  *\brief refreshes modules
  *
@@ -255,6 +326,7 @@
  *\brief interface shutdown
  *
  *Closes an interface
+
  *\param interface_obj the interface to close
  */
 GF_Err gf_modules_close_interface(GF_BaseInterface *interface_obj);
@@ -298,4 +370,3 @@
 
 
 #endif		/*_GF_MODULE_H_*/
-

v0.5.2.tar.gz/include/gpac/modules/codec.h -> v0.6.1.tar.gz/include/gpac/modules/codec.h Changed

v0.5.2.tar.gz/include/gpac/modules/service.h -> v0.6.1.tar.gz/include/gpac/modules/service.h Changed

@@ -90,6 +90,8 @@
 	GF_NET_CHAN_GET_ESD,
 	/*retrieves visual PAR as indicated in container if any*/
 	GF_NET_CHAN_GET_PIXEL_AR,
+	/*retrieves visual SRD as indicated in container if any*/
+	GF_NET_CHAN_GET_SRD,
 
 	/*service buffer query (for all channels running in service), app<-module*/
 	GF_NET_BUFFER_QUERY,
@@ -102,6 +104,8 @@
 	GF_NET_SERVICE_INFO,
 	/*checks if there is an audio stream in the service - term->net only*/
 	GF_NET_SERVICE_HAS_AUDIO,
+	/*checks if the service can support reverse playback (speed<0) - term->service only*/
+	GF_NET_SERVICE_CAN_REVERSE_PLAYBACK,
 	/*send by the terminal to indicate the channel(s) on this service need more data - term->net only*/
 	GF_NET_SERVICE_FLUSH_DATA,
 
@@ -146,6 +150,9 @@
 
 	/*seek request from service on all channels*/
 	GF_NET_SERVICE_SEEK,
+
+	/*query codec statistic on all channels*/
+	GF_NET_SERVICE_CODEC_STAT_QUERY,
 } GF_NET_CHAN_CMD;
 
 /*channel command for all commands that don't need params:
@@ -251,7 +258,7 @@
 	u32 command_type;
 	LPNETCHANNEL on_channel;
 	//time in sec in the timeshift buffer - 0 means live point
-	u32 time;
+	Double time;
 } GF_NetComTimeShift;
 
 
@@ -350,15 +357,24 @@
 	u16 multiplex_port;
 } GF_NetComStats;
 
-/*GF_NET_CHAN_GET_PIXEL_AR*/
+/*GF_NET_CHAN_GET_PIXEL_AR and GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE*/
 typedef struct
 {
 	u32 command_type;
 	LPNETCHANNEL on_channel;
 	u32 hSpacing, vSpacing;
 	u32 width, height, pixel_format;
+	Bool is_srd;
 } GF_NetComPixelAR;
 
+/*GF_NET_CHAN_GET_SRD*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	u32 w,h,x,y, width, height;
+} GF_NetComSRDInfo;
+
 /*GF_NET_SERVICE_INFO*/
 typedef struct __netinfocom
 {
@@ -437,6 +453,10 @@
 	const char *next_url_init_or_switch_segment;
 	u64 switch_start_range, switch_end_range;
 
+	/*set to key URL for current segment, or NULL if none*/
+	const char *key_url;
+	/*set to key IV for current segment, or NULL if none*/
+	bin128 *key_IV;
 
 	Bool has_next;
 	/*module->proxy: indicates that currently downloaded segment should be checked.
@@ -535,6 +555,7 @@
 	Bool is_announce, is_splicing;
 	Bool reload_external;
 	Bool enable_if_defined;
+	Bool disable_if_defined;
 	Double activation_countdown;
 } GF_AssociatedContentLocation;
 
@@ -552,6 +573,7 @@
 	Bool force_reload;
 	Bool is_paused;
 	Bool is_discontinuity;
+	u64 ntp;
 } GF_AssociatedContentTiming;
 
 /*GF_NET_CHAN_NALU_MODE*/
@@ -565,6 +587,17 @@
 	u32 extract_mode;
 } GF_NALUExtractMode;
 
+/*GF_NET_SERVICE_CODEC_STAT_QUERY*/
+typedef struct
+{
+	/*avg_dec_time is the maximum average decoding time of all channels;
+	 max_dec_time, irap_avg_dec_time and irap_max_dec_time is the maximum decoding time of a frame and a I frame in this channel*/
+	u32 avg_dec_time, max_dec_time, irap_avg_dec_time, irap_max_dec_time;
+	/*flag codec has been reset*/
+	Bool codec_reset;
+	Bool decode_only_rap;
+} GF_CodecStat;
+
 typedef union __netcommand
 {
 	GF_NET_CHAN_CMD command_type;
@@ -594,6 +627,8 @@
 	GF_NALUExtractMode nalu_mode;
 	GF_NetComSendEvent send_event;
 	GF_NetQualityQuery quality_query;
+	GF_CodecStat codec_stat;
+	GF_NetComSRDInfo srd;
 } GF_NetworkCommand;
 
 /*

v0.5.2.tar.gz/include/gpac/modules/video_out.h -> v0.6.1.tar.gz/include/gpac/modules/video_out.h Changed

v0.5.2.tar.gz/include/gpac/mpeg4_odf.h -> v0.6.1.tar.gz/include/gpac/mpeg4_odf.h Changed

v0.5.2.tar.gz/include/gpac/mpegts.h -> v0.6.1.tar.gz/include/gpac/mpegts.h Changed

@@ -268,7 +268,15 @@
 #define GF_M2TS_MAX_SERVICES	65535
 
 /*Maximum size of the buffer in UDP */
-#define UDP_BUFFER_SIZE	0x4000
+#ifdef WIN32
+#define GF_M2TS_UDP_BUFFER_SIZE	0x80000
+#else
+//fixme - issues on linux and OSX with large stack size
+//we need to change default stack size for TS thread
+#define GF_M2TS_UDP_BUFFER_SIZE	0x40000
+#endif
+
+#define GF_M2TS_MAX_PCR	2576980377811ULL
 
 /*returns readable name for given stream type*/
 const char *gf_m2ts_get_stream_name(u32 streamType);
@@ -509,6 +517,7 @@
 	Bool force_reload;
 	Bool is_paused;
 	Bool is_discontinuity;
+	u64 ntp;
 } GF_M2TS_TemiTimecodeDescriptor;
 
 
@@ -547,6 +556,9 @@
 	Bool is_scalable;
 
 	GF_M2TS_MetadataPointerDescriptor *metadata_pointer_descriptor;
+
+	/*continuity counter check for pure PCR PIDs*/
+	s16 pcr_cc;
 } GF_M2TS_Program;
 
 /*ES flags*/
@@ -566,6 +578,8 @@
 	GF_M2TS_ES_IS_MPE = 1<<5,
 	/*stream is used to send PCR to upper layer*/
 	GF_M2TS_INHERIT_PCR = 1<<6,
+	/*siugnals the stream is used to send the PCR, but is not the original PID carrying it*/
+	GF_M2TS_FAKE_PCR = 1<<7,
 
 	/*all flags above this mask are used by importers & co*/
 	GF_M2TS_ES_STATIC_FLAGS_MASK = 0x0000FFFF,
@@ -711,9 +725,13 @@
 	GF_M2TS_DVB_Subtitling_Descriptor sub;
 	GF_M2TS_MetadataDescriptor *metadata_descriptor;
 
-
+	//pointer to last received temi
 	char *temi_tc_desc;
 	u32 temi_tc_desc_len, temi_tc_desc_alloc_size;
+
+	//last decoded temi (may be one ahead of time as the last received TEMI)
+	GF_M2TS_TemiTimecodeDescriptor temi_tc;
+	Bool temi_pending;
 } GF_M2TS_PES;
 
 /*SDT information object*/
@@ -913,6 +931,9 @@
 	/* analyser */
 	FILE *pes_out;
 
+
+	Bool prefix_present;
+
 	Bool direct_mpe;
 
 	Bool dvb_h_demux;
@@ -938,7 +959,7 @@
 	char* dsmcc_root_dir;
 	GF_List* dsmcc_controler;
 
-	Bool segment_switch;
+	Bool abort_parsing;
 	Bool table_reset;
 
 	//duration estimation
@@ -952,6 +973,7 @@
 GF_M2TS_Demuxer *gf_m2ts_demux_new();
 void gf_m2ts_demux_del(GF_M2TS_Demuxer *ts);
 void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts);
+void gf_m2ts_reset_parsers_for_program(GF_M2TS_Demuxer *ts, GF_M2TS_Program *prog);
 GF_ESD *gf_m2ts_get_esd(GF_M2TS_ES *es);
 GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode);
 u32 gf_m2ts_pes_get_framing_mode(GF_M2TS_PES *pes);
@@ -966,6 +988,8 @@
 
 Bool gf_m2ts_crc32_check(char *data, u32 len);
 
+/*aborts parsing of the current data (typically needed when parsing done by a different thread). If force_reset_pes is set, all pending pes data is discarded*/
+void gf_m2ts_abort_parsing(GF_M2TS_Demuxer *ts, Bool force_reset_pes);
 
 
 typedef struct
@@ -1091,6 +1115,9 @@
 	/*multiplexer time - NOT THE PCR*/
 	GF_M2TS_Time time;
 
+	GF_M2TS_Time next_time;
+	Bool pcr_only_mode;
+
 	/*table tools*/
 	GF_M2TS_Mux_Table *tables;
 	/*total table sizes for bitrate estimation (PMT/PAT/...)*/
@@ -1102,6 +1129,7 @@
 	u32 refresh_rate_ms;
 	Bool table_needs_update;
 	Bool table_needs_send;
+	Bool force_single_au;
 
 	/*minimal amount of bytes we are allowed to copy frome next AU in the current PES. If no more than this
 	is available in PES, don't copy from next*/
@@ -1208,6 +1236,16 @@
 	GF_SEG_BOUNDARY_FORCE_PCR,
 };
 
+/*AU packing per pes configuration*/
+typedef enum
+{
+	/*only audio AUs are packed in a single PES, video and systems are not (recommended default)*/
+	GF_M2TS_PACK_AUDIO_ONLY,
+	/*never pack AUs in a single PES*/
+	GF_M2TS_PACK_NONE,
+	/*always try to pack AUs in a single PES*/
+	GF_M2TS_PACK_ALL
+} GF_M2TS_PackMode;
 
 struct __m2ts_mux {
 	GF_M2TS_Mux_Program *programs;
@@ -1248,7 +1286,9 @@
 
 	Bool force_pat;
 
-	Bool one_au_per_pes;
+	GF_M2TS_PackMode au_pes_mode;
+
+	Bool enable_forced_pcr;
 
 	Bool eos_found;
 	u64 last_br_time_us;
@@ -1292,9 +1332,9 @@
 u32 gf_m2ts_get_sys_clock(GF_M2TS_Mux *muxer);
 u32 gf_m2ts_get_ts_clock(GF_M2TS_Mux *muxer);
 
-/*set muxer in/out single-au pes mode. In this mode, each PES contains one and only one AU*/
-GF_Err gf_m2ts_mux_use_single_au_pes_mode(GF_M2TS_Mux *muxer, Bool strict_au_pes_mode);
+GF_Err gf_m2ts_mux_use_single_au_pes_mode(GF_M2TS_Mux *muxer, GF_M2TS_PackMode au_pes_mode);
 GF_Err gf_m2ts_mux_set_initial_pcr(GF_M2TS_Mux *muxer, u64 init_pcr_value);
+GF_Err gf_m2ts_mux_enable_pcr_only_packets(GF_M2TS_Mux *muxer, Bool enable_forced_pcr);
 
 /*user inteface functions*/
 GF_Err gf_m2ts_program_stream_update_ts_scale(GF_ESInterface *_self, u32 time_scale);
@@ -1333,9 +1373,6 @@
 };
 
 
-// DVB buffer size 188x20
-#define DVB_BUFFER_SIZE 3760
-
 #endif //GPAC_HAS_LINUX_DVB

v0.5.2.tar.gz/include/gpac/network.h -> v0.6.1.tar.gz/include/gpac/network.h Changed

@@ -170,6 +170,22 @@
 void gf_net_get_ntp(u32 *sec, u32 *frac);
 
 /*!
+ *\brief offsets NTP time by a given amount of seconds
+ *
+ *Offsets NTP time of the system by a given amount of seconds in the future or the past (default value is 0).
+ \param sec seconds to add or remove to the system NTP
+ */
+void gf_net_set_ntp_shift(s32 sec);
+
+/*!
+ *\brief gets NTP time
+ *
+ *Gets NTP (Network Time Protocol) timestamp (high 32 bit is seconds, low 32 bit is fraction)
+ \return NTP timestamp
+ */
+u64 gf_net_get_ntp_ts();
+
+/*!
  *
  *Gets diff in milliseconds between NTP time and current time
  \param ntp NTP timestamp
@@ -432,12 +448,42 @@
  *\brief checks address type
  *
  *Checks if an address is an IPV6 or IPV4 one.
+ *\param address Adress to check
  *\return true 1 if address is IPV6 one, 0 otherwise
  */
 Bool gf_net_is_ipv6(const char *address);
 
 
 /*!
+ *host to network conversion of integer
+ *
+ *\param integrer to convert
+ *\return converted integer
+ */
+u32 gf_htonl(u32 val);
+/*!
+ *network to host conversion of integer
+ *
+ *\param integrer to convert
+ *\return converted integer
+ */
+u32 gf_ntohl(u32 val);
+/*!
+ *host to network conversion of short integer
+ *
+ *\param short integrer to convert
+ *\return converted integer
+ */
+u16 gf_htons(u16 val);
+/*!
+ *network to host conversion of short integer
+ *
+ *\param short integrer to convert
+ *\return converted integer
+ */
+u16 gf_tohs(u16 val);
+
+/*!
  *	\brief MobileIP Callback
  *
  * The gf_net_mobileip_ctrl_cbk type is the type for the callback of the \ref gf_net_mobileip_set_callback function. By default no mobileip is used

v0.5.2.tar.gz/include/gpac/nodes_mpeg4.h -> v0.6.1.tar.gz/include/gpac/nodes_mpeg4.h Changed

v0.5.2.tar.gz/include/gpac/options.h -> v0.6.1.tar.gz/include/gpac/options.h Changed

v0.5.2.tar.gz/include/gpac/path2d.h -> v0.6.1.tar.gz/include/gpac/path2d.h Changed

v0.5.2.tar.gz/include/gpac/scene_manager.h -> v0.6.1.tar.gz/include/gpac/scene_manager.h Changed

@@ -245,6 +245,8 @@
 	GF_SceneManager *ctx;
 	/*file to import except IsoMedia files*/
 	const char *fileName;
+	//original URL for the file or NULL if same as fileName
+	const char *src_url;
 #ifndef GPAC_DISABLE_ISOM
 	/*IsoMedia file to import (we need to be able to load from an opened file for scene stats)*/
 	GF_ISOFile *isom;
@@ -369,19 +371,21 @@
 
 /*dumps scene context to a given format
 @rad_name: file name & loc without extension - if NULL dump will happen in stdout
+@is_final_name: if set, no extension is added to the filename
 @dump_mode: one of the above*/
-GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, GF_SceneDumpFormat dump_mode);
+GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, Bool is_final_name, GF_SceneDumpFormat dump_mode);
 
 typedef struct _scenedump GF_SceneDumper;
 
 /*create a scene dumper
 @graph: scene graph being dumped
 @rad_name: file radical (NULL for stdout) - if not NULL MUST BE GF_MAX_PATH length
+@is_final_name: if set, rad_name is the final name (no extension added)
 @indent_char: indent format
 @dump_mode: if set, dumps in XML format otherwise regular text
 returns NULL if can't create a file
 */
-GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, char indent_char, GF_SceneDumpFormat dump_mode);
+GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, Bool is_final_name, char indent_char, GF_SceneDumpFormat dump_mode);
 void gf_sm_dumper_set_extra_graph(GF_SceneDumper *sdump, GF_SceneGraph *extra);
 void gf_sm_dumper_del(GF_SceneDumper *bd);

v0.5.2.tar.gz/include/gpac/scenegraph_vrml.h -> v0.6.1.tar.gz/include/gpac/scenegraph_vrml.h Changed

@@ -316,6 +316,10 @@
 	*/
 	GF_SG_VRML_SCRIPT_FUNCTION,
 
+	/*special event only used in routes for binding eventOut/exposedFields to generic functions.
+	 A route with ToField.FieldType set to this value holds a pointer to a function object.
+	*/
+	GF_SG_VRML_GENERIC_FUNCTION,
 
 	GF_SG_VRML_UNKNOWN
 };
@@ -359,7 +363,7 @@
 of the extern proto lib if found and loaded, NULL if not found and GF_SG_INTERNAL_PROTO for internal
 hardcoded protos (extensions of MPEG-4 scene graph used for module deveopment)
 */
-#define GF_SG_INTERNAL_PROTO	(GF_SceneGraph *) 0xFFFFFFFF
+#define GF_SG_INTERNAL_PROTO	(PTR_TO_U_CAST -1)
 
 
 #ifndef GPAC_DISABLE_VRML
@@ -477,6 +481,8 @@
 from the routes present in scene*/
 void gf_sg_set_max_defined_route_id(GF_SceneGraph *sg, u32 ID);
 
+/*create a new route from a node output to a given callback/function*/
+void gf_sg_route_new_to_callback(GF_SceneGraph *sg, GF_Node *fromNode, u32 fromField, void *cbk, void ( *route_callback) (void *param, GF_FieldInfo *from_field) );
 
 /*activates all routes currently triggered - this follows the event cascade model of VRML/MPEG4:
 	- routes are collected during eventOut generation

v0.5.2.tar.gz/include/gpac/setup.h -> v0.6.1.tar.gz/include/gpac/setup.h Changed

@@ -300,6 +300,8 @@
 #define GF_EPSILON_FLOAT	FLT_EPSILON
 #define GF_SHORT_MAX		SHRT_MAX
 #define GF_SHORT_MIN		SHRT_MIN
+#define GF_INT_MAX			INT_MAX
+#define GF_INT_MIN			INT_MIN
 
 #ifndef MIN
 #define MIN(X, Y) ((X)<(Y)?(X):(Y))
@@ -341,11 +343,11 @@
 
 #else
 
-#define gf_malloc malloc
-#define gf_calloc calloc
-#define gf_realloc realloc
-#define gf_free free
-#define gf_strdup strdup
+void* gf_malloc(size_t size);
+void* gf_calloc(size_t num, size_t size_of);
+void* gf_realloc(void *ptr, size_t size);
+void gf_free(void *ptr);
+char* gf_strdup(const char *str);
 
 #endif
 
@@ -360,7 +362,11 @@
 #define LLXPAD( pad ) "%" pad "I64x"
 #define LLD_CAST
 #define LLU_CAST
+#ifdef _WIN64
+#define PTR_TO_U_CAST (u64)
+#else
 #define PTR_TO_U_CAST (u32)
+#endif
 
 #elif defined (__SYMBIAN32__)
 
@@ -538,7 +544,7 @@
 # endif
 #endif
 
-#ifndef GPAC_HAS_SPIDERMONKEY
+#if !defined(GPAC_HAS_SPIDERMONKEY) || defined(GPAC_DISABLE_SVG)
 # ifndef GPAC_DISABLE_MSE
 # define GPAC_DISABLE_MSE
 # endif

v0.5.2.tar.gz/include/gpac/sync_layer.h -> v0.6.1.tar.gz/include/gpac/sync_layer.h Changed

v0.5.2.tar.gz/include/gpac/term_info.h -> v0.6.1.tar.gz/include/gpac/term_info.h Changed

v0.5.2.tar.gz/include/gpac/terminal.h -> v0.6.1.tar.gz/include/gpac/terminal.h Changed

@@ -111,7 +111,7 @@
 /*process shortcuts*/
 void gf_term_process_shortcut(GF_Terminal *term, GF_Event *ev);
 
-void gf_term_set_speed(GF_Terminal *term, Fixed speed);
+GF_Err gf_term_set_speed(GF_Terminal *term, Fixed speed);
 
 /*sends a set of scene commands (BT, XMT, X3D, LASeR+XML) to the scene
 type indicates the language used - accepted values are
@@ -163,6 +163,9 @@
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
 Bool gf_term_user_event(GF_Terminal *term, GF_Event *event);
 
+/*post event to terminal*/
+Bool gf_term_send_event(GF_Terminal *term, GF_Event *evt);
+
 /*post extended user mouse interaction to terminal
 	X and Y are point coordinates in the display expressed in 2D coord system top-left (0,0), Y increasing towards bottom
 	@xxx_but_down: specifiy whether the mouse button is down(2) or up (1), 0 if unchanged
@@ -209,6 +212,10 @@
 VERY BASIC INTERFACE*/
 void gf_term_switch_quality(GF_Terminal *term, Bool up);
 
+
+/*get global clock in milliseconds*/
+u32 gf_term_get_clock(GF_Terminal *term);
+
 #ifdef __cplusplus
 }
 #endif

v0.5.2.tar.gz/include/gpac/thread.h -> v0.6.1.tar.gz/include/gpac/thread.h Changed

v0.5.2.tar.gz/include/gpac/token.h -> v0.6.1.tar.gz/include/gpac/token.h Changed

@@ -51,7 +51,7 @@
  *
  *Gets the next string component comprised in a given set of characters
  *\param Buffer source string to scan
- *\param Start char offset from begining of buffer where tokenization shall start
+ *\param Start char offset from beginning of buffer where tokenization shall start
  *\param Separator separator characters to use
  *\param Container output buffer location
  *\param ContainerSize output buffer allocated size
@@ -63,7 +63,7 @@
  *
  *Gets the next string component comprised in a given set of characters, removing surrounding characters
  *\param Buffer source string to scan
- *\param Start char offset from begining of buffer where tokenization shall start
+ *\param Start char offset from beginning of buffer where tokenization shall start
  *\param Separator separator characters to use
  *\param strip_set surrounding characters to remove
  *\param Container output buffer location
@@ -76,7 +76,7 @@
  *
  *Gets one line from buffer and remove delimiters CR, LF and CRLF
  *\param buffer source string to scan
- *\param start char offset from begining of buffer where tokenization shall start
+ *\param start char offset from beginning of buffer where tokenization shall start
  *\param size size of the input buffer to analyze
  *\param line_buffer output buffer location
  *\param line_buffer_size output buffer allocated size
@@ -88,7 +88,7 @@
  *
  *Locates a pattern in the buffer
  *\param Buffer source string to scan
- *\param Start char offset from begining of buffer where tokenization shall start
+ *\param Start char offset from beginning of buffer where tokenization shall start
  *\param Size size of the input buffer to analyze
  *\param Pattern pattern to locate
  *\return position of the first char in the buffer after the pattern, or -1 if pattern could not be found

v0.5.2.tar.gz/include/gpac/tools.h -> v0.6.1.tar.gz/include/gpac/tools.h Changed

@@ -123,12 +123,22 @@
  *	\brief large file opening
  *
  *	Opens a large file (>4GB)
- *	\param file_name Same semantics as gf_f64_open
- *	\param mode Same semantics as gf_f64_open
+ *	\param file_name Same semantics as fopen
+ *	\param mode Same semantics as fopen
  *	\return stream handle of the file object
  *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
 */
-FILE *gf_f64_open(const char *file_name, const char *mode);
+FILE *gf_fopen(const char *file_name, const char *mode);
+
+/*!
+ *	\brief file closing
+ *
+ *	Closes a file
+ *	\param file file to close
+ *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
+*/
+s32 gf_fclose(FILE *file);
+
 /*!
  *	\brief large file position query
  *
@@ -137,7 +147,7 @@
  *	\return position in the file
  *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
 */
-u64 gf_f64_tell(FILE *f);
+u64 gf_ftell(FILE *f);
 /*!
  *	\brief large file seeking
  *
@@ -148,7 +158,7 @@
  *	\return new position in the file
  *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
 */
-u64 gf_f64_seek(FILE *f, s64 pos, s32 whence);
+u64 gf_fseek(FILE *f, s64 pos, s32 whence);
 
 /*! @} */
 
@@ -412,7 +422,7 @@
  *
  *	Assigns a user-defined callback for printing log messages. By default all logs are redirected to stderr
  *	\param usr_cbk Opaque user data
- *	\param cbk  callback log function
+ *	\param cbk     Callback log function
  *	\return previous callback function
 */
 gf_log_cbk gf_log_set_callback(void *usr_cbk, gf_log_cbk cbk);
@@ -586,9 +596,10 @@
  *	\brief Temporary File Creation
  *
  *	Creates a new temporary file in binary mode
+ *	\param fileName if not NULL, strdup() of the temporary filename when created by GPAC (NULL otherwise as the system automatically removes its own tmp files)
  *	\return stream handle to the new file ressoucre
  */
-FILE *gf_temp_file_new();
+FILE *gf_temp_file_new(char ** const fileName);
 
 
 /*!
@@ -753,6 +764,14 @@
 GF_Err gf_mkdir(char* DirPathName);
 
 /*!
+ *	\brief Check Directory Exists
+ *
+ *	Create a directory within the full path.
+ *	\param DirPathName the dir path name.
+ */
+Bool gf_dir_exists(char *DirPathName);
+
+/*!
  *	\brief Create Directory
  *
  *	Cleanup a directory within the full path, removing all the files and the directories.
@@ -916,6 +935,11 @@
  */
 char * gf_get_default_cache_directory();
 
+/**
+ * Gets the number of open file handles (gf_fopen/gf_fclose only).
+ * \return  number of open file handles
+ */
+u32 gf_file_handles_count();
 
 
 /**

v0.5.2.tar.gz/include/gpac/user.h -> v0.6.1.tar.gz/include/gpac/user.h Changed

@@ -64,16 +64,23 @@
 
 	/*disables frame-rate regulation (used when dumping content)*/
 	GF_TERM_NO_REGULATION = 1<<5,
+
+	/*uses audio hardware clock rather than system clock. The clock is increased at the rate of audio sample consumption. This should only be used for extraction
+	purposes, as it may result in non-smooth visual playback (time is not continuously increasing)*/
+	GF_TERM_USE_AUDIO_HW_CLOCK = 1<<6,
+
 	/*works without window thread*/
-	GF_TERM_WINDOW_NO_THREAD = 1<<6,
+	GF_TERM_WINDOW_NO_THREAD = 1<<10,
 	/*lets the main user handle window events (needed for browser plugins)*/
-	GF_TERM_NO_WINDOWPROC_OVERRIDE = 1<<7,
+	GF_TERM_NO_WINDOWPROC_OVERRIDE = 1<<11,
 	/*works without title bar*/
-	GF_TERM_WINDOW_NO_DECORATION = 1<<8,
+	GF_TERM_WINDOW_NO_DECORATION = 1<<12,
+
+
 	/*framebuffer works in 32 bit alpha mode - experimental, only supported on Win32*/
-	GF_TERM_WINDOW_TRANSPARENT = 1<<9,
+	GF_TERM_WINDOW_TRANSPARENT = 1<<20,
 	/*works in windowless mode - experimental, only supported on Win32*/
-	GF_TERM_WINDOWLESS = 1<<10,
+	GF_TERM_WINDOWLESS = 1<<21,
 };
 
 /*user object for all callbacks*/

v0.5.2.tar.gz/include/gpac/utf.h -> v0.6.1.tar.gz/include/gpac/utf.h Changed

v0.5.2.tar.gz/include/gpac/version.h -> v0.6.1.tar.gz/include/gpac/version.h Changed

v0.5.2.tar.gz/include/gpac/xml.h -> v0.6.1.tar.gz/include/gpac/xml.h Changed

v0.5.2.tar.gz/include/win32/inttypes.h -> v0.6.1.tar.gz/include/win32/inttypes.h Changed

v0.5.2.tar.gz/mkdmg.sh -> v0.6.1.tar.gz/mkdmg.sh Changed

@@ -20,6 +20,7 @@
 then
 #  echo copying $1 to bundle
   cp $1 lib/
+  chmod +w lib/$basefile
   rewrite_deps lib/$basefile
 fi
 }
@@ -31,11 +32,14 @@
 rm -fr tmpdmg
 fi
 mkdir -p tmpdmg/Osmo4.app
-rsync -r --exclude=.svn $source_path/build/osxdmg/Osmo4.app/ ./tmpdmg/Osmo4.app/
+rsync -r --exclude=.git $source_path/build/osxdmg/Osmo4.app/ ./tmpdmg/Osmo4.app/
 ln -s /Applications ./tmpdmg/Applications
-cp $source_path/README ./tmpdmg
+cp $source_path/README.md ./tmpdmg
 cp $source_path/COPYING ./tmpdmg
 
+mkdir -p tmpdmg/Osmo4.app/Contents/MacOS/modules
+mkdir -p tmpdmg/Osmo4.app/Contents/MacOS/lib
+
 cp bin/gcc/gm* tmpdmg/Osmo4.app/Contents/MacOS/modules
 cp bin/gcc/libgpac.dylib tmpdmg/Osmo4.app/Contents/MacOS/lib
 cp bin/gcc/MP4Client tmpdmg/Osmo4.app/Contents/MacOS/Osmo4
@@ -77,22 +81,25 @@
 cd ../../../..
 
 echo Copying GUI
-rsync -r --exclude=.svn $source_path/gui ./tmpdmg/Osmo4.app/Contents/MacOS/
+rsync -r --exclude=.git $source_path/gui ./tmpdmg/Osmo4.app/Contents/MacOS/
 
 echo Building DMG
 version=`grep '#define GPAC_VERSION ' $source_path/include/gpac/version.h | cut -d '"' -f 2`
 
 cur_dir=`pwd`
 cd $source_path
-rev=`LANG=en_US svn info | grep Revision | tr -d 'Revision: '`
+TAG=$(git describe --tags --abbrev=0 2> /dev/null)
+REVISION=$(echo `git describe --tags --long 2> /dev/null || echo "UNKNOWN"` | sed "s/^$TAG-//")
+BRANCH=$(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
+rev="$REVISION-$BRANCH"
 cd $cur_dir
 
 full_version=$version
 if [ "$rev" != "" ]
 then
-	full_version="$full_version-r$rev"
+	full_version="$full_version-rev$rev"
 else
-	#if no revision can be extracted from SVN, use date
+	#if no revision can be extracted, use date
    	$rev = $(date +%Y%m%d)
 fi
 
@@ -111,8 +118,13 @@
 hdiutil flatten gpac_sla.dmg
 hdiutil internet-enable -yes gpac_sla.dmg
 
-echo "GPAC-$full_version.dmg ready"
+pck_name="gpac-$full_version.dmg"
+if [ "$1" = "snow-leopard" ]; then
+pck_name="gpac-$full_version-$1.dmg"
+fi
+
+echo "$pck_name ready"
 chmod o+rx gpac_sla.dmg
 chmod g+rx gpac_sla.dmg
-mv gpac_sla.dmg GPAC-$full_version.dmg
+mv gpac_sla.dmg $pck_name

v0.5.2.tar.gz/modules/Makefile -> v0.6.1.tar.gz/modules/Makefile Changed

v0.5.2.tar.gz/modules/aac_in/Makefile -> v0.6.1.tar.gz/modules/aac_in/Makefile Changed

v0.5.2.tar.gz/modules/aac_in/aac_in.c -> v0.6.1.tar.gz/modules/aac_in/aac_in.c Changed

@@ -106,16 +106,16 @@
 {
 	char *sExt;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
-	if (!strnicmp(url, "rtsp://", 7)) return 0;
+	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
 	{
 		int i;
 		for (i = 0 ; AAC_MIMES[i] ; i++)
 			if (gf_service_check_mime_register(plug, AAC_MIMES[i], AAC_EXTENSIONS, AAC_DESC, sExt))
-				return 1;
+				return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 #endif
 
@@ -180,7 +180,7 @@
 	esd->OCRESID = 0;
 	gf_list_add(od->ESDescriptors, esd);
 
-	gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
 }
 #endif
 
@@ -198,9 +198,9 @@
 			gf_bs_read_int(bs, 4);
 			continue;
 		}
-		hdr->is_mp2 = gf_bs_read_int(bs, 1);
+		hdr->is_mp2 = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 2);
-		hdr->no_crc = gf_bs_read_int(bs, 1);
+		hdr->no_crc = (Bool)gf_bs_read_int(bs, 1);
 		pos = gf_bs_get_position(bs) - 2;
 
 		hdr->profile = 1 + gf_bs_read_int(bs, 2);
@@ -221,7 +221,7 @@
 			continue;
 		}
 		hdr->frame_size -= hdr->hdr_size;
-		if (is_complete && (gf_bs_available(bs) == hdr->frame_size)) return 1;
+		if (is_complete && (gf_bs_available(bs) == hdr->frame_size)) return GF_TRUE;
 		else if (gf_bs_available(bs) <= hdr->frame_size) break;
 
 		gf_bs_skip_bytes(bs, hdr->frame_size);
@@ -237,10 +237,10 @@
 			continue;
 		}
 		gf_bs_seek(bs, pos+hdr->hdr_size);
-		return 1;
+		return GF_TRUE;
 	}
 	gf_bs_seek(bs, start_pos);
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool AAC_ConfigureFromFile(AACReader *read)
@@ -248,13 +248,13 @@
 	Bool sync;
 	GF_BitStream *bs;
 	ADTSHeader hdr;
-	if (!read || !read->stream) return 0;
+	if (!read || !read->stream) return GF_FALSE;
 	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
 
 	sync = ADTS_SyncFrame(bs, !read->is_remote, &hdr);
 	if (!sync) {
 		gf_bs_del(bs);
-		return 0;
+		return GF_FALSE;
 	}
 	read->nb_ch = hdr.nb_ch;
 	read->prof = hdr.profile;
@@ -273,7 +273,7 @@
 		}
 	}
 	gf_bs_del(bs);
-	gf_f64_seek(read->stream, 0, SEEK_SET);
+	gf_fseek(read->stream, 0, SEEK_SET);
 	return 1;
 }
 
@@ -495,7 +495,7 @@
 		szCache = gf_dm_sess_get_cache_name(read->dnload);
 		if (!szCache) e = GF_IO_ERR;
 		else {
-			read->stream = gf_f64_open((char *) szCache, "rb");
+			read->stream = gf_fopen((char *) szCache, "rb");
 			if (!read->stream) e = GF_SERVICE_ERROR;
 			else {
 				/*if full file at once (in cache) parse duration*/
@@ -508,7 +508,7 @@
 					if (bytes_done>10*1024) {
 						e = GF_CORRUPTED_DATA;
 					} else {
-						fclose(read->stream);
+						gf_fclose(read->stream);
 						read->stream = NULL;
 						return;
 					}
@@ -575,7 +575,7 @@
 		gf_free(read->icy_track_name);
 	read->icy_name = read->icy_genre = read->icy_track_name = NULL;
 	if (read->stream)
-		fclose(read->stream);
+		gf_fclose(read->stream);
 	if (read->data)
 		gf_free(read->data);
 	read->data = NULL;
@@ -629,11 +629,11 @@
 	}
 
 	reply = GF_OK;
-	read->stream = gf_f64_open(szURL, "rb");
+	read->stream = gf_fopen(szURL, "rb");
 	if (!read->stream) {
 		reply = GF_URL_ERROR;
 	} else if (!AAC_ConfigureFromFile(read)) {
-		fclose(read->stream);
+		gf_fclose(read->stream);
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
@@ -765,7 +765,7 @@
 		read->start_range = com->play.start_range;
 		read->end_range = com->play.end_range;
 		read->current_time = 0;
-		if (read->stream) gf_f64_seek(read->stream, 0, SEEK_SET);
+		if (read->stream) gf_fseek(read->stream, 0, SEEK_SET);
 
 		if (read->ch == com->base.on_channel) {
 			read->done = 0;
@@ -826,7 +826,7 @@
 		*is_new_data = 1;
 
 fetch_next:
-		pos = gf_f64_tell(read->stream);
+		pos = gf_ftell(read->stream);
 		sync = ADTS_SyncFrame(bs, !read->is_remote, &hdr);
 		if (!sync) {
 			gf_bs_del(bs);
@@ -837,8 +837,8 @@
 					if ((read->input->query_proxy(read->input, &param)==GF_OK)
 					 && param.url_query.next_url
 					 ) {
-						fclose(read->stream);
-						read->stream = gf_f64_open(param.url_query.next_url, "rb");
+						gf_fclose(read->stream);
+						read->stream = gf_fopen(param.url_query.next_url, "rb");
 						*out_reception_status = GF_OK;
 						return GF_OK;
 					}
@@ -847,7 +847,7 @@
 				*out_reception_status = GF_EOS;
 				read->done = 1;
 			} else {
-				gf_f64_seek(read->stream, pos, SEEK_SET);
+				gf_fseek(read->stream, pos, SEEK_SET);
 				*out_reception_status = GF_OK;
 			}
 			return GF_OK;

v0.5.2.tar.gz/modules/aac_in/faad_dec.c -> v0.6.1.tar.gz/modules/aac_in/faad_dec.c Changed

@@ -119,7 +119,7 @@
 			break;
 		}
 		a_cfg.base_object_type = GF_M4A_AAC_LC;
-		a_cfg.has_sbr = 0;
+		a_cfg.has_sbr = GF_FALSE;
 		a_cfg.nb_chan = a_cfg.nb_chan > 2 ? 1 : a_cfg.nb_chan;
 
 		gf_m4a_write_config(&a_cfg, &dsi, &dsi_len);
@@ -139,7 +139,7 @@
 	ctx->num_samples = 1024;
 	ctx->out_size = 2 * ctx->num_samples * ctx->num_channels;
 	ctx->ES_ID = esd->ESID;
-	ctx->signal_mc = ctx->num_channels>2 ? 1 : 0;
+	ctx->signal_mc = ctx->num_channels>2 ? GF_TRUE : GF_FALSE;
 	return GF_OK;
 }
 
@@ -322,7 +322,7 @@
 	/*FAAD froces us to decode a frame to get channel cfg*/
 	if (ctx->signal_mc) {
 		s32 ch, idx;
-		ctx->signal_mc = 0;
+		ctx->signal_mc = GF_FALSE;
 		idx = 0;
 		/*NOW WATCH OUT!! FAAD may very well decide to output more channels than indicated!!!*/
 		ctx->num_channels = ctx->info.channels;
@@ -432,7 +432,10 @@
 		return GF_CODEC_NOT_SUPPORTED;
 	}
 	/*this codec currently requires AAC config in ESD*/
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_CODEC_NOT_SUPPORTED;
+	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] DecoderSpecificInfo missing - cannot initialize\n"));
+		return GF_CODEC_NOT_SUPPORTED;
+	}
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if (gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg) != GF_OK) return GF_CODEC_NOT_SUPPORTED;

v0.5.2.tar.gz/modules/ac3_in/Makefile -> v0.6.1.tar.gz/modules/ac3_in/Makefile Changed

v0.5.2.tar.gz/modules/ac3_in/ac3_in.c -> v0.6.1.tar.gz/modules/ac3_in/ac3_in.c Changed

@@ -84,16 +84,16 @@
 	u32 i;
 	sExt = strrchr(url, '.');
 	for (i = 0 ; AC3_MIMES[i]; i++) {
-		if (gf_service_check_mime_register(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC, sExt)) return 1;
+		if (gf_service_check_mime_register(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC, sExt)) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool ac3_is_local(const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
 }
 
 static GF_ESD *AC3_GetESD(AC3Reader *read)
@@ -117,7 +117,7 @@
 	esd = AC3_GetESD(read);
 	esd->OCRESID = 0;
 	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
 }
 
 
@@ -127,7 +127,7 @@
 	GF_BitStream *bs;
 	GF_AC3Header hdr;
 	memset(&hdr, 0, sizeof(GF_AC3Header));
-	if (!read->stream) return 0;
+	if (!read->stream) return GF_FALSE;
 	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
 
 
@@ -149,8 +149,8 @@
 		}
 	}
 	gf_bs_del(bs);
-	gf_f64_seek(read->stream, 0, SEEK_SET);
-	return 1;
+	gf_fseek(read->stream, 0, SEEK_SET);
+	return GF_TRUE;
 }
 
 static void AC3_RegulateDataRate(AC3Reader *read)
@@ -176,19 +176,19 @@
 
 	memset(&hdr, 0, sizeof(GF_AC3Header));
 
-	read->data = gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
+	read->data = (unsigned char*)gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
 	memcpy(read->data + read->data_size, data, sizeof(char)*data_size);
 	read->data_size += data_size;
 
 	if (read->needs_connection) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		bs = gf_bs_new((char *) read->data, read->data_size, GF_BITSTREAM_READ);
 		sync = gf_ac3_parser_bs(bs, &hdr, GF_TRUE);
 		gf_bs_del(bs);
 		if (!sync) return;
 		read->nb_ch = hdr.channels;
 		read->sample_rate = hdr.sample_rate;
-		read->is_live = 1;
+		read->is_live = GF_TRUE;
 		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 		gf_service_connect_ack(read->service, NULL, GF_OK);
 		AC3_SetupObject(read);
@@ -218,7 +218,7 @@
 	if (pos) {
 		u8 *d;
 		read->data_size -= (u32) pos;
-		d = gf_malloc(sizeof(char) * read->data_size);
+		d = (u8*)gf_malloc(sizeof(char) * read->data_size);
 		memcpy(d, read->data + pos, sizeof(char) * read->data_size);
 		gf_free(read->data);
 		read->data = d;
@@ -237,7 +237,7 @@
 	/*done*/
 	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
 		if (read->stream) {
-			read->is_remote = 0;
+			read->is_remote = GF_FALSE;
 			e = GF_EOS;
 		} else if (!read->needs_connection) {
 			return;
@@ -283,7 +283,7 @@
 	if (e >= GF_OK) {
 		if (read->needs_connection) {
 			gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, NULL);
-			if (!total_size) read->is_live = 1;
+			if (!total_size) read->is_live = GF_TRUE;
 		}
 		if (read->is_live) {
 			if (!e) AC3_OnLiveData(read, param->data, param->size);
@@ -295,11 +295,11 @@
 		szCache = gf_dm_sess_get_cache_name(read->dnload);
 		if (!szCache) e = GF_IO_ERR;
 		else {
-			read->stream = gf_f64_open((char *) szCache, "rb");
+			read->stream = gf_fopen((char *) szCache, "rb");
 			if (!read->stream) e = GF_SERVICE_ERROR;
 			else {
 				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = 0;
+				if (e==GF_EOS) read->is_remote = GF_FALSE;
 				e = GF_OK;
 				/*not enough data*/
 				if (!AC3_ConfigureFromFile(read)) {
@@ -308,7 +308,7 @@
 					if (bytes_done>10*1024) {
 						e = GF_CORRUPTED_DATA;
 					} else {
-						fclose(read->stream);
+						gf_fclose(read->stream);
 						read->stream = NULL;
 						return;
 					}
@@ -318,7 +318,7 @@
 	}
 	/*OK confirm*/
 	if (read->needs_connection) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, e);
 		if (!e) AC3_SetupObject(read);
 	}
@@ -328,11 +328,11 @@
 {
 	AC3Reader *read = (AC3Reader*) plug->priv;
 
-	read->needs_connection = 1;
+	read->needs_connection = GF_TRUE;
 
 	read->dnload = gf_service_download_new(read->service, url, 0, AC3_NetIO, read);
 	if (!read->dnload ) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
@@ -347,7 +347,7 @@
 	char szURL[2048];
 	char *ext;
 	GF_Err reply;
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 	read->service = serv;
 
 	if (read->dnload) gf_service_download_del(read->dnload);
@@ -365,11 +365,11 @@
 	}
 
 	reply = GF_OK;
-	read->stream = gf_f64_open(szURL, "rb");
+	read->stream = gf_fopen(szURL, "rb");
 	if (!read->stream) {
 		reply = GF_URL_ERROR;
 	} else if (!AC3_ConfigureFromFile(read)) {
-		fclose(read->stream);
+		gf_fclose(read->stream);
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
@@ -380,8 +380,8 @@
 
 static GF_Err AC3_CloseService(GF_InputService *plug)
 {
-	AC3Reader *read = plug->priv;
-	if (read->stream) fclose(read->stream);
+	AC3Reader *read = (AC3Reader*)plug->priv;
+	if (read->stream) gf_fclose(read->stream);
 	read->stream = NULL;
 	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
@@ -394,7 +394,7 @@
 
 static GF_Descriptor *AC3_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
 {
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 	/*since we don't handle multitrack in ac3, we don't need to check sub_url, only use expected type*/
 
 	/*override default*/
@@ -419,7 +419,7 @@
 {
 	u32 ES_ID=0;
 	GF_Err e;
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 
 	e = GF_SERVICE_ERROR;
 	if (read->ch==channel) goto exit;
@@ -443,7 +443,7 @@
 
 static GF_Err AC3_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
 {
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 
 	GF_Err e = GF_STREAM_NOT_FOUND;
 	if (read->ch == channel) {
@@ -458,8 +458,7 @@
 
 static GF_Err AC3_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
-	AC3Reader *read = plug->priv;
-
+	AC3Reader *read = (AC3Reader*)plug->priv;
 
 	if (com->base.command_type==GF_NET_SERVICE_INFO) {
 		com->info.name = read->icy_track_name ? read->icy_track_name : read->icy_name;
@@ -496,10 +495,10 @@
 		read->start_range = com->play.start_range;
 		read->end_range = com->play.end_range;
 		read->current_time = 0;
-		if (read->stream) gf_f64_seek(read->stream, 0, SEEK_SET);
+		if (read->stream) gf_fseek(read->stream, 0, SEEK_SET);
 
 		if (read->ch == com->base.on_channel) {
-			read->done = 0;
+			read->done = GF_FALSE;
 			/*PLAY after complete download, estimate duration*/
 			if (!read->is_remote && !read->duration) {
 				AC3_ConfigureFromFile(read);
@@ -528,11 +527,11 @@
 	Bool sync;
 	GF_BitStream *bs;
 	GF_AC3Header hdr;
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 
 	*out_reception_status = GF_OK;
-	*sl_compressed = 0;
-	*is_new_data = 0;
+	*sl_compressed = GF_FALSE;
+	*is_new_data = GF_FALSE;
 	memset(&hdr, 0, sizeof(GF_AC3Header));
 
 	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
@@ -554,18 +553,18 @@
 			return GF_OK;
 		}
 		bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-		*is_new_data = 1;
+		*is_new_data = GF_TRUE;
 
 fetch_next:
-		pos = gf_f64_tell(read->stream);
+		pos = gf_ftell(read->stream);
 		sync = gf_ac3_parser_bs(bs, &hdr, GF_FALSE);
 		if (!sync) {
 			gf_bs_del(bs);
 			if (!read->dnload) {
 				*out_reception_status = GF_EOS;
-				read->done = 1;
+				read->done = GF_TRUE;
 			} else {
-				gf_f64_seek(read->stream, pos, SEEK_SET);
+				gf_fseek(read->stream, pos, SEEK_SET);
 				*out_reception_status = GF_OK;
 			}
 			return GF_OK;
@@ -574,7 +573,7 @@
 		if (!hdr.framesize) {
 			gf_bs_del(bs);
 			*out_reception_status = GF_EOS;
-			read->done = 1;
+			read->done = GF_TRUE;
 			return GF_OK;
 		}
 		read->data_size = hdr.framesize;
@@ -592,7 +591,7 @@
 
 		read->sl_hdr.compositionTimeStamp = read->current_time;
 
-		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
+		read->data = (unsigned char*)gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
 		gf_bs_read_data(bs, (char *) read->data, read->data_size);
 		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
 		gf_bs_del(bs);
@@ -605,7 +604,7 @@
 
 static GF_Err AC3_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
 {
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 
 	if (read->ch == channel) {
 		if (!read->data) return GF_BAD_PARAM;
@@ -620,7 +619,7 @@
 GF_InputService *AC3_Load()
 {
 	AC3Reader *reader;
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
+	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
 	memset(plug, 0, sizeof(GF_InputService));
 	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC AC3 Reader", "gpac distribution")
 
@@ -636,7 +635,7 @@
 	plug->ChannelGetSLP = AC3_ChannelGetSLP;
 	plug->ChannelReleaseSLP = AC3_ChannelReleaseSLP;
 
-	reader = gf_malloc(sizeof(AC3Reader));
+	reader = (AC3Reader*)gf_malloc(sizeof(AC3Reader));
 	memset(reader, 0, sizeof(AC3Reader));
 	plug->priv = reader;
 	return plug;
@@ -645,7 +644,7 @@
 void AC3_Delete(void *ifce)
 {
 	GF_InputService *plug = (GF_InputService *) ifce;
-	AC3Reader *read = plug->priv;
+	AC3Reader *read = (AC3Reader*)plug->priv;
 	gf_free(read);
 	gf_free(plug);
 }

v0.5.2.tar.gz/modules/alsa/Makefile -> v0.6.1.tar.gz/modules/alsa/Makefile Changed

v0.5.2.tar.gz/modules/amr_dec/Makefile -> v0.6.1.tar.gz/modules/amr_dec/Makefile Changed

v0.5.2.tar.gz/modules/amr_dec/amr_dec.c -> v0.6.1.tar.gz/modules/amr_dec/amr_dec.c Changed

v0.5.2.tar.gz/modules/amr_dec/amr_in.c -> v0.6.1.tar.gz/modules/amr_dec/amr_in.c Changed

@@ -115,25 +115,25 @@
 	esd = AMR_GetESD(read);
 	esd->OCRESID = 0;
 	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
+	gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
 }
 
 static Bool AMR_CanHandleURL(GF_InputService *plug, const char *url)
 {
 	char *sExt;
 	sExt = strrchr(url, '.');
-	if (!sExt) return 0;
-	if (gf_service_check_mime_register(plug, "audio/amr", "amr awb", "AMR Speech Data", sExt)) return 1;
-	if (gf_service_check_mime_register(plug, "audio/evrc", "evc", "EVRC Speech Data", sExt)) return 1;
-	if (gf_service_check_mime_register(plug, "audio/smv", "smv", "SMV Speech Data", sExt)) return 1;
-	return 0;
+	if (!sExt) return GF_FALSE;
+	if (gf_service_check_mime_register(plug, "audio/amr", "amr awb", "AMR Speech Data", sExt)) return GF_TRUE;
+	if (gf_service_check_mime_register(plug, "audio/evrc", "evc", "EVRC Speech Data", sExt)) return GF_TRUE;
+	if (gf_service_check_mime_register(plug, "audio/smv", "smv", "SMV Speech Data", sExt)) return GF_TRUE;
+	return GF_FALSE;
 }
 
 static Bool file_is_local(const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
 }
 
 
@@ -142,7 +142,7 @@
 	u32 i;
 	char magic[20];
 
-	if (!read->stream) return 0;
+	if (!read->stream) return GF_FALSE;
 	read->mtype = 0;
 	read->start_offset = 6;
 	read->sample_rate = 8000;
@@ -169,9 +169,9 @@
 		read->block_size = 320;
 		fseek(read->stream, 9, SEEK_SET);
 	}
-	else if (!strnicmp(magic, "#!AMR_MC1.0\n", 12)) return 0;
-	else if (!strnicmp(magic, "#!AMR-WB_MC1.0\n", 15)) return 0;
-	else return 0;
+	else if (!strnicmp(magic, "#!AMR_MC1.0\n", 12)) return GF_FALSE;
+	else if (!strnicmp(magic, "#!AMR-WB_MC1.0\n", 15)) return GF_FALSE;
+	else return GF_FALSE;
 
 
 	read->duration = 0;
@@ -202,7 +202,7 @@
 		}
 	}
 	fseek(read->stream, read->start_offset, SEEK_SET);
-	return 1;
+	return GF_TRUE;
 }
 
 static void AMR_NetIO(void *cbk, GF_NETIO_Parameter *param)
@@ -216,7 +216,7 @@
 	/*done*/
 	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
 		if (read->stream) {
-			read->is_remote = 0;
+			read->is_remote = GF_FALSE;
 			e = GF_EOS;
 		} else {
 			return;
@@ -235,11 +235,11 @@
 		szCache = gf_dm_sess_get_cache_name(read->dnload);
 		if (!szCache) e = GF_IO_ERR;
 		else {
-			read->stream = fopen((char *) szCache, "rb");
+			read->stream = gf_fopen((char *) szCache, "rb");
 			if (!read->stream) e = GF_SERVICE_ERROR;
 			else {
 				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = 0;
+				if (e==GF_EOS) read->is_remote = GF_FALSE;
 				e = GF_OK;
 				/*not enough data*/
 				if (!AMR_ConfigureFromFile(read)) {
@@ -248,7 +248,7 @@
 					if (bytes_done>10*1024) {
 						e = GF_CORRUPTED_DATA;
 					} else {
-						fclose(read->stream);
+						gf_fclose(read->stream);
 						read->stream = NULL;
 						return;
 					}
@@ -258,7 +258,7 @@
 	}
 	/*OK confirm*/
 	if (read->needs_connection) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, e);
 		if (!e) AMR_SetupObject(read);
 	}
@@ -268,11 +268,11 @@
 {
 	AMR_Reader *read = (AMR_Reader*) plug->priv;
 
-	read->needs_connection = 1;
+	read->needs_connection = GF_TRUE;
 
 	read->dnload = gf_service_download_new(read->service, url, 0, AMR_NetIO, read);
 	if (!read->dnload) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
@@ -287,7 +287,7 @@
 	char szURL[2048];
 	char *ext;
 	GF_Err reply;
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 	read->service = serv;
 
 	if (read->dnload) gf_service_download_del(read->dnload);
@@ -305,11 +305,11 @@
 	}
 
 	reply = GF_OK;
-	read->stream = fopen(szURL, "rb");
+	read->stream = gf_fopen(szURL, "rb");
 	if (!read->stream) {
 		reply = GF_URL_ERROR;
 	} else if (!AMR_ConfigureFromFile(read)) {
-		fclose(read->stream);
+		gf_fclose(read->stream);
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
@@ -320,8 +320,8 @@
 
 static GF_Err AMR_CloseService(GF_InputService *plug)
 {
-	AMR_Reader *read = plug->priv;
-	if (read->stream) fclose(read->stream);
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
+	if (read->stream) gf_fclose(read->stream);
 	read->stream = NULL;
 	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
@@ -334,7 +334,7 @@
 
 static GF_Descriptor *AMR_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
 {
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 	/*since we don't handle multitrack in aac, we don't need to check sub_url, only use expected type*/
 
 	/*override default*/
@@ -357,7 +357,7 @@
 {
 	u32 ES_ID;
 	GF_Err e;
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 
 	e = GF_SERVICE_ERROR;
 	if (read->ch==channel) goto exit;
@@ -381,7 +381,7 @@
 
 static GF_Err AMR_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
 {
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 
 	GF_Err e = GF_STREAM_NOT_FOUND;
 	if (read->ch == channel) {
@@ -396,7 +396,7 @@
 
 static GF_Err AMR_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 	switch (com->command_type) {
@@ -420,7 +420,7 @@
 		if (read->stream) fseek(read->stream, read->start_offset, SEEK_SET);
 
 		if (read->ch == com->base.on_channel) {
-			read->done = 0;
+			read->done = GF_FALSE;
 			/*PLAY after complete download, estimate duration*/
 			if (!read->is_remote && !read->duration) {
 				AMR_ConfigureFromFile(read);
@@ -447,11 +447,11 @@
 {
 	u32 pos, start_from, i;
 	u8 toc, ft;
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 
 	*out_reception_status = GF_OK;
-	*sl_compressed = 0;
-	*is_new_data = 0;
+	*sl_compressed = GF_FALSE;
+	*is_new_data = GF_FALSE;
 
 	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 	read->sl_hdr.randomAccessPointFlag = 1;
@@ -470,7 +470,7 @@
 			*out_data_size = 0;
 			return GF_OK;
 		}
-		*is_new_data = 1;
+		*is_new_data = GF_TRUE;
 
 fetch_next:
 		pos = ftell(read->stream);
@@ -509,20 +509,20 @@
 
 		read->data_size++;
 		read->sl_hdr.compositionTimeStamp = read->current_time;
-		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
+		read->data = (unsigned char*)gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
 		read->data[0] = toc;
 		if (read->data_size>1) fread(read->data + 1, read->data_size-1, 1, read->stream);
 		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
 	}
 	*out_sl_hdr = read->sl_hdr;
-	*out_data_ptr = read->data;
+	*out_data_ptr = (char*)read->data;
 	*out_data_size = read->data_size;
 	return GF_OK;
 }
 
 static GF_Err AMR_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
 {
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 
 	if (read->ch == channel) {
 		if (!read->data) return GF_BAD_PARAM;
@@ -537,7 +537,7 @@
 GF_InputService *NewAESReader()
 {
 	AMR_Reader *reader;
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
+	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
 	memset(plug, 0, sizeof(GF_InputService));
 	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC AMR/EVRC/SMV Reader", "gpac distribution")
 
@@ -553,7 +553,7 @@
 	plug->ChannelGetSLP = AMR_ChannelGetSLP;
 	plug->ChannelReleaseSLP = AMR_ChannelReleaseSLP;
 
-	reader = gf_malloc(sizeof(AMR_Reader));
+	reader = (AMR_Reader*)gf_malloc(sizeof(AMR_Reader));
 	memset(reader, 0, sizeof(AMR_Reader));
 	plug->priv = reader;
 	return plug;
@@ -562,7 +562,7 @@
 void DeleteAESReader(void *ifce)
 {
 	GF_InputService *plug = (GF_InputService *) ifce;
-	AMR_Reader *read = plug->priv;
+	AMR_Reader *read = (AMR_Reader*)plug->priv;
 	gf_free(read);
 	gf_free(plug);
 }

v0.5.2.tar.gz/modules/amr_float_dec/Makefile -> v0.6.1.tar.gz/modules/amr_float_dec/Makefile Changed

v0.5.2.tar.gz/modules/amr_float_dec/amr_api.h -> v0.6.1.tar.gz/modules/amr_float_dec/amr_api.h Changed

@@ -1,35 +1,35 @@
-#ifndef _AMR_API_H
-#define _AMR_API_H
-
-/*AMR*/
-void Decoder_Interface_Decode( void *st,
-#ifndef ETSI
-                               unsigned char *bits,
-#else
-                               short *bits,
-#endif
-                               short *synth, int bfi );
-
-void *Decoder_Interface_init( void );
-
-
-void Decoder_Interface_exit( void *state );
-
-
-
-/*AMR WB*/
-
-
-#define NB_SERIAL_MAX   61    /* max serial size      */
-#define L_FRAME16k      320   /* Frame size at 16kHz  */
-
-#define _good_frame  0
-#define _bad_frame   1
-#define _lost_frame  2
-#define _no_frame    3
-
-void D_IF_decode(void *st, unsigned char *bits, short *synth, long bfi);
-void * D_IF_init(void);
-void D_IF_exit(void *state);
-
+#ifndef _AMR_API_H
+#define _AMR_API_H
+
+/*AMR*/
+void Decoder_Interface_Decode( void *st,
+#ifndef ETSI
+                               unsigned char *bits,
+#else
+                               short *bits,
+#endif
+                               short *synth, int bfi );
+
+void *Decoder_Interface_init( void );
+
+
+void Decoder_Interface_exit( void *state );
+
+
+
+/*AMR WB*/
+
+
+#define NB_SERIAL_MAX   61    /* max serial size      */
+#define L_FRAME16k      320   /* Frame size at 16kHz  */
+
+#define _good_frame  0
+#define _bad_frame   1
+#define _lost_frame  2
+#define _no_frame    3
+
+void D_IF_decode(void *st, unsigned char *bits, short *synth, long bfi);
+void * D_IF_init(void);
+void D_IF_exit(void *state);
+
 #endif //_AMR_API_H
\ No newline at end of file

v0.5.2.tar.gz/modules/amr_float_dec/amr_float_dec.c -> v0.6.1.tar.gz/modules/amr_float_dec/amr_float_dec.c Changed

@@ -83,8 +83,8 @@
 	if (esd->dependsOnESID || !esd->decoderConfig->decoderSpecificInfo) return GF_NOT_SUPPORTED;
 
 	/*AMRWB dec is another module*/
-	if (!strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "sawb", 4)) ctx->is_amr_wb = 1;
-	else if (!strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "samr", 4) || !strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "amr ", 4)) ctx->is_amr_wb = 0;
+	if (!strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "sawb", 4)) ctx->is_amr_wb = GF_TRUE;
+	else if (!strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "samr", 4) || !strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "amr ", 4)) ctx->is_amr_wb = GF_FALSE;
 	else return GF_NOT_SUPPORTED;
 
 
@@ -284,7 +284,7 @@
 	AMRFTDec *dec;
 	GF_MediaDecoder *ifce;
 	GF_SAFEALLOC(ifce , GF_MediaDecoder);
-	dec = gf_malloc(sizeof(AMRFTDec));
+	dec = (AMRFTDec*)gf_malloc(sizeof(AMRFTDec));
 	memset(dec, 0, sizeof(AMRFTDec));
 	ifce->privateStack = dec;
 	ifce->CanHandleStream = AMR_CanHandleStream;

v0.5.2.tar.gz/modules/audio_filter/Makefile -> v0.6.1.tar.gz/modules/audio_filter/Makefile Changed

v0.5.2.tar.gz/modules/audio_filter/audio_filter.c -> v0.6.1.tar.gz/modules/audio_filter/audio_filter.c Changed

@@ -52,7 +52,7 @@
 	u32 i, count;
 	register Double temp;
 	Double gain, clip, volume;
-	FilterContext *ctx = af->udta;
+	FilterContext *ctx = (FilterContext*)af->udta;
 
 	gain=ctx->gain / 100.0;
 	clip=ctx->clip * 32768.0 / 100.0;
@@ -76,7 +76,7 @@
 
 static GF_Err ProcessIdentity(GF_AudioFilter *af, void *in_block, u32 in_block_size, void *out_block, u32 *out_block_size)
 {
-	FilterContext *ctx = af->udta;
+	FilterContext *ctx = (FilterContext*)af->udta;
 	if (!ctx->inplace)
 		memcpy(out_block, in_block, in_block_size);
 
@@ -90,7 +90,7 @@
 	u32 i;
 	register Double temp;
 	Double ratio, vol;
-	FilterContext *ctx = af->udta;
+	FilterContext *ctx = (FilterContext*)af->udta;
 	assert(ctx->block_size==in_block_size);
 
 	/*fill delai buffer*/
@@ -123,7 +123,7 @@
 
 static GF_Err Configure(GF_AudioFilter *af, u32 in_sr, u32 in_bps, u32 in_nb_ch, u32 in_ch_cfg, u32 *out_nb_ch, u32 *out_ch_cfg, u32 *out_block_len_in_samples, u32 *delay_ms, Bool *inplace)
 {
-	FilterContext *ctx = af->udta;
+	FilterContext *ctx = (FilterContext*)af->udta;
 
 	*inplace = ctx->inplace;
 	*delay_ms = 0;
@@ -138,11 +138,11 @@
 		ctx->delai_buffer_size *= ctx->block_size;
 
 		if (ctx->delai_buffer) gf_free(ctx->delai_buffer);
-		ctx->delai_buffer = gf_malloc(sizeof(char)*ctx->delai_buffer_size);
+		ctx->delai_buffer = (char*)gf_malloc(sizeof(char)*ctx->delai_buffer_size);
 		memset(ctx->delai_buffer, 0, sizeof(char)*ctx->delai_buffer_size);
 
 		if (ctx->block_buffer) gf_free(ctx->block_buffer);
-		ctx->block_buffer = gf_malloc(sizeof(char)*ctx->block_size);
+		ctx->block_buffer = (char*)gf_malloc(sizeof(char)*ctx->block_size);
 		memset(ctx->block_buffer, 0, sizeof(char)*ctx->block_size);
 		break;
 	}
@@ -154,14 +154,14 @@
 static Bool SetFilter(GF_AudioFilter *af, char *filter)
 {
 	char *opts;
-	FilterContext *ctx = af->udta;
-	if (!filter) return 0;
+	FilterContext *ctx = (FilterContext*)af->udta;
+	if (!filter) return GF_FALSE;
 
 	opts = strchr(filter, '@');
 	if (opts) opts[0] = 0;
 
 	ctx->sample_block_size = 0;
-	ctx->inplace = 1;
+	ctx->inplace = GF_TRUE;
 	ctx->volume = 100.0;
 
 	if (!stricmp(filter, "identity")) {
@@ -182,7 +182,7 @@
 		ctx->sample_block_size = 120;
 	} else {
 		if (opts) opts[0] = '@';
-		return 0;
+		return GF_FALSE;
 	}
 	if (opts) {
 		opts[0] = '@';
@@ -193,7 +193,7 @@
 			if (sep) sep[0] = 0;
 
 			if (!strnicmp(opts, "blocksize=", 10)) ctx->sample_block_size = atoi(opts+10);
-			else if (!stricmp(opts, "noinplace")) ctx->inplace = 0;
+			else if (!stricmp(opts, "noinplace")) ctx->inplace = GF_FALSE;
 			else if (!strnicmp(opts, "gain=", 5)) ctx->gain = atof(opts+5);
 			else if (!strnicmp(opts, "clip=", 5)) ctx->clip = atof(opts+5);
 			else if (!strnicmp(opts, "volume=", 7)) ctx->volume = atof(opts+7);
@@ -209,20 +209,20 @@
 		}
 	}
 
-	return 1;
+	return GF_TRUE;
 }
 
 
 static Bool SetOption(GF_AudioFilter *af, char *option, char *value)
 {
-	return 1;
+	return GF_TRUE;
 }
 static void Reset(GF_AudioFilter *af)
 {
 }
 
 
-void *NewAudioFilter()
+GF_BaseInterface *NewAudioFilter()
 {
 	FilterContext *ctx;
 	GF_AudioFilter *mod;
@@ -242,7 +242,7 @@
 	mod->Reset = Reset;
 
 	GF_REGISTER_MODULE_INTERFACE(mod, GF_AUDIO_FILTER_INTERFACE, "Sample Audio Filter", "gpac distribution");
-	return mod;
+	return (GF_BaseInterface*)mod;
 }
 
 void DeleteAudioFilter(void *ifce)

v0.5.2.tar.gz/modules/avcap/Makefile -> v0.6.1.tar.gz/modules/avcap/Makefile Changed

v0.5.2.tar.gz/modules/bifs_dec/Makefile -> v0.6.1.tar.gz/modules/bifs_dec/Makefile Changed

v0.5.2.tar.gz/modules/bifs_dec/bifs_dec.c -> v0.6.1.tar.gz/modules/bifs_dec/bifs_dec.c Changed

v0.5.2.tar.gz/modules/ctx_load/Makefile -> v0.6.1.tar.gz/modules/ctx_load/Makefile Changed

v0.5.2.tar.gz/modules/ctx_load/ctx_load.c -> v0.6.1.tar.gz/modules/ctx_load/ctx_load.c Changed

@@ -29,7 +29,7 @@
 #include <gpac/network.h>
 #include <gpac/nodes_mpeg4.h>
 
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
 
 typedef struct
 {
@@ -50,6 +50,8 @@
 	FILE *src;
 	u32 file_pos, sax_max_duration;
 	Bool progressive_support;
+
+	const char *service_url;
 } CTXLoadPriv;
 
 
@@ -151,23 +153,23 @@
 	FILE *f;
 	u32 now = gf_sys_clock();
 
-	if (!priv->file_size && (now - priv->last_check_time < 1000) ) return 0;
+	if (!priv->file_size && (now - priv->last_check_time < 1000) ) return GF_FALSE;
 
-	f = gf_f64_open(priv->file_name, "rt");
-	if (!f) return 0;
-	gf_f64_seek(f, 0, SEEK_END);
-	size = gf_f64_tell(f);
-	fclose(f);
+	f = gf_fopen(priv->file_name, "rt");
+	if (!f) return GF_FALSE;
+	gf_fseek(f, 0, SEEK_END);
+	size = gf_ftell(f);
+	gf_fclose(f);
 
 	/*we MUST have a complete file for now ...*/
 	if (!priv->file_size) {
-		if (priv->last_check_size == size) return 1;
+		if (priv->last_check_size == size) return GF_TRUE;
 		priv->last_check_size = size;
 		priv->last_check_time = now;
 	} else {
-		if (size==priv->file_size) return 1;
+		if (size==priv->file_size) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -182,6 +184,7 @@
 	priv->load.is = priv->scene;
 	priv->load.scene_graph = priv->scene->graph;
 	priv->load.fileName = priv->file_name;
+	priv->load.src_url = priv->service_url;
 	priv->load.flags = GF_SM_LOAD_FOR_PLAYBACK;
 	priv->load.localPath = gf_modules_get_option((GF_BaseInterface *)plug, "General", "CacheDirectory");
 	priv->load.swf_import_flags = GF_SM_SWF_STATIC_DICT | GF_SM_SWF_QUAD_CURVE | GF_SM_SWF_SCALABLE_LINE | GF_SM_SWF_SPLIT_TIMELINE;
@@ -221,11 +224,12 @@
 	priv->nb_streams = 1;
 	priv->load_flags = 0;
 	priv->base_stream_id = esd->ESID;
+	priv->service_url = esd->service_url;
 
 
 	CTXLoad_Setup(plug);
 
-	priv->progressive_support = 0;
+	priv->progressive_support = GF_FALSE;
 	priv->sax_max_duration = 0;
 
 	ext = strrchr(priv->file_name, '.');
@@ -236,7 +240,7 @@
 	 || !stricmp(ext, "x3d") || !stricmp(ext, "x3dz")
 	 ) {
 		ext = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "Progressive");
-		priv->progressive_support = (ext && !stricmp(ext, "yes")) ? 1 : 0;
+		priv->progressive_support = (ext && !stricmp(ext, "yes")) ? GF_TRUE : GF_FALSE;
 	}
 	if (priv->progressive_support) {
 		ext = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "MaxDuration");
@@ -274,15 +278,15 @@
 {
 	u32 i, count;
 	/*no root, only one stream possible*/
-	if (!od) return 1;
+	if (!od) return GF_TRUE;
 	count = gf_list_count(od->ESDescriptors);
 	/*idem*/
-	if (!count) return 1;
+	if (!count) return GF_TRUE;
 	for (i=0; i<count; i++) {
 		GF_ESD *esd = (GF_ESD *)gf_list_get(od->ESDescriptors, i);
-		if (esd->ESID==ESID) return 1;
+		if (esd->ESID==ESID) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -306,7 +310,7 @@
 	i=0;
 	while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
 		/*all streams in root OD are handled with ESID 0 to differentiate with any animation streams*/
-		if (CTXLoad_StreamInRootOD(priv->ctx->root_od, sc->ESID)) sc->in_root_od = 1;
+		if (CTXLoad_StreamInRootOD(priv->ctx->root_od, sc->ESID)) sc->in_root_od = GF_TRUE;
 		if (!sc->timeScale) sc->timeScale = 1000;
 
 		j=0;
@@ -346,15 +350,15 @@
 		/*seek on root stream: destroy the context manager and reload it. We cannot seek on the main stream
 		because commands may have changed node attributes/children and we d'ont track the initial value*/
 		if (priv->load_flags && (priv->base_stream_id == ES_ID)) {
-			if (priv->src) fclose(priv->src);
+			if (priv->src) gf_fclose(priv->src);
 			priv->src = NULL;
 			gf_sm_load_done(&priv->load);
 			priv->file_pos = 0;
 			/*queue scene for detach*/
-			gf_term_lock_media_queue(priv->scene->root_od->term, 1);
+			gf_term_lock_media_queue(priv->scene->root_od->term, GF_TRUE);
 			priv->scene->root_od->action_type = GF_ODM_ACTION_SCENE_RECONNECT;
 			gf_list_add(priv->scene->root_od->term->media_queue, priv->scene->root_od);
-			gf_term_lock_media_queue(priv->scene->root_od->term, 0);
+			gf_term_lock_media_queue(priv->scene->root_od->term, GF_FALSE);
 
 			return CTXLoad_Setup((GF_BaseDecoder *)plug);
 		}
@@ -377,21 +381,21 @@
 			u32 entry_time;
 			char file_buf[4096+1];
 			if (!priv->src) {
-				priv->src = gf_f64_open(priv->file_name, "rb");
+				priv->src = gf_fopen(priv->file_name, "rb");
 				if (!priv->src) return GF_URL_ERROR;
 				priv->file_pos = 0;
 			}
 			priv->load.type = GF_SM_LOAD_XMTA;
 			e = GF_OK;
 			entry_time = gf_sys_clock();
-			gf_f64_seek(priv->src, priv->file_pos, SEEK_SET);
+			gf_fseek(priv->src, priv->file_pos, SEEK_SET);
 			while (1) {
 				u32 diff, nb_read;
 				nb_read = (u32) fread(file_buf, 1, 4096, priv->src);
 				file_buf[nb_read] = 0;
 				if (!nb_read) {
 					if (priv->file_pos==priv->file_size) {
-						fclose(priv->src);
+						gf_fclose(priv->src);
 						priv->src = NULL;
 						priv->load_flags = 2;
 						gf_sm_load_done(&priv->load);
@@ -400,7 +404,7 @@
 					break;
 				}
 
-				e = gf_sm_load_string(&priv->load, file_buf, 0);
+				e = gf_sm_load_string(&priv->load, file_buf, GF_FALSE);
 				priv->file_pos += nb_read;
 				if (e) break;
 				diff = gf_sys_clock() - entry_time;
@@ -472,8 +476,8 @@
 			sc->last_au_time = 0;
 		}
 
-		can_delete_com = 0;
-		if (sc->in_root_od && (priv->load_flags==2)) can_delete_com = 1;
+		can_delete_com = GF_FALSE;
+		if (sc->in_root_od && (priv->load_flags==2)) can_delete_com = GF_TRUE;
 
 		/*we're in the right stream, apply update*/
 		j=0;
@@ -532,7 +536,7 @@
 			else if (sc->streamType == GF_STREAM_OD) {
 				/*apply the commands*/
 				while (gf_list_count(au->commands)) {
-					Bool keep_com = 0;
+					Bool keep_com = GF_FALSE;
 					GF_ODCom *com = (GF_ODCom *)gf_list_get(au->commands, 0);
 					gf_list_rem(au->commands, 0);
 					switch (com->tag) {
@@ -589,16 +593,16 @@
 								}
 								continue;
 							}
- //solve url before import
- if (mux->src_url) {
- char *res_url = gf_url_concatenate(mux->src_url, mux->file_name);
- if (res_url) {
- gf_free(mux->file_name);
- mux->file_name = res_url;
- }
- gf_free(mux->src_url);
- mux->src_url = NULL;
- }
+							//solve url before import
+							if (mux->src_url) {
+								char *res_url = gf_url_concatenate(mux->src_url, mux->file_name);
+								if (res_url) {
+									gf_free(mux->file_name);
+									mux->file_name = res_url;
+								}
+								gf_free(mux->src_url);
+								mux->src_url = NULL;
+							}
 							/*text import*/
 							if (mux->textNode) {
 #ifdef GPAC_DISABLE_MEDIA_IMPORT
@@ -621,16 +625,16 @@
 
 							/*soundstreams are a bit of a pain, they may be declared before any data gets written*/
 							if (mux->delete_file) {
-								FILE *t = gf_f64_open(mux->file_name, "rb");
+								FILE *t = gf_fopen(mux->file_name, "rb");
 								if (!t) {
-									keep_com = 1;
+									keep_com = GF_TRUE;
 									gf_list_insert(odU->objectDescriptors, od, 0);
 									break;
 								}
-								fclose(t);
+								gf_fclose(t);
 							}
 							/*remap to remote URL - warning, the URL has already been resolved according to the parent path*/
-							remote = gf_malloc(sizeof(char) * (strlen("gpac://")+strlen(mux->file_name)+1) );
+							remote = (char*)gf_malloc(sizeof(char) * (strlen("gpac://")+strlen(mux->file_name)+1) );
 							strcpy(remote, "gpac://");
 							strcat(remote, mux->file_name);
 							k = od->objectDescriptorID;
@@ -793,14 +797,14 @@
 	return (GF_BaseDecoder*)tmp;
 }
 
-#endif
+#endif //defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
 
 
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
 		GF_SCENE_DECODER_INTERFACE,
 #endif
 		0
@@ -812,7 +816,7 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
 	case GF_SCENE_DECODER_INTERFACE:
 		return (GF_BaseInterface *)NewContextLoader();
 #endif
@@ -825,7 +829,7 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
 	case GF_SCENE_DECODER_INTERFACE:
 		DeleteContextLoader((GF_BaseDecoder *)ifce);
 		break;

v0.5.2.tar.gz/modules/dektec_out/Makefile -> v0.6.1.tar.gz/modules/dektec_out/Makefile Changed

@@ -1,58 +1,58 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/dektec_out
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -DGPAC_HAVE_CONFIG_H -I../../
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(ENABLE_JOYSTICK), yes)
-CFLAGS+=-DENABLE_JOYSTICK
-endif
-
-ifeq ($(ENABLE_JOYSTICK_NO_CURSOR), yes)
-CFLAGS+=-DENABLE_JOYSTICK_NO_CURSOR
-endif
-
-#common obj
-OBJS= dektec_video.o
-
-SRCS := $(OBJS:.o=.cpp) 
-
-LIB=gm_dektec_out.$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols dektec_out.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CXX) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-ifeq ($(STATICBUILD),yes)
-	$(CXX) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/gm_dektec_out-static.$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static
-endif
-
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/dektec_out
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -DGPAC_HAVE_CONFIG_H -I../../
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+ifeq ($(ENABLE_JOYSTICK), yes)
+CFLAGS+=-DENABLE_JOYSTICK
+endif
+
+ifeq ($(ENABLE_JOYSTICK_NO_CURSOR), yes)
+CFLAGS+=-DENABLE_JOYSTICK_NO_CURSOR
+endif
+
+#common obj
+OBJS= dektec_video.o
+
+SRCS := $(OBJS:.o=.cpp) 
+
+LIB=gm_dektec_out$(DYN_LIB_SUFFIX)
+ifeq ($(CONFIG_WIN32),yes)
+#LDFLAGS+=-export-symbols dektec_out.def 
+endif
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CXX) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
+ifeq ($(STATICBUILD),yes)
+	$(CXX) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/gm_dektec_out-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static
+endif
+
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

v0.5.2.tar.gz/modules/dektec_out/dektec_video.cpp -> v0.6.1.tar.gz/modules/dektec_out/dektec_video.cpp Changed

@@ -1,348 +1,361 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau @ GPAC Licensing
- *					All rights reserved
- *
- * This file is part of GPAC / Dektec SDI video render module
- *
- * GPAC 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, or (at your option)
- * any later version.
- *
- * GPAC 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 this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#define _DTAPI_DISABLE_AUTO_LINK
-#include <DTAPI.h>
-
-extern "C" {
-
-	/*driver interfaces*/
-#include <gpac/modules/video_out.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/constants.h>
-#include <gpac/setup.h>
-
-
-//#define DEKTEC_DUMP_UYVY
-
-//TODO: use gf_stretch_bits and get values from config file
-#define DWIDTH 1920
-#define DHEIGHT 1080
-#define DFORMAT DTAPI_IOCONFIG_1080I50
-#define DNUMFIELDS 2
-
-
-	typedef struct
-	{
-		char *pixels;
-		unsigned char *pixels_UYVY;
-		u32 width, height, pixel_format, bpp;
-
-		DtDevice *dvc;
-		DtFrameBuffer *dtf;
-		bool isSending;
-		s64 frameNum;
-	} DtContext;
-
-//FIXME: referenced from dx
-	void dx_copy_pixels(GF_VideoSurface *dst_s, const GF_VideoSurface *src_s, const GF_Window *src_wnd);
-
-	static GF_Err Dektec_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-		GF_VideoSurface temp_surf;
-		dx_copy_pixels(&temp_surf, video_src, src_wnd);
-		memset(&temp_surf, 0, sizeof(GF_VideoSurface));
-		temp_surf.pixel_format = GF_PIXEL_UYVY;
-		temp_surf.video_buffer = (char*)dtc->pixels_UYVY;
-		temp_surf.pitch_y = dtc->width*2;
-		dx_copy_pixels(&temp_surf, video_src, src_wnd);
-		return GF_OK;
-	}
-
-	static GF_Err Dektec_Flush(GF_VideoOutput *dr, GF_Window *dest)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-		DtFrameBuffer *dtf = dtc->dtf;
-		DTAPI_RESULT res;
-		if (!dtc->isSending) {
-			// Start transmission
-			res = dtf->Start();
-			if (res != DTAPI_OK) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[Dektec Out] Can't start transmission: %s.\n", DtapiResult2Str(res)));
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Transmission started.\n"));
-				dtc->isSending = true;
-			}
-		}
-		s64 firstSafeFrame=-1, lastSafeFrame=-1;
-		res = dtf->WaitFrame(firstSafeFrame, lastSafeFrame);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't get the next frame: %s\n", DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		if (dtc->frameNum == -1)
-			dtc->frameNum = firstSafeFrame;
-
-		int numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
-		res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY, numWritten, DTAPI_SDI_FIELD1, DTAPI_SDI_8B, 1, numLines);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-		numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
-		res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY+numWritten, numWritten, DTAPI_SDI_FIELD2, DTAPI_SDI_8B, 1, numLines);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Written frame "LLD" [(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)]\n", dtc->frameNum, DWIDTH, DHEIGHT,
-		 dtc->pixels_UYVY[0], dtc->pixels_UYVY[1], dtc->pixels_UYVY[2], dtc->pixels_UYVY[3], dtc->pixels_UYVY[4], dtc->pixels_UYVY[5], dtc->pixels_UYVY[6], dtc->pixels_UYVY[7],
-																				 dtc->pixels_UYVY[8], dtc->pixels_UYVY[9], dtc->pixels_UYVY[10], dtc->pixels_UYVY[11], dtc->pixels_UYVY[12], dtc->pixels_UYVY[13], dtc->pixels_UYVY[14], dtc->pixels_UYVY[15]));
-
-		// commit HANC/VANC - mandatory to form a valid frame
-		res = dtf->AncCommit(dtc->frameNum);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write VANC for frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		dtc->frameNum++;
-
-#ifdef DEKTEC_DUMP_UYVY
-		char szName[1024];
-		sprintf(szName, "test.uyvy");
-		FILE *f = fopen(szName, "ab");
-		fwrite(dtc->pixels_UYVY, dtc->width*dtc->height*2, 1, f);
-		fclose(f);
-#endif
-		return GF_OK;
-	}
-
-	static GF_Err Dektec_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-
-		if (do_lock) {
-			if (!vi) return GF_BAD_PARAM;
-			memset(vi, 0, sizeof(GF_VideoSurface));
-			vi->height = dtc->height;
-			vi->width = dtc->width;
-			vi->video_buffer = dtc->pixels;
-			vi->pitch_x = dtc->bpp;
-			vi->pitch_y = dtc->bpp * vi->width;/*the correct value here is dtc->pixel_format, but the soft raster only supports RGB*/
-			/*TODO: allocate a real RGB buffer, otherwise we will crash when displaying composed objects*/
-			vi->pixel_format = GF_PIXEL_RGB_24;
-		}
-		return GF_OK;
-	}
-
-	static void Dektec_Shutdown(GF_VideoOutput *dr)
-	{
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Shutdown\n"));
-		DtContext *dtc = (DtContext*)dr->opaque;
-		DtFrameBuffer *dtf = dtc->dtf;
-		DTAPI_RESULT res = dtf->Start(false);
-		if (res != DTAPI_OK)
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't stop transmission: %s\n", DtapiResult2Str(res)));
-		dtf->Detach();
-		dtc->dvc->Detach();
-		dtc->isSending = false;
-	}
-
-	static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
-	{
-		DtFrameBuffer *dtf = (DtFrameBuffer*)(((DtContext*)dr->opaque)->dtf);
-
-		if (evt) {
-			switch (evt->type) {
-			case GF_EVENT_VIDEO_SETUP:
-				//FIXME: we do not know how to resize
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] resize (%ux%u) received.\n", evt->size.width, evt->size.height));
-				//Dektec_Shutdown(dr);
-				//Dektec_attach_start(dr);
-				if (evt->size.width != DWIDTH || evt->size.height != DHEIGHT) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Bad resize (%ux%u) received. Expected %dx%d.\n", evt->size.width, evt->size.height, DWIDTH, DHEIGHT));
-					//return GF_BAD_PARAM;
-					if (evt->size.width*evt->size.height > DWIDTH*DHEIGHT)
-						return GF_BAD_PARAM;
-				}
-				return GF_OK;
-			}
-		}
-		return GF_OK;
-	}
-
-	static GF_Err Dektec_resize(GF_VideoOutput *dr, u32 w, u32 h)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-		if (dtc->pixels) gf_free(dtc->pixels);
-		if (dtc->pixels_UYVY) gf_free(dtc->pixels_UYVY);
-		dtc->width = w;
-		dtc->height = h;
-		dtc->pixels = (char*)gf_malloc(dtc->bpp * w * h);
-		if (!dtc->pixels) return GF_OUT_OF_MEM;
-		memset(dtc->pixels, 0, dtc->bpp * w * h);
-		dtc->pixels_UYVY = (unsigned char*)gf_malloc(2 * w * h);
-		if (!dtc->pixels_UYVY) return GF_OUT_OF_MEM;
-		memset(dtc->pixels_UYVY, 0, 2 * w * h);
-		return GF_OK;
-	}
-
-	GF_Err Dektec_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
-	{
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Setup\n"));
-		DtContext *dtc = (DtContext*)dr->opaque;
-		dtc->bpp = 3; //needed because lock_buffer expects RGB
-		dtc->pixel_format = GF_PIXEL_YV12;
-		dtc->isSending = false;
-		Dektec_resize(dr, DWIDTH, DHEIGHT);
-
-		int port = 1;
-		const char *opt;
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
-		if (opt) {
-			port = atoi(opt);
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] No port specified, using default port: %d\n", port));
-		}
-
-		// Attach device and output channel objects to hardware
-		DtDevice *dvc = dtc->dvc;
-		DtFrameBuffer *dtf = dtc->dtf;
-		DTAPI_RESULT res;
-		res = dvc->AttachToType(2154);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] No DTA-2154 in system: %s\n", DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		res = dtf->AttachToOutput(dvc, port, 0);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't attach to port %d: %s\n", port, DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		int IoStdValue=-1, IoStdSubValue=-1;
-		res = DtapiVidStd2IoStd(DFORMAT, IoStdValue, IoStdSubValue);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Unknown VidStd: %s\n", DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		res = dtf->SetIoConfig(DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
-		if (res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config: %s\n", DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-
-		dtc->frameNum = -1;
-
-		return GF_OK;
-	}
-
-	GF_VideoOutput *NewDektecVideoOutput()
-	{
-		GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-		memset(driv, 0, sizeof(GF_VideoOutput));
-		GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Dektec Video Output", "gpac distribution")
-
-		DtDevice *dvc = new DtDevice;
-		DtFrameBuffer *dtf = new DtFrameBuffer;
-		if (!dtf || !dvc) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] DTA API couldn't be initialized.\n"));
-			delete dvc;
-			delete dtf;
-			gf_free(driv);
-			return NULL;
-		}
-
-		DtContext *dtc = new DtContext;
-		memset(dtc, 0, sizeof(DtContext));
-		dtc->dvc = dvc;
-		dtc->dtf = dtf;
-		driv->opaque = (void*)dtc;
-
-		driv->Flush = Dektec_Flush;
-		driv->LockBackBuffer = Dektec_LockBackBuffer;
-		driv->Setup = Dektec_Setup;
-		driv->Shutdown = Dektec_Shutdown;
-		driv->ProcessEvent = Dektec_ProcessEvent;
-		driv->Blit = Dektec_Blit;
-
-		driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_YUV;
-
-		return driv;
-	}
-
-	void DeleteDektecVideoOutput(void *ifce)
-	{
-		GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-		DtContext *dtc = (DtContext*)driv->opaque;
-		gf_free(dtc->pixels);
-		gf_free(dtc->pixels_UYVY);
-		delete(dtc->dtf);
-		delete(dtc->dvc);
-		delete(dtc);
-		gf_free(driv);
-	}
-
-
-#ifndef GPAC_STANDALONE_RENDER_2D
-
-	/*interface query*/
-	GPAC_MODULE_EXPORT
-	const u32 *QueryInterfaces()
-	{
-		static u32 si [] = {
-			GF_VIDEO_OUTPUT_INTERFACE,
-			0
-		};
-		return si;
-	}
-
-	/*interface create*/
-	GPAC_MODULE_EXPORT
-	GF_BaseInterface *LoadInterface(u32 InterfaceType)
-	{
-		if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewDektecVideoOutput();
-		return NULL;
-	}
-
-	/*interface destroy*/
-	GPAC_MODULE_EXPORT
-	void ShutdownInterface(GF_BaseInterface *ifce)
-	{
-		switch (ifce->InterfaceType) {
-		case GF_VIDEO_OUTPUT_INTERFACE:
-			DeleteDektecVideoOutput((GF_VideoOutput *)ifce);
-			break;
-		}
-	}
-
-
-	GPAC_MODULE_STATIC_DECLARATION( dektec_out )
-
-#endif
-
-} /* extern "C" */
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau @ GPAC Licensing
+ *					All rights reserved
+ *
+ * This file is part of GPAC / Dektec SDI video render module
+ *
+ * GPAC 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, or (at your option)
+ * any later version.
+ *
+ * GPAC 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 this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#define _DTAPI_DISABLE_AUTO_LINK
+#include <DTAPI.h>
+
+extern "C" {
+
+	/*driver interfaces*/
+#include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/constants.h>
+#include <gpac/setup.h>
+
+
+//#define DEKTEC_DUMP_UYVY
+#ifdef NDEBUG
+#define tru 1
+#else
+#define tru 0
+#endif
+
+//TODO: use gf_stretch_bits and get values from config file
+#if 1
+#define DWIDTH 1280
+#define DHEIGHT 720
+#define DFORMAT DTAPI_IOCONFIG_720P59_94
+#define DNUMFIELDS 1
+#else
+#define DWIDTH 1920
+#define DHEIGHT 1080
+#define DFORMAT DTAPI_IOCONFIG_1080I50
+#define DNUMFIELDS 2
+#endif
+
+	typedef struct
+	{
+		char *pixels;
+		unsigned char *pixels_UYVY;
+		u32 width, height, pixel_format, bpp;
+
+		DtDevice *dvc;
+		DtFrameBuffer *dtf;
+		bool isSending;
+		s64 frameNum;
+	} DtContext;
+
+
+	void dx_copy_pixels(GF_VideoSurface *dst_s, const GF_VideoSurface *src_s, const GF_Window *src_wnd); //FIXME: referenced from dx
+	static GF_Err Dektec_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+		GF_VideoSurface temp_surf;
+		memset(&temp_surf, 0, sizeof(GF_VideoSurface));
+		temp_surf.pixel_format = GF_PIXEL_UYVY;
+		temp_surf.video_buffer = (char*)dtc->pixels_UYVY;
+		temp_surf.pitch_y = dtc->width*2;
+		dx_copy_pixels(&temp_surf, video_src, src_wnd);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Blit\n"));
+		return GF_OK;
+	}
+
+	static GF_Err Dektec_Flush(GF_VideoOutput *dr, GF_Window *dest)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+		DtFrameBuffer *dtf = dtc->dtf;
+		DTAPI_RESULT res;
+		if (dest->w != DWIDTH || dest->h != DHEIGHT) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Discard data with wrong dimensions\n"));
+			if (tru) return GF_OK;
+		}
+		if (!dtc->isSending) {
+			// Start transmission
+			res = dtf->Start();
+			if (tru && res != DTAPI_OK) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[Dektec Out] Can't start transmission: %s.\n", DtapiResult2Str(res)));
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Transmission started.\n"));
+				dtc->isSending = true;
+			}
+		}
+		s64 firstSafeFrame=-1, lastSafeFrame=-1;
+		res = dtf->WaitFrame(firstSafeFrame, lastSafeFrame);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't get the next frame: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		if (dtc->frameNum == -1)
+			dtc->frameNum = firstSafeFrame;
+
+		int numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
+		res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY, numWritten, DTAPI_SDI_FIELD1, DTAPI_SDI_8B, 1, numLines);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+		if (DNUMFIELDS > 1) {
+			assert(DNUMFIELDS == 2);
+			numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
+			res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY+numWritten, numWritten, DTAPI_SDI_FIELD2, DTAPI_SDI_8B, 1, numLines);
+			if (tru && res != DTAPI_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
+				return GF_BAD_PARAM;
+			}
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Written frame "LLD" [(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)]\n", dtc->frameNum, DWIDTH, DHEIGHT,
+		 dtc->pixels_UYVY[0], dtc->pixels_UYVY[1], dtc->pixels_UYVY[2], dtc->pixels_UYVY[3], dtc->pixels_UYVY[4], dtc->pixels_UYVY[5], dtc->pixels_UYVY[6], dtc->pixels_UYVY[7],
+		 dtc->pixels_UYVY[8], dtc->pixels_UYVY[9], dtc->pixels_UYVY[10], dtc->pixels_UYVY[11], dtc->pixels_UYVY[12], dtc->pixels_UYVY[13], dtc->pixels_UYVY[14], dtc->pixels_UYVY[15]));
+
+		// commit HANC/VANC - mandatory to form a valid frame
+		res = dtf->AncCommit(dtc->frameNum);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write VANC for frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		dtc->frameNum++;
+
+#ifdef DEKTEC_DUMP_UYVY
+		char szName[1024];
+		sprintf(szName, "test.uyvy");
+		FILE *f = fopen(szName, "ab");
+		fwrite(dtc->pixels_UYVY, dtc->width*dtc->height*2, 1, f);
+		fclose(f);
+#endif
+		return GF_OK;
+	}
+
+	static GF_Err Dektec_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+
+		if (do_lock) {
+			if (!vi) return GF_BAD_PARAM;
+			memset(vi, 0, sizeof(GF_VideoSurface));
+			vi->height = dtc->height;
+			vi->width = dtc->width;
+			vi->video_buffer = dtc->pixels;
+			vi->pitch_x = dtc->bpp;
+			vi->pitch_y = dtc->bpp * vi->width;/*the correct value here is dtc->pixel_format, but the soft raster only supports RGB*/
+			vi->pixel_format = GF_PIXEL_RGB_24;
+		}
+		return GF_OK;
+	}
+
+	static void Dektec_Shutdown(GF_VideoOutput *dr)
+	{
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Shutdown\n"));
+		DtContext *dtc = (DtContext*)dr->opaque;
+		DtFrameBuffer *dtf = dtc->dtf;
+		DTAPI_RESULT res = dtf->Start(false);
+		if (tru && res != DTAPI_OK)
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't stop transmission: %s\n", DtapiResult2Str(res)));
+		dtf->Detach();
+		dtc->dvc->Detach();
+		dtc->isSending = false;
+	}
+
+	static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
+	{
+		DtFrameBuffer *dtf = (DtFrameBuffer*)(((DtContext*)dr->opaque)->dtf);
+
+		if (evt) {
+			switch (evt->type) {
+			case GF_EVENT_VIDEO_SETUP:
+				//FIXME: we do not know how to resize - Dektec_Shutdown(dr); Dektec_attach_start(dr);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] resize (%ux%u) received.\n", evt->size.width, evt->size.height));
+				if (evt->size.width != DWIDTH || evt->size.height != DHEIGHT) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Bad resize (%ux%u) received. Expected %dx%d.\n", evt->size.width, evt->size.height, DWIDTH, DHEIGHT));
+					if (evt->size.width*evt->size.height > DWIDTH*DHEIGHT) //FIXME
+						return GF_BAD_PARAM;
+				}
+				return GF_OK;
+			}
+		}
+		return GF_OK;
+	}
+
+	static GF_Err Dektec_resize(GF_VideoOutput *dr, u32 w, u32 h)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+		if (dtc->pixels) gf_free(dtc->pixels);
+		if (dtc->pixels_UYVY) gf_free(dtc->pixels_UYVY);
+		dtc->width = w;
+		dtc->height = h;
+		dtc->pixels = (char*)gf_malloc(dtc->bpp * w * h);
+		if (!dtc->pixels) return GF_OUT_OF_MEM;
+		memset(dtc->pixels, 0, dtc->bpp * w * h);
+		dtc->pixels_UYVY = (unsigned char*)gf_malloc(2 * w * h);
+		if (!dtc->pixels_UYVY) return GF_OUT_OF_MEM;
+		memset(dtc->pixels_UYVY, 0, 2 * w * h);
+		return GF_OK;
+	}
+
+	GF_Err Dektec_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
+	{
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Setup\n"));
+		DtContext *dtc = (DtContext*)dr->opaque;
+		dtc->bpp = 3; //lock_buffer expects RGB
+		dtc->pixel_format = GF_PIXEL_YV12;
+		dtc->isSending = false;
+		Dektec_resize(dr, DWIDTH, DHEIGHT);
+
+		int port = 1;
+		const char *opt;
+		opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
+		if (opt) {
+			port = atoi(opt);
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Using port %d (%s)\n", port, opt));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] No port specified, using default port: %d\n", port));
+		}
+
+		DtDevice *dvc = dtc->dvc;
+		DtFrameBuffer *dtf = dtc->dtf;
+		DTAPI_RESULT res;
+		res = dvc->AttachToType(2154);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] No DTA-2154 in system: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		res = dtf->AttachToOutput(dvc, port, 0);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't attach to port %d: %s\n", port, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		int IoStdValue=-1, IoStdSubValue=-1;
+		res = DtapiVidStd2IoStd(DFORMAT, IoStdValue, IoStdSubValue);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Unknown VidStd: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		res = dtf->SetIoConfig(DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
+		if (tru && res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		dtc->frameNum = -1;
+
+		return GF_OK;
+	}
+
+	GF_VideoOutput *NewDektecVideoOutput()
+	{
+		GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
+		memset(driv, 0, sizeof(GF_VideoOutput));
+		GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Dektec Video Output", "gpac distribution")
+
+		DtDevice *dvc = new DtDevice;
+		DtFrameBuffer *dtf = new DtFrameBuffer;
+		if (!dtf || !dvc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] DTA API couldn't be initialized.\n"));
+			delete dvc;
+			delete dtf;
+			gf_free(driv);
+			return NULL;
+		}
+
+		DtContext *dtc = new DtContext;
+		memset(dtc, 0, sizeof(DtContext));
+		dtc->dvc = dvc;
+		dtc->dtf = dtf;
+		driv->opaque = (void*)dtc;
+
+		driv->Flush = Dektec_Flush;
+		driv->LockBackBuffer = Dektec_LockBackBuffer;
+		driv->Setup = Dektec_Setup;
+		driv->Shutdown = Dektec_Shutdown;
+		driv->ProcessEvent = Dektec_ProcessEvent;
+		driv->Blit = Dektec_Blit;
+
+		driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_YUV;
+
+		return driv;
+	}
+
+	void DeleteDektecVideoOutput(void *ifce)
+	{
+		GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
+		DtContext *dtc = (DtContext*)driv->opaque;
+		gf_free(dtc->pixels);
+		gf_free(dtc->pixels_UYVY);
+		delete(dtc->dtf);
+		delete(dtc->dvc);
+		delete(dtc);
+		gf_free(driv);
+	}
+
+
+#ifndef GPAC_STANDALONE_RENDER_2D
+
+	/*interface query*/
+	GPAC_MODULE_EXPORT
+	const u32 *QueryInterfaces()
+	{
+		static u32 si [] = {
+			GF_VIDEO_OUTPUT_INTERFACE,
+			0
+		};
+		return si;
+	}
+
+	/*interface create*/
+	GPAC_MODULE_EXPORT
+	GF_BaseInterface *LoadInterface(u32 InterfaceType)
+	{
+		if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewDektecVideoOutput();
+		return NULL;
+	}
+
+	/*interface destroy*/
+	GPAC_MODULE_EXPORT
+	void ShutdownInterface(GF_BaseInterface *ifce)
+	{
+		switch (ifce->InterfaceType) {
+		case GF_VIDEO_OUTPUT_INTERFACE:
+			DeleteDektecVideoOutput((GF_VideoOutput *)ifce);
+			break;
+		}
+	}
+
+
+	GPAC_MODULE_STATIC_DECLARATION( dektec_out )
+
+#endif
+
+} /* extern "C" */

v0.5.2.tar.gz/modules/demo_is/Makefile -> v0.6.1.tar.gz/modules/demo_is/Makefile Changed

v0.5.2.tar.gz/modules/directfb_out/Makefile -> v0.6.1.tar.gz/modules/directfb_out/Makefile Changed

v0.5.2.tar.gz/modules/droid_cam/droid_cam.c -> v0.6.1.tar.gz/modules/droid_cam/droid_cam.c Changed

@@ -56,6 +56,7 @@
 static jmethodID getImageFormat;
 static jmethodID getImageHeight;
 static jmethodID getImageWidth;
+static jmethodID getBitsPerPixel;
 
 #ifndef GPAC_STATIC_MODULES
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
@@ -146,6 +147,13 @@
 		return -1;
 	}
 
+	getBitsPerPixel = (*env)->GetMethodID(env, camCtrlClass, "getBitsPerPixel", "()I");
+	if (getBitsPerPixel == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function getBitsPerPixel not found");
+		return -1;
+	}
+
 	return JNI_VERSION_1_2;
 }
 
@@ -182,9 +190,9 @@
 //----------------------------------------------------------------------
 
 
-#define CAM_PIXEL_FORMAT GF_PIXEL_NV21
+//#define CAM_PIXEL_FORMAT GF_PIXEL_NV21
 //GF_PIXEL_RGB_32
-#define CAM_PIXEL_SIZE 1.5f
+//#define CAM_PIXEL_SIZE 1.5f
 //4
 #define CAM_WIDTH 640
 #define CAM_HEIGHT 480
@@ -224,6 +232,7 @@
 	jmethodID getImageFormat;
 	jmethodID getImageHeight;
 	jmethodID getImageWidth;
+	jmethodID getBitsPerPixel;
 
 } ISOMReader;
 
@@ -242,7 +251,7 @@
 
 void unloadCameraControler(ISOMReader *read)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] unloadCameraControler: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] unloadCameraControler: %d\n", gf_th_id()));
 	if ( read->isAttached )
 	{
 		//(*rc->env)->PopLocalFrame(rc->env, NULL);
@@ -263,13 +272,13 @@
 	JNIEnv* env = NULL;
 	jint res = 0;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] loadCameraControler: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] loadCameraControler: %d\n", gf_th_id()));
 
 	// Get the JNI interface pointer
 	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
 	if ( res == JNI_EDETACHED )
 	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
 		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
 		{
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
@@ -295,6 +304,7 @@
 	read->getImageFormat = getImageFormat;
 	read->getImageHeight = getImageHeight;
 	read->getImageWidth = getImageWidth;
+	read->getBitsPerPixel = getBitsPerPixel;
 
 	// Create the object.
 	read->camCtrlObj = (*env)->NewObject(env, read->camCtrlClass, read->cid);
@@ -311,7 +321,7 @@
 	if (!plug || !plug->priv || !serv) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectService: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectService: %d\n", gf_th_id()));
 
 	read->input = plug;
 	read->service = serv;
@@ -322,6 +332,8 @@
 
 	loadCameraControler(read);
 
+	camStartCamera(read);
+
 	/*reply to user*/
 	gf_service_connect_ack(serv, NULL, GF_OK);
 	//if (read->no_service_desc) isor_declare_objects(read);
@@ -336,7 +348,7 @@
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_CloseService: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_CloseService: %d\n", gf_th_id()));
 
 	reply = GF_OK;
 
@@ -351,6 +363,8 @@
 
 u32 getWidth(ISOMReader *read);
 u32 getHeight(ISOMReader *read);
+u32 getFormat(ISOMReader *read);
+u32 getBitsPerPix(ISOMReader *read);
 
 static GF_Descriptor *CAM_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
 {
@@ -383,11 +397,11 @@
 		read->width = getWidth(read);
 		read->height = getHeight(read);
 
-		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+		gf_bs_write_u32(bs, getFormat(read)); // fourcc
 		gf_bs_write_u16(bs, read->width); // width
 		gf_bs_write_u16(bs, read->height); // height
-		gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
-		gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
+		gf_bs_write_u32(bs, read->width * read->height * getBitsPerPix(read) / 8); // framesize
+		gf_bs_write_u32(bs, read->width); // stride
 
 		gf_bs_align(bs);
 		gf_bs_get_content(bs, &buf, &buf_size);
@@ -413,7 +427,7 @@
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectChannel: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectChannel: %d\n", gf_th_id()));
 
 	e = GF_OK;
 	if (upstream) {
@@ -422,8 +436,6 @@
 
 	read->channel = channel;
 
-	camStartCamera(read);
-
 	gf_service_connect_ack(read->service, channel, e);
 	return e;
 }
@@ -435,7 +447,7 @@
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_DisconnectChannel: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_DisconnectChannel: %d\n", gf_th_id()));
 
 	e = GF_OK;
 
@@ -445,53 +457,6 @@
 	return e;
 }
 
-int* decodeYUV420SP( char* yuv420sp, int width, int height)
-{
-	int frameSize = width * height;
-	int j, yp, uvp, i, y, y1192, r, g, b, u, v;
-	int ti, tj;
-
-	int* rgb = (int*)gf_malloc(width*height*4);
-	for (j = 0, yp = 0, tj=height-1; j < height; j++, tj--)
-	{
-		uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
-		for (i = 0, ti=0; i < width; i++, yp++, ti+=width)
-		{
-			y = (0xff & ((int) yuv420sp[yp])) - 16;
-			if (y < 0) y = 0;
-			if ((i & 1) == 0)
-			{
-				v = (0xff & yuv420sp[uvp++]) - 128;
-				u = (0xff & yuv420sp[uvp++]) - 128;
-			}
-
-			y1192 = 1192 * y;
-			r = (y1192 + 1634 * v);
-			g = (y1192 - 833 * v - 400 * u);
-			b = (y1192 + 2066 * u);
-
-			if (r < 0)
-				r = 0;
-			else if (r > 262143)
-				r = 262143;
-			if (g < 0)
-				g = 0;
-			else if (g > 262143)
-				g = 262143;
-			if (b < 0)
-				b = 0;
-			else if (b > 262143)
-				b = 262143;
-
-			rgb[yp] = 0xff000000 | ((r << 6) & 0xff0000)
-			 | ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
-//			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
-//					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
-		}
-	}
-	return rgb;
-}
-
 void Java_com_gpac_Osmo4_Preview_processFrameBuf( JNIEnv* env, jobject thiz, jbyteArray arr)
 {
 	u8* data;
@@ -542,7 +507,7 @@
 	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
 	if ( res == JNI_EDETACHED )
 	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
 		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
 		{
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
@@ -565,7 +530,7 @@
 	JNIEnv* env = NULL;
 	jboolean isPortrait = JNI_FALSE;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
 
 	// Get the JNI interface pointer
 	env = read->env;
@@ -575,14 +540,14 @@
 
 void camStopCamera(ISOMReader *read)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] stopCamera: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] stopCamera: %d\n", gf_th_id()));
 
 	CallCamMethod(read, read->stopCamera);
 }
 
 void pauseCamera(ISOMReader *read)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] pauseCamera: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] pauseCamera: %d\n", gf_th_id()));
 
 	read->started = 0;
 	CallCamMethod(read, read->stopProcessing);
@@ -590,7 +555,7 @@
 
 void resumeCamera(ISOMReader *read)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] resumeCamera: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] resumeCamera: %d\n", gf_th_id()));
 
 	read->started = 1;
 	CallCamMethod(read, read->startProcessing);
@@ -600,7 +565,7 @@
 {
 	JNIEnv* env = NULL;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] getWidth: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getWidth: %d\n", gf_th_id()));
 
 	// Get the JNI interface pointer
 	env = read->env;
@@ -612,7 +577,7 @@
 {
 	JNIEnv* env = NULL;
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] getHeight: %d\n", gf_th_id()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getHeight: %d\n", gf_th_id()));
 
 	// Get the JNI interface pointer
 	env = read->env;
@@ -620,6 +585,39 @@
 	return (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getImageHeight);
 }
 
+u32 getFormat(ISOMReader *read)
+{
+	JNIEnv* env = NULL;
+	u32 pixel_format;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getFormat: %d\n", gf_th_id()));
+
+	// Get the JNI interface pointer
+	env = read->env;
+
+	pixel_format = (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getImageFormat);
+	switch (pixel_format) {
+	case 17: //NV21
+		return GF_PIXEL_NV21;
+	case 842094169: //YV12
+		return GF_PIXEL_YV12;
+	default:
+		return 0; //should never be here
+	}
+}
+
+u32 getBitsPerPix(ISOMReader *read)
+{
+	JNIEnv* env = NULL;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getBitsPerPix: %d\n", gf_th_id()));
+
+	// Get the JNI interface pointer
+	env = read->env;
+
+	return (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getBitsPerPixel);
+}
+
 GF_Err CAM_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
 	ISOMReader *read;
@@ -652,31 +650,6 @@
 	/*nothing to do on MP4 for channel config*/
 	case GF_NET_CHAN_CONFIG:
 		return GF_OK;
-	case GF_NET_CHAN_GET_PIXEL_AR:
-		return 1<<16;//gf_isom_get_pixel_aspect_ratio(read->mov, ch->track, 1, &com->par.hSpacing, &com->par.vSpacing);
-	case GF_NET_CHAN_GET_DSI:
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
-		/*it may happen that there are conflicting config when using ESD URLs...*/
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-		read->width = getWidth(read);
-		read->height = getHeight(read);
-
-		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
-		gf_bs_write_u16(bs, read->width); // width
-		gf_bs_write_u16(bs, read->height); // height
-		gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
-		gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
-
-		gf_bs_align(bs);
-		gf_bs_get_content(bs, &buf, &buf_size);
-		gf_bs_del(bs);
-
-		com->get_dsi.dsi = buf;
-		com->get_dsi.dsi_len = buf_size;
-		return GF_OK;
-	}
 	}
 	return GF_NOT_SUPPORTED;
 }

v0.5.2.tar.gz/modules/droid_out/droid_vout.c -> v0.6.1.tar.gz/modules/droid_out/droid_vout.c Changed

@@ -30,14 +30,13 @@
 
 #include <gpac/setup.h>
 
+#ifdef GPAC_USE_GLES2
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#else
 #include <GLES/gl.h>
 #include <GLES/glext.h>
-
-#include <android/log.h>
-
-#define TAG "DROID_VIDEO"
-
-#define LOG __android_log_print
+#endif
 
 #ifdef PI
 #undef PI
@@ -64,6 +63,14 @@
 
 	u8 draw_texture;
 	u8 non_power_two;
+
+	Bool fullscreen;
+
+	//Functions specific to OpenGL ES2
+#ifdef GPAC_USE_GLES2
+	GLuint base_vertex, base_fragment, base_program;
+	GF_Matrix identity, ortho;
+#endif
 } AndroidContext;
 
 
@@ -72,39 +79,255 @@
 
 #define RAWCTX	AndroidContext *rc = (AndroidContext *)dr->opaque
 
-//#define GLES_FRAMEBUFFER_TEST
 
-#ifdef GLES_FRAMEBUFFER_TEST
-#warning "Using FrameBuffer"
+
+//Functions specific to OpenGL ES2
+#ifdef GPAC_USE_GLES2
+
+#define GF_TRUE 1
+#define GF_FALSE 0
+
+
+//we custom-define these instead of importing gl_inc.h
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_LINK_STATUS 0x8B82
+#define GL_VERTEX_SHADER 0x8B31
+
+
+
+static char *glsl_vertex = "precision mediump float;\
+	attribute vec4 gfVertex;\
+	attribute vec4 gfTexCoord;\
+	varying vec2 TexCoord;\
+	uniform mat4 gfModelViewMatrix;\
+	uniform mat4 gfProjectionMatrix;\
+	void main(void){\
+		vec4 gfEye;\
+		gfEye = gfModelViewMatrix * gfVertex;\
+		TexCoord = vec2(gfTexCoord);\
+		gl_Position = gfProjectionMatrix * gfEye;\
+	}";
+
+static char *glsl_fragment = "precision mediump float;\
+	varying vec2 TexCoord;\
+	uniform sampler2D img;\
+	void main(void){\
+		gl_FragColor = texture2D(img, TexCoord);\
+	}";
+
+static inline void gl_check_error()
+{
+	s32 res = glGetError();
+	if (res) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE,
+		 ("GL Error %d file %s line %d\n", res,
+				__FILE__, __LINE__));
+	}
+}
+
+
+static GLint gf_glGetUniformLocation(u32 glsl_program, const char *uniform_name)
+{
+	GLint loc = glGetUniformLocation(glsl_program, uniform_name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find uniform \"%s\" in GLSL program\n", uniform_name));
+	}
+	return loc;
+}
+
+static GLint gf_glGetAttribLocation(u32 glsl_program, const char *attrib_name)
+{
+	GLint loc = glGetAttribLocation(glsl_program, attrib_name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find attrib \"%s\" in GLSL program\n", attrib_name));
+	}
+	return loc;
+}
+
+//modified version of visual_3d_compile_shader function
+Bool compile_shader(u32 shader_id, const char *name, const char *source) {
+	GLint blen = 0;
+	GLsizei slen = 0;
+	u32 len;
+	GLint is_compiled = 0;
+
+
+	if(!source || !shader_id) return 0;
+	len = (u32) strlen(source);
+	glShaderSource(shader_id, 1, &source, &len);
+	glCompileShader(shader_id);
+
+	glGetShaderiv(shader_id, GL_COMPILE_STATUS, &is_compiled);
+	if (is_compiled == 1) return GF_TRUE;
+
+	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
+	if (blen > 1) {
+		char* compiler_log = (char*) gf_malloc(blen);
+		glGetShaderInfoLog(shader_id, blen, &slen, compiler_log);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile %s shader: %s\n", name, compiler_log));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[GLSL] ***** faulty shader code ****\n%s\n**********************\n", source));
+		gf_free (compiler_log);
+		return GF_FALSE;
+	}
+
+	return GF_TRUE;
+}
+
+
+static Bool initGLES2(AndroidContext *rc) {
+
+
+//PRINT OpengGL INFO
+	char* ext;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android InitGLES2"));
+
+	ext = (char*)glGetString(GL_VENDOR);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Vendor: %s", ext));
+
+	ext = (char*)glGetString(GL_RENDERER);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Renderer: %s", ext));
+
+	ext = (char*)glGetString(GL_VERSION);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Version: %s", ext));
+
+	ext = (char*)glGetString(GL_EXTENSIONS);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Extensions: %s", ext));
+
+
+
+//Generic GL setup
+	/* Set the background black */
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+	/* Depth buffer setup */
+	glClearDepthf(1.0f);
+
+	/* Enables Depth Testing */
+	glEnable(GL_DEPTH_TEST);
+
+	/* The Type Of Depth Test To Do */
+	glDepthFunc(GL_LEQUAL);
+
+
+//Shaders setup
+	Bool res = GF_FALSE;
+	GLint linked;
+
+	gl_check_error();
+	gf_mx_init(rc->identity);
+	rc->base_program = glCreateProgram();
+	rc->base_vertex = glCreateShader(GL_VERTEX_SHADER);
+	rc->base_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Compiling shaders"));
+	res = compile_shader(rc->base_vertex, "vertex", glsl_vertex);
+	if(!res) return GF_FALSE;
+	res = compile_shader(rc->base_fragment, "fragment", glsl_fragment);
+	if(!res) return GF_FALSE;
+
+	glAttachShader(rc->base_program, rc->base_vertex);
+	glAttachShader(rc->base_program, rc->base_fragment);
+	glLinkProgram(rc->base_program);
+
+	glGetProgramiv(rc->base_program, GL_LINK_STATUS, &linked);
+	if (!linked) {
+		int i32CharsWritten, i32InfoLogLength;
+		char pszInfoLog[2048];
+		glGetProgramiv(rc->base_program, GL_INFO_LOG_LENGTH, &i32InfoLogLength);
+		glGetProgramInfoLog(rc->base_program, i32InfoLogLength, &i32CharsWritten, pszInfoLog);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, (pszInfoLog));
+		return GF_FALSE;
+	}
+	glUseProgram(rc->base_program);
+	gl_check_error();
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Shaders compiled"))
+
+	return GF_TRUE;
+}
+
+static void load_matrix_shaders(GLuint program, Fixed *mat, const char *name)
+{
+	GLint loc=-1;
+#ifdef GPAC_FIXED_POINT
+	Float _mat[16];
+	u32 i;
 #endif
+	gl_check_error();
+	loc = glGetUniformLocation(program, name);
+	if(loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error (file %s line %d): Invalid matrix name", __FILE__, __LINE__));
+		return;
+	}
+	gl_check_error();
+
+#ifdef GPAC_FIXED_POINT
+	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
+	glUniformMatrix4fv(loc, 1, GL_FALSE, (GLfloat *) _mat);
+#else
+	glUniformMatrix4fv(loc, 1, GL_FALSE, mat);
+#endif
+	gl_check_error();
+}
+
+
+//ES2 version of glOrthox() - resulting matrix is stored in rc->ortho
+//more info on Orthographic projection matrix at http://www.songho.ca/opengl/gl_projectionmatrix.html#ortho
+static void calculate_ortho(Fixed left, Fixed right, Fixed bottom, Fixed top, Fixed near, Fixed far, AndroidContext *rc) {
+
+
+	if((left==right)|(bottom==top)|(near==far)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error (file %s line %d): Invalid Orthogonal projection values", __FILE__, __LINE__));
+		return;
+	}
+
+	gf_mx_init(rc->ortho);
 
+//For Orthographic Projection
+	rc->ortho.m[0] = gf_divfix(2, (right-left));
+	rc->ortho.m[5] = gf_divfix(2, (top-bottom));
+	rc->ortho.m[10] = gf_divfix(-2, far-near);
+	rc->ortho.m[12] = -gf_divfix(right+left, right-left);
+	rc->ortho.m[13] = -gf_divfix(top+bottom, top-bottom);
+	rc->ortho.m[14] = -gf_divfix(far+near, far-near);
+	rc->ortho.m[15] = FIX_ONE;
+}
+
+
+
+#endif	//Endof specifix for GLES2 (ifdef GPAC_USE_GLES2)
+
+
+#ifndef GPAC_USE_GLES2
 void initGL(AndroidContext *rc)
 {
 	char* ext;
 
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android InitGL");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android InitGL"));
 
 	ext = (char*)glGetString(GL_VENDOR);
-	LOG( ANDROID_LOG_INFO, TAG, "OpenGL ES Vendor: %s", ext);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Vendor: %s", ext));
 
 	ext = (char*)glGetString(GL_RENDERER);
-	LOG( ANDROID_LOG_INFO, TAG, "OpenGL ES Renderer: %s", ext);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Renderer: %s", ext));
 
 	ext = (char*)glGetString(GL_VERSION);
-	LOG( ANDROID_LOG_INFO, TAG, "OpenGL ES Version: %s", ext);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Version: %s", ext));
 
 	ext = (char*)glGetString(GL_EXTENSIONS);
-	LOG( ANDROID_LOG_INFO, TAG, "OpenGL ES Extensions: %s", ext);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("OpenGL ES Extensions: %s", ext));
 
 	if ( strstr(ext, "GL_OES_draw_texture") )
 	{
 		rc->draw_texture = 1;
-		LOG( ANDROID_LOG_INFO, TAG, "Using GL_OES_draw_texture");
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("Using GL_OES_draw_texture"));
 	}
 	if ( strstr(ext, "GL_ARB_texture_non_power_of_two") )
 	{
 		rc->non_power_two = 0;
-		LOG( ANDROID_LOG_INFO, TAG, "Using GL_ARB_texture_non_power_of_two");
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("Using GL_ARB_texture_non_power_of_two"));
 	}
 
 	/* Enable smooth shading */
@@ -124,9 +347,8 @@
 
 	/* Really Nice Perspective Calculations */
 	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-
-	glDisable(GL_CULL_FACE | GL_NORMALIZE | GL_LIGHTING | GL_BLEND | GL_FOG | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
 }
+#endif
 
 void gluPerspective(GLfloat fovy, GLfloat aspect,
 GLfloat zNear, GLfloat zFar)
@@ -137,15 +359,16 @@
 	ymin = -ymax;
 	xmin = ymin * aspect;
 	xmax = ymax * aspect;
-
+#ifndef GPAC_USE_GLES2
 	glFrustumx((GLfixed)(xmin * 65536), (GLfixed)(xmax * 65536),
 	 (GLfixed)(ymin * 65536), (GLfixed)(ymax * 65536),
 	 (GLfixed)(zNear * 65536), (GLfixed)(zFar * 65536));
+#endif
 }
 
 void resizeWindow(AndroidContext *rc)
 {
-	LOG( ANDROID_LOG_VERBOSE, TAG, "resizeWindow : start");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("resizeWindow : start"));
 	/* Height / width ration */
 	GLfloat ratio;
 
@@ -159,7 +382,7 @@
 
 	/* Setup our viewport. */
 	glViewport(0, 0, (GLsizei)rc->width, (GLsizei)rc->height);
-
+#ifndef GPAC_USE_GLES2
 	/* change to the projection matrix and set our viewing volume. */
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
@@ -172,44 +395,60 @@
 
 	/* Reset The View */
 	glLoadIdentity();
-	LOG( ANDROID_LOG_VERBOSE, TAG, "resizeWindow : end");
+#else
+	gl_check_error();
+	glUseProgram(rc->base_program);
+	calculate_ortho(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1), rc);
+	load_matrix_shaders(rc->base_program, (Fixed *) rc->ortho.m, "gfProjectionMatrix");
+	load_matrix_shaders(rc->base_program, (Fixed *) rc->identity.m, "gfModelViewMatrix");
+	gl_check_error();
+#endif
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("resizeWindow : end"));
 }
 
 void drawGLScene(AndroidContext *rc)
 {
 #ifdef DROID_EXTREME_LOGS
-	LOG( ANDROID_LOG_VERBOSE, TAG, "drawGLScene : start");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("drawGLScene : start"));
 #endif /* DROID_EXTREME_LOGS */
+#ifdef GPAC_USE_GLES2
+	GLuint loc_vertex_array, loc_texcoord_array;
+	loc_vertex_array = loc_texcoord_array = -1;
+#endif
+
 	GLfloat vertices[4][3];
 	GLfloat texcoord[4][2];
 //	int i, j;
 
 	float rgba[4];
-
-#ifdef GLES_FRAMEBUFFER_TEST
-	glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#endif
+	gl_check_error();
 
 	// Reset states
 	rgba[0] = rgba[1] = rgba[2] = 0.f;
 	rgba[0] = 1.f;
+#ifndef GPAC_USE_GLES2
 	glColor4f(1.f, 1.f, 1.f, 1.f);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, rgba);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, rgba);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, rgba);
-	glDisable(GL_CULL_FACE | GL_NORMALIZE | GL_LIGHTING | GL_BLEND | GL_FOG | GL_COLOR_MATERIAL | GL_TEXTURE_2D);
-
+#endif
 	/* Clear The Screen And The Depth Buffer */
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
+	gl_check_error();
 	//glEnable(GL_BLEND);
 	//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
+#ifndef GPAC_USE_GLES2
 	glEnable(GL_TEXTURE_2D);
+#endif
+	glUseProgram(rc->base_program);
+	glActiveTexture(GL_TEXTURE0);
 	glBindTexture( GL_TEXTURE_2D, rc->texID);
+	gl_check_error();
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+#ifndef GPAC_USE_GLES2
 	glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+#endif
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
@@ -218,20 +457,25 @@
 // 		rc->texData[ i*rc->width*NBPP + j*NBPP + 3] = 200;
 
 // memset(rc->texData, 255, 4 * rc->width * rc->height );
-#ifndef GLES_FRAMEBUFFER_TEST
+
 	glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, rc->tex_width, rc->tex_height, 0,
 	 GL_RGBA, GL_UNSIGNED_BYTE, rc->texData );
-#endif
 
+	gl_check_error();
 	if ( rc->draw_texture )
 	{
+		gl_check_error();
 		int cropRect[4] = {0,rc->height,rc->width,-rc->height};
+#ifndef GPAC_USE_GLES2
 		glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, cropRect);
-
 		glDrawTexsOES(0, 0, 0, rc->width, rc->height);
+#endif
 	}
 	else
 	{
+		gl_check_error();
+
+#ifndef GPAC_USE_GLES2
 		/* Enable VERTEX array */
 		glEnableClientState(GL_VERTEX_ARRAY);
 		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -242,6 +486,21 @@
 
 		/* Move Left 1.5 Units And Into The Screen 6.0 */
 		glLoadIdentity();
+#else
+		loc_vertex_array = glGetAttribLocation(rc->base_program, "gfVertex");
+		if(loc_vertex_array<0)
+			return;
+		glEnableVertexAttribArray(loc_vertex_array);
+		glVertexAttribPointer(loc_vertex_array, 3, GL_FLOAT, GL_FALSE, 0, vertices);
+
+		loc_texcoord_array = glGetAttribLocation(rc->base_program, "gfTexCoord");
+		if (loc_texcoord_array>=0) {
+			glVertexAttribPointer(loc_texcoord_array, 2, GL_FLOAT, GL_FALSE, 0, texcoord);
+			glEnableVertexAttribArray(loc_texcoord_array);
+		}
+
+
+#endif
 		//glTranslatef(0.0f, 0.0f, -3.3f);
 		//glTranslatef(0.0f, 0.0f, -2.3f);
 
@@ -272,31 +531,32 @@
 
 		/* Drawing using triangle strips, draw triangles using 4 vertices */
 		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
+#ifndef GPAC_USE_GLES2
 		/* Disable vertex array */
 		glDisableClientState(GL_VERTEX_ARRAY);
 		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+#endif
 	}
-
+#ifndef GPAC_USE_GLES2
 	glDisable(GL_TEXTURE_2D);
+#endif
+	gl_check_error();
 
 	/* Flush all drawings */
 	glFinish();
-#ifdef GLES_FRAMEBUFFER_TEST
-	glBindFramebufferOES(GL_FRAMEBUFFER_OES, rc->framebuff);
-#endif
 #ifdef DROID_EXTREME_LOGS
-	LOG( ANDROID_LOG_VERBOSE, TAG, "drawGLScene : end");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("drawGLScene : end"));
 #endif /* DROID_EXTREME_LOGS */
 }
 
 int releaseTexture(AndroidContext *rc)
 {
+	gl_check_error();
 	if (!rc)
 		return 0;
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android Delete Texture");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Delete Texture"));
 
-	if ( rc->texID >= 0 )
+	if ( rc->texID >= 0)
 	{
 		glDeleteTextures(1, &(rc->texID));
 		rc->texID = -1;
@@ -306,7 +566,8 @@
 		gf_free(rc->texData);
 		rc->texData = NULL;
 	}
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Delete Texture DONE");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Delete Texture DONE"))
+	gl_check_error();
 	return 0;
 }
 
@@ -317,8 +578,7 @@
 	if ( rc->texID >= 0 )
 		releaseTexture(rc);
 
-	LOG( ANDROID_LOG_INFO, TAG, "Android Create Texture Size: WxH: %dx%d",
-	 rc->tex_width, rc->tex_height);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("Android Create Texture Size: WxH: %dx%d", rc->tex_width, rc->tex_height));
 
 	glGenTextures( 1, &(rc->texID) );
 
@@ -329,7 +589,9 @@
 	glBindTexture( GL_TEXTURE_2D, rc->texID);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+#ifndef GPAC_USE_GLES2
 	glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+#endif
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
@@ -337,94 +599,10 @@
 	 GL_RGBA, GL_UNSIGNED_BYTE, NULL/*rc->texData*/ );
 
 	glBindTexture( GL_TEXTURE_2D, 0);
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Create Texture DONE");
-	return 0;
-}
-
-#ifdef GLES_FRAMEBUFFER_TEST
-
-int releaseFrameBuffer(AndroidContext *rc)
-{
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android Delete FrameBuffer");
-
-	glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-
-	if ( rc->framebuff >= 0 )
-	{
-		glDeleteFramebuffersOES(1, &(rc->framebuff));
-		rc->framebuff = -1;
-	}
-	if ( rc->depthbuff >= 0 )
-	{
-		glDeleteRenderbuffersOES(1, &(rc->depthbuff));
-		rc->depthbuff = -1;
-	}
-}
-
-int createFrameBuffer(AndroidContext *rc)
-{
-	int backingWidth;
-	int backingHeight;
-	int res;
-
-	if ( rc->framebuff >= 0 )
-		releaseFrameBuffer(rc);
-
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android Create FrameBuffer"));
-
-	glGenFramebuffersOES(1, &(rc->framebuff));
-	glBindFramebufferOES(GL_FRAMEBUFFER_OES, rc->framebuff);
-
-//	glGenRenderbuffersOES(1, &(rc->depthbuff));
-//	glBindRenderbufferOES(GL_RENDERBUFFER_OES, rc->depthbuff);
-
-//	glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
-//	glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight);
-
-//	LOG( ANDROID_LOG_ERROR, TAG, "Android Depth Buffer Size: %dx%d\n", backingWidth, backingHeight));
-
-// glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH_COMPONENT16_OES, rc->width, rc->height);
-
-// glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES,
-// GL_RENDERBUFFER_OES, rc->depthbuff);
-
-	glFramebufferTexture2DOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES,
-	 GL_TEXTURE_2D, rc->texID, 0);
-
-	if ( (res=(int)glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES)) != GL_FRAMEBUFFER_COMPLETE_OES )
-	{
-		LOG( ANDROID_LOG_ERROR, TAG, "Android failed to make complete framebuffer object:");
-		switch (res)
-		{
-		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES:
-			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES:
-			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES:
-			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES:
-			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES");
-			break;
-		case GL_FRAMEBUFFER_UNSUPPORTED_OES:
-			LOG( ANDROID_LOG_ERROR, TAG, "GL_FRAMEBUFFER_UNSUPPORTED_OES");
-			break;
-		default :
-			LOG( ANDROID_LOG_ERROR, TAG, "Unknown error: %d", res);
-			break;
-		}
-
-		return 1;
-	}
-
-	//glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Create Texture DONE"));
 	return 0;
 }
 
-#endif
 
 u32 find_pow_2(u32 num)
 {
@@ -437,11 +615,20 @@
 static GF_Err droid_Resize(GF_VideoOutput *dr, u32 w, u32 h)
 {
 	RAWCTX;
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android Resize: %dx%d", w, h);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Resize: %dx%d", w, h));
 
 	rc->width = w;
 	rc->height = h;
 
+	if ((dr->max_screen_width < w) || (dr->max_screen_height < h)) {
+		dr->max_screen_width = w;
+		dr->max_screen_height = h;
+	}
+	//npot textures are supported in ES2
+#ifdef GPAC_USE_GLES2
+	rc->tex_width = rc->width;
+	rc->tex_height = rc->height;
+#else
 	if ( rc->non_power_two )
 	{
 		rc->tex_width = rc->width;
@@ -452,17 +639,16 @@
 		rc->tex_width = find_pow_2(rc->width);
 		rc->tex_height = find_pow_2(rc->height);
 	}
-
+#endif
+	gl_check_error();
 	resizeWindow(rc);
 
 	if ( rc->out_3d_type == 0 )
 	{
 		createTexture(rc);
-#ifdef GLES_FRAMEBUFFER_TEST
-		createFrameBuffer(rc);
-#endif
 	}
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Resize DONE", w, h);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Resize DONE", w, h));
+	gl_check_error();
 	return GF_OK;
 }
 
@@ -470,15 +656,33 @@
 {
 	RAWCTX;
 	void * pixels;
-	int ret;
+	Bool res = GF_FALSE;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Setup: %d", init_flags));
 
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android Setup: %d", init_flags);
 
-#ifndef GLES_FRAMEBUFFER_TEST
+#ifdef GPAC_USE_GLES2
+
+	if ( rc->out_3d_type == 0 ) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("We are in OpenGL: disable mode"));
+		res = initGLES2(rc);
+		if(res==GF_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("ERROR Compiling ES2 Shaders"));
+		} else {	//set texture
+			glUseProgram(rc->base_program);
+			GLint loc = gf_glGetUniformLocation(rc->base_program, "img");
+			glUniform1i(loc,0);
+		}
+	}
+
+#else
+
 	if ( rc->out_3d_type == 0 )
-#endif
+
 		initGL(rc);
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Setup DONE");
+#endif //GPAC_USE_GLES2
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Setup DONE"));
 	return GF_OK;
 }
 
@@ -486,13 +690,11 @@
 static void droid_Shutdown(GF_VideoOutput *dr)
 {
 	RAWCTX;
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android Shutdown\n");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Shutdown\n"));
 
 	releaseTexture(rc);
-#ifdef GLES_FRAMEBUFFER_TEST
-	releaseFrameBuffer(rc);
-#endif
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Shutdown DONE");
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Shutdown DONE"));
 }
 
 
@@ -500,15 +702,13 @@
 {
 	RAWCTX;
 #ifdef DROID_EXTREME_LOGS
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Flush\n");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Flush\n"));
 #endif /* DROID_EXTREME_LOGS */
 
-#ifndef GLES_FRAMEBUFFER_TEST
 	if ( rc->out_3d_type == 0 )
-#endif
 		drawGLScene(rc);
 #ifdef DROID_EXTREME_LOGS
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android Flush DONE");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Flush DONE"));
 #endif /* DROID_EXTREME_LOGS */
 	return GF_OK;
 }
@@ -520,7 +720,7 @@
 	void * pixels;
 	int i,j,t;
 #ifdef DROID_EXTREME_LOGS
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android LockBackBuffer: %d", do_lock);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android LockBackBuffer: %d", do_lock));
 #endif /* DROID_EXTREME_LOGS */
 	if (do_lock) {
 		if (!vi) return GF_BAD_PARAM;
@@ -550,7 +750,7 @@
 		}
 	}
 #ifdef DROID_EXTREME_LOGS
-	LOG( ANDROID_LOG_VERBOSE, TAG, "Android LockBackBuffer DONE");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android LockBackBuffer DONE"));
 #endif /* DROID_EXTREME_LOGS */
 	return GF_OK;
 }
@@ -562,12 +762,37 @@
 	if (evt) {
 		switch (evt->type) {
 		case GF_EVENT_SIZE:
-			LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SIZE( %d x %d)",
-			 evt->setup.width, evt->setup.height);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SIZE( %d x %d)", evt->setup.width, evt->setup.height));
 			//if (evt->setup.opengl_mode) return GF_OK;
-			return droid_Resize(dr, evt->setup.width, evt->setup.height);
+			//in fullscreen mode: do not change viewport; just update perspective
+			if (rc->fullscreen) {
+#ifdef GPAC_USE_GLES2
+				gl_check_error();
+				glUseProgram(rc->base_program);
+				calculate_ortho(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1), rc);
+				load_matrix_shaders(rc->base_program, (Fixed *) rc->ortho.m, "gfProjectionMatrix");
+				load_matrix_shaders(rc->base_program, (Fixed *) rc->identity.m, "gfModelViewMatrix");
+				gl_check_error();
+#else
+				/* change to the projection matrix and set our viewing volume. */
+				glMatrixMode(GL_PROJECTION);
+				glLoadIdentity();
+
+				/* Set our perspective */
+				glOrthox(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1));
+
+				/* Make sure we're chaning the model view and not the projection */
+				glMatrixMode(GL_MODELVIEW);
+
+				/* Reset The View */
+				glLoadIdentity();
+#endif
+				return GF_OK;
+			} else
+				return droid_Resize(dr, evt->setup.width, evt->setup.height);
+
 		case GF_EVENT_VIDEO_SETUP:
-			LOG( ANDROID_LOG_DEBUG, TAG, "Android OpenGL mode: %d", evt->setup.opengl_mode);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android OpenGL mode: %d", evt->setup.opengl_mode));
 			switch (evt->setup.opengl_mode)
 			{
 			case 0:
@@ -584,29 +809,42 @@
 				droid_Resize(dr, evt->setup.width, evt->setup.height);
 				return GF_OK;
 			case GF_EVENT_SET_CURSOR:
-				LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SET_CURSOR");
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SET_CURSOR"));
 				return GF_OK;
 			case GF_EVENT_SET_CAPTION:
-				LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SET_CAPTION");
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SET_CAPTION"));
 				return GF_OK;
 			case GF_EVENT_SHOWHIDE:
-				LOG( ANDROID_LOG_VERBOSE, TAG, "GF_EVENT_SHOWHIDE");
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SHOWHIDE"));
 				return GF_OK;
 			default:
-				LOG( ANDROID_LOG_DEBUG, TAG, "Process Unknown Event: %d", evt->type);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Process Unknown Event: %d", evt->type));
 				return GF_OK;
 			}
 			break;
+		case GF_EVENT_TEXT_EDITING_START:
+		case GF_EVENT_TEXT_EDITING_END:
+			return GF_NOT_SUPPORTED;
 		}
 	}
 	return GF_OK;
 }
 
+static GF_Err droid_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
+{
+	RAWCTX;;
+
+	*outWidth = dr->max_screen_width;
+	*outHeight = dr->max_screen_height;
+	rc->fullscreen = bOn;
+	return droid_Resize(dr, dr->max_screen_width, dr->max_screen_height);
+}
+
 GF_VideoOutput *NewAndroidVideoOutput()
 {
 	AndroidContext *pCtx;
 	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-	LOG( ANDROID_LOG_INFO, TAG, "Android Video Initialization in progress...");
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("Android Video Initialization in progress..."));
 	memset(driv, 0, sizeof(GF_VideoOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Android Video Output", "gpac distribution")
 
@@ -623,13 +861,14 @@
 	driv->Setup = droid_Setup;
 	driv->Shutdown = droid_Shutdown;
 	driv->ProcessEvent = droid_ProcessEvent;
+	driv->SetFullScreen = droid_SetFullScreen;
 
 	driv->max_screen_width = 1024;
 	driv->max_screen_height = 1024;
 
 	driv->hw_caps = GF_VIDEO_HW_OPENGL;// | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;//GF_VIDEO_HW_DIRECT_ONLY;//
 
-	LOG( ANDROID_LOG_INFO, TAG, "Android Video Init Done.\n");
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("Android Video Init Done.\n"));
 	return (void *)driv;
 }
 
@@ -645,7 +884,7 @@
 		gf_free(rc);
 	driv->opaque = NULL;
 	gf_free(driv);
-	LOG( ANDROID_LOG_DEBUG, TAG, "Android vout deinit\n");
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android vout deinit\n"));
 }
 
 /*interface query*/

v0.5.2.tar.gz/modules/dummy_in/Makefile -> v0.6.1.tar.gz/modules/dummy_in/Makefile Changed

v0.5.2.tar.gz/modules/dummy_in/dummy_in.c -> v0.6.1.tar.gz/modules/dummy_in/dummy_in.c Changed

@@ -69,10 +69,10 @@
 		if (dc->ch && dc->ch==ch) {
 			gf_list_rem(read->channels, i-1);
 			gf_free(dc);
-			return 1;
+			return GF_TRUE;
 		}
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static const char * DC_MIME_TYPES[] = {
@@ -106,13 +106,13 @@
 {
 	char *sExt;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
 	if (sExt) {
-		Bool ok = 0;
+		Bool ok = GF_FALSE;
 		char *cgi_par;
 		if (!strnicmp(sExt, ".gz", 3)) sExt = strrchr(sExt, '.');
-		if (!strnicmp(url, "rtsp://", 7)) return 0;
+		if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
 
 		cgi_par = strchr(sExt, '?');
 		if (cgi_par) cgi_par[0] = 0;
@@ -123,29 +123,29 @@
 					break;
 		}
 		if (cgi_par) cgi_par[0] = '?';
-		if (ok) return 1;
+		if (ok) return GF_TRUE;
 	}
 	/*views:// internal URI*/
 	if (!strnicmp(url, "views://", 8))
-		return 1;
+		return GF_TRUE;
 
-	if (!strncmp(url, "\\\\", 2)) return 0;
+	if (!strncmp(url, "\\\\", 2)) return GF_FALSE;
 
 	if (!strnicmp(url, "file://", 7) || !strstr(url, "://")) {
 		char *rtype = gf_xml_get_root_type(url, NULL);
 		if (rtype) {
-			Bool handled = 0;
-			if (!strcmp(rtype, "SAFSession")) handled = 1;
-			else if (!strcmp(rtype, "XMT-A")) handled = 1;
-			else if (!strcmp(rtype, "X3D")) handled = 1;
-			else if (!strcmp(rtype, "svg")) handled = 1;
-			else if (!strcmp(rtype, "bindings")) handled = 1;
-			else if (!strcmp(rtype, "widget")) handled = 1;
+			Bool handled = GF_FALSE;
+			if (!strcmp(rtype, "SAFSession")) handled = GF_TRUE;
+			else if (!strcmp(rtype, "XMT-A")) handled = GF_TRUE;
+			else if (!strcmp(rtype, "X3D")) handled = GF_TRUE;
+			else if (!strcmp(rtype, "svg")) handled = GF_TRUE;
+			else if (!strcmp(rtype, "bindings")) handled = GF_TRUE;
+			else if (!strcmp(rtype, "widget")) handled = GF_TRUE;
 			gf_free(rtype);
 			return handled;
 		}
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 void DC_NetIO(void *cbk, GF_NETIO_Parameter *param)
@@ -181,8 +181,9 @@
 	/*OK confirm*/
 	if (!read->is_service_connected) {
 		if (!gf_dm_sess_get_cache_name(read->dnload)) e = GF_IO_ERR;
+		if (e>0) e = GF_OK;
 		gf_service_connect_ack(read->service, NULL, e);
-		read->is_service_connected = 1;
+		read->is_service_connected = GF_TRUE;
 	}
 }
 
@@ -232,9 +233,9 @@
 	read->service = serv;
 
 	if (!strnicmp(url, "views://", 8)) {
-		read->is_views_url = 1;
+		read->is_views_url = GF_TRUE;
 		gf_service_connect_ack(serv, NULL, GF_OK);
-		read->is_service_connected = 1;
+		read->is_service_connected = GF_TRUE;
 		return GF_OK;
 	}
 
@@ -295,15 +296,15 @@
 		return GF_OK;
 	}
 
-	test = gf_f64_open(read->url, "rt");
+	test = gf_fopen(read->url, "rt");
 	if (!test) {
 		gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
 		return GF_OK;
 	}
-	fclose(test);
+	gf_fclose(test);
 	if (!read->is_service_connected) {
 		gf_service_connect_ack(serv, NULL, GF_OK);
-		read->is_service_connected = 1;
+		read->is_service_connected = GF_TRUE;
 	}
 	return GF_OK;
 }
@@ -348,10 +349,10 @@
 		uri = (char *) gf_dm_sess_get_cache_name(read->dnload);
 		gf_dm_sess_get_stats(read->dnload, NULL, NULL, &size, NULL, NULL, NULL);
 	} else {
-		FILE *f = gf_f64_open(read->url, "rt");
-		gf_f64_seek(f, 0, SEEK_END);
-		size = (u32) gf_f64_tell(f);
-		fclose(f);
+		FILE *f = gf_fopen(read->url, "rt");
+		gf_fseek(f, 0, SEEK_END);
+		size = (u32) gf_ftell(f);
+		gf_fclose(f);
 		uri = read->url;
 	}
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -448,9 +449,9 @@
 	out_sl_hdr->compositionTimeStampFlag = 1;
 	out_sl_hdr->compositionTimeStamp = dc->start;
 	out_sl_hdr->accessUnitStartFlag = 1;
-	*sl_compressed = 0;
+	*sl_compressed = GF_FALSE;
 	*out_reception_status = GF_OK;
-	*is_new_data = 1;
+	*is_new_data = GF_TRUE;
 	return GF_OK;
 }
 
@@ -461,7 +462,7 @@
 
 Bool DC_CanHandleURLInService(GF_InputService *plug, const char *url)
 {
-	return 0;
+	return GF_FALSE;
 }
 
 GPAC_MODULE_EXPORT

v0.5.2.tar.gz/modules/dx_hw/Makefile -> v0.6.1.tar.gz/modules/dx_hw/Makefile Changed

v0.5.2.tar.gz/modules/dx_hw/copy_pixels.c -> v0.6.1.tar.gz/modules/dx_hw/copy_pixels.c Changed

@@ -66,11 +66,11 @@
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_IYUV:
 	case GF_PIXEL_I420:
-		return 1;
+		return GF_TRUE;
 	/*not supported yet*/
 	case GF_PIXEL_YUVA:
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -80,9 +80,9 @@
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_IYUV:
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -121,12 +121,12 @@
 			unsigned char *dst, *src, *dst2, *src2, *dst3, *src3;
 
 			src = pY;
-			dst = vs->video_buffer;
+			dst = (unsigned char*)vs->video_buffer;
 
 			src2 = (vs->pixel_format != GF_PIXEL_YV12) ? pU : pV;
-			dst2 = vs->video_buffer + vs->pitch_y * vs->height;
+			dst2 = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
 			src3 = (vs->pixel_format != GF_PIXEL_YV12) ? pV : pU;
-			dst3 = vs->video_buffer + 5*vs->pitch_y * vs->height/4;
+			dst3 = (unsigned char*)vs->video_buffer + 5*vs->pitch_y * vs->height/4;
 			for (i=0; i<src_wnd->h; i++) {
 				memcpy(dst, src, src_wnd->w);
 				src += src_stride;
@@ -148,7 +148,7 @@
 			y = pY + i*src_stride;
 			u = pU + (i/2) * src_stride/2;
 			v = pV + (i/2) * src_stride/2;
-			dst = vs->video_buffer + i*vs->pitch_y;
+			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 
 			for (j=0; j<src_wnd->w/2; j++) {
 				*dst = *u;
@@ -172,7 +172,7 @@
 			y = pY + i*src_stride;
 			u = pU + (i/2) * src_stride/2;
 			v = pV + (i/2) * src_stride/2;
-			dst = vs->video_buffer + i*vs->pitch_y;
+			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 
 			for (j=0; j<src_wnd->w/2; j++) {
 				*dst = *y;
@@ -196,7 +196,7 @@
 			y = pY + i*src_stride;
 			u = pU + (i/2) * src_stride/2;
 			v = pV + (i/2) * src_stride/2;
-			dst = vs->video_buffer + i*vs->pitch_y;
+			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 
 			for (j=0; j<src_wnd->w/2; j++) {
 				*dst = *y;
@@ -246,13 +246,13 @@
 		u32 i, j;
 		unsigned char *dst_y, *dst_u, *dst_v;
 
-		dst_y = vs->video_buffer;
+		dst_y = (unsigned char*)vs->video_buffer;
 		if (vs->pixel_format == GF_PIXEL_YV12) {
-			dst_v = vs->video_buffer + vs->pitch_y * vs->height;
-			dst_u = vs->video_buffer + 5*vs->pitch_y * vs->height/4;
+			dst_v = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
+			dst_u = (unsigned char*)vs->video_buffer + 5*vs->pitch_y * vs->height/4;
 		} else {
-			dst_u = vs->video_buffer + vs->pitch_y * vs->height;
-			dst_v = vs->video_buffer + 5*vs->pitch_y * vs->height/4;
+			dst_u = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
+			dst_v = (unsigned char*)vs->video_buffer + 5*vs->pitch_y * vs->height/4;
 		}
 		for (i=0; i<src_wnd->h; i++) {
 			for (j=0; j<src_wnd->w; j+=2) {
@@ -290,9 +290,9 @@
 	base_pf = get_yuv_base(vs->pixel_format);
 	for (i=0; i<src_wnd->h; i++) {
 		char *dst = vs->video_buffer + i*vs->pitch_y;
-		char *y = pY + src_stride * i;
-		char *u = pU + src_stride * i;
-		char *v = pV + src_stride * i;
+		char *y = (char*)pY + src_stride * i;
+		char *u = (char*)pU + src_stride * i;
+		char *v = (char*)pV + src_stride * i;
 		switch (base_pf) {
 		case GF_PIXEL_UYVY:
 			for (j=0; j<src_wnd->w; j+=2) {
@@ -395,7 +395,7 @@
 	case GF_PIXEL_RGBS:
 		/*nope get all pixels*/
 		for (i=0; i<src_wnd->h; i++) {
-			dst = vs->video_buffer + i*vs->pitch_y;
+			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 			cur = src + i*src_stride;
 			for (j=0; j<src_wnd->w; j++) {
 				r = *cur++;
@@ -430,7 +430,7 @@
 	case GF_PIXEL_RGB_24:
 	case GF_PIXEL_RGBS:
 		for (i=0; i<src_wnd->h; i++) {
-			dst = vs->video_buffer + i*vs->pitch_y;
+			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 			cur = src + i*src_stride;
 			for (j=0; j<src_wnd->w; j++) {
 				r = *cur++;
@@ -462,13 +462,13 @@
 		return;
 	}
 	/*get all pixels*/
-	isBGR = vs->pixel_format==GF_PIXEL_BGR_32;
+	isBGR = (vs->pixel_format==GF_PIXEL_BGR_32) ? GF_TRUE : GF_FALSE;
 	if (isBGR) {
 		switch (src_pf) {
 		case GF_PIXEL_RGB_24:
 		case GF_PIXEL_RGBS:
 			for (i=0; i<src_wnd->h; i++) {
-				dst = vs->video_buffer + i*vs->pitch_y;
+				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 				cur = src + i*src_stride;
 				for (j=0; j<src_wnd->w; j++) {
 					dst[0] = *cur++;
@@ -481,7 +481,7 @@
 		case GF_PIXEL_RGBDS:
 		case GF_PIXEL_RGBD:
 			for (i=0; i<src_wnd->h; i++) {
-				dst = vs->video_buffer + i*vs->pitch_y;
+				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 				cur = src + i*src_stride;
 				for (j=0; j<src_wnd->w; j++) {
 					dst[0] = *cur++;
@@ -494,7 +494,7 @@
 			break;
 		case GF_PIXEL_BGR_24:
 			for (i=0; i<src_wnd->h; i++) {
-				dst = vs->video_buffer + i*vs->pitch_y;
+				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 				cur = src + i*src_stride;
 				for (j=0; j<src_wnd->w; j++) {
 					dst[2] = *cur++;
@@ -510,7 +510,7 @@
 		case GF_PIXEL_RGB_24:
 		case GF_PIXEL_RGBS:
 			for (i=0; i<src_wnd->h; i++) {
-				dst = vs->video_buffer + i*vs->pitch_y;
+				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 				cur = src + i*src_stride;
 				for (j=0; j<src_wnd->w; j++) {
 					dst[2] = *cur++;
@@ -523,7 +523,7 @@
 		case GF_PIXEL_RGBD:
 		case GF_PIXEL_RGBDS:
 			for (i=0; i<src_wnd->h; i++) {
-				dst = vs->video_buffer + i*vs->pitch_y;
+				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 				cur = src + i*src_stride;
 				for (j=0; j<src_wnd->w; j++) {
 					dst[2] = *cur++;
@@ -536,7 +536,7 @@
 			break;
 		case GF_PIXEL_BGR_24:
 			for (i=0; i<src_wnd->h; i++) {
-				dst = vs->video_buffer + i*vs->pitch_y;
+				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
 				cur = src + i*src_stride;
 				for (j=0; j<src_wnd->w; j++) {
 					dst[0] = *cur++;
@@ -592,7 +592,7 @@
 		}
 	}
 
-	gf_stretch_bits(dst_s, (GF_VideoSurface*) src_s, NULL, (GF_Window *)src_wnd, 0xFF, 0, NULL, NULL);
+	gf_stretch_bits(dst_s, (GF_VideoSurface*) src_s, NULL, (GF_Window *)src_wnd, 0xFF, GF_FALSE, NULL, NULL);
 }

v0.5.2.tar.gz/modules/dx_hw/dx_2d.c -> v0.6.1.tar.gz/modules/dx_hw/dx_2d.c Changed

@@ -47,9 +47,9 @@
 	case GF_PIXEL_IYUV:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_YV12_10:
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -128,16 +128,16 @@
 	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HardwareMemory");
 	if (opt) {
 		if (use_system_memory) {
-			if (!strcmp(opt, "Always")) use_system_memory = 0;
+			if (!strcmp(opt, "Always")) use_system_memory = GF_FALSE;
 		} else {
-			if (!strcmp(opt, "Never")) use_system_memory = 1;
-			else if (!strcmp(opt, "Auto")) dd->force_video_mem_for_yuv = 1;
+			if (!strcmp(opt, "Never")) use_system_memory = GF_TRUE;
+			else if (!strcmp(opt, "Auto")) dd->force_video_mem_for_yuv = GF_TRUE;
 		}
 	}
 
-	force_reinit = 0;
-	if (use_system_memory && !dd->systems_memory) force_reinit = 1;
-	else if (!use_system_memory && dd->systems_memory) force_reinit = 1;
+	force_reinit = GF_FALSE;
+	if (use_system_memory && !dd->systems_memory) force_reinit = GF_TRUE;
+	else if (!use_system_memory && dd->systems_memory) force_reinit = GF_TRUE;
 	if (dd->pBack && !force_reinit&& !dd->fullscreen && (dd->width == Width) && (dd->height == Height) ) {
 		return GF_OK;
 	}
@@ -154,11 +154,11 @@
 		ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
 	} else {
 		if (!use_system_memory) {
-			dd->systems_memory = 0;
+			dd->systems_memory = GF_FALSE;
 			ddsd.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY;
 		} else {
 			ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
-			dd->systems_memory = 1;
+			dd->systems_memory = GF_TRUE;
 		}
 	}
 	if (dd->systems_memory) dr->hw_caps &= ~GF_VIDEO_HW_HAS_RGB;
@@ -186,9 +186,6 @@
 	if (!dd->fullscreen) {
 		dd->width = Width;
 		dd->height = Height;
-	} else {
-		dd->fs_store_width = Width;
-		dd->fs_store_height = Height;
 	}
 	DD_ClearBackBuffer(dr, 0xFF000000);
 
@@ -218,7 +215,7 @@
 	if (FAILED(hr)) return GF_IO_ERR;
 
 
-	dd->switch_res = 0;
+	dd->switch_res = GF_FALSE;
 	cooplev = DDSCL_NORMAL;
 	/*Setup FS*/
 	if (dd->fullscreen) {
@@ -233,7 +230,7 @@
 			if( FAILED(hr)) return GF_IO_ERR;
 		}
 		dd->NeedRestore = 1;
-		cooplev = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN;
+//		cooplev = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN;
 	}
 
 	hr = dd->pDD->lpVtbl->SetCooperativeLevel(dd->pDD, dd->cur_hwnd, cooplev);
@@ -304,7 +301,7 @@
 	pcClipper->lpVtbl->Release(pcClipper);
 
 
-	dd->ddraw_init = 1;
+	dd->ddraw_init = GF_TRUE;
 	/*if YUV not initialize, init using HW video memory to setup HW caps*/
 	return GF_OK;
 }
@@ -323,12 +320,12 @@
 	if (FAILED(hr))
 		return GF_IO_ERR;
 
-	vi->video_buffer = desc.lpSurface;
+	vi->video_buffer = (char*)desc.lpSurface;
 	vi->width = desc.dwWidth;
 	vi->height = desc.dwHeight;
 	vi->pitch_x = 0;
 	vi->pitch_y = desc.lPitch;
-	vi->is_hardware_memory = dd->systems_memory ? 0 : 1;
+	vi->is_hardware_memory = dd->systems_memory ? GF_FALSE : GF_TRUE;
 	return GF_OK;
 }
 
@@ -448,7 +445,7 @@
 
 			SAFE_DD_RELEASE(yuvp->pSurface);
 			memset(yuvp, 0, sizeof(DDSurface));
-			yuvp->is_yuv = 1;
+			yuvp->is_yuv = GF_TRUE;
 
 			memset (&ddsd, 0, sizeof(ddsd));
 			ddsd.dwSize = sizeof(ddsd);
@@ -471,7 +468,7 @@
 
 				/*try without offscreen yuv->rgbcap*/
 				if (dd->offscreen_yuv_to_rgb) {
-					dd->offscreen_yuv_to_rgb = 0;
+					dd->offscreen_yuv_to_rgb = GF_FALSE;
 					if (dr->hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) {
 						ddsd.ddsCaps.dwCaps |= DDSCAPS_OVERLAY;
 						hr = dd->pDD->lpVtbl->CreateSurface(dd->pDD, &ddsd, &yuvp->pSurface, NULL);
@@ -555,7 +552,7 @@
 	/*get RGB or YUV pool surface*/
 	//if (video_src->pixel_format==GF_PIXEL_YUVD) return GF_NOT_SUPPORTED;
 	if (video_src->pixel_format==GF_PIXEL_YUVD) video_src->pixel_format=GF_PIXEL_YV12;
-	pool = DD_GetSurface(dr, w, h, video_src->pixel_format, 0);
+	pool = DD_GetSurface(dr, w, h, video_src->pixel_format, GF_FALSE);
 	if (!pool)
 		return GF_IO_ERR;
 
@@ -655,9 +652,9 @@
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_IYUV:
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -667,7 +664,7 @@
 void DD_InitYUV(GF_VideoOutput *dr)
 {
 	u32 w, h, j, i, num_yuv;
-	Bool force_yv12=0;
+	Bool force_yv12 = GF_FALSE;
 	DWORD numCodes;
 	DWORD formats[30];
 	DWORD *codes;
@@ -691,7 +688,7 @@
 			opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HasOverlay");
 			if (opt && !strcmp(opt, "yes"))
 				dr->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY;
-			dd->yuv_init = 1;
+			dd->yuv_init = GF_TRUE;
 			num_yuv = 1;
 		}
 	}
@@ -699,7 +696,7 @@
 	/*first run on this machine, to some benchmark*/
 	if (! dd->yuv_init) {
 		char szOpt[100];
-		dd->yuv_init = 1;
+		dd->yuv_init = GF_TRUE;
 
 		dr->hw_caps |= GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_YUV_OVERLAY;
 
@@ -731,11 +728,11 @@
 			if (dd->yuv_pool.pSurface) {
 				SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
 				memset(&dd->yuv_pool, 0, sizeof(DDSurface));
-				dd->yuv_pool.is_yuv = 1;
+				dd->yuv_pool.is_yuv = GF_TRUE;
 			}
 
 			dr->yuv_pixel_format = formats[i];
-			if (DD_GetSurface(dr, w, h, dr->yuv_pixel_format, 1) == NULL)
+			if (DD_GetSurface(dr, w, h, dr->yuv_pixel_format, GF_TRUE) == NULL)
 				goto rem_fmt;
 
 			now = gf_sys_clock();
@@ -746,7 +743,7 @@
 			}
 			now = gf_sys_clock() - now;
 			if (formats[i]== GF_PIXEL_YV12)
-				force_yv12=1;
+				force_yv12 = GF_TRUE;
 
 			if (!checkPacked) {
 				if (now<min_planar) {
@@ -778,7 +775,7 @@
 		if (dd->yuv_pool.pSurface) {
 			SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
 			memset(&dd->yuv_pool, 0, sizeof(DDSurface));
-			dd->yuv_pool.is_yuv = 1;
+			dd->yuv_pool.is_yuv = GF_TRUE;
 		}
 
 		if (best_planar && (min_planar <= min_packed )) {
@@ -817,7 +814,7 @@
 		gf_modules_set_option((GF_BaseInterface *)dr, "Video", "EnableOffscreenYUV", "yes");
 	}
 	if (opt && strcmp(opt, "yes")) dr->hw_caps &= ~GF_VIDEO_HW_HAS_YUV;
-	else dd->offscreen_yuv_to_rgb = 1;
+	else dd->offscreen_yuv_to_rgb = GF_TRUE;
 
 	/*get YUV overlay key*/
 	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "OverlayColorKey");

v0.5.2.tar.gz/modules/dx_hw/dx_audio.c -> v0.6.1.tar.gz/modules/dx_hw/dx_audio.c Changed

@@ -85,7 +85,7 @@
 	/*too bad, use desktop as window*/
 	if (!ctx->hWnd) ctx->hWnd = GetDesktopWindow();
 
-	ctx->force_config = (num_buffers && total_duration) ? 1 : 0;
+	ctx->force_config = (num_buffers && total_duration) ? GF_TRUE : GF_FALSE;
 	ctx->cfg_num_buffers = num_buffers;
 	ctx->cfg_duration = total_duration;
 	if (ctx->cfg_num_buffers <= 1) ctx->cfg_num_buffers = 2;
@@ -124,7 +124,7 @@
 	if (ctx->use_notif) {
 		for (i=0; i<ctx->num_audio_buffer; i++) CloseHandle(ctx->events[i]);
 	}
-	ctx->use_notif = 0;
+	ctx->use_notif = GF_FALSE;
 }
 
 static void DS_Shutdown(GF_AudioOutput *dr)
@@ -168,9 +168,9 @@
 	/*make sure we're aligned*/
 	while (ctx->buffer_size % ctx->format.nBlockAlign) ctx->buffer_size++;
 
-	ctx->use_notif = 1;
+	ctx->use_notif = GF_TRUE;
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Audio", "DisableNotification");
-	if (sOpt && !stricmp(sOpt, "yes")) ctx->use_notif = 0;
+	if (sOpt && !stricmp(sOpt, "yes")) ctx->use_notif = GF_FALSE;
 
 	memset(&dsbBufferDesc, 0, sizeof(DSBUFFERDESC));
 	dsbBufferDesc.dwSize = sizeof (DSBUFFERDESC);
@@ -205,7 +205,7 @@
 	if (FAILED(hr)) {
 retry:
 		if (ctx->use_notif) gf_modules_set_option((GF_BaseInterface *)dr, "Audio", "DisableNotification", "yes");
-		ctx->use_notif = 0;
+		ctx->use_notif = GF_FALSE;
 		dsbBufferDesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS;
 		hr = ctx->pDS->lpVtbl->CreateSoundBuffer(ctx->pDS, &dsbBufferDesc, &ctx->pOutput, NULL );
 		if (FAILED(hr)) {
@@ -242,7 +242,7 @@
 
 			pNotify->lpVtbl->Release(pNotify);
 		} else {
-			ctx->use_notif = 0;
+			ctx->use_notif = GF_FALSE;
 		}
 	}
 	if (ctx->use_notif) {
@@ -268,9 +268,9 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectSound] buffer lost\n"));
 		pDSBuffer->lpVtbl->Restore(pDSBuffer);
 		pDSBuffer->lpVtbl->GetStatus(pDSBuffer, &dwStatus);
-		if( dwStatus & DSBSTATUS_BUFFERLOST ) return 1;
+		if( dwStatus & DSBSTATUS_BUFFERLOST ) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -433,9 +433,13 @@
 	if( FAILED( hr = CoInitialize(NULL) ) ) return NULL;
 
 
-	ctx = gf_malloc(sizeof(DSContext));
+	ctx = (DSContext*)gf_malloc(sizeof(DSContext));
 	memset(ctx, 0, sizeof(DSContext));
+#ifdef UNICODE
+	ctx->hDSoundLib = LoadLibrary(L"dsound.dll");
+#else
 	ctx->hDSoundLib = LoadLibrary("dsound.dll");
+#endif
 	if (ctx->hDSoundLib) {
 		ctx->DirectSoundCreate = (DIRECTSOUNDCREATEPROC) GetProcAddress(ctx->hDSoundLib, "DirectSoundCreate");
 	}
@@ -446,7 +450,7 @@
 	}
 
 
-	driv = gf_malloc(sizeof(GF_AudioOutput));
+	driv = (GF_AudioOutput*)gf_malloc(sizeof(GF_AudioOutput));
 	memset(driv, 0, sizeof(GF_AudioOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "DirectSound Audio Output", "gpac distribution");
 
@@ -464,7 +468,7 @@
 	driv->WriteAudio = DS_WriteAudio;
 	driv->QueryOutputSampleRate = DS_QueryOutputSampleRate;
 	/*never threaded*/
-	driv->SelfThreaded = 0;
+	driv->SelfThreaded = GF_FALSE;
 	return driv;
 }

v0.5.2.tar.gz/modules/dx_hw/dx_hw.h -> v0.6.1.tar.gz/modules/dx_hw/dx_hw.h Changed

v0.5.2.tar.gz/modules/dx_hw/dx_video.c -> v0.6.1.tar.gz/modules/dx_hw/dx_video.c Changed

@@ -30,12 +30,25 @@
 
 
 #ifdef _WIN32_WCE
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 #endif
+#elif defined(GPAC_USE_GLES2)
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+//# pragma comment(lib, "libGLESv2")
+# pragma comment(lib, "libEGL")
+
+
 #else
 #include <GL/gl.h>
+
+# pragma comment(lib, "opengl32")
+
+
 #endif
 
+
 #define DDCONTEXT	DDContext *dd = (DDContext *)dr->opaque;
 
 
@@ -92,7 +105,7 @@
 static void dd_init_gl_offscreen(GF_VideoOutput *driv)
 {
 	const char *opt;
-	DDContext *dd = driv->opaque;
+	DDContext *dd = (DDContext*)driv->opaque;
 
 	opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode");
 
@@ -129,8 +142,12 @@
 #ifdef _WIN32_WCE
 			dd->gl_hwnd = CreateWindow(_T("GPAC DirectDraw Output"), _T("GPAC OpenGL Offscreen"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle(_T("gm_dx_hw.dll")), NULL);
 #else
+#ifdef UNICODE
+			dd->gl_hwnd = CreateWindow(L"GPAC DirectDraw Output", L"GPAC OpenGL Offscreen", WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle(L"gm_dx_hw.dll"), NULL);
+#else
 			dd->gl_hwnd = CreateWindow("GPAC DirectDraw Output", "GPAC OpenGL Offscreen", WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle("gm_dx_hw.dll"), NULL);
 #endif
+#endif
 			if (!dd->gl_hwnd)
 				return;
 
@@ -147,7 +164,7 @@
 static void RestoreWindow(DDContext *dd)
 {
 	if (!dd->NeedRestore) return;
-	dd->NeedRestore = 0;
+	dd->NeedRestore = GF_FALSE;
 
 #ifndef GPAC_DISABLE_3D
 	if (dd->output_3d_type==1) {
@@ -158,7 +175,7 @@
 #endif
 
 		dd->pDD->lpVtbl->SetCooperativeLevel(dd->pDD, dd->cur_hwnd, DDSCL_NORMAL);
-	dd->NeedRestore = 0;
+	dd->NeedRestore = GF_FALSE;
 
 //	SetForegroundWindow(dd->cur_hwnd);
 	SetFocus(dd->cur_hwnd);
@@ -173,12 +190,12 @@
 		memset(&dd->rgb_pool, 0, sizeof(DDSurface));
 		SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
 		memset(&dd->yuv_pool, 0, sizeof(DDSurface));
-		dd->yuv_pool.is_yuv = 1;
+		dd->yuv_pool.is_yuv = GF_TRUE;
 
 		SAFE_DD_RELEASE(dd->pPrimary);
 		SAFE_DD_RELEASE(dd->pBack);
 		SAFE_DD_RELEASE(dd->pDD);
-		dd->ddraw_init = 0;
+		dd->ddraw_init = GF_FALSE;
 
 #ifdef GPAC_DISABLE_3D
 	}
@@ -189,7 +206,7 @@
 	}
 
 	/*delete openGL context*/
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
 	if (dd->eglctx) eglDestroyContext(dd->egldpy, dd->eglctx);
 	dd->eglctx = NULL;
 	if (dd->surface) eglDestroySurface(dd->egldpy, dd->surface);
@@ -234,7 +251,7 @@
 
 void DestroyObjects(DDContext *dd)
 {
-	DestroyObjectsEx(dd, 0);
+	DestroyObjectsEx(dd, GF_FALSE);
 }
 
 #ifndef GPAC_DISABLE_3D
@@ -246,7 +263,7 @@
 	Bool hw_reset = GF_FALSE;
 	DDCONTEXT
 
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
 	EGLint major, minor;
 	EGLint n;
 	EGLConfig configs[1];
@@ -272,8 +289,13 @@
 	egl_atts[i++] = nb_bits;
 	egl_atts[i++] = EGL_STENCIL_SIZE;
 	egl_atts[i++] = EGL_DONT_CARE;
+
+	egl_atts[i++] = EGL_RENDERABLE_TYPE;
+	egl_atts[i++] = EGL_OPENGL_ES2_BIT;
+
 	egl_atts[i++] = EGL_NONE;
 
+
 	/*already setup*/
 	DestroyObjects(dd);
 	dd->gl_HDC = (NativeDisplayType) GetDC(dd->cur_hwnd);
@@ -283,7 +305,20 @@
 	dd->eglconfig = configs[0];
 	dd->surface = eglCreateWindowSurface(dd->egldpy, dd->eglconfig, dd->cur_hwnd, 0);
 	if (!dd->surface) return GF_IO_ERR;
+
+#ifdef GPAC_USE_GLES2
+
+	i=0;
+	egl_atts[i++] = EGL_CONTEXT_CLIENT_VERSION;
+	egl_atts[i++] = 2;
+	egl_atts[i++] = EGL_NONE;
+
+	eglBindAPI(EGL_OPENGL_ES_API);
+	dd->eglctx = eglCreateContext(dd->egldpy, dd->eglconfig, NULL, 	egl_atts);
+#else
 	dd->eglctx = eglCreateContext(dd->egldpy, dd->eglconfig, NULL, NULL);
+#endif
+
 	if (!dd->eglctx) {
 		eglDestroySurface(dd->egldpy, dd->surface);
 		dd->surface = 0L;
@@ -314,7 +349,7 @@
 	dd->bound_hwnd = target_hwnd;
 
 	/*cleanup*/
-	DestroyObjectsEx(dd, (dd->output_3d_type==1) ? 0 : 1);
+	DestroyObjectsEx(dd, (dd->output_3d_type==1) ? GF_FALSE : GF_TRUE);
 
 	//first time we init GL: create a dummy window to select pixel format for high bpp - we must do this because
 	//- we must get a valid GL context to query the extensions for bpp > 8 (regular choosePixelFormat does not work for them)
@@ -329,7 +364,11 @@
 			dd->bpp = atoi(sOpt);
 		}
 		if (dd->bpp > 8) {
+#ifdef UNICODE
+			highbpp_hwnd = CreateWindow(L"GPAC DirectDraw Output", L"dummy", WS_POPUP, 0, 0, 128, 128, NULL, NULL, NULL /* GetModuleHandle("gm_dx_hw.dll")*/, NULL);
+#else
 			highbpp_hwnd = CreateWindow("GPAC DirectDraw Output", "dummy", WS_POPUP, 0, 0, 128, 128, NULL, NULL, NULL /* GetModuleHandle("gm_dx_hw.dll")*/, NULL);
+#endif
 			dd->gl_HDC = GetDC(highbpp_hwnd);
 
 			memset(&pfd, 0, sizeof(pfd));
@@ -365,12 +404,12 @@
 	dd->gl_HDC = GetDC(dd->bound_hwnd);
 	if (!dd->gl_HDC) return GF_IO_ERR;
 
-	use_double_buffer = 0;
+	use_double_buffer = GF_FALSE;
 	if (dd->gl_double_buffer ) {
 		use_double_buffer = dd->gl_double_buffer;
 	} else {
 		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "UseGLDoubleBuffering");
-		if (!sOpt || !strcmp(sOpt, "yes")) use_double_buffer = 1;
+		if (!sOpt || !strcmp(sOpt, "yes")) use_double_buffer = GF_TRUE;
 	}
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
@@ -457,7 +496,7 @@
 	if (!dd->gl_HRC) return GF_IO_ERR;
 
 	if (!dd->glext_init) {
-		dd->glext_init=1;
+		dd->glext_init = GF_TRUE;
 		wglMakeCurrent(dd->gl_HDC, dd->gl_HRC);
 		dd_init_gl_offscreen(dr);
 	}
@@ -510,12 +549,15 @@
 	for our plugin window - avoid this by overriding the WindowProc once OpenGL is setup!!*/
 	if ((dd->bound_hwnd==dd->os_hwnd) && dd->orig_wnd_proc)
 #ifdef _WIN64
-		SetWindowLongPtr(dd->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
+		SetWindowLongPtr(dd->os_hwnd, GWLP_WNDPROC, (LPARAM) DD_WindowProc);
 #else
 		SetWindowLong(dd->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
 #endif
 
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 exit:
+#endif
+
 	if (dd->output_3d_type==1) {
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_VIDEO_SETUP;
@@ -573,6 +615,26 @@
 	DD_ShutdownWindow(dr);
 }
 
+void DD_ShowTaskbar(Bool show)
+{
+#ifdef UNICODE
+	HWND tbwnd = FindWindow(L"Shell_TrayWnd", NULL);
+	HWND swnd = FindWindow(L"Button", NULL);
+#else
+	HWND tbwnd = FindWindow("Shell_TrayWnd", NULL);
+	HWND swnd = FindWindow("Button", NULL);
+#endif
+
+	if (tbwnd != NULL) {
+		ShowWindow(tbwnd, show ? SW_SHOW : SW_HIDE);
+		UpdateWindow(tbwnd);
+	}
+	if (swnd != NULL) {
+		// Vista
+		ShowWindow(swnd, show ? SW_SHOW : SW_HIDE);
+		UpdateWindow(swnd);
+	}
+}
 static GF_Err DD_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
 {
 	GF_Err e;
@@ -589,10 +651,10 @@
 
 	/*whenever changing card display mode relocate fastest YUV format for blit (since it depends
 	on the dest pixel format)*/
-	dd->yuv_init = 0;
+	dd->yuv_init = GF_FALSE;
 	if (dd->fullscreen) {
 		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "SwitchResolution");
-		if (sOpt && !stricmp(sOpt, "yes")) dd->switch_res = 1;
+		if (sOpt && !stricmp(sOpt, "yes")) dd->switch_res = GF_TRUE;
 		/*get current or best fitting mode*/
 		if (GetDisplayMode(dd) != GF_OK) return GF_IO_ERR;
 	}
@@ -617,60 +679,71 @@
 		ShowWindow(dd->cur_hwnd, SW_SHOW);
 	}
 
-#ifndef GPAC_DISABLE_3D
-	if (dd->output_3d_type==1) {
-		e = GF_OK;
-		dd->on_secondary_screen = 0;
-		/*Setup FS*/
-		if (dd->fullscreen) {
-			int X = 0;
-			int Y = 0;
+
+	dd->on_secondary_screen = GF_FALSE;
+	/*Setup FS*/
+	if (dd->fullscreen) {
+		int X = 0;
+		int Y = 0;
 #if(WINVER >= 0x0500)
-			HMONITOR hMonitor;
-			MONITORINFOEX minfo;
-			/*get monitor our windows is on*/
-			hMonitor = MonitorFromWindow(dd->os_hwnd, MONITOR_DEFAULTTONEAREST);
-			if (hMonitor) {
-				memset(&minfo, 0, sizeof(MONITORINFOEX));
-				minfo.cbSize = sizeof(MONITORINFOEX);
-				/*get monitor top-left for fullscreen switch, and adjust width and height*/
-				GetMonitorInfo(hMonitor, (LPMONITORINFO) &minfo);
-				dd->fs_width = minfo.rcWork.right - minfo.rcWork.left;
-				dd->fs_height = minfo.rcWork.bottom - minfo.rcWork.top;
-				X = minfo.rcWork.left;
-				Y = minfo.rcWork.top;
-				if (!(minfo.dwFlags & MONITORINFOF_PRIMARY)) dd->on_secondary_screen = 1;
+		HMONITOR hMonitor;
+		MONITORINFOEX minfo;
+
+		DD_ShowTaskbar(GF_FALSE);
+
+		/*get monitor our windows is on*/
+		hMonitor = MonitorFromWindow(dd->os_hwnd, MONITOR_DEFAULTTONEAREST);
+		if (hMonitor) {
+			memset(&minfo, 0, sizeof(MONITORINFOEX));
+			minfo.cbSize = sizeof(MONITORINFOEX);
+			/*get monitor top-left for fullscreen switch, and adjust width and height*/
+			GetMonitorInfo(hMonitor, (LPMONITORINFO) &minfo);
+			dd->fs_width = minfo.rcWork.right - minfo.rcWork.left;
+			dd->fs_height = minfo.rcWork.bottom - minfo.rcWork.top;
+			X = minfo.rcWork.left;
+			Y = minfo.rcWork.top;
+
+			if (dd->fs_height+100 > dr->max_screen_height) {
+				dd->fs_height = dr->max_screen_height;
+				Y = 0;
 			}
+			if (!(minfo.dwFlags & MONITORINFOF_PRIMARY)) dd->on_secondary_screen = GF_TRUE;
+		}
 #endif
 
-			/*change display mode*/
-			if ((MaxWidth && (dd->fs_width >= MaxWidth)) || (MaxHeight && (dd->fs_height >= MaxHeight)) ) {
-				dd->fs_width = MaxWidth;
-				dd->fs_height = MaxHeight;
-			}
-			SetWindowPos(dd->cur_hwnd, NULL, X, Y, dd->fs_width, dd->fs_height, SWP_SHOWWINDOW | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
-
-			dd->fs_store_width = dd->fs_width;
-			dd->fs_store_height = dd->fs_height;
-		} else if (dd->os_hwnd==dd->fs_hwnd) {
-			SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_NOMOVE | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
+		/*change display mode*/
+		if ((MaxWidth && (dd->fs_width >= MaxWidth)) || (MaxHeight && (dd->fs_height >= MaxHeight)) ) {
+			dd->fs_width = MaxWidth;
+			dd->fs_height = MaxHeight;
 		}
+		SetWindowPos(dd->cur_hwnd, NULL, X, Y, dd->fs_width, dd->fs_height, SWP_SHOWWINDOW | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
+	} else if (dd->os_hwnd==dd->fs_hwnd) {
+		SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_SHOWWINDOW | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
+	}
+	if (!dd->fullscreen || dd->on_secondary_screen) {
+		DD_ShowTaskbar(GF_TRUE);
+	}
 
-		if (!e) e = DD_SetupOpenGL(dr, 0, 0);
 
+#ifndef GPAC_DISABLE_3D
+	if (dd->output_3d_type==1) {
+		e = DD_SetupOpenGL(dr, 0, 0);
 	} else
 #endif
 	{
-
 		if (!dd->fullscreen && (dd->os_hwnd==dd->fs_hwnd)) {
-			SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_NOZORDER | SWP_NOMOVE | SWP_ASYNCWINDOWPOS);
+//			SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_NOZORDER | SWP_NOMOVE | SWP_ASYNCWINDOWPOS);
 		}
 		/*first time FS, store*/
 		if (!dd->store_width) {
 			dd->store_width = dd->width;
 			dd->store_height = dd->height;
 		}
-		e = InitDirectDraw(dr, dd->store_width, dd->store_height);
+		if (dd->fullscreen) {
+			e = InitDirectDraw(dr, dd->fs_width, dd->fs_height);
+		} else {
+			e = InitDirectDraw(dr, dd->store_width, dd->store_height);
+		}
 	}
 
 	if (bOn) {
@@ -701,7 +774,7 @@
 #ifndef GPAC_DISABLE_3D
 
 	if (dd->output_3d_type==1) {
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
 		if (dd->surface) eglSwapBuffers(dd->egldpy, dd->surface);
 #else
 		SwapBuffers(dd->gl_HDC);
@@ -716,13 +789,13 @@
 	if (!dd->fullscreen && dd->windowless) {
 		HDC hdc;
 		/*lock backbuffer HDC*/
-		dr->LockOSContext(dr, 1);
+		dr->LockOSContext(dr, GF_TRUE);
 		/*get window hdc and copy from backbuffer to window*/
 		hdc = GetDC(dd->os_hwnd);
-		BitBlt(hdc, 0, 0, dd->width, dd->height, dd->lock_hdc, 0, 0, SRCCOPY );
+		BitBlt(hdc, 0, 0, dd->width, dd->height, dd->lock_hdc, 0, 0, SRCCOPY);
 		ReleaseDC(dd->os_hwnd, hdc);
 		/*unlock backbuffer HDC*/
-		dr->LockOSContext(dr, 0);
+		dr->LockOSContext(dr, GF_FALSE);
 		return GF_OK;
 	}
 
@@ -774,12 +847,12 @@
 {
 	if (dd->switch_res && dd->DirectDrawCreate) {
 		HRESULT hr;
-		Bool temp_dd = 0;;
+		Bool temp_dd = GF_FALSE;
 		if (!dd->pDD) {
 			LPDIRECTDRAW ddraw;
 			dd->DirectDrawCreate(NULL, &ddraw, NULL);
 			ddraw->lpVtbl->QueryInterface(ddraw, &IID_IDirectDraw7, (LPVOID *)&dd->pDD);
-			temp_dd = 1;
+			temp_dd = GF_TRUE;
 		}
 		//we start with a hugde res and downscale
 		dd->fs_width = dd->fs_height = 50000;
@@ -804,7 +877,7 @@
 	memset(driv, 0, sizeof(GF_VideoOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "DirectX Video Output", "gpac distribution");
 
-	pCtx = gf_malloc(sizeof(DDContext));
+	pCtx = (DDContext*)gf_malloc(sizeof(DDContext));
 	memset(pCtx, 0, sizeof(DDContext));
 	driv->opaque = pCtx;
 	driv->Flush = DD_Flush;
@@ -813,7 +886,11 @@
 	driv->SetFullScreen = DD_SetFullScreen;
 	driv->ProcessEvent = DD_ProcessEvent;
 
+#ifdef UNICODE
+	pCtx->hDDrawLib = LoadLibrary(L"ddraw.dll");
+#else
 	pCtx->hDDrawLib = LoadLibrary("ddraw.dll");
+#endif
 	if (pCtx->hDDrawLib) {
 		pCtx->DirectDrawCreate = (DIRECTDRAWCREATEPROC) GetProcAddress(pCtx->hDDrawLib, "DirectDrawCreate");
 	}
@@ -833,6 +910,10 @@
 	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
 	DDContext *dd = (DDContext *)driv->opaque;
 
+	if (dd->fullscreen) {
+		DD_ShowTaskbar(GF_TRUE);
+	}
+
 	if (dd->hDDrawLib) {
 		FreeLibrary(dd->hDDrawLib);
 	}
@@ -856,8 +937,8 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return NewDXVideoOutput();
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return NewAudioOutput();
+	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface*)NewDXVideoOutput();
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return (GF_BaseInterface*)NewAudioOutput();
 	return NULL;
 }
 /*interface destroy*/

v0.5.2.tar.gz/modules/dx_hw/dx_window.c -> v0.6.1.tar.gz/modules/dx_hw/dx_window.c Changed

@@ -26,6 +26,7 @@
 
 #include "dx_hw.h"
 #include <gpac/user.h>
+#include <gpac/utf.h>
 #include "resource.h"
 
 /*crude redef of winuser.h due to windows/winsock2 conflicts*/
@@ -460,7 +461,7 @@
 
 LRESULT APIENTRY DD_WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	Bool ret = 1;
+	Bool ret = GF_TRUE;
 	GF_Event evt;
 	DDContext *ctx;
 #ifdef _WIN64
@@ -477,11 +478,11 @@
 		if (wParam==SIZE_MINIMIZED) {
 			evt.type = GF_EVENT_SHOWHIDE_NOTIF;
 			evt.show.show_type = 0;
-			ctx->hidden = 1;
+			ctx->hidden = GF_TRUE;
 			vout->on_event(vout->evt_cbk_hdl, &evt);
 		} else {
 			if (ctx->hidden && wParam==SIZE_RESTORED) {
-				ctx->hidden = 0;
+				ctx->hidden = GF_FALSE;
 				evt.type = GF_EVENT_SHOWHIDE_NOTIF;
 				evt.show.show_type = 1;
 				vout->on_event(vout->evt_cbk_hdl, &evt);
@@ -519,10 +520,10 @@
 		}
 		break;
 	case WM_DISPLAYCHANGE:
-		ctx->dd_lost = 1;
+		ctx->dd_lost = GF_TRUE;
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_VIDEO_SETUP;
-		evt.setup.back_buffer = 1;
+		evt.setup.back_buffer = GF_TRUE;
 		vout->on_event(vout->evt_cbk_hdl, &evt);
 		break;
 
@@ -541,15 +542,15 @@
 	case WM_ACTIVATEAPP:
 #endif
 		if (hWnd==ctx->os_hwnd) {
-			ctx->has_focus = 1;
+			ctx->has_focus = GF_TRUE;
 			SetFocus(hWnd);
 		}
 		break;
 	case WM_KILLFOCUS:
-		if (hWnd==ctx->os_hwnd) ctx->has_focus = 0;
+		if (hWnd==ctx->os_hwnd) ctx->has_focus = GF_FALSE;
 		break;
 	case WM_SETFOCUS:
-		if (hWnd==ctx->os_hwnd) ctx->has_focus = 1;
+		if (hWnd==ctx->os_hwnd) ctx->has_focus = GF_TRUE;
 		break;
 	case WM_IME_SETCONTEXT:
 		if ((hWnd==ctx->os_hwnd) && (wParam!=0) && !ctx->fullscreen) SetFocus(hWnd);
@@ -581,9 +582,14 @@
 		HDROP hDrop = (HDROP) wParam;
 		evt.type = GF_EVENT_DROPFILE;
 		evt.open_file.nb_files = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
-		evt.open_file.files = gf_malloc(sizeof(char *)*evt.open_file.nb_files);
+		evt.open_file.files = (char**)gf_malloc(sizeof(char *)*evt.open_file.nb_files);
 		for (i=0; i<evt.open_file.nb_files; i++) {
+#ifdef UNICODE
+			/* TODO: Fix by converting to WC */
 			u32 res = DragQueryFile(hDrop, i, szFile, GF_MAX_PATH);
+#else
+			u32 res = DragQueryFile(hDrop, i, szFile, GF_MAX_PATH);
+#endif
 			evt.open_file.files[i] = res ? gf_strdup(szFile) : NULL;
 		}
 		DragFinish(hDrop);
@@ -629,7 +635,7 @@
 		evt.mouse.button = GF_MOUSE_LEFT;
 		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 		if (!ctx->has_focus && (hWnd==ctx->os_hwnd)) {
-			ctx->has_focus = 1;
+			ctx->has_focus = GF_TRUE;
 			SetFocus(ctx->os_hwnd);
 		}
 		break;
@@ -648,7 +654,7 @@
 		evt.mouse.button = GF_MOUSE_RIGHT;
 		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 		if (!ctx->has_focus && (hWnd==ctx->os_hwnd)) {
-			ctx->has_focus = 1;
+			ctx->has_focus = GF_TRUE;
 			SetFocus(ctx->os_hwnd);
 		}
 		break;
@@ -668,7 +674,7 @@
 		DD_GetCoordinates(lParam, &evt);
 		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 		if (!ctx->has_focus && (hWnd==ctx->os_hwnd)) {
-			ctx->has_focus = 1;
+			ctx->has_focus = GF_TRUE;
 			SetFocus(ctx->os_hwnd);
 		}
 		break;
@@ -729,8 +735,8 @@
 	case WM_KEYDOWN:
 		w32_translate_key(wParam, lParam, &evt.key);
 		evt.type = ((msg==WM_SYSKEYDOWN) || (msg==WM_KEYDOWN)) ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
-		if (evt.key.key_code==GF_KEY_ALT) ctx->alt_down = (evt.type==GF_EVENT_KEYDOWN) ? 1 : 0;
-		if (evt.key.key_code==GF_KEY_CONTROL) ctx->ctrl_down = (evt.type==GF_EVENT_KEYDOWN) ? 1 : 0;
+		if (evt.key.key_code==GF_KEY_ALT) ctx->alt_down = (evt.type==GF_EVENT_KEYDOWN) ? GF_TRUE : GF_FALSE;
+		if (evt.key.key_code==GF_KEY_CONTROL) ctx->ctrl_down = (evt.type==GF_EVENT_KEYDOWN) ? GF_TRUE : GF_FALSE;
 		if ((ctx->os_hwnd==ctx->fs_hwnd) && ctx->alt_down && (evt.key.key_code==GF_KEY_F4)) {
 			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_QUIT;
@@ -742,9 +748,16 @@
 
 			hglbCopy = GetClipboardData(CF_TEXT);
 			if (hglbCopy) {
-				LPTSTR lptstrCopy = (char *) GlobalLock(hglbCopy);
+#ifdef UNICODE
+				LPTSTR lptstrCopy = (wchar_t *) GlobalLock(hglbCopy);
+				evt.type = GF_EVENT_PASTE_TEXT;
+				/* TODO: Convert to UTF-8 */
+				evt.message.message = lptstrCopy;
+#else
+				LPTSTR lptstrCopy = (char *)GlobalLock(hglbCopy);
 				evt.type = GF_EVENT_PASTE_TEXT;
 				evt.message.message = lptstrCopy;
+#endif
 				ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 				GlobalUnlock(hglbCopy);
 			}
@@ -765,9 +778,16 @@
 				if (!len) break;
 
 				hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(char));
+#ifdef UNICODE
+				/* TODO fix encoding*/
+				lptstrCopy = (wchar_t *)GlobalLock(hglbCopy);
+				memcpy(lptstrCopy, evt.message.message, len * sizeof(char));
+				lptstrCopy[len] = 0;
+#else
 				lptstrCopy = (char *) GlobalLock(hglbCopy);
 				memcpy(lptstrCopy, evt.message.message, len * sizeof(char));
 				lptstrCopy[len] = 0;
+#endif
 				GlobalUnlock(hglbCopy);
 				SetClipboardData(CF_TEXT, hglbCopy);
 				CloseClipboard();
@@ -778,7 +798,7 @@
 
 		if ( !ctx->ctrl_down && !ctx->alt_down
 		 && evt.key.key_code != GF_KEY_CONTROL && evt.key.key_code != GF_KEY_ALT )
-			ret = 1;
+			ret = GF_TRUE;
 		break;
 
 	case WM_UNICHAR:
@@ -832,7 +852,11 @@
 	if (!isWin2K) return;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX Out] Enabling windowless mode\n"));
+#ifdef UNICODE
+	hUser32 = GetModuleHandle(L"USER32.DLL");
+#else
 	hUser32 = GetModuleHandle("USER32.DLL");
+#endif
 	if (hUser32 == NULL) return;
 
 	_SetLayeredWindowAttributes = (typSetLayeredWindowAttributes) GetProcAddress(hUser32,"SetLayeredWindowAttributes");
@@ -865,7 +889,7 @@
 Bool DD_InitWindows(GF_VideoOutput *vout, DDContext *ctx)
 {
 	u32 flags;
-	Bool use_fs_wnd = 1;
+	Bool use_fs_wnd = GF_TRUE;
 #ifndef _WIN32_WCE
 	RECT rc;
 #endif
@@ -873,7 +897,11 @@
 	HINSTANCE hInst;
 
 #ifndef _WIN32_WCE
+#ifdef UNICODE
+	hInst = GetModuleHandle(L"gm_dx_hw.dll");
+#else
 	hInst = GetModuleHandle("gm_dx_hw.dll");
+#endif
 #else
 	hInst = GetModuleHandle(_T("gm_dx_hw.dll"));
 #endif
@@ -882,7 +910,11 @@
 #ifndef _WIN32_WCE
 	wc.style = CS_BYTEALIGNWINDOW;
 	wc.hIcon = LoadIcon (hInst, MAKEINTRESOURCE(IDI_OSMO_ICON) );
+#ifdef UNICODE
+	wc.lpszClassName = L"GPAC DirectDraw Output";
+#else
 	wc.lpszClassName = "GPAC DirectDraw Output";
+#endif
 #else
 	wc.lpszClassName = _T("GPAC DirectDraw Output");
 #endif
@@ -893,12 +925,12 @@
 	RegisterClass (&wc);
 
 	flags = ctx->switch_res;
-	ctx->switch_res = 0;
-	ctx->force_alpha = (flags & GF_TERM_WINDOW_TRANSPARENT) ? 1 : 0;
+	ctx->switch_res = GF_FALSE;
+	ctx->force_alpha = (flags & GF_TERM_WINDOW_TRANSPARENT) ? GF_TRUE : GF_FALSE;
 
 	if (!ctx->os_hwnd) {
 		u32 styles;
-		if (flags & GF_TERM_WINDOWLESS) ctx->windowless = 1;
+		if (flags & GF_TERM_WINDOWLESS) ctx->windowless = GF_TRUE;
 
 
 #ifdef _WIN32_WCE
@@ -912,12 +944,16 @@
 		} else {
 			styles = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW;
 		}
-		use_fs_wnd=0;
+		use_fs_wnd = GF_FALSE;
+#ifdef UNICODE
+		ctx->os_hwnd = CreateWindow(L"GPAC DirectDraw Output", L"GPAC DirectDraw Output", styles, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
+#else
 		ctx->os_hwnd = CreateWindow("GPAC DirectDraw Output", "GPAC DirectDraw Output", styles, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
+#endif
 		ctx->backup_styles = styles;
 #endif
 		if (ctx->os_hwnd == NULL) {
-			return 0;
+			return GF_FALSE;
 		}
 		DragAcceptFiles(ctx->os_hwnd, TRUE);
 
@@ -939,7 +975,7 @@
 		ctx->off_w = rc.right - rc.left - 100;
 		ctx->off_h = rc.bottom - rc.top - 100;
 #endif
-		ctx->owns_hwnd = 1;
+		ctx->owns_hwnd = GF_TRUE;
 
 		if (ctx->windowless) SetWindowless(vout, ctx->os_hwnd);
 	}
@@ -948,14 +984,18 @@
 #ifdef _WIN32_WCE
 		ctx->fs_hwnd = CreateWindow(_T("GPAC DirectDraw Output"), _T("GPAC DirectDraw FS Output"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
 #else
+#ifdef UNICODE
+		ctx->fs_hwnd = CreateWindow(L"GPAC DirectDraw Output", L"GPAC DirectDraw FS Output", WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
+#else
 		ctx->fs_hwnd = CreateWindow("GPAC DirectDraw Output", "GPAC DirectDraw FS Output", WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
 #endif
+#endif
 		if (!ctx->fs_hwnd) {
-			return 0;
+			return GF_FALSE;
 		}
 		ShowWindow(ctx->fs_hwnd, SW_HIDE);
 #ifdef _WIN64
-		SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) vout);
+		SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG_PTR) vout);
 #else
 		SetWindowLong(ctx->fs_hwnd, GWL_USERDATA, (LONG) vout);
 #endif
@@ -966,9 +1006,9 @@
 	/*if visible set focus*/
 	if (!ctx->switch_res) SetFocus(ctx->os_hwnd);
 
-	ctx->switch_res = 0;
+	ctx->switch_res = GF_FALSE;
 #ifdef _WIN64
-	SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) vout);
+	SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG_PTR) vout);
 #else
 	SetWindowLong(ctx->os_hwnd, GWL_USERDATA, (LONG) vout);
 #endif
@@ -978,14 +1018,14 @@
 	ctx->curs_hand = LoadCursor(hInst, MAKEINTRESOURCE(IDC_HAND_PTR));
 	ctx->curs_collide = LoadCursor(hInst, MAKEINTRESOURCE(IDC_COLLIDE));
 	ctx->cursor_type = GF_CURSOR_NORMAL;
-	return 1;
+	return GF_TRUE;
 }
 
 u32 DD_WindowThread(void *par)
 {
 	MSG msg;
 
-	GF_VideoOutput *vout = par;
+	GF_VideoOutput *vout = (GF_VideoOutput*)par;
 	DDContext *ctx = (DDContext *)vout->opaque;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[DirectXOutput] Entering thread ID %d\n", gf_th_id() ));
@@ -1001,7 +1041,21 @@
 			DispatchMessage (&(msg));
 
 			if (ctx->caption) {
+#ifdef UNICODE
+				char *str_src = ctx->caption;
+				wchar_t *wcaption;
+				size_t len;
+				size_t len_res;
+				len = (strlen(str_src) + 1)*sizeof(wchar_t);
+				wcaption = (wchar_t *)gf_malloc(len);
+				len_res = gf_utf8_mbstowcs(wcaption, len, &str_src);
+				if (len_res != -1) {
+					SetWindowTextW(ctx->os_hwnd, wcaption);
+				}
+				gf_free(wcaption);
+#else
 				SetWindowText(ctx->os_hwnd, ctx->caption);
+#endif
 				gf_free(ctx->caption);
 				ctx->caption = NULL;
 			}
@@ -1022,10 +1076,10 @@
 		if (!(flags & GF_TERM_NO_WINDOWPROC_OVERRIDE) ) {
 #ifdef _WIN64
 			ctx->orig_wnd_proc = GetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC);
-			SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
+			SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, (LONG_PTR) DD_WindowProc);
 #else
 			ctx->orig_wnd_proc = GetWindowLong(ctx->os_hwnd, GWL_WNDPROC);
-			SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
+			SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, (LONG) DD_WindowProc);
 #endif
 		}
 		ctx->parent_wnd = GetParent(ctx->os_hwnd);
@@ -1068,8 +1122,8 @@
 	if (ctx->fs_hwnd != ctx->os_hwnd) {
 		dd_closewindow(ctx->fs_hwnd);
 #ifdef _WIN64
-		SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) NULL);
-		SetWindowLongPtr(ctx->fs_hwnd, GWLP_WNDPROC, (DWORD) DefWindowProc);
+		SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG_PTR) NULL);
+		SetWindowLongPtr(ctx->fs_hwnd, GWLP_WNDPROC, (LONG_PTR) DefWindowProc);
 #else
 		SetWindowLong(ctx->fs_hwnd, GWL_USERDATA, (LONG) NULL);
 		SetWindowLong(ctx->fs_hwnd, GWL_WNDPROC, (DWORD) DefWindowProc);
@@ -1091,7 +1145,7 @@
 	/*special care for Firefox: the windows created by our NP plugin may still be called
 	after the shutdown of the plugin !!*/
 #ifdef _WIN64
-	SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) NULL);
+	SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG_PTR) NULL);
 #else
 	SetWindowLong(ctx->os_hwnd, GWL_USERDATA, (LONG) NULL);
 #endif
@@ -1099,8 +1153,12 @@
 #ifdef _WIN32_WCE
 	UnregisterClass(_T("GPAC DirectDraw Output"), GetModuleHandle(_T("gm_dx_hw.dll")) );
 #else
+#ifdef UNICODE
+	UnregisterClass(L"GPAC DirectDraw Output", GetModuleHandle(L"gm_dx_hw.dll"));
+#else
 	UnregisterClass("GPAC DirectDraw Output", GetModuleHandle("gm_dx_hw.dll"));
 #endif
+#endif
 	ctx->os_hwnd = NULL;
 	ctx->fs_hwnd = NULL;
 #ifndef GPAC_DISABLE_3D
@@ -1170,7 +1228,12 @@
 			MSG msg;
 
 			if (ctx->caption) {
+#ifdef UNICODE
+				/* TODO: Fix by converting UTF-8 to WC */
+				SetWindowText(ctx->os_hwnd, ctx->caption);
+#else
 				SetWindowText(ctx->os_hwnd, ctx->caption);
+#endif
 				gf_free(ctx->caption);
 				ctx->caption = NULL;
 			}
@@ -1236,10 +1299,10 @@
 	/*HW setup*/
 	case GF_EVENT_VIDEO_SETUP:
 		if (ctx->dd_lost) {
-			ctx->dd_lost = 0;
+			ctx->dd_lost = GF_FALSE;
 			DestroyObjects(ctx);
 		}
-		ctx->is_setup=1;
+		ctx->is_setup = GF_TRUE;
 		switch (evt->setup.opengl_mode) {
 		case 0:
 #ifndef GPAC_DISABLE_3D

v0.5.2.tar.gz/modules/epoc_hw/epoc_vout.cpp -> v0.6.1.tar.gz/modules/epoc_hw/epoc_vout.cpp Changed

@@ -30,7 +30,7 @@
 
 #include <w32std.h>
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 #include <GLES/egl.h>
 #endif
 
@@ -47,7 +47,7 @@
 	char *locked_data;
 	u32 output_3d_type;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	EGLDisplay egl_display;
 	EGLSurface egl_surface;
 	EGLContext egl_context;
@@ -60,7 +60,7 @@
 {
 	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	if (ctx->egl_display) {
 		eglMakeCurrent(ctx->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 		if (ctx->egl_context) eglDestroyContext(ctx->egl_display, ctx->egl_context);
@@ -168,7 +168,7 @@
 	ctx->width = s.iWidth;
 	ctx->height = s.iHeight;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	if (ctx->output_3d_type==1) {
 		if (!gl_buffer_size) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Display mode not supported by OpenGL\n"));
@@ -237,7 +237,7 @@
 	return GF_OK;
 }
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 
 static GF_Err EVID_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height)
 {
@@ -356,7 +356,7 @@
 	res = EVID_InitSurface(dr);
 
 	/*setup opengl offscreen*/
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Querying Offscreen OpenGL Capabilities\n"));
 	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
 	GF_Err e = EVID_SetupOGL_ES_Offscreen(dr, 20, 20);
@@ -419,7 +419,7 @@
 	case GF_EVENT_VIDEO_SETUP:
 		((EPOCVideo *)dr->opaque)->output_3d_type = evt->setup.opengl_mode;
 		if (evt->setup.opengl_mode==2) {
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 			return EVID_SetupOGL_ES_Offscreen(dr, evt->setup.width, evt->setup.height);
 #else
 			return GF_NOT_SUPPORTED;
@@ -473,7 +473,7 @@
 
 	/*alpha and keying to do*/
 	driv->hw_caps = 0;
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	/*no offscreen opengl with epoc at the moment*/
 	driv->hw_caps |= GF_VIDEO_HW_OPENGL;
 #endif

v0.5.2.tar.gz/modules/ffmpeg_in/Makefile -> v0.6.1.tar.gz/modules/ffmpeg_in/Makefile Changed

@@ -15,23 +15,34 @@
 endif
 
 LOCAL_LIB=
-LINKLIBS=-lgpac -lz $(ffmpeg_lflags)
+
+LINKFLAGS=$(ffmpeg_lflags)
+
+ifeq ($(STATICBUILD),yes)
+##include static modules and other deps for libgpac
+include ../../static.mak
+LINKFLAGS+=-lgpac_static
+LINKFLAGS+=$(EXTRALIBS)
+else
+LINKFLAGS+=-lgpac
+endif
+
+#common obj
+OBJS=ffmpeg_decode.o ffmpeg_demux.o ffmpeg_load.o
+
 
 #darwin needs bz2
 ifeq ($(CONFIG_DARWIN),yes)
-LINKLIBS+=-lbz2
+LINKFLAGS+=-lbz2
 endif
 
 #old ffmpeg lib
 ifeq ($(CONFIG_FFMPEG_OLD), yes)
 CFLAGS+=-DFFMPEG_OLD_HEADERS -I/usr/include
 else
-LINKLIBS+=-lswscale
+LINKFLAGS+=-lswscale
 endif
 
-#common obj
-OBJS=ffmpeg_decode.o ffmpeg_demux.o ffmpeg_load.o
-
 #local ffmpeg lib
 ifeq ($(CONFIG_FFMPEG), local)
 LOCAL_LIB=-L../../extra_lib/lib/gcc
@@ -45,14 +56,14 @@
 
 SRCS := $(OBJS:.o=.c) 
 
-LIB=gm_ffmpeg_in.$(DYN_LIB_SUFFIX)
+LIB=gm_ffmpeg_in$(DYN_LIB_SUFFIX)
 ifeq ($(CONFIG_WIN32),yes)
 #LDFLAGS+=-export-symbols ffmpeg_in.def 
 endif
 
 #need to add cross-libraries if not local
 ifeq ($(CROSS_COMPILING),yes)
-EXTRALIBS+=-L$(prefix)/lib
+LINKFLAGS+=-L$(prefix)/lib
 endif
 
 
@@ -60,7 +71,7 @@
 
 
 $(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS)
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LINKFLAGS) 
 
 clean: 
 	rm -f $(OBJS) ../../bin/gcc/$(LIB)

v0.5.2.tar.gz/modules/ffmpeg_in/ffmpeg_decode.c -> v0.6.1.tar.gz/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -51,7 +51,7 @@
 	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
 	if (oldBuffer)
 		gf_free(oldBuffer);
-	buffer = gf_malloc( allocatedSz );
+	buffer = (uint8_t*)gf_malloc( allocatedSz );
 	if (buffer)
 		memset( buffer, 0, allocatedSz);
 	return buffer;
@@ -153,7 +153,7 @@
 		u32 i = 0;
 		GF_Descriptor *d = NULL;
 		if (esd->dependsOnESID != ffd->base_ES_ID) return GF_NOT_SUPPORTED;
-		while ((d = gf_list_enum(esd->extensionDescriptors, &i))) {
+		while ((d = (GF_Descriptor*)gf_list_enum(esd->extensionDescriptors, &i))) {
 			if (d->tag == GF_ODF_AUX_VIDEO_DATA) break;
 		}
 		if (!d) return GF_NOT_SUPPORTED;
@@ -204,7 +204,7 @@
 		}
 
 		*codec = avcodec_find_decoder(codec_id);
-		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, 1);
+		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_TRUE);
 		gf_bs_del(bs);
 	}
 	/*private QT DSI*/
@@ -230,7 +230,7 @@
 			(*ctx)->height = gf_bs_read_u16(bs);
 		}
 		(*codec) = ffmpeg_get_codec(codec_id);
-		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, 0);
+		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
 		gf_bs_del(bs);
 	}
 	/*use std MPEG-4 st/oti*/
@@ -261,7 +261,11 @@
 				break;
 			case GPAC_OTI_IMAGE_JPEG:
 				codec_id = CODEC_ID_MJPEG;
-				ffd->is_image=1;
+				ffd->is_image = GF_TRUE;
+				break;
+			case GPAC_OTI_IMAGE_PNG:
+				codec_id = CODEC_ID_PNG;
+				ffd->is_image = GF_TRUE;
 				break;
 			case 0xFF:
 				codec_id = CODEC_ID_SVQ3;
@@ -308,12 +312,12 @@
 					if (dsi.height%2) dsi.height++;
 					(*ctx)->width = dsi.width;
 					(*ctx)->height = dsi.height;
-					if (!dsi.width && !dsi.height) ffd->check_short_header = 1;
+					if (!dsi.width && !dsi.height) ffd->check_short_header = GF_TRUE;
 					ffd->previous_par = (dsi.par_num<<16) | dsi.par_den;
-					ffd->no_par_update = 1;
+					ffd->no_par_update = GF_TRUE;
 #endif
 				} else if (ffd->oti==GPAC_OTI_VIDEO_AVC) {
-					ffd->check_h264_isma = 1;
+					ffd->check_h264_isma = GF_TRUE;
 				}
 
 				/*setup dsi for FFMPEG context BEFORE attaching decoder (otherwise not proper init)*/
@@ -378,7 +382,7 @@
 	if (codec_id == CODEC_ID_RAWVIDEO) {
 		(*ctx)->codec_id = CODEC_ID_RAWVIDEO;
 		(*ctx)->pix_fmt = ffd->raw_pix_fmt;
-		if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
+		if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = GF_TRUE;
 	} else {
 #ifdef USE_AVCTX3
 		if (avcodec_open2((*ctx), (*codec), NULL )<0) return GF_NON_COMPLIANT_BITSTREAM;
@@ -414,8 +418,13 @@
 #if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(51, 20, 0))
 		case CODEC_ID_GIF:
 #endif
+		case CODEC_ID_PNG:
 		case CODEC_ID_RAWVIDEO:
-			ffd->pix_fmt = GF_PIXEL_RGB_24;
+			if ((*ctx)->pix_fmt==PIX_FMT_YUV420P) {
+				ffd->pix_fmt = GF_PIXEL_YV12;
+			} else {
+				ffd->pix_fmt = GF_PIXEL_RGB_24;
+			}
 			break;
 
 		case CODEC_ID_DVD_SUBTITLE:
@@ -462,12 +471,12 @@
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Systems", "Output8bit");
 	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)plug, "Systems", "Output8bit", (ffd->display_bpp>8) ? "no" : "yes");
-	if (sOpt && !strcmp(sOpt, "yes")) ffd->output_as_8bit = 1;
+	if (sOpt && !strcmp(sOpt, "yes")) ffd->output_as_8bit = GF_TRUE;
 
 	if (ffd->output_as_8bit && (ffd->stride > (u32) (*ctx)->width)) {
 		ffd->stride /=2;
 		ffd->out_size /= 2;
-		ffd->conv_to_8bit = 1;
+		ffd->conv_to_8bit = GF_TRUE;
 	}
 
 	return GF_OK;
@@ -590,6 +599,8 @@
 	case GF_CODEC_STRIDE:
 		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24)
 			capability->cap.valueInt = ffd->stride*3;
+		else if (ffd->out_pix_fmt==GF_PIXEL_RGBA)
+			capability->cap.valueInt = ffd->stride*4;
 		else if (ffd->conv_buffer)
 			capability->cap.valueInt = ffd->base_ctx->width;
 		else
@@ -675,7 +686,7 @@
 #ifdef FFMPEG_SWSCALE
 	struct SwsContext **cached_sws;
 #endif
-	FFDec *ffd = plug->privateStack;
+	FFDec *ffd = (FFDec*)plug->privateStack;
 #ifdef FFMPEG_SWSCALE
 	cached_sws = &(ffd->base_sws);
 #endif
@@ -850,7 +861,7 @@
 		}
 		if (inBufferLength) {
 			*outBufferLength = ffd->out_size;
-			assert(inBufferLength==ffd->out_size);
+//			assert(inBufferLength==ffd->out_size);
 
 			if (ffd->raw_pix_fmt==PIX_FMT_BGR24) {
 				s32 i, j;
@@ -884,7 +895,7 @@
 
 	/*we have a valid frame not yet dispatched*/
 	if (ffd->had_pic) {
-		ffd->had_pic = 0;
+		ffd->had_pic = GF_FALSE;
 		gotpic = 1;
 	} else {
 		if (ffd->check_h264_isma) {
@@ -983,8 +994,8 @@
 
 	/*we have a picture and need resize, do it*/
 	if (gotpic && ffd->needs_output_resize) {
-		ffd->needs_output_resize=0;
-		ffd->had_pic = 1;
+		ffd->needs_output_resize = GF_FALSE;
+		ffd->had_pic = GF_TRUE;
 		*outBufferLength = ffd->out_size;
 		return GF_BUFFER_TOO_SMALL;
 	}
@@ -992,7 +1003,7 @@
 	stride = frame->linesize[0];
 #ifndef NO_10bit
 	if ((ctx->pix_fmt == PIX_FMT_YUV420P10LE) && ffd->output_as_8bit && (frame->linesize[0] >= 2*w) ) {
-		ffd->conv_to_8bit = 1;
+		ffd->conv_to_8bit = GF_TRUE;
 		stride=w;
 	}
 #endif
@@ -1006,7 +1017,11 @@
 	 ) {
 
 		ffd->stride = (!ffd->conv_to_8bit && ffd->direct_output) ? frame->linesize[0] : ctx->width;
-		if (ffd->out_pix_fmt == GF_PIXEL_RGB_24) {
+		if (ctx->pix_fmt == PIX_FMT_RGBA) {
+			ffd->out_pix_fmt = ffd->pix_fmt = GF_PIXEL_RGBA;
+			outsize = ctx->width * ctx->height * 4;
+		}
+		else if (ffd->out_pix_fmt == GF_PIXEL_RGB_24) {
 			outsize = ctx->width * ctx->height * 3;
 		}
 #ifndef NO_10bit
@@ -1036,7 +1051,7 @@
 		/*we didn't get any picture: wait for a picture before resizing output buffer, otherwise we will have no
 		video in the output buffer*/
 		if (!gotpic) {
-			ffd->needs_output_resize = 1;
+			ffd->needs_output_resize = GF_TRUE;
 			return GF_OK;
 		}
 		*outBufferLength = ffd->out_size;
@@ -1050,10 +1065,10 @@
 			*cached_sws = NULL;
 		}
 #endif
-		ffd->had_pic = 1;
+		ffd->had_pic = GF_TRUE;
 
 		if (ffd->conv_to_8bit && ffd->direct_output) {
-			ffd->conv_buffer = gf_realloc(ffd->conv_buffer, sizeof(char)*ffd->out_size);
+			ffd->conv_buffer = (char*)gf_realloc(ffd->conv_buffer, sizeof(char)*ffd->out_size);
 		}
 
 		return GF_BUFFER_TOO_SMALL;
@@ -1065,11 +1080,11 @@
 			ffd->previous_par = new_par;
 
 			if (!gotpic) {
-				ffd->needs_output_resize = 1;
+				ffd->needs_output_resize = GF_TRUE;
 				return GF_OK;
 			}
 			*outBufferLength = ffd->out_size;
-			ffd->had_pic = 1;
+			ffd->had_pic = GF_TRUE;
 			return GF_BUFFER_TOO_SMALL;
 		}
 	}
@@ -1100,7 +1115,7 @@
 		dst.video_buffer = ffd->direct_output ? ffd->conv_buffer : outBuffer;
 		dst.pixel_format = GF_PIXEL_YV12;
 
-		gf_color_write_yv12_10_to_yuv(&dst, (u8 *) frame->data[0], frame->data[1], frame->data[2], frame->linesize[0], ctx->width, ctx->height, NULL, 0);
+		gf_color_write_yv12_10_to_yuv(&dst, (u8 *) frame->data[0], frame->data[1], frame->data[2], frame->linesize[0], ctx->width, ctx->height, NULL, GF_FALSE);
 		*outBufferLength = ffd->out_size;
 		return GF_OK;
 	}
@@ -1124,6 +1139,8 @@
 #if defined(_WIN32_WCE) || defined(__SYMBIAN32__)
 	if (ffd->pix_fmt==GF_PIXEL_RGB_24) {
 		memcpy(outBuffer, frame->data[0], sizeof(char)*3*ctx->width);
+	} else if (ffd->pix_fmt==GF_PIXEL_RGBA) {
+		memcpy(outBuffer, frame->data[0], sizeof(char)*4*ctx->width);
 	} else {
 		s32 i;
 		char *pYO, *pUO, *pVO;
@@ -1158,6 +1175,10 @@
 		pict.data[0] = (uint8_t *)outBuffer;
 		pict.linesize[0] = 3*ctx->width;
 		pix_out = PIX_FMT_RGB24;
+	} else if (ffd->out_pix_fmt==GF_PIXEL_RGBA) {
+		pict.data[0] = (uint8_t *)outBuffer;
+		pict.linesize[0] = 4*ctx->width;
+		pix_out = PIX_FMT_RGBA;
 	} else {
 		pict.data[0] = (uint8_t *)outBuffer;
 		pict.data[1] = (uint8_t *)outBuffer + ffd->stride * ctx->height;
@@ -1171,9 +1192,13 @@
 			pix_out = PIX_FMT_YUV420P10LE;
 		}
 #endif
+
+#if (LIBAVCODEC_VERSION_MAJOR<56)
 		if (!mmlevel && frame->interlaced_frame) {
 			avpicture_deinterlace((AVPicture *) frame, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height);
 		}
+#endif
+
 	}
 	pict.data[3] = 0;
 	pict.linesize[3] = 0;
@@ -1186,11 +1211,11 @@
 	 SWS_BICUBIC, NULL, NULL, NULL);
 	if ((*cached_sws)) {
 #if LIBSWSCALE_VERSION_INT < AV_VERSION_INT(0, 9, 0)
-		int sz = sws_scale((*cached_sws), frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
+		sws_scale((*cached_sws), frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
 #else
-		int sz = sws_scale((*cached_sws), (const uint8_t * const*)frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
+		sws_scale((*cached_sws), (const uint8_t * const*)frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
 #endif
-		assert( sz > 0 );
+
 	}
 #endif
 
@@ -1202,7 +1227,7 @@
 
 static GF_Err FFDEC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
 {
-	FFDec *ffd = ifcg->privateStack;
+	FFDec *ffd = (FFDec*)ifcg->privateStack;
 	AVFrame *frame;
 
 
@@ -1230,7 +1255,7 @@
 	GF_BitStream *bs;
 	u32 codec_id;
 	Bool check_4cc;
-	FFDec *ffd = plug->privateStack;
+	FFDec *ffd = (FFDec*)plug->privateStack;
 
 	/*media type query*/
 	if (!esd) {
@@ -1243,7 +1268,7 @@
 	ffd->st = StreamType;
 
 	codec_id = 0;
-	check_4cc = 0;
+	check_4cc = GF_FALSE;
 
 	/*private from FFMPEG input*/
 	if (ffd->oti == GPAC_OTI_MEDIA_FFMPEG) {
@@ -1255,7 +1280,7 @@
 	else if (ffd->oti == GPAC_OTI_MEDIA_GENERIC) {
 		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
 		codec_id = gf_bs_read_u32(bs);
-		check_4cc = 1;
+		check_4cc = GF_TRUE;
 		gf_bs_del(bs);
 	}
 	else if (StreamType==GF_STREAM_AUDIO) {
@@ -1280,22 +1305,22 @@
 		/*fixme - we should use some priority rather than declare ffmpeg can't handle svc*/
 		if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
 			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-				Bool is_svc = 0;
+				Bool is_svc = GF_FALSE;
 				u32 i, count;
 				GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 				if (!cfg) return GF_CODEC_SUPPORTED;
 
 				if (esd->has_ref_base)
-					is_svc = 1;
+					is_svc = GF_TRUE;
 
 				/*decode all NALUs*/
 				count = gf_list_count(cfg->sequenceParameterSets);
 				for (i=0; i<count; i++) {
-					GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
+					GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
 					u8 nal_type = slc->data[0] & 0x1F;
 
 					if (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM) {
-						is_svc = 1;
+						is_svc = GF_TRUE;
 						break;
 					}
 				}
@@ -1340,6 +1365,11 @@
 				return GF_CODEC_MAYBE_SUPPORTED;
 
 			return GF_CODEC_NOT_SUPPORTED;
+		case GPAC_OTI_IMAGE_PNG:
+			if (avcodec_find_decoder(CODEC_ID_PNG) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+			return GF_CODEC_NOT_SUPPORTED;
+
 		default:
 			return GF_CODEC_NOT_SUPPORTED;
 		}
@@ -1375,7 +1405,7 @@
 	FFDec *ffd;
 	if (!dec)
 		return NULL;
-	ffd = dec->privateStack;
+	ffd = (FFDec*)dec->privateStack;
 	if (ffd && ffd->base_codec) {
 		sprintf(ffd->szCodec, "FFMPEG %s - version %s", ffd->base_codec->name ? ffd->base_codec->name : "unknown", LIBAVCODEC_IDENT);
 		return ffd->szCodec;
@@ -1417,11 +1447,11 @@
 
 void FFDEC_Delete(void *ifce)
 {
-	GF_BaseDecoder *dec = ifce;
+	GF_BaseDecoder *dec = (GF_BaseDecoder*)ifce;
 	FFDec *ffd;
 	if (!ifce)
 		return;
-	ffd = dec->privateStack;
+	ffd = (FFDec*)dec->privateStack;
 	dec->privateStack = NULL;
 	if (ffd) {
 		if (ffd->base_ctx && ffd->base_ctx->codec) avcodec_close(ffd->base_ctx);

v0.5.2.tar.gz/modules/ffmpeg_in/ffmpeg_demux.c -> v0.6.1.tar.gz/modules/ffmpeg_in/ffmpeg_demux.c Changed

@@ -61,7 +61,7 @@
 #endif
 
 
-#if defined(GPAC_ANDROID) && (LIBAVFORMAT_VERSION_MAJOR <= 52) 
+#if defined(GPAC_ANDROID) && (LIBAVFORMAT_VERSION_MAJOR <= 52)
 
 #ifndef FF_API_CLOSE_INPUT_FILE
 #define FF_API_CLOSE_INPUT_FILE	1
@@ -183,11 +183,39 @@
 	return i/3;
 }
 
-static int open_file(AVFormatContext **	ic_ptr, const char * 	filename, AVInputFormat * 	fmt) {
+static int open_file(AVFormatContext **	ic_ptr, const char * 	filename, AVInputFormat * 	fmt, void *ops) {
 #ifdef USE_PRE_0_7
 	return av_open_input_file(ic_ptr, filename, fmt, 0, NULL);
 #else
-	return avformat_open_input(ic_ptr, filename, fmt, NULL);
+	return avformat_open_input(ic_ptr, filename, fmt, (AVDictionary**)ops);
+#endif
+}
+
+void ffd_parse_options(FFDemux *ffd, const char *url)
+{
+#ifdef USE_AVFORMAT_OPEN_INPUT
+	int res;
+	char *frag = (char*) strchr(url, '#');
+	if (frag) frag = frag+1;
+
+	if (ffd->options) return;
+
+	while (frag) {
+		char *mid, *sep = strchr(frag, ':');
+		if (sep) sep[0] = 0;
+		mid = strchr(frag, '=');
+		if (mid) {
+			mid[0] = 0;
+			res = av_dict_set(&ffd->options, frag, mid+1, 0);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Failed to set option %s:%s\n", frag, mid+1) );
+			}
+			mid[0] = '=';
+		}
+		if (!sep) break;
+		sep[0] = ':';
+		frag = sep+1;
+	}
 #endif
 }
 
@@ -198,19 +226,22 @@
 	s32 i;
 	AVFormatContext *ctx;
 	AVOutputFormat *fmt_out;
-	Bool ret = 0;
+	Bool ret = GF_FALSE;
 	char *ext, szName[1000], szExt[20];
 	const char *szExtList;
+	FFDemux *ffd;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	/*disable RTP/RTSP from ffmpeg*/
-	if (!strnicmp(url, "rtsp://", 7)) return 0;
-	if (!strnicmp(url, "rtspu://", 8)) return 0;
-	if (!strnicmp(url, "rtp://", 6)) return 0;
-	if (!strnicmp(url, "plato://", 8)) return 0;
-	if (!strnicmp(url, "udp://", 6)) return 0;
-	if (!strnicmp(url, "tcp://", 6)) return 0;
-	if (!strnicmp(url, "data:", 5)) return 0;
+	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
+	if (!strnicmp(url, "rtspu://", 8)) return GF_FALSE;
+	if (!strnicmp(url, "rtp://", 6)) return GF_FALSE;
+	if (!strnicmp(url, "plato://", 8)) return GF_FALSE;
+	if (!strnicmp(url, "udp://", 6)) return GF_FALSE;
+	if (!strnicmp(url, "tcp://", 6)) return GF_FALSE;
+	if (!strnicmp(url, "data:", 5)) return GF_FALSE;
+
+	ffd = (FFDemux*)plug->priv;
 
 	strcpy(szName, url);
 	ext = strrchr(szName, '#');
@@ -225,7 +256,7 @@
 		strcpy(szExt, &ext[1]);
 		strlwr(szExt);
 #ifndef FFMPEG_DEMUX_ENABLE_MPEG2TS
-		if (!strcmp(szExt, "ts")) return 0;
+		if (strstr("ts m2t mts dmb trp", szExt) ) return GF_FALSE;
 #endif
 
 		/*note we forbid ffmpeg to handle files we support*/
@@ -240,47 +271,51 @@
 		 || !strcmp(szExt, "xmt") || !strcmp(szExt, "xmta") || !strcmp(szExt, "x3d")
 
 		 || !strcmp(szExt, "jpg") || !strcmp(szExt, "jpeg") || !strcmp(szExt, "png")
-		 ) return 0;
+		 ) return GF_FALSE;
 
 		/*check any default stuff that should work with ffmpeg*/
 		{
 			u32 i;
 			for (i = 0 ; FFD_MIME_TYPES[i]; i+=3) {
 				if (gf_service_check_mime_register(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2], ext))
-					return 1;
+					return GF_TRUE;
 			}
 		}
 	}
 
+	ffd_parse_options(ffd, url);
+
 	ctx = NULL;
-	if (open_file(&ctx, szName, NULL)<0) {
+	if (open_file(&ctx, szName, NULL, ffd->options ? &ffd->options : NULL)<0) {
 		AVInputFormat *av_in = NULL;;
 		/*some extensions not supported by ffmpeg*/
 		if (ext && !strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
 
-		if (open_file(&ctx, szName, av_in)<0) {
-			return 0;
+		if (open_file(&ctx, szName, av_in, ffd->options ? &ffd->options : NULL)<0) {
+			return GF_FALSE;
 		}
 	}
-	if (!ctx || av_find_stream_info(ctx) <0) goto exit;
+
+	if (!ctx) goto exit;
+	if (av_find_stream_info(ctx) <0) goto exit;
 
 	/*figure out if we can use codecs or not*/
-	has_video = has_audio = 0;
+	has_video = has_audio = GF_FALSE;
 	for(i = 0; i < (s32)ctx->nb_streams; i++) {
 		AVCodecContext *enc = ctx->streams[i]->codec;
 		switch(enc->codec_type) {
 		case AVMEDIA_TYPE_AUDIO:
-			if (!has_audio) has_audio = 1;
+			if (!has_audio) has_audio = GF_TRUE;
 			break;
 		case AVMEDIA_TYPE_VIDEO:
-			if (!has_video) has_video= 1;
+			if (!has_video) has_video= GF_TRUE;
 			break;
 		default:
 			break;
 		}
 	}
 	if (!has_audio && !has_video) goto exit;
-	ret = 1;
+	ret = GF_TRUE;
 #if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
 	fmt_out = guess_stream_format(NULL, url, NULL);
 #else
@@ -300,7 +335,7 @@
 				u32 len;
 				char *buf;
 				len = (u32) (strlen(szExtList) + strlen(szExt) + 10);
-				buf = gf_malloc(sizeof(char)*len);
+				buf = (char*)gf_malloc(sizeof(char)*len);
 				sprintf(buf, "\"%s ", szExt);
 				strcat(buf, &szExtList[1]);
 				gf_modules_set_option((GF_BaseInterface *)plug, "MimeTypes", "application/x-ffmpeg", buf);
@@ -343,7 +378,7 @@
 			if (!dec->extradata_size) goto opaque_audio;
 			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
 			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
-			esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*dec->extradata_size);
+			esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*dec->extradata_size);
 			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
 			 dec->extradata,
 			 sizeof(char)*dec->extradata_size);
@@ -384,7 +419,7 @@
 			/*otherwise use any MPEG-4 Visual*/
 			esd->decoderConfig->objectTypeIndication = (dec->codec_id==CODEC_ID_H264) ? GPAC_OTI_VIDEO_AVC : GPAC_OTI_VIDEO_MPEG4_PART2;
 			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
-			esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*dec->extradata_size);
+			esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*dec->extradata_size);
 			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
 			 dec->extradata,
 			 sizeof(char)*dec->extradata_size);
@@ -414,7 +449,7 @@
 			gf_bs_del(bs);
 			break;
 		}
-		dont_use_sl = 0;
+		dont_use_sl = GF_FALSE;
 	}
 
 	if (dont_use_sl) {
@@ -442,19 +477,19 @@
 
 	if ((ffd->audio_st>=0) && (ffd->service_type != 1)) {
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		esd = FFD_GetESDescriptor(ffd, 1);
+		esd = FFD_GetESDescriptor(ffd, GF_TRUE);
 		od->objectDescriptorID = esd->ESID;
 		audio_esid = esd->ESID;
 		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, (ffd->video_st>=0) ? 1 : 0);
+		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, (ffd->video_st>=0) ? GF_TRUE : GF_FALSE);
 	}
 	if ((ffd->video_st>=0) && (ffd->service_type != 2)) {
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		esd = FFD_GetESDescriptor(ffd, 0);
+		esd = FFD_GetESDescriptor(ffd, GF_FALSE);
 		od->objectDescriptorID = esd->ESID;
 		esd->OCRESID = audio_esid;
 		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, 0);
+		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, GF_FALSE);
 	}
 }
 
@@ -521,7 +556,7 @@
 	Bool is_local;
 	const char *sOpt;
 	char *ext, szName[1024];
-	FFDemux *ffd = plug->priv;
+	FFDemux *ffd = (FFDemux*)plug->priv;
 	AVInputFormat *av_in = NULL;
 	char szExt[20];
 
@@ -540,13 +575,15 @@
 		ext[0] = 0;
 	}
 
+	ffd_parse_options(ffd, url);
+
 	/*some extensions not supported by ffmpeg, overload input format*/
 	ext = strrchr(szName, '.');
 	strcpy(szExt, ext ? ext+1 : "");
 	strlwr(szExt);
 	if (!strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
 
-	is_local = (strnicmp(url, "file://", 7) && strstr(url, "://")) ? 0 : 1;
+	is_local = (strnicmp(url, "file://", 7) && strstr(url, "://")) ? GF_FALSE : GF_TRUE;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] opening file %s - local %d - av_in %08x\n", url, is_local, av_in));
 
@@ -557,9 +594,9 @@
 		ffd->buffer_size = 8192;
 		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "FFMPEG", "IOBufferSize");
 		if (sOpt) ffd->buffer_size = atoi(sOpt);
-		ffd->buffer = gf_malloc(sizeof(char)*ffd->buffer_size);
+		ffd->buffer = (char*)gf_malloc(sizeof(char)*ffd->buffer_size);
 #ifdef FFMPEG_DUMP_REMOTE
-		ffd->outdbg = gf_f64_open("ffdeb.raw", "wb");
+		ffd->outdbg = gf_fopen("ffdeb.raw", "wb");
 #endif
 #ifdef USE_PRE_0_7
 		init_put_byte(&ffd->io, ffd->buffer, ffd->buffer_size, 0, ffd, ff_url_read, NULL, NULL);
@@ -582,7 +619,7 @@
 		}
 		if (e==GF_EOS) {
 			const char *cache_file = gf_dm_sess_get_cache_name(ffd->dnload);
-			res = open_file(&ffd->ctx, cache_file, av_in);
+			res = open_file(&ffd->ctx, cache_file, av_in, ffd->options ? &ffd->options : NULL);
 		} else {
 			pd.filename = szName;
 			pd.buf_size = ffd->buffer_used;
@@ -601,7 +638,7 @@
 #endif
 		}
 	} else {
-		res = open_file(&ffd->ctx, szName, av_in);
+		res = open_file(&ffd->ctx, szName, av_in, ffd->options ? &ffd->options : NULL);
 	}
 
 	switch (res) {
@@ -629,7 +666,12 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] looking for streams in %s - %d streams - type %s\n", ffd->ctx->filename, ffd->ctx->nb_streams, ffd->ctx->iformat->name));
 
+#ifdef USE_AVFORMAT_OPEN_INPUT
+	res = avformat_find_stream_info(ffd->ctx, ffd->options ? &ffd->options : NULL);
+#else
 	res = av_find_stream_info(ffd->ctx);
+#endif
+
 	if (res <0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] cannot locate streams - error %d\n", res));
 		e = GF_NOT_SUPPORTED;
@@ -684,10 +726,10 @@
 				if (pkt.pts == AV_NOPTS_VALUE) pkt.pts = pkt.dts;
 				if (pkt.stream_index==ffd->audio_st) last_aud_pts = pkt.pts;
 			}
-			if (last_aud_pts*ffd->audio_tscale.den<10*ffd->audio_tscale.num) ffd->unreliable_audio_timing = 1;
+			if (last_aud_pts*ffd->audio_tscale.den<10*ffd->audio_tscale.num) ffd->unreliable_audio_timing = GF_TRUE;
 		}
 
-		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
+		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? GF_FALSE : GF_TRUE;
 		if (!ffd->seekable) {
 #if FF_API_CLOSE_INPUT_FILE
 			av_close_input_file(ffd->ctx);
@@ -695,7 +737,7 @@
 			avformat_close_input(&ffd->ctx);
 #endif
 			ffd->ctx = NULL;
-			open_file(&ffd->ctx, szName, av_in);
+			open_file(&ffd->ctx, szName, av_in, ffd->options ? &ffd->options : NULL);
 			av_find_stream_info(ffd->ctx);
 		}
 	}
@@ -723,7 +765,7 @@
 {
 	GF_ObjectDescriptor *od;
 	GF_ESD *esd;
-	FFDemux *ffd = plug->priv;
+	FFDemux *ffd = (FFDemux*)plug->priv;
 
 	if (!ffd->ctx) return NULL;
 
@@ -738,7 +780,7 @@
 		if (ffd->audio_st<0) return NULL;
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 		od->objectDescriptorID = 1;
-		esd = FFD_GetESDescriptor(ffd, 1);
+		esd = FFD_GetESDescriptor(ffd, GF_TRUE);
 		/*if session join, setup sync*/
 		if (ffd->video_ch) esd->OCRESID = ffd->video_st+1;
 		gf_list_add(od->ESDescriptors, esd);
@@ -749,7 +791,7 @@
 		if (ffd->video_st<0) return NULL;
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 		od->objectDescriptorID = 1;
-		esd = FFD_GetESDescriptor(ffd, 0);
+		esd = FFD_GetESDescriptor(ffd, GF_FALSE);
 		/*if session join, setup sync*/
 		if (ffd->audio_ch) esd->OCRESID = ffd->audio_st+1;
 		gf_list_add(od->ESDescriptors, esd);
@@ -762,7 +804,7 @@
 
 static GF_Err FFD_CloseService(GF_InputService *plug)
 {
-	FFDemux *ffd = plug->priv;
+	FFDemux *ffd = (FFDemux*)plug->priv;
 
 	ffd->is_running = 0;
 
@@ -774,7 +816,7 @@
 
 	ffd->ctx = NULL;
 	ffd->audio_ch = ffd->video_ch = NULL;
-	ffd->audio_run = ffd->video_run = 0;
+	ffd->audio_run = ffd->video_run = GF_FALSE;
 
 	if (ffd->dnload) {
 		if (ffd->is_running) {
@@ -789,7 +831,7 @@
 
 	gf_service_disconnect_ack(ffd->service, NULL, GF_OK);
 #ifdef FFMPEG_DUMP_REMOTE
-	if (ffd->outdbg) fclose(ffd->outdbg);
+	if (ffd->outdbg) gf_fclose(ffd->outdbg);
 #endif
 	return GF_OK;
 }
@@ -798,7 +840,7 @@
 {
 	GF_Err e;
 	u32 ESID;
-	FFDemux *ffd = plug->priv;
+	FFDemux *ffd = (FFDemux*)plug->priv;
 
 	e = GF_STREAM_NOT_FOUND;
 	if (upstream) {
@@ -836,18 +878,18 @@
 static GF_Err FFD_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
 {
 	GF_Err e;
-	FFDemux *ffd = plug->priv;
+	FFDemux *ffd = (FFDemux*)plug->priv;
 
 	e = GF_STREAM_NOT_FOUND;
 	if (ffd->audio_ch == channel) {
 		e = GF_OK;
 		ffd->audio_ch = NULL;
-		ffd->audio_run = 0;
+		ffd->audio_run = GF_FALSE;
 	}
 	else if (ffd->video_ch == channel) {
 		e = GF_OK;
 		ffd->video_ch = NULL;
-		ffd->video_run = 0;
+		ffd->video_run = GF_FALSE;
 	}
 	gf_service_disconnect_ack(ffd->service, channel, e);
 	return GF_OK;
@@ -855,7 +897,7 @@
 
 static GF_Err FFD_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
-	FFDemux *ffd = plug->priv;
+	FFDemux *ffd = (FFDemux*)plug->priv;
 
 
 	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
@@ -886,8 +928,8 @@
 		gf_mx_p(ffd->mx);
 		ffd->seek_time = (com->play.start_range>=0) ? com->play.start_range : 0;
 
-		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = 1;
-		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = 1;
+		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = GF_TRUE;
+		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = GF_TRUE;
 
 		/*play on media stream, start thread*/
 		if ((ffd->audio_ch==com->base.on_channel) || (ffd->video_ch==com->base.on_channel)) {
@@ -899,8 +941,8 @@
 		gf_mx_v(ffd->mx);
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
-		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = 0;
-		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = 0;
+		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = GF_FALSE;
+		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = GF_FALSE;
 		return GF_OK;
 	/*note we don't handle PAUSE/RESUME/SET_SPEED, this is automatically handled by the demuxing thread
 	through buffer occupancy queries*/
@@ -929,17 +971,17 @@
 	sep = strrchr(szURL, '#');
 	if (sep) sep[0] = 0;
 
-	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return 0;
+	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
 	sep = strrchr(url, '#');
-	if (sep && !stricmp(sep, "#video") && (ffd->video_st>=0)) return 1;
-	if (sep && !stricmp(sep, "#audio") && (ffd->audio_st>=0)) return 1;
+	if (sep && !stricmp(sep, "#video") && (ffd->video_st>=0)) return GF_TRUE;
+	if (sep && !stricmp(sep, "#audio") && (ffd->audio_st>=0)) return GF_TRUE;
 	return GF_FALSE;
 }
 
 void *New_FFMPEG_Demux()
 {
 	FFDemux *priv;
-	GF_InputService *ffd = gf_malloc(sizeof(GF_InputService));
+	GF_InputService *ffd = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
 	memset(ffd, 0, sizeof(GF_InputService));
 
 	GF_SAFEALLOC(priv, FFDemux);
@@ -974,13 +1016,17 @@
 	GF_InputService *ptr = (GF_InputService *)ifce;
 	if (!ptr)
 		return;
-	ffd = ptr->priv;
+	ffd = (FFDemux*)ptr->priv;
 	if (ffd) {
 		if (ffd->thread)
 			gf_th_del(ffd->thread);
 		ffd->thread = NULL;
 		if (ffd->mx)
 			gf_mx_del(ffd->mx);
+
+#ifndef USE_PRE_0_7
+		if (ffd->options) av_dict_free(&ffd->options);
+#endif
 		ffd->mx = NULL;
 		gf_free(ffd);
 		ptr->priv = NULL;

v0.5.2.tar.gz/modules/ffmpeg_in/ffmpeg_in.h -> v0.6.1.tar.gz/modules/ffmpeg_in/ffmpeg_in.h Changed

@@ -223,8 +223,10 @@
 
 #ifdef USE_PRE_0_7
 	ByteIOContext   io;
+	void *options;
 #else
 	AVIOContext io;
+	AVDictionary *options;
 #endif
 	char *buffer;
 	u32 buffer_size;
@@ -264,6 +266,46 @@
 */
 
 
+/*TODO - we need to cleanup the ffmpeg code to align with only latest version and remove old compatibility code*/
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0 )
+
+#define CODEC_ID_SVQ3	AV_CODEC_ID_SVQ3
+#define CODEC_ID_MPEG4	AV_CODEC_ID_MPEG4
+#define CODEC_ID_H264	AV_CODEC_ID_H264
+#define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
+#define CODEC_ID_MJPEG	AV_CODEC_ID_MJPEG
+#define CODEC_ID_MP2	AV_CODEC_ID_MP2
+#define CODEC_ID_AC3	AV_CODEC_ID_AC3
+#define CODEC_ID_EAC3	AV_CODEC_ID_EAC3
+#define CODEC_ID_DVD_SUBTITLE	AV_CODEC_ID_DVD_SUBTITLE
+#define CODEC_ID_RAWVIDEO	AV_CODEC_ID_RAWVIDEO
+#define CODEC_ID_MJPEGB	AV_CODEC_ID_MJPEGB
+#define CODEC_ID_LJPEG	AV_CODEC_ID_LJPEG
+#define CODEC_ID_GIF	AV_CODEC_ID_GIF
+#define CODEC_ID_H263	AV_CODEC_ID_H263
+#define CODEC_ID_MP3	AV_CODEC_ID_MP3
+#define CODEC_ID_AAC	AV_CODEC_ID_AAC
+#define CODEC_ID_MPEG1VIDEO	AV_CODEC_ID_MPEG1VIDEO
+#define CODEC_ID_PNG	AV_CODEC_ID_PNG
+
+#endif
+
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 42, 0)
+#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
+#define PIX_FMT_YUV420P10LE AV_PIX_FMT_YUV420P10LE
+#define PIX_FMT_BGR24 AV_PIX_FMT_BGR24
+#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24
+#define PIX_FMT_RGBA AV_PIX_FMT_RGBA
+#endif
+
+#if (LIBAVCODEC_VERSION_MAJOR>56)
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC
+#endif
+#endif
+
+
 
 #endif

v0.5.2.tar.gz/modules/ffmpeg_in/ffmpeg_load.c -> v0.6.1.tar.gz/modules/ffmpeg_in/ffmpeg_load.c Changed

v0.5.2.tar.gz/modules/freenect/Makefile -> v0.6.1.tar.gz/modules/freenect/Makefile Changed

v0.5.2.tar.gz/modules/ft_font/Makefile -> v0.6.1.tar.gz/modules/ft_font/Makefile Changed

v0.5.2.tar.gz/modules/ft_font/ft_font.c -> v0.6.1.tar.gz/modules/ft_font/ft_font.c Changed

@@ -49,12 +49,13 @@
 {
 	FT_Library library;
 	FT_Face active_face;
-	char *font_dir;
+
+	GF_List *font_dirs;
 
 	GF_List *loaded_fonts;
 
 	/*default fonts*/
-	char *font_serif, *font_sans, *font_fixed;
+	char *font_serif, *font_sans, *font_fixed, *font_default;
 } FTBuilder;
 
 static const char * BEST_FIXED_FONTS[] = {
@@ -139,14 +140,14 @@
 			strcpy(szfont, face->family_name);
 
 			/*remember first font found which looks like a alphabetical one*/
-			if (!ftpriv->font_dir) {
+			if (!ftpriv->font_default) {
 				u32 gidx;
 				FT_Select_Charmap(face, FT_ENCODING_UNICODE);
 				gidx = FT_Get_Char_Index(face, (u32) 'a');
 				if (gidx) gidx = FT_Get_Char_Index(face, (u32) 'z');
 				if (gidx) gidx = FT_Get_Char_Index(face, (u32) '1');
 				if (gidx) gidx = FT_Get_Char_Index(face, (u32) '@');
-				if (gidx) ftpriv->font_dir = gf_strdup(szfont);
+				if (gidx) ftpriv->font_default = gf_strdup(szfont);
 			}
 
 			bold = italic = 0;
@@ -205,12 +206,11 @@
 
 static void ft_rescan_fonts(GF_FontReader *dr)
 {
-	char *font_dir, *font_default;
 	u32 i, count;
 	GF_Config *cfg = gf_modules_get_config((GF_BaseInterface *)dr);
 	FTBuilder *ftpriv = (FTBuilder *)dr->udta;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Rescaning font directory %s\n", ftpriv->font_dir));
+	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Rescaning %d font directories\n", gf_list_count(ftpriv->font_dirs) ));
 
 	count = gf_cfg_get_key_count(cfg, "FontEngine");
 	for (i=0; i<count; i++) {
@@ -226,22 +226,26 @@
 	}
 	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "RescanFonts", "no");
 
- if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
- ftpriv->font_fixed = NULL;
- if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
- ftpriv->font_sans = NULL;
- if (ftpriv->font_serif) gf_free(ftpriv->font_serif);
- ftpriv->font_serif = NULL;
+	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
+	ftpriv->font_fixed = NULL;
+	if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
+	ftpriv->font_sans = NULL;
+	if (ftpriv->font_serif) gf_free(ftpriv->font_serif);
+	ftpriv->font_serif = NULL;
 
-	font_dir = ftpriv->font_dir;
-	ftpriv->font_dir = NULL;
+	if (ftpriv->font_default) gf_free(ftpriv->font_default);
+	ftpriv->font_default = NULL;
 
-	gf_enum_directory(font_dir, 0, ft_enum_fonts, dr, "ttf;ttc");
-	gf_enum_directory(font_dir, 1, ft_enum_fonts_dir, dr, NULL);
 
-	font_default = ftpriv->font_dir;
-	ftpriv->font_dir = font_dir;
+	count = gf_list_count(ftpriv->font_dirs);
+	for (i=0; i<count; i++) {
+		char *font_dir = gf_list_get(ftpriv->font_dirs, i);
 
+		if (gf_dir_exists(font_dir)) {
+			gf_enum_directory(font_dir, 0, ft_enum_fonts, dr, "ttf;ttc");
+			gf_enum_directory(font_dir, 1, ft_enum_fonts_dir, dr, NULL);
+		}
+	}
 
 	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
 	ftpriv->font_fixed = NULL;
@@ -298,16 +302,15 @@
 		}
 	}
 
-	if (!ftpriv->font_serif) ftpriv->font_serif = gf_strdup(font_default ? font_default : "");
-	if (!ftpriv->font_sans) ftpriv->font_sans = gf_strdup(font_default ? font_default : "");
-	if (!ftpriv->font_fixed) ftpriv->font_fixed = gf_strdup(font_default ? font_default : "");
-	if (font_default) gf_free(font_default);
+	if (!ftpriv->font_serif) ftpriv->font_serif = gf_strdup(ftpriv->font_default ? ftpriv->font_default : "");
+	if (!ftpriv->font_sans) ftpriv->font_sans = gf_strdup(ftpriv->font_default ? ftpriv->font_default : "");
+	if (!ftpriv->font_fixed) ftpriv->font_fixed = gf_strdup(ftpriv->font_default ? ftpriv->font_default : "");
 
 	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed", ftpriv->font_fixed);
 	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif", ftpriv->font_serif);
 	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "FontSans", ftpriv->font_sans);
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Font directory scanned\n", ftpriv->font_dir));
+	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[FreeType] Font directories scanned\n"));
 }
 
 
@@ -326,42 +329,48 @@
 		return GF_IO_ERR;
 	}
 
-	/*remove the final delimiter*/
-	ftpriv->font_dir = gf_strdup(sOpt);
-	while ( (ftpriv->font_dir[strlen(ftpriv->font_dir)-1] == '\n') || (ftpriv->font_dir[strlen(ftpriv->font_dir)-1] == '\r') )
-		ftpriv->font_dir[strlen(ftpriv->font_dir)-1] = 0;
-
-	/*store font path*/
-	if (ftpriv->font_dir[strlen(ftpriv->font_dir)-1] != GF_PATH_SEPARATOR) {
-		char ext[2], *temp;
-		ext[0] = GF_PATH_SEPARATOR;
-		ext[1] = 0;
-		temp = gf_malloc(sizeof(char) * (strlen(ftpriv->font_dir) + 2));
-		strcpy(temp, ftpriv->font_dir);
-		strcat(temp, ext);
-		gf_free(ftpriv->font_dir);
-		ftpriv->font_dir = temp;
+	while (sOpt) {
+		char dir[GF_MAX_PATH];
+		char *sep = (char *) strchr(sOpt, ',');
+		if (sep) sep[0] = 0;
+
+		strcpy(dir, sOpt);
+		while ( (dir[strlen(dir)-1] == '\n') || (dir[strlen(dir)-1] == '\r') )
+			dir[strlen(dir)-1] = 0;
+
+		if (dir[strlen(dir)-1] != GF_PATH_SEPARATOR) {
+			char ext[2];
+			ext[0] = GF_PATH_SEPARATOR;
+			ext[1] = 0;
+			strcat(dir, ext);
+		}
+
+		gf_list_add(ftpriv->font_dirs, gf_strdup(dir) );
+
+		if (!sep) break;
+		sep[0] = ',';
+		sOpt = sep+1;
 	}
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "RescanFonts");
 	if (!sOpt || !strcmp(sOpt, "yes") )
 		ft_rescan_fonts(dr);
 
- if (!ftpriv->font_serif) {
- sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
- ftpriv->font_serif = gf_strdup(sOpt ? sOpt : "");
- }
- 
- if (!ftpriv->font_sans) {
- sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
- ftpriv->font_sans = gf_strdup(sOpt ? sOpt : "");
- }
-
- if (!ftpriv->font_fixed) {
- sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
- ftpriv->font_fixed = gf_strdup(sOpt ? sOpt : "");
- }
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Init OK - font directory %s\n", ftpriv->font_dir));
+	if (!ftpriv->font_serif) {
+		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
+		ftpriv->font_serif = gf_strdup(sOpt ? sOpt : "");
+	}
+
+	if (!ftpriv->font_sans) {
+		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
+		ftpriv->font_sans = gf_strdup(sOpt ? sOpt : "");
+	}
+
+	if (!ftpriv->font_fixed) {
+		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
+		ftpriv->font_fixed = gf_strdup(sOpt ? sOpt : "");
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Init OK - %d font directory (first %s)\n", gf_list_count(ftpriv->font_dirs), gf_list_get(ftpriv->font_dirs, 0) ));
 
 	return GF_OK;
 }
@@ -564,7 +573,15 @@
 	s32 last_x, last_y;
 } ft_outliner;
 
-int ft_move_to(const FT_Vector *to, void *user)
+#if defined(GPAC_IPHONE) || defined(GPAC_ANDROID)
+#define FTCST
+#else
+#define FTCST const
+#endif
+
+
+
+int ft_move_to(FTCST FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	gf_path_add_move_to(ftol->path, INT2FIX(to->x), INT2FIX(to->y) );
@@ -573,7 +590,7 @@
 	return 0;
 }
 
-int ft_line_to(const FT_Vector *to, void *user)
+int ft_line_to(FTCST FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	if ( (ftol->last_x == to->x) && (ftol->last_y == to->y)) {
@@ -584,7 +601,7 @@
 	return 0;
 }
 
-int ft_conic_to(const FT_Vector * control, const FT_Vector *to, void *user)
+int ft_conic_to(FTCST FT_Vector * control, FTCST FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	gf_path_add_quadratic_to(ftol->path, INT2FIX(control->x), INT2FIX(control->y), INT2FIX(to->x), INT2FIX(to->y) );
@@ -592,7 +609,7 @@
 	return 0;
 }
 
-int ft_cubic_to(const FT_Vector *c1, const FT_Vector *c2, const FT_Vector *to, void *user)
+int ft_cubic_to(FTCST FT_Vector *c1, FTCST FT_Vector *c2, FTCST FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	gf_path_add_cubic_to(ftol->path, INT2FIX(c1->x), INT2FIX(c1->y), INT2FIX(c2->x), INT2FIX(c2->y), INT2FIX(to->x), INT2FIX(to->y) );
@@ -677,6 +694,8 @@
 	ftpriv = gf_malloc(sizeof(FTBuilder));
 	memset(ftpriv, 0, sizeof(FTBuilder));
 
+	ftpriv->font_dirs = gf_list_new();
+
 	ftpriv->loaded_fonts = gf_list_new();
 
 	dr->udta = ftpriv;
@@ -697,8 +716,14 @@
 	GF_FontReader *dr = (GF_FontReader *) ifce;
 	FTBuilder *ftpriv = dr->udta;
 
+	while (gf_list_count(ftpriv->font_dirs)) {
+		char *font = gf_list_pop_back(ftpriv->font_dirs);
+		if (font)
+			gf_free(font);
+	}
+
+	gf_list_del(ftpriv->font_dirs);
 
-	if (ftpriv->font_dir) gf_free(ftpriv->font_dir);
 	if (ftpriv->font_serif) gf_free(ftpriv->font_serif);
 	if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
 	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);

v0.5.2.tar.gz/modules/gapi/gapi.cpp -> v0.6.1.tar.gz/modules/gapi/gapi.cpp Changed

@@ -31,7 +31,7 @@
 
 #include "gapi.h"
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 
 #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
 
@@ -552,7 +552,7 @@
 
 void GAPI_SetupWindow(GF_VideoOutput *dr)
 {
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	GF_Err e;
 #endif
 	GAPIPriv *ctx = (GAPIPriv *)dr->opaque;
@@ -579,7 +579,7 @@
 	}
 
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	ctx->use_pbuffer = GF_TRUE;
 	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
 	e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
@@ -636,7 +636,7 @@
 		ctx->orig_wnd_proc = 0L;
 	}
 	ctx->hWnd = NULL;
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	PostMessage(ctx->gl_hwnd, WM_DESTROY, 0, 0);
 	ctx->gl_hwnd = NULL;
 	UnregisterClass(_T("GPAC GAPI Offscreen"), GetModuleHandle(_T("gm_gapi.dll") ));
@@ -698,7 +698,7 @@
 	ctx->hdc = GetDC(NULL/*ctx->hWnd*/);
 
 	if (pix_type==2) {
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		ctx->gl_bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->gl_bits, NULL, 0);
 #endif
 	} else if (pix_type==1) {
@@ -720,7 +720,7 @@
 }
 
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 
 void GAPI_ReleaseOGL_ES(GAPIPriv *ctx, Bool offscreen_only)
 {
@@ -926,7 +926,7 @@
 {
 	ctx->raw_ptr = NULL;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	if (ctx->output_3d_type) GAPI_ReleaseOGL_ES(ctx, GF_FALSE);
 	else
 #endif
@@ -1019,7 +1019,7 @@
 	if (is_wide_scene) bOn = GF_TRUE;
 	if (bOn == gctx->fullscreen) return GF_OK;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	if (gctx->output_3d_type==1) {
 		gctx->fullscreen = bOn;
 		return GAPI_SetupOGL_ES(dr);
@@ -1161,7 +1161,7 @@
 
 	gf_mx_p(gctx->mx);
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	if (gctx->output_3d_type==1) {
 #ifndef GLES_NO_PIXMAP
 		if (gctx->fullscreen && gctx->surface && gctx->egldpy) {
@@ -1239,11 +1239,11 @@
 	case GF_EVENT_VIDEO_SETUP:
 		switch (evt->setup.opengl_mode) {
 		case 0:
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 			gctx->output_3d_type = 0;
 #endif
 			return GAPI_InitBackBuffer(dr, evt->setup.width, evt->setup.height);
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		case 1:
 			gctx->output_3d_type = 1;
 			return GAPI_SetupOGL_ES(the_video_driver);
@@ -1606,7 +1606,7 @@
 	priv->mx = gf_mx_new("GAPI");
 	driv->opaque = priv;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	driv->hw_caps = GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
 #endif
 	/*rgb, yuv to do*/

v0.5.2.tar.gz/modules/gapi/gapi.h -> v0.6.1.tar.gz/modules/gapi/gapi.h Changed

v0.5.2.tar.gz/modules/gpac_js/Makefile -> v0.6.1.tar.gz/modules/gpac_js/Makefile Changed

v0.5.2.tar.gz/modules/gpac_js/gpac_js.c -> v0.6.1.tar.gz/modules/gpac_js/gpac_js.c Changed

@@ -75,6 +75,8 @@
 	GF_JSClass odmClass;
 	GF_JSClass anyClass;
 
+	GF_JSClass storageClass;
+
 	jsval evt_fun;
 	GF_TermEventFilter evt_filter;
 	GF_Event *evt;
@@ -85,6 +87,10 @@
 
 	u32 rti_refresh_rate;
 	GF_SystemRTInfo rti;
+
+	//list of config files for storage
+	GF_List *storages;
+
 } GF_GPACJSExt;
 
 
@@ -246,11 +252,11 @@
 	break;
 
 case -25: //"http_bitrate"
-	*vp = INT_TO_JSVAL( gf_dm_get_global_rate(term->downloader));
+	*vp = INT_TO_JSVAL( gf_dm_get_global_rate(term->downloader) / 1000);
 	break;
 
 case -26: //"fps"
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, gf_sc_get_fps(term->compositor, 0) ) );
+	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, gf_term_get_framerate(term, 0) ) );
 	break;
 
 case -27: //"cpu_load" || "cpu"
@@ -324,13 +330,20 @@
 case -32://"caption"
 {
 	GF_Event evt;
+	char *caption;
 	if (!JSVAL_IS_STRING(*vp)) {
 		return JS_FALSE;
 	}
 	evt.type = GF_EVENT_SET_CAPTION;
-	evt.caption.caption = SMJS_CHARS(c, *vp);
+	caption = SMJS_CHARS(c, *vp);
+	if (!strnicmp(caption, "gpac://", 7)) {
+		evt.caption.caption = caption + 7;
+	} else {
+		evt.caption.caption = caption;
+	}
+
 	gf_term_user_event(term, &evt);
-	SMJS_FREE(c, (char*)evt.caption.caption);
+	SMJS_FREE(c, (char*)caption);
 }
 break;
 case -13://"fullscreen"
@@ -387,7 +400,7 @@
 return JS_TRUE;
 }
 
-static JSBool SMJS_FUNCTION(gpac_getOption)
+static JSBool SMJS_FUNCTION(gpac_get_option)
 {
 	const char *opt = NULL;
 	char *sec_name, *key_name;
@@ -423,9 +436,9 @@
 		opt = gf_cfg_get_key(term->user->config, sec_name, key_name);
 	} else if (idx>=0) {
 		opt = gf_cfg_get_key_name(term->user->config, sec_name, idx);
- } else {
- opt = NULL;
- }
+	} else {
+		opt = NULL;
+	}
 	if (key_name) {
 		SMJS_FREE(c, key_name);
 	}
@@ -440,7 +453,7 @@
 	return JS_TRUE;
 }
 
-static JSBool SMJS_FUNCTION(gpac_setOption)
+static JSBool SMJS_FUNCTION(gpac_set_option)
 {
 	char *sec_name, *key_name, *key_val;
 	SMJS_OBJ
@@ -503,6 +516,89 @@
 }
 
 
+static JSBool SMJS_FUNCTION(gpac_set_back_color)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	u32 r, g, b, a, i;
+	jsdouble d;
+	GF_Terminal *term = gpac_get_term(c, obj);
+	if (!term) return JS_FALSE;
+
+	if (argc < 3) return JS_FALSE;
+	r = g = b = 0;
+	a = 255;
+	for (i=0; i<argc; i++) {
+		u32 v=0;
+		if (JSVAL_IS_DOUBLE(argv[i])) {
+			SMJS_GET_NUMBER(argv[i], d);
+			v = (u32) (255 * d);
+		} else if (JSVAL_IS_INT(argv[i])) {
+			v = 255 * JSVAL_TO_INT(argv[i]);
+		}
+		if (i==0) r = v;
+		else if (i==1) g = v;
+		else if (i==2) b = v;
+		else if (i==3) a = v;
+	}
+	term->compositor->back_color = term->compositor->default_back_color = GF_COL_ARGB(a, r, g, b);
+	gf_sc_invalidate(term->compositor, NULL);
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(gpac_switch_quality)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_Terminal *term = gpac_get_term(c, obj);
+	if (!term) return JS_FALSE;
+
+	if (argc < 1) return JS_FALSE;
+
+	if (JSVAL_IS_BOOLEAN(argv[0])) {
+		Bool up = (JSVAL_TO_BOOLEAN(argv[0])==JS_TRUE) ? GF_TRUE : GF_FALSE;
+		gf_term_switch_quality(term, up);
+		return JS_TRUE;
+	} else {
+		return JS_FALSE;
+	}
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(gpac_reload)
+{
+	SMJS_OBJ
+	GF_Event evt;
+	GF_Terminal *term = gpac_get_term(c, obj);
+	if (!term) return JS_FALSE;
+
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_RELOAD;
+	term->user->EventProc(term->user->opaque, &evt);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(gpac_navigation_supported)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	u32 type;
+	GF_Terminal *term = gpac_get_term(c, obj);
+	if (!term) return JS_FALSE;
+
+	if (argc < 1) return JS_FALSE;
+
+	if (! JSVAL_IS_INT(argv[0]) ) {
+		SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
+		return JS_TRUE;
+	}
+	type = JSVAL_TO_INT(argv[0]);
+	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( gf_sc_navigation_supported(term->compositor, type) ? JS_TRUE : JS_FALSE ) );
+	return JS_TRUE;
+}
+
 typedef struct
 {
 	JSContext *c;
@@ -672,6 +768,7 @@
 			term->compositor->scene_width = w;
 			term->compositor->scene_height = h;
 			term->compositor->has_size_info = 1;
+			return JS_TRUE;
 		}
 		if (term->user->os_window_handler) {
 			evt.type = GF_EVENT_SCENE_SIZE;
@@ -812,275 +909,370 @@
 
 static SMJS_FUNC_PROP_GET( odm_getProperty)
 
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-	GF_MediaInfo odi;
-	char *str;
-	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
+GF_MediaInfo odi;
+s32 prop_id;
+char *str;
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
-	gf_term_get_object_info(odm->term, odm, &odi);
+gf_term_get_object_info(odm->term, odm, &odi);
 
-	switch (SMJS_ID_TO_INT(id)) {
-	case -1:
-		*vp = INT_TO_JSVAL(odi.od->objectDescriptorID);
-		break;
-	case -2:
-		*vp = INT_TO_JSVAL(odm->subscene ? gf_list_count(odm->subscene->resources) : 0);
-		break;
-	case -3:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_url));
-		break;
-	case -4:
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.duration) );
-		break;
-	case -5:
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.current_time) );
-		break;
-	case -6:
-		*vp = INT_TO_JSVAL( odi.clock_drift);
-		break;
-	case -7:
-		if (odi.status==0) str = "Stopped";
-		else if (odi.status==1) str = "Playing";
-		else if (odi.status==2) str = "Paused";
-		else if (odi.status==3) str = "Not Setup";
-		else str = "Setup Failed";
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
-		break;
-	case -8:
-		*vp = INT_TO_JSVAL( odi.buffer);
-		break;
-	case -9:
-		*vp = INT_TO_JSVAL( odi.db_unit_count);
-		break;
-	case -10:
-		*vp = INT_TO_JSVAL( odi.cb_unit_count);
-		break;
-	case -11:
-		*vp = INT_TO_JSVAL( odi.cb_max_count);
-		break;
-	case -12:
-		if (odi.od_type==GF_STREAM_SCENE) str = "Scene";
-		else if (odi.od_type==GF_STREAM_OD) str = "Object Descriptor";
-		else if (odi.od_type==GF_STREAM_VISUAL) str = "Video";
-		else if (odi.od_type==GF_STREAM_AUDIO) str = "Audio";
-		else if (odi.od_type==GF_STREAM_TEXT) str = "Text";
-		else if (odm->subscene) str = "Subscene";
-		else str = "Unknow";
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
-		break;
-	case -13:
-		*vp = INT_TO_JSVAL( odi.sample_rate);
-		break;
-	case -14:
-		*vp = INT_TO_JSVAL( odi.num_channels);
-		break;
-	case -15:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_4cc_to_str(odi.lang) ) );
-		break;
-	case -16:
-		*vp = INT_TO_JSVAL( odi.width);
-		break;
-	case -17:
-		*vp = INT_TO_JSVAL( odi.height);
-		break;
-	case -18:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_4cc_to_str(odi.pixelFormat) ) );
-		break;
-	case -19:
-		if (odi.par) {
-			char szPar[50];
-			sprintf(szPar, "%d:%d", (odi.par>>16)&0xFF, (odi.par)&0xFF );
-			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szPar ) );
-		} else {
-			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "1:1" ) );
-		}
-		break;
-	case -20:
-		*vp = INT_TO_JSVAL(odi.nb_dec_frames);
-		break;
-	case -21:
-		*vp = INT_TO_JSVAL(odi.nb_droped);
-		break;
-	case -22:
-		*vp = INT_TO_JSVAL(odi.max_dec_time);
-		break;
-	case -23:
-		*vp = INT_TO_JSVAL(odi.total_dec_time);
-		break;
-	case -24:
-		*vp = INT_TO_JSVAL(odi.avg_bitrate);
-		break;
-	case -25:
-		*vp = INT_TO_JSVAL(odi.max_bitrate);
-		break;
-	case -26:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_handler));
-		break;
-	case -27:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.codec_name));
-		break;
-	case -28:
-	{
-		//first check network
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_QUALITY_QUERY;
-		com.base.on_channel = gf_list_get(odm->channels, 0);
+prop_id = SMJS_ID_TO_INT(id);
+switch (prop_id) {
+case -1:
+	*vp = INT_TO_JSVAL(odi.od->objectDescriptorID);
+	break;
+case -2:
+	*vp = INT_TO_JSVAL(odm->subscene ? gf_list_count(odm->subscene->resources) : 0);
+	break;
+case -3:
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_url));
+	break;
+case -4:
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.duration) );
+	break;
+case -5:
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.current_time) );
+	break;
+case -6:
+	*vp = INT_TO_JSVAL( odi.clock_drift);
+	break;
+case -7:
+	if (odi.status==0) str = "Stopped";
+	else if (odi.status==1) str = "Playing";
+	else if (odi.status==2) str = "Paused";
+	else if (odi.status==3) str = "Not Setup";
+	else str = "Setup Failed";
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
+	break;
+case -8:
+	*vp = INT_TO_JSVAL( odi.buffer);
+	break;
+case -9:
+	*vp = INT_TO_JSVAL( odi.db_unit_count);
+	break;
+case -10:
+	*vp = INT_TO_JSVAL( odi.cb_unit_count);
+	break;
+case -11:
+	*vp = INT_TO_JSVAL( odi.cb_max_count);
+	break;
+case -12:
+	if (odi.od_type==GF_STREAM_SCENE) str = "Scene";
+	else if (odi.od_type==GF_STREAM_OD) str = "Object Descriptor";
+	else if (odi.od_type==GF_STREAM_VISUAL) str = "Video";
+	else if (odi.od_type==GF_STREAM_AUDIO) str = "Audio";
+	else if (odi.od_type==GF_STREAM_TEXT) str = "Text";
+	else if (odm->subscene) str = "Subscene";
+	else str = "Unknow";
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
+	break;
+case -13:
+	*vp = INT_TO_JSVAL( odi.sample_rate);
+	break;
+case -14:
+	*vp = INT_TO_JSVAL( odi.num_channels);
+	break;
+case -15:
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, odi.lang_code ? odi.lang_code : gf_4cc_to_str(odi.lang) ) );
+	break;
+case -16:
+	*vp = INT_TO_JSVAL( odi.width);
+	break;
+case -17:
+	*vp = INT_TO_JSVAL( odi.height);
+	break;
+case -18:
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_4cc_to_str(odi.pixelFormat) ) );
+	break;
+case -19:
+	if (odi.par) {
+		char szPar[50];
+		sprintf(szPar, "%d:%d", (odi.par>>16)&0xFF, (odi.par)&0xFF );
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szPar ) );
+	} else {
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "1:1" ) );
+	}
+	break;
+case -20:
+	*vp = INT_TO_JSVAL(odi.nb_dec_frames);
+	break;
+case -21:
+	*vp = INT_TO_JSVAL(odi.nb_dropped);
+	break;
+case -22:
+	*vp = INT_TO_JSVAL(odi.max_dec_time);
+	break;
+case -23:
+	*vp = INT_TO_JSVAL(odi.total_dec_time);
+	break;
+case -24:
+	*vp = INT_TO_JSVAL(odi.avg_bitrate);
+	break;
+case -25:
+	*vp = INT_TO_JSVAL(odi.max_bitrate);
+	break;
+case -26:
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_handler));
+	break;
+case -27:
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.codec_name));
+	break;
+case -28:
+{
+	//first check network
+	GF_NetworkCommand com;
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.command_type = GF_NET_SERVICE_QUALITY_QUERY;
+	com.base.on_channel = gf_list_get(odm->channels, 0);
 
-		gf_term_service_command(odm->net_service, &com);
-		if (com.quality_query.index) {
-			*vp = INT_TO_JSVAL(com.quality_query.index);
+	gf_term_service_command(odm->net_service, &com);
+	if (com.quality_query.index) {
+		*vp = INT_TO_JSVAL(com.quality_query.index);
+		break;
+	}
+#if 0
+	//use input channels
+	if (odm->codec->type==GF_STREAM_VISUAL) {
+		u32 count = gf_list_count(odm->codec->inChannels);
+		if (count>1) {
+			*vp = INT_TO_JSVAL(count);
 			break;
 		}
-
-	#if 0
-		//otherwise use input channels
-		if (odm->codec->type==GF_STREAM_VISUAL) {
-			*vp = INT_TO_JSVAL(gf_list_count(odm->codec->inChannels));
-		} else {
-			*vp = INT_TO_JSVAL(0);
+	}
+	//use number of scalable addons
+	if (odm->upper_layer_odm) {
+		u32 count = 0;
+		while (odm) {
+			odm = odm->upper_layer_odm;
+			count++;
 		}
-	#endif
+		*vp = INT_TO_JSVAL(count);
+		break;
 	}
+#endif
+	*vp = INT_TO_JSVAL(1);
 	break;
-	case -29:
-		*vp = INT_TO_JSVAL(odi.max_buffer);
-		break;
-	case -30:
-		*vp = INT_TO_JSVAL(odi.min_buffer);
-		break;
-	case -31:
-		*vp = INT_TO_JSVAL(odi.au_duration);
-		break;
-	case -32:
-		*vp = INT_TO_JSVAL(odi.nb_iraps);
-		break;
-	case -33:
-		*vp = INT_TO_JSVAL(odi.irap_total_dec_time);
-		break;
-	case -34:
-		*vp = INT_TO_JSVAL(odi.irap_max_dec_time);
-		break;
-	case -35:
-		*vp = INT_TO_JSVAL(odi.od ? odi.od->ServiceID : 0);
-		break;
-	case -36:
-		*vp = INT_TO_JSVAL( (!odm->addon && odm->subscene) ? odm->subscene->selected_service_id : odm->parentscene->selected_service_id);
-		break;
-	case -37:
-	{
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_GET_STATS;
-		com.base.on_channel = gf_list_get(odm->channels, 0);
-		gf_term_service_command(odm->net_service, &com);
-		*vp = INT_TO_JSVAL(com.net_stats.bw_down);
+}
+case -29:
+	*vp = INT_TO_JSVAL(odi.max_buffer);
+	break;
+case -30:
+	*vp = INT_TO_JSVAL(odi.min_buffer);
+	break;
+case -31:
+	*vp = INT_TO_JSVAL(odi.au_duration);
+	break;
+case -32:
+	*vp = INT_TO_JSVAL(odi.nb_iraps);
+	break;
+case -33:
+	*vp = INT_TO_JSVAL(odi.irap_total_dec_time);
+	break;
+case -34:
+	*vp = INT_TO_JSVAL(odi.irap_max_dec_time);
+	break;
+case -35:
+	*vp = INT_TO_JSVAL(odi.od ? odi.od->ServiceID : 0);
+	break;
+case -36:
+	*vp = INT_TO_JSVAL( (!odm->addon && odm->subscene) ? odm->subscene->selected_service_id : odm->parentscene->selected_service_id);
+	break;
+case -37:
+{
+	GF_NetworkCommand com;
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.command_type = GF_NET_GET_STATS;
+	com.base.on_channel = gf_list_get(odm->channels, 0);
+	gf_term_service_command(odm->net_service, &com);
+	*vp = INT_TO_JSVAL(com.net_stats.bw_down/1000);
+}
+break;
+case -38:
+	*vp = INT_TO_JSVAL(gf_list_count(odm->net_service->dnloads) );
+	break;
+case -39:
+	if ((s32) odm->timeshift_depth > 0) {
+		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, ((Double) odm->timeshift_depth) / 1000.0 ) );
+	} else {
+		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, 0.0) );
 	}
 	break;
-	case -38:
-		*vp = INT_TO_JSVAL(gf_list_count(odm->net_service->dnloads) );
-		break;
-	case -39:
-		if ((s32) odm->timeshift_depth >= 0) {
-			*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, ((Double) odm->timeshift_depth) / 1000.0 ) );
-		} else {
-			*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, -1) );
-		}
+case -40:
+{
+	GF_NetworkCommand com;
+	GF_Scene *scene;
+	Double res = 0.0;
+
+	if (!odm->timeshift_depth) {
+		*vp = INT_TO_JSVAL(0);
 		break;
-	case -40:
-	{
-		GF_NetworkCommand com;
-		GF_Scene *scene;
+	}
 
-		if (!odm->timeshift_depth) {
-			*vp = INT_TO_JSVAL(0);
-			break;
-		}
+	scene = odm->subscene ? odm->subscene : odm->parentscene;
 
-		scene = odm->subscene ? odm->subscene : odm->parentscene;
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.command_type = GF_NET_GET_TIMESHIFT;
 
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_GET_TIMESHIFT;
-
-		//we may need to check the main addon for timeshifting
-		if (scene->main_addon_selected) {
-			u32 i, count = gf_list_count(scene->resources);
-			for (i=0; i < count; i++) {
-				GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-				if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-					odm = an_odm;
-				}
+	//we may need to check the main addon for timeshifting
+	if (scene->main_addon_selected) {
+		u32 i, count = gf_list_count(scene->resources);
+		for (i=0; i < count; i++) {
+			GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+			if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+				odm = an_odm;
 			}
 		}
+	}
 
+	if (odm->timeshift_depth) {
 		//can be NULL
 		com.base.on_channel = gf_list_get(odm->channels, 0);
 		gf_term_service_command(odm->net_service, &com);
-		*vp = INT_TO_JSVAL(com.timeshift.time);
-	}
-	break;
-	case -41:
-		*vp = BOOLEAN_TO_JSVAL( (odm->addon || (!odm->subscene && odm->parentscene->root_od->addon)) ? JS_TRUE : JS_FALSE);
-		break;
-	case -42:
-	{
-		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-		*vp = BOOLEAN_TO_JSVAL( scene->main_addon_selected ? JS_TRUE : JS_FALSE);
+		res = com.timeshift.time;
+	} else if (scene->main_addon_selected) {
+		GF_Clock *ck;
+		ck = scene->dyn_ck;
+		if (scene->scene_codec) ck = scene->scene_codec->ck;
+		if (ck) {
+			u32 now = gf_clock_time(scene->dyn_ck) ;
+			u32 live = scene->obj_clock_at_main_activation + gf_sys_clock() - scene->sys_clock_at_main_activation;
+			res = ((Double) live) / 1000.0;
+			res -= ((Double) now) / 1000.0;
+
+			if (res<0) {
+				GF_Event evt;
+				memset(&evt, 0, sizeof(evt));
+				evt.type = GF_EVENT_TIMESHIFT_UNDERRUN;
+				gf_term_send_event(odm->term, &evt);
+				res=0;
+			} else if (res && res*1000 > scene->timeshift_depth) {
+				GF_Event evt;
+				memset(&evt, 0, sizeof(evt));
+				evt.type = GF_EVENT_TIMESHIFT_OVERFLOW;
+				gf_term_send_event(odm->term, &evt);
+				res=scene->timeshift_depth;
+				res/=1000;
+			}
+		}
 	}
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, res) );
+}
+break;
+case -41:
+	*vp = BOOLEAN_TO_JSVAL( (odm->addon || (!odm->subscene && odm->parentscene->root_od->addon)) ? JS_TRUE : JS_FALSE);
 	break;
-	case -43:
-	{
-		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-		*vp = BOOLEAN_TO_JSVAL( gf_sc_is_over(odm->term->compositor, scene->graph) ? JS_TRUE : JS_FALSE);
-	}
+case -42:
+{
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	*vp = BOOLEAN_TO_JSVAL( scene->main_addon_selected ? JS_TRUE : JS_FALSE);
+}
+break;
+case -43:
+{
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	*vp = BOOLEAN_TO_JSVAL( gf_sc_is_over(odm->term->compositor, scene->graph) ? JS_TRUE : JS_FALSE);
+}
+break;
+case -44:
+{
+	GF_Channel *ch = gf_list_get(odm->channels, 0);
+	*vp = BOOLEAN_TO_JSVAL((ch && ch->is_pulling) ? JS_TRUE : JS_FALSE);
+}
+break;
+case -45:
+	*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->is_dynamic_scene ? JS_TRUE : JS_FALSE);
 	break;
-	case -44:
-	{
-		GF_Channel *ch = gf_list_get(odm->channels, 0);
-		*vp = BOOLEAN_TO_JSVAL((ch && ch->is_pulling) ? JS_TRUE : JS_FALSE);
+case -46:
+{
+	GF_NetworkCommand com;
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.command_type = GF_NET_SERVICE_INFO;
+	com.info.service_id = odi.od->ServiceID;
+	gf_term_service_command(odm->net_service, &com);
+	if (com.info.name) {
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, com.info.name ) );
+	} else {
+		*vp = JSVAL_NULL;
 	}
+}
+break;
+case -47:
+	*vp = INT_TO_JSVAL( odi.ntp_diff);
 	break;
-	case -45:
-		*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->is_dynamic_scene ? JS_TRUE : JS_FALSE);
-		break;
-	case -46:
-	{
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_INFO;
-		com.info.service_id = odi.od->ServiceID;
-		gf_term_service_command(odm->net_service, &com);
-		if (com.info.name) {
-			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, com.info.name ) );
-		} else {
-			*vp = JSVAL_NULL;
+
+case -48:
+{
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	u32 i, count = gf_list_count(scene->resources);
+	*vp = JSVAL_NULL;
+	for (i=0; i < count; i++) {
+		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+		if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			if (!strstr(an_odm->addon->url, "://")) {
+				char szURL[GF_MAX_PATH];
+				sprintf(szURL, "gpac://%s", an_odm->addon->url);
+				*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szURL) );
+			} else {
+				*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, an_odm->addon->url) );
+			}
 		}
 	}
-	break;
-	case -47:
-		*vp = INT_TO_JSVAL( odi.ntp_diff);
-		break;
+}
+break;
+case -49:
+{
+	u32 i, count;
+	GF_Err e;
+	GF_NetworkCommand com;
+	GF_Scene *scene;
 
-	case -48:
-	{
-		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-		u32 i, count = gf_list_count(scene->resources);
-		*vp = JSVAL_NULL;
-		for (i=0; i < count; i++) {
-			GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-			if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-				if (!strstr(an_odm->addon->url, "://")) {
-					char szURL[GF_MAX_PATH];
-					sprintf(szURL, "gpac://%s", an_odm->addon->url);
-					*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szURL) );
-				} else {
-					*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, an_odm->addon->url) );
-				}
-			}
+	scene = odm->subscene ? odm->subscene : odm->parentscene;
+
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.command_type = GF_NET_SERVICE_CAN_REVERSE_PLAYBACK;
+
+	//we may need to check the main addon for timeshifting
+	count = gf_list_count(scene->resources);
+	for (i=0; i < count; i++) {
+		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+		if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			odm = an_odm;
 		}
 	}
+
+	//can be NULL
+	com.base.on_channel = gf_list_get(odm->channels, 0);
+	e = gf_term_service_command(odm->net_service, &com);
+	*vp = BOOLEAN_TO_JSVAL((e==GF_OK) ? GF_TRUE : GF_FALSE );
+}
+break;
+case -50:
+	*vp = BOOLEAN_TO_JSVAL(odm && (odm->lower_layer_odm || odm->scalable_addon) ? JS_TRUE : JS_FALSE);
 	break;
+case -51:
+{
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	u32 i, count = gf_list_count(scene->resources);
+
+	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, -1) );
+	if (! scene->main_addon_selected) break;
+
+	for (i=0; i < count; i++) {
+		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+		if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			if (an_odm->duration) {
+				Double now = gf_clock_time(scene->dyn_ck) / 1000.0;
+				now -= ((Double) an_odm->addon->media_pts) / 90000.0;
+				now += ((Double) an_odm->addon->media_timestamp) / an_odm->addon->media_timescale;
+				*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, now) );
+			}
+		}
 	}
+}
+break;
+}
+
 return JS_TRUE;
 }
 
@@ -1186,6 +1378,20 @@
 	return JS_TRUE;
 }
 
+static JSBool SMJS_FUNCTION(gjs_odm_select)
+{
+	SMJS_OBJ
+	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
+
+	if (!odm) return JS_TRUE;
+
+#ifndef GPAC_DISABLE_PLAYER
+	gf_scene_select_object(odm->parentscene, odm);
+#endif
+	return JS_TRUE;
+}
+
+
 static JSBool SMJS_FUNCTION(gjs_odm_get_resource)
 {
 	GF_ObjectManager *an_odm = NULL;
@@ -1231,28 +1437,34 @@
 	return JS_TRUE;
 }
 
-static void do_enable_addon(GF_ObjectManager *odm, char *addon_url, Bool enable_if_defined )
+static void do_enable_addon(GF_ObjectManager *odm, char *addon_url, Bool enable_if_defined, Bool disable_if_defined )
 {
 	GF_AssociatedContentLocation addon_info;
 	memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
 	addon_info.external_URL = addon_url;
 	addon_info.timeline_id = -100;
 	addon_info.enable_if_defined = enable_if_defined;
+	addon_info.disable_if_defined = disable_if_defined;
 	gf_scene_register_associated_media(odm->subscene ? odm->subscene : odm->parentscene, &addon_info);
 }
 
 static JSBool SMJS_FUNCTION(gjs_odm_enable_addon)
 {
+	Bool do_disable = GF_FALSE;
 	char *addon_url = NULL;
 	SMJS_OBJ
 	SMJS_ARGS
 	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
 
 	if (! JSVAL_IS_STRING(argv[0]) ) return JS_TRUE;
+	if ((argc==2) && JSVAL_IS_BOOLEAN(argv[1])) {
+		do_disable = (Bool) JSVAL_TO_BOOLEAN(argv[1]);
+	}
+
 
 	addon_url = SMJS_CHARS(c, argv[0]);
 	if (addon_url) {
-		do_enable_addon(odm, addon_url, GF_TRUE);
+		do_enable_addon(odm, addon_url, GF_TRUE, do_disable);
 	}
 	return JS_TRUE;
 }
@@ -1268,7 +1480,7 @@
 
 	addon_url = SMJS_CHARS(c, argv[0]);
 	if (addon_url) {
-		do_enable_addon(odm, addon_url, GF_FALSE);
+		do_enable_addon(odm, addon_url, GF_FALSE, GF_FALSE);
 	}
 	return JS_TRUE;
 }
@@ -1293,6 +1505,7 @@
 			return JS_TRUE;
 		}
 		if (!strncmp(service_url, "gpac://", 7)) url = service_url + 7;
+		if (!strncmp(service_url, "file://", 7)) url = service_url + 7;
 		count = gf_list_count(scene->resources);
 		for (i=0; i<count; i++) {
 			odm = gf_list_get(scene->resources, i);
@@ -1316,6 +1529,72 @@
 }
 
 
+static JSBool SMJS_FUNCTION(gpac_new_storage)
+{
+	char szFile[GF_MAX_PATH];
+	JSObject *anobj;
+	GF_Config *storage = NULL;
+	char *storage_url = NULL;
+	u8 hash[20];
+	char temp[3];
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_GPACJSExt *gjs = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
+
+	if (JSVAL_IS_STRING(argv[0]) ) {
+		u32 i, count;
+		storage_url = SMJS_CHARS(c, argv[0]);
+		if (!storage_url) {
+			SMJS_SET_RVAL(JSVAL_NULL);
+			return JS_TRUE;
+		}
+
+		szFile[0]=0;
+		gf_sha1_csum((u8 *)storage_url, (u32) strlen(storage_url), hash);
+		for (i=0; i<20; i++) {
+			sprintf(temp, "%02X", hash[i]);
+			strcat(szFile, temp);
+		}
+		strcat(szFile, ".cfg");
+
+		count = gf_list_count(gjs->storages);
+		for (i=0; i<count; i++) {
+			GF_Config *a_cfg = gf_list_get(gjs->storages, i);
+			char *cfg_name = gf_cfg_get_filename(a_cfg);
+
+			if (strstr(cfg_name, szFile)) {
+				storage = a_cfg;
+				gf_free(cfg_name);
+				break;
+			}
+			gf_free(cfg_name);
+		}
+
+		if (!storage) {
+			const char *storage_dir = gf_cfg_get_key(gjs->term->user->config, "General", "StorageDirectory");
+
+			storage = gf_cfg_force_new(storage_dir, szFile);
+			if (storage) {
+				gf_cfg_set_key(storage, "GPAC", "StorageURL", storage_url);
+				gf_list_add(gjs->storages, storage);
+			}
+		}
+
+		SMJS_FREE(c, storage_url);
+	}
+
+	if (!storage) {
+		SMJS_SET_RVAL(JSVAL_NULL);
+		return JS_TRUE;
+	}
+	anobj = JS_NewObject(c, &gjs->storageClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, anobj, storage);
+
+
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(anobj) );
+	return JS_TRUE;
+}
+
 static SMJS_FUNC_PROP_GET( gpacevt_getProperty)
 
 GF_GPACJSExt *gjs = SMJS_GET_PRIVATE(c, obj);
@@ -1355,6 +1634,9 @@
 		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, gf_dom_event_get_name(evt->type) ));
 #endif
 		break;
+	case -9:
+		*vp = INT_TO_JSVAL(evt->key.hw_code);
+		break;
 	}
 } else if (SMJS_ID_IS_STRING(id)) {
 	char *name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
@@ -1382,12 +1664,25 @@
 
 static Bool gjs_event_filter(void *udta, GF_Event *evt, Bool consumed_by_compositor)
 {
+	u32 retry;
 	Bool res;
 	jsval argv[1], rval;
 	GF_GPACJSExt *gjs = (GF_GPACJSExt *)udta;
 	if (consumed_by_compositor) return 0;
 
 	if (gjs->evt != NULL) return 0;
+
+	/*fixme - events should all be handled by the compositor */
+	res = 0;
+	retry=100;
+	while (retry && gjs->nb_loaded) {
+		res = gf_mx_try_lock(gjs->term->compositor->mx);
+		if (res) break;
+		retry --;
+		gf_sleep(0);
+	}
+	if (!res) return 0;
+
 	res = 0;
 	while (gjs->nb_loaded) {
 		res = gf_sg_try_lock_javascript(gjs->c);
@@ -1399,14 +1694,15 @@
 	gjs->evt = evt;
 	SMJS_SET_PRIVATE(gjs->c, gjs->evt_obj, gjs);
 	argv[0] = OBJECT_TO_JSVAL(gjs->evt_obj);
-	rval = JSVAL_VOID;
+	rval = BOOLEAN_TO_JSVAL(JS_TRUE);
 	JS_CallFunctionValue(gjs->c, gjs->evt_filter_obj, gjs->evt_fun, 1, argv, &rval);
 	SMJS_SET_PRIVATE(gjs->c, gjs->evt_obj, NULL);
 	gjs->evt = NULL;
+	gf_mx_v(gjs->term->compositor->mx);
 
 	res = 0;
 	if (JSVAL_IS_BOOLEAN(rval) ) {
-		res = (JSVAL_TO_BOOLEAN(rval)==JS_TRUE) ? 1 : 0;
+		res = (JSVAL_TO_BOOLEAN(rval)==JS_TRUE) ? GF_TRUE : GF_FALSE;
 	} else if (JSVAL_IS_INT(rval) ) {
 		res = (JSVAL_TO_INT(rval)) ? 1 : 0;
 	}
@@ -1470,8 +1766,11 @@
 	GF_Node *elt;
 	u32 w, h;
 	JSObject *scene_obj;
+#ifndef GPAC_DISABLE_SCENEGRAPH
 	GF_SceneGraph *sg;
+#endif
 	GF_Scene *scene=NULL;
+
 	SMJS_OBJ
 	SMJS_ARGS
 	GF_GPACJSExt *gjs = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
@@ -1480,12 +1779,18 @@
 	elt = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]));
 	if (!elt) return JS_TRUE;
 	switch (elt->sgprivate->tag) {
+#ifndef GPAC_DISABLE_VRML
 	case TAG_MPEG4_Inline:
+		scene = (GF_Scene *)gf_node_get_private(elt);
+		break;
+#endif
+
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Inline:
-#endif
 		scene = (GF_Scene *)gf_node_get_private(elt);
 		break;
+#endif
+
 #ifndef GPAC_DISABLE_SVG
 	case TAG_SVG_animation:
 		sg = gf_sc_animation_get_scenegraph(elt);
@@ -1525,20 +1830,106 @@
 	return JS_TRUE;
 }
 
+
+static JSBool SMJS_FUNCTION(gjs_storage_get_option)
+{
+	const char *opt = NULL;
+	char *sec_name, *key_name;
+	s32 idx = -1;
+	JSString *s;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_Config *config = (GF_Config *)SMJS_GET_PRIVATE(c, obj);
+	if (!config) return JS_FALSE;
+
+	if (argc < 2) return JS_FALSE;
+
+	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
+	if (!JSVAL_IS_STRING(argv[1]) && !JSVAL_IS_INT(argv[1])) return JS_FALSE;
+
+	sec_name = SMJS_CHARS(c, argv[0]);
+	key_name = NULL;
+	if (JSVAL_IS_INT(argv[1])) {
+		idx = JSVAL_TO_INT(argv[1]);
+	} else if (JSVAL_IS_STRING(argv[1]) ) {
+		key_name = SMJS_CHARS(c, argv[1]);
+	}
+
+	if (key_name) {
+		opt = gf_cfg_get_key(config, sec_name, key_name);
+	} else if (idx>=0) {
+		opt = gf_cfg_get_key_name(config, sec_name, idx);
+	} else {
+		opt = NULL;
+	}
+	if (key_name) {
+		SMJS_FREE(c, key_name);
+	}
+	SMJS_FREE(c, sec_name);
+
+	if (opt) {
+		s = JS_NewStringCopyZ(c, opt);
+		SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
+	} else {
+		SMJS_SET_RVAL( JSVAL_NULL );
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(gjs_storage_set_option)
+{
+	char *sec_name, *key_name, *key_val;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_Config *config = (GF_Config *)SMJS_GET_PRIVATE(c, obj);
+	if (!config) return JS_FALSE;
+
+	if (argc < 3) return JS_FALSE;
+
+	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
+	if (!JSVAL_IS_STRING(argv[1])) return JS_FALSE;
+
+	sec_name = SMJS_CHARS(c, argv[0]);
+	key_name = SMJS_CHARS(c, argv[1]);
+	key_val = NULL;
+	if (JSVAL_IS_STRING(argv[2]))
+		key_val = SMJS_CHARS(c, argv[2]);
+
+	gf_cfg_set_key(config, sec_name, key_name, key_val);
+
+	SMJS_FREE(c, sec_name);
+	SMJS_FREE(c, key_name);
+	if (key_val) {
+		SMJS_FREE(c, key_val);
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(gjs_storage_save)
+{
+	SMJS_OBJ
+	GF_Config *config = (GF_Config *)SMJS_GET_PRIVATE(c, obj);
+	if (!config) return JS_FALSE;
+
+	gf_cfg_save(config);
+	return JS_TRUE;
+}
+
 static void gjs_load(GF_JSUserExtension *jsext, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
 {
 	GF_GPACJSExt *gjs;
 	GF_JSAPIParam par;
 
 	JSPropertySpec gpacEvtClassProps[] = {
-		SMJS_PROPERTY_SPEC("keycode",			 -1, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("mouse_x",			 -2, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("mouse_y",			 -3, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("picked",			 -4, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("wheel",			 -5, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("keycode",			-1, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("mouse_x",			-2, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("mouse_y",			-3, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("picked",			-4, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("wheel",				-5, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("button",			-6, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("type",			 -7, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("name",			 -8, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("type",				-7, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("name",				-8, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("hwkey",				-9, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacEvtClassFuncs[] = {
@@ -1589,10 +1980,8 @@
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("getOption",		gpac_getOption, 3),
-		SMJS_FUNCTION_SPEC("setOption",		gpac_setOption, 4),
-		SMJS_FUNCTION_SPEC("get_option",		gpac_getOption, 3),
-		SMJS_FUNCTION_SPEC("set_option",		gpac_setOption, 4),
+		SMJS_FUNCTION_SPEC("get_option",		gpac_get_option, 3),
+		SMJS_FUNCTION_SPEC("set_option",		gpac_set_option, 4),
 		SMJS_FUNCTION_SPEC("get_arg",		gpac_get_arg, 1),
 		SMJS_FUNCTION_SPEC("enum_directory",	gpac_enum_directory, 1),
 		SMJS_FUNCTION_SPEC("set_size",		gpac_set_size, 1),
@@ -1608,6 +1997,11 @@
 		SMJS_FUNCTION_SPEC("show_keyboard",		gpac_show_keyboard, 1),
 		SMJS_FUNCTION_SPEC("trigger_gc",		gpac_trigger_gc, 1),
 		SMJS_FUNCTION_SPEC("get_object_manager",		gpac_get_object_manager, 1),
+		SMJS_FUNCTION_SPEC("new_storage",		gpac_new_storage, 1),
+		SMJS_FUNCTION_SPEC("switch_quality",		gpac_switch_quality, 1),
+		SMJS_FUNCTION_SPEC("reload",		gpac_reload, 1),
+		SMJS_FUNCTION_SPEC("navigation_supported",		gpac_navigation_supported, 1),
+		SMJS_FUNCTION_SPEC("set_back_color",		gpac_set_back_color, 3),
 
 
 		SMJS_FUNCTION_SPEC(0, 0, 0)
@@ -1662,6 +2056,10 @@
 		SMJS_PROPERTY_SPEC("service_name",		-46, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("ntp_diff",			-47, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("main_addon_url",	-48, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("reverse_playback_supported",		-49, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("scalable_enhancement",		-50, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("main_addon_media_time",		-51, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+
 
 
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
@@ -1676,10 +2074,23 @@
 		SMJS_FUNCTION_SPEC("select_service", gjs_odm_select_service, 1),
 		SMJS_FUNCTION_SPEC("select_quality", gjs_odm_select_quality, 1),
 		SMJS_FUNCTION_SPEC("disable_main_addon", gjs_odm_disable_main_addon, 1),
+		SMJS_FUNCTION_SPEC("select", gjs_odm_select, 1),
 
 		SMJS_FUNCTION_SPEC(0, 0, 0)
 	};
 
+
+	JSPropertySpec storageClassProps[] = {
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+	};
+	JSFunctionSpec storageClassFuncs[] = {
+		SMJS_FUNCTION_SPEC("get_option",		gjs_storage_get_option, 2),
+		SMJS_FUNCTION_SPEC("set_option",		gjs_storage_set_option, 3),
+		SMJS_FUNCTION_SPEC("save",				gjs_storage_save, 0),
+		SMJS_FUNCTION_SPEC(0, 0, 0)
+	};
+
+
 	gjs = jsext->udta;
 	/*nothing to do on unload*/
 	if (unload) {
@@ -1711,6 +2122,10 @@
 
 		JS_SETUP_CLASS(gjs->odmClass, "ODM", JSCLASS_HAS_PRIVATE, odm_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
 		GF_JS_InitClass(c, global, 0, &gjs->odmClass, 0, 0, odmClassProps, odmClassFuncs, 0, 0);
+
+
+		JS_SETUP_CLASS(gjs->storageClass, "Storage", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		GF_JS_InitClass(c, global, 0, &gjs->storageClass, 0, 0, storageClassProps, storageClassFuncs, 0, 0);
 	} else {
 		JS_DefineProperty(c, global, "gpac", OBJECT_TO_JSVAL(gjs->gpac_obj), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
 	}
@@ -1743,6 +2158,8 @@
 		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_OVERFLOW);
 		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_UNDERRUN);
 		DECLARE_GPAC_CONST(GF_EVENT_QUIT);
+		DECLARE_GPAC_CONST(GF_EVENT_MAIN_ADDON_STATE);
+		DECLARE_GPAC_CONST(GF_EVENT_SCENE_SIZE);
 
 		DECLARE_GPAC_CONST(GF_NAVIGATE_NONE);
 		DECLARE_GPAC_CONST(GF_NAVIGATE_WALK);
@@ -1780,6 +2197,7 @@
 	GF_SAFEALLOC(gjs, GF_GPACJSExt);
 	gjs->rti_refresh_rate = GPAC_JS_RTI_REFRESH_RATE;
 	gjs->evt_fun = JSVAL_NULL;
+	gjs->storages = gf_list_new();
 	dr->load = gjs_load;
 	dr->udta = gjs;
 	return dr;
@@ -1790,6 +2208,14 @@
 {
 	GF_JSUserExtension *dr = (GF_JSUserExtension *) ifce;
 	GF_GPACJSExt *gjs = dr->udta;
+
+	while (gf_list_count(gjs->storages)) {
+		GF_Config *cfg = (GF_Config *) gf_list_pop_back(gjs->storages);
+		gf_cfg_discard_changes(cfg);
+		gf_cfg_del(cfg);
+	}
+	gf_list_del(gjs->storages);
+
 	gf_free(gjs);
 	gf_free(dr);
 }

v0.5.2.tar.gz/modules/hyb_in/Makefile -> v0.6.1.tar.gz/modules/hyb_in/Makefile Changed

v0.5.2.tar.gz/modules/img_in/Makefile -> v0.6.1.tar.gz/modules/img_in/Makefile Changed

v0.5.2.tar.gz/modules/img_in/bmp_dec.c -> v0.6.1.tar.gz/modules/img_in/bmp_dec.c Changed

v0.5.2.tar.gz/modules/img_in/img_in.c -> v0.6.1.tar.gz/modules/img_in/img_in.c Changed

@@ -71,9 +71,9 @@
 		esd->decoderConfig->objectTypeIndication = GPAC_BMP_OTI;
 	else {
 		u8 OTI=0;
-		u32 mtype, w, h;
 		GF_BitStream *bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
 #ifndef GPAC_DISABLE_AV_PARSERS
+		u32 mtype, w, h;
 		gf_img_parse(bs, &OTI, &mtype, &w, &h, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
 #endif
 		gf_bs_del(bs);
@@ -132,20 +132,20 @@
 	u32 i;
 	GF_LOG(GF_LOG_MEDIA, GF_LOG_INFO, ("IMG_CanHandleURL(%s)\n", url));
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
 	for (i = 0 ; IMG_MIME_TYPES[i]; i+=3) {
 		if (gf_service_check_mime_register(plug, IMG_MIME_TYPES[i], IMG_MIME_TYPES[i+1], IMG_MIME_TYPES[i+2], sExt))
-			return 1;
+			return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool jp_is_local(const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
 }
 
 
@@ -156,7 +156,7 @@
 		GF_ESD *esd = IMG_GetESD(read);
 		od->objectDescriptorID = 1;
 		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(read->service, (GF_Descriptor *)od, 0);
+		gf_service_declare_media(read->service, (GF_Descriptor *)od, GF_FALSE);
 	}
 }
 
@@ -174,18 +174,19 @@
 	e = param->error;
 	/*wait to get the whole file*/
 	if (!e && (param->msg_type!=GF_NETIO_DATA_TRANSFERED)) return;
+	if ((e==GF_EOS) && (param->msg_type==GF_NETIO_DATA_EXCHANGE)) return;
 
 	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
 		szCache = gf_dm_sess_get_cache_name(read->dnload);
 		if (!szCache) e = GF_IO_ERR;
 		else {
-			read->stream = gf_f64_open((char *) szCache, "rb");
+			read->stream = gf_fopen((char *) szCache, "rb");
 			if (!read->stream) e = GF_SERVICE_ERROR;
 			else {
 				e = GF_OK;
-				gf_f64_seek(read->stream, 0, SEEK_END);
-				read->data_size = (u32) gf_f64_tell(read->stream);
-				gf_f64_seek(read->stream, 0, SEEK_SET);
+				gf_fseek(read->stream, 0, SEEK_END);
+				read->data_size = (u32) gf_ftell(read->stream);
+				gf_fseek(read->stream, 0, SEEK_SET);
 			}
 		}
 	}
@@ -233,11 +234,11 @@
 		return GF_OK;
 	}
 
-	read->stream = fopen(url, "rb");
+	read->stream = gf_fopen(url, "rb");
 	if (read->stream) {
-		gf_f64_seek(read->stream, 0, SEEK_END);
-		read->data_size = (u32) gf_f64_tell(read->stream);
-		gf_f64_seek(read->stream, 0, SEEK_SET);
+		gf_fseek(read->stream, 0, SEEK_END);
+		read->data_size = (u32) gf_ftell(read->stream);
+		gf_fseek(read->stream, 0, SEEK_SET);
 	}
 	gf_service_connect_ack(serv, NULL, read->stream ? GF_OK : GF_URL_ERROR);
 	if (read->stream && read->is_inline) IMG_SetupObject(read);
@@ -252,7 +253,7 @@
 	read = (IMGLoader *)plug->priv;
 	if (!read)
 		return GF_BAD_PARAM;
-	if (read->stream) fclose(read->stream);
+	if (read->stream) gf_fclose(read->stream);
 	read->stream = NULL;
 	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
@@ -278,7 +279,7 @@
 		gf_list_add(od->ESDescriptors, esd);
 		return (GF_Descriptor *) od;
 	}
-	read->is_inline = 1;
+	read->is_inline = GF_TRUE;
 	return NULL;
 }
 
@@ -288,7 +289,7 @@
 	GF_Err e;
 	IMGLoader *read;
 	if (!plug)
-		return 0;
+		return GF_OK;
 	read = (IMGLoader *)plug->priv;
 
 	e = GF_SERVICE_ERROR;
@@ -342,7 +343,7 @@
 	case GF_NET_CHAN_PLAY:
 		/*note we don't handle range since we're only dealing with images*/
 		if (read->ch == com->base.on_channel) {
-			read->done = 0;
+			read->done = GF_FALSE;
 		}
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
@@ -358,8 +359,8 @@
 	IMGLoader *read = (IMGLoader *)plug->priv;
 
 	*out_reception_status = GF_OK;
-	*sl_compressed = 0;
-	*is_new_data = 0;
+	*sl_compressed = GF_FALSE;
+	*is_new_data = GF_FALSE;
 
 	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 	read->sl_hdr.randomAccessPointFlag = 1;
@@ -378,11 +379,11 @@
 				*out_data_size = 0;
 				return GF_OK;
 			}
-			*is_new_data = 1;
-			gf_f64_seek(read->stream, 0, SEEK_SET);
+			*is_new_data = GF_TRUE;
+			gf_fseek(read->stream, 0, SEEK_SET);
 			read->data = (char*) gf_malloc(sizeof(char) * (read->data_size + read->pad_bytes));
 			read->data_size = (u32) fread(read->data, sizeof(char), read->data_size, read->stream);
-			gf_f64_seek(read->stream, 0, SEEK_SET);
+			gf_fseek(read->stream, 0, SEEK_SET);
 			if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
 
 		}
@@ -401,7 +402,7 @@
 		if (!read->data) return GF_BAD_PARAM;
 		gf_free(read->data);
 		read->data = NULL;
-		read->done = 1;
+		read->done = GF_TRUE;
 		return GF_OK;
 	}
 	return GF_OK;

v0.5.2.tar.gz/modules/img_in/jp2_dec.c -> v0.6.1.tar.gz/modules/img_in/jp2_dec.c Changed

v0.5.2.tar.gz/modules/img_in/jpeg_dec.c -> v0.6.1.tar.gz/modules/img_in/jpeg_dec.c Changed

v0.5.2.tar.gz/modules/img_in/png_dec.c -> v0.6.1.tar.gz/modules/img_in/png_dec.c Changed

v0.5.2.tar.gz/modules/ismacryp/Makefile -> v0.6.1.tar.gz/modules/ismacryp/Makefile Changed

v0.5.2.tar.gz/modules/ismacryp/isma_ea.c -> v0.6.1.tar.gz/modules/ismacryp/isma_ea.c Changed

@@ -51,7 +51,7 @@
 	u32 nb_allow_play;
 	Bool is_oma;
 	u32 preview_range;
-	/*for Common Enxryption*/
+	/*for Common Encryption*/
 	Bool is_cenc;
 	Bool is_cbc;
 	Bool first_crypted_samp;
@@ -76,9 +76,9 @@
 
 	e = GF_OK;
 	/*try local*/
-	t = (strstr(kms_url, "://") == NULL) ? gf_f64_open(kms_url, "r") : NULL;
+	t = (strstr(kms_url, "://") == NULL) ? gf_fopen(kms_url, "r") : NULL;
 	if (t) {
-		fclose(t);
+		gf_fclose(t);
 		return gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *)kms_url, priv->key, priv->salt);
 	}
 	/*note that gpac doesn't have TLS support -> not really usefull. As a general remark, ISMACryp
@@ -283,6 +283,7 @@
 {
 	GF_CENCConfig *cfg = (GF_CENCConfig*)evt->config_data;
 	u32 i;
+	Bool is_playing = (priv->state == ISMAEA_STATE_PLAY) ? GF_TRUE : GF_FALSE;
 
 	priv->state = ISMAEA_STATE_ERROR;
 
@@ -351,7 +352,7 @@
 	else
 		priv->is_cbc = GF_TRUE;
 
-	priv->state = ISMAEA_STATE_SETUP;
+	priv->state = is_playing ? ISMAEA_STATE_PLAY : ISMAEA_STATE_SETUP;
 	//priv->nb_allow_play = 1;
 	return GF_OK;
 }
@@ -395,7 +396,6 @@
 	bin128 KID;
 	char *buffer;
 	u32 max_size, i, subsample_count;
-	u64 BSO;
 	GF_CENCSampleAuxInfo *sai;
 
 	e = GF_OK;
@@ -472,7 +472,6 @@
 	//sub-sample encryption
 	if (sai->subsample_count) {
 		subsample_count = 0;
-		BSO = 0;
 		while (gf_bs_available(cyphertext_bs)) {
 			if (subsample_count >= sai->subsample_count)
 				break;
@@ -494,43 +493,6 @@
 			gf_crypt_decrypt(priv->crypt, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
 			gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
 
-			/*update IV for next subsample*/
-			if (priv->is_cenc) {
-				BSO += sai->subsamples[subsample_count].bytes_encrypted_data;
-				if (gf_bs_available(cyphertext_bs)) {
-					char next_IV[17];
-					u64 prev_block_count, salt_portion, block_count_portion;
-					u32 remain;
-					GF_BitStream *bs, *tmp;
-
-					prev_block_count = BSO / 16;
-					remain = BSO % 16;
-					tmp = gf_bs_new((const char *)sai->IV, 16, GF_BITSTREAM_READ);
-					bs = gf_bs_new(next_IV, 17, GF_BITSTREAM_WRITE);
-					gf_bs_write_u8(bs, 0);	/*begin of counter*/
-
-					salt_portion = gf_bs_read_u64(tmp);
-					block_count_portion = gf_bs_read_u64(tmp);
-					/*reset the block counter to zero without affecting the other 64 bits of the IV*/
-					if (prev_block_count > 0xFFFFFFFFFFFFFFFFULL - block_count_portion)
-						block_count_portion = prev_block_count - (0xFFFFFFFFFFFFFFFFULL - block_count_portion) - 1;
-					else
-						block_count_portion +=  prev_block_count;
-					gf_bs_write_u64(bs, salt_portion);
-					gf_bs_write_u64(bs, block_count_portion);
-
-					gf_crypt_set_state(priv->crypt, next_IV, 17);
-					/*decrypt remain bytes*/
-					if (remain) {
-						char dummy[20];
-						gf_crypt_decrypt(priv->crypt, dummy, remain);
-					}
-
-					gf_bs_del(bs);
-					gf_bs_del(tmp);
-				}
-			}
-
 			subsample_count++;
 		}
 		if (buffer) gf_free(buffer);

v0.5.2.tar.gz/modules/isom_in/Makefile -> v0.6.1.tar.gz/modules/isom_in/Makefile Changed

v0.5.2.tar.gz/modules/isom_in/isom_cache.c -> v0.6.1.tar.gz/modules/isom_in/isom_cache.c Changed

@@ -39,15 +39,15 @@
 	strcpy(szPath, szRoot);
 	strcat(szPath, ".mp4");
 	if (keep_existing_files) {
-		FILE *f = gf_f64_open(szPath, "rb");
+		FILE *f = gf_fopen(szPath, "rb");
 		if (f) {
 			u32 i=0;
-			fclose(f);
+			gf_fclose(f);
 			while (1) {
 				sprintf(szPath, "%s_%04d.mp4", szRoot, i);
-				f = gf_f64_open(szPath, "rb");
+				f = gf_fopen(szPath, "rb");
 				if (!f) break;
-				fclose(f);
+				gf_fclose(f);
 				i++;
 			}
 		}
@@ -139,19 +139,19 @@
 		mch->time_scale = esd->slConfig->timestampResolution;
 		mch->streamType = esd->decoderConfig->streamType;
 		mch->track = gf_isom_new_track(cache->mov, com.cache_esd.esd->ESID, mtype, mch->time_scale);
-		mch->is_playing = 1;
+		mch->is_playing = GF_TRUE;
 		mch->channel = ch;
 		mch->owner = cache;
 		gf_isom_set_track_enabled(cache->mov, mch->track, 1);
 		/*translate 3GP streams to MP4*/
-		mapped = 0;
+		mapped = GF_FALSE;
 		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_GENERIC) {
 			char szCode[5];
 			strncpy(szCode, esd->decoderConfig->decoderSpecificInfo->data, 4);
 			szCode[4]=0;
 			if (!stricmp(szCode, "samr") || !stricmp(szCode, "amr ") || !stricmp(szCode, "sawb")) {
 				GF_3GPConfig amrc;
-				mapped = 1;
+				mapped = GF_TRUE;
 				memset(&amrc, 0, sizeof(GF_3GPConfig));
 
 				amrc.frames_per_sample = (u32) esd->decoderConfig->decoderSpecificInfo->data[13];
@@ -164,7 +164,7 @@
 				h263c.type = GF_ISOM_SUBTYPE_3GP_H263;
 				h263c.vendor = GF_4CC('G','P','A','C');
 				gf_isom_3gp_config_new(cache->mov, mch->track, &h263c, NULL, NULL, &di);
-				mapped = 1;
+				mapped = GF_TRUE;
 			}
 		}
 		if (!mapped) gf_isom_new_mpeg4_description(cache->mov, mch->track, esd, NULL, NULL, &di);

v0.5.2.tar.gz/modules/isom_in/isom_in.h -> v0.6.1.tar.gz/modules/isom_in/isom_in.h Changed

v0.5.2.tar.gz/modules/isom_in/load.c -> v0.6.1.tar.gz/modules/isom_in/load.c Changed

@@ -24,6 +24,7 @@
 */
 
 #include "isom_in.h"
+#include <gpac/iso639.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
@@ -94,7 +95,8 @@
 	/*TODO check for alternate tracks*/
 	count = gf_isom_get_track_count(read->mov);
 	for (i=0; i<count; i++) {
-		if (!gf_isom_is_track_enabled(read->mov, i+1)) continue;
+		if (!gf_isom_is_track_enabled(read->mov, i+1))
+			continue;
 
 		switch (gf_isom_get_media_type(read->mov, i+1)) {
 		case GF_ISOM_MEDIA_AUDIO:
@@ -132,6 +134,11 @@
 			gf_isom_get_reference(read->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
 			esd->has_ref_base = base_track ? GF_TRUE : GF_FALSE;
 
+			if (!esd->langDesc) {
+				esd->langDesc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
+				gf_isom_get_media_language(read->mov, i+1, &esd->langDesc->full_lang_code);
+			}
+
 			od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 			od->service_ifce = read->input;
 			od->objectDescriptorID = 0;
@@ -162,7 +169,7 @@
 				sprintf(szName, "%s%s_cover.%s", cdir, sep, (tlen & 0x80000000) ? "png" : "jpg");
 			}
 
-			t = gf_f64_open(szName, "wb");
+			t = gf_fopen(szName, "wb");
 
 			if (t) {
 				Bool isom_contains_video = GF_FALSE;
@@ -170,7 +177,7 @@
 				/*write cover data*/
 				assert(!(tlen & 0x80000000));
 				gf_fwrite(tag, tlen & 0x7FFFFFFF, 1, t);
-				fclose(t);
+				gf_fclose(t);
 
 				/*don't display cover art when video is present*/
 				for (i=0; i<gf_isom_get_track_count(read->mov); i++) {

v0.5.2.tar.gz/modules/isom_in/read.c -> v0.6.1.tar.gz/modules/isom_in/read.c Changed

@@ -67,11 +67,13 @@
 	"application/x-isomedia", "*", "IsoMedia Files",
 	"video/mp4", "mp4 mpg4", "MPEG-4 Movies",
 	"audio/mp4", "m4a mp4 mpg4", "MPEG-4 Music",
-	"application/mp4", "mp4 mpg4", "MPEG-4 Applications",
+	"application/mp4", "m4i mp4 mpg4", "MPEG-4 Applications",
 	"video/3gpp", "3gp 3gpp", "3GPP/MMS Movies",
 	"audio/3gpp", "3gp 3gpp", "3GPP/MMS Music",
 	"video/3gpp2", "3g2 3gp2", "3GPP2/MMS Movies",
 	"audio/3gpp2", "3g2 3gp2", "3GPP2/MMS Music",
+	"video/iso.segment", "iso", "ISOBMF Fragments",
+	"audio/iso.segment", "iso", "ISOBMF Fragments",
 	NULL
 };
 
@@ -134,10 +136,12 @@
 	dld_time_remaining = total-done;
 	dld_time_remaining /= Bps;
 
-	//we add 30 seconds to smooth out bitrate variations ..;
-	dld_time_remaining += 30;
-
 	mov_rate = total;
+	if (read->frag_type) {
+		u64 bytesMissing=0;
+		gf_isom_refresh_fragmented(read->mov, &bytesMissing, NULL);
+		mov_rate = (Double) (done + bytesMissing);
+	}
 	dur = gf_isom_get_duration(read->mov);
 	if (dur) {
 		mov_rate /= dur;
@@ -158,12 +162,14 @@
 			u64 data_offset;
 			u32 di, sn = ch->sample_num ? ch->sample_num : 1;
 			GF_ISOSample *samp = gf_isom_get_sample_info(read->mov, ch->track, sn, &di, &data_offset);
-			if (!samp) continue;
+			if (!samp) {
+				do_buffer = GF_TRUE;
+				continue;
+			}
 
 			data_offset += samp->dataLength;
 
-			//we only send buffer on/off based on remainging playback time in channel
-#if 0
+#if 1
 			//we don't have enough data
 			if (((data_offset + ch->buffer_min * mov_rate/1000 > done))) {
 				do_buffer = GF_TRUE;
@@ -171,8 +177,12 @@
 			//we have enough buffer
 			else if ((data_offset + ch->buffer_max * mov_rate/1000 <= done)) {
 				do_buffer = GF_FALSE;
+			} else {
+				do_buffer = ch->buffering;
 			}
-#endif
+			buffer_level = (u32) ( (done - data_offset) / mov_rate * 1000);
+#else
+			//we only send buffer on/off based on remainging playback time in channel
 			time_remain_ch -= (samp->DTS + samp->CTS_Offset);
 			if (time_remain_ch<0) time_remain_ch=0;
 			gf_isom_sample_del(&samp);
@@ -189,6 +199,7 @@
 			} else {
 				do_buffer = GF_FALSE;
 			}
+#endif
 		}
 
 		if (do_buffer != ch->buffering) {
@@ -265,6 +276,7 @@
 		read->mov = gf_isom_open(local_name, GF_ISOM_OPEN_READ, NULL);
 		if (!read->mov) e = gf_isom_last_error(NULL);
 		else read->time_scale = gf_isom_get_timescale(read->mov);
+		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
 		if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
 			send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
 		} else {
@@ -432,8 +444,6 @@
 	reply = GF_OK;
 
 	read->disconnected = GF_TRUE;
-	if (read->mov) gf_isom_close(read->mov);
-	read->mov = NULL;
 
 	while (gf_list_count(read->channels)) {
 		ISOMChannel *ch = (ISOMChannel *)gf_list_get(read->channels, 0);
@@ -444,6 +454,9 @@
 	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
 
+	if (read->mov) gf_isom_close(read->mov);
+	read->mov = NULL;
+
 	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
 		send_proxy_command(read, GF_TRUE, GF_FALSE, reply, NULL, NULL);
 	} else {
@@ -939,14 +952,6 @@
 	return GF_OK;
 }
 
-static u64 check_round(ISOMChannel *ch, u64 val_ts, Double val_range, Bool make_greater)
-{
-	Double round_check = (Double) (s64) val_ts;
-	round_check /= ch->time_scale;
-//	if (round_check != val_range) val_ts += make_greater ? 1 : -1;
-	return val_ts;
-}
-
 /*switch channel quality. Return next channel or current channel if error*/
 static
 u32 gf_channel_switch_quality(ISOMChannel *ch, GF_ISOFile *the_file, Bool switch_up)
@@ -1045,7 +1050,7 @@
 		for (i = 0; i < count; i++)
 		{
 			ch = (ISOMChannel *)gf_list_get(read->channels, i);
-			if (gf_isom_has_scalable_layer(read->mov)) {
+			if (gf_isom_needs_layer_reconstruction(read->mov)) {
 				ch->next_track = gf_channel_switch_quality(ch, read->mov, com->switch_quality.up);
 			}
 		}
@@ -1060,6 +1065,8 @@
 			isor_flush_data(read, 0, 0);
 		return GF_OK;
 	}
+	if (com->command_type == GF_NET_SERVICE_CAN_REVERSE_PLAYBACK)
+		return GF_OK;
 
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 
@@ -1117,17 +1124,22 @@
 		isor_reset_reader(ch);
 		ch->speed = com->play.speed;
 		read->reset_frag_state = 1;
+		if (read->frag_type)
+			read->frag_type = 1;
 		gf_mx_v(read->segment_mutex);
 
 		ch->start = ch->end = 0;
 		if (com->play.speed>0) {
+			Double t;
 			if (com->play.start_range>=0) {
-				ch->start = (u64) (s64) (com->play.start_range * ch->time_scale);
-				ch->start = check_round(ch, ch->start, com->play.start_range, 1);
+				t = com->play.start_range;
+				t *= ch->time_scale;
+				ch->start = (u64) t;
 			}
 			if (com->play.end_range >= com->play.start_range) {
-				ch->end = (u64) (s64) (com->play.end_range*ch->time_scale);
-				ch->end = check_round(ch, ch->end, com->play.end_range, 0);
+				t = com->play.end_range;
+				t *= ch->time_scale;
+				ch->end = (u64) t;
 			}
 		} else if (com->play.speed<0) {
 			Double end = com->play.end_range;

v0.5.2.tar.gz/modules/isom_in/read_ch.c -> v0.6.1.tar.gz/modules/isom_in/read_ch.c Changed

@@ -45,6 +45,33 @@
 	memset(&ch->current_slh, 0, sizeof(GF_SLHeader));
 }
 
+void isor_check_producer_ref_time(ISOMReader *read)
+{
+	u32 trackID;
+	u64 ntp;
+	u64 timestamp;
+
+	if (gf_isom_get_last_producer_time_box(read->mov, &trackID, &ntp, &timestamp, GF_TRUE)) {
+#if !defined(_WIN32_WCE) && !defined(GPAC_DISABLE_LOG)
+
+		if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
+			time_t secs;
+			struct tm t;
+
+			s32 diff = gf_net_get_ntp_diff_ms(ntp);
+
+			secs = (ntp>>32) - GF_NTP_SEC_1900_TO_1970;
+			t = *gmtime(&secs);
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] TrackID %d: Timestamp %d matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ - NTP clock diff (local - remote): %d ms\n", trackID, (u32) timestamp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, diff));
+		}
+#endif
+
+		read->last_sender_ntp = ntp;
+		read->cts_for_last_sender_ntp = timestamp;
+	}
+}
+
 /*
 	refresh type:
 		0: not progressive
@@ -89,7 +116,7 @@
 	}
 
 	//if first time trying to fetch next segment, check if we have to discard it
-	if (!do_refresh && (read->seg_opened==2)) {
+	if (!do_refresh && (read->seg_opened==2) && !read->pending_scalable_enhancement_segment_index) {
 #ifdef DASH_USE_PULL
 		for (i=0; i<count; i++) {
 			ISOMChannel *ch = gf_list_get(read->channels, i);
@@ -110,11 +137,19 @@
 		param.url_query.drop_first_segment = 1;
 	}
 
+	if (read->pending_scalable_enhancement_segment_index) {
+		do_refresh = 0;
+		param.url_query.drop_first_segment = 0;
+		param.url_query.dependent_representation_index = read->pending_scalable_enhancement_segment_index;
+		scalable_segment = 1;
+		read->pending_scalable_enhancement_segment_index = 0;
+	}
+
+
 next_segment:
 	/*update current fragment if any*/
 	e = read->input->query_proxy(read->input, &param);
 	if (e == GF_OK) {
-		u64 timestamp, ntp;
 		u32 trackID = 0;
 		if (param.url_query.next_url) {
 			u32 flags;
@@ -139,14 +174,21 @@
 					e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, read->use_memory ? param.url_query.next_url : NULL);
 
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[IsoMedia] LowLatency mode: Reparsing segment %s boxes at UTC "LLU" - "LLU" bytes still missing\n", param.url_query.next_url, gf_net_get_utc(), bytesMissing ));
-					for (i=0; i<count; i++) {
-						ISOMChannel *ch = gf_list_get(read->channels, i);
-						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[IsoMedia] refresh track %d fragment - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
+
+#ifndef GPAC_DISABLE_LOG
+					if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
+						for (i=0; i<count; i++) {
+							ISOMChannel *ch = gf_list_get(read->channels, i);
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] refresh track %d fragment - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
+						}
 					}
+#endif
+					isor_check_producer_ref_time(read);
 				}
 				//we did the last refresh and the segment is downloaded, move to fully parsed mode
 				if (! param.url_query.current_download) {
 					read->seg_opened = 2;
+					read->waiting_for_data = GF_FALSE;
 				}
 				gf_mx_v(read->segment_mutex);
 				return;
@@ -183,7 +225,7 @@
 				} else if (param.url_query.end_range) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Playing new range in %s: "LLU"-"LLU"\n", param.url_query.next_url, param.url_query.start_range, param.url_query.end_range ));
 				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s\n", param.url_query.next_url));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s (has next dep %d)\n", param.url_query.next_url, param.url_query.has_next));
 				}
 #endif
 			}
@@ -214,20 +256,7 @@
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in non-progressive mode (completely downloaded)\n"));
 			}
 
-#ifndef _WIN32_WCE
-			if (gf_isom_get_last_producer_time_box(read->mov, &trackID, &ntp, &timestamp, 1)) {
-				time_t secs;
-				struct tm t;
-
-				s32 diff = gf_net_get_ntp_diff_ms(ntp);
-
-				secs = (ntp>>32) - GF_NTP_SEC_1900_TO_1970;
-				t = *gmtime(&secs);
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] TrackID %d: Timestamp %d matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ - NTP clock diff (local - remote): %d ms\n", trackID, (u32) timestamp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, diff ));
-				read->last_sender_ntp = ntp;
-			}
-#endif
+			isor_check_producer_ref_time(read);
 
 			trackID = 0;
 			for (i=0; i<count; i++) {
@@ -294,17 +323,16 @@
 	} else if (e==GF_EOS) {
 		/*consider we are done*/
 		read->frag_type = 2;
+		read->waiting_for_data = GF_FALSE;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] No more segments - done playing file\n"));
 	} else if (e==GF_BUFFER_TOO_SMALL) {
-		if (do_refresh==0) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next segment is not yet available\n"));
-			read->waiting_for_data = GF_TRUE;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Corrupted state in low latency mode !!\n"));
-		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next segment is not yet available\n"));
+		read->waiting_for_data = GF_TRUE;
+		read->pending_scalable_enhancement_segment_index = param.url_query.dependent_representation_index;
 	} else {
 		/*consider we are done*/
 		read->frag_type = 2;
+		read->waiting_for_data = GF_FALSE;
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error fetching next DASH segment: no more segments\n"));
 	}
 	gf_mx_v(read->segment_mutex);
@@ -312,7 +340,7 @@
 
 static void init_reader(ISOMChannel *ch)
 {
-	u32 ivar;
+	u32 sample_desc_index;
 	if (ch->is_pulling && ch->wait_for_segment_switch) {
 		isor_segment_switch_or_refresh(ch->owner, 0);
 		if (ch->wait_for_segment_switch)
@@ -341,9 +369,9 @@
 
 		/*take care of seeking out of the track range*/
 		if (!ch->owner->frag_type && (ch->duration<ch->start)) {
-			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->duration, &ivar, mode, &ch->sample, &ch->sample_num);
+			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->duration, &sample_desc_index, mode, &ch->sample, &ch->sample_num);
 		} else {
-			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->start, &ivar, mode, &ch->sample, &ch->sample_num);
+			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->start, &sample_desc_index, mode, &ch->sample, &ch->sample_num);
 		}
 		ch->last_state = GF_OK;
 
@@ -383,6 +411,7 @@
 	}
 	ch->to_init = 0;
 
+	ch->current_slh.seekFlag = 0;
 	if (ch->disable_seek) {
 		ch->current_slh.decodingTimeStamp = ch->sample->DTS;
 		ch->current_slh.compositionTimeStamp = ch->sample->DTS + ch->sample->CTS_Offset;
@@ -390,9 +419,13 @@
 	} else {
 		ch->current_slh.decodingTimeStamp = ch->start;
 		ch->current_slh.compositionTimeStamp = ch->start;
+		if (ch->current_slh.compositionTimeStamp != ch->sample->DTS + ch->sample->CTS_Offset) {
+			ch->current_slh.seekFlag = 1;
+		}
 	}
 	ch->current_slh.randomAccessPointFlag = ch->sample ? ch->sample->IsRAP : 0;
-
+	if (!sample_desc_index) sample_desc_index = 1;
+	ch->last_sample_desc_index = sample_desc_index;
 	ch->owner->no_order_check = ch->speed < 0 ? GF_TRUE : GF_FALSE;
 }
 
@@ -401,7 +434,7 @@
 void isor_reader_get_sample(ISOMChannel *ch)
 {
 	GF_Err e;
-	u32 ivar;
+	u32 sample_desc_index;
 	if (ch->sample) return;
 
 	if (ch->next_track) {
@@ -415,14 +448,19 @@
 
 	if (ch->to_init) {
 		init_reader(ch);
+		sample_desc_index = ch->last_sample_desc_index;
 	} else if (ch->speed < 0) {
-		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time - 1, &ivar, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
-		if (e) {
-			if (e==GF_EOS) {
-				ch->last_state = GF_EOS;
+		if (!ch->sample_time) {
+			ch->last_state = GF_EOS;
+			return;
+		} else {
+			e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time - 1, &sample_desc_index, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
+			if (e) {
+				if ((e==GF_EOS) && !ch->owner->frag_type) {
+					ch->last_state = GF_EOS;
+				}
 				return;
 			}
-			return;
 		}
 		if (ch->sample->DTS + ch->dts_offset == ch->sample_time) {
 			if (!ch->owner->frag_type) {
@@ -441,7 +479,7 @@
 
 	} else if (ch->has_edit_list) {
 		u32 prev_sample = ch->sample_num;
-		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &ivar, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
+		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
 
 		if (e == GF_OK) {
 
@@ -450,7 +488,7 @@
 				ch->edit_sync_frame++;
 				if (ch->edit_sync_frame < ch->sample_num) {
 					gf_isom_sample_del(&ch->sample);
-					ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->edit_sync_frame, &ivar);
+					ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->edit_sync_frame, &sample_desc_index);
 					ch->sample->DTS = ch->sample_time;
 					ch->sample->CTS_Offset = 0;
 				} else {
@@ -474,7 +512,7 @@
 						if (s2 && s1) {
 							assert(s2->DTS >= s1->DTS);
 							time_diff = (u32) (s2->DTS - s1->DTS);
-							e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + time_diff, &ivar, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
+							e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + time_diff, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
 						} else if (s1 && !s2) {
 							e = GF_EOS;
 						}
@@ -490,7 +528,7 @@
 					GF_ISOSample *found = ch->sample;
 					u32 samp_num = ch->sample_num;
 					ch->sample = NULL;
-					e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &ivar, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
+					e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->sample, &ch->sample_num);
 					assert (e == GF_OK);
 					/*if no sync point in the past, use the first non-sync for the given time*/
 					if (!ch->sample || !ch->sample->data) {
@@ -512,7 +550,7 @@
 	} else {
 		ch->sample_num++;
 
-		ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &ivar);
+		ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index);
 		/*if sync shadow / carousel RAP skip*/
 		if (ch->sample && (ch->sample->IsRAP==RAP_REDUNDANT)) {
 			gf_isom_sample_del(&ch->sample);
@@ -553,6 +591,8 @@
 			}
 			else if (ch->owner->input->query_proxy) {
 				ch->last_state = GF_OK;
+				if (!ch->has_edit_list && ch->sample_num)
+					ch->sample_num--;
 			}
 		}
 		else if (!ch->sample_num
@@ -585,6 +625,39 @@
 		}
 		return;
 	}
+
+	if (sample_desc_index != ch->last_sample_desc_index) {
+		u32 mtype = gf_isom_get_media_type(ch->owner->mov, ch->track);
+		switch (mtype) {
+		case GF_ISOM_MEDIA_VISUAL:
+			//code is here as a reminder, but by default we use inband param set extraction so no need for it
+#if 0
+			if ( ! (ch->nalu_extract_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ) {
+				u32 extract_mode = ch->nalu_extract_mode | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
+
+				gf_isom_sample_del(&ch->sample);
+				ch->sample = NULL;
+				gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, extract_mode);
+				ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &ch->last_sample_desc_index);
+
+				gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
+			}
+#endif
+			break;
+		case GF_ISOM_MEDIA_TEXT:
+		case GF_ISOM_MEDIA_SUBPIC:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
+			break;
+		default:
+			//TODO: do we want to support codec changes ?
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Change of sample description (%d->%d) for media type %s not supported\n", ch->last_sample_desc_index, sample_desc_index, gf_4cc_to_str(mtype) ));
+			gf_isom_sample_del(&ch->sample);
+			ch->sample = NULL;
+			ch->last_state = GF_NOT_SUPPORTED;
+			return;
+		}
+	}
+
 	ch->last_state = GF_OK;
 	ch->current_slh.accessUnitEndFlag = ch->current_slh.accessUnitStartFlag = 1;
 	ch->current_slh.accessUnitLength = ch->sample->dataLength;
@@ -592,13 +665,15 @@
 
 	/*still seeking or not ?
 	 1- when speed is negative, the RAP found is "after" the seek point in playback order since we used backward RAP search: nothing to do
-	 2- otherwise set DTS+CTS to start value - !! FIXME we should not change the TS but rather signal the frame is a seek frame
+	 2- otherwise set DTS+CTS to start value
 	 */
 	if ((ch->speed < 0) || (ch->start <= ch->sample->DTS + ch->sample->CTS_Offset)) {
 		ch->current_slh.decodingTimeStamp = ch->sample->DTS;
 		ch->current_slh.compositionTimeStamp = ch->sample->DTS + ch->sample->CTS_Offset;
+		ch->current_slh.seekFlag = 0;
 	} else {
 		ch->current_slh.compositionTimeStamp = ch->start;
+		ch->current_slh.seekFlag = 1;
 		if (ch->streamType==GF_STREAM_SCENE)
 			ch->current_slh.decodingTimeStamp = ch->sample->DTS;
 		else
@@ -612,11 +687,13 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] End of Channel "LLD" (CTS "LLD")\n", ch->end, ch->sample->DTS + ch->sample->CTS_Offset));
 		ch->last_state = GF_EOS;
 	}
-	if (ch->owner->last_sender_ntp) {
+	if (ch->owner->last_sender_ntp && ch->current_slh.compositionTimeStamp==ch->owner->cts_for_last_sender_ntp) {
 		ch->current_slh.sender_ntp = ch->owner->last_sender_ntp;
-		ch->owner->last_sender_ntp = 0;
+	} else {
+		ch->current_slh.sender_ntp = 0;
 	}
 
+
 	if (ch->is_encrypted) {
 		GF_ISMASample *ismasamp = gf_isom_get_ismacryp_sample(ch->owner->mov, ch->track, ch->sample, 1);
 		if (ismasamp) {
@@ -644,15 +721,16 @@
 					sai = NULL;
 					gf_isom_cenc_get_sample_aux_info(ch->owner->mov, ch->track, ch->sample_num, &sai, NULL);
 					if (sai) {
+						u32 i;
 						GF_BitStream *bs;
 						bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 						/*write sample auxiliary information*/
 						gf_bs_write_data(bs, (char *)KID, 16);
 						gf_bs_write_data(bs, (char *)sai->IV, IV_size);
 						gf_bs_write_u16(bs, sai->subsample_count);
-						for (ivar = 0; ivar < sai->subsample_count; ivar++) {
-							gf_bs_write_u16(bs, sai->subsamples[ivar].bytes_clear_data);
-							gf_bs_write_u32(bs, sai->subsamples[ivar].bytes_encrypted_data);
+						for (i = 0; i < sai->subsample_count; i++) {
+							gf_bs_write_u16(bs, sai->subsamples[i].bytes_clear_data);
+							gf_bs_write_u32(bs, sai->subsamples[i].bytes_encrypted_data);
 						}
 						gf_bs_get_content(bs, &ch->current_slh.sai, &ch->current_slh.saiz);
 						gf_bs_del(bs);
@@ -713,7 +791,7 @@
 		//otherwise this is new chunk or end of chunk, process
 	}
 	//this is a new file, check buffer level
-	else if (!is_chunk_flush && check_buffer_level) {
+	else if (/*!is_chunk_flush && */ check_buffer_level) {
 		Bool buffer_full = 1;
 		for (i=0; i<count; i++) {
 			ch = (ISOMChannel *)gf_list_get(read->channels, i);
@@ -739,7 +817,7 @@
 	}
 	//flush request from terminal: only process if nothing is opened and we have pending segments
 	//we have to keep the polling event when no segments are pending, in order to detect period switch - we therefore tolerate a couble of requests even though no segments are pending
-	if (!check_buffer_level && !read->seg_opened && !read->has_pending_segments && (read->nb_force_flush > 2) && !read->drop_next_segment) {
+	if (!check_buffer_level && read->seg_opened && (!read->has_pending_segments || (read->nb_force_flush > 2)) && !read->drop_next_segment) {
 		read->in_data_flush = 0;
 		gf_mx_v(read->segment_mutex);
 		return;
@@ -752,6 +830,14 @@
 	//update data
 	isor_segment_switch_or_refresh(read, do_refresh);
 
+	//segment not ready
+	if ( read->pending_scalable_enhancement_segment_index) {
+		read->in_data_flush = 0;
+		gf_mx_v(read->segment_mutex);
+		return;
+	}
+
+
 	//for all channels, fetch and send ...
 	count = gf_list_count(read->channels);
 	for (i=0; i<count; i++) {
@@ -800,7 +886,7 @@
 		/*close current segment*/
 		gf_isom_release_segment(read->mov, 1);
 		read->seg_opened = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment \n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment - closing it\n"));
 	}
 	read->in_data_flush = 0;

v0.5.2.tar.gz/modules/jack/Makefile -> v0.6.1.tar.gz/modules/jack/Makefile Changed

v0.5.2.tar.gz/modules/laser_dec/Makefile -> v0.6.1.tar.gz/modules/laser_dec/Makefile Changed

v0.5.2.tar.gz/modules/libplayer/Makefile -> v0.6.1.tar.gz/modules/libplayer/Makefile Changed

v0.5.2.tar.gz/modules/mp3_in/Makefile -> v0.6.1.tar.gz/modules/mp3_in/Makefile Changed

v0.5.2.tar.gz/modules/mp3_in/mad_dec.c -> v0.6.1.tar.gz/modules/mp3_in/mad_dec.c Changed

@@ -83,9 +83,9 @@
 	mad_stream_init(&ctx->stream);
 	mad_frame_init(&ctx->frame);
 	mad_synth_init(&ctx->synth);
-	ctx->configured = 1;
+	ctx->configured = GF_TRUE;
 
-	ctx->buffer = gf_malloc(sizeof(char) * 2*MAD_BUFFER_MDLEN);
+	ctx->buffer = (unsigned char*)gf_malloc(sizeof(char) * 2*MAD_BUFFER_MDLEN);
 
 	/*we need a frame to init, so use default values*/
 	ctx->num_samples = 1152;
@@ -93,7 +93,7 @@
 	ctx->sample_rate = 0;
 	ctx->out_size = 2 * ctx->num_samples * ctx->num_channels;
 	ctx->ES_ID = esd->ESID;
-	ctx->first = 1;
+	ctx->first = GF_TRUE;
 	return GF_OK;
 }
 
@@ -114,7 +114,7 @@
 		mad_frame_finish(&ctx->frame);
 		mad_synth_finish(&ctx->synth);
 	}
-	ctx->configured = 0;
+	ctx->configured = GF_FALSE;
 	return GF_OK;
 }
 static GF_Err MAD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
@@ -172,7 +172,7 @@
 	switch (capability.CapCode) {
 	/*reset storage buffer*/
 	case GF_CODEC_WAIT_RAP:
-		ctx->first = 1;
+		ctx->first = GF_TRUE;
 		ctx->len = 0;
 		if (ctx->configured) {
 			mad_stream_finish(&ctx->stream);
@@ -233,7 +233,7 @@
 	}
 
 	if (ctx->first) {
-		ctx->first = 0;
+		ctx->first = GF_FALSE;
 		memcpy(ctx->buffer, inBuffer, inBufferLength);
 		ctx->len = inBufferLength;
 		*outBufferLength = 0;
@@ -360,7 +360,7 @@
 			mad_frame_finish(&ctx->frame);
 			mad_synth_finish(&ctx->synth);
 		}
-		ctx->configured = 0;
+		ctx->configured = GF_FALSE;
 		ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
 		ctx->num_channels = 0;
 		gf_free(ctx);

v0.5.2.tar.gz/modules/mp3_in/mp3_in.c -> v0.6.1.tar.gz/modules/mp3_in/mp3_in.c Changed

@@ -89,23 +89,23 @@
 {
 	char *sExt;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
-	if (!strnicmp(url, "rtsp://", 7)) return 0;
+	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
 	{
 		u32 i;
 		for (i =0 ; MP3_MIME_TYPES[i] ; i++)
 			if (gf_service_check_mime_register(plug, MP3_MIME_TYPES[i], MP3_EXTENSIONS, MP3_DESC, sExt))
-				return 1;
+				return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool mp3_is_local(const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
 }
 
 
@@ -127,7 +127,7 @@
 		od->objectDescriptorID = 1;
 		esd = MP3_GetESD(read);
 		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
+		gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
 	}
 }
 
@@ -141,7 +141,7 @@
 	unsigned char id3v2[10];
 	u32 hdr, size;
 	u64 pos;
-	if (!read->stream) return 0;
+	if (!read->stream) return GF_FALSE;
 	/* ID3VVFFFFSIZE = 13bytes
 	 * ID3 string
 	 * VV = Version
@@ -159,31 +159,31 @@
 			*minSizeToRead = sz;
 		}
 	}
-	gf_f64_seek(read->stream, 0, SEEK_SET);
+	gf_fseek(read->stream, 0, SEEK_SET);
 	hdr = gf_mp3_get_next_header(read->stream);
-	if (!hdr) return 0;
+	if (!hdr) return GF_FALSE;
 	read->sample_rate = gf_mp3_sampling_rate(hdr);
 	read->oti = gf_mp3_object_type_indication(hdr);
-	gf_f64_seek(read->stream, 0, SEEK_SET);
-	if (!read->oti) return 0;
+	gf_fseek(read->stream, 0, SEEK_SET);
+	if (!read->oti) return GF_FALSE;
 
 	/*we don't have the full file...*/
-	if (read->is_remote) return	1;
+	if (read->is_remote) return	GF_TRUE;
 
 //	return 1;
 
-	gf_f64_seek(read->stream, 0, SEEK_SET);
+	gf_fseek(read->stream, 0, SEEK_SET);
 	read->duration = 0;
 	while (1) {
 		hdr = gf_mp3_get_next_header(read->stream);
 		if (!hdr) break;
 		read->duration += gf_mp3_window_size(hdr);
 		size = gf_mp3_frame_size(hdr);
-		pos = gf_f64_tell(read->stream);
-		gf_f64_seek(read->stream, pos + size - 4, SEEK_SET);
+		pos = gf_ftell(read->stream);
+		gf_fseek(read->stream, pos + size - 4, SEEK_SET);
 	}
-	gf_f64_seek(read->stream, 0, SEEK_SET);
-	return 1;
+	gf_fseek(read->stream, 0, SEEK_SET);
+	return GF_TRUE;
 }
 
 static void MP3_RegulateDataRate(MP3Reader *read)
@@ -210,7 +210,7 @@
 
 		read->sample_rate = gf_mp3_sampling_rate(hdr);
 		read->oti = gf_mp3_object_type_indication(hdr);
-		read->is_live = 1;
+		read->is_live = GF_TRUE;
 		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 
 		read->needs_connection = 0;
@@ -219,7 +219,7 @@
 	}
 	if (!data_size) return;
 
-	read->data = gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
+	read->data = (char*)gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
 	memcpy(read->data + read->data_size, data, sizeof(char)*data_size);
 	read->data_size += data_size;
 	if (!read->ch) return;
@@ -235,7 +235,7 @@
 
 		/*not enough data, copy over*/
 		if (!hdr || (pos+size>data_size)) {
-			char *d = gf_malloc(sizeof(char) * data_size);
+			char *d = (char*)gf_malloc(sizeof(char) * data_size);
 			memcpy(d, data, sizeof(char) * data_size);
 			gf_free(read->data);
 			read->data = d;
@@ -268,7 +268,7 @@
 	/*done*/
 	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
 		if (read->stream) {
-			read->is_remote = 0;
+			read->is_remote = GF_FALSE;
 			e = GF_EOS;
 		} else {
 			return;
@@ -319,12 +319,12 @@
 	if (e >= GF_OK) {
 		if (read->needs_connection) {
 			gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, NULL);
-			if (!total_size) read->is_live = 1;
+			if (!total_size) read->is_live = GF_TRUE;
 		}
 		/*looks like a live stream*/
 		if (read->is_live) {
 			if (read->liveDataCopySize < param->size) {
-				read->liveDataCopy = gf_realloc(read->liveDataCopy, param->size);
+				read->liveDataCopy = (char*)gf_realloc(read->liveDataCopy, param->size);
 			}
 			memcpy(read->liveDataCopy, param->data, param->size);
 			if (!e) MP3_OnLiveData(read, read->liveDataCopy, param->size);
@@ -337,12 +337,12 @@
 		szCache = gf_dm_sess_get_cache_name(read->dnload);
 		if (!szCache) e = GF_IO_ERR;
 		else {
-			read->stream = gf_f64_open((char *) szCache, "rb");
+			read->stream = gf_fopen((char *) szCache, "rb");
 			if (!read->stream) e = GF_SERVICE_ERROR;
 			else {
 				u32 minSizeToRead = 0;
 				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = 0;
+				if (e==GF_EOS) read->is_remote = GF_FALSE;
 				e = GF_OK;
 				/*not enough data*/
 				if (!MP3_ConfigureFromFile(read, &minSizeToRead)) {
@@ -351,7 +351,7 @@
 					if (bytes_done>(100*1024 + minSizeToRead)) {
 						e = GF_CORRUPTED_DATA;
 					} else {
-						fclose(read->stream);
+						gf_fclose(read->stream);
 						read->stream = NULL;
 						return;
 					}
@@ -392,7 +392,7 @@
 	u32 minSizeToRead = 0;
 	char *ext;
 	GF_Err reply;
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 	read->service = serv;
 
 	if (read->dnload) gf_service_download_del(read->dnload);
@@ -410,11 +410,11 @@
 	}
 
 	reply = GF_OK;
-	read->stream = gf_f64_open(szURL, "rb");
+	read->stream = gf_fopen(szURL, "rb");
 	if (!read->stream) {
 		reply = GF_URL_ERROR;
 	} else if (!MP3_ConfigureFromFile(read, &minSizeToRead)) {
-		fclose(read->stream);
+		gf_fclose(read->stream);
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
 	}
@@ -425,8 +425,8 @@
 
 static GF_Err MP3_CloseService(GF_InputService *plug)
 {
-	MP3Reader *read = plug->priv;
-	if (read->stream) fclose(read->stream);
+	MP3Reader *read = (MP3Reader*)plug->priv;
+	if (read->stream) gf_fclose(read->stream);
 	read->stream = NULL;
 
 	if (read->dnload) gf_service_download_del(read->dnload);
@@ -454,7 +454,7 @@
 
 static GF_Descriptor *MP3_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
 {
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 
 	/*override default*/
 	if (expect_type==GF_MEDIA_OBJECT_UNDEF) expect_type=GF_MEDIA_OBJECT_AUDIO;
@@ -467,7 +467,7 @@
 		gf_list_add(od->ESDescriptors, esd);
 		return (GF_Descriptor *) od;
 	}
-	read->is_inline = 1;
+	read->is_inline = GF_TRUE;
 	return NULL;
 }
 
@@ -475,7 +475,7 @@
 {
 	u32 ES_ID=0;
 	GF_Err e;
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 
 	e = GF_SERVICE_ERROR;
 	if (read->ch==channel) goto exit;
@@ -499,7 +499,7 @@
 
 static GF_Err MP3_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
 {
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 	GF_Err e = GF_STREAM_NOT_FOUND;
 	if (read->ch == channel) {
 		read->ch = NULL;
@@ -513,7 +513,7 @@
 
 static GF_Err MP3_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 
 	if (com->base.command_type==GF_NET_SERVICE_INFO) {
 		com->info.name = read->icy_track_name ? read->icy_track_name : read->icy_name;
@@ -550,10 +550,10 @@
 		read->start_range = com->play.start_range;
 		read->end_range = com->play.end_range;
 		read->current_time = 0;
-		if (read->stream) gf_f64_seek(read->stream, 0, SEEK_SET);
+		if (read->stream) gf_fseek(read->stream, 0, SEEK_SET);
 
 		if (read->ch == com->base.on_channel) {
-			read->done = 0;
+			read->done = GF_FALSE;
 			/*PLAY after complete download, estimate duration*/
 			if (!read->is_remote && !read->duration) {
 				u32 minSizeToRead = 0;
@@ -581,14 +581,14 @@
 {
 	u64 pos;
 	u32 hdr, start_from;
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 
 	if (read->ch != channel)
 		return GF_STREAM_NOT_FOUND;
 
 	*out_reception_status = GF_OK;
-	*sl_compressed = 0;
-	*is_new_data = 0;
+	*sl_compressed = GF_FALSE;
+	*is_new_data = GF_FALSE;
 
 	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
 	read->sl_hdr.randomAccessPointFlag = 1;
@@ -605,16 +605,16 @@
 			*out_data_size = 0;
 			return GF_OK;
 		}
-		*is_new_data = 1;
+		*is_new_data = GF_TRUE;
 
-		pos = gf_f64_tell(read->stream);
+		pos = gf_ftell(read->stream);
 		hdr = gf_mp3_get_next_header(read->stream);
 		if (!hdr) {
 			if (!read->dnload) {
 				*out_reception_status = GF_EOS;
-				read->done = 1;
+				read->done = GF_TRUE;
 			} else {
-				gf_f64_seek(read->stream, pos, SEEK_SET);
+				gf_fseek(read->stream, pos, SEEK_SET);
 				*out_reception_status = GF_OK;
 			}
 			return GF_OK;
@@ -622,7 +622,7 @@
 		read->data_size = gf_mp3_frame_size(hdr);
 		if (!read->data_size) {
 			*out_reception_status = GF_EOS;
-			read->done = 1;
+			read->done = GF_TRUE;
 			return GF_OK;
 		}
 
@@ -631,7 +631,7 @@
 		if (read->start_range && read->duration) {
 			read->current_time = 0;
 			start_from = (u32) (read->start_range * read->sample_rate);
-			gf_f64_seek(read->stream, 0, SEEK_SET);
+			gf_fseek(read->stream, 0, SEEK_SET);
 			while (read->current_time<start_from) {
 				hdr = gf_mp3_get_next_header(read->stream);
 				if (!hdr) {
@@ -641,18 +641,18 @@
 				}
 				read->current_time += gf_mp3_window_size(hdr);
 				read->data_size = gf_mp3_frame_size(hdr);
-				gf_f64_seek(read->stream, read->data_size-4, SEEK_CUR);
+				gf_fseek(read->stream, read->data_size-4, SEEK_CUR);
 			}
 			read->start_range = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[MP3Demux] Seeking to frame size %d - TS %d - file pos %d\n", read->data_size, read->current_time, gf_f64_tell(read->stream)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[MP3Demux] Seeking to frame size %d - TS %d - file pos %d\n", read->data_size, read->current_time, gf_ftell(read->stream)));
 		}
 
 		read->sl_hdr.compositionTimeStamp = read->current_time;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[MP3Demux] Found new frame size %d - TS %d - file pos %d\n", read->data_size, read->current_time, gf_f64_tell(read->stream)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[MP3Demux] Found new frame size %d - TS %d - file pos %d\n", read->data_size, read->current_time, gf_ftell(read->stream)));
 
 		read->current_time += gf_mp3_window_size(hdr);
 
-		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
+		read->data = (char*)gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
 		read->data[0] = (hdr >> 24) & 0xFF;
 		read->data[1] = (hdr >> 16) & 0xFF;
 		read->data[2] = (hdr >> 8) & 0xFF;
@@ -662,7 +662,7 @@
 			gf_free(read->data);
 			read->data = NULL;
 			if (read->is_remote) {
-				gf_f64_seek(read->stream, pos, SEEK_SET);
+				gf_fseek(read->stream, pos, SEEK_SET);
 				*out_reception_status = GF_OK;
 			} else {
 				*out_reception_status = GF_EOS;
@@ -679,7 +679,7 @@
 
 static GF_Err MP3_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
 {
-	MP3Reader *read = plug->priv;
+	MP3Reader *read = (MP3Reader*)plug->priv;
 
 	if (read->ch == channel) {
 		if (!read->data) return GF_BAD_PARAM;
@@ -693,7 +693,7 @@
 GF_InputService *MP3_Load()
 {
 	MP3Reader *reader;
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
+	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
 	memset(plug, 0, sizeof(GF_InputService));
 	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MP3 Reader", "gpac distribution")
 	plug->CanHandleURL = MP3_CanHandleURL;
@@ -708,7 +708,7 @@
 	plug->ChannelGetSLP = MP3_ChannelGetSLP;
 	plug->ChannelReleaseSLP = MP3_ChannelReleaseSLP;
 
-	reader = gf_malloc(sizeof(MP3Reader));
+	reader = (MP3Reader*)gf_malloc(sizeof(MP3Reader));
 	memset(reader, 0, sizeof(MP3Reader));
 	plug->priv = reader;
 	return plug;
@@ -720,7 +720,7 @@
 	GF_InputService *plug = (GF_InputService *) ifce;
 	if (!plug)
 		return;
-	read = plug->priv;
+	read = (MP3Reader*)plug->priv;
 	if (read)
 		gf_free(read);
 	plug->priv = NULL;

v0.5.2.tar.gz/modules/mpd_in/Makefile -> v0.6.1.tar.gz/modules/mpd_in/Makefile Changed

v0.5.2.tar.gz/modules/mpd_in/mpd_in.c -> v0.6.1.tar.gz/modules/mpd_in/mpd_in.c Changed

@@ -49,12 +49,14 @@
 	GF_DASHFileIO dash_io;
 
 	Bool connection_ack_sent;
-	Bool in_seek;
 	Bool memory_storage;
 	Bool use_max_res, immediate_switch, allow_http_abort;
 	u32 use_low_latency;
 	MpdInBuffer buffer_mode;
-	Double previous_start_range;
+	u32 nb_playing;
+
+	Bool buffer_adaptation;
+
 	/*max width & height in all active representations*/
 	u32 width, height;
 
@@ -75,10 +77,11 @@
 	Bool has_new_data;
 	u32 idx;
 	GF_DownloadSession *sess;
-	Bool in_seek, is_timestamp_based, pto_setup;
+	Bool is_timestamp_based, pto_setup;
 	u32 timescale;
 	s64 pto;
 	s64 max_cts_in_period;
+	bin128 key_IV;
 } GF_MPDGroup;
 
 const char * MPD_MPD_DESC = "MPEG-DASH Streaming";
@@ -163,6 +166,22 @@
 	}
 
 	group = gf_dash_get_group_udta(mpdin->dash, i);
+
+	if (gf_dash_is_m3u8(mpdin->dash)) {
+		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
+		if (!group->pto_setup) {
+			GF_NetworkCommand com;
+			memset(&com, 0, sizeof(com));
+			com.command_type = GF_NET_CHAN_SET_MEDIA_TIME;
+			com.map_time.media_time = mpdin->media_start_range;
+			com.map_time.timestamp = hdr->compositionTimeStamp;
+			com.base.on_channel = ns;
+			gf_service_command(service, &com, GF_OK);
+			group->pto_setup = GF_TRUE;
+		}
+		return;
+	}
+
 	//if sync is based on timestamps do not adjust the timestamps back
 	if (! group->is_timestamp_based) {
 		if (!group->pto_setup) {
@@ -179,6 +198,7 @@
 			}
 			scale = ch->esd->slConfig->timestampResolution;
 			scale /= 1000;
+
 			dur = (u64) (scale * gf_dash_get_period_duration(mpdin->dash));
 			if (dur) {
 				group->max_cts_in_period = group->pto + dur;
@@ -189,25 +209,48 @@
 			start = (u64) (scale * gf_dash_get_period_start(mpdin->dash));
 			group->pto -= start;
 		}
+
 		//filter any packet outside the current period
 		if (group->max_cts_in_period && (s64) hdr->compositionTimeStamp > group->max_cts_in_period) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet timestamp "LLU" larger than max CTS in period "LLU" - skipping\n", hdr->compositionTimeStamp, group->max_cts_in_period));
-			return;
+//			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet timestamp "LLU" larger than max CTS in period "LLU" - skipping\n", hdr->compositionTimeStamp, group->max_cts_in_period));
+//			return;
 		}
 
 		//remap timestamps to our timeline
-		if ((s64) hdr->decodingTimeStamp >= group->pto)
-			hdr->decodingTimeStamp -= group->pto;
-		else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet DTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
-			hdr->decodingTimeStamp = 0;
+		if (hdr->decodingTimeStampFlag) {
+			if ((s64) hdr->decodingTimeStamp >= group->pto)
+				hdr->decodingTimeStamp -= group->pto;
+			else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet DTS "LLU" less than PTO "LLU" - forcing DTS to 0\n", hdr->decodingTimeStamp, group->pto));
+				hdr->decodingTimeStamp = 0;
+				hdr->seekFlag = 1;
+			}
 		}
-		if ((s64) hdr->compositionTimeStamp >= group->pto)
-			hdr->compositionTimeStamp -= group->pto;
-		else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
-			hdr->compositionTimeStamp = 0;
+		if (hdr->compositionTimeStampFlag) {
+			if ((s64) hdr->compositionTimeStamp >= group->pto)
+				hdr->compositionTimeStamp -= group->pto;
+			else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
+				hdr->compositionTimeStamp = 0;
+				hdr->seekFlag = 1;
+			}
 		}
+
+		if (hdr->OCRflag) {
+			u32 scale = hdr->m2ts_pcr ? 300 : 1;
+			u64 pto = scale*group->pto;
+			if (hdr->objectClockReference >= pto) {
+				hdr->objectClockReference -= pto;
+			}
+			//keep 4 sec between the first received PCR and the first allowed PTS to be used in the period.
+			else if (pto - hdr->objectClockReference < 108000000) {
+				hdr->objectClockReference = 0;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet OCR/PCR "LLU" less than PTO "LLU" - discarding PCR\n", hdr->objectClockReference/scale, group->pto));
+				return;
+			}
+		}
+
 	} else if (!group->pto_setup) {
 		do_map_time = 1;
 		group->pto_setup = 1;
@@ -244,8 +287,6 @@
 	GF_MPD_In *mpdin = (GF_MPD_In *) ifce->proxy_udta;
 	if (!param || !ifce || !ifce->proxy_udta) return GF_BAD_PARAM;
 
-	mpdin->in_seek = 0;
-
 	/*gets byte range of init segment (for local validation)*/
 	if (param->command_type==GF_NET_SERVICE_QUERY_INIT_RANGE) {
 		param->url_query.next_url = NULL;
@@ -256,9 +297,16 @@
 			GF_MPDGroup *group;
 			if (!gf_dash_is_group_selectable(mpdin->dash, i)) continue;
 			group = gf_dash_get_group_udta(mpdin->dash, i);
+			if (!group) continue;
+
 			if (group->segment_ifce == ifce) {
 				gf_dash_group_get_segment_init_url(mpdin->dash, i, &param->url_query.start_range, &param->url_query.end_range);
 				param->url_query.current_download = 0;
+
+				param->url_query.key_url = gf_dash_group_get_segment_init_keys(mpdin->dash, i, &group->key_IV);
+				if (param->url_query.key_url) {
+					param->url_query.key_IV = &group->key_IV;
+				}
 				return GF_OK;
 			}
 		}
@@ -295,12 +343,6 @@
 			return GF_SERVICE_ERROR;
 		}
 
-		if (group->in_seek) {
-			group->in_seek = 0;
-			param->url_query.discontinuity_type = 2;
-			discard_first_cache_entry = 0;
-		}
-
 		//update group idx
 		if (group->idx != group_idx) {
 			group->idx = group_idx;
@@ -368,10 +410,12 @@
 
 		e = gf_dash_group_get_next_segment_location(mpdin->dash, group_idx, param->url_query.dependent_representation_index, &param->url_query.next_url, &param->url_query.start_range, &param->url_query.end_range,
 		 NULL, &param->url_query.next_url_init_or_switch_segment, &param->url_query.switch_start_range , &param->url_query.switch_end_range,
-		 &src_url, &param->url_query.has_next);
+		 &src_url, &param->url_query.has_next, &param->url_query.key_url, &group->key_IV);
 		if (e)
 			return e;
 
+		param->url_query.key_IV = &group->key_IV;
+
 		if (gf_dash_group_loop_detected(mpdin->dash, group_idx))
 			param->url_query.discontinuity_type = 2;
 
@@ -692,15 +736,39 @@
 		/*select input services if possible*/
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
 			const char *mime, *init_segment;
+			u32 j;
+			Bool playable = GF_TRUE;
 			//let the player decide which group to play
 			if (!gf_dash_is_group_selectable(mpdin->dash, i))
 				continue;
 
+			j=0;
+			while (1) {
+				const char *desc_id, *desc_scheme, *desc_value;
+				if (! gf_dash_group_enum_descriptor(mpdin->dash, i, GF_MPD_DESC_ESSENTIAL_PROPERTIES, j, &desc_id, &desc_scheme, &desc_value))
+					break;
+				j++;
+				if (!strcmp(desc_scheme, "urn:mpeg:dash:srd:2014")) {
+				} else {
+					playable = GF_FALSE;
+					break;
+				}
+			}
+			if (!playable) {
+				gf_dash_group_select(mpdin->dash, i, GF_FALSE);
+				continue;
+			}
+
+			if (gf_dash_group_has_dependent_group(mpdin->dash, i)) {
+				gf_dash_group_select(mpdin->dash, i, GF_TRUE);
+				continue;
+			}
+
 			mime = gf_dash_group_get_segment_mime(mpdin->dash, i);
 			init_segment = gf_dash_group_get_segment_init_url(mpdin->dash, i, NULL, NULL);
 			e = MPD_LoadMediaService(mpdin, i, mime, init_segment);
 			if (e != GF_OK) {
-				gf_dash_group_select(mpdin->dash, i, 0);
+				gf_dash_group_select(mpdin->dash, i, GF_FALSE);
 			} else {
 				u32 w, h;
 				/*connect our media service*/
@@ -710,11 +778,15 @@
 					mpdin->width = w;
 					mpdin->height = h;
 				}
+				if (gf_dash_group_get_srd_max_size_info(mpdin->dash, i, &w, &h)) {
+					mpdin->width = w;
+					mpdin->height = h;
+				}
 
 				e = group->segment_ifce->ConnectService(group->segment_ifce, mpdin->service, init_segment);
 				if (e) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Unable to connect input service to %s\n", init_segment));
-					gf_dash_group_select(mpdin->dash, i, 0);
+					gf_dash_group_select(mpdin->dash, i, GF_FALSE);
 				} else {
 					group->service_connected = 1;
 				}
@@ -804,9 +876,45 @@
 		gf_service_command(mpdin->service, &com, GF_OK);
 	}
 
+	if (dash_evt==GF_DASH_EVENT_CODEC_STAT_QUERY) {
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(GF_NetworkCommand));
+		com.command_type = GF_NET_SERVICE_CODEC_STAT_QUERY;
+		gf_service_command(mpdin->service, &com, GF_OK);
+		gf_dash_set_codec_stat(mpdin->dash, group_idx, com.codec_stat.avg_dec_time, com.codec_stat.max_dec_time, com.codec_stat.irap_avg_dec_time, com.codec_stat.irap_max_dec_time, com.codec_stat.codec_reset, com.codec_stat.decode_only_rap);
+
+		if (mpdin->buffer_adaptation) {
+			memset(&com, 0, sizeof(GF_NetworkCommand));
+			com.command_type = GF_NET_BUFFER_QUERY;
+			gf_service_command(mpdin->service, &com, GF_OK);
+			gf_dash_set_buffer_levels(mpdin->dash, group_idx, com.buffer.min, com.buffer.max, com.buffer.occupancy);
+		}
+	}
+
 	return GF_OK;
 }
 
+/*check in all groups if the service can support reverse playback (speed<0); return GF_OK only if service is supported in all groups*/
+static GF_Err mpdin_dash_can_reverse_playback(GF_MPD_In *mpdin)
+{
+	u32 i;
+	GF_Err e = GF_NOT_SUPPORTED;
+	for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
+		if (gf_dash_is_group_selectable(mpdin->dash, i)) {
+			GF_MPDGroup *mudta = gf_dash_get_group_udta(mpdin->dash, i);
+			if (mudta && mudta->segment_ifce) {
+				GF_NetworkCommand com;
+				com.command_type = GF_NET_SERVICE_CAN_REVERSE_PLAYBACK;
+				e = mudta->segment_ifce->ServiceCommand(mudta->segment_ifce, &com);
+				if (GF_OK != e)
+					return e;
+			}
+		}
+	}
+
+	return e;
+}
+
 
 GF_Err MPD_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
 {
@@ -814,9 +922,10 @@
 	const char *opt;
 	GF_Err e;
 	s32 shift_utc_ms, debug_adaptation_set;
-	u32 max_cache_duration, auto_switch_count, init_timeshift;
+	u32 max_cache_duration, auto_switch_count, init_timeshift, tiles_rate_decrease;
 	Bool use_server_utc;
 	GF_DASHInitialSelectionMode first_select_mode;
+	GF_DASHTileAdaptationMode tile_adapt_mode;
 	Bool keep_files, disable_switching;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Connection request (%p) from terminal for %s\n", serv, url));
@@ -861,8 +970,15 @@
 	if (opt && !strcmp(opt, "yes")) keep_files = 1;
 
 	disable_switching = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "DisableSwitching");
-	if (opt && !strcmp(opt, "yes")) disable_switching = 1;
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "NetworkAdaptation");
+	if (!opt) {
+		opt = "buffer";
+		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "NetworkAdaptation", opt);
+	}
+	if (!strcmp(opt, "disabled")) disable_switching = 2;
+	else if (!strcmp(opt, "bandwidth")) mpdin->buffer_adaptation = GF_FALSE;
+	else mpdin->buffer_adaptation = GF_TRUE;
+
 
 	first_select_mode = 0;
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "StartRepresentation");
@@ -871,6 +987,7 @@
 		opt = "minBandwidth";
 	}
 	if (opt && !strcmp(opt, "maxBandwidth")) first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST;
+	else if (opt && !strcmp(opt, "maxBandwidthTiles")) first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES;
 	else if (opt && !strcmp(opt, "minQuality")) first_select_mode = GF_DASH_SELECT_QUALITY_LOWEST;
 	else if (opt && !strcmp(opt, "maxQuality")) first_select_mode = GF_DASH_SELECT_QUALITY_HIGHEST;
 	else first_select_mode = GF_DASH_SELECT_BANDWIDTH_LOWEST;
@@ -881,11 +998,7 @@
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution");
 	if (!opt) {
-#if defined(_WIN32_WCE) || defined(GPAC_ANDROID) || defined(GPAC_IPHONE)
 		opt = "yes";
-#else
-		opt = "no";
-#endif
 		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution", opt);
 	}
 	mpdin->use_max_res = !strcmp(opt, "yes") ? 1 : 0;
@@ -920,14 +1033,41 @@
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseServerUTC", "yes");
 	use_server_utc = (opt && !strcmp(opt, "yes")) ? 1 : 0;
 
-	mpdin->in_seek = 0;
-	mpdin->previous_start_range = 0;
+	mpdin->nb_playing = 0;
 
 	init_timeshift = 0;
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift", "0");
 	if (opt) init_timeshift = atoi(opt);
 
+
+	tile_adapt_mode = 0;
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TileAdaptation");
+	if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "TileAdaptation", "none");
+		opt = "none";
+	}
+	if (!strcmp(opt, "none")) tile_adapt_mode = GF_DASH_ADAPT_TILE_NONE;
+	else if (!strcmp(opt, "rows")) tile_adapt_mode = GF_DASH_ADAPT_TILE_ROWS;
+	else if (!strcmp(opt, "reverseRows")) tile_adapt_mode = GF_DASH_ADAPT_TILE_ROWS_REVERSE;
+	else if (!strcmp(opt, "middleRows")) tile_adapt_mode = GF_DASH_ADAPT_TILE_ROWS_MIDDLE;
+	else if (!strcmp(opt, "columns")) tile_adapt_mode = GF_DASH_ADAPT_TILE_COLUMNS;
+	else if (!strcmp(opt, "reverseColumns")) tile_adapt_mode = GF_DASH_ADAPT_TILE_COLUMNS_REVERSE;
+	else if (!strcmp(opt, "middleColumns")) tile_adapt_mode = GF_DASH_ADAPT_TILE_COLUMNS_MIDDLE;
+	else if (!strcmp(opt, "center")) tile_adapt_mode = GF_DASH_ADAPT_TILE_CENTER;
+	else if (!strcmp(opt, "edges")) tile_adapt_mode = GF_DASH_ADAPT_TILE_EDGES;
+	else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPDIn] Unrecognized tile adaptation mode %s - defaulting to none\n", opt));
+		tile_adapt_mode = GF_DASH_ADAPT_TILE_NONE;
+	}
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TileRateDecrease");
+	if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "TileRateDecrease", "100");
+		opt = "100";
+	}
+	tiles_rate_decrease = atoi(opt);
+
 	//override all service callbacks
 	mpdin->fn_connect_ack = serv->fn_connect_ack;
 	serv->fn_connect_ack = mpdin_connect_ack;
@@ -944,6 +1084,7 @@
 
 	gf_dash_set_utc_shift(mpdin->dash, shift_utc_ms);
 	gf_dash_enable_utc_drift_compensation(mpdin->dash, use_server_utc);
+	gf_dash_set_tile_adaptation_mode(mpdin->dash, tile_adapt_mode, tiles_rate_decrease);
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseScreenResolution");
 	//default mode is no for the time being
@@ -983,6 +1124,13 @@
 
 	gf_dash_debug_group(mpdin->dash, debug_adaptation_set);
 
+	/*by default, speed adaptation and display adaptation are enable*/
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "SpeedAdaptation");
+	if (opt && !strcmp(opt, "yes"))
+		gf_dash_disable_speed_adaptation(mpdin->dash, GF_FALSE);
+	else
+		gf_dash_disable_speed_adaptation(mpdin->dash, GF_TRUE);
+
 	/*dash thread starts at the end of gf_dash_open */
 	e = gf_dash_open(mpdin->dash, url);
 	if (e) {
@@ -1107,7 +1255,12 @@
 	case GF_NET_GET_TIMESHIFT:
 		com->timeshift.time = gf_dash_get_timeshift_buffer_pos(mpdin->dash);
 		return GF_OK;
+	case GF_NET_SERVICE_CAN_REVERSE_PLAYBACK:
+		return mpdin_dash_can_reverse_playback(mpdin);
 
+	case GF_NET_ASSOCIATED_CONTENT_TIMING:
+		gf_dash_override_ntp(mpdin->dash, com->addon_time.ntp);
+		return GF_OK;
 	default:
 		break;
 	}
@@ -1122,6 +1275,15 @@
 		/* TODO - we are interactive if not live without timeshift */
 		return GF_OK;
 
+	case GF_NET_CHAN_GET_SRD:
+	{
+		Bool res;
+		idx = MPD_GetGroupIndexForChannel(mpdin, com->base.on_channel);
+		if (idx < 0) return GF_BAD_PARAM;
+		res = gf_dash_group_get_srd_info(mpdin->dash, idx, NULL, &com->srd.x, &com->srd.y, &com->srd.w, &com->srd.h, &com->srd.width, &com->srd.height);
+		return res ? GF_OK : GF_NOT_SUPPORTED;
+	}
+
 	case GF_NET_GET_STATS:
 	{
 		idx = MPD_GetGroupIndexForChannel(mpdin, com->base.on_channel);
@@ -1172,7 +1334,7 @@
 
 	case GF_NET_CHAN_BUFFER:
 		/*get it from MPD minBufferTime - if not in low latency mode, indicate the value given in MPD (not possible to fetch segments earlier) - to be more precise we should get the min segment duration for this group*/
-		if (!mpdin->use_low_latency && (mpdin->buffer_mode>=MPDIN_BUFFER_MIN)) {
+		if (/* !mpdin->use_low_latency && */ (mpdin->buffer_mode>=MPDIN_BUFFER_MIN)) {
 			u32 max = gf_dash_get_min_buffer_time(mpdin->dash);
 			if (max>com->buffer.max)
 				com->buffer.max = max;
@@ -1219,6 +1381,9 @@
 			group->is_timestamp_based = 0;
 			group->pto_setup = 0;
 			if (com->play.start_range<0) com->play.start_range = 0;
+			//in m3u8, we need also media start time for mapping time
+			if (gf_dash_is_m3u8(mpdin->dash))
+				mpdin->media_start_range = com->play.start_range;
 		}
 
 		//we cannot handle seek request outside of a period being setup, this messes up our internal service setup
@@ -1237,44 +1402,25 @@
 
 		gf_dash_set_speed(mpdin->dash, com->play.speed);
 
-		/*don't seek if this command is the first PLAY request of objects declared by the subservice*/
-		if (! mpdin->in_seek && !com->play.initial_broadcast_play /*&& (com->play.start_range>2.0) */) {
-			Bool skip_seek;
+		/*don't seek if this command is the first PLAY request of objects declared by the subservice, unless start range is not default one (0) */
+		if (!mpdin->nb_playing && (!com->play.initial_broadcast_play || (com->play.start_range>1.0) )) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Play command from terminal on channel %p on Service (%p)\n", com->base.on_channel, mpdin->service));
 
-			mpdin->in_seek = GF_TRUE;
-
-			/*if start range request is the same as previous one, don't process it
-			- this happens at period switch when new objects are declared*/
-			skip_seek = GF_FALSE;
-			if (com->play.initial_broadcast_play && (mpdin->previous_start_range==com->play.start_range))
-				skip_seek = GF_TRUE;
-			if (gf_dash_is_m3u8(mpdin->dash) == GF_TRUE)
-				skip_seek = GF_TRUE;
-
-			mpdin->previous_start_range = com->play.start_range;
-
-			if (!skip_seek) {
-				if (com->play.end_range<=0) {
-					u32 ms = (u32) ( 1000 * (-com->play.end_range) );
-					if (ms<1000) ms = 0;
-					gf_dash_set_timeshift(mpdin->dash, ms);
-				}
-				gf_dash_seek(mpdin->dash, com->play.start_range);
-
-				//we have issued a seek request, mark the group as seeking
-				if (mpdin->in_seek) {
-					//group->in_seek = 1;
-				}
-				//and check if current segment playback should be aborted
-				com->play.dash_segment_switch = gf_dash_group_segment_switch_forced(mpdin->dash, idx);
+			if (com->play.end_range<=0) {
+				u32 ms = (u32) ( 1000 * (-com->play.end_range) );
+				if (ms<1000) ms = 0;
+				gf_dash_set_timeshift(mpdin->dash, ms);
 			}
+			gf_dash_seek(mpdin->dash, com->play.start_range);
 
 			//to remove once we manage to keep the service alive
 			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
 			if (gf_dash_get_period_switch_status(mpdin->dash)) return GF_OK;
 		}
 
+		//check if current segment playback should be aborted
+		com->play.dash_segment_switch = gf_dash_group_segment_switch_forced(mpdin->dash, idx);
+
 		gf_dash_group_select(mpdin->dash, idx, GF_TRUE);
 		gf_dash_set_group_done(mpdin->dash, (u32) idx, 0);
 
@@ -1287,6 +1433,7 @@
 			com->play.start_range += ((Double)pto) / timescale;
 		}
 
+		mpdin->nb_playing++;
 		return segment_ifce->ServiceCommand(segment_ifce, com);
 
 	case GF_NET_CHAN_STOP:
@@ -1295,7 +1442,8 @@
 		if (idx>=0) {
 			gf_dash_set_group_done(mpdin->dash, (u32) idx, 1);
 		}
-		mpdin->previous_start_range = -1;
+		if (mpdin->nb_playing)
+			mpdin->nb_playing--;
 	}
 	return segment_ifce->ServiceCommand(segment_ifce, com);

v0.5.2.tar.gz/modules/mpegts_in/Makefile -> v0.6.1.tar.gz/modules/mpegts_in/Makefile Changed

v0.5.2.tar.gz/modules/mpegts_in/mpegts_in.c -> v0.6.1.tar.gz/modules/mpegts_in/mpegts_in.c Changed

@@ -33,6 +33,7 @@
 #ifndef GPAC_DISABLE_MPEG2TS
 
 static const char * MIMES[] = { "video/mpeg-2", "video/mp2t", "video/mpeg", NULL};
+static const char * M2TS_EXTENSIONS = "ts m2t mts dmb trp";
 
 //when regulating data rate from file using PCR, this is the maximum sleep we tolerate
 #define M2TS_MAX_SLEEP 200
@@ -56,7 +57,7 @@
 	Bool request_all_pids;
 	Bool is_connected;
 	Bool low_latency_mode;
-	Bool in_segment_download;
+	Bool in_segment_download, first_chunk_in_seg_parsed;
 	Bool first_segment_fetched;
 
 	Bool epg_requested;
@@ -91,6 +92,8 @@
 
 	u32 map_media_time_on_prog_id;
 	Double media_start_range;
+
+	const char *force_temi_url;
 } M2TSIn;
 
 
@@ -115,7 +118,7 @@
 	{
 		int i=0;
 		for (i = 0 ; NULL != MIMES[i]; i++)
-			if (gf_service_check_mime_register(plug, MIMES[i], "ts m2t dmb trp", "MPEG-2 TS", sExt))
+			if (gf_service_check_mime_register(plug, MIMES[i], M2TS_EXTENSIONS, "MPEG-2 TS", sExt))
 				return 1;
 	}
 	return 0;
@@ -700,13 +703,11 @@
 		((GF_M2TS_PES_PCK *) param)->stream->program->first_dts = 1;
 
 		if (discontinuity) {
-#if 0
-			if (ts->pcr_last) {
-				ts->pcr_last = ((GF_M2TS_PES_PCK *) param)->PTS;
-				ts->stb_at_last_pcr = gf_sys_clock();
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] PCR discontinuity - switching from old STB "LLD" to new one "LLD"\n", m2ts->pcr_last, ((GF_M2TS_PES_PCK *) param)->PTS));
+			if (m2ts->pcr_last) {
+				m2ts->pcr_last = ((GF_M2TS_PES_PCK *) param)->PTS;
+				m2ts->stb_at_last_pcr = gf_sys_clock();
 			}
-#endif
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS In] PCR discontinuity - switching from old STB "LLD" to new one "LLD"\n", m2ts->pcr_last, ((GF_M2TS_PES_PCK *) param)->PTS));
 			/*FIXME - we need to find a way to treat PCR discontinuities correctly while ignoring broken PCR discontinuities
 			seen in many HLS solutions*/
 			return;
@@ -728,7 +729,7 @@
 			if (m2ts->pcr_last) {
 				s32 diff;
 				if (pcr < m2ts->pcr_last) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS In] PCR "LLU" less than previous PCR "LLU"\n", ((GF_M2TS_PES_PCK *) param)->PTS, m2ts->pcr_last));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] PCR "LLU" less than previous PCR "LLU"\n", ((GF_M2TS_PES_PCK *) param)->PTS, m2ts->pcr_last));
 					m2ts->pcr_last = pcr;
 					m2ts->stb_at_last_pcr = gf_sys_clock();
 					diff = 0;
@@ -851,6 +852,8 @@
 		memset(&com, 0, sizeof(com));
 		com.addon_info.command_type = GF_NET_ASSOCIATED_CONTENT_LOCATION;
 		com.addon_info.external_URL = ((GF_M2TS_TemiLocationDescriptor*)param)->external_URL;
+		if (m2ts->force_temi_url)
+			com.addon_info.external_URL = m2ts->force_temi_url;
 		com.addon_info.is_announce = ((GF_M2TS_TemiLocationDescriptor*)param)->is_announce;
 		com.addon_info.is_splicing = ((GF_M2TS_TemiLocationDescriptor*)param)->is_splicing;
 		com.addon_info.activation_countdown = ((GF_M2TS_TemiLocationDescriptor*)param)->activation_countdown;
@@ -870,6 +873,7 @@
 		com.addon_time.media_timestamp = ((GF_M2TS_TemiTimecodeDescriptor*)param)->media_timestamp;
 		com.addon_time.force_reload = ((GF_M2TS_TemiTimecodeDescriptor*)param)->force_reload;
 		com.addon_time.is_paused = ((GF_M2TS_TemiTimecodeDescriptor*)param)->is_paused;
+		com.addon_time.ntp = ((GF_M2TS_TemiTimecodeDescriptor*)param)->ntp;
 		gf_service_command(m2ts->service, &com, GF_OK);
 	}
 	break;
@@ -994,6 +998,10 @@
 			}
 			//state "in progress"
 			m2ts->in_segment_download = 1;
+			if (!m2ts->first_chunk_in_seg_parsed) {
+				m2ts->first_chunk_in_seg_parsed=1;
+				m2ts->ts->pos_in_stream = 0;
+			}
 		} else {
 			if (refresh_type) {
 				//segment done downloading but was in progress mode: do a final refresh
@@ -1004,6 +1012,7 @@
 					*refresh_type = 0;
 				}
 			}
+			m2ts->first_chunk_in_seg_parsed=0;
 			m2ts->in_segment_download = 0;
 		}
 	}
@@ -1029,7 +1038,11 @@
 			m2ts->has_pending_segments++;
 		return;
 	}
-	gf_mx_p(m2ts->mx);
+	if (! gf_mx_try_lock(m2ts->mx)) {
+		if (flush_type==GF_M2TS_PUSH_SEGMENT)
+			m2ts->has_pending_segments++;
+		return;
+	}
 	m2ts->in_data_flush = 1;
 
 	//check buffer level when start of new segment
@@ -1060,6 +1073,9 @@
 	e = M2TS_QueryNextFile(m2ts, (flush_type==GF_M2TS_FLUSH_DATA) ? NEXT_SEGMENT_EXCEPT_DL : NEXT_SEGMENT, &url, &start_byterange, &end_byterange, &refresh_type);
 	if (e) {
 		m2ts->in_data_flush = 0;
+		if (e==GF_EOS) {
+			gf_m2ts_demux_file(m2ts->ts, NULL, 0, 0, 0, 1);
+		}
 		gf_mx_v(m2ts->mx);
 		return;
 	}
@@ -1075,6 +1091,11 @@
 		if (e==GF_EOS) {
 			gf_m2ts_demux_file(m2ts->ts, NULL, 0, 0, 0, 1);
 		}
+		//we are currently downloading this segment, parse it ONLY IF WE ARE CALLED FROM THE PROXY THREAD
+		//TODO: we should fix this to allow concurrent access to gmem://
+		else if (m2ts->in_segment_download && (flush_type != GF_M2TS_FLUSH_DATA) ) {
+			gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, refresh_type, 0);
+		}
 
 	}
 	m2ts->in_data_flush = 0;
@@ -1100,6 +1121,9 @@
 
 	m2ts->service = serv;
 
+	m2ts->force_temi_url = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "ForceTEMILocation");
+	if (m2ts->force_temi_url && !strlen(m2ts->force_temi_url)) m2ts->force_temi_url = NULL;
+
 	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "DSMCC", "Activated");
 	if (opt && !strcmp(opt, "yes")) {
 		gf_m2ts_demux_dmscc_init(m2ts->ts);
@@ -1288,7 +1312,7 @@
 		}
 
 		/* No IOD */
-		if (ES_ID == 18) {
+		if ((ES_ID == 18) && (!m2ts->ts->ess[18] || !(m2ts->ts->ess[18]->flags & GF_M2TS_ES_IS_PES)) ) {
 			e = GF_OK; /* 18 is the PID of EIT packets */
 			m2ts->eit_channel = channel;
 		} else if (ES_ID<GF_M2TS_MAX_STREAMS) {
@@ -1485,8 +1509,11 @@
 			if (!m2ts->map_media_time_on_prog_id)
 				m2ts->map_media_time_on_prog_id = pes->program->number;
 
-			if (plug->query_proxy && ts->file)
-				ts->segment_switch = 1;
+			if (com->play.dash_segment_switch) {
+				/*this is used in case of HLS stream while we need update media start time for mapping*/
+				m2ts->media_start_range = com->play.start_range;
+				gf_m2ts_abort_parsing(ts, GF_TRUE);
+			}
 
 			/*start demuxer*/
 			if (!plug->query_proxy) {
@@ -1568,7 +1595,7 @@
 	if (service == NULL)
 		return 0;
 	for (i = 0 ; MIMES[i]; i++)
-		gf_service_register_mime( service, MIMES[i], "ts m2t dmb", "MPEG-2 TS");
+		gf_service_register_mime( service, MIMES[i], M2TS_EXTENSIONS, "MPEG-2 TS");
 	return i;
 }
 
@@ -1584,7 +1611,7 @@
 	}
 
 	mcast_ifce = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "DefaultMCastInterface");
-	if(mcast_ifce) reader->ts->network_type = gf_strdup(mcast_ifce);
+	if(mcast_ifce) reader->ts->network_type = mcast_ifce;
 }
 
 GF_InputService *NewM2TSReader()
@@ -1649,15 +1676,12 @@
 	}
 	if (m2ts->network_buffer)
 		gf_free(m2ts->network_buffer);
+
 	m2ts->network_buffer = NULL;
-	m2ts->network_buffer_size = 0;
-	m2ts->request_all_pids = 0;
 	gf_m2ts_demux_del(m2ts->ts);
-	m2ts->ts = NULL;
 	gf_mx_del(m2ts->mx);
-	m2ts->mx = NULL;
 	gf_free(m2ts);
-	plug->priv = NULL;
+
 	gf_free(plug);
 }

v0.5.2.tar.gz/modules/mse_in/Makefile -> v0.6.1.tar.gz/modules/mse_in/Makefile Changed

v0.5.2.tar.gz/modules/mse_in/mse_in.c -> v0.6.1.tar.gz/modules/mse_in/mse_in.c Changed

@@ -27,6 +27,8 @@
 #include <gpac/internal/terminal_dev.h>
 #include <gpac/html5_mse.h>
 
+#ifndef GPAC_DISABLE_MSE
+
 typedef struct __mse_module
 {
 	GF_HTML_MediaSource *mediasource;
@@ -315,11 +317,15 @@
 	}
 }
 
+#endif //GPAC_DISABLE_MSE
+
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
+#ifndef GPAC_DISABLE_MSE
 		GF_NET_CLIENT_INTERFACE,
+#endif
 		0
 	};
 	return si;
@@ -328,6 +334,9 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
+#ifdef GPAC_DISABLE_MSE
+	return NULL;
+#else
 	GF_MSE_In *msein;
 	GF_InputService *plug;
 	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
@@ -349,10 +358,13 @@
 	plug->priv = msein;
 	msein->plug = plug;
 	return (GF_BaseInterface *)plug;
+#endif
 }
+
 GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *bi)
 {
+#ifndef GPAC_DISABLE_MSE
 	GF_MSE_In *msein;
 
 	if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
@@ -361,6 +373,7 @@
 	assert(msein);
 	gf_free(msein);
 	gf_free(bi);
+#endif
 }
 
 GPAC_MODULE_STATIC_DECLARATION( mse_in )

v0.5.2.tar.gz/modules/odf_dec/Makefile -> v0.6.1.tar.gz/modules/odf_dec/Makefile Changed

v0.5.2.tar.gz/modules/ogg/Makefile -> v0.6.1.tar.gz/modules/ogg/Makefile Changed

v0.5.2.tar.gz/modules/ogg/ogg_in.c -> v0.6.1.tar.gz/modules/ogg/ogg_in.c Changed

@@ -99,7 +99,7 @@
 {
 	OGGStream *st;
 	u32 i=0;
-	while ((st = gf_list_enum(read->streams, &i))) {
+	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 		gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
 	}
 }
@@ -117,17 +117,17 @@
 		GF_NetIOStatus status;
 		e = gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, &status);
 		/*not ready*/
-		if ((e<GF_OK) || (status > GF_NETIO_DATA_EXCHANGE)) return 0;
+		if ((e<GF_OK) || (status > GF_NETIO_DATA_EXCHANGE)) return GF_FALSE;
 		if (status == GF_NETIO_DATA_EXCHANGE) {
 			if (!total_size && !read->is_live) {
-				read->is_live = 1;
+				read->is_live = GF_TRUE;
 				read->tune_in_time = gf_sys_clock();
 			}
 			else if (!read->is_live && !read->ogfile) {
 				const char *szCache = gf_dm_sess_get_cache_name(read->dnload);
-				if (!szCache) return 0;
-				read->ogfile = gf_f64_open((char *) szCache, "rb");
-				if (!read->ogfile) return 0;
+				if (!szCache) return GF_FALSE;
+				read->ogfile = gf_fopen((char *) szCache, "rb");
+				if (!read->ogfile) return GF_FALSE;
 			}
 		}
 	}
@@ -139,19 +139,19 @@
 		if (read->ogfile) {
 			if (feof(read->ogfile)) {
 				OGG_EndOfFile(read);
-				return 0;
+				return GF_FALSE;
 			}
 			bytes = (u32) fread(buf, 1, OGG_BUFFER_SIZE, read->ogfile);
 		} else {
 			e = gf_dm_sess_fetch_data(read->dnload, buf, OGG_BUFFER_SIZE, &bytes);
-			if (e) return 0;
+			if (e) return GF_FALSE;
 		}
-		if (!bytes) return 0;
+		if (!bytes) return GF_FALSE;
 		buffer = ogg_sync_buffer(&read->oy, bytes);
 		memcpy(buffer, buf, bytes);
 		ogg_sync_wrote(&read->oy, bytes);
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 static OGGStream *OGG_FindStreamForPage(OGGReader *read, ogg_page *oggpage)
@@ -159,7 +159,7 @@
 	u32 i, count;
 	count = gf_list_count(read->streams);
 	for (i=0; i<count; i++) {
-		OGGStream *st = gf_list_get(read->streams, i);
+		OGGStream *st = (OGGStream*)gf_list_get(read->streams, i);
 		if (ogg_stream_pagein(&st->os, oggpage) == 0) return st;
 	}
 	return NULL;
@@ -318,7 +318,7 @@
 	/*reannounce of stream (caroussel in live streams) - until now I don't think icecast uses this*/
 	serial_no = ogg_page_serialno(oggpage);
 	i=0;
-	while ((st = gf_list_enum(read->streams, &i))) {
+	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 		if (st->serial_no==serial_no) {
 			OGG_ResetupStream(read, st, oggpage);
 			return;
@@ -327,7 +327,7 @@
 
 	/*look if we have the same stream defined (eg, reuse first stream dead with same header page)*/
 	i=0;
-	while ((st = gf_list_enum(read->streams, &i))) {
+	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 		if (st->eos_detected) {
 			ogg_stream_state os;
 			ogg_stream_init(&os, serial_no);
@@ -377,11 +377,11 @@
 	st->last_granule = -1;
 
 	if (st->info.streamType==GF_STREAM_VISUAL) {
-		read->has_video = 1;
+		read->has_video = GF_TRUE;
 	} else {
-		read->has_audio = 1;
+		read->has_audio = GF_TRUE;
 	}
-	if (st->got_headers && read->is_inline) gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), 0);
+	if (st->got_headers && read->is_inline) gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), GF_FALSE);
 }
 
 void OGG_SignalEndOfStream(OGGReader *read, OGGStream *st)
@@ -455,7 +455,7 @@
 	}
 
 	if (ogg_page_eos(&oggpage))
-		st->eos_detected = 1;
+		st->eos_detected = GF_TRUE;
 
 	if (st->parse_headers && !st->got_headers) {
 		while (ogg_stream_packetout(&st->os, &oggpacket ) > 0 ) {
@@ -476,9 +476,9 @@
 			gf_bs_del(bs);
 			st->parse_headers--;
 			if (!st->parse_headers) {
-				st->got_headers = 1;
+				st->got_headers = GF_TRUE;
 				if (read->is_inline)
-					gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), 0);
+					gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), GF_FALSE);
 				break;
 			}
 		}
@@ -512,11 +512,11 @@
 				GF_NetworkCommand map;
 				map.command_type = GF_NET_CHAN_MAP_TIME;
 				map.map_time.on_channel = st->ch;
-				map.map_time.reset_buffers = (read->start_range>0.2) ? 1 : 0;
+				map.map_time.reset_buffers = (read->start_range>0.2) ? GF_TRUE : GF_FALSE;
 				map.map_time.timestamp = st->ogg_ts = 0;
 				map.map_time.media_time = t;
 				gf_service_command(read->service, &map, GF_OK);
-				st->map_time = 0;
+				st->map_time = GF_FALSE;
 				OGG_SendPackets(read, st, &oggpacket);
 			}
 		}
@@ -539,7 +539,7 @@
 	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
 
 	if (read->needs_connection) {
-		read->needs_connection=0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, GF_OK);
 	}
 
@@ -567,10 +567,10 @@
 				u32 seek_to = 0;
 				read->resync_stream = NULL;
 				if (read->dur) seek_to = (u32) (read->file_size * (read->start_range/read->dur) * 0.6f);
-				if ((s32) seek_to > gf_f64_tell(read->ogfile) ) {
-					gf_f64_seek(read->ogfile, seek_to, SEEK_SET);
+				if ((s32) seek_to > gf_ftell(read->ogfile) ) {
+					gf_fseek(read->ogfile, seek_to, SEEK_SET);
 				} else {
-					gf_f64_seek(read->ogfile, 0, SEEK_SET);
+					gf_fseek(read->ogfile, 0, SEEK_SET);
 				}
 			}
 		}
@@ -582,13 +582,13 @@
 		while (go && !read->kill_demux) {
 			count = gf_list_count(read->streams);
 			for (i=0; i<count; i++) {
-				st = gf_list_get(read->streams, i);
+				st = (OGGStream*)gf_list_get(read->streams, i);
 				if (!st->ch) continue;
 				com.base.on_channel = st->ch;
 				gf_service_command(read->service, &com, GF_OK);
 				if (com.buffer.occupancy < read->data_buffer_ms) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[OGG] channel %d needs fill (%d ms data, %d max buffer)\n", st->ESID, com.buffer.occupancy, read->data_buffer_ms));
-					go = 0;
+					go = GF_FALSE;
 					break;
 				}
 			}
@@ -609,8 +609,8 @@
 	ogg_packet oggpacket;
 	ogg_stream_state os, the_os;
 	u64 max_gran;
-	Bool has_stream = 0;
-	gf_f64_seek(read->ogfile, 0, SEEK_SET);
+	Bool has_stream = GF_FALSE;
+	gf_fseek(read->ogfile, 0, SEEK_SET);
 
 	ogg_sync_init(&read->oy);
 	memset(&the_info, 0, sizeof(OGGInfo));
@@ -627,7 +627,7 @@
 					OGG_GetStreamInfo(&oggpacket, &info);
 				}
 				if (!has_stream) {
-					has_stream = 1;
+					has_stream = GF_TRUE;
 					ogg_stream_init(&the_os, ogg_page_serialno(&oggpage));
 					the_info = info;
 				}
@@ -644,8 +644,8 @@
 		}
 	}
 	ogg_sync_clear(&read->oy);
-	read->file_size = gf_f64_tell(read->ogfile);
-	gf_f64_seek(read->ogfile, 0, SEEK_SET);
+	read->file_size = gf_ftell(read->ogfile);
+	gf_fseek(read->ogfile, 0, SEEK_SET);
 	read->dur = 0;
 	if (has_stream) {
 		ogg_stream_clear(&the_os);
@@ -689,20 +689,20 @@
 	sExt = strrchr(url, '.');
 	for (i = 0 ; OGG_MIMES_AUDIO[i]; i++) {
 		if (gf_service_check_mime_register(plug, OGG_MIMES_AUDIO[i], OGG_MIMES_AUDIO_EXT, OGG_MIMES_AUDIO_DESC, sExt))
-			return 1;
+			return GF_TRUE;
 	}
 	for (i = 0 ; OGG_MIMES_VIDEO[i]; i++) {
 		if (gf_service_check_mime_register(plug, OGG_MIMES_VIDEO[i], OGG_MIMES_VIDEO_EXT, OGG_MIMES_VIDEO_DESC, sExt))
-			return 1;
+			return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool ogg_is_local(const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
 }
 
 void OGG_NetIO(void *cbk, GF_NETIO_Parameter *param)
@@ -713,13 +713,13 @@
 
 	/*done*/
 	if ((param->msg_type==GF_NETIO_DATA_TRANSFERED) && read->ogfile) {
-		read->is_remote = 0;
+		read->is_remote = GF_FALSE;
 		/*reload file*/
 		OGG_CheckFile(read);
 		return;
 	}
 	if (param->error && read->needs_connection) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		read->kill_demux = 2;
 		gf_service_connect_ack(read->service, NULL, param->error);
 	}
@@ -733,7 +733,7 @@
 	read->dnload = gf_service_download_new(read->service, url, GF_NETIO_SESSION_NOT_THREADED, OGG_NetIO, read);
 	if (!read->dnload) {
 		read->kill_demux=2;
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	}
 	/*service confirm is done once fetched, but start the demuxer thread*/
@@ -746,7 +746,7 @@
 	char szURL[2048];
 	char *ext;
 	GF_Err reply;
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 	read->service = serv;
 
 	if (read->dnload) gf_service_download_del(read->dnload);
@@ -764,21 +764,21 @@
 	/*remote fetch*/
 	read->is_remote = !ogg_is_local(szURL);
 	if (read->is_remote) {
-		read->needs_connection = 1;
+		read->needs_connection = GF_TRUE;
 		OGG_DownloadFile(plug, szURL);
 		return GF_OK;
 	} else {
-		read->ogfile = gf_f64_open(szURL, "rb");
+		read->ogfile = gf_fopen(szURL, "rb");
 		if (!read->ogfile) {
 			reply = GF_URL_ERROR;
 		} else {
 			reply = GF_OK;
 			/*init ogg file in local mode*/
 			if (!OGG_CheckFile(read)) {
-				fclose(read->ogfile);
+				gf_fclose(read->ogfile);
 				reply = GF_NON_COMPLIANT_BITSTREAM;
 			} else {
-				read->needs_connection = 1;
+				read->needs_connection = GF_TRUE;
 				/*start the demuxer thread*/
 				gf_th_run(read->demuxer, OggDemux, read);
 				return GF_OK;
@@ -793,13 +793,13 @@
 
 static GF_Err OGG_CloseService(GF_InputService *plug)
 {
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 	if (!read->kill_demux) {
 		read->kill_demux = 1;
 		while (read->kill_demux!=2) gf_sleep(2);
 	}
 
-	if (read->ogfile) fclose(read->ogfile);
+	if (read->ogfile) gf_fclose(read->ogfile);
 	read->ogfile = NULL;
 	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;
@@ -812,7 +812,7 @@
 	u32 i;
 	GF_ObjectDescriptor *od;
 	OGGStream *st;
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 	/*since we don't handle multitrack in ogg yes, we don't need to check sub_url, only use expected type*/
 
 	/*single object*/
@@ -820,17 +820,17 @@
 		if ((expect_type==GF_MEDIA_OBJECT_AUDIO) && !read->has_audio) return NULL;
 		if ((expect_type==GF_MEDIA_OBJECT_VIDEO) && !read->has_video) return NULL;
 		i=0;
-		while ((st = gf_list_enum(read->streams, &i))) {
+		while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 			if ((expect_type==GF_MEDIA_OBJECT_AUDIO) && (st->info.streamType!=GF_STREAM_AUDIO)) continue;
 			if ((expect_type==GF_MEDIA_OBJECT_VIDEO) && (st->info.streamType!=GF_STREAM_VISUAL)) continue;
 
 			od = OGG_GetOD(st);
-			read->is_single_media = 1;
+			read->is_single_media = GF_TRUE;
 			return (GF_Descriptor *) od;
 		}
 		/*not supported yet - we need to know what's in the ogg stream for that*/
 	}
-	read->is_inline = 1;
+	read->is_inline = GF_TRUE;
 	return NULL;
 }
 
@@ -839,7 +839,7 @@
 	u32 ES_ID, i;
 	GF_Err e;
 	OGGStream *st;
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 
 	e = GF_STREAM_NOT_FOUND;
 	if (strstr(url, "ES_ID")) {
@@ -849,7 +849,7 @@
 //	else if (!read->es_ch && OGG_CanHandleURL(plug, url)) ES_ID = 3;
 
 	i=0;
-	while ((st = gf_list_enum(read->streams, &i))) {
+	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 		if (st->ESID==ES_ID) {
 			st->ch = channel;
 			e = GF_OK;
@@ -865,10 +865,10 @@
 	GF_Err e;
 	OGGStream *st;
 	u32 i=0;
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 
 	e = GF_STREAM_NOT_FOUND;
-	while ((st = gf_list_enum(read->streams, &i))) {
+	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 		if (st->ch==channel) {
 			st->ch = NULL;
 			e = GF_OK;
@@ -883,7 +883,7 @@
 {
 	OGGStream *st;
 	u32 i;
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 
 	if (!com->base.on_channel) {
 		/*if live session we may cache*/
@@ -912,10 +912,10 @@
 		read->start_range = com->play.start_range;
 		read->end_range = com->play.end_range;
 		i=0;
-		while ((st = gf_list_enum(read->streams, &i))) {
+		while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 			if (st->ch == com->base.on_channel) {
-				st->is_running = 1;
-				st->map_time = read->dur ? 1 : 0;
+				st->is_running = GF_TRUE;
+				st->map_time = read->dur ? GF_TRUE : GF_FALSE;
 				if (!read->nb_playing) read->do_seek = 1;
 				read->nb_playing ++;
 				break;
@@ -932,9 +932,9 @@
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
 		i=0;
-		while ((st = gf_list_enum(read->streams, &i))) {
+		while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
 			if (st->ch == com->base.on_channel) {
-				st->is_running = 0;
+				st->is_running = GF_FALSE;
 				read->nb_playing --;
 				break;
 			}
@@ -950,23 +950,23 @@
 	char szURL[2048], *sep;
 	OGGReader *read = (OGGReader *)plug->priv;
 	const char *this_url = gf_service_get_url(read->service);
-	if (!this_url || !url) return 0;
+	if (!this_url || !url) return GF_FALSE;
 
 	strcpy(szURL, this_url);
 	sep = strrchr(szURL, '#');
 	if (sep) sep[0] = 0;
 
-	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return 0;
+	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
 	sep = strrchr(url, '#');
-	if (!stricmp(sep, "#video") && (read->has_video)) return 1;
-	if (!stricmp(sep, "#audio") && (read->has_audio)) return 1;
-	return 0;
+	if (!stricmp(sep, "#video") && (read->has_video)) return GF_TRUE;
+	if (!stricmp(sep, "#audio") && (read->has_audio)) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_InputService *OGG_LoadDemux()
 {
 	OGGReader *reader;
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
+	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
 	memset(plug, 0, sizeof(GF_InputService));
 	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC OGG Reader", "gpac distribution")
 	plug->RegisterMimeTypes = OGG_RegisterMimeTypes;
@@ -979,7 +979,7 @@
 	plug->ServiceCommand = OGG_ServiceCommand;
 	plug->CanHandleURLInService = OGG_CanHandleURLInService;
 
-	reader = gf_malloc(sizeof(OGGReader));
+	reader = (OGGReader*)gf_malloc(sizeof(OGGReader));
 	memset(reader, 0, sizeof(OGGReader));
 	reader->streams = gf_list_new();
 	reader->demuxer = gf_th_new("OGGDemux");
@@ -992,12 +992,12 @@
 void OGG_DeleteDemux(void *ifce)
 {
 	GF_InputService *plug = (GF_InputService *) ifce;
-	OGGReader *read = plug->priv;
+	OGGReader *read = (OGGReader*)plug->priv;
 	gf_th_del(read->demuxer);
 
 	/*just in case something went wrong*/
 	while (gf_list_count(read->streams)) {
-		OGGStream *st = gf_list_get(read->streams, 0);
+		OGGStream *st = (OGGStream*)gf_list_get(read->streams, 0);
 		gf_list_rem(read->streams, 0);
 		ogg_stream_clear(&st->os);
 		if (st->dsi) gf_free(st->dsi);

v0.5.2.tar.gz/modules/opencv_is/Makefile -> v0.6.1.tar.gz/modules/opencv_is/Makefile Changed

v0.5.2.tar.gz/modules/openhevc_dec/Makefile -> v0.6.1.tar.gz/modules/openhevc_dec/Makefile Changed

v0.5.2.tar.gz/modules/openhevc_dec/openhevc_dec.c -> v0.6.1.tar.gz/modules/openhevc_dec/openhevc_dec.c Changed

@@ -30,6 +30,9 @@
 #include <gpac/internal/media_dev.h>
 #include <openHevcWrapper.h>
 
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
 #define OPEN_SHVC
 
 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
@@ -70,6 +73,8 @@
 
 	u32 dec_frames;
 
+
+	FILE *raw_out;
 } HEVCDec;
 
 static GF_Err HEVC_ConfigurationScalableStream(HEVCDec *ctx, GF_ESD *esd)
@@ -82,7 +87,7 @@
 
 	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data)
 		return GF_OK;
-	cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+	cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
 	if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
 	if (ctx->nalu_size_length != cfg->nal_unit_size)
 		return GF_NON_COMPLIANT_BITSTREAM;
@@ -100,6 +105,9 @@
 	gf_bs_get_content(bs, &data, &data_len);
 	gf_bs_del(bs);
 	libOpenHevcDecode(ctx->openHevcHandle, (u8 *)data, data_len, 0);
+
+	if (ctx->raw_out) fwrite((u8 *)data, 1, data_len, ctx->raw_out);
+
 	gf_free(data);
 
 	libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 2);
@@ -121,7 +129,7 @@
 		HEVCState hevc;
 		memset(&hevc, 0, sizeof(HEVCState));
 
-		cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+		cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
 		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
 		ctx->nalu_size_length = cfg->nal_unit_size;
 
@@ -186,8 +194,8 @@
 		ctx->stride /=2;
 		ctx->out_size /= 2;
 		ctx->chroma_bpp = ctx->luma_bpp = 8;
-		ctx->conv_to_8bit = 1;
-		ctx->pack_mode = 0;
+		ctx->conv_to_8bit = GF_TRUE;
+		ctx->pack_mode = GF_FALSE;
 	}
 	ctx->dec_frames = 0;
 	return GF_OK;
@@ -227,7 +235,7 @@
 	}
 	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "Systems", "Output8bit");
 	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "Systems", "Output8bit", (ctx->display_bpp>8) ? "no" : "yes");
-	if (sOpt && !strcmp(sOpt, "yes")) ctx->output_as_8bit = 1;
+	if (sOpt && !strcmp(sOpt, "yes")) ctx->output_as_8bit = GF_TRUE;
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits");
 	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits", "4");
@@ -235,9 +243,14 @@
 	if (!ctx->output_cb_size) ctx->output_cb_size = 4;
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "PackHFR");
-	if (sOpt && !strcmp(sOpt, "yes") ) ctx->pack_mode = 1;
+	if (sOpt && !strcmp(sOpt, "yes") ) ctx->pack_mode = GF_TRUE;
 	else if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "PackHFR", "no");
 
+	if (!ctx->raw_out) {
+		sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "InputRipFile");
+		if (sOpt) ctx->raw_out = fopen(sOpt, "wb");
+	}
+
 
 	/*RTP case: configure enhancement now*/
 	if (esd->dependsOnESID) {
@@ -258,7 +271,7 @@
 		libOpenHevcClose(ctx->openHevcHandle);
 		ctx->openHevcHandle = NULL;
 	}
-	ctx->is_init = 0;
+	ctx->is_init = GF_FALSE;
 	ctx->width = ctx->height = ctx->out_size = 0;
 	if (ctx->conv_buffer) gf_free(ctx->conv_buffer);
 	ctx->conv_buffer = NULL;
@@ -324,7 +337,7 @@
 		capability->cap.valueInt = 1;
 		break;
 	case GF_CODEC_DIRECT_OUTPUT:
-		capability->cap.valueBool = 1;
+		capability->cap.valueBool = GF_TRUE;
 		break;
 	/*not known at our level...*/
 	case GF_CODEC_CU_DURATION:
@@ -344,7 +357,7 @@
 	case GF_CODEC_WAIT_RAP:
 		if (ctx->dec_frames) {
 			//quick hack, we have an issue with openHEVC resuming after being flushed ...
-			ctx->had_pic = 0;
+			ctx->had_pic = GF_FALSE;
 			libOpenHevcClose(ctx->openHevcHandle);
 			ctx->openHevcHandle = NULL;
 			ctx->is_init = GF_FALSE;
@@ -363,9 +376,9 @@
 		return GF_OK;
 	case GF_CODEC_DIRECT_OUTPUT:
 		ctx->direct_output = GF_TRUE;
-		ctx->pack_mode = 0;
+		ctx->pack_mode = GF_FALSE;
 		if (ctx->conv_to_8bit && ctx->out_size)
-			ctx->conv_buffer = gf_realloc(ctx->conv_buffer, sizeof(char)*ctx->out_size);
+			ctx->conv_buffer = (char*)gf_realloc(ctx->conv_buffer, sizeof(char)*ctx->out_size);
 
 		return GF_OK;
 	}
@@ -393,14 +406,14 @@
 
 	if (!ctx->output_as_8bit) {
 		if ((ctx->luma_bpp>8) || (ctx->chroma_bpp>8)) {
-			ctx->pack_mode = 0;
+			ctx->pack_mode = GF_FALSE;
 		}
 	} else {
 		if (bit_depth>8) {
 			bit_depth=8;
-			ctx->conv_to_8bit = 1;
+			ctx->conv_to_8bit = GF_TRUE;
 			a_stride /= 2;
-			ctx->pack_mode = 0;
+			ctx->pack_mode = GF_FALSE;
 		}
 	}
 
@@ -415,7 +428,7 @@
 		*outBufferLength = ctx->out_size;
 
 		if (ctx->conv_to_8bit && ctx->direct_output) {
-			ctx->conv_buffer = gf_realloc(ctx->conv_buffer, sizeof(char)*ctx->out_size);
+			ctx->conv_buffer = (char*)gf_realloc(ctx->conv_buffer, sizeof(char)*ctx->out_size);
 		}
 		return GF_BUFFER_TOO_SMALL;
 	}
@@ -436,7 +449,7 @@
 			dst.video_buffer = ctx->direct_output ? ctx->conv_buffer : outBuffer;
 			dst.pixel_format = GF_PIXEL_YV12;
 
-			gf_color_write_yv12_10_to_yuv(&dst, (u8 *) openHevcFramePtr.pvY, (u8 *) openHevcFramePtr.pvU, (u8 *) openHevcFramePtr.pvV, openHevcFramePtr.frameInfo.nYPitch, ctx->width, ctx->height, NULL, 0);
+			gf_color_write_yv12_10_to_yuv(&dst, (u8 *) openHevcFramePtr.pvY, (u8 *) openHevcFramePtr.pvU, (u8 *) openHevcFramePtr.pvV, openHevcFramePtr.frameInfo.nYPitch, ctx->width, ctx->height, NULL, GF_FALSE);
 			*outBufferLength = ctx->out_size;
 
 			if (ctx->direct_output )
@@ -453,9 +466,9 @@
 		idx_w = ((ctx->frame_idx==0) || (ctx->frame_idx==2)) ? 0 : ctx->width;
 		idx_h = ((ctx->frame_idx==0) || (ctx->frame_idx==1)) ? 0 : ctx->height*2*ctx->stride;
 
-		pY = (void*) ( outBuffer + idx_h + idx_w );
-		pU = (void*) (outBuffer + 2*ctx->stride*2*ctx->height + idx_w/2 + idx_h/4);
-		pV = (void*) (outBuffer + 2*ctx->stride*2*ctx->height + ctx->stride*ctx->height + idx_w/2 + idx_h/4);
+		pY = (u8*) (outBuffer + idx_h + idx_w );
+		pU = (u8*) (outBuffer + 2*ctx->stride*2*ctx->height + idx_w/2 + idx_h/4);
+		pV = (u8*) (outBuffer + 2*ctx->stride*2*ctx->height + ctx->stride*ctx->height + idx_w/2 + idx_h/4);
 
 
 		*outBufferLength = 0;
@@ -518,7 +531,7 @@
 			return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
 		}
 		//quick hack, we have an issue with openHEVC resuming after being flushed ...
-		ctx->had_pic = 0;
+		ctx->had_pic = GF_FALSE;
 		libOpenHevcClose(ctx->openHevcHandle);
 		ctx->openHevcHandle = NULL;
 		ctx->is_init = GF_FALSE;
@@ -540,11 +553,14 @@
 	*outBufferLength = 0;
 
 	if (ctx->had_pic) {
-		ctx->had_pic = 0;
+		ctx->had_pic = GF_FALSE;
 		return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
 	}
 	ctx->dec_frames++;
 	got_pic = libOpenHevcDecode(ctx->openHevcHandle, (u8 *) inBuffer, inBufferLength, *CTS);
+
+	if (ctx->raw_out) fwrite((u8 *) inBuffer, 1, inBufferLength, ctx->raw_out);
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] Decode CTS %d - size %d - got pic %d\n", *CTS, inBufferLength, got_pic));
 	if (got_pic>0) {
 		e = HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
@@ -630,10 +646,14 @@
 void DeleteHEVCDec(GF_BaseDecoder *ifcg)
 {
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+	if (ctx->raw_out) fclose(ctx->raw_out);
+
 	gf_free(ctx);
 	gf_free(ifcg);
 }
 
+#endif
+
 GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {

v0.5.2.tar.gz/modules/opensvc_dec/Makefile -> v0.6.1.tar.gz/modules/opensvc_dec/Makefile Changed

v0.5.2.tar.gz/modules/opensvc_dec/opensvc_dec.c -> v0.6.1.tar.gz/modules/opensvc_dec/opensvc_dec.c Changed

@@ -84,7 +84,7 @@
 		for (i=0; i<count; i++) {
 			u32 w=0, h=0, sid;
 			s32 par_n=0, par_d=0;
-			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
+			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 			gf_avc_get_sps_info(slc->data, slc->size, &sid, &w, &h, &par_n, &par_d);
@@ -108,7 +108,7 @@
 		count = gf_list_count(cfg->pictureParameterSets);
 		for (i=0; i<count; i++) {
 			u32 sps_id, pps_id;
-			GF_AVCConfigSlot *slc = gf_list_get(cfg->pictureParameterSets, i);
+			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, i);
 			gf_avc_get_pps_info(slc->data, slc->size, &pps_id, &sps_id);
 			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, Layer);
 			if (res<0) {
@@ -116,7 +116,7 @@
 			}
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", pps_id, slc->data[0] & 0x1F, slc->size, sps_id));
 		}
-		ctx->state_found = 1;
+		ctx->state_found = GF_TRUE;
 		gf_odf_avc_cfg_del(cfg);
 	} else {
 		if (ctx->nalu_size_length) {
@@ -241,7 +241,7 @@
 			ctx->MaxDqId = 0;
 
 		ctx->CurrentDqId = ctx->MaxDqId;
-		ctx->init_layer_set = 1;
+		ctx->init_layer_set = GF_TRUE;
 	}
 	if (curMaxDqId != ctx->MaxDqId)
 		ctx->CurrentDqId = ctx->MaxDqId;
@@ -303,7 +303,7 @@
 			case GF_AVC_NALU_SEQ_PARAM:
 			case GF_AVC_NALU_PIC_PARAM:
 				if (ctx->baseES_ID == ES_ID)
-					ctx->state_found = 1;
+					ctx->state_found = GF_TRUE;
 				break;
 			}
 		}
@@ -360,22 +360,22 @@
 	case GPAC_OTI_VIDEO_AVC:
 	case GPAC_OTI_VIDEO_SVC:
 		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-			Bool is_svc = 0;
+			Bool is_svc = GF_FALSE;
 			u32 i, count;
 			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
 
 			if (esd->has_ref_base)
-				is_svc = 1;
+				is_svc = GF_TRUE;
 
 			/*decode all NALUs*/
 			count = gf_list_count(cfg->sequenceParameterSets);
 			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
+				GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
 				u8 nal_type = slc->data[0] & 0x1F;
 
 				if (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM) {
-					is_svc = 1;
+					is_svc = GF_TRUE;
 					break;
 				}
 			}

v0.5.2.tar.gz/modules/osd/Makefile -> v0.6.1.tar.gz/modules/osd/Makefile Changed

v0.5.2.tar.gz/modules/osd/osd.c -> v0.6.1.tar.gz/modules/osd/osd.c Changed

v0.5.2.tar.gz/modules/oss_audio/Makefile -> v0.6.1.tar.gz/modules/oss_audio/Makefile Changed

v0.5.2.tar.gz/modules/platinum/GPACFileMediaServer.cpp -> v0.6.1.tar.gz/modules/platinum/GPACFileMediaServer.cpp Changed

v0.5.2.tar.gz/modules/platinum/GPACFileMediaServer.h -> v0.6.1.tar.gz/modules/platinum/GPACFileMediaServer.h Changed

v0.5.2.tar.gz/modules/platinum/GPACPlatinum.cpp -> v0.6.1.tar.gz/modules/platinum/GPACPlatinum.cpp Changed

@@ -1617,7 +1617,7 @@
 		if (!sep[1]) continue;
 		strcpy(szFriendlyName, sep+1);
 
-		FILE *f = gf_f64_open(szFile, "rt");
+		FILE *f = gf_fopen(szFile, "rt");
 		if (!f) continue;
 
 
@@ -1625,9 +1625,9 @@
 		device->js_source = szFile;
 
 		jsval aval;
-		gf_f64_seek(f, 0, SEEK_END);
-		u32 size = (u32) gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
+		gf_fseek(f, 0, SEEK_END);
+		u32 size = (u32) gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
 		char *buf = (char*)gf_malloc(sizeof(char)*(size+1));
 		size = (u32) fread(buf, 1, size, f);
 		buf[size]=0;
@@ -1638,7 +1638,7 @@
 			gf_list_del_item(m_Devices, device);
 			delete device;
 		}
-		fclose(f);
+		gf_fclose(f);
 		gf_free(buf);
 	}
 	return GF_TRUE;
@@ -1655,15 +1655,9 @@
 	case GF_TERM_EXT_START:
 		opt = gf_modules_get_option((GF_BaseInterface*)termext, "UPnP", "Enabled");
 		if (!opt) {
-#ifdef GPAC_CONFIG_DARWIN
-			opt = "no";
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in /Users/yourname/.gpacrc"));
-#else
-//			opt = "yes";
 			//UPnP is disabkled by default on all platforms until we have a more stable state on load and exit
 			opt = "no";
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in /Users/yourname/.gpacrc"));
-#endif
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in GPAC config file\n"));
 			gf_modules_set_option((GF_BaseInterface*)termext, "UPnP", "Enabled", opt);
 		}
 		if (!strcmp(opt, "yes")) {

v0.5.2.tar.gz/modules/platinum/Makefile -> v0.6.1.tar.gz/modules/platinum/Makefile Changed

v0.5.2.tar.gz/modules/pulseaudio/Makefile -> v0.6.1.tar.gz/modules/pulseaudio/Makefile Changed

v0.5.2.tar.gz/modules/raw_out/Makefile -> v0.6.1.tar.gz/modules/raw_out/Makefile Changed

v0.5.2.tar.gz/modules/raw_out/raw_video.c -> v0.6.1.tar.gz/modules/raw_out/raw_video.c Changed

@@ -52,7 +52,7 @@
 	if (rc->pixels) gf_free(rc->pixels);
 	rc->width = w;
 	rc->height = h;
-	rc->pixels = gf_malloc(sizeof(char) * rc->bpp * w * h);
+	rc->pixels = (char*)gf_malloc(sizeof(char) * rc->bpp * w * h);
 	if (!rc->pixels) return GF_OUT_OF_MEM;
 	return GF_OK;
 }
@@ -69,7 +69,7 @@
 
 	opt = gf_modules_get_option((GF_BaseInterface *)dr, "RAWVideo", "RawOutput");
 	if (opt && !strcmp(opt, "null")) {
-		rc->passthrough = 1;
+		rc->passthrough = GF_TRUE;
 		dr->Blit = RAW_BlitPassthrough;
 		dr->hw_caps |= GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_STRETCH | GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_HAS_YUV_OVERLAY;
 	}
@@ -140,7 +140,7 @@
 	memset(driv, 0, sizeof(GF_VideoOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Raw Video Output", "gpac distribution")
 
-	pCtx = gf_malloc(sizeof(RawContext));
+	pCtx = (RawContext*)gf_malloc(sizeof(RawContext));
 	memset(pCtx, 0, sizeof(RawContext));
 
 	driv->opaque = pCtx;
@@ -150,7 +150,7 @@
 	driv->Setup = RAW_Setup;
 	driv->Shutdown = RAW_Shutdown;
 	driv->ProcessEvent = RAW_ProcessEvent;
-	return (void *)driv;
+	return driv;
 }
 
 void DeleteRawVideoOutput(void *ifce)
@@ -219,15 +219,15 @@
 {
 	RawContext *ctx;
 	GF_AudioOutput *driv;
-	ctx = gf_malloc(sizeof(RawContext));
+	ctx = (RawContext*)gf_malloc(sizeof(RawContext));
 	memset(ctx, 0, sizeof(RawContext));
-	driv = gf_malloc(sizeof(GF_AudioOutput));
+	driv = (GF_AudioOutput*)gf_malloc(sizeof(GF_AudioOutput));
 	memset(driv, 0, sizeof(GF_AudioOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "Raw Audio Output", "gpac distribution")
 
 	driv->opaque = ctx;
 
-	driv->SelfThreaded = 0;
+	driv->SelfThreaded = GF_FALSE;
 	driv->Setup = RAW_AudioSetup;
 	driv->Shutdown = RAW_AudioShutdown;
 	driv->ConfigureOutput = RAW_ConfigureOutput;

v0.5.2.tar.gz/modules/redirect_av/Makefile -> v0.6.1.tar.gz/modules/redirect_av/Makefile Changed

v0.5.2.tar.gz/modules/redirect_av/ffmpeg_ts_muxer.c -> v0.6.1.tar.gz/modules/redirect_av/ffmpeg_ts_muxer.c Changed

@@ -14,6 +14,7 @@
 #endif
 
 
+
 #define STREAM_FRAME_RATE 25 /* 25 images/s */
 #define STREAM_NB_FRAMES  ((int)(STREAM_DURATION * STREAM_FRAME_RATE))
 #define STREAM_PIX_FMT PIX_FMT_YUV420P /* default pix_fmt */
@@ -171,7 +172,7 @@
 #endif
 
 GF_AbstractTSMuxer * ts_amux_new(GF_AVRedirect * avr, u32 videoBitrateInBitsPerSec, u32 width, u32 height, u32 audioBitRateInBitsPerSec) {
-	GF_AbstractTSMuxer * ts = gf_malloc( sizeof(GF_AbstractTSMuxer));
+	GF_AbstractTSMuxer * ts = (GF_AbstractTSMuxer*)gf_malloc( sizeof(GF_AbstractTSMuxer));
 	memset( ts, 0, sizeof( GF_AbstractTSMuxer));
 	ts->oc = avformat_alloc_context();
 	ts->destination = avr->destination;
@@ -181,7 +182,12 @@
 		ts->oc->oformat = GUESS_FORMAT("mpegts", NULL, NULL);
 	assert( ts->oc->oformat);
 #if REDIRECT_AV_AUDIO_ENABLED
+
+#ifdef FF_API_AVFRAME_LAVC
+	ts->audio_st = avformat_new_stream(ts->oc, avr->audioCodec);
+#else
 	ts->audio_st = av_new_stream(ts->oc, avr->audioCodec->id);
+#endif
 	{
 		AVCodecContext * c = ts->audio_st->codec;
 		c->codec_id = avr->audioCodec->id;
@@ -199,7 +205,11 @@
 	}
 #endif
 
+#ifdef FF_API_AVFRAME_LAVC
+	ts->video_st = avformat_new_stream(ts->oc, avr->videoCodec);
+#else
 	ts->video_st = av_new_stream(ts->oc, avr->videoCodec->id);
+#endif
 	{
 		AVCodecContext * c = ts->video_st->codec;
 		c->codec_id = avr->videoCodec->id;
@@ -268,7 +278,7 @@
 #endif
 	ts->videoMx = gf_mx_new("TS_VideoMx");
 	ts->tsEncodingThread = gf_th_new("ts_interleave_thread_run");
-	ts->encode = 1;
+	ts->encode = GF_TRUE;
 	ts->audioPackets = NULL;
 	ts->videoPackets = NULL;
 	gf_th_run(ts->tsEncodingThread, ts_interleave_thread_run, ts);
@@ -278,7 +288,7 @@
 void ts_amux_del(GF_AbstractTSMuxer * muxerToDelete) {
 	if (!muxerToDelete)
 		return;
-	muxerToDelete->encode = 0;
+	muxerToDelete->encode = GF_FALSE;
 	gf_sleep(100);
 	gf_th_stop(muxerToDelete->tsEncodingThread);
 	muxerToDelete->tsEncodingThread = NULL;
@@ -320,8 +330,8 @@
 	AVPacketList *pl;
 	AVPacket * pkt;
 	if (!ts->encode)
-		return 1;
-	pl = gf_malloc(sizeof(AVPacketList));
+		return GF_TRUE;
+	pl = (AVPacketList*)gf_malloc(sizeof(AVPacketList));
 	pl->next = NULL;
 	pkt = &(pl->pkt);
 	av_init_packet(pkt);
@@ -360,15 +370,15 @@
 		px->next = pl;
 	}
 	gf_mx_v(ts->audioMx);
-	return 0;
+	return GF_FALSE;
 }
 
 Bool ts_encode_video_frame(GF_AbstractTSMuxer* ts, uint8_t* data, int encoded) {
 	AVPacketList *pl;
 	AVPacket * pkt;
 	if (!ts->encode)
-		return 1;
-	pl = gf_malloc(sizeof(AVPacketList));
+		return GF_TRUE;
+	pl = (AVPacketList*)gf_malloc(sizeof(AVPacketList));
 	pl->next = NULL;
 	pkt = &(pl->pkt);
 
@@ -395,7 +405,7 @@
 		px->next = pl;
 	}
 	gf_mx_v(ts->videoMx);
-	return 0;
+	return GF_FALSE;
 }
 
 AVCodecContext * ts_get_video_codec_context(GF_AbstractTSMuxer * ts) {

v0.5.2.tar.gz/modules/redirect_av/redirect_av.c -> v0.6.1.tar.gz/modules/redirect_av/redirect_av.c Changed

@@ -57,11 +57,14 @@
 
 #include "ts_muxer.h"
 
-#define USE_GPAC_MPEG2TS
+//#define USE_GPAC_MPEG2TS
 #undef USE_GPAC_MPEG2TS
 
 //#define MULTITHREAD_REDIRECT_AV
+
+#if (LIBAVCODEC_VERSION_MAJOR<56)
 #define REDIRECT_AV_AUDIO_ENABLED 1
+#endif
 
 #ifdef USE_GPAC_MPEG2TS
 #include "gpac_ts_muxer.c"
@@ -87,6 +90,8 @@
 #endif
 
 
+
+
 /* This number * 188 should be lower than the UDP packet size */
 #define TS_PACKETS_PER_UDP_PACKET 1
 
@@ -123,19 +128,19 @@
 	u64 myTime = 0;
 	u32 frameCountSinceReset = 0;
 	u32 lastCurrentTime;
-	Bool sendPts = 1;
+	Bool sendPts = GF_TRUE;
 	GF_AVRedirect * avr = (GF_AVRedirect*) param;
 	AVCodecContext * ctx = NULL;
 	assert( avr );
 
 	outBuffSize = FF_MIN_BUFFER_SIZE;
 
-	outBuff = gf_malloc(outBuffSize* sizeof(u8));
+	outBuff = (u8*)gf_malloc(outBuffSize* sizeof(u8));
 	inBuff = NULL;
 #ifdef DUMP_MP3
-	FILE * mp3 = fopen("/tmp/dump.mp3", "w");
+	FILE * mp3 = gf_fopen("/tmp/dump.mp3", "w");
 #endif /* DUMP_MP3 */
-	sendPts = 1;
+	sendPts = GF_TRUE;
 	gf_sc_add_audio_listener ( avr->term->compositor, &avr->audio_listen );
 	while (avr->is_running && !ctx) {
 		ctx = ts_get_audio_codec_context(avr->ts_implementation);
@@ -152,7 +157,7 @@
 	// 2 chars are needed for each short
 	toRead = samplesReaden * 2;
 	inBuffSize = toRead;
-	inBuff = gf_malloc(inBuffSize * sizeof(u8));
+	inBuff = (u8*)gf_malloc(inBuffSize * sizeof(u8));
 	while (avr->is_running && !avr->audioCurrentTime) {
 		gf_sleep(16);
 	}
@@ -164,7 +169,7 @@
 			//GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] Drift in audio : audioCurrentTime = %u, myTime=%u, resync...\n", avr->audioCurrentTime, myTime));
 			//myTime = lastCurrentTime = avr->audioCurrentTime;
 			//frameCountSinceReset = 0;
-			sendPts = 1;
+			sendPts = GF_TRUE;
 		}
 		while (toRead <= gf_ringbuffer_available_for_read(avr->pcmAudio) ) {
 			memset( inBuff, 0, inBuffSize);
@@ -178,6 +183,7 @@
 				//assert( oldFrameSize <= ctx->frame_size );
 				/* buf_size * input_sample_size / output_sample_size */
 				int encoded = avcodec_encode_audio(ctx, outBuff, outBuffSize, (const short *) inBuff);
+
 				if (encoded < 0) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[RedirectAV]: failed to encode audio, buffer size=%u, readen=%u, frame_size=%u\n", outBuffSize, readen, ctx->frame_size));
 				} else if (encoded > 0) {
@@ -194,7 +200,7 @@
 					/* Avoid overflow , multiply by 10 and divide sample rate by 100 instead of *1000 / sampleRate */
 					myTime = lastCurrentTime + (frameCountSinceReset * toRead * 10 / (ctx->sample_rate / 100) / ctx->channels / 4);
 					//sendPts = 0;
-					sendPts = 1;
+					sendPts = GF_TRUE;
 				} else {
 					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[RedirectAV]: no encoded frame.\n"));
 					//frameCountSinceReset++;
@@ -212,7 +218,7 @@
 		gf_free( outBuff );
 #ifdef DUMP_MP3
 	if (mp3)
-		fclose(mp3);
+		gf_fclose(mp3);
 #endif /* DUMP_MP3 */
 	if (avr->term)
 		gf_sc_remove_audio_listener ( avr->term->compositor, &avr->audio_listen );
@@ -253,7 +259,7 @@
 			assert( currentFrameTimeProcessed != avr->frameTime);
 			currentFrameTimeProcessed = avr->frameTime;
 			{
-				avpicture_fill ( ( AVPicture * ) avr->RGBpicture, avr->frame, PIX_FMT_RGB24, avr->srcWidth, avr->srcHeight );
+				avpicture_fill ( ( AVPicture * ) avr->RGBpicture, (const uint8_t*)avr->frame, PIX_FMT_RGB24, avr->srcWidth, avr->srcHeight );
 				assert( avr->swsContext );
 				sws_scale ( avr->swsContext,
 #ifdef USE_AVCODEC2
@@ -320,11 +326,11 @@
 static Bool start_if_needed(GF_AVRedirect *avr) {
 	enum PixelFormat pxlFormatForCodec = PIX_FMT_YUV420P;
 	if (avr->is_open)
-		return 0;
+		return GF_FALSE;
 	gf_mx_p(avr->frameMutex);
 	if (avr->is_open) {
 		gf_mx_v(avr->frameMutex);
-		return 0;
+		return GF_FALSE;
 	}
 	if (!avr->srcWidth || !avr->srcHeight
 #if REDIRECT_AV_AUDIO_ENABLED
@@ -356,7 +362,7 @@
 		{
 			gf_mx_v(avr->frameMutex);
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Cannot find audio codec.\n" ) );
-			return 1;
+			return GF_TRUE;
 		}
 #endif
 
@@ -370,21 +376,29 @@
 			pxlFormatForCodec = PIX_FMT_YUVJ420P;
 		}
 
+#if !defined(FF_API_AVFRAME_LAVC)
 		avr->RGBpicture = avcodec_alloc_frame();
+#else
+		avr->RGBpicture = av_frame_alloc();
+#endif
 		assert ( avr->RGBpicture );
 		avr->RGBpicture->data[0] = NULL;
+#if !defined(FF_API_AVFRAME_LAVC)
 		avr->YUVpicture = avcodec_alloc_frame();
+#else
+		avr->YUVpicture = av_frame_alloc();
+#endif
 		assert ( avr->YUVpicture );
 		{
 			u32 sz = sizeof ( uint8_t ) * avpicture_get_size ( pxlFormatForCodec, avr->srcWidth, avr->srcHeight );
-			avr->yuv_data = av_malloc ( sz ); /* size for YUV 420 */
+			avr->yuv_data = (uint8_t*)av_malloc ( sz ); /* size for YUV 420 */
 			assert ( avr->yuv_data );
 			memset ( avr->yuv_data, 0, sz );
 			avpicture_fill ( ( AVPicture* ) avr->YUVpicture, avr->yuv_data, pxlFormatForCodec, avr->srcWidth, avr->srcHeight );
 			avr->YUVpicture->coded_picture_number = 0;
 		}
 		avr->videoOutbufSize = avr->srcHeight * avr->srcWidth * 4;
-		avr->videoOutbuf = gf_malloc ( avr->videoOutbufSize );
+		avr->videoOutbuf = (uint8_t*)gf_malloc ( avr->videoOutbufSize );
 		memset ( avr->videoOutbuf, 0, avr->videoOutbufSize );
 	}
 #ifdef AVR_DUMP_RAW_AVI
@@ -416,7 +430,7 @@
 	*/
 	avr->is_open = avr->ts_implementation != NULL;
 	gf_mx_v(avr->frameMutex);
-	return avr->is_open ? 1 : 0;
+	return avr->is_open ? GF_TRUE : GF_FALSE;
 }
 
 
@@ -426,7 +440,7 @@
 	if ( avr->is_open)
 		return GF_OK;
 	if (!avr->is_running) {
-		avr->is_running = 1;
+		avr->is_running = GF_TRUE;
 		gf_th_run(avr->encodingThread, video_encoding_thread_run, avr);
 #if REDIRECT_AV_AUDIO_ENABLED
 		gf_th_run(avr->audioEncodingThread, audio_encoding_thread_run, avr);
@@ -521,7 +535,7 @@
 		gf_mx_p(avr->frameMutex);
 		if ( avr->frame ) gf_free ( avr->frame );
 		avr->size = 3*width*height;
-		avr->frame = gf_malloc ( sizeof ( char ) *avr->size );
+		avr->frame = (char*)gf_malloc ( sizeof ( char ) *avr->size );
 		avr->srcWidth = width;
 		avr->srcHeight = height;
 		avr->swsContext = sws_getCachedContext ( avr->swsContext, avr->srcWidth, avr->srcHeight, PIX_FMT_RGB24, avr->srcWidth, avr->srcHeight, PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL );
@@ -572,7 +586,7 @@
 static void avr_close ( GF_AVRedirect *avr )
 {
 	if ( !avr->is_open ) return;
-	avr->is_open = 0;
+	avr->is_open = GF_FALSE;
 #ifdef AVR_DUMP_RAW_AVI
 	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ( "[AVRedirect] Closing output AVI file\n" ) );
 	AVI_close ( avr->avi_out );
@@ -582,7 +596,7 @@
 
 static Bool avr_on_event ( void *udta, GF_Event *evt, Bool consumed_by_compositor )
 {
-	GF_AVRedirect *avr = udta;
+	GF_AVRedirect *avr = (GF_AVRedirect*)udta;
 	switch ( evt->type )
 	{
 	case GF_EVENT_CONNECT:
@@ -596,7 +610,7 @@
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static const char * AVR_ENABLED_OPTION = "Enabled";
@@ -610,7 +624,7 @@
 static Bool avr_process ( GF_TermExt *termext, u32 action, void *param )
 {
 	const char *opt;
-	GF_AVRedirect *avr = termext->udta;
+	GF_AVRedirect *avr = (GF_AVRedirect*)termext->udta;
 
 	switch ( action )
 	{
@@ -619,12 +633,12 @@
 		opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_ENABLED_OPTION );
 		if ( !opt )
 			gf_modules_set_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_ENABLED_OPTION, "no" );
-		if ( !opt || strcmp ( opt, "yes" ) ) return 0;
+		if ( !opt || strcmp ( opt, "yes" ) ) return GF_FALSE;
 		opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_VIDEO_CODEC_OPTION );
 		avr->globalLock = gf_global_resource_lock("AVRedirect:output");
 		if (!avr->globalLock) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Failed to lock global resource 'AVRedirect:output', another GPAC instance must be running, disabling AVRedirect\n"));
-			return 0;
+			return GF_FALSE;
 		}
 #ifndef AVIO_FLAG_WRITE
 		/* must be called before using avcodec lib */
@@ -726,7 +740,7 @@
 		avr->term_listen.udta = avr;
 		avr->term_listen.on_event = avr_on_event;
 		gf_term_add_event_filter ( avr->term, &avr->term_listen );
-		return 1;
+		return GF_TRUE;
 
 	case GF_TERM_EXT_STOP:
 		gf_term_remove_event_filter ( avr->term, &avr->term_listen );
@@ -737,7 +751,7 @@
 	case GF_TERM_EXT_PROCESS:
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -756,9 +770,9 @@
 	uir->frameMutex = gf_mx_new("RedirectAV_frameMutex");
 	uir->encodingThread = gf_th_new("RedirectAV_EncodingThread");
 	uir->audioEncodingThread = gf_th_new("RedirectAV_AudioEncodingThread");
-	uir->encode = 1;
-	uir->is_open = 0;
-	uir->is_running = 0;
+	uir->encode = GF_TRUE;
+	uir->is_open = GF_FALSE;
+	uir->is_running = GF_FALSE;
 	return dr;
 }
 
@@ -766,8 +780,8 @@
 void avr_delete ( GF_BaseInterface *ifce )
 {
 	GF_TermExt *dr = ( GF_TermExt * ) ifce;
-	GF_AVRedirect *avr = dr->udta;
-	avr->is_running = 0;
+	GF_AVRedirect *avr = (GF_AVRedirect*)dr->udta;
+	avr->is_running = GF_FALSE;
 	/* Ensure encoding is finished */
 	gf_mx_p(avr->frameMutex);
 	gf_mx_v(avr->frameMutex);

v0.5.2.tar.gz/modules/redirect_av/ts_muxer.h -> v0.6.1.tar.gz/modules/redirect_av/ts_muxer.h Changed

@@ -56,6 +56,48 @@
 #endif
 
 
+
+/*TODO - we need to cleanup the ffmpeg code to align with only latest version and remove old compatibility code*/
+#ifndef CODEC_ID_MJPEG
+
+#define CODEC_ID_SVQ3	AV_CODEC_ID_SVQ3
+#define CODEC_ID_MPEG4	AV_CODEC_ID_MPEG4
+#define CODEC_ID_H264	AV_CODEC_ID_H264
+#define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
+#define CODEC_ID_MJPEG	AV_CODEC_ID_MJPEG
+#define CODEC_ID_MP2	AV_CODEC_ID_MP2
+#define CODEC_ID_AC3	AV_CODEC_ID_AC3
+#define CODEC_ID_EAC3	AV_CODEC_ID_EAC3
+#define CODEC_ID_DVD_SUBTITLE	AV_CODEC_ID_DVD_SUBTITLE
+#define CODEC_ID_RAWVIDEO	AV_CODEC_ID_RAWVIDEO
+#define CODEC_ID_MJPEGB	AV_CODEC_ID_MJPEGB
+#define CODEC_ID_LJPEG	AV_CODEC_ID_LJPEG
+#define CODEC_ID_GIF	AV_CODEC_ID_GIF
+#define CODEC_ID_H263	AV_CODEC_ID_H263
+#define CODEC_ID_MP3	AV_CODEC_ID_MP3
+#define CODEC_ID_AAC	AV_CODEC_ID_AAC
+#define CODEC_ID_MPEG1VIDEO	AV_CODEC_ID_MPEG1VIDEO
+#define CODEC_ID_MSMPEG4V3	AV_CODEC_ID_MSMPEG4V3
+#define CODEC_ID_RV10	AV_CODEC_ID_RV10
+#define CODEC_ID_H263P	AV_CODEC_ID_H263P
+#define CODEC_ID_H263I	AV_CODEC_ID_H263I
+#endif
+
+#ifndef PIX_FMT_YUV420P
+#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
+#define PIX_FMT_YUV420P10LE AV_PIX_FMT_YUV420P10LE
+#define PIX_FMT_BGR24 AV_PIX_FMT_BGR24
+#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24
+#define PIX_FMT_YUVJ420P AV_PIX_FMT_YUVJ420P
+#endif
+
+#if (LIBAVCODEC_VERSION_MAJOR>56)
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC
+#endif
+
+#endif
+
 #include <gpac/ringbuffer.h>
 
 typedef struct

v0.5.2.tar.gz/modules/rtp_in/Makefile -> v0.6.1.tar.gz/modules/rtp_in/Makefile Changed

v0.5.2.tar.gz/modules/rtp_in/rtp_in.c -> v0.6.1.tar.gz/modules/rtp_in/rtp_in.c Changed

@@ -157,7 +157,7 @@
 
 			if (sess->connect_error) {
 				gf_service_connect_ack(sess->owner->service, NULL, sess->connect_error);
-				sess->connect_error = 0;
+				sess->connect_error = GF_OK;
 			}
 
 		}
@@ -191,22 +191,22 @@
 {
 	char *sExt;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
 
-	if (sExt && gf_service_check_mime_register(plug, sdp_mime, sdp_exts, sdp_desc, sExt)) return 1;
+	if (sExt && gf_service_check_mime_register(plug, sdp_mime, sdp_exts, sdp_desc, sExt)) return GF_TRUE;
 
 	/*local */
-	if (strstr(url, "data:application/sdp")) return 1;
+	if (strstr(url, "data:application/sdp")) return GF_TRUE;
 	/*embedded data*/
 	if (strstr(url, "data:application/mpeg4-od-au;base64") ||
 	 strstr(url, "data:application/mpeg4-bifs-au;base64") ||
-	 strstr(url, "data:application/mpeg4-es-au;base64")) return 1;
+	 strstr(url, "data:application/mpeg4-es-au;base64")) return GF_TRUE;
 
 	/*we need rtsp/tcp , rtsp/udp or direct RTP sender (no control)*/
-	if (!strnicmp(url, "rtsp://", 7) || !strnicmp(url, "rtspu://", 8) || !strnicmp(url, "rtp://", 6)) return 1;
+	if (!strnicmp(url, "rtsp://", 7) || !strnicmp(url, "rtspu://", 8) || !strnicmp(url, "rtp://", 6)) return GF_TRUE;
 	/*we don't check extensions*/
-	return 0;
+	return GF_FALSE;
 }
 
 GF_Err RP_ConnectServiceEx(GF_InputService *plug, GF_ClientService *serv, const char *url, Bool skip_migration)
@@ -232,9 +232,9 @@
 	if (!skip_migration) {
 		session_cache = (char *) gf_modules_get_option((GF_BaseInterface *) plug, "Streaming", "SessionMigrationFile");
 		if (session_cache && session_cache[0]) {
-			FILE *f = gf_f64_open(session_cache, "rb");
+			FILE *f = gf_fopen(session_cache, "rb");
 			if (f) {
-				fclose(f);
+				gf_fclose(f);
 				GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Restarting RTSP session from %s\n", session_cache));
 				RP_FetchSDP(priv, (char *) session_cache, NULL, (char *) url);
 				return GF_OK;
@@ -282,7 +282,7 @@
 
 GF_Err RP_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
 {
-	return RP_ConnectServiceEx(plug, serv, url, 0);
+	return RP_ConnectServiceEx(plug, serv, url, GF_FALSE);
 }
 
 static void RP_FlushCommands(RTPClient *rtp)
@@ -379,7 +379,7 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Connecting channel @%08x - %s\n", channel, url));
 
-	ch = RP_FindChannel(priv, channel, 0, (char *) url, 0);
+	ch = RP_FindChannel(priv, channel, 0, (char *) url, GF_FALSE);
 	if (ch && (ch->status != RTP_Disconnected) ) return GF_SERVICE_ERROR;
 
 	es_url = NULL;
@@ -387,7 +387,7 @@
 	if (strstr(url, "ES_ID=")) {
 		sscanf(url, "ES_ID=%ud", &ESID);
 		/*first case: simple URL (same namespace)*/
-		ch = RP_FindChannel(priv, NULL, ESID, NULL, 0);
+		ch = RP_FindChannel(priv, NULL, ESID, NULL, GF_FALSE);
 		/*this should not happen, the sdp must describe all streams in the service*/
 		if (!ch) return GF_STREAM_NOT_FOUND;
 
@@ -432,7 +432,7 @@
 	/*session migration resume - don't send data to the server*/
 	if (ch->status==RTP_SessionResume) {
 		ch->flags |= RTP_CONNECTED;
-		RP_InitStream(ch, 0);
+		RP_InitStream(ch, GF_FALSE);
 		RP_ConfirmChannelConnect(ch, GF_OK);
 		return GF_OK;
 	}
@@ -453,7 +453,7 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Disconnecting channel @%08x\n", channel));
 
-	ch = RP_FindChannel(priv, channel, 0, NULL, 0);
+	ch = RP_FindChannel(priv, channel, 0, NULL, GF_FALSE);
 	if (!ch) return GF_STREAM_NOT_FOUND;
 	gf_mx_p(priv->mx);
 	/*disconnect stream BUT DO NOT DELETE IT since we don't store SDP*/
@@ -499,7 +499,7 @@
 				{
 					/*resume streaming next channel*/
 					gf_mx_p(rtp->mx);
-					RP_InitStream(ch, 0);
+					RP_InitStream(ch, GF_FALSE);
 					gf_mx_v(rtp->mx);
 					ch->status = RTP_Running;
 					rtp->cur_mid = ch->mid;
@@ -548,7 +548,7 @@
 	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
 		u32 i;
 		for (i=0; i<gf_list_count(priv->channels); i++) {
-			ch = gf_list_get(priv->channels, i);
+			ch = (RTPStream*)gf_list_get(priv->channels, i);
 			if (ch->depacketizer->sl_map.StreamType==GF_STREAM_AUDIO)
 				return GF_OK;
 		}
@@ -556,7 +556,7 @@
 	}
 	if (com->command_type==GF_NET_SERVICE_MIGRATION_INFO) {
 		RP_SaveSessionState(priv);
-		priv->session_migration=1;
+		priv->session_migration = GF_TRUE;
 		if (priv->session_state_data) {
 			com->migrate.data = priv->session_state_data;
 			com->migrate.data_len = (u32) strlen(priv->session_state_data);
@@ -577,7 +577,7 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-	ch = RP_FindChannel(priv, com->base.on_channel, 0, NULL, 0);
+	ch = RP_FindChannel(priv, com->base.on_channel, 0, NULL, GF_FALSE);
 	if (!ch) return GF_STREAM_NOT_FOUND;
 
 	switch (com->command_type) {
@@ -646,16 +646,16 @@
 				/*technically we shouldn't attempt to synchronize streams based on RTP, we should use RTCP/ However it
 				may happen that the RTCP traffic is absent ...*/
 				//ch->check_rtp_time = RTP_SET_TIME_RTP;
-				ch->rtcp_init = 0;
+				ch->rtcp_init = GF_FALSE;
 				gf_mx_p(priv->mx);
-				RP_InitStream(ch, (ch->flags & RTP_CONNECTED) ? 1 : 0);
+				RP_InitStream(ch, (ch->flags & RTP_CONNECTED) ? GF_TRUE : GF_FALSE);
 				gf_mx_v(priv->mx);
 				gf_rtp_set_info_rtp(ch->rtp_ch, 0, 0, 0);
 			} else {
 				/*direct channel, store current start*/
 				ch->current_start = com->play.start_range;
 				ch->flags |= GF_RTP_NEW_AU;
-				gf_rtp_depacketizer_reset(ch->depacketizer, 0);
+				gf_rtp_depacketizer_reset(ch->depacketizer, GF_FALSE);
 			}
 		}
 		return GF_OK;
@@ -669,7 +669,7 @@
 			ch->status = RTP_Connected;
 			ch->owner->last_ntp = 0;
 		}
-		ch->rtcp_init = 0;
+		ch->rtcp_init = GF_FALSE;
 		return GF_OK;
 	case GF_NET_CHAN_SET_SPEED:
 	case GF_NET_CHAN_PAUSE:
@@ -735,7 +735,7 @@
 	RTPStream *ch;
 	RTPClient *priv = (RTPClient *)plug->priv;
 
-	ch = RP_FindChannel(priv, channel, 0, NULL, 0);
+	ch = RP_FindChannel(priv, channel, 0, NULL, GF_FALSE);
 	if (!ch) return GF_STREAM_NOT_FOUND;
 	if (ch->rtp_ch || ch->rtsp || !ch->control) return GF_SERVICE_ERROR;
 	if (ch->status != RTP_Running) return GF_SERVICE_ERROR;
@@ -743,7 +743,7 @@
 	if (!data) return GF_SERVICE_ERROR;
 
 	if (ch->current_start>=0) {
-		*sl_compressed = 0;
+		*sl_compressed = GF_FALSE;
 		memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
 		out_sl_hdr->accessUnitEndFlag = 1;
 		out_sl_hdr->accessUnitStartFlag = 1;
@@ -751,7 +751,7 @@
 		out_sl_hdr->compositionTimeStampFlag = 1;
 		out_sl_hdr->randomAccessPointFlag = 1;
 		*out_reception_status = GF_OK;
-		*is_new_data = (ch->flags & GF_RTP_NEW_AU) ? 1 : 0;
+		*is_new_data = (ch->flags & GF_RTP_NEW_AU) ? GF_TRUE : GF_FALSE;
 
 		/*decode data*/
 		data = strstr(data, ",");
@@ -774,7 +774,7 @@
 	RTPStream *ch;
 	RTPClient *priv = (RTPClient *)plug->priv;
 
-	ch = RP_FindChannel(priv, channel, 0, NULL, 0);
+	ch = RP_FindChannel(priv, channel, 0, NULL, GF_FALSE);
 	if (!ch) return GF_STREAM_NOT_FOUND;
 	if (ch->rtp_ch || ch->rtsp || !ch->control) return GF_SERVICE_ERROR;
 	if (ch->status != RTP_Running) return GF_SERVICE_ERROR;
@@ -792,10 +792,10 @@
 	if (strstr(url, "data:application/mpeg4-od-au;base64")
 	 || strstr(url, "data:application/mpeg4-bifs-au;base64")
 	 || strstr(url, "data:application/mpeg4-es-au;base64")
-	 ) return 1;
+	 ) return GF_TRUE;
 
 	if (url[0]=='#') {
-		Bool st_type = 0;
+		Bool st_type = GF_FALSE;
 		if (!stricmp(url, "#video")) st_type = GF_STREAM_VISUAL;
 		else if (!stricmp(url, "#audio")) st_type = GF_STREAM_AUDIO;
 
@@ -804,17 +804,17 @@
 			RTPStream *st;
 			while ((st = (RTPStream *)gf_list_enum(priv->channels, &i))) {
 				if (st->depacketizer && (st->depacketizer->sl_map.StreamType==st_type))
-					return 1;
+					return GF_TRUE;
 			}
 		}
-		return 0;
+		return GF_FALSE;
 	} else if (!RP_CanHandleURL(plug, url)) {
-		return 0;
+		return GF_FALSE;
 	}
 	/*if this URL is part of a running session then ok*/
 	sess = RP_CheckSession(priv, (char *) url);
-	if (sess) return 1;
-	return 0;
+	if (sess) return GF_TRUE;
+	return GF_FALSE;
 }

v0.5.2.tar.gz/modules/rtp_in/rtp_session.c -> v0.6.1.tar.gz/modules/rtp_in/rtp_session.c Changed

@@ -115,7 +115,7 @@
 			//signal what's going on
 			if (time >= time_out) {
 				if (!strcmp(com->method, GF_RTSP_TEARDOWN)) {
-					gf_rtsp_session_reset(sess->session, 1);
+					gf_rtsp_session_reset(sess->session, GF_TRUE);
 				} else {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Request Timeout for command %s after %d ms\n", com->method, time));
 				}
@@ -287,10 +287,10 @@
 	char *service_name, *ctrl;
 	RTSPSession *in_session = RP_CheckSession(rtp, session_control);
 
-	has_aggregated_control = 0;
+	has_aggregated_control = GF_FALSE;
 	if (session_control) {
 		//if (!strcmp(session_control, "*")) session_control = NULL;
-		if (session_control) has_aggregated_control = 1;
+		if (session_control) has_aggregated_control = GF_TRUE;
 	}
 
 	/*regular setup in an established session (RTSP DESCRIBE)*/
@@ -382,7 +382,7 @@
 		//first = 0;
 	}
 	/*reset session state*/
-	gf_rtsp_session_reset(sess->session, 1);
+	gf_rtsp_session_reset(sess->session, GF_TRUE);
 	sess->flags &= ~RTSP_WAIT_REPLY;
 }

v0.5.2.tar.gz/modules/rtp_in/rtp_signaling.c -> v0.6.1.tar.gz/modules/rtp_in/rtp_signaling.c Changed

@@ -33,9 +33,9 @@
 	u32 i=0;
 	RTPStream *st;
 	while ((st = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-		if (st == ch) return 1;
+		if (st == ch) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 void RP_StopChannel(RTPStream *ch)
@@ -61,7 +61,7 @@
 		/*count only active channels*/
 		if (ach->status == RTP_Running) count++;
 	}
-	return count ? 1 : 0;
+	return count ? GF_TRUE : GF_FALSE;
 }
 
 static void RP_QueueCommand(RTSPSession *sess, RTPStream *ch, GF_RTSPCommand *com, Bool needs_sess_id)
@@ -116,7 +116,7 @@
 	/*1: multicast forced*/
 	opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceMulticastIP");
 	if (opt) {
-		trans->IsUnicast = 0;
+		trans->IsUnicast = GF_FALSE;
 		trans->destination = gf_strdup(opt);
 		opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceMulticastTTL");
 		trans->TTL = opt ? atoi(opt) : 127;
@@ -136,7 +136,7 @@
 		if (trans->Profile) gf_free(trans->Profile);
 		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP_TCP);
 		//some servers expect the interleaved to be set during the setup request
-		trans->IsInterleaved = 1;
+		trans->IsInterleaved = GF_TRUE;
 		trans->rtpID = gf_list_find(ch->owner->channels, ch);
 		trans->rtcpID = trans->rtpID+1;
 		gf_rtp_setup_transport(ch->rtp_ch, trans, NULL);
@@ -156,7 +156,7 @@
 	com->user_data = ch;
 	ch->status = RTP_WaitingForAck;
 
-	RP_QueueCommand(ch->rtsp, ch, com, 1);
+	RP_QueueCommand(ch->rtsp, ch, com, GF_TRUE);
 }
 
 /*filter setup if no session (rtp only)*/
@@ -182,7 +182,7 @@
 	if (!ch->rtsp) {
 		ch->flags |= RTP_CONNECTED;
 		/*init rtp*/
-		resp = RP_InitStream(ch, 0),
+		resp = RP_InitStream(ch, GF_FALSE),
 		/*send confirmation to user*/
 		RP_ConfirmChannelConnect(ch, resp);
 	} else {
@@ -239,7 +239,7 @@
 	}
 	if (e) goto exit;
 
-	e = RP_InitStream(ch, 0);
+	e = RP_InitStream(ch, GF_FALSE);
 	if (e) goto exit;
 	ch->status = RTP_Connected;
 
@@ -273,19 +273,19 @@
 	/*not a channel describe*/
 	if (!com->user_data) {
 		RP_SendMessage(sess->owner->service, GF_OK, "Connecting...");
-		return 1;
+		return GF_TRUE;
 	}
 
 	ch_desc = (ChannelDescribe *)com->user_data;
-	ch = RP_FindChannel(sess->owner, NULL, ch_desc->ES_ID, ch_desc->esd_url, 0);
-	if (!ch) return 1;
+	ch = RP_FindChannel(sess->owner, NULL, ch_desc->ES_ID, ch_desc->esd_url, GF_FALSE);
+	if (!ch) return GF_TRUE;
 
 	/*channel has been described already, skip describe and send setup directly*/
 	RP_SetupChannel(ch, ch_desc);
 
 	if (ch_desc->esd_url) gf_free(ch_desc->esd_url);
 	gf_free(ch_desc);
-	return 0;
+	return GF_FALSE;
 }
 
 /*process describe reply*/
@@ -316,7 +316,7 @@
 
 	ch = NULL;
 	if (ch_desc) {
-		ch = RP_FindChannel(sess->owner, ch_desc->channel, ch_desc->ES_ID, ch_desc->esd_url, 0);
+		ch = RP_FindChannel(sess->owner, ch_desc->channel, ch_desc->ES_ID, ch_desc->esd_url, GF_FALSE);
 	} else {
 		RP_SendMessage(sess->owner->service, GF_OK, "Connected");
 	}
@@ -358,7 +358,7 @@
 	/*locate the channel by URL - if we have one, this means the channel is already described
 	this happens when 2 ESD with URL use the same RTSP service - skip describe and send setup*/
 	if (esd_url || channel) {
-		ch = RP_FindChannel(sess->owner, channel, 0, esd_url, 0);
+		ch = RP_FindChannel(sess->owner, channel, 0, esd_url, GF_FALSE);
 		if (ch) {
 			if (!ch->channel) ch->channel = channel;
 			switch (ch->status) {
@@ -404,7 +404,7 @@
 	opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(sess->owner->service), "Network", "Bandwidth");
 	if (opt && !stricmp(opt, "yes")) com->Bandwidth = atoi(opt);
 
-	RP_QueueCommand(sess, NULL, com, 0);
+	RP_QueueCommand(sess, NULL, com, GF_FALSE);
 }
 
 
@@ -435,19 +435,19 @@
 
 	ch_ctrl = NULL;
 	if (strcmp(com->method, GF_RTSP_TEARDOWN)) ch_ctrl = (ChannelControl *)com->user_data;
-	if (!ch_ctrl || !ch_ctrl->ch) return 1;
+	if (!ch_ctrl || !ch_ctrl->ch) return GF_TRUE;
 	ch = ch_ctrl->ch;
 
 	if (!ch->channel || !channel_is_valid(sess->owner, ch)) {
 		gf_free(ch_ctrl);
 		com->user_data = NULL;
-		return 0;
+		return GF_FALSE;
 	}
 
 	assert(ch->rtsp == sess);
 	assert(ch->channel==ch_ctrl->com.base.on_channel);
 
-	skip_it = 0;
+	skip_it = GF_FALSE;
 	if (!com->Session) {
 		/*re-SETUP failed*/
 		if (!strcmp(com->method, GF_RTSP_PLAY) || !strcmp(com->method, GF_RTSP_PAUSE)) {
@@ -455,7 +455,7 @@
 			goto err_exit;
 		}
 		/*this is a stop, no need for SessionID just skip*/
-		skip_it = 1;
+		skip_it = GF_TRUE;
 	} else {
 		SkipCommandOnSession(ch);
 	}
@@ -466,9 +466,9 @@
 		gf_service_command(sess->owner->service, &ch_ctrl->com, GF_OK);
 		gf_free(ch_ctrl);
 		com->user_data = NULL;
-		return 0;
+		return GF_FALSE;
 	}
-	return 1;
+	return GF_TRUE;
 
 err_exit:
 	gf_rtsp_reset_aggregation(ch->rtsp->session);
@@ -477,7 +477,7 @@
 	gf_service_command(sess->owner->service, &ch_ctrl->com, e);
 	gf_free(ch_ctrl);
 	com->user_data = NULL;
-	return 0;
+	return GF_FALSE;
 }
 
 void RP_ProcessUserCommand(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
@@ -548,7 +548,7 @@
 		count = gf_list_count(sess->rtsp_rsp->RTP_Infos);
 		for (i=0; i<count; i++) {
 			info = (GF_RTPInfo*)gf_list_get(sess->rtsp_rsp->RTP_Infos, i);
-			agg_ch = RP_FindChannel(sess->owner, NULL, 0, info->url, 0);
+			agg_ch = RP_FindChannel(sess->owner, NULL, 0, info->url, GF_FALSE);
 
 			if (!agg_ch || (agg_ch->rtsp != sess) ) continue;
 			/*channel is already playing*/
@@ -567,7 +567,7 @@
 				agg_ch->check_rtp_time = RTP_SET_TIME_RTP_SEEK;
 			}
 			/* reset the buffers */
-			RP_InitStream(agg_ch, 1);
+			RP_InitStream(agg_ch, GF_TRUE);
 
 			gf_rtp_set_info_rtp(agg_ch->rtp_ch, info->seq, info->rtp_time, info->ssrc);
 			agg_ch->status = RTP_Running;
@@ -587,7 +587,7 @@
 		if (!i) {
 			ch->current_start = 0.0;
 			ch->check_rtp_time = RTP_SET_TIME_RTP;
-			RP_InitStream(ch, 1);
+			RP_InitStream(ch, GF_TRUE);
 			ch->status = RTP_Running;
 			if (gf_rtp_is_interleaved(ch->rtp_ch)) {
 				gf_rtsp_register_interleave(sess->session,
@@ -654,14 +654,14 @@
 	RTPStream *a_ch;
 	ChannelControl *ch_ctrl;
 	u32 i;
-	Bool needs_setup = 0;
+	Bool needs_setup = GF_FALSE;
 	GF_RTSPCommand *com;
 	GF_RTSPRange *range;
 
 	switch (command->command_type) {
 	case GF_NET_CHAN_PLAY:
 	case GF_NET_CHAN_RESUME:
-		needs_setup = 1;
+		needs_setup = GF_TRUE;
 		break;
 	case GF_NET_CHAN_PAUSE:
 	case GF_NET_CHAN_STOP:
@@ -699,7 +699,7 @@
 
 		com->method = gf_strdup(GF_RTSP_PLAY);
 
-		ch->paused=0;
+		ch->paused = GF_FALSE;
 
 		/*specify pause range on resume - this is not mandatory but most servers need it*/
 		if (command->command_type==GF_NET_CHAN_RESUME) {
@@ -768,7 +768,7 @@
 			else if (strlen(ch->control))
 				com->ControlString = gf_strdup(ch->control);
 
-			ch->paused=1;
+			ch->paused = GF_TRUE;
 		}
 	}
 	else if (command->command_type==GF_NET_CHAN_STOP) {
@@ -776,7 +776,7 @@
 		ch->stat_stop_time = gf_sys_clock();
 
 		ch->status = RTP_Connected;
-		RP_InitStream(ch, 1);
+		RP_InitStream(ch, GF_TRUE);
 
 		/*if server only support aggregation on pause, skip the command or issue
 		a teardown if last active stream*/
@@ -812,7 +812,7 @@
 	memcpy(&ch_ctrl->com, command, sizeof(GF_NetworkCommand));
 	com->user_data = ch_ctrl;
 
-	RP_QueueCommand(sess, ch, com, 1);
+	RP_QueueCommand(sess, ch, com, GF_TRUE);
 	return;
 }
 
@@ -849,7 +849,7 @@
 		com->user_data = ch;
 	}
 
-	RP_QueueCommand(sess, ch, com, 1);
+	RP_QueueCommand(sess, ch, com, GF_TRUE);
 }
 
 #endif /*GPAC_DISABLE_STREAMING*/

v0.5.2.tar.gz/modules/rtp_in/rtp_stream.c -> v0.6.1.tar.gz/modules/rtp_in/rtp_stream.c Changed

@@ -85,7 +85,7 @@
 
 			}
 		}
-		return gf_rtp_initialize(ch->rtp_ch, RTP_BUFFER_SIZE, 0, 0, reorder_size, 200, (char *)ip_ifce);
+		return gf_rtp_initialize(ch->rtp_ch, RTP_BUFFER_SIZE, GF_FALSE, 0, reorder_size, 200, (char *)ip_ifce);
 	}
 	//just reset the sockets
 	gf_rtp_reset_buffers(ch->rtp_ch);
@@ -101,7 +101,7 @@
 		}
 		RP_RemoveStream(ch->owner, ch);
 	} else {
-		RP_FindChannel(ch->owner, ch->channel, 0, NULL, 1);
+		RP_FindChannel(ch->owner, ch->channel, 0, NULL, GF_TRUE);
 	}
 
 	if (ch->depacketizer) gf_rtp_depacketizer_del(ch->depacketizer);
@@ -126,12 +126,23 @@
 			return;
 		}
 		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Timeout for RTCP: no SR recevied after %d ms - forcing playback, sync may be broken\n", RTCP_DEFAULT_TIMEOUT_MS));
-		ch->rtcp_init = 1;
+		ch->rtcp_init = GF_TRUE;
 	}
+
 	cts = hdr->compositionTimeStamp;
 	dts = hdr->decodingTimeStamp;
-	hdr->compositionTimeStamp -= ch->ts_offset;
-	hdr->decodingTimeStamp -= ch->ts_offset;
+
+	if (hdr->compositionTimeStamp < ch->ts_offset) {
+		hdr->compositionTimeStamp = hdr->decodingTimeStamp = 0;
+		hdr->seekFlag = 1;
+	} else {
+		hdr->seekFlag = 0;
+		hdr->compositionTimeStamp -= ch->ts_offset;
+
+		if (hdr->decodingTimeStamp) {
+			hdr->decodingTimeStamp -= ch->ts_offset;
+		}
+	}
 
 	if (ch->rtp_ch->packet_loss) e = GF_REMOTE_SERVICE_ERROR;
 
@@ -152,14 +163,14 @@
 	RTPStream *tmp;
 	GF_RTPMap *map;
 	u32 i, ESID, ODID, ssrc, rtp_seq, rtp_time;
-	Bool force_bcast = 0;
+	Bool force_bcast = GF_FALSE;
 	Double Start, End;
 	Float CurrentTime;
 	u16 rvc_predef = 0;
 	char *rvc_config_att = NULL;
 	u32 s_port_first, s_port_last;
 	GF_X_Attribute *att;
-	Bool is_migration = 0;
+	Bool is_migration = GF_FALSE;
 	char *ctrl;
 	GF_SDPConnection *conn;
 	GF_RTSPTransport trans;
@@ -179,14 +190,14 @@
 	i=0;
 	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
 		if (!stricmp(att->Name, "control")) ctrl = att->Value;
-		else if (!stricmp(att->Name, "gpac-broadcast")) force_bcast = 1;
+		else if (!stricmp(att->Name, "gpac-broadcast")) force_bcast = GF_TRUE;
 		else if (!stricmp(att->Name, "mpeg4-esid") && att->Value) ESID = atoi(att->Value);
 		else if (!stricmp(att->Name, "mpeg4-odid") && att->Value) ODID = atoi(att->Value);
 		else if (!stricmp(att->Name, "range") && !range) range = gf_rtsp_range_parse(att->Value);
 		else if (!stricmp(att->Name, "x-stream-state") ) {
 			sscanf(att->Value, "server-port=%u-%u;ssrc=%X;npt=%g;seq=%u;rtptime=%u",
 			 &s_port_first, &s_port_last, &ssrc, &CurrentTime, &rtp_seq, &rtp_time);
-			is_migration = 1;
+			is_migration = GF_TRUE;
 		}
 		else if (!stricmp(att->Name, "x-server-port") ) {
 			sscanf(att->Value, "%u-%u", &s_port_first, &s_port_last);
@@ -245,7 +256,7 @@
 		if (!ctrl) ctrl = input_stream->control;
 		tmp = input_stream;
 	} else {
-		tmp = RP_FindChannel(rtp, NULL, ESID, NULL, 0);
+		tmp = RP_FindChannel(rtp, NULL, ESID, NULL, GF_FALSE);
 		if (tmp) return NULL;
 
 		GF_SAFEALLOC(tmp, RTPStream);
@@ -264,7 +275,7 @@
 	memset(&trans, 0, sizeof(GF_RTSPTransport));
 	trans.Profile = media->Profile;
 	trans.source = conn ? conn->host : sdp->o_address;
-	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? 0 : 1;
+	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
 	if (!trans.IsUnicast) {
 		trans.port_first = media->PortNumber;
 		trans.port_last = media->PortNumber + 1;
@@ -316,20 +327,20 @@
 	} else if (rvc_config_att) {
 		char *rvc_data=NULL;
 		u32 rvc_size;
-		Bool is_gz = 0;
+		Bool is_gz = GF_FALSE;
 		if (!strncmp(rvc_config_att, "data:application/rvc-config+xml", 32) && strstr(rvc_config_att, "base64") ) {
 			char *data = strchr(rvc_config_att, ',');
 			if (data) {
 				rvc_size = (u32) strlen(data) * 3 / 4 + 1;
-				rvc_data = gf_malloc(sizeof(char) * rvc_size);
+				rvc_data = (char*)gf_malloc(sizeof(char) * rvc_size);
 				rvc_size = gf_base64_decode(data, (u32) strlen(data), rvc_data, rvc_size);
 				rvc_data[rvc_size] = 0;
 			}
-			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 35)) is_gz = 1;
+			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 35)) is_gz = GF_TRUE;
 		} else if (!strnicmp(rvc_config_att, "http://", 7) || !strnicmp(rvc_config_att, "https://", 8) ) {
 			char *mime;
 			if (gf_dm_get_file_memory(rvc_config_att, &rvc_data, &rvc_size, &mime) == GF_OK) {
-				if (mime && strstr(mime, "+gz")) is_gz = 1;
+				if (mime && strstr(mime, "+gz")) is_gz = GF_TRUE;
 				if (mime) gf_free(mime);
 			}
 		}
@@ -407,7 +418,7 @@
 			}
 
 			com.map_time.timestamp = hdr.TimeStamp;
-			com.map_time.reset_buffers = 0;
+			com.map_time.reset_buffers = GF_FALSE;
 			gf_service_command(ch->owner->service, &com, GF_OK);
 
 			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Mapping RTP Time seq %d TS %d Media Time %g - rtp info seq %d TS %d\n",
@@ -415,7 +426,7 @@
 			 ));
 
 			/*skip RTCP clock init when RTSP is used*/
-			if (ch->rtsp) ch->rtcp_init = 1;
+			if (ch->rtsp) ch->rtcp_init = GF_TRUE;
 
 //			if (ch->depacketizer->payt==GF_RTP_PAYT_H264_AVC) ch->depacketizer->flags |= GF_RTP_AVC_WAIT_RAP;
 		}
@@ -482,28 +493,12 @@
 		ch->ts_offset = ch->rtp_ch->last_SR_rtp_time;
 		ch->ts_offset -= (s64) (ntp_clock * ch->rtp_ch->TimeScale);
 
-#if 0
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(com));
-		com.command_type = GF_NET_CHAN_MAP_TIME;
-		com.base.on_channel = ch->channel;
-		com.map_time.media_time = ntp;
-
-		if (com.map_time.media_time >= ch->owner->last_ntp) {
-			com.map_time.media_time -= ch->owner->last_ntp;
-		} else {
-			com.map_time.media_time = 0;
-		}
-		com.map_time.timestamp = ch->rtp_ch->last_SR_rtp_time;
-		com.map_time.reset_buffers = 1;
-		gf_service_command(ch->owner->service, &com, GF_OK);
-#endif
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTCP] At %d Using Sender Report to map RTP TS %d to NTP clock %g - new TS offset "LLD" \n",
 		 gf_sys_clock(), ch->rtp_ch->last_SR_rtp_time, ntp_clock, ch->ts_offset
 		 ));
 
-		ch->rtcp_init = 1;
+		ch->rtcp_init = GF_TRUE;
 		ch->check_rtp_time = RTP_SET_TIME_NONE;
 	}

v0.5.2.tar.gz/modules/rtp_in/sdp_fetch.c -> v0.6.1.tar.gz/modules/rtp_in/sdp_fetch.c Changed

@@ -58,21 +58,21 @@
 	sdp_buf = NULL;
 
 	if (file_name && strstr(file_name, "file://")) file_name += strlen("file://");
-	if (!file_name || !(_sdp = gf_f64_open(file_name, "rt")) ) {
+	if (!file_name || !(_sdp = gf_fopen(file_name, "rt")) ) {
 		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
 		return;
 	}
 
-	gf_f64_seek(_sdp, 0, SEEK_END);
-	sdp_size = (u32) gf_f64_tell(_sdp);
-	gf_f64_seek(_sdp, 0, SEEK_SET);
+	gf_fseek(_sdp, 0, SEEK_END);
+	sdp_size = (u32) gf_ftell(_sdp);
+	gf_fseek(_sdp, 0, SEEK_SET);
 	sdp_buf = (char*)gf_malloc(sdp_size);
 	if (1 > fread(sdp_buf, 1, sdp_size, _sdp)) {
 		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
 	} else {
 		RP_LoadSDP(rtp, sdp_buf, sdp_size, stream);
 	}
-	fclose(_sdp);
+	gf_fclose(_sdp);
 	gf_free(sdp_buf);
 }
 
@@ -129,7 +129,7 @@
 		gf_free(sdp);
 		rtp->sdp_temp = NULL;
 		RP_SendMessage(rtp->service, e, "Error fetching session state - restarting");
-		RP_ConnectServiceEx(gf_service_get_interface(rtp->service), rtp->service, url, 1);
+		RP_ConnectServiceEx(gf_service_get_interface(rtp->service), rtp->service, url, GF_TRUE);
 		gf_free(url);
 		return;
 	}

v0.5.2.tar.gz/modules/rtp_in/sdp_load.c -> v0.6.1.tar.gz/modules/rtp_in/sdp_load.c Changed

@@ -57,7 +57,7 @@
 		else if (!strcmp(att->Name, "x-session-name")) url = att->Value;
 		else if (!strcmp(att->Name, "x-session-id")) session_id = att->Value;
 		/*we have the H264-SVC streams*/
-		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3)) rtp->is_scalable = 1;
+		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3)) rtp->is_scalable = GF_TRUE;
 	}
 	if (range) {
 		Start = range->start;
@@ -181,11 +181,11 @@
 	esd->slConfig->timestampResolution = gf_rtp_get_clockrate(ch->rtp_ch);
 	esd->slConfig->useRandomAccessPointFlag = 1;
 	esd->slConfig->useTimestampsFlag = 1;
-	esd->slConfig->no_dts_signaling = ch->depacketizer->sl_map.DTSDeltaLength ? 0 : 1;
+	esd->slConfig->no_dts_signaling = ch->depacketizer->sl_map.DTSDeltaLength ? GF_FALSE : GF_TRUE;
 	esd->ESID = ch->ES_ID;
 	esd->OCRESID = 0;
 	if (ch->mid)
-		esd->has_ref_base = 1;
+		esd->has_ref_base = GF_TRUE;
 
 	esd->decoderConfig->streamType = ch->depacketizer->sl_map.StreamType;
 	esd->decoderConfig->objectTypeIndication = ch->depacketizer->sl_map.ObjectTypeIndication;
@@ -290,16 +290,16 @@
 		if (!rtp->media_type) {
 			od = RP_GetChannelOD(ch, i);
 			if (!od) continue;
-			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, 1);
+			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, GF_TRUE);
 		} else if (rtp->media_type==ch->depacketizer->sl_map.StreamType) {
 			od = RP_GetChannelOD(ch, i);
 			if (!od) continue;
-			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, 1);
+			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, GF_TRUE);
 			rtp->media_type = 0;
 			break;
 		}
 	}
-	gf_service_declare_media(rtp->service, NULL, 0);
+	gf_service_declare_media(rtp->service, NULL, GF_FALSE);
 }
 
 void RP_LoadSDP(RTPClient *rtp, char *sdp_text, u32 sdp_len, RTPStream *stream)
@@ -311,7 +311,7 @@
 	char *iod_str;
 	GF_X_Attribute *att;
 
-	is_isma_1 = 0;
+	is_isma_1 = GF_FALSE;
 	iod_str = NULL;
 	sdp = gf_sdp_info_new();
 	e = gf_sdp_info_parse(sdp, sdp_text, sdp_len);
@@ -326,7 +326,7 @@
 			while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
 				if (!iod_str && !strcmp(att->Name, "mpeg4-iod") ) iod_str = att->Value;
 				if (!is_isma_1 && !strcmp(att->Name, "isma-compliance") ) {
-					if (!stricmp(att->Value, "1,1.0,1")) is_isma_1 = 1;
+					if (!stricmp(att->Value, "1,1.0,1")) is_isma_1 = GF_TRUE;
 				}
 			}
 
@@ -347,13 +347,13 @@
 			}
 			if (!iod_str) {
 				RTPStream *ch;
-				Bool needs_iod = 0;
+				Bool needs_iod = GF_FALSE;
 				i=0;
 				while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
 					if ((ch->depacketizer->payt==GF_RTP_PAYT_MPEG4) && (ch->depacketizer->sl_map.StreamType==GF_STREAM_SCENE)
 //						|| ((ch->depacketizer->payt==GF_RTP_PAYT_3GPP_DIMS) && (ch->depacketizer->sl_map.StreamType==GF_STREAM_SCENE))
 					 ) {
-						needs_iod = 1;
+						needs_iod = GF_TRUE;
 						break;
 					}
 				}
@@ -365,7 +365,7 @@
 			if (iod_str) e = RP_SDPLoadIOD(rtp, iod_str);
 		}
 		/*attach service*/
-		has_iod = rtp->session_desc ? 1 : 0;
+		has_iod = rtp->session_desc ? GF_TRUE : GF_FALSE;
 		gf_service_connect_ack(rtp->service, NULL, e);
 		if (!e && !has_iod && !rtp->media_type) RP_SetupObjects(rtp);
 		rtp->media_type = 0;
@@ -385,7 +385,7 @@
 		char *buf=NULL;
 		gf_sdp_info_write(sdp, &buf);
 		if (buf) {
-			rtp->session_state_data = gf_malloc(sizeof(char) * (strlen("data:application/sdp,") + strlen(buf) + 1) );
+			rtp->session_state_data = (char*)gf_malloc(sizeof(char) * (strlen("data:application/sdp,") + strlen(buf) + 1) );
 			strcpy(rtp->session_state_data, "data:application/sdp,");
 			strcat(rtp->session_state_data, buf);
 			gf_free(buf);
@@ -413,6 +413,8 @@
 		param->data = rtp->session_state_data + strlen("data:application/sdp,");
 		param->size = (u32) strlen(param->data);
 		return;
+	default:
+		return;
 	}
 }
 
@@ -435,7 +437,7 @@
 
 	for (i=0; i<gf_list_count(rtp->channels); i++) {
 		GF_SDPMedia *media = NULL;
-		RTPStream *ch = gf_list_get(rtp->channels, i);
+		RTPStream *ch = (RTPStream*)gf_list_get(rtp->channels, i);
 		if (!ch->control) continue;
 
 		for (j=0; j<gf_list_count(sdp->media_desc); j++) {
@@ -526,7 +528,7 @@
 	sdp_buf = NULL;
 	gf_sdp_info_write(sdp, &sdp_buf);
 	if (sdp_buf) {
-		rtp->session_state_data = gf_malloc(sizeof(char) * (strlen("data:application/sdp,") + strlen(sdp_buf) + 1) );
+		rtp->session_state_data = (char*)gf_malloc(sizeof(char) * (strlen("data:application/sdp,") + strlen(sdp_buf) + 1) );
 		strcpy(rtp->session_state_data, "data:application/sdp,");
 		strcat(rtp->session_state_data, sdp_buf);
 		gf_free(sdp_buf);
@@ -552,11 +554,11 @@
 			gf_service_download_del(rtp->dnload);
 			rtp->dnload = NULL;
 		} else {
-			FILE *f = gf_f64_open(opt, "wt");
+			FILE *f = gf_fopen(opt, "wt");
 			if (f) {
 				sdp_buf = rtp->session_state_data + strlen("data:application/sdp,");
 				gf_fwrite(sdp_buf, 1, strlen(sdp_buf), f);
-				fclose(f);
+				gf_fclose(f);
 			} else {
 				e = GF_IO_ERR;
 			}

v0.5.2.tar.gz/modules/rvc_dec/Makefile -> v0.6.1.tar.gz/modules/rvc_dec/Makefile Changed

v0.5.2.tar.gz/modules/rvc_dec/rvc_dec.c -> v0.6.1.tar.gz/modules/rvc_dec/rvc_dec.c Changed

v0.5.2.tar.gz/modules/saf_in/Makefile -> v0.6.1.tar.gz/modules/saf_in/Makefile Changed

v0.5.2.tar.gz/modules/saf_in/saf_in.c -> v0.6.1.tar.gz/modules/saf_in/saf_in.c Changed

@@ -95,10 +95,10 @@
 {
 	char *sExt;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
-	if (gf_service_check_mime_register(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC, sExt)) return 1;
-	return 0;
+	if (gf_service_check_mime_register(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC, sExt)) return GF_TRUE;
+	return GF_FALSE;
 }
 
 static void SAF_Regulate(SAFIn *read)
@@ -147,7 +147,7 @@
 		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) {
 			if (e<0) {
 				if (read->needs_connection) {
-					read->needs_connection = 0;
+					read->needs_connection = GF_FALSE;
 					gf_service_connect_ack(read->service, NULL, e);
 				}
 				return;
@@ -177,14 +177,14 @@
 	bs = gf_bs_new(read->saf_data, read->saf_size, GF_BITSTREAM_READ);
 	bs_pos = 0;
 
-	go = 1;
+	go = GF_TRUE;
 	while (go) {
 		u64 avail = gf_bs_available(bs);
 		bs_pos = gf_bs_get_position(bs);
 
 		if (avail<10) break;
 
-		is_rap = gf_bs_read_int(bs, 1);
+		is_rap = (Bool)gf_bs_read_int(bs, 1);
 		au_sn = gf_bs_read_int(bs, 15);
 		gf_bs_read_int(bs, 2);
 		cts = gf_bs_read_int(bs, 30);
@@ -194,7 +194,7 @@
 		if (au_size > avail) break;
 		assert(au_size>=2);
 
-		is_rap = 1;
+		is_rap = GF_TRUE;
 
 		type = gf_bs_read_int(bs, 4);
 		stream_id = gf_bs_read_int(bs, 12);
@@ -244,7 +244,7 @@
 
 				if (read->needs_connection && (ch->esd->decoderConfig->streamType==GF_STREAM_SCENE)) {
 					gf_list_add(read->channels, ch);
-					read->needs_connection = 0;
+					read->needs_connection = GF_FALSE;
 					gf_service_connect_ack(read->service, NULL, GF_OK);
 				} else if (read->needs_connection) {
 					gf_odf_desc_del((GF_Descriptor *) ch->esd);
@@ -258,7 +258,7 @@
 					gf_list_add(od->ESDescriptors, ch->esd);
 					ch->esd = NULL;
 					od->objectDescriptorID = ch->stream_id;
-					gf_service_declare_media(read->service, (GF_Descriptor*)od, 0);
+					gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
 
 				}
 			}
@@ -283,7 +283,7 @@
 			if (ch) gf_service_send_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
 			break;
 		case 5:
-			go = 0;
+			go = GF_FALSE;
 			read->run_state = 0;
 			i=0;
 			while ((ch = (SAFChannel *)gf_list_enum(read->channels, &i))) {
@@ -312,7 +312,7 @@
 	par.msg_type = GF_NETIO_DATA_EXCHANGE;
 	par.data = data;
 
-	gf_f64_seek(read->stream, 0, SEEK_SET);
+	gf_fseek(read->stream, 0, SEEK_SET);
 	read->saf_size=0;
 	read->run_state = 1;
 	while (read->run_state && !feof(read->stream) ) {
@@ -330,7 +330,7 @@
 
 	read->dnload = gf_service_download_new(read->service, url, 0, SAF_NetIO, read);
 	if (!read->dnload) {
-		read->needs_connection = 0;
+		read->needs_connection = GF_FALSE;
 		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
@@ -350,7 +350,7 @@
 	u32 nb_streams, i, cts, au_size, au_type, stream_id, ts_res;
 	GF_BitStream *bs;
 	StreamInfo si[1024];
-	gf_f64_seek(read->stream, 0, SEEK_SET);
+	gf_fseek(read->stream, 0, SEEK_SET);
 	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
 
 	nb_streams=0;
@@ -384,7 +384,7 @@
 		gf_bs_skip_bytes(bs, au_size);
 	}
 	gf_bs_del(bs);
-	gf_f64_seek(read->stream, 0, SEEK_SET);
+	gf_fseek(read->stream, 0, SEEK_SET);
 }
 
 static GF_Err SAF_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
@@ -401,7 +401,7 @@
 	ext = strrchr(szURL, '#');
 	if (ext) ext[0] = 0;
 
-	read->needs_connection = 1;
+	read->needs_connection = GF_TRUE;
 	read->duration = 0;
 
 	read->saf_type = SAF_FILE_LOCAL;
@@ -412,7 +412,7 @@
 		return GF_OK;
 	}
 
-	read->stream = gf_f64_open(szURL, "rb");
+	read->stream = gf_fopen(szURL, "rb");
 	if (!read->stream) {
 		gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
 		return GF_OK;
@@ -437,7 +437,7 @@
 		read->th = NULL;
 	}
 
-	if (read->stream) fclose(read->stream);
+	if (read->stream) gf_fclose(read->stream);
 	read->stream = NULL;
 	if (read->dnload) gf_service_download_del(read->dnload);
 	read->dnload = NULL;

v0.5.2.tar.gz/modules/sdl_out/Makefile -> v0.6.1.tar.gz/modules/sdl_out/Makefile Changed

v0.5.2.tar.gz/modules/sdl_out/audio.c -> v0.6.1.tar.gz/modules/sdl_out/audio.c Changed

v0.5.2.tar.gz/modules/sdl_out/sdl_out.c -> v0.6.1.tar.gz/modules/sdl_out/sdl_out.c Changed

v0.5.2.tar.gz/modules/sdl_out/sdl_out.h -> v0.6.1.tar.gz/modules/sdl_out/sdl_out.h Changed

v0.5.2.tar.gz/modules/sdl_out/video.c -> v0.6.1.tar.gz/modules/sdl_out/video.c Changed

@@ -594,14 +594,19 @@
 static void SDLVid_DestroyObjects(SDLVidCtx *ctx)
 {
 #if SDL_VERSION_ATLEAST(2,0,0)
-	if (ctx->back_buffer) SDL_FreeSurface(ctx->back_buffer);
-	ctx->back_buffer = NULL;
-	if (ctx->pool_rgb) SDL_FreeSurface(ctx->pool_rgb);
+
+	if (ctx->pool_rgb) SDL_DestroyTexture(ctx->pool_rgb);
 	ctx->pool_rgb = NULL;
-	if (ctx->pool_rgba) SDL_FreeSurface(ctx->pool_rgba);
+	if (ctx->pool_rgba) SDL_DestroyTexture(ctx->pool_rgba);
 	ctx->pool_rgba = NULL;
-	SDL_DestroyTexture(ctx->yuv_texture);
-	ctx->yuv_texture = NULL;
+	if (ctx->pool_yuv) SDL_DestroyTexture(ctx->pool_yuv);
+	ctx->pool_yuv = NULL;
+
+	if (ctx->tx_back_buffer) SDL_DestroyTexture(ctx->tx_back_buffer);
+	ctx->tx_back_buffer = NULL;
+	if (ctx->back_buffer_pixels) gf_free(ctx->back_buffer_pixels);
+	ctx->back_buffer_pixels = NULL;
+
 #else
 	if (ctx->back_buffer) SDL_FreeSurface(ctx->back_buffer);
 	ctx->back_buffer = NULL;
@@ -686,6 +691,13 @@
 		assert(width);
 		assert(height);
 #if SDL_VERSION_ATLEAST(2,0,0)
+
+#ifdef GPAC_USE_GLES2
+		/* Set the correct attributes for MASK and MAJOR version */
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+#endif
+
 		if (!ctx->screen) {
 			if (!(ctx->screen = SDL_CreateWindow("", 0, 0, width, height, flags))) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
@@ -729,23 +741,36 @@
 		flags = SDL_FULLSCREEN_FLAGS;
 		//SDL readme says it would make us faster
 		SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
-		SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, 1);
 #else
-		flags = SDL_WINDOW_FLAGS;
+		flags = SDL_WINDOW_FLAGS | SDL_WINDOW_RESIZABLE;
+
+		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
+
 #endif
 		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
 
 #if SDL_VERSION_ATLEAST(2,0,0)
- flags |= SDL_WINDOW_RESIZABLE;
- 
+
+#ifdef GPAC_IPHONE
+		//still some issues with render to tager and landscape orientation, we need to reset everything ...
+		if (ctx->enable_defer_mode) {
+			if (ctx->renderer) SDL_DestroyRenderer(ctx->renderer);
+			ctx->renderer=NULL;
+			if (ctx->screen) SDL_DestroyWindow(ctx->screen);
+			ctx->screen=NULL;
+		}
+#endif
+
 		if (!ctx->screen) {
-			if (!(ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags))) {
+			ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags);
+
+			if (!ctx->screen) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
- SDL_RaiseWindow(ctx->screen);
+			SDL_RaiseWindow(ctx->screen);
 		}
 		if ( !ctx->renderer ) {
 			u32 flags = SDL_RENDERER_ACCELERATED;
@@ -760,9 +785,11 @@
 				return GF_IO_ERR;
 			}
 		}
+#ifndef GPAC_IPHONE
 		SDL_SetWindowSize(ctx->screen, width, height);
- SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 255);
- SDL_RenderClear(ctx->renderer);
+#endif
+		SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 255);
+		SDL_RenderClear(ctx->renderer);
 
 #else
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
@@ -790,7 +817,7 @@
 	flags = SDL_WasInit(SDL_INIT_VIDEO);
 	if (!(flags & SDL_INIT_VIDEO)) {
 		if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
-			return 0;
+			return GF_FALSE;
 		}
 	}
 
@@ -805,7 +832,7 @@
 #endif
 
 	ctx->last_mouse_move = SDL_GetTicks();
-	ctx->cursor_on = 1;
+	ctx->cursor_on = GF_TRUE;
 
 	/*save display resolution - SDL seems to get the screen resolution if asked for video info before
 	changing the video mode - to check on other platforms*/
@@ -852,7 +879,7 @@
 		SDLVid_SetCaption();
 #endif
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Video output initialized - screen resolution %d %d\n", dr->max_screen_width, dr->max_screen_height));
-	return 1;
+	return GF_TRUE;
 }
 
 static void SDLVid_ResetWindow(SDLVidCtx *ctx)
@@ -934,7 +961,7 @@
 			memset(&gpac_evt, 0, sizeof(GF_Event));
 			gpac_evt.type = GF_EVENT_QUIT;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
-			return 0;
+			return GF_FALSE;
 
 #ifdef SDL_TEXTINPUTEVENT_TEXT_SIZE
 		/*keyboard*/
@@ -956,9 +983,9 @@
 			sdl_translate_key(sdl_evt.key.keysym.sym, &gpac_evt.key);
 			gpac_evt.type = (sdl_evt.key.type==SDL_KEYDOWN) ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
-			if (gpac_evt.key.key_code==GF_KEY_CONTROL) ctx->ctrl_down = (sdl_evt.key.type==SDL_KEYDOWN) ? 1 : 0;
-			else if (gpac_evt.key.key_code==GF_KEY_ALT) ctx->alt_down = (sdl_evt.key.type==SDL_KEYDOWN) ? 1 : 0;
-			else if (gpac_evt.key.key_code==GF_KEY_META) ctx->meta_down = (sdl_evt.key.type==SDL_KEYDOWN) ? 1 : 0;
+			if (gpac_evt.key.key_code==GF_KEY_CONTROL) ctx->ctrl_down = (sdl_evt.key.type==SDL_KEYDOWN) ? GF_TRUE : GF_FALSE;
+			else if (gpac_evt.key.key_code==GF_KEY_ALT) ctx->alt_down = (sdl_evt.key.type==SDL_KEYDOWN) ? GF_TRUE : GF_FALSE;
+			else if (gpac_evt.key.key_code==GF_KEY_META) ctx->meta_down = (sdl_evt.key.type==SDL_KEYDOWN) ? GF_TRUE : GF_FALSE;
 
 #if (SDL_MAJOR_VERSION>=1) && (SDL_MINOR_VERSION>=3)
 
@@ -1128,9 +1155,9 @@
 	//if (os_handle) SDLVid_SetHack(os_handle, 1);
 
 	ctx->os_handle = os_handle;
-	ctx->is_init = 0;
+	ctx->is_init = GF_FALSE;
 	ctx->output_3d_type = 0;
-	ctx->force_alpha = (init_flags & GF_TERM_WINDOW_TRANSPARENT) ? 1 : 0;
+	ctx->force_alpha = (init_flags & GF_TERM_WINDOW_TRANSPARENT) ? GF_TRUE : GF_FALSE;
 
 	if (!SDLOUT_InitSDL())
 		return GF_IO_ERR;
@@ -1156,7 +1183,7 @@
 	}
 #endif
 
-	ctx->is_init = 1;
+	ctx->is_init = GF_TRUE;
 	return GF_OK;
 }
 
@@ -1182,7 +1209,7 @@
 #endif
 
 	SDLOUT_CloseSDL();
-	ctx->is_init = 0;
+	ctx->is_init = GF_FALSE;
 }
 
 
@@ -1217,8 +1244,8 @@
 #endif
 		Bool switch_res = GF_FALSE;
 		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "SwitchResolution");
-		if (sOpt && !stricmp(sOpt, "yes")) switch_res = 1;
-		if (!dr->max_screen_width || !dr->max_screen_height) switch_res = 1;
+		if (sOpt && !stricmp(sOpt, "yes")) switch_res = GF_TRUE;
+		if (!dr->max_screen_width || !dr->max_screen_height) switch_res = GF_TRUE;
 
 		ctx->store_width = *screen_width;
 		ctx->store_height = *screen_height;
@@ -1283,7 +1310,7 @@
 		SDLVid_ResizeWindow(dr, ctx->store_width, ctx->store_height);
 		*screen_width = ctx->store_width;
 		*screen_height = ctx->store_height;
- }
+	}
 	gf_mx_v(ctx->evt_mx);
 	if (!ctx->screen) return GF_IO_ERR;
 	return GF_OK;
@@ -1294,9 +1321,7 @@
 	const char *opt;
 	SDLVID();
 #if SDL_VERSION_ATLEAST(2,0,0)
-	SDL_DisplayMode disp;
-	s32 bpp;
-	u32 Rmask, Gmask, Bmask, Amask;
+
 #else
 	u32 col;
 #endif
@@ -1305,38 +1330,44 @@
 
 	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HardwareMemory");
 	if (system_mem) {
-		if (opt && !strcmp(opt, "Always")) system_mem = 0;
+		if (opt && !strcmp(opt, "Always")) system_mem = GF_FALSE;
 	} else {
-		if (opt && !strcmp(opt, "Never")) system_mem = 1;
+		if (opt && !strcmp(opt, "Never")) system_mem = GF_TRUE;
 	}
 	ctx->use_systems_memory = system_mem;
 
 
 	/*clear screen*/
 #if SDL_VERSION_ATLEAST(2,0,0)
+
+
+	if (ctx->tx_back_buffer) SDL_DestroyTexture(ctx->tx_back_buffer);
+	if (ctx->back_buffer_pixels) gf_free(ctx->back_buffer_pixels);
+
+	ctx->tx_back_buffer = SDL_CreateTexture(ctx->renderer, SDL_PIXELFORMAT_RGB24, SDL_TEXTUREACCESS_STREAMING, newWidth, newHeight);
+	ctx->back_buffer_pixels = gf_malloc(sizeof(char)*3*newWidth*newHeight);
+
+
 	SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 255);
 	SDL_RenderClear(ctx->renderer);
 	SDL_RenderPresent(ctx->renderer);
+
 #else
 	col = SDL_MapRGB(ctx->screen->format, 0, 0, 0);
 	SDL_FillRect(ctx->screen, NULL, col);
 	SDL_Flip(ctx->screen);
-#endif
 
 	if (ctx->back_buffer && ((u32) ctx->back_buffer->w==newWidth) && ((u32) ctx->back_buffer->h==newHeight)) {
 		return GF_OK;
 	}
 	if (ctx->back_buffer) SDL_FreeSurface(ctx->back_buffer);
-#if SDL_VERSION_ATLEAST(2,0,0)
-	SDL_GetWindowDisplayMode(ctx->screen, &disp);
-	SDL_PixelFormatEnumToMasks(disp.format, &bpp, &Rmask, &Gmask, &Bmask, &Amask);
-	ctx->back_buffer = SDL_CreateRGBSurface(0, newWidth, newHeight, bpp, Rmask, Gmask, Bmask, 0);
-#else
+
 	ctx->back_buffer = SDL_CreateRGBSurface(ctx->use_systems_memory ? SDL_SWSURFACE : SDL_HWSURFACE, newWidth, newHeight, ctx->screen->format->BitsPerPixel, ctx->screen->format->Rmask, ctx->screen->format->Gmask, ctx->screen->format->Bmask, 0);
+
+	if (!ctx->back_buffer) return GF_IO_ERR;
 #endif
 	ctx->width = newWidth;
 	ctx->height = newHeight;
-	if (!ctx->back_buffer) return GF_IO_ERR;
 
 	return GF_OK;
 }
@@ -1363,9 +1394,36 @@
 	}
 }
 
+#if SDL_VERSION_ATLEAST(2,0,0)
 static GF_Err SDLVid_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *video_info, Bool do_lock)
 {
 	SDLVID();
+
+	if (do_lock) {
+		memset(video_info, 0, sizeof(GF_VideoSurface));
+		video_info->width = ctx->width;
+		video_info->height = ctx->height;
+		video_info->pitch_x = 0;
+		video_info->pitch_y = ctx->width*3;
+		video_info->video_buffer = ctx->back_buffer_pixels;
+		video_info->pixel_format = GF_PIXEL_RGB_24;
+		video_info->is_hardware_memory = 0;
+		if (ctx->needs_bb_grab) {
+			SDL_RenderReadPixels(ctx->renderer, NULL, SDL_PIXELFORMAT_RGB24, video_info->video_buffer, video_info->pitch_y);
+			ctx->needs_bb_grab = 0;
+		}
+	} else {
+		SDL_UpdateTexture(ctx->tx_back_buffer, NULL, video_info->video_buffer, video_info->pitch_y);
+		SDL_RenderCopy(ctx->renderer, ctx->tx_back_buffer, NULL, NULL);
+	}
+	return GF_OK;
+}
+
+#else
+static GF_Err SDLVid_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *video_info, Bool do_lock)
+{
+	SDLVID();
+
 	if (!ctx->back_buffer) return GF_BAD_PARAM;
 	if (do_lock) {
 		if (!video_info) return GF_BAD_PARAM;
@@ -1383,10 +1441,13 @@
 	}
 	return GF_OK;
 }
+#endif
+
+
+#if SDL_VERSION_ATLEAST(2,0,0)
 
 static GF_Err SDLVid_Flush(GF_VideoOutput *dr, GF_Window *dest)
 {
-	SDL_Rect rc;
 	SDLVID();
 	/*if resizing don't process otherwise we may deadlock*/
 	if (!ctx->screen) return GF_OK;
@@ -1394,20 +1455,49 @@
 	//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Flush\n"));
 
 	if (ctx->output_3d_type==1) {
-#if SDL_VERSION_ATLEAST(2,0,0)
 		SDL_GL_SwapWindow(ctx->screen);
+		return GF_OK;
+	}
+
+	if (ctx->enable_defer_mode) {
+		if (ctx->needs_bb_flush) {
+			SDL_UpdateTexture(ctx->tx_back_buffer, NULL, ctx->back_buffer_pixels, 3*ctx->width);
+			SDL_RenderCopy(ctx->renderer, ctx->tx_back_buffer, NULL, NULL);
+		}
+		SDL_RenderReadPixels(ctx->renderer, NULL, SDL_PIXELFORMAT_RGB24, ctx->back_buffer_pixels, 3*ctx->width);
+		ctx->needs_bb_grab = 0;
+		ctx->needs_bb_flush = 0;
+		SDL_RenderPresent(ctx->renderer);
+		//push back texture after SDL flip
+		SDL_RenderCopy(ctx->renderer, ctx->tx_back_buffer, NULL, NULL);
+	} else {
+		ctx->needs_clear = 1;
+		SDL_RenderPresent(ctx->renderer);
+	}
+
+
+	return GF_OK;
+}
+
 #else
+
+static GF_Err SDLVid_Flush(GF_VideoOutput *dr, GF_Window *dest)
+{
+	SDL_Rect rc;
+	SDLVID();
+	/*if resizing don't process otherwise we may deadlock*/
+	if (!ctx->screen) return GF_OK;
+
+	//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Flush\n"));
+
+	if (ctx->output_3d_type==1) {
 		SDL_GL_SwapBuffers();
-#endif
 		return GF_OK;
 	}
 	if (!ctx->back_buffer) return GF_BAD_PARAM;
 
 	if ((dest->w != (u32) ctx->back_buffer->w) || (dest->h != (u32) ctx->back_buffer->h)) {
 		GF_VideoSurface src, dst;
-#if SDL_VERSION_ATLEAST(2,0,0)
-		SDL_Surface* wndSurface;
-#endif
 
 		SDL_LockSurface(ctx->back_buffer);
 		memset(&src, 0, sizeof(GF_VideoSurface));
@@ -1418,64 +1508,33 @@
 		src.pixel_format = SDLVid_MapPixelFormat(ctx->back_buffer->format, ctx->force_alpha);
 		src.video_buffer = (char*)ctx->back_buffer->pixels;
 
-#if SDL_VERSION_ATLEAST(2,0,0)
-		wndSurface = SDL_GetWindowSurface(ctx->screen);
-		SDL_LockSurface(wndSurface);
-		memset(&dst, 0, sizeof(GF_VideoSurface));
-		dst.height = wndSurface->h;
-		dst.width = wndSurface->w;
-		dst.pitch_x = 0;
-		dst.pitch_y = wndSurface->pitch;
-		dst.pixel_format = SDLVid_MapPixelFormat(wndSurface->format, GF_FALSE);
-		dst.video_buffer = (char*)wndSurface->pixels;
-#else
 		SDL_LockSurface(ctx->screen);
 		dst.height = ctx->screen->h;
 		dst.width = ctx->screen->w;
 		dst.pitch_x = 0;
 		dst.pitch_y = ctx->screen->pitch;
-		dst.pixel_format = SDLVid_MapPixelFormat(ctx->screen->format, 0);
-		dst.video_buffer = ctx->screen->pixels;
-#endif
+		dst.pixel_format = SDLVid_MapPixelFormat(ctx->screen->format, GF_FALSE);
+		dst.video_buffer = (char*)ctx->screen->pixels;
 
-		gf_stretch_bits(&dst, &src, dest, NULL, 0xFF, 0, NULL, NULL);
-#if SDL_VERSION_ATLEAST(2,0,0)
-		SDL_UnlockSurface(wndSurface);
-#else
+		gf_stretch_bits(&dst, &src, dest, NULL, 0xFF, GF_FALSE, NULL, NULL);
 		SDL_UnlockSurface(ctx->screen);
-#endif
 		SDL_UnlockSurface(ctx->back_buffer);
 
 	} else {
-#if SDL_VERSION_ATLEAST(2,0,0)
-		SDL_Texture* tx;
-#endif
 		rc.x = dest->x;
 		rc.y = dest->y;
 		rc.w = dest->w;
 		rc.h = dest->h;
-#if SDL_VERSION_ATLEAST(2,0,0)
-		SDL_ClearError();
-		if (!(tx = SDL_CreateTextureFromSurface(ctx->renderer, ctx->back_buffer))) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("SDL_GetWindowSurface failed: %s\n", SDL_GetError()));
-			SDL_ClearError();
-		}
-		SDL_RenderCopy(ctx->renderer, tx, NULL, &rc);
-		SDL_DestroyTexture(tx);
-#else
 		SDL_BlitSurface(ctx->back_buffer, NULL, ctx->screen, &rc);
-#endif
 	}
-#if SDL_VERSION_ATLEAST(2,0,0)
-	SDL_RenderPresent(ctx->renderer);
-#else
 	SDL_Flip(ctx->screen);
-#endif
 	return GF_OK;
 }
+#endif
 
 static void SDLVid_SetCursor(GF_VideoOutput *dr, u32 cursor_type)
 {
+#ifndef GPAC_IPHONE
 	SDLVID();
 	switch (cursor_type) {
 	case GF_CURSOR_ANCHOR:
@@ -1492,6 +1551,7 @@
 		SDL_SetCursor(ctx->curs_def);
 		break;
 	}
+#endif
 }
 
 
@@ -1530,7 +1590,9 @@
 	}
 	switch (evt->type) {
 	case GF_EVENT_SET_CURSOR:
+#ifndef GPAC_IPHONE
 		SDLVid_SetCursor(dr, evt->cursor.cursor_type);
+#endif
 		break;
 	case GF_EVENT_SET_CAPTION:
 #ifdef SDL_WINDOW_THREAD
@@ -1557,17 +1619,19 @@
 	case GF_EVENT_SIZE:
 	{
 		SDLVID();
+#ifdef GPAC_IPHONE
 		if (ctx->fullscreen) {
-			//ctx->store_width = evt->size.width;
-			//ctx->store_height = evt->size.height;
 		} else {
-#ifdef GPAC_IPHONE
-// SDLVid_ResizeWindow(dr, dr->max_screen_width, dr->max_screen_height);
 			SDLVid_ResizeWindow(dr, evt->size.width, evt->size.height);
+		}
 #else
+		if (ctx->fullscreen) {
+			//ctx->store_width = evt->size.width;
+			//ctx->store_height = evt->size.height;
+		} else {
 			SDLVid_ResizeWindow(dr, evt->size.width, evt->size.height);
-#endif
 		}
+#endif
 	}
 	break;
 	case GF_EVENT_MOVE:
@@ -1668,6 +1732,20 @@
 #else
 		return GF_NOT_SUPPORTED;
 #endif
+
+	case GF_EVENT_TEXT_EDITING_START:
+	case GF_EVENT_TEXT_EDITING_END:
+#if defined(GPAC_IPHONE) && SDL_VERSION_ATLEAST(2,0,0)
+		if (evt->type==GF_EVENT_TEXT_EDITING_START) {
+			SDL_StartTextInput();
+		} else {
+			SDL_StopTextInput();
+		}
+		return GF_OK;
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+
 	}
 	return GF_OK;
 }
@@ -1785,51 +1863,107 @@
 	}
 }
 
+#if SDL_VERSION_ATLEAST(2,0,0)
 static GF_Err SDL_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
 {
 	SDLVID();
-	u32 amask = 0;
-	u32 bpp;
-#if SDL_VERSION_ATLEAST(2,0,0)
-#else
-	u32 i;
-	u8 *dst, *src;
-#endif
+	Bool need_copy=0;
+	u32 format;
+	s32 acc, w, h;
+	int res;
+	Bool set_blend=0;
 	SDL_Rect dstrc;
-	SDL_Surface **pool;
+	SDL_Texture **pool;
+	SDL_Rect srcrc, *src_ptr=NULL;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] Bliting surface (overlay type %d)\n", overlay_type));
 
-	if (overlay_type) {
-#if SDL_VERSION_ATLEAST(2,0,0)
-		u8* pixels;
-		int pitch;
-		u32 format;
-		s32 acc, w, h;
-		u8 *pY, *pU, *pV;
-		if (!video_src) {
-			if (ctx->yuv_texture) {
-				SDL_DestroyTexture(ctx->yuv_texture);
-				ctx->yuv_texture=NULL;
-			}
-			return GF_OK;
+	if (ctx->needs_bb_flush) {
+		SDL_UpdateTexture(ctx->tx_back_buffer, NULL, ctx->back_buffer_pixels, 3*ctx->width);
+		SDL_RenderCopy(ctx->renderer, ctx->tx_back_buffer, NULL, NULL);
+		ctx->needs_bb_grab = 1;
+	}
+
+	ctx->needs_bb_grab = 1;
+	if (ctx->needs_clear) {
+		SDL_RenderClear(ctx->renderer);
+		ctx->needs_clear = 0;
+	}
+
+	dstrc.w = dst_wnd->w;
+	dstrc.h = dst_wnd->h;
+	dstrc.x = dst_wnd->x;
+	dstrc.y = dst_wnd->y;
+
+	if (src_wnd) {
+		srcrc.x = src_wnd->x;
+		srcrc.y = src_wnd->y;
+		srcrc.w = src_wnd->w;
+		srcrc.h = src_wnd->h;
+		src_ptr = &srcrc;
+	}
+
+	//this is a clear (not very elegant ...)
+	if ((video_src->width<=2) && (video_src->height<=2)) {
+		u8 *pix =(u8 *) video_src->video_buffer;
+		if (video_src->pixel_format == GF_PIXEL_RGB_24) {
+			SDL_SetRenderDrawColor(ctx->renderer, pix[0], pix[1], pix[2], 0xFF);
+		} else {
+			SDL_SetRenderDrawColor(ctx->renderer, pix[0], pix[1], pix[2], pix[3]);
 		}
-		if (ctx->yuv_texture ) {
-			SDL_QueryTexture(ctx->yuv_texture, &format, &acc, &w, &h);
-			if ((w != src_wnd->w) || (h != src_wnd->h) ) {
-				SDL_DestroyTexture(ctx->yuv_texture);
-				ctx->yuv_texture = NULL;
-			}
+		res = SDL_RenderFillRect(ctx->renderer, &dstrc);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL2] Clear error: %s\n", SDL_GetError()));
+			return GF_IO_ERR;
 		}
-		if (! ctx->yuv_texture ) {
-			ctx->yuv_texture = SDL_CreateTexture(ctx->renderer, SDL_PIXELFORMAT_YV12, SDL_TEXTUREACCESS_STREAMING, src_wnd->w, src_wnd->h);
-			if (!ctx->yuv_texture) return GF_NOT_SUPPORTED;
+		return GF_OK;
+	}
+
+	switch (video_src->pixel_format) {
+	case GF_PIXEL_RGB_24:
+		pool = &ctx->pool_rgb;
+		format=SDL_PIXELFORMAT_RGB24;
+		break;
+	case GF_PIXEL_RGBA:
+		pool = &ctx->pool_rgba;
+		format=SDL_PIXELFORMAT_ABGR8888;
+		set_blend=1;
+		break;
+	case GF_PIXEL_YV12:
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_YV12;
+		format=SDL_PIXELFORMAT_IYUV;
+		break;
+	case GF_PIXEL_YV12_10:
+		need_copy=1;
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_YV12;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+
+	if (*pool ) {
+		SDL_QueryTexture(*pool, &format, &acc, &w, &h);
+		if ((w != video_src->width) || (h != video_src->height) ) {
+			SDL_DestroyTexture(*pool);
+			*pool = NULL;
 		}
+	}
+	if (!(*pool)) {
+		(*pool) = SDL_CreateTexture(ctx->renderer, format, SDL_TEXTUREACCESS_STREAMING, video_src->width, video_src->height);
+		if (!(*pool)) return GF_NOT_SUPPORTED;
+	}
 
-		SDL_QueryTexture(ctx->yuv_texture, &format, &acc, &w, &h);
+	SDL_QueryTexture((*pool), &format, &acc, &w, &h);
 
+	if (need_copy) {
+		u8* pixels;
+		int pitch;
+		u8 *pY, *pU, *pV;
 		/*copy pixels*/
-		if (SDL_LockTexture(ctx->yuv_texture, NULL, (void**)&pixels, &pitch) < 0) {
+		if (SDL_LockTexture(*pool, NULL, (void**)&pixels, &pitch) < 0) {
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -1838,19 +1972,53 @@
 		pV = pixels + 5*h*pitch/4;
 		copy_yuv(pY, pU, pV, GF_PIXEL_YV12, pitch, (unsigned char *) video_src->video_buffer, (unsigned char *) video_src->u_ptr, (unsigned char *) video_src->v_ptr, video_src->pitch_y, video_src->pixel_format, video_src->width, video_src->height, src_wnd);
 
-		SDL_UnlockTexture(ctx->yuv_texture);
+		SDL_UnlockTexture(*pool);
+	} else {
+		SDL_UpdateTexture(*pool, NULL, video_src->video_buffer, video_src->pitch_y);
+	}
 
-		dstrc.w = dst_wnd->w;
-		dstrc.h = dst_wnd->h;
-		dstrc.x = dst_wnd->x;
-		dstrc.y = dst_wnd->y;
+	if (set_blend || (video_src->global_alpha!=0xFF)) {
+		res = SDL_SetTextureBlendMode(*pool, SDL_BLENDMODE_BLEND);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL2] Cannot change texture blend mode: %s\n", SDL_GetError()));
+			return GF_IO_ERR;
+		}
+		res = SDL_SetTextureAlphaMod(*pool, video_src->global_alpha);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL2] Cannot change global alpha of texture: %s\n", SDL_GetError()));
+			return GF_IO_ERR;
+		}
+	} else {
+		res = SDL_SetTextureBlendMode(*pool, SDL_BLENDMODE_NONE);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL2] Cannot change texture blend mode: %s\n", SDL_GetError()));
+			return GF_IO_ERR;
+		}
+	}
 
-		SDL_ClearError();
-		SDL_RenderCopy(ctx->renderer, ctx->yuv_texture, NULL, &dstrc);
-		SDL_RenderPresent(ctx->renderer);
-		return GF_OK;
+	res = SDL_RenderCopy(ctx->renderer, *pool, src_ptr, &dstrc);
+	if (res<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL2] Blit error: %s\n", SDL_GetError()));
+		return GF_IO_ERR;
+	}
+	return GF_OK;
+}
 
 #else
+static GF_Err SDL_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+{
+	SDLVID();
+	u32 amask = 0;
+	u32 bpp;
+	GF_Err e = GF_OK;
+	u32 i;
+	u8 *dst, *src;
+	SDL_Rect dstrc;
+	SDL_Surface **pool;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] Bliting surface (overlay type %d)\n", overlay_type));
+
+	if (overlay_type) {
 		if (!video_src) {
 			if (ctx->yuv_overlay) {
 				SDL_FreeYUVOverlay(ctx->yuv_overlay);
@@ -1879,7 +2047,6 @@
 		dstrc.y = dst_wnd->y;
 		SDL_DisplayYUVOverlay(ctx->yuv_overlay, &dstrc);
 		return GF_OK;
-#endif
 	}
 
 	/*SDL doesn't support stretching ...*/
@@ -1903,28 +2070,6 @@
 	default:
 		return GF_NOT_SUPPORTED;
 	}
-#if SDL_VERSION_ATLEAST(2,0,0)
-	if ((*pool)) SDL_FreeSurface((*pool));
-	(*pool) = SDL_CreateRGBSurfaceFrom(video_src->video_buffer + video_src->pitch_y*src_wnd->y + src_wnd->x*bpp,
-	 src_wnd->w, src_wnd->h, 8*bpp, video_src->pitch_y,
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-	 0xFF000000, 0x00FF0000, 0x0000FF00, amask);
-#else
-	 0x000000FF, 0x0000FF00, 0x00FF0000, amask);
-#endif
-	dstrc.w = dst_wnd->w;
-	dstrc.h = dst_wnd->h;
-	dstrc.x = dst_wnd->x;
-	dstrc.y = dst_wnd->y;
-
-	if (SDL_BlitSurface(*pool, NULL, ctx->back_buffer, &dstrc))
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
-
-
-	SDL_FreeSurface((*pool));
-	*pool = NULL;
-
-#else
 	if (! *pool || ((*pool)->w < (int) src_wnd->w) || ((*pool)->h < (int) src_wnd->h) ) {
 		if ((*pool)) SDL_FreeSurface((*pool));
 
@@ -1953,16 +2098,17 @@
 
 	if (SDL_BlitSurface(*pool, NULL, ctx->back_buffer, &dstrc))
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
-#endif
 
-
-	return GF_OK;
+	return e;
 }
 
-
+#endif
 
 void *SDL_NewVideo()
 {
+#if SDL_VERSION_ATLEAST(2,0,0)
+	const char *opt;
+#endif
 	SDLVidCtx *ctx;
 	GF_VideoOutput *driv;
 
@@ -1977,6 +2123,7 @@
 #endif
 	ctx->evt_mx = gf_mx_new("SDLEvents");
 
+
 	driv->opaque = ctx;
 	driv->Setup = SDLVid_Setup;
 	driv->Shutdown = SDLVid_Shutdown;
@@ -1987,27 +2134,29 @@
 	driv->hw_caps |= GF_VIDEO_HW_OPENGL;
 
 	/*no YUV hardware blitting in SDL (only overlays)*/
-	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA;;
-	driv->Blit = SDL_Blit;
-	driv->LockBackBuffer = SDLVid_LockBackBuffer;
-	driv->LockOSContext = NULL;
+	driv->hw_caps |= GF_VIDEO_HW_HAS_RGB ;
 
+#if SDL_VERSION_ATLEAST(2,0,0)
 
-	/*color keying with overlays are not supported in SDL ...*/
-#if 0
-	/*get YUV overlay key*/
-	opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "OverlayColorKey");
-	/*no set is the default*/
-	if (!opt) {
-		opt = "0101FE";
-		gf_modules_set_option((GF_BaseInterface *)driv, "Video", "OverlayColorKey", "0101FE");
-	}
-	sscanf(opt, "%06x", &driv->overlay_color_key);
-	if (driv->overlay_color_key) driv->overlay_color_key |= 0xFF000000;
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL Out] YUV Overlays enabled - ColorKey enabled: %s (key %x)\n",
-	 driv->overlay_color_key ? "Yes" : "No", driv->overlay_color_key
-	 ));
+	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_STRETCH | GF_VIDEO_HW_HAS_RGBA;
+
+
+	opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "SDL_DeferMode");
+	ctx->enable_defer_mode = 0;
+	if (opt && !strcmp(opt, "yes"))
+		ctx->enable_defer_mode = 1;
+
+	if (! ctx->enable_defer_mode)
+		driv->hw_caps |= GF_VIDEO_HW_DIRECT_ONLY;
+#else
+	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY;
 #endif
+
+
+
+	driv->Blit = SDL_Blit;
+	driv->LockBackBuffer = SDLVid_LockBackBuffer;
+	driv->LockOSContext = NULL;
 #ifndef SDL_TEXTINPUTEVENT_TEXT_SIZE
 	SDL_EnableUNICODE(1);
 #else

v0.5.2.tar.gz/modules/soft_raster/Makefile -> v0.6.1.tar.gz/modules/soft_raster/Makefile Changed

v0.5.2.tar.gz/modules/soft_raster/ftgrays.c -> v0.6.1.tar.gz/modules/soft_raster/ftgrays.c Changed

v0.5.2.tar.gz/modules/soft_raster/raster_argb.c -> v0.6.1.tar.gz/modules/soft_raster/raster_argb.c Changed

@@ -196,10 +196,10 @@
 	sx = rc.x;
 	sy = rc.y;
 
-	use_memset = 0;
-	if (_this->pitch_x !=4) use_memset = 0;
-	else if (!col_a) use_memset = 1;
-	else if ((col_a==col_r) && (col_a==col_g) && (col_a==col_b)) use_memset = 1;
+	use_memset = GF_FALSE;
+	if (_this->pitch_x !=4) use_memset = GF_FALSE;
+	else if (!col_a) use_memset = GF_TRUE;
+	else if ((col_a==col_r) && (col_a==col_g) && (col_a==col_b)) use_memset = GF_TRUE;
 
 	if (!use_memset) {
 		for (y = 0; y < h; y++) {
@@ -690,15 +690,22 @@
 	w = rc.width;
 	sy = rc.y;
 
+	if (sy+h > _this->height) {
+		h = _this->height - sy;
+	}
+	if (rc.x + w > _this->width) {
+		w = _this->width - rc.x;
+	}
+
 	a = GF_COL_A(col);
 	r = GF_COL_R(col);
 	g = GF_COL_G(col);
 	b = GF_COL_B(col);
 
-	use_memset = 0;
-	if (_this->pitch_x !=4) use_memset = 0;
-	else if (!a) use_memset = 1;
-	else if ((a==r) && (a==g) && (a==b)) use_memset = 1;
+	use_memset = GF_FALSE;
+	if (_this->pitch_x !=4) use_memset = GF_FALSE;
+	else if (!a) use_memset = GF_TRUE;
+	else if ((a==r) && (a==g) && (a==b)) use_memset = GF_TRUE;
 
 
 	if (!use_memset) {

v0.5.2.tar.gz/modules/soft_raster/stencil.c -> v0.6.1.tar.gz/modules/soft_raster/stencil.c Changed

@@ -233,8 +233,8 @@
 	u32 *data = surf->stencil_pix_run;
 	EVG_LinearGradient *_this = (EVG_LinearGradient *) p;
 
-	has_cmat = _this->cmat.identity ? 0 : 1;
-	has_a = (_this->alpha==0xFF) ? 0 : 1;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
+	has_a = (_this->alpha==0xFF) ? GF_FALSE : GF_TRUE;
 
 	/*no need to move x & y to fixed*/
 	_res = (Fixed) (x * _this->smat.m[0] + y * _this->smat.m[1] + _this->smat.m[2]);
@@ -319,8 +319,8 @@
 	y = INT2FIX(_y);
 	gf_mx2d_apply_coords(&_this->smat, &x, &y);
 
-	has_cmat = _this->cmat.identity ? 0 : 1;
-	has_a = (_this->alpha==0xFF) ? 0 : 1;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
+	has_a = (_this->alpha==0xFF) ? GF_FALSE : GF_TRUE;
 
 	dx = x - _this->d_f.x;
 	dy = y - _this->d_f.y;
@@ -529,9 +529,9 @@
 	while (y<0) y += _fd;
 
 	y0 = (s32) FIX2INT(y);
-	has_alpha = (_this->alpha != 255) ? 1 : 0;
-	has_replace_cmat = _this->cmat_is_replace ? 1 : 0;
-	has_cmat = _this->cmat.identity ? 0 : 1;
+	has_alpha = (_this->alpha != 255) ? GF_TRUE : GF_FALSE;
+	has_replace_cmat = _this->cmat_is_replace ? GF_TRUE : GF_FALSE;
+	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
 	replace_col = _this->replace_col;
 
 	while (count) {
@@ -629,7 +629,7 @@
 	s32 x0, y0;
 	u32 pix;
 	u32 __a;
-	Bool repeat_s = 0;
+	Bool repeat_s = GF_FALSE;
 	Fixed x, y, _fdim;
 	char *pix_line;
 	u32 *data = surf->stencil_pix_run;
@@ -696,13 +696,13 @@
 	_this->inc_y = p1.y - p0.y;
 
 	_this->replace_col = 0;
-	_this->cmat_is_replace = 0;
+	_this->cmat_is_replace = GF_FALSE;
 	if (!_this->cmat.identity
 	 && !_this->cmat.m[0] && !_this->cmat.m[1] && !_this->cmat.m[2] && !_this->cmat.m[3]
 	 && !_this->cmat.m[5] && !_this->cmat.m[6] && !_this->cmat.m[7] && !_this->cmat.m[8]
 	 && !_this->cmat.m[10] && !_this->cmat.m[11] && !_this->cmat.m[12] && !_this->cmat.m[13]
 	 && !_this->cmat.m[15] && !_this->cmat.m[16] && !_this->cmat.m[17] && !_this->cmat.m[19]) {
-		_this->cmat_is_replace = 1;
+		_this->cmat_is_replace = GF_TRUE;
 		_this->replace_col = GF_COL_ARGB(FIX2INT(_this->cmat.m[18]*255), FIX2INT(_this->cmat.m[4]*255), FIX2INT(_this->cmat.m[9]*255), FIX2INT(_this->cmat.m[14]*255));
 	}
 
@@ -809,7 +809,7 @@
 		return GF_BAD_PARAM;
 
 	_this->pixels = 0L;
-	_this->is_converted = 1;
+	_this->is_converted = GF_TRUE;
 
 	switch (pixelFormat) {
 	case GF_PIXEL_ARGB:
@@ -836,13 +836,13 @@
 		_this->orig_format = GF_PIXEL_YV12;
 		_this->orig_buf = (u8 *) pixels;
 		_this->orig_stride = stride;
-		_this->is_converted = 0;
+		_this->is_converted = GF_FALSE;
 		break;
 	case GF_PIXEL_YUVA:
 		_this->orig_format = GF_PIXEL_YUVA;
 		_this->orig_buf = (u8 *) pixels;
 		_this->orig_stride = stride;
-		_this->is_converted = 0;
+		_this->is_converted = GF_FALSE;
 		break;
 	default:
 		/*the rest is not supported (eg BGR32)*/
@@ -934,9 +934,9 @@
 	dst.pixel_format = _this->pixel_format;
 	dst.video_buffer = (char *) _this->conv_buf;
 
-	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, 0, NULL, NULL);
+	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, GF_FALSE, NULL, NULL);
 
-	_this->is_converted = 1;
+	_this->is_converted = GF_TRUE;
 	_this->pixels = (char *) _this->conv_buf;
 	_this->stride = _this->Bpp * _this->width;
 	texture_set_callback(_this);
@@ -947,7 +947,7 @@
 	EVG_Texture *_this = 	(EVG_Texture *)st;
 	if (_this->orig_buf) return GF_BAD_PARAM;
 	_this->pixels = 0L;
-	_this->is_converted = 1;
+	_this->is_converted = GF_TRUE;
 
 	switch (pixelFormat) {
 	case GF_PIXEL_ARGB:
@@ -979,7 +979,7 @@
 	if (_this->pixels) gf_free(_this->pixels);
 	_this->pixels = (char *) gf_malloc(sizeof(char) * _this->stride * _this->height);
 	memset(_this->pixels, 0, sizeof(char) * _this->stride * _this->height);
-	_this->owns_texture = 1;
+	_this->owns_texture = GF_TRUE;
 	texture_set_callback(_this);
 	return GF_OK;
 }

v0.5.2.tar.gz/modules/soft_raster/surface.c -> v0.6.1.tar.gz/modules/soft_raster/surface.c Changed

@@ -341,19 +341,19 @@
 static Bool setup_grey_callback(EVGSurface *surf)
 {
 	u32 col, a;
-	Bool use_const = 1;
+	Bool use_const = GF_TRUE;
 
 	if (surf->sten->type == GF_STENCIL_SOLID) {
 		col = surf->fill_col = ((EVG_Brush *)surf->sten)->color;
 		a = GF_COL_A(surf->fill_col);
 	} else {
 		col = a = 0;
-		use_const = 0;
+		use_const = GF_FALSE;
 	}
 
 	if (surf->raster_cbk) {
 		if (use_const) {
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_user_fill_const_a;
 			} else {
@@ -362,13 +362,13 @@
 		} else {
 			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_user_fill_var;
 		}
-		return 1;
+		return GF_TRUE;
 	}
 
 	switch (surf->pixelFormat) {
 	case GF_PIXEL_ARGB:
 		if (use_const) {
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgra_fill_const_a;
 			} else {
@@ -395,7 +395,7 @@
 
 	case GF_PIXEL_RGB_32:
 		if (use_const) {
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgrx_fill_const_a;
 			} else {
@@ -408,7 +408,7 @@
 
 	case GF_PIXEL_BGR_32:
 		if (use_const) {
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const_a;
 			} else {
@@ -421,7 +421,7 @@
 
 	case GF_PIXEL_RGB_24:
 		if (use_const) {
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const_a;
 			} else {
@@ -433,7 +433,7 @@
 		break;
 	case GF_PIXEL_BGR_24:
 		if (use_const) {
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgr_fill_const_a;
 			} else {
@@ -446,7 +446,7 @@
 	case GF_PIXEL_RGB_565:
 		if (use_const) {
 			surf->fill_565 = GF_COL_TO_565(col);
-			if (!a) return 0;
+			if (!a) return GF_FALSE;
 			if (a!=0xFF) {
 				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const_a;
 			} else {
@@ -487,7 +487,7 @@
 		break;
 #endif
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -571,7 +571,7 @@
 
 	get_surface_world_matrix(surf, &mat);
 
-	restore_filter = 0;
+	restore_filter = GF_FALSE;
 	/*get path frame for texture convertion */
 	if (sten->type != GF_STENCIL_SOLID) {
 		rc = surf->path_bounds;
@@ -599,7 +599,7 @@
 			gf_mx2d_inverse(&sten->smat);
 			evg_bmp_init(sten);
 			if (((EVG_Texture *)sten)->filter == GF_TEXTURE_FILTER_DEFAULT) {
-				restore_filter = 1;
+				restore_filter = GF_TRUE;
 				((EVG_Texture *)sten)->filter = surf->texture_filter;
 			}

v0.5.2.tar.gz/modules/svg_in/Makefile -> v0.6.1.tar.gz/modules/svg_in/Makefile Changed

v0.5.2.tar.gz/modules/svg_in/svg_in.c -> v0.6.1.tar.gz/modules/svg_in/svg_in.c Changed

@@ -48,13 +48,13 @@
 static Bool svg_check_download(SVGIn *svgin)
 {
 	u64 size;
-	FILE *f = gf_f64_open(svgin->file_name, "rb");
-	if (!f) return 0;
-	gf_f64_seek(f, 0, SEEK_END);
-	size = gf_f64_tell(f);
-	fclose(f);
-	if (size==svgin->file_size) return 1;
-	return 0;
+	FILE *f = gf_fopen(svgin->file_name, "rb");
+	if (!f) return GF_FALSE;
+	gf_fseek(f, 0, SEEK_END);
+	size = gf_ftell(f);
+	gf_fclose(f);
+	if (size==svgin->file_size) return GF_TRUE;
+	return GF_FALSE;
 }
 
 #define SVG_PROGRESSIVE_BUFFER_SIZE		4096
@@ -83,7 +83,7 @@
 				break;
 			}
 			svg_data[d_stream.total_out - done] = 0;
-			e = gf_sm_load_string(&svgin->loader, svg_data, 0);
+			e = gf_sm_load_string(&svgin->loader, svg_data, GF_FALSE);
 			if (e || (err== Z_STREAM_END)) break;
 			done = (u32) d_stream.total_out;
 			d_stream.avail_out = 2048;
@@ -158,7 +158,7 @@
 
 				file_buf[nb_read] = file_buf[nb_read+1] = 0;
 
-				e = gf_sm_load_string(&svgin->loader, file_buf, 0);
+				e = gf_sm_load_string(&svgin->loader, file_buf, GF_FALSE);
 				svgin->file_pos += nb_read;
 
 
@@ -178,7 +178,7 @@
 
 	/*!OTI for streaming SVG - GPAC internal*/
 	case GPAC_OTI_SCENE_SVG:
-		e = gf_sm_load_string(&svgin->loader, inBuffer, 0);
+		e = gf_sm_load_string(&svgin->loader, inBuffer, GF_FALSE);
 		break;
 
 	/*!OTI for streaming SVG + gz - GPAC internal*/
@@ -195,7 +195,7 @@
 		char * buf2 = gf_malloc(inBufferLength);
 		GF_BitStream *bs = gf_bs_new(inBuffer, inBufferLength, GF_BITSTREAM_READ);
 		memcpy(buf2, inBuffer, inBufferLength);
-//			FILE *f = gf_f64_open("dump.svg", "wb");
+//			FILE *f = gf_fopen("dump.svg", "wb");
 //
 		while (gf_bs_available(bs)) {
 			pos = gf_bs_get_position(bs);
@@ -215,13 +215,13 @@
 			if (dims_hdr & GF_DIMS_UNIT_C) {
 				e = svgin_deflate(svgin, buf2 + pos + nb_bytes + 1, size - 1);
 			} else {
-				e = gf_sm_load_string(&svgin->loader, buf2 + pos + nb_bytes + 1, 0);
+				e = gf_sm_load_string(&svgin->loader, buf2 + pos + nb_bytes + 1, GF_FALSE);
 			}
 			buf2[pos + nb_bytes + size] = prev;
 			gf_bs_skip_bytes(bs, size-1);
 
 		}
-//          fclose(f);
+//          gf_fclose(f);
 		gf_bs_del(bs);
 	}
 	break;
@@ -378,7 +378,7 @@
 {
 	if (cap.CapCode==GF_CODEC_ABORT) {
 		SVGIn *svgin = (SVGIn *)plug->privateStack;
-		gf_sm_load_suspend(&svgin->loader, 1);
+		gf_sm_load_suspend(&svgin->loader, GF_TRUE);
 	}
 	return GF_OK;
 }

v0.5.2.tar.gz/modules/timedtext/Makefile -> v0.6.1.tar.gz/modules/timedtext/Makefile Changed

v0.5.2.tar.gz/modules/timedtext/timedtext_dec.c -> v0.6.1.tar.gz/modules/timedtext/timedtext_dec.c Changed

@@ -108,9 +108,9 @@
 	/*no size info is given in main scene, override by associated video size if any, or by text track size*/
 	if (!has_size) {
 		if (priv->cfg->has_vid_info && priv->cfg->video_width && priv->cfg->video_height) {
-			gf_sg_set_scene_size_info(priv->sg, priv->cfg->video_width, priv->cfg->video_height, 1);
+			gf_sg_set_scene_size_info(priv->sg, priv->cfg->video_width, priv->cfg->video_height, GF_TRUE);
 		} else {
-			gf_sg_set_scene_size_info(priv->sg, priv->cfg->text_width, priv->cfg->text_height, 1);
+			gf_sg_set_scene_size_info(priv->sg, priv->cfg->text_width, priv->cfg->text_height, GF_TRUE);
 		}
 		gf_sg_get_scene_size_info(priv->sg, &w, &h);
 		if (!w || !h) return;
@@ -119,25 +119,25 @@
 
 	if (!w || !h) return;
 	/*apply*/
-	gf_sg_set_scene_size_info(priv->sg, w, h, 1);
+	gf_sg_set_scene_size_info(priv->sg, w, h, GF_TRUE);
 	/*make sure the scene size is big enough to contain the text track after positioning. RESULTS ARE UNDEFINED
 	if offsets are negative: since MPEG-4 uses centered coord system, we must assume video is aligned to top-left*/
 	if (priv->cfg->has_vid_info) {
-		Bool set_size = 0;
+		Bool set_size = GF_FALSE;
 		vw = priv->cfg->horiz_offset;
 		if (vw<0) vw = 0;
 		vh = priv->cfg->vert_offset;
 		if (vh<0) vh = 0;
 		if (priv->cfg->text_width + (u32) vw > w) {
 			w = priv->cfg->text_width+vw;
-			set_size = 1;
+			set_size = GF_TRUE;
 		}
 		if (priv->cfg->text_height + (u32) vh > h) {
 			h = priv->cfg->text_height+vh;
-			set_size = 1;
+			set_size = GF_TRUE;
 		}
 		if (set_size) {
-			gf_sg_set_scene_size_info(priv->sg, w, h, 1);
+			gf_sg_set_scene_size_info(priv->sg, w, h, GF_TRUE);
 			gf_scene_force_size(priv->inlineScene, w, h);
 		}
 	} else {
@@ -198,9 +198,9 @@
 		if (capability.cap.valueInt) {
 			TTD_ResetDisplay(priv);
 			TTD_UpdateSizeInfo(priv);
-			gf_scene_register_extra_graph(priv->inlineScene, priv->sg, 0);
+			gf_scene_register_extra_graph(priv->inlineScene, priv->sg, GF_FALSE);
 		} else {
-			gf_scene_register_extra_graph(priv->inlineScene, priv->sg, 1);
+			gf_scene_register_extra_graph(priv->inlineScene, priv->sg, GF_TRUE);
 		}
 	}
 	return GF_OK;
@@ -342,9 +342,9 @@
 
 	/*option setup*/
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "StreamingText", "UseTexturing");
-	priv->use_texture = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+	priv->use_texture = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "StreamingText", "OutlineText");
-	priv->outline = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+	priv->outline = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
 	return e;
 }
 
@@ -353,7 +353,7 @@
 	TTDPriv *priv = (TTDPriv *)plug->privateStack;
 	if (!priv->nb_streams) return GF_BAD_PARAM;
 
-	gf_scene_register_extra_graph(priv->inlineScene, priv->sg, 1);
+	gf_scene_register_extra_graph(priv->inlineScene, priv->sg, GF_TRUE);
 
 	gf_node_unregister((GF_Node *) priv->ts_blink, NULL);
 	gf_node_unregister((GF_Node *) priv->process_blink, NULL);
@@ -375,8 +375,8 @@
 	u32 i;
 	TTDPriv *priv = (TTDPriv *)gf_node_get_private(node);
 
-	Bool blink_on = 1;
-	if (priv->process_blink->set_fraction>FIX_ONE/2) blink_on = 0;
+	Bool blink_on = GF_TRUE;
+	if (priv->process_blink->set_fraction>FIX_ONE/2) blink_on = GF_FALSE;
 	i=0;
 	while ((m = (M_Material2D*)gf_list_enum(priv->blink_nodes, &i))) {
 		if (m->filled != blink_on) {
@@ -391,7 +391,7 @@
 	Fixed frac;
 	TTDPriv *priv = (TTDPriv *)gf_node_get_private(node);
 	frac = priv->process_scroll->set_fraction;
-	if (frac==FIX_ONE) priv->is_active = 0;
+	if (frac==FIX_ONE) priv->is_active = GF_FALSE;
 	if (!priv->tr_scroll) return;
 
 	switch (priv->scroll_type - 1) {
@@ -596,8 +596,9 @@
 
 	start_char = tc->start_char;
 	for (i=tc->start_char; i<tc->end_char; i++) {
-		Bool new_line = 0;
-		if ((utf16_txt[i] == '\n') || (utf16_txt[i] == '\r') || (utf16_txt[i] == 0x85) || (utf16_txt[i] == 0x2028) || (utf16_txt[i] == 0x2029)) new_line = 1;
+		Bool new_line = GF_FALSE;
+		if ((utf16_txt[i] == '\n') || (utf16_txt[i] == '\r') || (utf16_txt[i] == 0x85) || (utf16_txt[i] == 0x2028) || (utf16_txt[i] == 0x2029))
+			new_line = GF_TRUE;
 
 		if (new_line || (i+1==tc->end_char) ) {
 			SFString *st;
@@ -609,9 +610,9 @@
 				u32 len;
 				s16 wsChunk[5000], *sp;
 
-				/*spliting lines, duplicate node*/
+				/*splitting lines, duplicate node*/
 
-				n2 = gf_node_clone(priv->sg, txt_model, NULL, "", 1);
+				n2 = gf_node_clone(priv->sg, txt_model, NULL, "", GF_TRUE);
 				if (tc->hlink && tc->hlink->URL) {
 					GF_Node *t = ((M_Anchor *)n2)->children->node;
 					text = (M_Text *) ((M_Shape *)t)->geometry;
@@ -702,14 +703,14 @@
 		/*assign mod*/
 		switch (mod->type) {
 		case GF_ISOM_BOX_TYPE_HLIT:
-			tc->is_hilight = 1;
+			tc->is_hilight = GF_TRUE;
 			if (txt->highlight_color) tc->hilight_col = txt->highlight_color->hil_color;
 			break;
 		case GF_ISOM_BOX_TYPE_HREF:
 			tc->hlink = (GF_TextHyperTextBox *) mod;
 			break;
 		case GF_ISOM_BOX_TYPE_BLNK:
-			tc->has_blink = 1;
+			tc->has_blink = GF_TRUE;
 			break;
 		}
 		/*done*/
@@ -756,7 +757,7 @@
 	if (!td) return;
 
 
-	vertical = (td->displayFlags & GF_TXT_VERTICAL) ? 1 : 0;
+	vertical = (td->displayFlags & GF_TXT_VERTICAL) ? GF_TRUE : GF_FALSE;
 
 	/*set back color*/
 	/*do we fill the text box or the entire text track region*/
@@ -838,7 +839,7 @@
 	else if (offset - thh < -th/2) offset = -th/2 + thh;
 	priv->tr_box->translation.y = INT2FIX(offset);
 
-	gf_node_dirty_set((GF_Node *)priv->tr_box, 0, 1);
+	gf_node_dirty_set((GF_Node *)priv->tr_box, 0, GF_TRUE);
 
 
 	if (priv->scroll_type) {
@@ -1083,7 +1084,7 @@
 	(*id) = -1;
 
 
-	gf_node_dirty_set((GF_Node *)form, 0, 1);
+	gf_node_dirty_set((GF_Node *)form, 0, GF_TRUE);
 	gf_node_changed((GF_Node *)form, NULL);
 	gf_node_changed((GF_Node *) priv->dlist, NULL);
 
@@ -1093,7 +1094,7 @@
 		gf_node_changed((GF_Node *) priv->ts_blink, NULL);
 	}
 
-	priv->is_active = 1;
+	priv->is_active = GF_TRUE;
 	/*scroll timer also acts as AU timer*/
 	priv->ts_scroll->startTime = gf_node_get_scene_time((GF_Node *) priv->ts_scroll);
 	priv->ts_scroll->stopTime = priv->ts_scroll->startTime - 1.0;
@@ -1115,7 +1116,7 @@
 		GF_TextSample *txt;
 		Bool is_utf_16;
 		u32 type, length, sample_index, sample_duration;
-		is_utf_16 = gf_bs_read_int(bs, 1);
+		is_utf_16 = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 4);
 		type = gf_bs_read_int(bs, 3);
 		length = gf_bs_read_u16(bs);

v0.5.2.tar.gz/modules/timedtext/timedtext_in.c -> v0.6.1.tar.gz/modules/timedtext/timedtext_in.c Changed

@@ -57,6 +57,7 @@
 	"x-subtitle/srt", "srt", "SRT SubTitles",
 	"x-subtitle/sub", "sub", "SUB SubTitles",
 	"x-subtitle/ttxt", "ttxt", "3GPP TimedText",
+	"text/vtt", "vtt", "VTT SubTitles",
 	NULL
 };
 
@@ -75,22 +76,25 @@
 	char *sExt;
 	u32 i;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
-	if (!sExt) return 0;
+	if (!sExt)
+		return GF_FALSE;
 	for (i = 0 ; TTIN_MIME_TYPES[i]; i+=3) {
-		if (gf_service_check_mime_register(plug, TTIN_MIME_TYPES[i], TTIN_MIME_TYPES[i+1], TTIN_MIME_TYPES[i+2], sExt)) return 1;
+		if (gf_service_check_mime_register(plug, TTIN_MIME_TYPES[i], TTIN_MIME_TYPES[i+1], TTIN_MIME_TYPES[i+2], sExt))
+			return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool TTIn_is_local(const char *url)
 {
 	if (!url)
-		return 0;
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
+		return GF_FALSE;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (!strnicmp(url, "gmem://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
 }
 
 static GF_ESD *tti_get_esd(TTIn *tti)
@@ -98,13 +102,14 @@
 	return gf_media_map_esd(tti->mp4, tti->tt_track);
 }
 
-static void tti_setup_object(TTIn *tti)
+static void tti_setup_object(TTIn *tti, GF_InputService *plug)
 {
 	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 	GF_ESD *esd = tti_get_esd(tti);
-	od->objectDescriptorID = esd->ESID;
+	od->objectDescriptorID = 0;
+	od->service_ifce = plug;
 	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(tti->service, (GF_Descriptor *)od, 0);
+	gf_service_declare_media(tti->service, (GF_Descriptor *)od, GF_FALSE);
 }
 
 
@@ -137,15 +142,35 @@
 	import.dest = tti->mp4;
 	/*override layout from sub file*/
 	import.flags = GF_IMPORT_SKIP_TXT_BOX;
-	import.in_name = gf_strdup(url);
 
-	e = gf_media_import(&import);
+	if (!strnicmp(url, "gmem://", 7)) {
+		u8 *mem_address;
+		u32 size;
+		FILE *tmp_txt;
+		import.streamFormat = "TEXT";
+
+		if (sscanf(url, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_BAD_PARAM;
+		}
+		strcat(szFILE, "_tmptxt");
+		tmp_txt = gf_fopen(szFILE, "w");
+		if (!tmp_txt) return GF_IO_ERR;
+		fwrite(mem_address, size, 1, tmp_txt);
+		fclose(tmp_txt);
+
+		import.in_name = szFILE;
+		e = gf_media_import(&import);
+
+		gf_delete_file(szFILE);
+
+	} else {
+		import.in_name = (char *) url;
+		e = gf_media_import(&import);
+	}
 	if (!e) {
 		tti->tt_track = 1;
-		gf_isom_text_set_streaming_mode(tti->mp4, 1);
+		gf_isom_text_set_streaming_mode(tti->mp4, GF_TRUE);
 	}
-	if (import.in_name)
-		gf_free(import.in_name);
 	return e;
 }
 
@@ -165,17 +190,17 @@
 		szCache = gf_dm_sess_get_cache_name(tti->dnload);
 		if (!szCache) e = GF_IO_ERR;
 		else {
-			e = TTIn_LoadFile(plug, szCache, 1);
+			e = TTIn_LoadFile(plug, szCache, GF_TRUE);
 		}
 	}
-	else if (param->msg_type==GF_NETIO_DATA_EXCHANGE)
+	else if (!e || (param->msg_type==GF_NETIO_DATA_EXCHANGE))
 		return;
 
 	/*OK confirm*/
 	if (tti->needs_connection) {
-		tti->needs_connection = 0;
+		tti->needs_connection = GF_FALSE;
 		gf_service_connect_ack(tti->service, NULL, e);
-		if (!e && !tti->od_done) tti_setup_object(tti);
+		if (!e && !tti->od_done) tti_setup_object(tti, plug);
 	}
 }
 
@@ -184,10 +209,10 @@
 	TTIn *tti = (TTIn *) plug->priv;
 	if (!plug || !url)
 		return;
-	tti->needs_connection = 1;
+	tti->needs_connection = GF_TRUE;
 	tti->dnload = gf_service_download_new(tti->service, url, 0, TTIn_NetIO, plug);
 	if (!tti->dnload) {
-		tti->needs_connection = 0;
+		tti->needs_connection = GF_FALSE;
 		gf_service_connect_ack(tti->service, NULL, GF_NOT_SUPPORTED);
 	} else {
 		/*start our download (threaded)*/
@@ -212,9 +237,9 @@
 		TTIn_download_file(plug, url);
 		return GF_OK;
 	}
-	e = TTIn_LoadFile(plug, url, 0);
+	e = TTIn_LoadFile(plug, url, GF_FALSE);
 	gf_service_connect_ack(serv, NULL, e);
-	if (!e && !tti->od_done) tti_setup_object(tti);
+	if (!e && !tti->od_done) tti_setup_object(tti, plug);
 	return GF_OK;
 }
 
@@ -264,7 +289,7 @@
 		GF_ESD *esd = tti_get_esd(tti);
 		od->objectDescriptorID = esd->ESID;
 		gf_list_add(od->ESDescriptors, esd);
-		tti->od_done = 1;
+		tti->od_done = GF_TRUE;
 		return (GF_Descriptor *) od;
 	}
 	default:
@@ -344,8 +369,8 @@
 	TTIn *tti = (TTIn *)plug->priv;
 
 	*out_reception_status = GF_OK;
-	*sl_compressed = 0;
-	*is_new_data = 0;
+	*sl_compressed = GF_FALSE;
+	*is_new_data = GF_FALSE;
 
 	memset(&tti->sl_hdr, 0, sizeof(GF_SLHeader));
 	tti->sl_hdr.randomAccessPointFlag = 1;
@@ -372,7 +397,7 @@
 				*out_reception_status = GF_CORRUPTED_DATA;
 				return GF_OK;
 			}
-			*is_new_data = 1;
+			*is_new_data = GF_TRUE;
 		}
 		tti->sl_hdr.compositionTimeStamp = tti->sl_hdr.decodingTimeStamp = tti->samp->DTS;
 		*out_data_ptr = tti->samp->data;
@@ -403,7 +428,7 @@
 	TTIn *priv;
 	GF_InputService *plug;
 	GF_SAFEALLOC(plug, GF_InputService);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC SubTitle Reader", "gpac distribution")
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC TimedText Reader", "gpac distribution")
 
 	plug->RegisterMimeTypes = TTIN_RegisterMimeTypes;
 	plug->CanHandleURL = TTIn_CanHandleURL;

v0.5.2.tar.gz/modules/ui_rec/Makefile -> v0.6.1.tar.gz/modules/ui_rec/Makefile Changed

v0.5.2.tar.gz/modules/ui_rec/ui_rec.c -> v0.6.1.tar.gz/modules/ui_rec/ui_rec.c Changed

@@ -52,7 +52,7 @@
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 Bool uir_on_event_record(GF_UIRecord *uir , GF_Event *event, Bool consumed_by_compositor)
@@ -97,13 +97,13 @@
 		gf_bs_write_u32(uir->bs, event->character.unicode_char);
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 void uir_load_event(GF_UIRecord *uir)
 {
 	memset(&uir->next_event, 0, sizeof(GF_Event));
-	uir->evt_loaded = 0;
+	uir->evt_loaded = GF_FALSE;
 	if (!gf_bs_available(uir->bs)) return;
 
 
@@ -138,25 +138,25 @@
 		uir->next_event.character.unicode_char = gf_bs_read_u32(uir->bs);
 		break;
 	}
-	uir->evt_loaded = 1;
+	uir->evt_loaded = GF_TRUE;
 }
 
 static Bool uir_process(GF_TermExt *termext, u32 action, void *param)
 {
 	const char *opt, *uifile;
-	GF_UIRecord *uir = termext->udta;
+	GF_UIRecord *uir = (GF_UIRecord*)termext->udta;
 
 	switch (action) {
 	case GF_TERM_EXT_START:
 		uir->term = (GF_Terminal *) param;
 		opt = gf_modules_get_option((GF_BaseInterface*)termext, "UIRecord", "Mode");
-		if (!opt) return 0;
+		if (!opt) return GF_FALSE;
 		uifile = gf_modules_get_option((GF_BaseInterface*)termext, "UIRecord", "File");
-		if (!uifile) return 0;
+		if (!uifile) return GF_FALSE;
 
 		if (!strcmp(opt, "Play")) {
-			uir->uif = gf_f64_open(uifile, "rb");
-			if (!uir->uif) return 0;
+			uir->uif = gf_fopen(uifile, "rb");
+			if (!uir->uif) return GF_FALSE;
 			uir->bs = gf_bs_from_file(uir->uif, GF_BITSTREAM_READ);
 			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
 
@@ -166,20 +166,20 @@
 
 			uir_load_event(uir);
 		} else if (!strcmp(opt, "Record")) {
-			uir->uif = gf_f64_open(uifile, "wb");
-			if (!uir->uif) return 0;
+			uir->uif = gf_fopen(uifile, "wb");
+			if (!uir->uif) return GF_FALSE;
 			uir->bs = gf_bs_from_file(uir->uif, GF_BITSTREAM_WRITE);
 
 			uir->evt_filter.on_event = uir_on_event_record;
 			uir->evt_filter.udta = uir;
 			gf_term_add_event_filter(uir->term, &uir->evt_filter);
 		} else {
-			return 0;
+			return GF_FALSE;
 		}
-		return 1;
+		return GF_TRUE;
 
 	case GF_TERM_EXT_STOP:
-		if (uir->uif) fclose(uir->uif);
+		if (uir->uif) gf_fclose(uir->uif);
 		if (uir->bs) gf_bs_del(uir->bs);
 		gf_term_remove_event_filter(uir->term, &uir->evt_filter);
 		uir->term = NULL;
@@ -195,7 +195,7 @@
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -217,7 +217,7 @@
 void uir_delete(GF_BaseInterface *ifce)
 {
 	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_UIRecord *uir = dr->udta;
+	GF_UIRecord *uir = (GF_UIRecord*)dr->udta;
 	gf_free(uir);
 	gf_free(dr);
 }

v0.5.2.tar.gz/modules/validator/Makefile -> v0.6.1.tar.gz/modules/validator/Makefile Changed

v0.5.2.tar.gz/modules/validator/README.TXT -> v0.6.1.tar.gz/modules/validator/README.TXT Changed

@@ -1,41 +1,49 @@
-The validator allows recording user interactions and taking snapshots when playing back interactive content; and replaying the content simulating the interactions, generating and comparing snapshots. To activate it you need to modify the GPAC configuration as follows: 
-
-Add a section:
-[Validator]
-Mode=Play
-
-Mode can be: Play, Record, or Disable
-
-The validator will try to load a single file to be tested or a playlist.
-Single files are indicated with:
-XVS=C:\Users\Cyril Concolato\code\tsi_svn\trunk\gpac_public\regression_tests\svg\file.xvs
-XVS means XML Validation Sequence. An example of XVS is:
-
-<TestValidationScript file="C:\Users\Cyril Concolato\standards\SVG_WG\SVG\profiles\1.1F2\test\svg\animate-elem-09-t.svg" >
-<snapshot time="237" image="animate-elem-09-t-reference-000.png" />
-<mousemove time="4749.000000" x="99" y="354" />
-<mousemove time="4749.000000" x="103" y="343" />
-<mousemove time="4749.000000" x="108" y="333" />
-</TestValidationScript>
-
-
-Playlist of XVS are givin with:
-XVL=C:\Users\Cyril Concolato\code\tsi_svn\trunk\gpac_public\regression_tests\svg\svg1.1f2.xvl
-XVL means XML Validation List. An example of XVL is:
-
-<TestSuiteValidationScript content-base="C:\Users\Cyril Concolato\standards\SVG_WG\SVG\profiles\1.1F2\test\svg" >
-<Test scenario="animate-elem-02-t.xvs" content="animate-elem-02-t.svg" />
-<Test scenario="animate-elem-03-t.xvs" content="animate-elem-03-t.svg" />
-<Test scenario="animate-dom-01-f.xvs" content="animate-dom-01-f.svg" />
-<Test scenario="animate-dom-02-f.xvs" content="animate-dom-02-f.svg" />
-</TestSuiteValidationScript>
-
-When recording and playing back, the GPAC player rendering is switched to 5 FPS without antialiasing.
-
-When recording, you can trigger some actions as follows:
-CTRL+Insert: takes a snapshot and records it as a PNG. In replay mode, a PNG will be taken at the same scene time and the PNG will be compared.
-CTRL+Fin: Quit
-CTRL+F1: Takes snapshot at next frame change.
-Page Down: Ends current XVS and switches to next in the XVL
-
-Note: after recording, upon closing the player, the Validator mode is automatically switched to Play to avoid losing recorded interactions.
\ No newline at end of file
+The validator allows recording user interactions and taking snapshots when playing back interactive content; and replaying the content simulating the interactions, generating and comparing snapshots. To activate it you need to modify the GPAC configuration as follows: 
+
+Add a section:
+[Validator]
+Mode=Play
+
+Mode can be: Play, Record, or Disable
+
+The validator will try to load a trace file, a single file or a playlist.
+
+** Trace files are indicated with
+Trace=SomeTrace
+
+A trace file does not contain any association with the source file nor screenshots, only mouse and keyboard events are used. 
+In trace mode the renderer is not reconfigured.
+
+** Single files are indicated with:
+XVS=/PATH/TOfile.xvs
+XVS means XML Validation Sequence. An example of XVS is:
+
+<TestValidationScript file="/PATH/TO/animate-elem-09-t.svg" >
+<snapshot time="237" image="animate-elem-09-t-reference-000.png" />
+<mousemove time="4749.000000" x="99" y="354" />
+<mousemove time="4749.000000" x="103" y="343" />
+<mousemove time="4749.000000" x="108" y="333" />
+</TestValidationScript>
+
+
+** Playlist of XVS are givin with:
+
+XVL=/PATH/TO/svg1.1f2.xvl
+XVL means XML Validation List. An example of XVL is:
+
+<TestSuiteValidationScript content-base="/PATH/TO/svg" >
+<Test scenario="animate-elem-02-t.xvs" content="animate-elem-02-t.svg" />
+<Test scenario="animate-elem-03-t.xvs" content="animate-elem-03-t.svg" />
+<Test scenario="animate-dom-01-f.xvs" content="animate-dom-01-f.svg" />
+<Test scenario="animate-dom-02-f.xvs" content="animate-dom-02-f.svg" />
+</TestSuiteValidationScript>
+
+When recording and playing back, the GPAC player rendering is switched to 5 FPS without antialiasing, except for Trace mode.
+
+When recording, you can trigger some actions as follows (except for trace mode):
+CTRL+Insert: takes a snapshot and records it as a PNG. In replay mode, a PNG will be taken at the same scene time and the PNG will be compared.
+CTRL+Fin: Quit
+CTRL+F1: Takes snapshot at next frame change.
+Page Down: Ends current XVS and switches to next in the XVL
+
+Note: after recording, upon closing the player, the Validator mode is automatically switched to Play to avoid losing recorded interactions, except in trace mode.

v0.5.2.tar.gz/modules/validator/validator.c -> v0.6.1.tar.gz/modules/validator/validator.c Changed

@@ -77,6 +77,8 @@
 static void validator_xvs_close(GF_Validator *validator);
 static Bool validator_xvs_next(GF_Validator *validator, Bool reverse);
 
+#ifndef GPAC_DISABLE_AV_PARSERS
+
 static void validator_xvs_add_snapshot_node(GF_Validator *validator, const char *filename, u32 scene_time)
 {
 	GF_XMLNode *snap_node;
@@ -86,7 +88,7 @@
 	snap_node->attributes = gf_list_new();
 	GF_SAFEALLOC(att, GF_XMLAttribute);
 	att->name = gf_strdup("time");
-	att->value = gf_malloc(100);
+	att->value = (char*)gf_malloc(100);
 	sprintf(att->value, "%d", scene_time);
 	gf_list_add(snap_node->attributes, att);
 	GF_SAFEALLOC(att, GF_XMLAttribute);
@@ -128,18 +130,18 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error dumping screen buffer %s\n", gf_error_to_string(e)));
 	} else {
 		u32 dst_size = fb.width*fb.height*3;
-		char *dst=gf_malloc(sizeof(char)*dst_size);
+		char *dst = (char*)gf_malloc(sizeof(char)*dst_size);
 
 		e = gf_img_png_enc(fb.video_buffer, fb.width, fb.height, fb.pitch_y, fb.pixel_format, dst, &dst_size);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error encoding PNG %s\n", gf_error_to_string(e)));
 		} else {
-			FILE *png = gf_f64_open(dumpname, "wb");
+			FILE *png = gf_fopen(dumpname, "wb");
 			if (!png) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error writing file %s\n", dumpname));
 			} else {
 				gf_fwrite(dst, dst_size, 1, png);
-				fclose(png);
+				gf_fclose(png);
 				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Validator] Writing file %s\n", dumpname));
 			}
 		}
@@ -156,13 +158,13 @@
 	u32 ref_width, ref_height, ref_pixel_format, ref_data_size;
 	u32 new_width, new_height, new_pixel_format, new_data_size;
 	char *ref_data, *new_data;
-	Bool result = 0;
+	Bool result = GF_FALSE;
 	GF_Err e;
 	u32 i;
 
 	u32 snap_number = validator->snapshot_number - 1;
-	ref_name = validator_get_snapshot_name(validator, 1, snap_number);
-	new_name = validator_get_snapshot_name(validator, 0, snap_number);
+	ref_name = validator_get_snapshot_name(validator, GF_TRUE, snap_number);
+	new_name = validator_get_snapshot_name(validator, GF_FALSE, snap_number);
 
 	e = gf_img_file_dec(ref_name, NULL, &ref_width, &ref_height, &ref_pixel_format, &ref_data, &ref_data_size);
 	if (e) {
@@ -193,7 +195,7 @@
 			break;
 		}
 	}
-	if (i==ref_data_size) result = 1;
+	if (i==ref_data_size) result = GF_TRUE;
 
 end:
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] PNG Comparison result: %s\n", (result?"Same":"Different")));
@@ -201,15 +203,18 @@
 	if (new_name) gf_free(new_name);
 	return result;
 }
+#endif
 
 static void validator_on_video_frame(void *udta, u32 time)
 {
 	GF_Validator *validator = (GF_Validator *)udta;
 	if (validator->snapshot_next_frame) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		char *snap_name = validator_create_snapshot(validator);
 		validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
 		gf_free(snap_name);
-		validator->snapshot_next_frame = 0;
+#endif
+		validator->snapshot_next_frame = GF_FALSE;
 	}
 }
 
@@ -241,7 +246,7 @@
 	case GF_EVENT_MOUSEWHEEL:
 	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_TEXTINPUT:
-		return 1;
+		return GF_TRUE;
 	case GF_EVENT_KEYUP:
 		if ((event->key.key_code == GF_KEY_END)&&(event->key.flags & GF_KEY_MOD_CTRL)) {
 			GF_Event evt;
@@ -249,9 +254,9 @@
 			evt.type = GF_EVENT_QUIT;
 			validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
 		}
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static void validator_xvs_add_event_dom(GF_Validator *validator, GF_Event *event)
@@ -272,7 +277,9 @@
 	case GF_EVENT_KEYUP:
 	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_TEXTINPUT:
+#ifndef GPAC_DISABLE_SVG
 		evt_node->name = gf_strdup(gf_dom_event_get_name(event->type));
+#endif
 		break;
 	}
 
@@ -285,7 +292,7 @@
 
 	GF_SAFEALLOC(att, GF_XMLAttribute);
 	att->name = gf_strdup("time");
-	att->value = gf_malloc(100);
+	att->value = (char*)gf_malloc(100);
 	sprintf(att->value, "%f", gf_scene_get_time(validator->term->root_scene)*1000);
 	gf_list_add(evt_node->attributes, att);
 
@@ -315,18 +322,18 @@
 		}
 		GF_SAFEALLOC(att, GF_XMLAttribute);
 		att->name = gf_strdup("x");
-		att->value = gf_malloc(100);
+		att->value = (char*)gf_malloc(100);
 		sprintf(att->value, "%d", event->mouse.x);
 		gf_list_add(evt_node->attributes, att);
 		GF_SAFEALLOC(att, GF_XMLAttribute);
 		att->name = gf_strdup("y");
-		att->value = gf_malloc(100);
+		att->value = (char*)gf_malloc(100);
 		sprintf(att->value, "%d", event->mouse.y);
 		gf_list_add(evt_node->attributes, att);
 		if (event->type == GF_EVENT_MOUSEWHEEL) {
 			GF_SAFEALLOC(att, GF_XMLAttribute);
 			att->name = gf_strdup("wheel_pos");
-			att->value = gf_malloc(100);
+			att->value = (char*)gf_malloc(100);
 			sprintf(att->value, "%f", FIX2FLT( event->mouse.wheel_pos) );
 			gf_list_add(evt_node->attributes, att);
 		}
@@ -355,7 +362,9 @@
 	case GF_EVENT_LONGKEYPRESS:
 		GF_SAFEALLOC(att, GF_XMLAttribute);
 		att->name = gf_strdup("key_identifier");
+#ifndef GPAC_DISABLE_SVG
 		att->value = gf_strdup(gf_dom_get_key_name(event->key.key_code));
+#endif
 		gf_list_add(evt_node->attributes, att);
 		if (event->key.flags & GF_KEY_MOD_SHIFT) {
 			GF_SAFEALLOC(att, GF_XMLAttribute);
@@ -379,7 +388,7 @@
 	case GF_EVENT_TEXTINPUT:
 		GF_SAFEALLOC(att, GF_XMLAttribute);
 		att->name = gf_strdup("unicode-char");
-		att->value = gf_malloc(100);
+		att->value = (char*)gf_malloc(100);
 		sprintf(att->value, "%d", event->character.unicode_char);
 		gf_list_add(evt_node->attributes, att);
 		break;
@@ -395,7 +404,7 @@
 Bool validator_on_event_record(void *udta, GF_Event *event, Bool consumed_by_compositor)
 {
 	GF_Validator *validator = (GF_Validator *)udta;
-	Bool rec_event = 1;
+	Bool rec_event = GF_TRUE;
 	switch (event->type) {
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
@@ -407,55 +416,57 @@
 		break;
 	case GF_EVENT_KEYDOWN:
 		if (event->key.key_code == GF_KEY_INSERT) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		} else if (event->key.key_code == GF_KEY_PAGEDOWN) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		} else if (event->key.key_code == GF_KEY_PAGEUP) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		} else if (event->key.key_code == GF_KEY_END) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		} else if (event->key.key_code == GF_KEY_CONTROL) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		} else if (event->key.flags & GF_KEY_MOD_CTRL) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		}
 		break;
 	case GF_EVENT_KEYUP:
 		if (event->key.flags & GF_KEY_MOD_CTRL) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 			if (event->key.key_code == GF_KEY_INSERT) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 				char *snap_name = validator_create_snapshot(validator);
 				validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
 				gf_free(snap_name);
+#endif
 			} else if (event->key.key_code == GF_KEY_END) {
 				GF_Event evt;
 				memset(&evt, 0, sizeof(GF_Event));
 				evt.type = GF_EVENT_QUIT;
 				validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
 			} else if (event->key.key_code == GF_KEY_F1) {
-				validator->snapshot_next_frame = 1;
+				validator->snapshot_next_frame = GF_TRUE;
 			}
 		} else if (event->key.key_code == GF_KEY_PAGEDOWN) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 			validator_xvs_close(validator);
 			gf_term_disconnect(validator->term);
 			gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-			validator_xvs_next(validator, 0);
+			validator_xvs_next(validator, GF_FALSE);
 		} else if (event->key.key_code == GF_KEY_PAGEUP) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 			validator_xvs_close(validator);
 			gf_term_disconnect(validator->term);
 			gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-			validator_xvs_next(validator, 1);
+			validator_xvs_next(validator, GF_TRUE);
 		} else if (event->key.key_code == GF_KEY_CONTROL) {
-			rec_event = 0;
+			rec_event = GF_FALSE;
 		}
 		break;
 	}
 	if (rec_event) {
 		validator_xvs_add_event_dom(validator, event);
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static void validator_xvl_open(GF_Validator *validator)
@@ -478,7 +489,7 @@
 	}
 	att_index = 0;
 	while (1) {
-		att = gf_list_get(validator->xvl_node->attributes, att_index);
+		att = (GF_XMLAttribute*)gf_list_get(validator->xvl_node->attributes, att_index);
 		if (!att) break;
 		if (!strcmp(att->name, "content-base")) {
 			validator->test_base = gf_strdup(att->value);
@@ -496,14 +507,14 @@
 			char *xvl_content;
 			char result_filename[GF_MAX_PATH];
 			char *dot;
-			xvl_content = gf_xml_dom_serialize(validator->xvl_node, 0);
+			xvl_content = gf_xml_dom_serialize(validator->xvl_node, GF_FALSE);
 			dot = strrchr(validator->xvl_filename, '.');
 			dot[0] = 0;
 			sprintf(result_filename, "%s-result.xml", validator->xvl_filename);
 			dot[0] = '.';
-			xvl_fp = gf_f64_open(result_filename, "wt");
+			xvl_fp = gf_fopen(result_filename, "wt");
 			gf_fwrite(xvl_content, strlen(xvl_content), 1, xvl_fp);
-			fclose(xvl_fp);
+			gf_fclose(xvl_fp);
 			gf_free(xvl_content);
 		}
 		gf_xml_dom_del(validator->xvl_parser);
@@ -519,7 +530,7 @@
 	validator->xvs_filename = NULL;
 	validator->test_filename = NULL;
 	while (1) {
-		validator->xvs_node_in_xvl = gf_list_get(validator->xvl_node->content, validator->xvl_node_index);
+		validator->xvs_node_in_xvl = (GF_XMLNode*)gf_list_get(validator->xvl_node->content, validator->xvl_node_index);
 		if (!validator->xvs_node_in_xvl) {
 			return;
 		}
@@ -530,7 +541,7 @@
 		}
 		xvl_att_index = 0;
 		while(1) {
-			GF_XMLAttribute *att = gf_list_get(validator->xvs_node_in_xvl->attributes, xvl_att_index);
+			GF_XMLAttribute *att = (GF_XMLAttribute*)gf_list_get(validator->xvs_node_in_xvl->attributes, xvl_att_index);
 			if (!att) break;
 			if (!strcmp(att->name, "scenario")) {
 				validator->xvs_filename = att->value;
@@ -561,7 +572,7 @@
 		} else {
 			gf_xml_dom_del(validator->xvs_parser);
 			validator->xvs_parser = NULL;
-			return 0;
+			return GF_FALSE;
 		}
 	} else {
 		validator->xvs_node = gf_xml_dom_get_root(validator->xvs_parser);
@@ -573,7 +584,7 @@
 		u32 att_index = 0;
 		att_file = NULL;
 		while (1) {
-			att = gf_list_get(validator->xvs_node->attributes, att_index);
+			att = (GF_XMLAttribute*)gf_list_get(validator->xvs_node->attributes, att_index);
 			if (!att) {
 				break;
 			} else if (!strcmp(att->name, "file")) {
@@ -586,7 +597,7 @@
 			gf_xml_dom_del(validator->xvs_parser);
 			validator->xvs_parser = NULL;
 			validator->xvs_node = NULL;
-			return 0;
+			return GF_FALSE;
 		} else {
 			char *sep;
 			sep = strrchr(att_file->value, GF_PATH_SEPARATOR);
@@ -614,9 +625,9 @@
 		node->name = gf_strdup("\n");
 		gf_list_add(validator->xvs_node->content, node);
 	} else {
-		validator->xvs_result = 1;
+		validator->xvs_result = GF_TRUE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 static void validator_xvs_close(GF_Validator *validator)
@@ -630,7 +641,7 @@
 			GF_XMLAttribute *att_file = NULL;
 			u32 att_index = 0;
 			while (1) {
-				att = gf_list_get(validator->xvs_node->attributes, att_index);
+				att = (GF_XMLAttribute*)gf_list_get(validator->xvs_node->attributes, att_index);
 				if (!att) {
 					break;
 				} else if (!strcmp(att->name, "file")) {
@@ -649,10 +660,10 @@
 			}
 			sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
 			att->value = gf_strdup(filename);
-			xvs_content = gf_xml_dom_serialize(validator->xvs_node, 0);
-			xvs_fp = gf_f64_open(validator->xvs_filename, "wt");
+			xvs_content = gf_xml_dom_serialize(validator->xvs_node, GF_FALSE);
+			xvs_fp = gf_fopen(validator->xvs_filename, "wt");
 			gf_fwrite(xvs_content, strlen(xvs_content), 1, xvs_fp);
-			fclose(xvs_fp);
+			gf_fclose(xvs_fp);
 			gf_free(xvs_content);
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] XVS Result : %s\n", (validator->xvs_result?"Success":"Failure")));
@@ -661,7 +672,7 @@
 				GF_XMLAttribute *att_result = NULL;
 				u32 att_index = 0;
 				while (1) {
-					att = gf_list_get(validator->xvs_node_in_xvl->attributes, att_index);
+					att = (GF_XMLAttribute*)gf_list_get(validator->xvs_node_in_xvl->attributes, att_index);
 					if (!att) {
 						break;
 					} else if (!strcmp(att->name, "result")) {
@@ -693,7 +704,7 @@
 static void validator_test_open(GF_Validator *validator)
 {
 	char filename[100];
-	
+
 	if (!validator->trace_mode) {
 		if (validator->test_base)
 			sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
@@ -702,7 +713,7 @@
 
 		gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
 		if (validator->is_recording)
-			validator->snapshot_next_frame = 1;
+			validator->snapshot_next_frame = GF_TRUE;
 		gf_term_connect(validator->term, filename);
 
 	}
@@ -716,20 +727,20 @@
 		if (validator->xvs_filename) {
 			validator_xvs_open(validator);
 			if (!validator->xvs_node) {
-				return 0;
+				return GF_FALSE;
 			}
 			if (validator->test_filename) {
 				validator_test_open(validator);
 			} else {
 				validator_xvs_close(validator);
-				return 0;
+				return GF_FALSE;
 			}
 		} else {
-			return 0;
+			return GF_FALSE;
 		}
-		return 1;
+		return GF_TRUE;
 	} else {
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -740,15 +751,15 @@
 	u32 att_index;
 
 	memset(&validator->next_event, 0, sizeof(GF_Event));
-	validator->evt_loaded = 0;
-	validator->next_event_snapshot = 0;
+	validator->evt_loaded = GF_FALSE;
+	validator->next_event_snapshot = GF_FALSE;
 
-	if (!validator->xvs_node) return 0;
+	if (!validator->xvs_node) return GF_FALSE;
 
 	while (1) {
-		event_node = gf_list_get(validator->xvs_node->content, validator->xvs_event_index);
+		event_node = (GF_XMLNode*)gf_list_get(validator->xvs_node->content, validator->xvs_event_index);
 		if (!event_node) {
-			return 0;
+			return GF_FALSE;
 		} else if (event_node->type == GF_XML_NODE_TYPE) {
 			validator->xvs_event_index++;
 			break;
@@ -758,17 +769,20 @@
 	}
 
 	if (!strcmp(event_node->name, "snapshot")) {
-		validator->next_event_snapshot = 1;
+		validator->next_event_snapshot = GF_TRUE;
 	} else {
+#ifndef GPAC_DISABLE_SVG
 		validator->next_event.type = gf_dom_event_type_by_name(event_node->name);
-		if (validator->next_event.type == GF_EVENT_UNKNOWN) {
-			return 1;
+		if (validator->next_event.type == GF_EVENT_UNKNOWN)
+#endif
+		{
+			return GF_TRUE;
 		}
 	}
 
 	att_index = 0;
 	while (1) {
-		att = gf_list_get(event_node->attributes, att_index);
+		att = (GF_XMLAttribute*)gf_list_get(event_node->attributes, att_index);
 		if (!att) break;
 		if (!strcmp(att->name, "time")) {
 			validator->next_time = atoi(att->value);
@@ -792,21 +806,23 @@
 			validator->next_event.mouse.key_states |= GF_KEY_MOD_ALT;
 		} else if (!strcmp(att->name, "ctrl") && !strcmp(att->value, "true")) {
 			validator->next_event.mouse.key_states |= GF_KEY_MOD_CTRL;
+#ifndef GPAC_DISABLE_SVG
 		} else if (!strcmp(att->name, "key_identifier")) {
 			validator->next_event.key.key_code = gf_dom_get_key_type(att->value);
+#endif
 		} else if (!strcmp(att->name, "unicode-char")) {
 			validator->next_event.character.unicode_char = atoi(att->value);
 		}
 		att_index++;
 	}
-	validator->evt_loaded = 1;
-	return 1;
+	validator->evt_loaded = GF_TRUE;
+	return GF_TRUE;
 }
 
 static Bool validator_process(GF_TermExt *termext, u32 action, void *param)
 {
 	const char *opt;
-	GF_Validator *validator = termext->udta;
+	GF_Validator *validator = (GF_Validator*)termext->udta;
 
 	switch (action) {
 
@@ -825,19 +841,19 @@
 		opt = gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Mode");
 		if (!opt) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Validator missing configuration, stopping.\n"));
-			return 0;
+			return GF_FALSE;
 		} else if (!strcmp(opt, "Play")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in playback mode.\n"));
-			validator->is_recording = 0;
+			validator->is_recording = GF_FALSE;
 		} else if (!strcmp(opt, "Record")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in recording mode.\n"));
-			validator->is_recording = 1;
+			validator->is_recording = GF_TRUE;
 		} else if (!strcmp(opt, "Disable")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator is disabled.\n"));
-			return 0;
+			return GF_FALSE;
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration using wrong mode, stopping.\n"));
-			return 0;
+			return GF_FALSE;
 		}
 
 		/* initializes the validator and starts */
@@ -849,10 +865,10 @@
 				validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Trace");
 				if (!validator->xvs_filename) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
-					return 0;
+					return GF_FALSE;
 				}
 				validator->test_filename = validator->xvs_filename;
-				validator->trace_mode = 1;
+				validator->trace_mode = GF_TRUE;
 				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using trace file: %s\n", validator->xvs_filename));
 			} else {
 				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario file: %s\n", validator->xvs_filename));
@@ -871,25 +887,25 @@
 		if (validator->xvl_filename) {
 			validator_xvl_open(validator);
 			if (!validator->xvl_node) {
-				return 0;
+				return GF_FALSE;
 			}
-			validator_xvs_next(validator, 0);
+			validator_xvs_next(validator, GF_FALSE);
 			if (!validator->xvs_node) {
-				return 0;
+				return GF_FALSE;
 			}
 		} else if (validator->xvs_filename) {
 			validator_xvs_open(validator);
 			if (!validator->xvs_node) {
-				return 0;
+				return GF_FALSE;
 			}
 			if (validator->test_filename) {
 				validator_test_open(validator);
 			} else {
 				validator_xvs_close(validator);
-				return 0;
+				return GF_FALSE;
 			}
 		} else {
-			return 0;
+			return GF_FALSE;
 		}
 
 		validator->evt_filter.udta = validator;
@@ -908,7 +924,7 @@
 		if (!validator->is_recording) {
 			validator_load_event(validator);
 		}
-		return 1;
+		return GF_TRUE;
 
 	/* when the terminal stops, we close the XVS parser and XVL parser if any, restore the config,
 	and free all validator data (the validator will be destroyed when the module is unloaded)
@@ -953,38 +969,40 @@
 			//u32 diff = gf_clock_time(validator->ck) - validator->next_time;
 			//GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Time diff: evt_time=%d  clock_time = %d, diff=%d\n", validator->next_time, gf_clock_time(validator->ck), diff));
 			if (validator->next_event_snapshot) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 				Bool res;
 				char *snap_name = validator_create_snapshot(validator);
 				gf_free(snap_name);
 				res = validator_compare_snapshots(validator);
 				validator->xvs_result &= res;
-				validator->next_event_snapshot = 0;
+				validator->next_event_snapshot = GF_FALSE;
+#endif
 			} else {
 				validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &validator->next_event);
 			}
 			has_more_events = validator_load_event(validator);
 			if (!has_more_events) {
 				validator_xvs_close(validator);
-                if (! validator->trace_mode) {
-                    gf_term_disconnect(validator->term);
-                    gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-                    validator_xvs_next(validator, 0);
-                    if (!validator->xvs_node) {
-                        GF_Event evt;
-                        memset(&evt, 0, sizeof(GF_Event));
-                        evt.type = GF_EVENT_QUIT;
-                        validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
-                    } else {
-                        if (!validator->is_recording) {
-                            validator_load_event(validator);
-                        }
-                    }
+				if (! validator->trace_mode) {
+					gf_term_disconnect(validator->term);
+					gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+					validator_xvs_next(validator, GF_FALSE);
+					if (!validator->xvs_node) {
+						GF_Event evt;
+						memset(&evt, 0, sizeof(GF_Event));
+						evt.type = GF_EVENT_QUIT;
+						validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+					} else {
+						if (!validator->is_recording) {
+							validator_load_event(validator);
+						}
+					}
 				}
 			}
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -1006,7 +1024,7 @@
 void validator_delete(GF_BaseInterface *ifce)
 {
 	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_Validator *validator = dr->udta;
+	GF_Validator *validator = (GF_Validator*)dr->udta;
 	if (validator->prev_fps) gf_free(validator->prev_fps);
 	if (validator->prev_alias) gf_free(validator->prev_alias);
 	gf_free(validator);

v0.5.2.tar.gz/modules/vtt_in/Makefile -> v0.6.1.tar.gz/modules/vtt_in/Makefile Changed

v0.5.2.tar.gz/modules/vtt_in/vtt_dec.c -> v0.6.1.tar.gz/modules/vtt_in/vtt_dec.c Changed

@@ -29,10 +29,11 @@
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/internal/media_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
+#include <gpac/internal/compositor_dev.h>
 #include <gpac/nodes_svg.h>
 #include <gpac/webvtt.h>
 
-#ifndef GPAC_DISABLE_VTT
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
 
 typedef struct {
 	GF_BaseInterface *module;
@@ -85,11 +86,11 @@
 static Bool vtt_check_download(VTTDec *vttdec)
 {
 	u64 size;
-	FILE *f = gf_f64_open(vttdec->file_name, "rt");
+	FILE *f = gf_fopen(vttdec->file_name, "rt");
 	if (!f) return GF_FALSE;
-	gf_f64_seek(f, 0, SEEK_END);
-	size = gf_f64_tell(f);
-	fclose(f);
+	gf_fseek(f, 0, SEEK_END);
+	size = gf_ftell(f);
+	gf_fclose(f);
 	if (size==vttdec->file_size) return GF_TRUE;
 	return GF_FALSE;
 }
@@ -128,6 +129,7 @@
 
 	case GPAC_OTI_SCENE_VTT_MP4:
 	{
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 		char start[100], end[100];
 		GF_List *cues;
 		cues = gf_webvtt_parse_cues_from_data(inBuffer, inBufferLength, 0);
@@ -142,6 +144,7 @@
 			}
 		}
 		gf_list_del(cues);
+#endif
 	}
 	break;
 
@@ -152,6 +155,29 @@
 	return e;
 }
 
+void VTT_UpdateSizeInfo(VTTDec *vttdec)
+{
+	u32 w, h;
+	GF_FieldInfo info;
+	char szVB[100];
+	GF_Node *root = gf_sg_get_root_node(vttdec->sg);
+	if (!root) return;
+	w = vttdec->scene->root_od->term->compositor->display_width;
+	h = vttdec->scene->root_od->term->compositor->display_height;
+
+	w=1280;
+	h=720;
+	/*apply*/
+	gf_sg_set_scene_size_info(vttdec->sg, w, h, GF_TRUE);
+
+	sprintf(szVB, "0 0 %d %d", w, h);
+	gf_node_get_attribute_by_tag(root, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(root, &info, szVB, 0);
+
+}
+
+
+
 void VTT_load_script(VTTDec *vttdec, GF_SceneGraph *graph)
 {
 	GF_Node *n, *root;
@@ -169,10 +195,9 @@
 	n = root = gf_node_new(graph, TAG_SVG_svg);
 	gf_node_register(root, NULL);
 	gf_sg_set_root_node(graph, root);
-	gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
-	gf_svg_parse_attribute(n, &info, "0 0 320 240", 0);
 	gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
 	gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
+	VTT_UpdateSizeInfo(vttdec);
 	gf_node_init(n);
 
 	n = gf_node_new(graph, TAG_SVG_script);
@@ -183,20 +208,28 @@
 		/* try to find the JS renderer in the default GPAC installation folder */
 		const char *startuppath = gf_modules_get_option((GF_BaseInterface *)vttdec->module, "General", "StartupFile");
 		path = gf_url_concatenate(startuppath, "webvtt-renderer.js");
-		jsfile = gf_f64_open(path, "rt");
+		jsfile = gf_fopen(path, "rt");
 		if (jsfile) {
 			gf_modules_set_option((GF_BaseInterface *)vttdec->module, "WebVTT", "RenderingScript", path);
-			fclose(jsfile);
+			gf_fclose(jsfile);
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[WebVTT] Cannot find Rendering Script - check config file\n"));
 			return;
 		}
 	}
-	jsfile = gf_f64_open(path, "rt");
+	jsfile = gf_fopen(path, "rt");
 	if (jsfile) {
-		fclose(jsfile);
+		gf_fclose(jsfile);
 		gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
-		gf_svg_parse_attribute(n, &info, (char *) path, 0);
+		if (strstr(path, ":\\")) {
+			gf_svg_parse_attribute(n, &info, (char *) path, 0);
+		} else {
+			char szPath[GF_MAX_PATH];
+			strcpy(szPath, "file://");
+			strcat(szPath, path);
+			gf_svg_parse_attribute(n, &info, (char *) szPath, 0);
+		}
+
 		vttdec->has_rendering_script = GF_TRUE;
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[WebVTT] Cannot open Rendering Script - %s\n", path));
@@ -352,6 +385,7 @@
 		/* TODO */
 	} else if (capability.CapCode==GF_CODEC_SHOW_SCENE) {
 		if (capability.cap.valueInt) {
+			VTT_UpdateSizeInfo(vttdec);
 			gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_FALSE);
 		} else {
 			gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_TRUE);
@@ -393,4 +427,48 @@
 	gf_free(plug);
 }
 
+#endif // !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
+
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	switch (InterfaceType) {
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
+	case GF_SCENE_DECODER_INTERFACE:
+		return (GF_BaseInterface *)NewVTTDec();
 #endif
+	default:
+		return NULL;
+	}
+}
+
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
+	case GF_SCENE_DECODER_INTERFACE:
+		DeleteVTTDec((GF_BaseDecoder *)ifce);
+		break;
+#endif
+	}
+}
+
+/*interface query*/
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
+		GF_SCENE_DECODER_INTERFACE,
+#endif
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_STATIC_DECLARATION( vtt_dec )

v0.5.2.tar.gz/modules/vtt_in/vtt_in.c -> v0.6.1.tar.gz/modules/vtt_in/vtt_in.c Changed

@@ -29,7 +29,7 @@
 #include <gpac/constants.h>
 #include <gpac/modules/js_usr.h>
 
-#ifndef GPAC_DISABLE_VTT
+#if 0
 
 typedef struct
 {
@@ -335,7 +335,7 @@
 	VTTIn *priv;
 	GF_InputService *plug;
 	GF_SAFEALLOC(plug, GF_InputService);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC SubTitle Reader", "gpac distribution")
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC VTT Reader", "gpac distribution")
 
 	plug->RegisterMimeTypes = VTT_RegisterMimeTypes;
 	plug->CanHandleURL = VTT_CanHandleURL;
@@ -369,76 +369,6 @@
 	gf_free(plug);
 }
 
-void *NewVTTDec();
-void DeleteVTTDec(GF_BaseDecoder *plug);
-//GF_JSUserExtension *NewVTTJS();
-//void DeleteVTTJS(GF_BaseInterface *ifce);
 
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewVTTDec();
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *)NewVTTInput();
-//	case GF_JS_USER_EXT_INTERFACE: return (GF_BaseInterface *)NewVTTJS();
-	default:
-		return NULL;
-	}
-}
-
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteVTTDec((GF_BaseDecoder *)ifce);
-		break;
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteVTTInput(ifce);
-		break;
-		//case GF_JS_USER_EXT_INTERFACE:
-		//	DeleteVTTJS(ifce);
-		//	break;
-	}
-}
-
-#else
-
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	return NULL;
-}
-
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-}
-
-#endif
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#if !defined(GPAC_DISABLE_VTT)
-		GF_SCENE_DECODER_INTERFACE,
-		GF_NET_CLIENT_INTERFACE,
-//		GF_JS_USER_EXT_INTERFACE,
 #endif
-		0
-	};
-	return si;
-}
 
-GPAC_MODULE_STATIC_DECLARATION( vtt_in )

v0.5.2.tar.gz/modules/wav_out/Makefile -> v0.6.1.tar.gz/modules/wav_out/Makefile Changed

v0.5.2.tar.gz/modules/wav_out/wav_out.c -> v0.6.1.tar.gz/modules/wav_out/wav_out.c Changed

@@ -117,7 +117,7 @@
 {
 	WAVCTX();
 
-	ctx->force_config = (num_buffers && total_duration) ? 1 : 0;
+	ctx->force_config = (num_buffers && total_duration) ? GF_TRUE : GF_FALSE;
 	ctx->cfg_num_buffers = num_buffers;
 	if (ctx->cfg_num_buffers <= 1) ctx->cfg_num_buffers = 2;
 	ctx->cfg_duration = total_duration;
@@ -126,7 +126,7 @@
 	return GF_OK;
 }
 
-static void CALLBACK WaveProc(HWAVEOUT hwo, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2)
+static void CALLBACK WaveProc(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
 {
 	GF_AudioOutput *dr = (GF_AudioOutput *) dwInstance;
 	WAVCTX();
@@ -145,7 +145,7 @@
 
 	/*brute-force version, actually much safer on winCE*/
 #ifdef _WIN32_WCE
-	ctx->exit_request = 1;
+	ctx->exit_request = GF_TRUE;
 	SetEvent(ctx->event);
 	waveOutReset(ctx->hwo);
 	waveOutClose(ctx->hwo);
@@ -153,9 +153,9 @@
 	ctx->wav_buf = NULL;
 	CloseHandle(ctx->event);
 	ctx->event = NULL;
-	ctx->exit_request = 0;
+	ctx->exit_request = GF_FALSE;
 #else
-	ctx->exit_request = 1;
+	ctx->exit_request = GF_TRUE;
 	SetEvent(ctx->event);
 	if (ctx->hwo) {
 		u32 i;
@@ -163,10 +163,10 @@
 		MMRESULT res;
 		/*wait for all buffers to complete, otherwise this locks waveOutReset*/
 		while (1) {
-			not_done = 0;
+			not_done = GF_FALSE;
 			for (i=0 ; i< ctx->num_buffers; i++) {
 				if (! (ctx->wav_hdr[i].dwFlags & WHDR_DONE)) {
-					not_done = 1;
+					not_done = GF_TRUE;
 					break;
 				}
 			}
@@ -184,7 +184,7 @@
 	ctx->wav_buf = NULL;
 	CloseHandle(ctx->event);
 	ctx->event = NULL;
-	ctx->exit_request = 0;
+	ctx->exit_request = GF_FALSE;
 #endif
 }
 
@@ -250,7 +250,7 @@
 	/* Open a waveform device for output using window callback. */
 	retry = 10;
 	while (retry) {
-		hr = waveOutOpen((LPHWAVEOUT)&ctx->hwo, WAVE_MAPPER, &ctx->fmt, (DWORD) WaveProc, (DWORD) dr,
+		hr = waveOutOpen((LPHWAVEOUT)&ctx->hwo, WAVE_MAPPER, &ctx->fmt, (DWORD_PTR) WaveProc, (DWORD_PTR) dr,
 		 CALLBACK_FUNCTION | WAVE_ALLOWSYNC | WAVE_FORMAT_DIRECT
 		 );
 
@@ -275,7 +275,7 @@
 	/*make sure we're aligned*/
 	while (ctx->buffer_size % ctx->fmt.nBlockAlign) ctx->buffer_size++;
 
-	ctx->wav_buf = gf_malloc(ctx->buffer_size*ctx->num_buffers*sizeof(char));
+	ctx->wav_buf = (char*)gf_malloc(ctx->buffer_size*ctx->num_buffers*sizeof(char));
 	memset(ctx->wav_buf, 0, ctx->buffer_size*ctx->num_buffers*sizeof(char));
 
 	/*setup wave headers*/
@@ -429,20 +429,19 @@
 
 void *NewWAVRender()
 {
-	WAVContext *ctx;
 	GF_AudioOutput *driv;
-	ctx = gf_malloc(sizeof(WAVContext));
+	WAVContext *ctx = (WAVContext*)gf_malloc(sizeof(WAVContext));
 	memset(ctx, 0, sizeof(WAVContext));
 	ctx->num_buffers = 10;
 	ctx->pan = 50;
 	ctx->vol = 100;
-	driv = gf_malloc(sizeof(GF_AudioOutput));
+	driv = (GF_AudioOutput*)gf_malloc(sizeof(GF_AudioOutput));
 	memset(driv, 0, sizeof(GF_AudioOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "Windows MME Output", "gpac distribution")
 
 	driv->opaque = ctx;
 
-	driv->SelfThreaded = 0;
+	driv->SelfThreaded = GF_FALSE;
 	driv->Setup = WAV_Setup;
 	driv->Shutdown = WAV_Shutdown;
 	driv->ConfigureOutput = WAV_ConfigureOutput;
@@ -478,7 +477,8 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return NewWAVRender();
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
+		return (GF_BaseInterface*)NewWAVRender();
 	return NULL;
 }

v0.5.2.tar.gz/modules/widgetman/Makefile -> v0.6.1.tar.gz/modules/widgetman/Makefile Changed

v0.5.2.tar.gz/modules/widgetman/unzip.c -> v0.6.1.tar.gz/modules/widgetman/unzip.c Changed

@@ -98,7 +98,7 @@
 		mode_fopen = "wb";
 
 	if ((filename!=NULL) && (mode_fopen != NULL))
-		file = fopen(filename, mode_fopen);
+		file = gf_fopen(filename, mode_fopen);
 	return file;
 }
 
@@ -167,7 +167,7 @@
 voidpf stream;
 {
 	int ret;
-	ret = fclose((FILE *)stream);
+	ret = gf_fclose((FILE *)stream);
 	return ret;
 }
 
@@ -1258,7 +1258,7 @@
 
 		if ((skip==0) && (err==UNZ_OK))
 		{
-			fout=fopen(write_filename,"wb");
+			fout = gf_fopen(write_filename,"wb");
 
 			/* some zipfile don't contain directory alone before file */
 			if ((fout==NULL) && (filename_withoutpath!=(char*)filename_inzip))
@@ -1267,7 +1267,7 @@
 				*(filename_withoutpath-1)='\0';
 				makedir(write_filename);
 				*(filename_withoutpath-1)=c;
-				fout=fopen(write_filename,"wb");
+				fout = gf_fopen(write_filename,"wb");
 			}
 
 			if (fout==NULL)
@@ -1298,7 +1298,7 @@
 			}
 			while (err>0);
 			if (fout)
-				fclose(fout);
+				gf_fclose(fout);
 		}
 
 		if (err==UNZ_OK)
@@ -1367,13 +1367,13 @@
 int gf_unzip_probe(const char *zipfilename)
 {
 	int ret = 0;
-	FILE *f = fopen(zipfilename, "r");
+	FILE *f = gf_fopen(zipfilename, "r");
 	if (!f) return 0;
 	if (fgetc(f)=='P')
 		if (fgetc(f)=='K')
 			if (fgetc(f)==3)
 				if (fgetc(f)==4)
 					ret = 1;
-	fclose(f);
+	gf_fclose(f);
 	return ret;
 }

v0.5.2.tar.gz/modules/widgetman/unzip.h -> v0.6.1.tar.gz/modules/widgetman/unzip.h Changed

v0.5.2.tar.gz/modules/widgetman/wgt_load.c -> v0.6.1.tar.gz/modules/widgetman/wgt_load.c Changed

@@ -43,7 +43,7 @@
 #include <gpac/nodes_svg.h>
 #include <gpac/constants.h>
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#if defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG)
 
 typedef struct
 {
@@ -75,20 +75,20 @@
 			FILE *jsfile;
 			GF_ChildNodeItem *last;
 
-			wgtload->loaded = 1;
+			wgtload->loaded = GF_TRUE;
 
 			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/2000/svg", NULL);
 			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/1999/xlink", "xlink");
 			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/2001/xml-events", "ev");
-			gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, 1);
+			gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, GF_TRUE);
 
 			/* modify the scene with an Inline/Animation pointing to the widget start file URL */
 			n = root = gf_node_new(wgtload->scene->graph, TAG_SVG_svg);
 			gf_node_register(root, NULL);
 			gf_sg_set_root_node(wgtload->scene->graph, root);
-			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_viewBox, 1, 0, &info);
+			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute(n, &info, "0 0 320 240", 0);
-			gf_node_get_attribute_by_name(n, "xmlns", 0, 1, 0, &info);
+			gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
 			/*
 						gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, 1);
@@ -103,9 +103,9 @@
 			gf_node_set_id(n, 1, "w_anim");
 			gf_node_register(n, root);
 			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, 1, 0, &info);
+			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute(n, &info, "320", 0);
-			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, 1, 0, &info);
+			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute(n, &info, "240", 0);
 			gf_node_init(n);
 
@@ -119,10 +119,10 @@
 			gf_node_register(n, root);
 			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
 			path = gf_modules_get_option((GF_BaseInterface *)plug, "Widgets", "WidgetLoadScript");
-			jsfile = path ? gf_f64_open(path, "rt") : NULL;
+			jsfile = path ? gf_fopen(path, "rt") : NULL;
 			if (jsfile) {
-				fclose(jsfile);
-				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, 1, 0, &info);
+				gf_fclose(jsfile);
+				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
 				gf_svg_parse_attribute(n, &info, (char *) path, 0);
 			} else {
 				const char *load_fun = "function load_widget(wid_url) {\n"
@@ -142,13 +142,13 @@
 
 
 			wmpath = gf_modules_get_option((GF_BaseInterface *)plug, "Widgets", "WidgetManagerScript");
-			jsfile = wmpath ? gf_f64_open(wmpath, "rt") : NULL;
+			jsfile = wmpath ? gf_fopen(wmpath, "rt") : NULL;
 			if (jsfile) {
-				fclose(jsfile);
+				gf_fclose(jsfile);
 				n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
 				gf_node_register(n, root);
 				gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, 1, 0, &info);
+				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
 				gf_svg_parse_attribute(n, &info, (char *) wmpath, 0);
 				gf_node_init(n);
 
@@ -159,7 +159,7 @@
 				gf_node_init(n);
 			}
 
-			tmp = gf_malloc(sizeof(char) * (strlen(wgtload->file_name)+50) );
+			tmp = (char*)gf_malloc(sizeof(char) * (strlen(wgtload->file_name)+50) );
 			sprintf(tmp, "load_widget(\"%s\");\n", wgtload->file_name);
 
 			n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
@@ -299,4 +299,4 @@
 	gf_free(sdec);
 }
 
-#endif	/*GPAC_HAS_SPIDERMONKEY*/
+#endif	/* defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG) */

v0.5.2.tar.gz/modules/widgetman/wgt_load_base.js -> v0.6.1.tar.gz/modules/widgetman/wgt_load_base.js Changed

v0.5.2.tar.gz/modules/widgetman/widget.c -> v0.6.1.tar.gz/modules/widgetman/widget.c Changed

@@ -103,7 +103,7 @@
 	if ((JS_LookupProperty(c, wid->widget->wm->obj, "showNotification", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
 		jsval *vars;
 		u32 i;
-		vars = gf_malloc(sizeof(jsval)*(argc+1));
+		vars = (jsval*)gf_malloc(sizeof(jsval)*(argc+1));
 		vars[0] = OBJECT_TO_JSVAL(wid->obj);
 		for (i=0; i<argc; i++)
 			vars[i+1] = argv[i];
@@ -127,7 +127,7 @@
 	if ((JS_LookupProperty(c, obj, "replyCallback", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
 		list = JSVAL_TO_OBJECT(argv[0]);
 		JS_GetArrayLength(c, list, (jsuint*) &count);
-		vals = gf_malloc(sizeof(jsval)*(count+1));
+		vals = (jsval*)gf_malloc(sizeof(jsval)*(count+1));
 		vals[0] = OBJECT_TO_JSVAL(obj);
 		for (i=0; i<count; i++) {
 			JS_GetElement(c, list, (jsint) i, &vals[i+1]);
@@ -156,7 +156,7 @@
 	SMJS_SET_RVAL( JSVAL_NULL );
 	count = gf_list_count(bifce->ifce->messages);
 	for (i=0; i<count; i++) {
-		GF_WidgetMessage *msg = gf_list_get(bifce->ifce->messages, i);
+		GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_get(bifce->ifce->messages, i);
 		if (!strcmp(msg->name, msg_name)) {
 			JSObject *an_obj = JS_NewObject(c, &bifce->wid->widget->wm->widgetAnyClass._class, 0, 0);
 			SMJS_SET_PRIVATE(c, an_obj, msg);
@@ -257,7 +257,7 @@
 
 	count = gf_list_count(wid->bound_ifces);
 	for (i=0; i<count; i++) {
-		GF_WidgetInterfaceInstance *ifce = gf_list_get(wid->bound_ifces, i);
+		GF_WidgetInterfaceInstance *ifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
 		if (strcmp(ifce->ifce->type, ifce_name)) continue;
 
 		widget_interface_js_bind(c, ifce);
@@ -285,13 +285,13 @@
 
 	count = gf_list_count(wid->widget->main->components);
 	for (i=0; i<count; i++) {
-		GF_WidgetComponent *comp = gf_list_get(wid->widget->main->components, i);
+		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
 		if (!comp->id || strcmp(comp->id, comp_id)) continue;
 
 		if (is_deactivate) {
 			wm_deactivate_component(c, wid, comp, NULL);
 		} else {
-			wm_activate_component(c, wid, comp, 0);
+			wm_activate_component(c, wid, comp, GF_FALSE);
 		}
 		break;
 	}
@@ -301,12 +301,12 @@
 
 static JSBool SMJS_FUNCTION(widget_activate_widget)
 {
-	return widget_activate_component(SMJS_CALL_ARGS, 0);
+	return widget_activate_component(SMJS_CALL_ARGS, GF_FALSE);
 }
 
 static JSBool SMJS_FUNCTION(widget_deactivate_widget)
 {
-	return widget_activate_component(SMJS_CALL_ARGS, 1);
+	return widget_activate_component(SMJS_CALL_ARGS, GF_TRUE);
 }
 
 void widget_on_interface_bind(GF_WidgetInterfaceInstance *ifce, Bool unbind)
@@ -399,7 +399,7 @@
 
 	/*Is this scenegraph a widget or not ? To find out, browse all widget instances*/
 	i=0;
-	while ((wi = gf_list_enum(wm->widget_instances, &i))) {
+	while ((wi = (GF_WidgetInstance*)gf_list_enum(wm->widget_instances, &i))) {
 		if (!wi->scene || (wi->scene != scene)) continue;
 		break;
 	}
@@ -411,7 +411,7 @@
 		/*detach all bound interfaces from this script*/
 		count = gf_list_count(wi->bound_ifces);
 		for (i=0; i<count; i++) {
-			GF_WidgetInterfaceInstance *ifce = gf_list_get(wi->bound_ifces, i);
+			GF_WidgetInterfaceInstance *ifce = (GF_WidgetInterfaceInstance*)gf_list_get(wi->bound_ifces, i);
 			if (ifce->obj) {
 				SMJS_SET_PRIVATE(c, ifce->obj, NULL);
 				gf_js_remove_root(c, &ifce->obj, GF_JSGC_OBJECT);

v0.5.2.tar.gz/modules/widgetman/widgetman.c -> v0.6.1.tar.gz/modules/widgetman/widgetman.c Changed

@@ -70,11 +70,12 @@
 		if (p1[i] != p2[i]) {
 			if ((c1=='/') && (c2=='\\')) {}
 			else if ((c1=='\\') && (c2=='/')) {}
-			else return 0;
+			else return GF_FALSE;
 		}
 		i++;
 	} while (c1);
-	return 1;
+
+	return GF_TRUE;
 }
 
 static void widget_package_extract_file(GF_WidgetPackage *wpack, GF_WidgetPackageResource *res)
@@ -104,7 +105,7 @@
 
 			unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
 
-			fout=gf_f64_open(res->extracted_path, "wb");
+			fout=gf_fopen(res->extracted_path, "wb");
 			if (!fout) break;
 			do {
 				err = unzReadCurrentFile(uf,buf,8192);
@@ -115,9 +116,9 @@
 						break;
 					}
 			} while (err>0);
-			if (fout) fclose(fout);
+			if (fout) gf_fclose(fout);
 
-			res->extracted = 1;
+			res->extracted = GF_TRUE;
 			break;
 		}
 		unzClose(uf);
@@ -127,18 +128,18 @@
 		GF_ISOFile *isom = gf_isom_open(wpack->package_path, GF_ISOM_OPEN_READ, 0);
 		if (!isom ) return;
 
-		count = gf_isom_get_meta_item_count(isom, 1, 0);
+		count = gf_isom_get_meta_item_count(isom, GF_TRUE, 0);
 		for (i=0; i<count; i++) {
 			u32 ID;
 			const char *url, *urn, *enc;
 			Bool self_ref;
 			const char *item_name;
 
-			gf_isom_get_meta_item_info(isom, 1, 0, i+1, &ID, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
+			gf_isom_get_meta_item_info(isom, GF_TRUE, 0, i+1, &ID, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
 			if (strcmp(res->inner_path, item_name)) continue;
 
-			gf_isom_extract_meta_item(isom, 1, 0, ID, res->extracted_path);
-			res->extracted = 1;
+			gf_isom_extract_meta_item(isom, GF_TRUE, 0, ID, res->extracted_path);
+			res->extracted = GF_TRUE;
 			break;
 		}
 		gf_isom_close(isom);
@@ -152,15 +153,15 @@
 	u32 count, i;
 	count = gf_list_count(wpack->resources);
 	for (i=0; i<count; i++) {
-		GF_WidgetPackageResource *pack_res = gf_list_get(wpack->resources, i);
+		GF_WidgetPackageResource *pack_res = (GF_WidgetPackageResource*)gf_list_get(wpack->resources, i);
 		if (is_same_path(res_path, pack_res->inner_path, 0)) {
 			strcpy(localized_rel_path, res_path);
 			strcpy(relocated_path, pack_res->extracted_path);
 			if (!pack_res->extracted) widget_package_extract_file(wpack, pack_res);
-			return 1;
+			return GF_TRUE;
 		}
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 /* Checks if a resource in the package has the given rel_path, potentially in a localized sub-folder */
@@ -180,7 +181,7 @@
 	}
 	/*resource doesn't belong to our archive*/
 	else {
-		return 0;
+		return GF_FALSE;
 	}
 
 	/* First try to locate the resource in the locales folder */
@@ -215,7 +216,7 @@
 
 		sprintf(path, "locales/%s/%s", lan, rel_path);
 		if (package_find_res(wpack, path, relocated_path, localized_rel_path))
-			return 1;
+			return GF_TRUE;
 
 		/*recursively remove region (sub)tags*/
 		while (1) {
@@ -224,17 +225,17 @@
 			sep[0] = 0;
 			sprintf(path, "locales/%s/%s", lan, rel_path);
 			if (package_find_res(wpack, path, relocated_path, localized_rel_path))
-				return 1;
+				return GF_TRUE;
 		}
 	}
 
 	/*no locale*/
 	if (package_find_res(wpack, (char*)rel_path, relocated_path, localized_rel_path))
-		return 1;
+		return GF_TRUE;
 
 	strcpy(localized_rel_path, "");
 	strcpy(relocated_path, "");
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -253,8 +254,8 @@
 	GF_ISOFile *isom = gf_isom_open(path, GF_ISOM_OPEN_READ, 0);
 	if (!isom ) return NULL;
 
-	brand = gf_isom_get_meta_type(isom, 1, 0);
-	if ((brand!=GF_4CC('m','w','g','t') )		|| !gf_isom_has_meta_xml(isom, 1, 0) ) {
+	brand = gf_isom_get_meta_type(isom, GF_TRUE, 0);
+	if ((brand!=GF_4CC('m','w','g','t') )		|| !gf_isom_has_meta_xml(isom, GF_TRUE, 0) ) {
 		gf_isom_close(isom);
 		return NULL;
 	}
@@ -275,7 +276,7 @@
 
 	strcpy(szPath, wzip->root_extracted_path);
 	strcat(szPath, "config.xml");
-	if (gf_isom_extract_meta_xml(isom, 1, 0, szPath, NULL) != GF_OK) {
+	if (gf_isom_extract_meta_xml(isom, GF_TRUE, 0, szPath, NULL) != GF_OK) {
 		gf_list_del(wzip->resources);
 		gf_free(wzip);
 		gf_isom_close(isom);
@@ -287,11 +288,11 @@
 	GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
 	pack_res->extracted_path = gf_strdup(szPath);
 	pack_res->inner_path = gf_strdup("config.xml");
-	pack_res->extracted = 1;
+	pack_res->extracted = GF_TRUE;
 	gf_list_add(wzip->resources, pack_res);
 
 
-	count = gf_isom_get_meta_item_count(isom, 1, 0);
+	count = gf_isom_get_meta_item_count(isom, GF_TRUE, 0);
 	for (i=0; i<count; i++) {
 		u32 ID;
 		const char *url, *urn, *enc;
@@ -299,7 +300,7 @@
 		char *sep;
 		const char *item_name;
 
-		gf_isom_get_meta_item_info(isom, 1, 0, i+1, &ID, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
+		gf_isom_get_meta_item_info(isom, GF_TRUE, 0, i+1, &ID, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
 
 		sep = strrchr(item_name, '/');
 		if (!sep) sep = strrchr(item_name, '\\');
@@ -314,7 +315,7 @@
 		GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
 		pack_res->extracted_path = gf_strdup(szPath);
 		pack_res->inner_path = gf_strdup(item_name);
-		pack_res->extracted = 0;
+		pack_res->extracted = GF_FALSE;
 		gf_list_add(wzip->resources, pack_res);
 	}
 	gf_isom_close(isom);
@@ -340,7 +341,7 @@
 	GF_SAFEALLOC(wzip, GF_WidgetPackage);
 
 	wzip->wm = wm;
-	wzip->is_zip = 1;
+	wzip->is_zip = GF_TRUE;
 	wzip->relocate_uri = widget_package_relocate_uri;
 	wzip->resources = gf_list_new();
 	wzip->package_path = gf_strdup(path);
@@ -379,7 +380,7 @@
 			FILE *fout;
 			unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
 
-			fout=gf_f64_open(szPath,"wb");
+			fout=gf_fopen(szPath,"wb");
 			if (!fout) return NULL;
 
 			do {
@@ -392,19 +393,19 @@
 						break;
 					}
 			} while (err>0);
-			if (fout) fclose(fout);
+			if (fout) gf_fclose(fout);
 			if (err==0) {
 				GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
 				pack_res->extracted_path = gf_strdup(szPath);
 				pack_res->inner_path = gf_strdup(filename_inzip);
-				pack_res->extracted = 1;
+				pack_res->extracted = GF_TRUE;
 				gf_list_add(wzip->resources, pack_res);
 			}
 		} else {
 			GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
 			pack_res->extracted_path = gf_strdup(szPath);
 			pack_res->inner_path = gf_strdup(filename_inzip);
-			pack_res->extracted = 0;
+			pack_res->extracted = GF_FALSE;
 			gf_list_add(wzip->resources, pack_res);
 		}
 
@@ -441,7 +442,7 @@
 	gf_mx_v(wm->term->net_mx);
 
 	while (gf_list_count(wpackage->resources)) {
-		GF_WidgetPackageResource *wu = gf_list_get(wpackage->resources, 0);
+		GF_WidgetPackageResource *wu = (GF_WidgetPackageResource*)gf_list_get(wpackage->resources, 0);
 		gf_list_rem(wpackage->resources, 0);
 		gf_delete_file(wu->extracted_path);
 		gf_free(wu->extracted_path);
@@ -471,15 +472,15 @@
 	if (!content) return;
 
 	while (gf_list_count(content->interfaces)) {
-		GF_WidgetInterface*ifce = gf_list_last(content->interfaces);
+		GF_WidgetInterface *ifce = (GF_WidgetInterface*)gf_list_last(content->interfaces);
 		gf_list_rem_last(content->interfaces);
 
 		while (gf_list_count(ifce->messages)) {
-			GF_WidgetMessage *msg = gf_list_last(ifce->messages);
+			GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_last(ifce->messages);
 			gf_list_rem_last(ifce->messages);
 
 			while (gf_list_count(msg->params)) {
-				GF_WidgetPin *par = gf_list_last(msg->params);
+				GF_WidgetPin *par = (GF_WidgetPin*)gf_list_last(msg->params);
 				gf_list_rem_last(msg->params);
 				wm_delete_message_param(par);
 			}
@@ -502,14 +503,14 @@
 	gf_list_del(content->interfaces);
 
 	while (gf_list_count(content->components)) {
-		GF_WidgetComponent *comp = gf_list_last(content->components);
+		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_last(content->components);
 		gf_list_rem_last(content->components);
 
 		wm_delete_message_param(comp->activateTrigger);
 		wm_delete_message_param(comp->deactivateTrigger);
 
 		while (gf_list_count(comp->required_interfaces)) {
-			char *type = gf_list_last(comp->required_interfaces);
+			char *type = (char*)gf_list_last(comp->required_interfaces);
 			gf_list_rem_last(comp->required_interfaces);
 			if (type) gf_free(type);
 		}
@@ -521,7 +522,7 @@
 	gf_list_del(content->components);
 
 	while (gf_list_count(content->preferences)) {
-		GF_WidgetPreference *pref = gf_list_last(content->preferences);
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_last(content->preferences);
 		gf_list_rem_last(content->preferences);
 
 		wm_delete_message_param(pref->connectTo);
@@ -566,18 +567,18 @@
 
 
 	while (gf_list_count(wid->icons)) {
-		GF_WidgetContent *icon = gf_list_get(wid->icons, 0);
+		GF_WidgetContent *icon = (GF_WidgetContent*)gf_list_get(wid->icons, 0);
 		gf_list_rem(wid->icons, 0);
 		wm_delete_widget_content(icon);
 	}
 	gf_list_del(wid->icons);
 
 	while (gf_list_count(wid->features)) {
-		GF_WidgetFeature *f = gf_list_get(wid->features, 0);
+		GF_WidgetFeature *f = (GF_WidgetFeature*)gf_list_get(wid->features, 0);
 		gf_list_rem(wid->features, 0);
 		if (f->name) gf_free(f->name);
 		while (gf_list_count(f->params)) {
-			GF_WidgetFeatureParam *p = gf_list_get(f->params, 0);
+			GF_WidgetFeatureParam *p = (GF_WidgetFeatureParam*)gf_list_get(f->params, 0);
 			gf_list_rem(f->params, 0);
 			if (p->name) gf_free(p->name);
 			if (p->value) gf_free(p->value);
@@ -605,7 +606,7 @@
 {
 
 	while (gf_list_count(widg->components)) {
-		GF_WidgetComponentInstance *comp = gf_list_get(widg->components, 0);
+		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(widg->components, 0);
 		gf_list_rem(widg->components, 0);
 		if (comp->wid) wm_delete_widget_instance(wm, comp->wid);
 		gf_free(comp);
@@ -613,7 +614,7 @@
 	gf_list_del(widg->components);
 
 	while (gf_list_count(widg->bound_ifces)) {
-		GF_WidgetInterfaceInstance *bifce = gf_list_get(widg->bound_ifces, 0);
+		GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance*)gf_list_get(widg->bound_ifces, 0);
 		gf_list_rem(widg->bound_ifces, 0);
 		wm_delete_interface_instance(wm, bifce);
 	}
@@ -703,7 +704,7 @@
 
 	if (param->in_action) return JS_TRUE;
 
-	param->in_action = 1;
+	param->in_action = GF_TRUE;
 
 #ifndef GPAC_DISABLE_SVG
 	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
@@ -728,9 +729,9 @@
 					gf_node_changed(n, NULL);
 				}
 				else {
-					if (gf_node_get_attribute_by_name(n, param->attribute, 0, 1, 0, &info)==GF_OK) {
+					if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 						gf_svg_parse_attribute(n, &info, (char *)str_val, 0);
-						if (info.fieldType==XMLRI_datatype) gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
+						if (info.fieldType==XMLRI_datatype) gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 						gf_node_changed(n, &info);
 					}
 				}
@@ -749,7 +750,7 @@
 			} else {
 				/*should we fire a DOMAttrModified event ? to clarify in the spec*/
 
-				if (gf_node_get_attribute_by_name(n, param->attribute, 0, 1, 0, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 					evt.bubbles = 1;
 					evt.type = GF_EVENT_ATTR_MODIFIED;
 					evt.attr = &info;
@@ -873,7 +874,7 @@
 #endif /*GPAC_DISABLE_VRML*/
 
 exit:
-	param->in_action = 0;
+	param->in_action = GF_FALSE;
 	return JS_TRUE;
 }
 
@@ -914,7 +915,7 @@
 		JSObject *list = JSVAL_TO_OBJECT(argv[1]);
 		u32 i, count;
 		JS_GetArrayLength(c, list, (jsuint*) &count);
-		args = gf_malloc(sizeof(jsval)*count);
+		args = (jsval*)gf_malloc(sizeof(jsval)*count);
 		for (i=0; i<count; i++) {
 			JS_GetElement(c, list, (jsint) i, &args[i] );
 		}
@@ -969,7 +970,7 @@
 				att_name = (u32) -1;
 			}
 			/* modify an attribute */
-			else if (gf_node_get_attribute_by_name(n, param->attribute, 0, 1, 0, &info)==GF_OK) {
+			else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 				att_name = info.fieldIndex;
 			}
 			else {
@@ -993,15 +994,15 @@
 	handler->sgprivate->UserCallback = wm_handler_destroy;
 
 	/*create attributes if needed*/
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, 1, 0, &info);
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 	((XMLEV_Event*)info.far_ptr)->type = evt_type;
 	((XMLEV_Event*)info.far_ptr)->parameter = att_name;
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, 1, 0, &info);
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
 	((XMLRI*)info.far_ptr)->target = (GF_Node*)handler;
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, 1, 0, &info);
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
 	((XMLRI*)info.far_ptr)->target = n;
 
-	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, 1, 0, &info);
+	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 	((XMLEV_Event*)info.far_ptr)->type = evt_type;
 	((XMLEV_Event*)info.far_ptr)->parameter = att_name;
 
@@ -1019,8 +1020,8 @@
 	GF_WidgetComponent *comp;
 	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
 
-	c = handler->js_context;
-	obj = handler->evt_listen_obj;
+	c = (JSContext*)handler->js_context;
+	obj = (JSObject*)handler->evt_listen_obj;
 	if (!c || !obj) return;
 	wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
 	if (!wid) return;
@@ -1029,16 +1030,16 @@
 	if (unload) {
 		wm_deactivate_component(c, wid, comp, NULL);
 	} else {
-		wm_activate_component(c, wid, comp, 0);
+		wm_activate_component(c, wid, comp, GF_FALSE);
 	}
 }
 static void wm_component_activate_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
 {
-	wm_component_activation_event(hdl, evt, observer, 0);
+	wm_component_activation_event(hdl, evt, observer, GF_FALSE);
 }
 static void wm_component_deactivate_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
 {
-	wm_component_activation_event(hdl, evt, observer, 1);
+	wm_component_activation_event(hdl, evt, observer, GF_TRUE);
 }
 
 static void wm_widget_set_pref_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
@@ -1051,11 +1052,13 @@
 	if (evt->type != GF_EVENT_ATTR_MODIFIED) return;
 
 	if (evt->detail == (u32) -1) {
+#ifndef GPAC_DISABLE_SVG
 		att = gf_dom_flatten_textContent(evt->target);
+#endif
 	} else {
 		att = gf_node_dump_attribute(evt->target, evt->attr);
-		if (!att) return;
 	}
+	if (!att) return;
 	gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *)wid->secname, pref->name, att);
 	gf_free(att);
 }
@@ -1069,12 +1072,12 @@
 	if (!wid || wid->activated) return;
 
 	/*widget is now activated*/
-	wid->activated = 1;
+	wid->activated = GF_TRUE;
 
 	/*for all components, setup bindings on activateTrigger & deactivateTrigger*/
 	count = gf_list_count(wid->widget->main->components);
 	for (i=0; i<count; i++) {
-		GF_WidgetComponent *comp = gf_list_get(wid->widget->main->components, i);
+		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
 		/*setup listener*/
 		if (comp->activateTrigger && comp->activateTrigger->attribute) {
 			SVG_handlerElement *a_hdl = wm_create_scene_listener(wid, comp->activateTrigger);
@@ -1102,7 +1105,7 @@
 	count = gf_list_count(wid->widget->main->preferences);
 	for (i=0; i<count; i++) {
 		const char *value;
-		GF_WidgetPreference *pref = gf_list_get(wid->widget->main->preferences, i);
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
 
 
 		/*get stored value for this preference*/
@@ -1114,7 +1117,7 @@
 		if (context) {
 			GF_XMLNode *pref_node;
 			u32 j=0;
-			while ((pref_node = gf_list_enum(context->content, &j))) {
+			while ((pref_node = (GF_XMLNode*)gf_list_enum(context->content, &j))) {
 				const char *att;
 				if (pref_node->type != GF_XML_NODE_TYPE) continue;
 				if (strcmp(pref_node->name, "preference")) continue;
@@ -1158,7 +1161,7 @@
 		wid->mpegu_context = NULL;
 	}
 
-	gf_sg_lock_javascript(wid->widget->wm->ctx, 1);
+	gf_sg_lock_javascript(wid->widget->wm->ctx, GF_TRUE);
 	/*refresh all interface bindings*/
 	JS_LookupProperty(wid->widget->wm->ctx, wid->widget->wm->obj, "check_bindings", &funval);
 	if (JSVAL_IS_OBJECT(funval)) {
@@ -1170,7 +1173,7 @@
 	if (JSVAL_IS_OBJECT(funval)) {
 		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, funval, 0, 0, &rval);
 	}
-	gf_sg_lock_javascript(wid->widget->wm->ctx, 0);
+	gf_sg_lock_javascript(wid->widget->wm->ctx, GF_FALSE);
 }
 
 
@@ -1180,8 +1183,8 @@
 	JSContext *c;
 	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
 
-	c = handler->js_context;
-	obj = handler->evt_listen_obj;
+	c = (JSContext*)handler->js_context;
+	obj = (JSObject*)handler->evt_listen_obj;
 	if (!c || !obj) return;
 
 	on_widget_activated(c, obj);
@@ -1190,9 +1193,11 @@
 
 static JSBool SMJS_FUNCTION(wm_widget_activate)
 {
+#ifndef GPAC_DISABLE_SVG
 	SVG_handlerElement *handler;
+#endif
 	GF_MediaObject *mo;
-	Bool direct_trigger = 0;
+	Bool direct_trigger = GF_FALSE;
 	MFURL url;
 	SFURL _url;
 	GF_Node *inl;
@@ -1210,10 +1215,10 @@
 	_url.url = gf_url_concatenate(wid->widget->url, wid->widget->main->relocated_src);
 	url.count = 1;
 	url.vals = &_url;
-	mo = gf_mo_register(inl, &url, 0, 1);
+	mo = gf_mo_register(inl, &url, GF_FALSE, GF_TRUE);
 	if (mo) {
 		wid->scene = gf_mo_get_scenegraph(mo);
-		if (wid->scene && gf_sg_get_root_node(wid->scene)) direct_trigger = 1;
+		if (wid->scene && gf_sg_get_root_node(wid->scene)) direct_trigger = GF_TRUE;
 	}
 	if (_url.url) gf_free(_url.url);
 
@@ -1240,7 +1245,7 @@
 	GF_Node *n;
 	jsval argv[1], rval, jsfun;
 	SVG_handlerElement *handler = (SVG_handlerElement *) hdl;
-	GF_WidgetPin *param = handler->js_fun;
+	GF_WidgetPin *param = (GF_WidgetPin*)handler->js_fun;
 	GF_WidgetInstance *wid = (GF_WidgetInstance *)handler->evt_listen_obj;
 
 	if (!wid->scene)
@@ -1266,7 +1271,7 @@
 			char *txt = gf_dom_flatten_textContent(n);
 			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, txt ? txt : "") );
 			if (txt) gf_free(txt);
-		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, 1, 0, &info)==GF_OK) {
+		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 			char *attValue;
 			if (event->attr->fieldIndex != info.fieldIndex) return;
 
@@ -1336,7 +1341,7 @@
 			char *txt = gf_dom_flatten_textContent(n);
 			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, txt ? txt : "") ));
 			if (txt) gf_free(txt);
-		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, 1, 0, &info)==GF_OK) {
+		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 			char *attValue = gf_node_dump_attribute(n, &info);
 			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, attValue) ));
 			if (attValue) gf_free(attValue);
@@ -1426,12 +1431,12 @@
 	if (JSVAL_IS_INT(argv[0])) {
 		u32 idx;
 		idx = JSVAL_TO_INT(argv[0]);
-		msg = gf_list_get(ifce->messages, idx);
+		msg = (GF_WidgetMessage*)gf_list_get(ifce->messages, idx);
 	} else if (JSVAL_IS_STRING(argv[0])) {
 		u32 i, count = gf_list_count(ifce->messages);
 		char *name = SMJS_CHARS(c, argv[0]);
 		for (i=0; i<count; i++) {
-			msg = gf_list_get(ifce->messages, i);
+			msg = (GF_WidgetMessage*)gf_list_get(ifce->messages, i);
 			if (!strcmp(msg->name, name)) break;
 			msg = NULL;
 		}
@@ -1466,7 +1471,7 @@
 	comp_id = SMJS_CHARS(c, argv[0]);
 	count = gf_list_count(wid->components);
 	for (i=0; i<count; i++) {
-		comp_inst = gf_list_get(wid->components, i);
+		comp_inst = (GF_WidgetComponentInstance*)gf_list_get(wid->components, i);
 		if (comp_inst->comp->id && !strcmp(comp_inst->comp->id, comp_id)) {
 			SMJS_SET_RVAL( OBJECT_TO_JSVAL(comp_inst->wid->obj) );
 			SMJS_FREE(c, comp_id);
@@ -1477,10 +1482,10 @@
 	if ((argc==2) && JSVAL_IS_BOOLEAN(argv[1]) && (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ) {
 		count = gf_list_count(wid->widget->main->components);
 		for (i=0; i<count; i++) {
-			GF_WidgetComponent *comp = gf_list_get(wid->widget->main->components, i);
+			GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
 			if (!comp->id || strcmp(comp->id, comp_id)) continue;
 
-			comp_inst = wm_activate_component(c, wid, comp, 1);
+			comp_inst = wm_activate_component(c, wid, comp, GF_TRUE);
 			if (comp_inst) {
 				SMJS_SET_RVAL( OBJECT_TO_JSVAL(comp_inst->wid->obj) );
 				SMJS_FREE(c, comp_id);
@@ -1505,7 +1510,7 @@
 	if (!wid || !argc || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
 
 	idx = JSVAL_TO_INT(argv[0]);
-	ifce = gf_list_get(wid->widget->main->interfaces, idx);
+	ifce = (GF_WidgetInterface*)gf_list_get(wid->widget->main->interfaces, idx);
 
 	if (ifce) {
 		if (!ifce->obj) {
@@ -1582,7 +1587,7 @@
 
 	count = gf_list_count(wid->widget->main->preferences);
 	for (i=0; i<count; i++) {
-		GF_WidgetPreference *pref = gf_list_get(wid->widget->main->preferences, i);
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
 
 		/*preference is read only, do not include in context*/
 		if (pref->flags & GF_WM_PREF_READONLY) continue;
@@ -1695,7 +1700,7 @@
 	count = gf_list_count(wid->widget->icons);
 	arr = JS_NewArrayObject(c, count, NULL);
 	for (i = 0; i<count; i++) {
-		GF_WidgetContent *icon = gf_list_get(wid->widget->icons, i);
+		GF_WidgetContent *icon = (GF_WidgetContent*)gf_list_get(wid->widget->icons, i);
 		if (icon) {
 			char *abs_reloc_url;
 			jsval icon_obj_val;
@@ -1720,7 +1725,7 @@
 	count = gf_list_count(wid->widget->main->preferences);
 	arr = JS_NewArrayObject(c, count, NULL);
 	for (i = 0; i<count; i++) {
-		GF_WidgetPreference *pref = gf_list_get(wid->widget->main->preferences, i);
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
 		if (pref) {
 			jsval pref_obj_val;
 			JSObject *pref_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
@@ -1740,7 +1745,7 @@
 	count = gf_list_count(wid->widget->features);
 	arr = JS_NewArrayObject(c, count, NULL);
 	for (i = 0; i<count; i++) {
-		GF_WidgetFeature *feat = gf_list_get(wid->widget->features, i);
+		GF_WidgetFeature *feat = (GF_WidgetFeature*)gf_list_get(wid->widget->features, i);
 		if (feat) {
 			jsval feat_obj_val;
 			JSObject *feat_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
@@ -1753,7 +1758,7 @@
 				pcount = gf_list_count(feat->params);
 				params_arr = JS_NewArrayObject(c, pcount, NULL);
 				for (j=0; j < pcount; j++) {
-					GF_WidgetFeatureParam *param = gf_list_get(feat->params, j);
+					GF_WidgetFeatureParam *param = (GF_WidgetFeatureParam*)gf_list_get(feat->params, j);
 					JSObject *param_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
 					jsval param_obj_val;
 					SMJS_SET_PRIVATE(c, param_obj, param);
@@ -1778,7 +1783,7 @@
 	count = gf_list_count(wid->components);
 	arr = JS_NewArrayObject(c, count, NULL);
 	for (i = 0; i<count; i++) {
-		GF_WidgetComponentInstance *comp = gf_list_get(wid->components, i);
+		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(wid->components, i);
 		val = OBJECT_TO_JSVAL(comp->wid->obj);
 		JS_SetElement(c, arr, i, &val);
 	}
@@ -1913,7 +1918,7 @@
 
 /*internal to WidgetManager, never stored*/
 if (!strcmp(prop_name, "permanent")) {
-	wid->permanent = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? 1 : 0;
+	wid->permanent = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? GF_TRUE : GF_FALSE;
 }
 
 /*any widget properties*/
@@ -1972,7 +1977,7 @@
 		hostname = SMJS_CHARS(c, argv[2]);
 		count = gf_list_count(wid->bound_ifces);
 		for (i=0; i<count; i++) {
-			bifce = gf_list_get(wid->bound_ifces, i);
+			bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
 			if (!strcmp(bifce->ifce->type, ifce->type) && (bifce->cookie==cookie) ) {
 				SMJS_FREE(c, hostname);
 				return JS_TRUE;
@@ -1989,7 +1994,7 @@
 		if (ifce->bind_action) {
 			return wm_widget_set_scene_input_value(c, obj, 1, argv, rval, 2, NULL, NULL, NULL);
 		} else {
-			widget_on_interface_bind(bifce, 0);
+			widget_on_interface_bind(bifce, GF_FALSE);
 		}
 	} else {
 		JSObject *cookie = NULL;
@@ -1997,35 +2002,37 @@
 
 		count = gf_list_count(wid->bound_ifces);
 		for (i=0; i<count; i++) {
-			bifce = gf_list_get(wid->bound_ifces, i);
+			bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
 			if (!ifce || ( !strcmp(bifce->ifce->type, ifce->type) && (bifce->cookie==cookie)) ) {
 				gf_list_rem(wid->bound_ifces, i);
 				if (bifce->ifce->unbind_action) {
 					wm_widget_set_scene_input_value(c, NULL, 0, NULL, rval, 3, wid, bifce->ifce->unbind_action, NULL);
 				} else {
-					widget_on_interface_bind(bifce, 1);
+					widget_on_interface_bind(bifce, GF_TRUE);
 				}
 				if (ifce) {
 					/*unregister our message handlers*/
 					count = gf_list_count(wid->output_triggers);
 					for (i=0; i<count; i++) {
 						u32 j, c2, found;
-						GF_DOMHandler *handler = gf_list_get(wid->output_triggers, i);
-						GF_WidgetPin *param = handler->js_fun;
+						GF_DOMHandler *handler = (GF_DOMHandler*)gf_list_get(wid->output_triggers, i);
+						GF_WidgetPin *param = (GF_WidgetPin*)handler->js_fun;
 
 						if (handler->sgprivate->UserPrivate != cookie) continue;
 						found = 0;
 						c2 = gf_list_count(bifce->ifce->messages);
 						for (j=0; j<c2; j++) {
-							GF_WidgetMessage *msg = gf_list_get(bifce->ifce->messages, j);
+							GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_get(bifce->ifce->messages, j);
 							if (msg->output_trigger == param) {
 								found = 1;
 								break;
 							}
 						}
 						if (found) {
+#ifndef GPAC_DISABLE_SVG
 							GF_Node *listener = handler->sgprivate->parents->node;
 							gf_dom_listener_del(listener, listener->sgprivate->UserPrivate);
+#endif
 							gf_list_rem(wid->output_triggers, i);
 							i--;
 							count--;
@@ -2047,14 +2054,14 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	SMJS_DECL_RVAL
-	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, 0);
+	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, GF_FALSE);
 }
 static JSBool SMJS_FUNCTION(wm_widget_unbind_interface)
 {
 	SMJS_OBJ
 	SMJS_ARGS
 	SMJS_DECL_RVAL
-	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, 1);
+	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, GF_TRUE);
 }
 
 
@@ -2071,7 +2078,7 @@
 		GF_WidgetInstance *par_wid = wid->parent;
 		count = gf_list_count(par_wid->components);
 		for (i=0; i<count; i++) {
-			GF_WidgetComponentInstance *comp = gf_list_get(par_wid->components, i);
+			GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(par_wid->components, i);
 			if (comp->wid == wid) {
 				gf_list_rem(par_wid->components, i);
 				gf_free(comp);
@@ -2083,13 +2090,13 @@
 
 	/*remove all components*/
 	while (gf_list_count(wid->components)) {
-		GF_WidgetComponentInstance *comp = gf_list_get(wid->components, 0);
+		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(wid->components, 0);
 		wm_deactivate_component(c, wid, NULL, comp);
 		gf_list_rem(wid->components, 0);
 	}
 
 	/*mark the widget as deactivated, so it is no longer valid when checking all widgets bindings*/
-	wid->activated = 0;
+	wid->activated = GF_FALSE;
 
 	/*unbind existing widgets*/
 	JS_LookupProperty(wid->widget->wm->ctx, wid->widget->wm->obj, "unbind_widget", &funval);
@@ -2100,7 +2107,7 @@
 	}
 
 	/*unbind all interfaces of this widget*/
-	wm_widget_bind_interface_ex(c, obj, 0, NULL, SMJS_GET_RVAL, 1);
+	wm_widget_bind_interface_ex(c, obj, 0, NULL, SMJS_GET_RVAL, GF_TRUE);
 
 	/*detach scene now that all unbind events have been sent*/
 	wid->scene = NULL;
@@ -2124,7 +2131,7 @@
 
 	if (!comp_inst) {
 		u32 i=0;
-		while ((comp_inst = gf_list_enum(wid->components, &i))) {
+		while ((comp_inst = (GF_WidgetComponentInstance*)gf_list_enum(wid->components, &i))) {
 			if (comp_inst->comp == comp) break;
 			comp_inst = NULL;
 		}
@@ -2152,13 +2159,13 @@
 
 		count = gf_list_count(wid->widget->wm->widget_instances);
 		for (i=0; i<count; i++) {
-			comp_wid = gf_list_get(wid->widget->wm->widget_instances, i);
+			comp_wid = (GF_WidgetInstance*)gf_list_get(wid->widget->wm->widget_instances, i);
 			if (!strcmp(comp_wid->widget->url, url) && !comp_wid->parent) break;
 			comp_wid = NULL;
 		}
 		if (!comp_wid) {
-			comp_wid = wm_load_widget(wid->widget->wm, url, 0, 0);
-			if (comp_wid) comp_wid->permanent = 0;
+			comp_wid = wm_load_widget(wid->widget->wm, url, 0, GF_FALSE);
+			if (comp_wid) comp_wid->permanent = GF_FALSE;
 		}
 		gf_free(url);
 	}
@@ -2204,7 +2211,7 @@
 	SMJS_SET_RVAL(BOOLEAN_TO_JSVAL(JS_FALSE));
 	count = gf_list_count(wid->bound_ifces);
 	for (i=0; i<count; i++) {
-		GF_WidgetInterfaceInstance *bifce = gf_list_get(wid->bound_ifces, i);
+		GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
 		if (!strcmp(bifce->ifce->type, ifce->type) && (!cookie || (bifce->cookie==cookie))) {
 			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
 			break;
@@ -2247,12 +2254,12 @@
 	wid=NULL;
 	count = gf_list_count(wm->widget_instances);
 	for (i=0; i<count; i++) {
-		wid = gf_list_get(wm->widget_instances, i);
+		wid = (GF_WidgetInstance*)gf_list_get(wm->widget_instances, i);
 		if (!strcmp(wid->widget->url, url) && !wid->activated) break;
 		wid = NULL;
 	}
 	if (!wid) {
-		wid = wm_load_widget(wm, url, 0, 1);
+		wid = wm_load_widget(wm, url, 0, GF_TRUE);
 	}
 	if (url) gf_free(url);
 
@@ -2363,7 +2370,7 @@
 	if (!argc || !JSVAL_IS_INT(argv[0])) return JS_TRUE;
 
 	i = JSVAL_TO_INT(argv[0]);
-	wid = gf_list_get(wm->widget_instances, i);
+	wid = (GF_WidgetInstance*)gf_list_get(wm->widget_instances, i);
 	if (wid) SMJS_SET_RVAL( OBJECT_TO_JSVAL(wid->obj) );
 	return JS_TRUE;
 }
@@ -2380,10 +2387,10 @@
 
 	ifce_name = SMJS_CHARS(c, argv[0]);
 	i=0;
-	while ( (wid = gf_list_enum(wm->widget_instances, &i) )) {
+	while ( (wid = (GF_WidgetInstance*)gf_list_enum(wm->widget_instances, &i) )) {
 		u32 j=0;
 		GF_WidgetInterface *wid_ifce;
-		while ((wid_ifce = gf_list_enum(wid->widget->main->interfaces, &j))) {
+		while ((wid_ifce = (GF_WidgetInterface*)gf_list_enum(wid->widget->main->interfaces, &j))) {
 			if (!strcmp(wid_ifce->type, ifce_name)) {
 				SMJS_SET_RVAL( OBJECT_TO_JSVAL(wid->obj) );
 				SMJS_FREE(c, ifce_name);
@@ -2415,13 +2422,13 @@
 /* TODO Implement real language check according to BCP 47*/
 static Bool wm_check_language(const char *xml_lang_value, const char *user_locale)
 {
-	Bool ret = 0;
+	Bool ret = GF_FALSE;
 	char *sep, *val;
 	val = (char*)xml_lang_value;
 	while (!ret) {
 		sep = strchr(val, ';');
 		if (sep) sep[0] = 0;
-		if (strstr(user_locale, val)) ret = 1;
+		if (strstr(user_locale, val)) ret = GF_TRUE;
 		if (sep) {
 			sep[0] = ';';
 			val = sep+1;
@@ -2442,7 +2449,7 @@
 
 	count = gf_list_count(root->content);
 	for (i=0; i<count; i++) {
-		GF_XMLNode *n = gf_list_get(root->content, i);
+		GF_XMLNode *n = (GF_XMLNode*)gf_list_get(root->content, i);
 		if (n->type==GF_XML_NODE_TYPE && n->name && !strcmp(n->name, name) && ((!ns_prefix && !n->ns) || (ns_prefix && n->ns && !strcmp(ns_prefix, n->ns)))) {
 			const char *lang = wm_xml_get_attr(n, "xml:lang");
 			if (!lang) {
@@ -2510,7 +2517,7 @@
 	if (ifces) {
 
 		/*get all interface element*/
-		while ((ifce_node = gf_list_enum(ifces->content, &i))) {
+		while ((ifce_node = (GF_XMLNode*)gf_list_enum(ifces->content, &i))) {
 			GF_XMLNode *msg_node;
 			u32 j;
 			const char *ifce_type, *act;
@@ -2526,13 +2533,13 @@
 			gf_list_add(content->interfaces, ifce);
 
 			act = wm_xml_get_attr(ifce_node, "serviceProvider");
-			if (act && !strcmp(act, "true")) ifce->provider = 1;
+			if (act && !strcmp(act, "true")) ifce->provider = GF_TRUE;
 
 			act = wm_xml_get_attr(ifce_node, "multipleBindings");
-			if (act && !strcmp(act, "true")) ifce->multiple_binding = 1;
+			if (act && !strcmp(act, "true")) ifce->multiple_binding = GF_TRUE;
 
 			act = wm_xml_get_attr(ifce_node, "required");
-			if (act && !strcmp(act, "true")) ifce->required = 1;
+			if (act && !strcmp(act, "true")) ifce->required = GF_TRUE;
 
 			act = wm_xml_get_attr(ifce_node, "connectTo");
 			if (act) ifce->connectTo = gf_strdup(act);
@@ -2547,7 +2554,7 @@
 			}
 
 			j=0;
-			while ((msg_node = gf_list_enum(ifce_node->content, &j))) {
+			while ((msg_node = (GF_XMLNode*)gf_list_enum(ifce_node->content, &j))) {
 				u32 k;
 				GF_XMLNode *par_node;
 				const char *msg_name, *action;
@@ -2814,6 +2821,8 @@
 	case GF_NETIO_GET_METHOD:
 		parameter->name = "HEAD";
 		break;
+	default:
+		return;
 	}
 }
 
@@ -3634,8 +3643,11 @@
 	static u32 si [] = {
 #ifdef GPAC_HAS_SPIDERMONKEY
 		GF_JS_USER_EXT_INTERFACE,
+#ifndef GPAC_DISABLE_SVG
 		GF_SCENE_DECODER_INTERFACE,
 #endif
+
+#endif
 		0
 	};
 	return si;
@@ -3646,8 +3658,10 @@
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	if (InterfaceType == GF_JS_USER_EXT_INTERFACE) return (GF_BaseInterface *)gwm_new();
+#ifndef GPAC_DISABLE_SVG
 	else if (InterfaceType == GF_SCENE_DECODER_INTERFACE) return (GF_BaseInterface *)LoadWidgetReader();
 #endif
+#endif
 	return NULL;
 }
 
@@ -3659,10 +3673,13 @@
 	case GF_JS_USER_EXT_INTERFACE:
 		gwm_delete(ifce);
 		break;
+#ifndef GPAC_DISABLE_SVG
 	case GF_SCENE_DECODER_INTERFACE:
 		ShutdownWidgetReader(ifce);
 		break;
 #endif
+
+#endif
 	}
 }

v0.5.2.tar.gz/modules/wiiis/Makefile -> v0.6.1.tar.gz/modules/wiiis/Makefile Changed

v0.5.2.tar.gz/modules/x11_out/Makefile -> v0.6.1.tar.gz/modules/x11_out/Makefile Changed

v0.5.2.tar.gz/modules/x11_out/x11_out.h -> v0.6.1.tar.gz/modules/x11_out/x11_out.h Changed

v0.5.2.tar.gz/modules/xvid_dec/Makefile -> v0.6.1.tar.gz/modules/xvid_dec/Makefile Changed

v0.5.2.tar.gz/modules/xvid_dec/xvid_dec.c -> v0.6.1.tar.gz/modules/xvid_dec/xvid_dec.c Changed

@@ -99,7 +99,7 @@
 		return GF_NOT_SUPPORTED;
 #endif
 
-		while ((d = gf_list_enum(esd->extensionDescriptors, &i))) {
+		while ((d = (GF_Descriptor*)gf_list_enum(esd->extensionDescriptors, &i))) {
 			if (d->tag == GF_ODF_AUX_VIDEO_DATA) break;
 		}
 		if (!d) return GF_NOT_SUPPORTED;
@@ -148,11 +148,11 @@
 	xvid_decore(*codec, XVID_DEC_DECODE, &frame, NULL);
 #endif
 
-	ctx->first_frame = 1;
+	ctx->first_frame = GF_TRUE;
 	/*output in YV12 only - let the player handle conversion*/
 	if (ctx->depth_codec) {
 		ctx->out_size = ctx->width * ctx->height * 5 / 2;
-		ctx->temp_uv = gf_malloc(sizeof(char)*ctx->width * ctx->height / 2);
+		ctx->temp_uv = (char*)gf_malloc(sizeof(char)*ctx->width * ctx->height / 2);
 	} else {
 		ctx->yuv_size = ctx->out_size = ctx->width * ctx->height * 3 / 2;
 	}
@@ -363,7 +363,7 @@
 	default:
 		*outBufferLength = ctx->out_size;
 		if (ctx->first_frame) {
-			ctx->first_frame = 0;
+			ctx->first_frame = GF_FALSE;
 			if ((outBuffer[0] == 'v') && (outBuffer[1] == 'o') && (outBuffer[2] == 'i') && (outBuffer[3] == 'd')) {
 				*outBufferLength = 0;
 				return GF_OK;
@@ -430,7 +430,7 @@
 		init.cpu_flags = 0; /*autodetect*/
 		xvid_global(NULL, 0, &init, NULL);
 #endif
-		xvid_is_init = 1;
+		xvid_is_init = GF_TRUE;
 	}
 
 	/*get config*/

v0.5.2.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi -> v0.6.1.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi Changed

@@ -1,976 +1,969 @@
-;--------------------------------
-;General
-!define GPAC_VERSION	0.5.1-DEV
-!include default.out
-
-!define GPAC_ROOT ..\..\..
-!ifdef IS_WIN64
-!define GPAC_BIN ${GPAC_ROOT}\bin\x64\release
-!define GPAC_EXTRA_LIB ${GPAC_ROOT}\extra_lib\lib\x64\release
-InstallDir "$PROGRAMFILES64\GPAC"
-!else
-!define GPAC_BIN ${GPAC_ROOT}\bin\win32\release
-!define GPAC_EXTRA_LIB ${GPAC_ROOT}\extra_lib\lib\win32\release
-InstallDir "$PROGRAMFILES32\GPAC"
-!endif
-
-InstallDirRegKey HKCU "SOFTWARE\GPAC" "InstallDir"
-
-RequestExecutionLevel highest
-!include LogicLib.nsh
-
-Function .onInit
-!ifdef IS_WIN64
-!include "x64.nsh"
-${If} ${RunningX64}
-${Else}
-	MessageBox MB_OK|MB_ICONSTOP "This installer is for 64bits operating systems only.$\n Please go to our website and get the 32 BITS installer."
-	Quit
-${Endif}
-!endif
-
-UserInfo::GetAccountType
-pop $0
-FunctionEnd
-
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI2.nsh"
-
-WindowIcon on
-Icon "${GPAC_ROOT}\doc\osmo4.ico"
-UninstallIcon "${GPAC_ROOT}\doc\osmo4.ico"
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-Var DIALOG
-Var Label
-Var Confirm
-
-LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
-LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
-
-Function EnableNext
-  Pop $R1
-  ${NSD_GetState} $Confirm $R1
-	GetDlgItem $0 $HWNDPARENT 1
-	${If} $R1 == ${BST_CHECKED}
-   EnableWindow $0 1
-  ${Else} 
-   EnableWindow $0 0
-  ${Endif} 
-FunctionEnd
-
-Function customPage
-	!insertmacro MUI_HEADER_TEXT "Patents and Royalties" "Please read carefully the following clause."
-	GetDlgItem $0 $HWNDPARENT 1
-	EnableWindow $0 0
-	nsDialogs::Create 1018
-	Pop $DIALOG
-
-  ${NSD_CreateLabel} 0 0 100% 120u "Multimedia technologies are often covered by various patents which are most of the time hard to identify. These patents may or may not apply in your local jurisdiction. By installing this software, you acknowledge that you may have to pay royaltee fees in order to legally use this software. Do not proceed with this setup if you do not understand or do not agree with these terms. In any case, the authors and/or distributors bears no liability for any infringing usage of this software, which is provided for educational or research purposes."
-	Pop $Label
-
-  ${NSD_CreateCheckBox} 0 -30 100% 12u "I understand and accept the conditions"
-  Pop $Confirm
-	GetFunctionAddress $0 EnableNext
-	nsDialogs::OnClick $Confirm $0
-  
-  
-  nsDialogs::Show
-FunctionEnd
-
-;--------------------------------
-;Pages
-
-  !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "${GPAC_ROOT}\COPYING" 
-  Page custom customPage
-  !insertmacro MUI_PAGE_COMPONENTS
-  !insertmacro MUI_PAGE_DIRECTORY
-    
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-  
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-  !insertmacro MUI_LANGUAGE "English"
-
-ComponentText "This will install the GPAC Framework on your computer. Select which optional things you want installed."
-DirText "This will install the GPAC Framework on your computer. Choose a directory"
-
-
-Function FctWriteRegStrAuth
-   ;local var
-   Push $0
-   Push $R0
-   Push $R1
-   Push $R2
-   Push $R3
-   ;pop function arguments
-   Exch 5
-   Pop $R3
-   Exch 5
-   Pop $R2
-   Exch 5
-   Pop $R1
-   Exch 5
-   Pop $R0
-
-   ;test if calling HKCR
-   StrCmp $R0 "HKCR" +1 +3
-   WriteRegStr HKCR $R1 $R2 $R3
-   goto lbl_end
-   
-   #has current user admin privileges?
-   userInfo::getAccountType
-   Pop $0
-   StrCmp $0 "Admin" lbl_admin lbl_not_admin
-
-   lbl_admin:
-      WriteRegStr HKLM $R1 $R2 $R3
-      goto lbl_end
-
-   lbl_not_admin:
-      WriteRegStr HKCU $R1 $R2 $R3
-
-   lbl_end:
-      Pop $R3
-      Pop $R2
-      Pop $R1
-      Pop $R0
-      Pop $0
-FunctionEnd
-
-!macro WriteRegStrAuth HKREG SUBREG ENTRY VALUESTR
-    Push "${HKREG}"
-    Push "${SUBREG}"
-    Push "${ENTRY}"
-    Push "${VALUESTR}"
-    Call FctWriteRegStrAuth
-!macroend
- 
-!define WriteRegStrAuth "!insertmacro WriteRegStrAuth"
-
-
-Function un.FctDeleteRegKeyAuth
-   ;local var
-   Push $0
-   Push $R0
-   Push $R1
-   ;pop function arguments
-   Exch 3
-   Pop $R1
-   Exch 3
-   Pop $R0
-
-   ;test if calling HKCR
-   StrCmp $R0 "HKCR" +1 +3
-   DeleteRegKey HKCR $R1
-   goto lbl_end
-   
-   #has current user admin privileges?
-   userInfo::getAccountType
-   Pop $0
-   StrCmp $0 "Admin" lbl_admin lbl_not_admin
-   
-   lbl_admin:
-      DeleteRegKey HKLM $R1
-      goto lbl_end
-   
-   lbl_not_admin:
-      DeleteRegKey HKCU $R1
-
-   lbl_end:
-      Pop $0
-      Pop $R1
-      Pop $R0
-FunctionEnd
-
-!macro DeleteRegKeyAuth HKREG SUBREG
-    Push "${HKREG}"
-    Push "${SUBREG}"
-    Call un.FctDeleteRegKeyAuth
-!macroend
- 
-!define DeleteRegKeyAuth "!insertmacro DeleteRegKeyAuth"
-
-Function InsertGDIPLUS
-   Push $R0
-   Push $R1
-   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-   StrCmp $R0 "" 0 lbl_winnt
-
-   ;NOT NT
-   ReadRegStr $R0 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion VersionNumber
-
-   StrCpy $R1 $R0 1
-   ; win95, NOT SUPPORTED
-   StrCmp $R1 '4' 0 lbl_err_95
-   StrCpy $R1 $R0 3
-   StrCmp $R1 '4.0' lbl_err_95
-   ;winME or 98 otherwise
-   StrCmp $R1 '4.9' lbl_add lbl_add
-
-lbl_err_nt:
-   MessageBox MB_OK "Microsoft GDI+ cannot be installed on NT 3 Systems"
-   Goto lbl_done
-
-lbl_err_95:
-   MessageBox MB_OK "Microsoft GDI+ cannot be installed on Windows 95 and older Systems"
-   Goto lbl_done
-
-lbl_winnt:
-   StrCpy $R1 $R0 1
-   StrCmp $R1 '3' lbl_err_nt
-   StrCmp $R1 '4' lbl_add
-   StrCpy $R1 $R0 3
-   StrCmp $R1 '5.0' lbl_add	;2000
-   StrCmp $R1 '5.1' lbl_xp	;XP
-   StrCmp $R1 '5.2' lbl_done	;.NET server
-
-lbl_add:
- !ifndef IS_WIN64
-   File "${GPAC_BIN}\Gdiplus.dll"
-  !endif
-
-lbl_xp:
-   File "${GPAC_BIN}\gm_gdip_raster.dll"
-
-lbl_done:
-FunctionEnd
-
-;GPAC core
-Section "GPAC Core" SecGPAC
-  SectionIn RO
-  SetOutPath $INSTDIR
-
-  File /oname=ReadMe.txt "${GPAC_ROOT}\README"
-  File /oname=License.txt "${GPAC_ROOT}\COPYING"
-  File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
-  File "${GPAC_ROOT}\doc\configuration.html"
-  File "${GPAC_ROOT}\doc\gpac.mp4"
-  File "${GPAC_ROOT}\doc\osmo4.ico"
-  File "${GPAC_BIN}\libgpac.dll"
-  File "${GPAC_BIN}\js.dll"
-  File "${GPAC_BIN}\libeay32.dll"
-  File "${GPAC_BIN}\ssleay32.dll"
-
-  ;create default cache
-  SetOutPath $INSTDIR\cache
-
-  SetOutPath $INSTDIR
-  
-  ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
-  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "DisplayName" "GPAC (remove only)"
-  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "UninstallString" "$INSTDIR\uninstall.exe"
-  WriteUninstaller "uninstall.exe"
-
-SectionEnd
-
-;player install
-Section "GPAC Player" SecOsmo4
-  SectionIn 1
-
-  !ifndef IS_WIN64
-  File "${GPAC_BIN}\Osmo4.exe"
-  !endif
-  File "${GPAC_BIN}\gm_dummy_in.dll"
-  File "${GPAC_BIN}\gm_dx_hw.dll"
-  File "${GPAC_BIN}\gm_gpac_js.dll"
-  File "${GPAC_BIN}\gm_ismacryp.dll"
-
-  ;copy GUI
-  SetOutPath $INSTDIR\gui
-  File "${GPAC_ROOT}\gui\gui.bt"
-  File "${GPAC_ROOT}\gui\gui.js"
-  File "${GPAC_ROOT}\gui\gwlib.js"
-  File "${GPAC_ROOT}\gui\mpegu-core.js"
-  File "${GPAC_ROOT}\gui\webvtt-renderer.js"
-  SetOutPath $INSTDIR\gui\icons
-  File /r /x .svn ${GPAC_ROOT}\gui\icons\*
-  SetOutPath $INSTDIR\gui\extensions
-  File /r /x .svn ${GPAC_ROOT}\gui\extensions\*
-
-  SetOutPath $INSTDIR
-SectionEnd
-
-SubSection "GPAC Plugins" SecPlugins
-
-
-;
-;	2 install modes, normal one and full one
-
-Section "MPEG-4 BIFS Decoder" SecBIFS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_bifs_dec.dll"
-SectionEnd
-
-Section "MPEG-4 ODF Decoder" SecODF
-  SectionIn 1
-  File "${GPAC_BIN}\gm_odf_dec.dll"
-SectionEnd
-
-Section "MPEG-4 LASeR Decoder" SecLASeR
-  SectionIn 1
-  File "${GPAC_BIN}\gm_laser_dec.dll"
-SectionEnd
-
-Section "MPEG-4 SAF Demultiplexer" SecSAF
-  SectionIn 1
-  File "${GPAC_BIN}\gm_saf_in.dll"
-SectionEnd
-
-Section "Textual MPEG-4 Loader" SecTextLoad
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ctx_load.dll"
-SectionEnd
-
-Section "Image Package (PNG, JPEG, BMP)" SecIMG
-  SectionIn 1
-  File "${GPAC_BIN}\gm_img_in.dll"
-SectionEnd
-
-Section "AAC Audio" SecAAC
-  SectionIn 1
-  File "${GPAC_BIN}\gm_aac_in.dll"
-SectionEnd
-
-Section "MP3 Audio" SecMP3
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mp3_in.dll"
-SectionEnd
-
-Section "AC3 Audio" SecAC3
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ac3_in.dll"
-SectionEnd
-
-Section "FFMPEG" SecFFMPEG
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ffmpeg_in.dll"
-  File "${GPAC_BIN}\avcodec-*.dll"
-  File "${GPAC_BIN}\avdevice-*.dll"
-  File "${GPAC_BIN}\avfilter-*.dll"
-  File "${GPAC_BIN}\avformat-*.dll"
-  File "${GPAC_BIN}\avutil-*.dll"
-  File "${GPAC_BIN}\avresample-*.dll"
-  File "${GPAC_BIN}\swresample-*.dll"
-  File "${GPAC_BIN}\swscale-*.dll"
-  File "${GPAC_BIN}\libx264-*.dll"
-SectionEnd
-
-Section "XviD Video Decoder" SecXVID
-  SectionIn 1
-  File "${GPAC_BIN}\gm_xvid_dec.dll"
-SectionEnd
-
-;Section "AMR NB & WB" SecAMRFT
-;  SectionIn 1
-;  File "..\gm_amr_float_dec.dll"
-;SectionEnd
-
-Section "Subtitles" SecSUBS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_timedtext.dll"
-SectionEnd
-
-Section "ISO File Format" SecISOFF
-  SectionIn 1
-  File "${GPAC_BIN}\gm_isom_in.dll"
-SectionEnd
-
-Section "MPEG-2 TS" SecM2TS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mpegts_in.dll"
-SectionEnd
-
-Section "RTP/RTSP" SecRTP
-  SectionIn 1
-  File "${GPAC_BIN}\gm_rtp_in.dll"
-SectionEnd
-
-Section "SVG" SecSVG
-  SectionIn 1
-  File "${GPAC_BIN}\gm_svg_in.dll"
-SectionEnd
-
-Section "WebVTT" SecWebVTT
-  SectionIn 1
-  File "${GPAC_BIN}\gm_vtt_in.dll"
-SectionEnd
-
-Section "GDI+" SecGDIP
-  SectionIn 1
-  call InsertGDIPLUS
-SectionEnd
-
-Section "GPAC 2D Raster" SecG2DS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_soft_raster.dll"
-SectionEnd
-
-Section "FreeType" SecFT
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ft_font.dll"
-SectionEnd
-
-Section "Windows MME Audio" SecWAVE
-  SectionIn 1
-  File "${GPAC_BIN}\gm_wav_out.dll"
-SectionEnd
-
-Section "Xiph" SecXIPH
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ogg.dll"
-SectionEnd
-
-Section "OpenSVC Decoder" SecOSVC
-  SectionIn 1
-  File "${GPAC_BIN}\OpenSVCDecoder.dll"
-  File "${GPAC_BIN}\gm_opensvc_dec.dll"
-SectionEnd
-
-Section "OpenHEVC Decoder" SecOHEVC
-  SectionIn 1
-  File "${GPAC_BIN}\libLibOpenHevcWrapper.dll"
-  File "${GPAC_BIN}\gm_openhevc_dec.dll"
-SectionEnd
-
-Section "MPEG DASH Support" SecDASH
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mpd_in.dll"
-SectionEnd
-
-Section "HTML 5 Media Source Extensions Support" SecMSE
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mse_in.dll"
-SectionEnd
-
-Section "UPnP Support" SecUPnP
-  SectionIn 1
-  File "${GPAC_BIN}\gm_platinum.dll"
-SectionEnd
-
-Section "Widget Manager" SecMPEGU
-  SectionIn 1
-  File "${GPAC_BIN}\gm_widgetman.dll"
-SectionEnd
-
-;Section "MobileIP Framework" SecMobIP
-;  SectionIn 1
-;  File "..\gm_mobile_ip.dll"
-;  File "..\MobileSession.dll"
-;SectionEnd
-
-
-;Section "OFFIS Audio compressor" SecOffisComp
-;  SectionIn 1
-;  ;copy GUI
-;  File "..\gm_offis_compressor.dll"
-;  File "..\QtCore4.dll"
-;  File "..\QtGui4.dll"
-;  SetOutPath $INSTDIR\gui\extensions
-;  File /r /x .svn ..\..\..\..\gui\extensions\offis*
-;  SetOutPath $INSTDIR
-;SectionEnd
-
-SubSectionEnd
-
-
-Section "MP4Box" SecMP4B
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\MP4Box.exe"
-  Push $INSTDIR
-  Call AddToPath
-SectionEnd
-
-Section "MP42TS" SecMP42TS
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\MP42TS.exe"
-  Push $INSTDIR
-  Call AddToPath
-SectionEnd
-
-Section "DashCast" SecDC
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\dashcast.exe"
-  Push $INSTDIR
-  Call AddToPath
-SectionEnd
-
-
-Section "GPAC SDK" SecSDK
-  SectionIn 1
-  SetOutPath $INSTDIR\sdk\include
-  File /r /x CVS ${GPAC_ROOT}\include\*.h
-  SetOutPath $INSTDIR\sdk\lib
-  File ${GPAC_BIN}\libgpac.lib
-  File ${GPAC_EXTRA_LIB}\js.lib
-SectionEnd
-
-
-!ifndef IS_WIN64
-!define HK_MOZ "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
-
-Section "Osmozilla" SecZILLA
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\nposmozilla.dll"
-  File "${GPAC_BIN}\nposmozilla.xpt"
-
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Path" "$INSTDIR\nposmozilla.dll"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "XPTPath" "$INSTDIR\nposmozilla.xpt"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Version" "${GPAC_VERSION}"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Vendor" "GPAC"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Description" "GPAC plugin"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "ProductName" "Osmozilla"
-SectionEnd
-!endif
-
-Section "GPAX" SecGPAX
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\GPAX.dll"
-  RegDLL "$INSTDIR\GPAX.dll"
-SectionEnd
-
-
-Section "MP4Client" SecMP4C
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\MP4Client.exe"
-SectionEnd   
-                 
-                 
-                  
-Section "Windows Runtime Libraries" SecMSVCRT
-  SectionIn 1
-;  File "..\Microsoft.VC100.CRT.manifest"
-;  File "..\Microsoft.VC100.MFC.manifest"       
-  File "${GPAC_BIN}\msvcr100.dll"
-  File "${GPAC_BIN}\mfc100.dll"
-SectionEnd
-
-
-
-
-SubSection "GPAC Shortcuts"
-
-Section "Add Start Menu Shortcuts"
-  SectionIn 1
-  #has current user admin privileges?
-  userInfo::getAccountType
-  Pop $0
-  StrCmp $0 "Admin" +1 +2
-  SetShellVarContext all
-  CreateDirectory "$SMPROGRAMS\GPAC"
-  CreateShortCut "$SMPROGRAMS\GPAC\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4/MP4Client.lnk" "$INSTDIR\MP4Client.exe" "-gui" 
-  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4/MP4Client (with Console).lnk" "$INSTDIR\MP4Client.exe" ""
-  !ifndef IS_WIN64
-  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4 (Old UI).lnk" "$INSTDIR\Osmo4.exe" ""
-  !endif
-  CreateShortCut "$SMPROGRAMS\GPAC\Readme.lnk" "$INSTDIR\ReadMe.txt"
-  CreateShortCut "$SMPROGRAMS\GPAC\License.lnk" "$INSTDIR\License.txt"
-  CreateShortCut "$SMPROGRAMS\GPAC\History.lnk" "$INSTDIR\changelog.txt"
-  CreateShortCut "$SMPROGRAMS\GPAC\Configuration Info.lnk" "$INSTDIR\configuration.html"
-SectionEnd
-
-!ifndef IS_WIN64
-Section "Add shortcut to QuickLaunch"
-  SectionIn 1
-  CreateShortCut "$QUICKLAUNCH\GPAC.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
-SectionEnd
-
-Section "Add shortcut to Desktop"
-  SectionIn 1
-  CreateShortCut "$DESKTOP\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
-SectionEnd
-
-!define SHCNE_ASSOCCHANGED 0x08000000
-!define SHCNF_IDLIST 0
-
-Section "Make Osmo4 the default MPEG-4 Player"
-  SectionIn 1
-  ;write file association
-  ${WriteRegStrAuth} HKCR GPAC\mp4\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
-  ${WriteRegStrAuth} HKCR GPAC\mp4\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
-  ${WriteRegStrAuth} HKCR .mp4 "" "GPAC\mp4"
-  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-
-SectionEnd
-
-Section "Associate 3GPP files (3GP) with Osmo4"
-  SectionIn 1
-  ;write file association
-  ${WriteRegStrAuth} HKCR GPAC\3gp\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
-  ${WriteRegStrAuth} HKCR GPAC\3gp\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
-  ${WriteRegStrAuth} HKCR .3gp "" "GPAC\3gp"
-  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-SectionEnd
-
-Section "Associate 3GPP2 files (3G2) with Osmo4"
-  SectionIn 1
-  ;write file association
-  ${WriteRegStrAuth} HKCR GPAC\3g2\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
-  ${WriteRegStrAuth} HKCR GPAC\3g2\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
-  ${WriteRegStrAuth} HKCR .3g2 "" "GPAC\3g2"
-  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-SectionEnd
-!endif
-  
-SubSectionEnd
-
-
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAC} "GPAC Core"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmo4} "GPAC Player"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "GPAC Plugins"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecBIFS} "MPEG-4 BIFS Scene Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecODF} "MPEG-4 Object Descriptor Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecLASeR} "MPEG-4 LASeR Scene Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTextLoad} "Support for uncompressed MPEG-4 (BT and XMT), VRML and X3D textual formats"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSAF} "MPEG-4 SAF Demultiplexer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecIMG} "Support for PNG, JPEG, BMP and JPEG2000 images"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAAC} "Support for MPEG-4 Audio HE-AAC decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP3} "Support for MPEG-1/2 Audio (inc. MP3) decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAC3} "Support for Dolby AC3 decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecFFMPEG} "Support for FFMPEG libraries for various format decoding and demultiplexing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXVID} "Support for XVID library for MPEG-4 Video Part 2 decoding"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAMRFT} "Support for AMR and AMR WideBand decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSUBS} "Subtitle support include SRT, SUB, 3GPP and MPEG-4 Text formats"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecISOFF} "Support for ISO-based file formats (3GP, MP4, MJ2K)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecM2TS} "Support for MPEG-2 Transport Stream"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRTP} "Support for RTP and RTSP IP streaming"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSVG} "Support for SVG including progressive loading"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebVTT} "Support for WebVTT subtitles"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWAVE} "Windows MME Audio output support"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXIPH} "Support for XIPP OGG, Vorbis and Theora media"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOSVC} "Support for SVC decoding through OpenSVC Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOHEVC} "Support for HEVC decoding through OpenHEVC Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDASH} "HTTP Streaming using MPEG DASH"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMSE}  "HTTP Streaming using HTML 5 Media Source Extensions"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOffisComp} "OFFIS Audio Compressor"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for various multimedia operations"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP42TS} "MP42TS command-line tool for MPEG-2 TS multiplexing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDC} "DashCast offline and live MPEG-DASH Encoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSDK} "GPAC SDK: headers and library files needed to develop modules for GPAC or appllication based on GPAC"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecZILLA} "GPAC playback support NPAPI-based browsers (FireFox/Gecko, Safari/WebKit)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAX} "GPAC playback support using ActiveX component (Internet Explorer)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4C} "GPAC command-line player and AVI dumper"
-  
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-Function .onInstSuccess
-;  MessageBox MB_YESNO "GPAC Framework installation complete. Do you want to launch the player?" IDNO NoLaunch
-;  Exec $INSTDIR\Osmo4.exe
-;  NoLaunch:
-FunctionEnd
-
-
-
-
-
-; uninstall stuff
-
-UninstallText "This will uninstall GPAC from your computer. Hit next to continue."
-
-; special uninstall section.
-Section "Uninstall"
-  ; remove registry keys
-  ${DeleteRegKeyAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC"
-  ${DeleteRegKeyAuth} HKCU "SOFTWARE\GPAC"
-  ${DeleteRegKeyAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
-  ${DeleteRegKeyAuth} HKCR GPAC\mp4\DefaultIcon
-  ${DeleteRegKeyAuth} HKCR GPAC\mp4\shell\open\command
-  ${DeleteRegKeyAuth} HKCR GPAC\mp4
-  ${DeleteRegKeyAuth} HKCR .mp4
-  ${DeleteRegKeyAuth} HKCR GPAC\3gp\DefaultIcon
-  ${DeleteRegKeyAuth} HKCR GPAC\3gp\shell\open\command
-  ${DeleteRegKeyAuth} HKCR GPAC\3gp
-  ${DeleteRegKeyAuth} HKCR .3gp
-  ${DeleteRegKeyAuth} HKCR GPAC\3g2\DefaultIcon
-  ${DeleteRegKeyAuth} HKCR GPAC\3g2\shell\open\command
-  ${DeleteRegKeyAuth} HKCR GPAC\3g2
-  ${DeleteRegKeyAuth} HKCR .3g2
-  ${DeleteRegKeyAuth} HKCR GPAC
-
-  UnRegDLL "$INSTDIR\GPAX.dll"
-  RMDir /r $INSTDIR
-  Push $INSTDIR
-  Call un.RemoveFromPath
-  #has current user admin privileges?
-  userInfo::getAccountType
-  Pop $0
-  StrCmp $0 "Admin" +1 +2
-  SetShellVarContext all
-  Delete "$SMPROGRAMS\GPAC\*.*"
-  RMDir "$SMPROGRAMS\GPAC"
-  Delete "$QUICKLAUNCH\Osmo4.lnk"
-  Delete "$DESKTOP\Osmo4.lnk"
-
-SectionEnd
-
-;path modif functions
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
-
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
-
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCpy $2 $1 1 -1 # copy last char
-    StrCmp $2 ";" 0 +2 # if last char == ;
-      StrCpy $1 $1 -1 # remove last char
-    StrCmp $1 "" AddToPath_NTdoIt
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
-
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
-###########################################
-#            Utility Functions            #
-###########################################
-
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
-
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
-
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
-
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
+;--------------------------------
+;General
+!define GPAC_VERSION 0.6.1
+!include default.out
+
+!define GPAC_ROOT ..\..\..
+!ifdef IS_WIN64
+!define GPAC_BIN ${GPAC_ROOT}\bin\x64\release
+!define GPAC_EXTRA_LIB ${GPAC_ROOT}\extra_lib\lib\x64\release
+InstallDir "$PROGRAMFILES64\GPAC"
+!else
+!define GPAC_BIN ${GPAC_ROOT}\bin\win32\release
+!define GPAC_EXTRA_LIB ${GPAC_ROOT}\extra_lib\lib\win32\release
+InstallDir "$PROGRAMFILES32\GPAC"
+!endif
+
+InstallDirRegKey HKCU "SOFTWARE\GPAC" "InstallDir"
+
+RequestExecutionLevel highest
+!include LogicLib.nsh
+
+Function .onInit
+!ifdef IS_WIN64
+!include "x64.nsh"
+${If} ${RunningX64}
+${Else}
+	MessageBox MB_OK|MB_ICONSTOP "This installer is for 64bits operating systems only.$\n Please go to our website and get the 32 BITS installer."
+	Quit
+${Endif}
+!endif
+
+UserInfo::GetAccountType
+pop $0
+FunctionEnd
+
+;--------------------------------
+;Include Modern UI
+
+  !include "MUI2.nsh"
+
+WindowIcon on
+Icon "${GPAC_ROOT}\doc\osmo4.ico"
+UninstallIcon "${GPAC_ROOT}\doc\osmo4.ico"
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+Var DIALOG
+Var Label
+Var Confirm
+
+LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
+LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
+
+Function EnableNext
+  Pop $R1
+  ${NSD_GetState} $Confirm $R1
+	GetDlgItem $0 $HWNDPARENT 1
+	${If} $R1 == ${BST_CHECKED}
+   EnableWindow $0 1
+  ${Else} 
+   EnableWindow $0 0
+  ${Endif} 
+FunctionEnd
+
+Function customPage
+	!insertmacro MUI_HEADER_TEXT "Patents and Royalties" "Please read carefully the following clause."
+	GetDlgItem $0 $HWNDPARENT 1
+	EnableWindow $0 0
+	nsDialogs::Create 1018
+	Pop $DIALOG
+
+  ${NSD_CreateLabel} 0 0 100% 120u "Multimedia technologies are often covered by various patents which are most of the time hard to identify. These patents may or may not apply in your local jurisdiction. By installing this software, you acknowledge that you may have to pay royaltee fees in order to legally use this software. Do not proceed with this setup if you do not understand or do not agree with these terms. In any case, the authors and/or distributors bears no liability for any infringing usage of this software, which is provided for educational or research purposes."
+	Pop $Label
+
+  ${NSD_CreateCheckBox} 0 -30 100% 12u "I understand and accept the conditions"
+  Pop $Confirm
+	GetFunctionAddress $0 EnableNext
+	nsDialogs::OnClick $Confirm $0
+  
+  
+  nsDialogs::Show
+FunctionEnd
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_LICENSE "${GPAC_ROOT}\COPYING" 
+  Page custom customPage
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+    
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+  !insertmacro MUI_LANGUAGE "English"
+
+ComponentText "This will install the GPAC Framework on your computer. Select which optional things you want installed."
+DirText "This will install the GPAC Framework on your computer. Choose a directory"
+
+
+Function FctWriteRegStrAuth
+   ;local var
+   Push $0
+   Push $R0
+   Push $R1
+   Push $R2
+   Push $R3
+   ;pop function arguments
+   Exch 5
+   Pop $R3
+   Exch 5
+   Pop $R2
+   Exch 5
+   Pop $R1
+   Exch 5
+   Pop $R0
+
+   ;test if calling HKCR
+   StrCmp $R0 "HKCR" +1 +3
+   WriteRegStr HKCR $R1 $R2 $R3
+   goto lbl_end
+   
+   #has current user admin privileges?
+   userInfo::getAccountType
+   Pop $0
+   StrCmp $0 "Admin" lbl_admin lbl_not_admin
+
+   lbl_admin:
+      WriteRegStr HKLM $R1 $R2 $R3
+      goto lbl_end
+
+   lbl_not_admin:
+      WriteRegStr HKCU $R1 $R2 $R3
+
+   lbl_end:
+      Pop $R3
+      Pop $R2
+      Pop $R1
+      Pop $R0
+      Pop $0
+FunctionEnd
+
+!macro WriteRegStrAuth HKREG SUBREG ENTRY VALUESTR
+    Push "${HKREG}"
+    Push "${SUBREG}"
+    Push "${ENTRY}"
+    Push "${VALUESTR}"
+    Call FctWriteRegStrAuth
+!macroend
+ 
+!define WriteRegStrAuth "!insertmacro WriteRegStrAuth"
+
+
+Function un.FctDeleteRegKeyAuth
+   ;local var
+   Push $0
+   Push $R0
+   Push $R1
+   ;pop function arguments
+   Exch 3
+   Pop $R1
+   Exch 3
+   Pop $R0
+
+   ;test if calling HKCR
+   StrCmp $R0 "HKCR" +1 +3
+   DeleteRegKey HKCR $R1
+   goto lbl_end
+   
+   #has current user admin privileges?
+   userInfo::getAccountType
+   Pop $0
+   StrCmp $0 "Admin" lbl_admin lbl_not_admin
+   
+   lbl_admin:
+      DeleteRegKey HKLM $R1
+      goto lbl_end
+   
+   lbl_not_admin:
+      DeleteRegKey HKCU $R1
+
+   lbl_end:
+      Pop $0
+      Pop $R1
+      Pop $R0
+FunctionEnd
+
+!macro DeleteRegKeyAuth HKREG SUBREG
+    Push "${HKREG}"
+    Push "${SUBREG}"
+    Call un.FctDeleteRegKeyAuth
+!macroend
+ 
+!define DeleteRegKeyAuth "!insertmacro DeleteRegKeyAuth"
+
+Function InsertGDIPLUS
+   Push $R0
+   Push $R1
+   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+   StrCmp $R0 "" 0 lbl_winnt
+
+   ;NOT NT
+   ReadRegStr $R0 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion VersionNumber
+
+   StrCpy $R1 $R0 1
+   ; win95, NOT SUPPORTED
+   StrCmp $R1 '4' 0 lbl_err_95
+   StrCpy $R1 $R0 3
+   StrCmp $R1 '4.0' lbl_err_95
+   ;winME or 98 otherwise
+   StrCmp $R1 '4.9' lbl_add lbl_add
+
+lbl_err_nt:
+   MessageBox MB_OK "Microsoft GDI+ cannot be installed on NT 3 Systems"
+   Goto lbl_done
+
+lbl_err_95:
+   MessageBox MB_OK "Microsoft GDI+ cannot be installed on Windows 95 and older Systems"
+   Goto lbl_done
+
+lbl_winnt:
+   StrCpy $R1 $R0 1
+   StrCmp $R1 '3' lbl_err_nt
+   StrCmp $R1 '4' lbl_add
+   StrCpy $R1 $R0 3
+   StrCmp $R1 '5.0' lbl_add	;2000
+   StrCmp $R1 '5.1' lbl_xp	;XP
+   StrCmp $R1 '5.2' lbl_done	;.NET server
+
+lbl_add:
+ !ifndef IS_WIN64
+   File "${GPAC_BIN}\Gdiplus.dll"
+  !endif
+
+lbl_xp:
+   File "${GPAC_BIN}\gm_gdip_raster.dll"
+
+lbl_done:
+FunctionEnd
+
+;GPAC core
+Section "GPAC Core" SecGPAC
+  SectionIn RO
+  SetOutPath $INSTDIR
+
+  File /oname=ReadMe.txt "${GPAC_ROOT}\README.md"
+  File /oname=License.txt "${GPAC_ROOT}\COPYING"
+  File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
+  File "${GPAC_ROOT}\doc\configuration.html"
+  File "${GPAC_ROOT}\doc\gpac.mp4"
+  File "${GPAC_ROOT}\doc\osmo4.ico"
+  File "${GPAC_BIN}\libgpac.dll"
+  File "${GPAC_BIN}\js.dll"
+  File "${GPAC_BIN}\libeay32.dll"
+  File "${GPAC_BIN}\ssleay32.dll"
+
+  ;create default cache
+  SetOutPath $INSTDIR\cache
+
+  SetOutPath $INSTDIR
+  
+  ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
+  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "DisplayName" "GPAC (remove only)"
+  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteUninstaller "uninstall.exe"
+
+SectionEnd
+
+;player install
+Section "GPAC Player" SecOsmo4
+  SectionIn 1
+
+  !ifndef IS_WIN64
+  File "${GPAC_BIN}\Osmo4.exe"
+  !endif
+  File "${GPAC_BIN}\gm_dummy_in.dll"
+  File "${GPAC_BIN}\gm_dx_hw.dll"
+  File "${GPAC_BIN}\gm_gpac_js.dll"
+  File "${GPAC_BIN}\gm_ismacryp.dll"
+
+  ;copy GUI
+  SetOutPath $INSTDIR\gui
+  File "${GPAC_ROOT}\gui\gui.bt"
+  File "${GPAC_ROOT}\gui\gui.js"
+  File "${GPAC_ROOT}\gui\gwlib.js"
+  File "${GPAC_ROOT}\gui\mpegu-core.js"
+  File "${GPAC_ROOT}\gui\webvtt-renderer.js"
+  SetOutPath $INSTDIR\gui\icons
+  File /r /x .git ${GPAC_ROOT}\gui\icons\*
+  SetOutPath $INSTDIR\gui\extensions
+  File /r /x .git ${GPAC_ROOT}\gui\extensions\*
+
+  ;copy shaders
+  SetOutPath $INSTDIR\shaders
+  File "${GPAC_ROOT}\shaders\vertex.glsl"
+  File "${GPAC_ROOT}\shaders\fragment.glsl"
+
+  SetOutPath $INSTDIR
+SectionEnd
+
+SubSection "GPAC Plugins" SecPlugins
+
+
+;
+;	2 install modes, normal one and full one
+
+Section "MPEG-4 BIFS Decoder" SecBIFS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_bifs_dec.dll"
+SectionEnd
+
+Section "MPEG-4 ODF Decoder" SecODF
+  SectionIn 1
+  File "${GPAC_BIN}\gm_odf_dec.dll"
+SectionEnd
+
+Section "MPEG-4 LASeR Decoder" SecLASeR
+  SectionIn 1
+  File "${GPAC_BIN}\gm_laser_dec.dll"
+SectionEnd
+
+Section "MPEG-4 SAF Demultiplexer" SecSAF
+  SectionIn 1
+  File "${GPAC_BIN}\gm_saf_in.dll"
+SectionEnd
+
+Section "Textual MPEG-4 Loader" SecTextLoad
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ctx_load.dll"
+SectionEnd
+
+Section "Image Package (PNG, JPEG, BMP)" SecIMG
+  SectionIn 1
+  File "${GPAC_BIN}\gm_img_in.dll"
+SectionEnd
+
+Section "AAC Audio" SecAAC
+  SectionIn 1
+  File "${GPAC_BIN}\gm_aac_in.dll"
+SectionEnd
+
+Section "MP3 Audio" SecMP3
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mp3_in.dll"
+SectionEnd
+
+Section "AC3 Audio" SecAC3
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ac3_in.dll"
+SectionEnd
+
+Section "FFMPEG" SecFFMPEG
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ffmpeg_in.dll"
+  File "${GPAC_BIN}\avcodec-*.dll"
+  File "${GPAC_BIN}\avdevice-*.dll"
+  File "${GPAC_BIN}\avfilter-*.dll"
+  File "${GPAC_BIN}\avformat-*.dll"
+  File "${GPAC_BIN}\avutil-*.dll"
+  File "${GPAC_BIN}\avresample-*.dll"
+  File "${GPAC_BIN}\swresample-*.dll"
+  File "${GPAC_BIN}\swscale-*.dll"
+  File "${GPAC_BIN}\libx264-*.dll"
+SectionEnd
+
+Section "XviD Video Decoder" SecXVID
+  SectionIn 1
+  File "${GPAC_BIN}\gm_xvid_dec.dll"
+SectionEnd
+
+;Section "AMR NB & WB" SecAMRFT
+;  SectionIn 1
+;  File "..\gm_amr_float_dec.dll"
+;SectionEnd
+
+Section "Subtitles" SecSUBS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_timedtext.dll"
+SectionEnd
+
+Section "ISO File Format" SecISOFF
+  SectionIn 1
+  File "${GPAC_BIN}\gm_isom_in.dll"
+SectionEnd
+
+Section "MPEG-2 TS" SecM2TS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mpegts_in.dll"
+SectionEnd
+
+Section "RTP/RTSP" SecRTP
+  SectionIn 1
+  File "${GPAC_BIN}\gm_rtp_in.dll"
+SectionEnd
+
+Section "SVG" SecSVG
+  SectionIn 1
+  File "${GPAC_BIN}\gm_svg_in.dll"
+SectionEnd
+
+Section "WebVTT" SecWebVTT
+  SectionIn 1
+  File "${GPAC_BIN}\gm_vtt_in.dll"
+SectionEnd
+
+Section "GDI+" SecGDIP
+  SectionIn 1
+  call InsertGDIPLUS
+SectionEnd
+
+Section "GPAC 2D Raster" SecG2DS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_soft_raster.dll"
+SectionEnd
+
+Section "FreeType" SecFT
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ft_font.dll"
+SectionEnd
+
+Section "Windows MME Audio" SecWAVE
+  SectionIn 1
+  File "${GPAC_BIN}\gm_wav_out.dll"
+SectionEnd
+
+Section "Xiph" SecXIPH
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ogg.dll"
+SectionEnd
+
+Section "OpenSVC Decoder" SecOSVC
+  SectionIn 1
+  File "${GPAC_BIN}\OpenSVCDecoder.dll"
+  File "${GPAC_BIN}\gm_opensvc_dec.dll"
+SectionEnd
+
+Section "OpenHEVC Decoder" SecOHEVC
+  SectionIn 1
+  File "${GPAC_BIN}\libLibOpenHevcWrapper.dll"
+  File "${GPAC_BIN}\gm_openhevc_dec.dll"
+SectionEnd
+
+Section "MPEG DASH Support" SecDASH
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mpd_in.dll"
+SectionEnd
+
+Section "HTML 5 Media Source Extensions Support" SecMSE
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mse_in.dll"
+SectionEnd
+
+Section "UPnP Support" SecUPnP
+  SectionIn 1
+  File "${GPAC_BIN}\gm_platinum.dll"
+SectionEnd
+
+Section "Widget Manager" SecMPEGU
+  SectionIn 1
+  File "${GPAC_BIN}\gm_widgetman.dll"
+SectionEnd
+
+;Section "MobileIP Framework" SecMobIP
+;  SectionIn 1
+;  File "..\gm_mobile_ip.dll"
+;  File "..\MobileSession.dll"
+;SectionEnd
+
+SubSectionEnd
+
+
+Section "MP4Box" SecMP4B
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\MP4Box.exe"
+  Push $INSTDIR
+  Call AddToPath
+SectionEnd
+
+Section "MP42TS" SecMP42TS
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\MP42TS.exe"
+  Push $INSTDIR
+  Call AddToPath
+SectionEnd
+
+Section "DashCast" SecDC
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\dashcast.exe"
+  Push $INSTDIR
+  Call AddToPath
+SectionEnd
+
+
+Section "GPAC SDK" SecSDK
+  SectionIn 1
+  SetOutPath $INSTDIR\sdk\include
+  File /r ${GPAC_ROOT}\include\*.h
+  SetOutPath $INSTDIR\sdk\lib
+  File ${GPAC_BIN}\libgpac.lib
+  File ${GPAC_EXTRA_LIB}\js.lib
+SectionEnd
+
+
+!ifndef IS_WIN64
+!define HK_MOZ "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
+
+Section "Osmozilla" SecZILLA
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\nposmozilla.dll"
+  File "${GPAC_BIN}\nposmozilla.xpt"
+
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Path" "$INSTDIR\nposmozilla.dll"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "XPTPath" "$INSTDIR\nposmozilla.xpt"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Version" "${GPAC_VERSION}"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Vendor" "GPAC"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Description" "GPAC plugin"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "ProductName" "Osmozilla"
+SectionEnd
+!endif
+
+Section "GPAX" SecGPAX
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\GPAX.dll"
+  RegDLL "$INSTDIR\GPAX.dll"
+SectionEnd
+
+
+Section "MP4Client" SecMP4C
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\MP4Client.exe"
+SectionEnd   
+                 
+                 
+                  
+Section "Windows Runtime Libraries" SecMSVCRT
+  SectionIn 1
+;  File "..\Microsoft.VC100.CRT.manifest"
+;  File "..\Microsoft.VC100.MFC.manifest"       
+  File "${GPAC_BIN}\msvcr100.dll"
+  File "${GPAC_BIN}\mfc100.dll"
+SectionEnd
+
+
+
+
+SubSection "GPAC Shortcuts"
+
+Section "Add Start Menu Shortcuts"
+  SectionIn 1
+  #has current user admin privileges?
+  userInfo::getAccountType
+  Pop $0
+  StrCmp $0 "Admin" +1 +2
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\GPAC"
+  CreateShortCut "$SMPROGRAMS\GPAC\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4.lnk" "$INSTDIR\MP4Client.exe" "" 
+  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4 (with Console).lnk" "$INSTDIR\MP4Client.exe" "-guid"
+  !ifndef IS_WIN64
+  CreateShortCut "$SMPROGRAMS\GPAC\Osmo4 (Old UI).lnk" "$INSTDIR\Osmo4.exe" ""
+  !endif
+  CreateShortCut "$SMPROGRAMS\GPAC\Readme.lnk" "$INSTDIR\ReadMe.txt"
+  CreateShortCut "$SMPROGRAMS\GPAC\License.lnk" "$INSTDIR\License.txt"
+  CreateShortCut "$SMPROGRAMS\GPAC\History.lnk" "$INSTDIR\changelog.txt"
+  CreateShortCut "$SMPROGRAMS\GPAC\Configuration Info.lnk" "$INSTDIR\configuration.html"
+SectionEnd
+
+!ifndef IS_WIN64
+Section "Add shortcut to QuickLaunch"
+  SectionIn 1
+  CreateShortCut "$QUICKLAUNCH\GPAC.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
+SectionEnd
+
+Section "Add shortcut to Desktop"
+  SectionIn 1
+  CreateShortCut "$DESKTOP\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
+SectionEnd
+
+!define SHCNE_ASSOCCHANGED 0x08000000
+!define SHCNF_IDLIST 0
+
+Section "Make Osmo4 the default MPEG-4 Player"
+  SectionIn 1
+  ;write file association
+  ${WriteRegStrAuth} HKCR GPAC\mp4\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
+  ${WriteRegStrAuth} HKCR GPAC\mp4\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
+  ${WriteRegStrAuth} HKCR .mp4 "" "GPAC\mp4"
+  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+
+SectionEnd
+
+Section "Associate 3GPP files (3GP) with Osmo4"
+  SectionIn 1
+  ;write file association
+  ${WriteRegStrAuth} HKCR GPAC\3gp\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
+  ${WriteRegStrAuth} HKCR GPAC\3gp\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
+  ${WriteRegStrAuth} HKCR .3gp "" "GPAC\3gp"
+  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+SectionEnd
+
+Section "Associate 3GPP2 files (3G2) with Osmo4"
+  SectionIn 1
+  ;write file association
+  ${WriteRegStrAuth} HKCR GPAC\3g2\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
+  ${WriteRegStrAuth} HKCR GPAC\3g2\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
+  ${WriteRegStrAuth} HKCR .3g2 "" "GPAC\3g2"
+  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+SectionEnd
+!endif
+  
+SubSectionEnd
+
+
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAC} "GPAC Core"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmo4} "GPAC Player"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "GPAC Plugins"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecBIFS} "MPEG-4 BIFS Scene Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecODF} "MPEG-4 Object Descriptor Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecLASeR} "MPEG-4 LASeR Scene Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTextLoad} "Support for uncompressed MPEG-4 (BT and XMT), VRML and X3D textual formats"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSAF} "MPEG-4 SAF Demultiplexer"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecIMG} "Support for PNG, JPEG, BMP and JPEG2000 images"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAAC} "Support for MPEG-4 Audio HE-AAC decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP3} "Support for MPEG-1/2 Audio (inc. MP3) decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAC3} "Support for Dolby AC3 decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecFFMPEG} "Support for FFMPEG libraries for various format decoding and demultiplexing"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecXVID} "Support for XVID library for MPEG-4 Video Part 2 decoding"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAMRFT} "Support for AMR and AMR WideBand decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSUBS} "Subtitle support include SRT, SUB, 3GPP and MPEG-4 Text formats"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecISOFF} "Support for ISO-based file formats (3GP, MP4, MJ2K)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecM2TS} "Support for MPEG-2 Transport Stream"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecRTP} "Support for RTP and RTSP IP streaming"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSVG} "Support for SVG including progressive loading"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebVTT} "Support for WebVTT subtitles"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWAVE} "Windows MME Audio output support"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecXIPH} "Support for XIPP OGG, Vorbis and Theora media"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOSVC} "Support for SVC decoding through OpenSVC Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOHEVC} "Support for HEVC decoding through OpenHEVC Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDASH} "HTTP Streaming using MPEG DASH"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMSE}  "HTTP Streaming using HTML 5 Media Source Extensions"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOffisComp} "OFFIS Audio Compressor"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for various multimedia operations"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP42TS} "MP42TS command-line tool for MPEG-2 TS multiplexing"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDC} "DashCast offline and live MPEG-DASH Encoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSDK} "GPAC SDK: headers and library files needed to develop modules for GPAC or appllication based on GPAC"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecZILLA} "GPAC playback support NPAPI-based browsers (FireFox/Gecko, Safari/WebKit)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAX} "GPAC playback support using ActiveX component (Internet Explorer)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4C} "GPAC command-line player and AVI dumper"
+  
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+Function .onInstSuccess
+;  MessageBox MB_YESNO "GPAC Framework installation complete. Do you want to launch the player?" IDNO NoLaunch
+;  Exec $INSTDIR\Osmo4.exe
+;  NoLaunch:
+FunctionEnd
+
+
+
+
+
+; uninstall stuff
+
+UninstallText "This will uninstall GPAC from your computer. Hit next to continue."
+
+; special uninstall section.
+Section "Uninstall"
+  ; remove registry keys
+  ${DeleteRegKeyAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC"
+  ${DeleteRegKeyAuth} HKCU "SOFTWARE\GPAC"
+  ${DeleteRegKeyAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
+  ${DeleteRegKeyAuth} HKCR GPAC\mp4\DefaultIcon
+  ${DeleteRegKeyAuth} HKCR GPAC\mp4\shell\open\command
+  ${DeleteRegKeyAuth} HKCR GPAC\mp4
+  ${DeleteRegKeyAuth} HKCR .mp4
+  ${DeleteRegKeyAuth} HKCR GPAC\3gp\DefaultIcon
+  ${DeleteRegKeyAuth} HKCR GPAC\3gp\shell\open\command
+  ${DeleteRegKeyAuth} HKCR GPAC\3gp
+  ${DeleteRegKeyAuth} HKCR .3gp
+  ${DeleteRegKeyAuth} HKCR GPAC\3g2\DefaultIcon
+  ${DeleteRegKeyAuth} HKCR GPAC\3g2\shell\open\command
+  ${DeleteRegKeyAuth} HKCR GPAC\3g2
+  ${DeleteRegKeyAuth} HKCR .3g2
+  ${DeleteRegKeyAuth} HKCR GPAC
+
+  UnRegDLL "$INSTDIR\GPAX.dll"
+  RMDir /r $INSTDIR
+  Push $INSTDIR
+  Call un.RemoveFromPath
+  #has current user admin privileges?
+  userInfo::getAccountType
+  Pop $0
+  StrCmp $0 "Admin" +1 +2
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\GPAC\*.*"
+  RMDir "$SMPROGRAMS\GPAC"
+  Delete "$QUICKLAUNCH\Osmo4.lnk"
+  Delete "$DESKTOP\Osmo4.lnk"
+
+SectionEnd
+
+;path modif functions
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+
+!ifndef WriteEnvStr_RegKey
+  !ifdef ALL_USERS
+    !define WriteEnvStr_RegKey \
+       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+  !else
+    !define WriteEnvStr_RegKey 'HKCU "Environment"'
+  !endif
+!endif
+
+; AddToPath - Adds the given dir to the search path.
+;        Input - head of the stack
+;        Note - Win9x systems requires reboot
+
+Function AddToPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+ 
+  # don't add if the path doesn't exist
+  IfFileExists "$0\*.*" "" AddToPath_done
+ 
+  ReadEnvStr $1 PATH
+  Push "$1;"
+  Push "$0;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$0\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  GetFullPathName /SHORT $3 $0
+  Push "$1;"
+  Push "$3;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$3\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+ 
+  Call IsNT
+  Pop $1
+  StrCmp $1 1 AddToPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" a
+    FileSeek $1 -1 END
+    FileReadByte $1 $2
+    IntCmp $2 26 0 +2 +2 # DOS EOF
+      FileSeek $1 -1 END # write over EOF
+    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+    FileClose $1
+    SetRebootFlag true
+    Goto AddToPath_done
+ 
+  AddToPath_NT:
+    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+    StrCpy $2 $1 1 -1 # copy last char
+    StrCmp $2 ";" 0 +2 # if last char == ;
+      StrCpy $1 $1 -1 # remove last char
+    StrCmp $1 "" AddToPath_NTdoIt
+      StrCpy $0 "$1;$0"
+    AddToPath_NTdoIt:
+      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+ 
+  AddToPath_done:
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+; RemoveFromPath - Remove a given dir from the path
+;     Input: head of the stack
+
+Function un.RemoveFromPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $6
+ 
+  IntFmt $6 "%c" 26 # DOS EOF
+ 
+  Call un.IsNT
+  Pop $1
+  StrCmp $1 1 unRemoveFromPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" r
+    GetTempFileName $4
+    FileOpen $2 $4 w
+    GetFullPathName /SHORT $0 $0
+    StrCpy $0 "SET PATH=%PATH%;$0"
+    Goto unRemoveFromPath_dosLoop
+ 
+    unRemoveFromPath_dosLoop:
+      FileRead $1 $3
+      StrCpy $5 $3 1 -1 # read last char
+      StrCmp $5 $6 0 +2 # if DOS EOF
+        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
+      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+      FileWrite $2 $3
+      Goto unRemoveFromPath_dosLoop
+      unRemoveFromPath_dosLoopRemoveLine:
+        SetRebootFlag true
+        Goto unRemoveFromPath_dosLoop
+ 
+    unRemoveFromPath_dosLoopEnd:
+      FileClose $2
+      FileClose $1
+      StrCpy $1 $WINDIR 2
+      Delete "$1\autoexec.bat"
+      CopyFiles /SILENT $4 "$1\autoexec.bat"
+      Delete $4
+      Goto unRemoveFromPath_done
+ 
+  unRemoveFromPath_NT:
+    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+    StrCpy $5 $1 1 -1 # copy last char
+    StrCmp $5 ";" +2 # if last char != ;
+      StrCpy $1 "$1;" # append ;
+    Push $1
+    Push "$0;"
+    Call un.StrStr ; Find `$0;` in $1
+    Pop $2 ; pos of our dir
+    StrCmp $2 "" unRemoveFromPath_done
+      ; else, it is in path
+      # $0 - path to add
+      # $1 - path var
+      StrLen $3 "$0;"
+      StrLen $4 $2
+      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
+      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
+      StrCpy $3 $5$6
+ 
+      StrCpy $5 $3 1 -1 # copy last char
+      StrCmp $5 ";" 0 +2 # if last char == ;
+        StrCpy $3 $3 -1 # remove last char
+ 
+      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+ 
+  unRemoveFromPath_done:
+    Pop $6
+    Pop $5
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+###########################################
+#            Utility Functions            #
+###########################################
+
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+;   Call IsNT
+;   Pop $R0
+;  ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+  Push $0
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+  StrCmp $0 "" 0 IsNT_yes
+  ; we are not NT.
+  Pop $0
+  Push 0
+  Return
+ 
+  IsNT_yes:
+    ; NT!!!
+    Pop $0
+    Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+; StrStr
+; input, top of stack = string to search for
+;        top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+;   Push "this is a long ass string"
+;   Push "ass"
+;   Call StrStr
+;   Pop $R0
+;  ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1 ; st=haystack,old$R1, $R1=needle
+  Exch    ; st=old$R1,haystack
+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+  Push $R3
+  Push $R4
+  Push $R5
+  StrLen $R3 $R1
+  StrCpy $R4 0
+  ; $R1=needle
+  ; $R2=haystack
+  ; $R3=len(needle)
+  ; $R4=cnt
+  ; $R5=tmp
+  loop:
+    StrCpy $R5 $R2 $R3 $R4
+    StrCmp $R5 $R1 done
+    StrCmp $R5 "" done
+    IntOp $R4 $R4 + 1
+    Goto loop
+done:
+  StrCpy $R1 $R2 "" $R4
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."

v0.5.2.tar.gz/regression_tests/auxiliary_files/logo.bt -> v0.6.1.tar.gz/regression_tests/auxiliary_files/logo.bt Changed

@@ -1,126 +1,126 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 2038
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 4
-     isCommandStream true
-     pixelMetric true
-    }
-   }
-   slConfigDescr SLConfigDescriptor {
-    useAccessUnitStartFlag true
-    useAccessUnitEndFlag true
-    useTimeStampsFlag true
-    timeStampResolution 1000
-    timeStampLength 32
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-#  Background2D { backColor 1 1 1 }
-  DEF N0 Viewport {
-   size 140 140
-   fit 1
-  }
-
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    Transform2D {
-     translation 1 -2
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         lineProps XLineProperties {
-          lineColor 0.2 0.2 0.2
-          width 20
-         }
-        }
-       }
-       geometry Circle {
-        radius 100
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -30
-     children [
-      Shape {
-       appearance DEF N3 Appearance {
-        texture RadialGradient {
-         focalPoint 0.45 0.8
-         key [0 1]
-         keyValue [0.5 0.5 0.5 0 0 0]
-        }
-        material Material2D {
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 60
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 90
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         filled true
-        }
-        texture RadialGradient {
-         focalPoint 0.45 0.2
-         key [0 1]
-         keyValue [0.2 0.2 0.2 0 0 0]
-        }
-       }
-       geometry IndexedFaceSet2D {
-        colorPerVertex false
-        coord Coordinate2D {
-         point [-40 5 40 5 0 -60]
-        }
-       }
-      }
-     ]
-    }
-    Shape {
-     appearance Appearance {
-      material DEF N4 Material2D {
-       lineProps DEF N5 XLineProperties {
-        lineColor 1 0 0
-        width 20
-        texture RadialGradient {
-         focalPoint 0.5 0.5
-         key [0 0.8 0.9 1]
-         keyValue [0 0 0 0.5 0 0 1 0 0 0.5 0 0]
-        }
-       }
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
-
- ]
-}
-
-
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ sceneProfileLevelIndication 254
+ graphicsProfileLevelIndication 254
+ ODProfileLevelIndication 254
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 2038
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 4
+     isCommandStream true
+     pixelMetric true
+    }
+   }
+   slConfigDescr SLConfigDescriptor {
+    useAccessUnitStartFlag true
+    useAccessUnitEndFlag true
+    useTimeStampsFlag true
+    timeStampResolution 1000
+    timeStampLength 32
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+#  Background2D { backColor 1 1 1 }
+  DEF N0 Viewport {
+   size 140 140
+   fit 1
+  }
+
+  Transform2D {
+   scale 0.5 0.5
+   children [
+    Transform2D {
+     translation 1 -2
+     children [
+      Shape {
+       appearance Appearance {
+        material Material2D {
+         lineProps XLineProperties {
+          lineColor 0.2 0.2 0.2
+          width 20
+         }
+        }
+       }
+       geometry Circle {
+        radius 100
+       }
+      }
+     ]
+    }
+    Transform2D {
+     translation 0 -30
+     children [
+      Shape {
+       appearance DEF N3 Appearance {
+        texture RadialGradient {
+         focalPoint 0.45 0.8
+         key [0 1]
+         keyValue [0.5 0.5 0.5 0 0 0]
+        }
+        material Material2D {
+         filled TRUE
+        }
+       }
+       geometry Circle {
+        radius 60
+       }
+      }
+     ]
+    }
+    Transform2D {
+     translation 0 90
+     children [
+      Shape {
+       appearance Appearance {
+        material Material2D {
+         filled true
+        }
+        texture RadialGradient {
+         focalPoint 0.45 0.2
+         key [0 1]
+         keyValue [0.2 0.2 0.2 0 0 0]
+        }
+       }
+       geometry IndexedFaceSet2D {
+        colorPerVertex false
+        coord Coordinate2D {
+         point [-40 5 40 5 0 -60]
+        }
+       }
+      }
+     ]
+    }
+    Shape {
+     appearance Appearance {
+      material DEF N4 Material2D {
+       lineProps DEF N5 XLineProperties {
+        lineColor 1 0 0
+        width 20
+        texture RadialGradient {
+         focalPoint 0.5 0.5
+         key [0 0.8 0.9 1]
+         keyValue [0 0 0 0.5 0 0 1 0 0 0.5 0 0]
+        }
+       }
+      }
+     }
+     geometry Circle {
+      radius 100
+     }
+    }
+   ]
+  }
+
+ ]
+}
+
+

v0.5.2.tar.gz/regression_tests/bifs/bifs-3D-positioning-layer3D.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-3D-positioning-layer3D.bt Changed

v0.5.2.tar.gz/regression_tests/bifs/bifs-3D-shapes-box-transparent.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-3D-shapes-box-transparent.bt Changed

v0.5.2.tar.gz/regression_tests/bifs/bifs-cachetexture_cache.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-cachetexture_cache.bt Changed

@@ -1,90 +1,90 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the CacheTexture node. The texture is cached for 3 seconds only."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "CacheTexture Node for testing cache"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture CacheTexture {
-       objectTypeIndication 108
-       image "../auxiliary_files/sky.jpg"
-       cacheURL "MyCachedPicture.jpg"
-       expirationDate 3
-      }
-     }
-     geometry Rectangle {
-      size 160 120
-     }
-    }
-   ]
-  }
- ]
-}
-
-AT 1000 {
- REPLACE TR.children[0] BY Shape {}
-}
-
-AT 2000 {
- REPLACE TR.children[0] BY Shape {
-   appearance Appearance {
-    texture ImageTexture {
-     url "MyCachedPicture.jpg"
-    }
-   }
-   geometry Circle {
-    radius 80
-   }
-  }
- }
-}
-
-AT 3000 {
- REPLACE TR.children[0] BY Shape {}
-}
-
-AT 4000 {
- REPLACE TR.children[0] BY Shape {
-   appearance Appearance {
-    texture ImageTexture {
-     url "MyCachedPicture.jpg"
-    }
-   }
-   geometry Rectangle {
-    size 160 80
-   }
-  }
- }
-}
-
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ ODProfileLevelIndication 1
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 177
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 24
+     isCommandStream true
+     pixelMetric true
+     pixelWidth 400
+     pixelHeight 300
+    }
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+  Background2D {backColor 1 1 1}
+  WorldInfo {
+   info [
+    "This test shows usage of the CacheTexture node. The texture is cached for 3 seconds only."
+    "" 
+    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
+    "(C) 2010-200X GPAC Team"
+   ]
+   title "CacheTexture Node for testing cache"
+  }
+  DEF TR Transform2D {
+   children [
+    Shape {
+     appearance Appearance {
+      texture CacheTexture {
+       objectTypeIndication 108
+       image "../auxiliary_files/sky.jpg"
+       cacheURL "MyCachedPicture.jpg"
+       expirationDate 3
+      }
+     }
+     geometry Rectangle {
+      size 160 120
+     }
+    }
+   ]
+  }
+ ]
+}
+
+AT 1000 {
+ REPLACE TR.children[0] BY Shape {}
+}
+
+AT 2000 {
+ REPLACE TR.children[0] BY Shape {
+   appearance Appearance {
+    texture ImageTexture {
+     url "MyCachedPicture.jpg"
+    }
+   }
+   geometry Circle {
+    radius 80
+   }
+  }
+ }
+}
+
+AT 3000 {
+ REPLACE TR.children[0] BY Shape {}
+}
+
+AT 4000 {
+ REPLACE TR.children[0] BY Shape {
+   appearance Appearance {
+    texture ImageTexture {
+     url "MyCachedPicture.jpg"
+    }
+   }
+   geometry Rectangle {
+    size 160 80
+   }
+  }
+ }
+}
+

v0.5.2.tar.gz/regression_tests/bifs/bifs-cachetexture_nocache.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-cachetexture_nocache.bt Changed

@@ -1,57 +1,57 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the CacheTexture node for embedding images in the BIFS bitstream."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "CacheTexture Node for in-band images"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture CacheTexture {
-       objectTypeIndication 108
-       image "../auxiliary_files/sky.jpg"
-      }
-     }
-     geometry Rectangle {
-      size 160 120
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition -1 -1
-     autoOffset TRUE
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ ODProfileLevelIndication 1
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 177
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 24
+     isCommandStream true
+     pixelMetric true
+     pixelWidth 400
+     pixelHeight 300
+    }
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+  Background2D {backColor 1 1 1}
+  WorldInfo {
+   info [
+    "This test shows usage of the CacheTexture node for embedding images in the BIFS bitstream."
+    "" 
+    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
+    "(C) 2010-200X GPAC Team"
+   ]
+   title "CacheTexture Node for in-band images"
+  }
+  DEF TR Transform2D {
+   children [
+    Shape {
+     appearance Appearance {
+      texture CacheTexture {
+       objectTypeIndication 108
+       image "../auxiliary_files/sky.jpg"
+      }
+     }
+     geometry Rectangle {
+      size 160 120
+     }
+    }
+    DEF PS PlaneSensor2D {
+     maxPosition -1 -1
+     autoOffset TRUE
+    }
+   ]
+  }
+ ]
+}
+
+ROUTE PS.translation_changed TO TR.translation

v0.5.2.tar.gz/regression_tests/bifs/bifs-environmenttest.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-environmenttest.bt Changed

@@ -1,129 +1,129 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the EnvironmentTest node. The various settings of the node are tested."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "EnvironmentTest Node testing"
-  }
-
-  Transform2D {
-   translation 0 50
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled true
-      }
-     }
-     geometry Text {
-      string ["Width:"]
-      fontStyle DEF FSEND FontStyle {
-       size 24
-       justify "END"
-      }
-     }
-    }
-    Shape {
-     appearance USE APP 
-     geometry DEF T1 Text {
-      string [""]
-      fontStyle DEF FSBEGIN FontStyle {
-       size 24
-       justify "BEGIN"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Height:"]
-      fontStyle USE FSEND
-     }
-    }
-    Shape {
-     appearance USE APP 
-     geometry DEF T2 Text {
-      string [""]
-      fontStyle USE FSBEGIN 
-     }
-    }
-   ]
-  }
-
-  Transform2D {
-   translation 0 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Portrait:"]
-      fontStyle USE FSEND
-     }
-    }
-    Shape {
-     appearance USE APP 
-     geometry DEF T3 Text {
-      string [""]
-      fontStyle USE FSBEGIN 
-     }
-    }
-   ]
-  }
-
-  DEF V1 Valuator {}
-  DEF EV1 EnvironmentTest {
-   parameter 2
-  }
-
-  DEF V2 Valuator {}
-  DEF EV2 EnvironmentTest {
-   parameter 3
-  }
-
-  DEF V3 Valuator {}
-  DEF EV3 EnvironmentTest {
-   parameter 1
-  }
- ]
-}
-
-ROUTE EV1.parameterValue TO V1.inSFString
-ROUTE V1.outMFString TO T1.string 
-
-ROUTE EV2.parameterValue TO V2.inSFString
-ROUTE V2.outMFString TO T2.string 
-
-ROUTE EV3.valueEqual TO V3.inSFBool
-ROUTE V3.outMFString TO T3.string 
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ ODProfileLevelIndication 1
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 177
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 24
+     isCommandStream true
+     pixelMetric true
+     pixelWidth 400
+     pixelHeight 300
+    }
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+  Background2D {backColor 1 1 1}
+  WorldInfo {
+   info [
+    "This test shows usage of the EnvironmentTest node. The various settings of the node are tested."
+    "" 
+    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
+    "(C) 2010-200X GPAC Team"
+   ]
+   title "EnvironmentTest Node testing"
+  }
+
+  Transform2D {
+   translation 0 50
+   children [
+    Shape {
+     appearance DEF APP Appearance {
+      material Material2D {
+       emissiveColor 0 0 0
+       filled true
+      }
+     }
+     geometry Text {
+      string ["Width:"]
+      fontStyle DEF FSEND FontStyle {
+       size 24
+       justify "END"
+      }
+     }
+    }
+    Shape {
+     appearance USE APP 
+     geometry DEF T1 Text {
+      string [""]
+      fontStyle DEF FSBEGIN FontStyle {
+       size 24
+       justify "BEGIN"
+      }
+     }
+    }
+   ]
+  }
+  Transform2D {
+   children [
+    Shape {
+     appearance USE APP
+     geometry Text {
+      string ["Height:"]
+      fontStyle USE FSEND
+     }
+    }
+    Shape {
+     appearance USE APP 
+     geometry DEF T2 Text {
+      string [""]
+      fontStyle USE FSBEGIN 
+     }
+    }
+   ]
+  }
+
+  Transform2D {
+   translation 0 -50
+   children [
+    Shape {
+     appearance USE APP
+     geometry Text {
+      string ["Portrait:"]
+      fontStyle USE FSEND
+     }
+    }
+    Shape {
+     appearance USE APP 
+     geometry DEF T3 Text {
+      string [""]
+      fontStyle USE FSBEGIN 
+     }
+    }
+   ]
+  }
+
+  DEF V1 Valuator {}
+  DEF EV1 EnvironmentTest {
+   parameter 2
+  }
+
+  DEF V2 Valuator {}
+  DEF EV2 EnvironmentTest {
+   parameter 3
+  }
+
+  DEF V3 Valuator {}
+  DEF EV3 EnvironmentTest {
+   parameter 1
+  }
+ ]
+}
+
+ROUTE EV1.parameterValue TO V1.inSFString
+ROUTE V1.outMFString TO T1.string 
+
+ROUTE EV2.parameterValue TO V2.inSFString
+ROUTE V2.outMFString TO T2.string 
+
+ROUTE EV3.valueEqual TO V3.inSFBool
+ROUTE V3.outMFString TO T3.string

v0.5.2.tar.gz/regression_tests/bifs/bifs-keynavigator.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-keynavigator.bt Changed

@@ -1,220 +1,220 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the KeyNavigator node. Navigate through the keypad between the various items."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "KeyNavigator Node for testing keypad navigation"
-  }
-  Transform2D {
-   translation -100 100
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 1 0 0
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS1 TouchSensor {}
-    DEF V1 Valuator { Factor1 0.75 }
-   ]
-  }
-
-  Transform2D {
-   translation 100 100
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M2 Material2D {
-       emissiveColor 0 1 0
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS2 TouchSensor {}
-    DEF V2 Valuator { Factor1 0.75 }
-   ]
-  }
-
-  Transform2D {
-   translation -100 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M3 Material2D {
-       emissiveColor 1 0 1
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS3 TouchSensor {}
-    DEF V3 Valuator { Factor1 0.75 }
-   ]
-  }
-
-  Transform2D {
-   translation 100 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M4 Material2D {
-       emissiveColor 0 0 1
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS4 TouchSensor {}
-    DEF V4 Valuator { Factor1 0.75 }
-   ]
-  }
-  
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [".", "."]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 24
-      }
-     }
-    }
-   ]
-  }
-
-  DEF C1 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN1 got focus" 
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN1 lost focus" 
-   }
-  }
-  DEF KN1 KeyNavigator {
-   sensor USE TS1
-   right USE KN2
-   down USE KN3
-  }
-
-  DEF C2 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN2 got focus" 
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN2 lost focus" 
-   }
-  }
-  DEF KN2 KeyNavigator {
-   sensor USE TS2
-   left USE KN1
-   down USE KN4
-  }
-
-  DEF C3 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN3 got focus" 
-   }
-  }
-  DEF RC3 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN3 lost focus" 
-   }
-  }
-  DEF KN3 KeyNavigator {
-   sensor USE TS3
-   right USE KN4
-   up USE KN1
-   select USE KN2
-  }
-
-  DEF C4 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN4 got focus" 
-   }
-  }
-  DEF RC4 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN4 lost focus" 
-   }
-  }
-  DEF KN4 KeyNavigator {
-   sensor USE TS4
-   left USE KN3
-   up USE KN2
-  }
-  
-  DEF AC1 Conditional { buffer { REPLACE KN4.setFocus BY TRUE}}
- ]
-}
-
-ROUTE TS1.isOver TO M1.filled
-ROUTE TS1.isActive TO V1.inSFBool
-ROUTE V1.outSFFloat TO M1.transparency
-ROUTE TS1.isActive TO AC1.activate
-ROUTE KN1.focusSet TO C1.activate
-ROUTE KN1.focusSet TO RC1.reverseActivate
-
-ROUTE TS2.isOver TO M2.filled
-ROUTE TS2.isActive TO V2.inSFBool
-ROUTE V2.outSFFloat TO M2.transparency
-ROUTE KN2.focusSet TO C2.activate
-ROUTE KN2.focusSet TO RC2.reverseActivate
-
-ROUTE TS3.isOver TO M3.filled
-ROUTE TS3.isActive TO V3.inSFBool
-ROUTE V3.outSFFloat TO M3.transparency
-ROUTE KN3.focusSet TO C3.activate
-ROUTE KN3.focusSet TO RC3.reverseActivate
-
-ROUTE TS4.isOver TO M4.filled
-ROUTE TS4.isActive TO V4.inSFBool
-ROUTE V4.outSFFloat TO M4.transparency
-ROUTE KN4.focusSet TO C4.activate
-ROUTE KN4.focusSet TO RC4.reverseActivate
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ ODProfileLevelIndication 1
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 177
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 24
+     isCommandStream true
+     pixelMetric true
+     pixelWidth 400
+     pixelHeight 300
+    }
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+  Background2D {backColor 1 1 1}
+  WorldInfo {
+   info [
+    "This test shows usage of the KeyNavigator node. Navigate through the keypad between the various items."
+    "" 
+    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
+    "(C) 2010-200X GPAC Team"
+   ]
+   title "KeyNavigator Node for testing keypad navigation"
+  }
+  Transform2D {
+   translation -100 100
+   children [
+    Shape {
+     appearance Appearance {
+      material DEF M1 Material2D {
+       emissiveColor 1 0 0
+      }
+     }
+     geometry Rectangle {
+      size 60 60
+     }
+    }
+    DEF TS1 TouchSensor {}
+    DEF V1 Valuator { Factor1 0.75 }
+   ]
+  }
+
+  Transform2D {
+   translation 100 100
+   children [
+    Shape {
+     appearance Appearance {
+      material DEF M2 Material2D {
+       emissiveColor 0 1 0
+      }
+     }
+     geometry Rectangle {
+      size 60 60
+     }
+    }
+    DEF TS2 TouchSensor {}
+    DEF V2 Valuator { Factor1 0.75 }
+   ]
+  }
+
+  Transform2D {
+   translation -100 -50
+   children [
+    Shape {
+     appearance Appearance {
+      material DEF M3 Material2D {
+       emissiveColor 1 0 1
+      }
+     }
+     geometry Rectangle {
+      size 60 60
+     }
+    }
+    DEF TS3 TouchSensor {}
+    DEF V3 Valuator { Factor1 0.75 }
+   ]
+  }
+
+  Transform2D {
+   translation 100 -50
+   children [
+    Shape {
+     appearance Appearance {
+      material DEF M4 Material2D {
+       emissiveColor 0 0 1
+      }
+     }
+     geometry Rectangle {
+      size 60 60
+     }
+    }
+    DEF TS4 TouchSensor {}
+    DEF V4 Valuator { Factor1 0.75 }
+   ]
+  }
+  
+  Transform2D {
+   translation 0 -100
+   children [
+    Shape {
+     appearance Appearance {
+      material Material2D {
+       emissiveColor 0 0 0
+       filled TRUE
+      }
+     }
+     geometry DEF TXT Text {
+      string [".", "."]
+      fontStyle FontStyle {
+       justify ["MIDDLE"]
+       size 24
+      }
+     }
+    }
+   ]
+  }
+
+  DEF C1 Conditional {
+   buffer {
+    REPLACE TXT.string[0] BY "KN1 got focus" 
+   }
+  }
+  DEF RC1 Conditional {
+   buffer {
+    REPLACE TXT.string[1] BY "KN1 lost focus" 
+   }
+  }
+  DEF KN1 KeyNavigator {
+   sensor USE TS1
+   right USE KN2
+   down USE KN3
+  }
+
+  DEF C2 Conditional {
+   buffer {
+    REPLACE TXT.string[0] BY "KN2 got focus" 
+   }
+  }
+  DEF RC2 Conditional {
+   buffer {
+    REPLACE TXT.string[1] BY "KN2 lost focus" 
+   }
+  }
+  DEF KN2 KeyNavigator {
+   sensor USE TS2
+   left USE KN1
+   down USE KN4
+  }
+
+  DEF C3 Conditional {
+   buffer {
+    REPLACE TXT.string[0] BY "KN3 got focus" 
+   }
+  }
+  DEF RC3 Conditional {
+   buffer {
+    REPLACE TXT.string[1] BY "KN3 lost focus" 
+   }
+  }
+  DEF KN3 KeyNavigator {
+   sensor USE TS3
+   right USE KN4
+   up USE KN1
+   select USE KN2
+  }
+
+  DEF C4 Conditional {
+   buffer {
+    REPLACE TXT.string[0] BY "KN4 got focus" 
+   }
+  }
+  DEF RC4 Conditional {
+   buffer {
+    REPLACE TXT.string[1] BY "KN4 lost focus" 
+   }
+  }
+  DEF KN4 KeyNavigator {
+   sensor USE TS4
+   left USE KN3
+   up USE KN2
+  }
+  
+  DEF AC1 Conditional { buffer { REPLACE KN4.setFocus BY TRUE}}
+ ]
+}
+
+ROUTE TS1.isOver TO M1.filled
+ROUTE TS1.isActive TO V1.inSFBool
+ROUTE V1.outSFFloat TO M1.transparency
+ROUTE TS1.isActive TO AC1.activate
+ROUTE KN1.focusSet TO C1.activate
+ROUTE KN1.focusSet TO RC1.reverseActivate
+
+ROUTE TS2.isOver TO M2.filled
+ROUTE TS2.isActive TO V2.inSFBool
+ROUTE V2.outSFFloat TO M2.transparency
+ROUTE KN2.focusSet TO C2.activate
+ROUTE KN2.focusSet TO RC2.reverseActivate
+
+ROUTE TS3.isOver TO M3.filled
+ROUTE TS3.isActive TO V3.inSFBool
+ROUTE V3.outSFFloat TO M3.transparency
+ROUTE KN3.focusSet TO C3.activate
+ROUTE KN3.focusSet TO RC3.reverseActivate
+
+ROUTE TS4.isOver TO M4.filled
+ROUTE TS4.isActive TO V4.inSFBool
+ROUTE V4.outSFFloat TO M4.transparency
+ROUTE KN4.focusSet TO C4.activate
+ROUTE KN4.focusSet TO RC4.reverseActivate

v0.6.1.tar.gz/regression_tests/bifs/bifs-misc-hc-proto-planeclipper-box.bt Added

@@ -0,0 +1,77 @@
+InitialObjectDescriptor {
+  objectDescriptorID 1
+  ODProfileLevelIndication 0xFF
+  sceneProfileLevelIndication 0xFE
+  audioProfileLevelIndication 0xFF
+  visualProfileLevelIndication 0xFF
+  graphicsProfileLevelIndication 0xFE
+
+  esdescr [
+    ES_Descriptor {
+      es_id 1
+      decConfigDescr DecoderConfigDescriptor {
+				streamType 3
+				decSpecificInfo BIFSConfig {
+				  isCommandStream true
+				  pixelMetric false
+				  pixelWidth 600
+				  pixelHeight 400
+				}
+      }
+    }
+  ]
+}
+
+
+EXTERNPROTO PlaneClipper [
+    exposedField SFVec3f plane_normal 1 0 0
+    exposedField SFFloat plane_distance 0.0
+    exposedField MFNode children []
+]
+[ "urn:inet:gpac:builtin:PlaneClipper"]
+
+
+
+Group {
+  children [
+		WorldInfo {
+   		info ["This shows GPAC PlaneClipper HardcodedProto" "The plane clipper normal and distance are interpolated to cut the mesh at different places" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
+   		title "PlaneClipper HardcodedProto"
+  	}
+  	Background2D { backColor 1 1 0}
+    DEF VIEWPOINT Viewpoint {
+        description "one"
+        position 2 2 10
+    }
+    DEF PC PlaneClipper {
+    	children [
+     Shape {
+     	appearance Appearance {
+		material Material { diffuseColor 1.0 0.0 0.0 }
+				texture	ImageTexture {  url "../auxiliary_files/logo.jpg" }
+     	}
+      geometry Box {size 1 1 1}
+     }
+
+
+    	]
+    }
+    DEF TS TimeSensor { cycleInterval 4.0 loop TRUE}
+    DEF SI ScalarInterpolator {
+    	key [0 0.5 1]
+    	keyValue [-3 3 -3]
+    }
+    DEF TS2 TimeSensor { cycleInterval 12.0 loop TRUE}
+    DEF PI PositionInterpolator {
+#    	key [0 0.333 0.334 0.666 0.667 1]
+#    	keyValue [1 0 0 1 0 0 0 1 0 0 1 0 0 0 -1 0 0 -1]
+    	key [0 0.33 0.666 1]
+    	keyValue [1 0 0, 0 1 0, 0 0 -1, 1 1 0]
+    }
+	]
+}
+
+ROUTE TS.fraction_changed TO SI.set_fraction
+ROUTE SI.value_changed TO PC.plane_distance
+ROUTE TS2.fraction_changed TO PI.set_fraction
+ROUTE PI.value_changed TO PC.plane_normal

v0.5.2.tar.gz/regression_tests/bifs/bifs-storage.bt -> v0.6.1.tar.gz/regression_tests/bifs/bifs-storage.bt Changed

@@ -1,65 +1,65 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the Storage node. The rectangle position is stored upon closing of the scene in the player. It is restored if the scene is re-opened less than 10 seconds later."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "Storage Node for testing persistent storage"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled true
-      }
-     }
-     geometry Rectangle {
-      size 160 120
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition -1 -1
-     autoOffset TRUE
-    }
-   ]
-  }
-  Storage {
-   expireAfter 10
-   name "test storage"
-   storageList [
-    TR.translation
-    PS.offset
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ ODProfileLevelIndication 1
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 177
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 24
+     isCommandStream true
+     pixelMetric true
+     pixelWidth 400
+     pixelHeight 300
+    }
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+  Background2D {backColor 1 1 1}
+  WorldInfo {
+   info [
+    "This test shows usage of the Storage node. The rectangle position is stored upon closing of the scene in the player. It is restored if the scene is re-opened less than 10 seconds later."
+    "" 
+    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
+    "(C) 2010-200X GPAC Team"
+   ]
+   title "Storage Node for testing persistent storage"
+  }
+  DEF TR Transform2D {
+   children [
+    Shape {
+     appearance Appearance {
+      material Material2D {
+       emissiveColor 1 0 0
+       filled true
+      }
+     }
+     geometry Rectangle {
+      size 160 120
+     }
+    }
+    DEF PS PlaneSensor2D {
+     maxPosition -1 -1
+     autoOffset TRUE
+    }
+   ]
+  }
+  Storage {
+   expireAfter 10
+   name "test storage"
+   storageList [
+    TR.translation
+    PS.offset
+   ]
+  }
+ ]
+}
+
+ROUTE PS.translation_changed TO TR.translation

v0.5.2.tar.gz/regression_tests/build-navigator-w32.bat -> v0.6.1.tar.gz/regression_tests/build-navigator-w32.bat Changed

v0.5.2.tar.gz/regression_tests/build-w32.bat -> v0.6.1.tar.gz/regression_tests/build-w32.bat Changed

@@ -1,54 +1,54 @@
-@ECHO OFF
-
-IF "%1" == "" GOTO BTTOMP4
-IF "%1" == "mp4" GOTO BTTOMP4
-IF "%1" == "xmt" GOTO BTTOXMT
-IF "%1" == "xmp4" GOTO XMTTOMP4
-IF "%1" == "x3d" GOTO X3DVTOX3D
-IF "%1" == "clean" GOTO REGCLEAN
-IF "%1" == "help" GOTO GETHELP
-
-:BTTOMP4
-for %%a in (*.bt) DO (
-echo %%a
-MP4Box -mp4 -quiet %%a
-)
-GOTO DONE
-
-:BTTOXMT
-for %%a in (*.bt) DO (
-echo %%a
-MP4Box -xmt -quiet %%a
-)
-GOTO DONE
-
-:XMTTOMP4
-for %%a in (*.xmt) DO (
-MP4Box -mp4 -quiet %%a
-echo %a
-)
-GOTO DONE
-
-:X3DVTOX3D
-for %%a in (*.x3dv) DO MP4Box -x3d %%a
-GOTO DONE
-
-:REGCLEAN
-DEL /S *.mp4
-DEL /S *.xmt
-DEL /S bifs*.html
-DEL /S x3d*.html
-GOTO DONE
-
-:GETHELP
-echo GPAC Regression Tests Build Script usage: 00-do-w32 [opt]
-echo 	no op / opt = "mp4": builds MP4 file sfrom BT scripts
-echo 	opt = "xmt": builds XMT-A files from BT scripts
-echo 	opt = "xmp4": builds MP4 files from XMT-A scripts
-echo 	opt = "clean": deletes all XMT-A and MP4 files
-echo 	opt = "help": prints this screen.
-GOTO DONE
-
-
-:DONE
-
+@ECHO OFF
+
+IF "%1" == "" GOTO BTTOMP4
+IF "%1" == "mp4" GOTO BTTOMP4
+IF "%1" == "xmt" GOTO BTTOXMT
+IF "%1" == "xmp4" GOTO XMTTOMP4
+IF "%1" == "x3d" GOTO X3DVTOX3D
+IF "%1" == "clean" GOTO REGCLEAN
+IF "%1" == "help" GOTO GETHELP
+
+:BTTOMP4
+for %%a in (*.bt) DO (
+echo %%a
+MP4Box -mp4 -quiet %%a
+)
+GOTO DONE
+
+:BTTOXMT
+for %%a in (*.bt) DO (
+echo %%a
+MP4Box -xmt -quiet %%a
+)
+GOTO DONE
+
+:XMTTOMP4
+for %%a in (*.xmt) DO (
+MP4Box -mp4 -quiet %%a
+echo %a
+)
+GOTO DONE
+
+:X3DVTOX3D
+for %%a in (*.x3dv) DO MP4Box -x3d %%a
+GOTO DONE
+
+:REGCLEAN
+DEL /S *.mp4
+DEL /S *.xmt
+DEL /S bifs*.html
+DEL /S x3d*.html
+GOTO DONE
+
+:GETHELP
+echo GPAC Regression Tests Build Script usage: 00-do-w32 [opt]
+echo 	no op / opt = "mp4": builds MP4 file sfrom BT scripts
+echo 	opt = "xmt": builds XMT-A files from BT scripts
+echo 	opt = "xmp4": builds MP4 files from XMT-A scripts
+echo 	opt = "clean": deletes all XMT-A and MP4 files
+echo 	opt = "help": prints this screen.
+GOTO DONE
+
+
+:DONE
+

v0.5.2.tar.gz/regression_tests/html5_video/basic_arraybuffer.js -> v0.6.1.tar.gz/regression_tests/html5_video/basic_arraybuffer.js Changed

@@ -1,21 +1,21 @@
-/*****************************************************************************************
- * Testing basic support for the ArrayBuffer JavaScript object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e)
-{
-	for(var propertyName in e) {
-		alert(" "+propertyName+": "+e[propertyName]);
-	}		
-}
-
-function init()
-{	
-	alert("Creating ArrayBuffer(100)");
-	var ab = new ArrayBuffer(100);
-	alert("Typeof(ArrayBuffer): "+typeof(ab));
-	alert("ArrayBuffer: "+ab);
-	enumerate(ab);
+/*****************************************************************************************
+ * Testing basic support for the ArrayBuffer JavaScript object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e)
+{
+	for(var propertyName in e) {
+		alert(" "+propertyName+": "+e[propertyName]);
+	}		
+}
+
+function init()
+{	
+	alert("Creating ArrayBuffer(100)");
+	var ab = new ArrayBuffer(100);
+	alert("Typeof(ArrayBuffer): "+typeof(ab));
+	alert("ArrayBuffer: "+ab);
+	enumerate(ab);
 }
\ No newline at end of file

v0.5.2.tar.gz/regression_tests/html5_video/basic_audio.svg -> v0.6.1.tar.gz/regression_tests/html5_video/basic_audio.svg Changed

v0.5.2.tar.gz/regression_tests/html5_video/basic_mediasource.js -> v0.6.1.tar.gz/regression_tests/html5_video/basic_mediasource.js Changed

@@ -1,25 +1,25 @@
-/*****************************************************************************************
- * Testing basic support for the MediaSource JavaScript object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e, s)
-{
-	for(var propertyName in e) {
-		alert((s==null?"":s)+" "+propertyName+": "+e[propertyName]);
-		if (typeof(e[propertyName]) == "object") {
-			enumerate(e[propertyName], " ");
-		}
-	}		
-}
-
-function init()
-{	
-	alert("Creating new MediaSource");
-	var ms = new MediaSource();			
-	alert("MediaSource object: "+ms);
-	enumerate(ms);
-}
-
+/*****************************************************************************************
+ * Testing basic support for the MediaSource JavaScript object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e, s)
+{
+	for(var propertyName in e) {
+		alert((s==null?"":s)+" "+propertyName+": "+e[propertyName]);
+		if (typeof(e[propertyName]) == "object") {
+			enumerate(e[propertyName], " ");
+		}
+	}		
+}
+
+function init()
+{	
+	alert("Creating new MediaSource");
+	var ms = new MediaSource();			
+	alert("MediaSource object: "+ms);
+	enumerate(ms);
+}
+
 document.documentElement.addEventListener("load", init);
\ No newline at end of file

v0.5.2.tar.gz/regression_tests/html5_video/basic_sourcebuffer.js -> v0.6.1.tar.gz/regression_tests/html5_video/basic_sourcebuffer.js Changed

@@ -1,53 +1,53 @@
-/*****************************************************************************************
- * Testing basic support for the MSE SourceBuffer JavaScript object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e, s)
-{
-	for(var propertyName in e) {
-		alert((s==null?"":s)+" "+propertyName+": "+e[propertyName]);
-		if (typeof(e[propertyName]) == "object") {
-			enumerate(e[propertyName], " ");
-		}
-	}		
-}
-
-function onSourceOpen(event)
-{
-	alert("MediaSource opened");
-	/* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
-	var ms = event.target.ms;
-	enumerate(ms);
-	
-	alert("Checking if type video/mp4 is supported: "+MediaSource.isTypeSupported("video/mp4"));
-	alert("Checking if type video/ogg is supported: "+MediaSource.isTypeSupported("video/ogg"));
-	alert("Checking if type text/plain is supported: "+MediaSource.isTypeSupported("text/plain"));
-	alert("Checking if type application/octet-stream is supported: "+MediaSource.isTypeSupported("application/octet-stream"));
-
-	alert("Adding Source Buffer of type video/mp4 to the MediaSource");
-	var sb = ms.addSourceBuffer("video/mp4");
-	alert("SourceBuffer "+sb);
-	enumerate(sb);
-	enumerate(sb.buffered);
-}
-
-function init()
-{	
-	var v = document.getElementById("v");
-	
-	alert("Creating new MediaSource");
-	var ms = new MediaSource();			
-
-	/* GPAC Hack: the event should be dispatched to the MediaSource object */
-	v.addEventListener("sourceopen", onSourceOpen);
-				
-	var url = URL.createObjectURL(ms);
-	alert("Attaching Media Source "+url+" to Video");
-	v.src = url;
-	
-	/* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched */
-	v.ms = ms;
-	
+/*****************************************************************************************
+ * Testing basic support for the MSE SourceBuffer JavaScript object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e, s)
+{
+	for(var propertyName in e) {
+		alert((s==null?"":s)+" "+propertyName+": "+e[propertyName]);
+		if (typeof(e[propertyName]) == "object") {
+			enumerate(e[propertyName], " ");
+		}
+	}		
+}
+
+function onSourceOpen(event)
+{
+	alert("MediaSource opened");
+	/* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
+	var ms = event.target.ms;
+	enumerate(ms);
+	
+	alert("Checking if type video/mp4 is supported: "+MediaSource.isTypeSupported("video/mp4"));
+	alert("Checking if type video/ogg is supported: "+MediaSource.isTypeSupported("video/ogg"));
+	alert("Checking if type text/plain is supported: "+MediaSource.isTypeSupported("text/plain"));
+	alert("Checking if type application/octet-stream is supported: "+MediaSource.isTypeSupported("application/octet-stream"));
+
+	alert("Adding Source Buffer of type video/mp4 to the MediaSource");
+	var sb = ms.addSourceBuffer("video/mp4");
+	alert("SourceBuffer "+sb);
+	enumerate(sb);
+	enumerate(sb.buffered);
+}
+
+function init()
+{	
+	var v = document.getElementById("v");
+	
+	alert("Creating new MediaSource");
+	var ms = new MediaSource();			
+
+	/* GPAC Hack: the event should be dispatched to the MediaSource object */
+	v.addEventListener("sourceopen", onSourceOpen);
+				
+	var url = URL.createObjectURL(ms);
+	alert("Attaching Media Source "+url+" to Video");
+	v.src = url;
+	
+	/* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched */
+	v.ms = ms;
+	
 }
\ No newline at end of file

v0.5.2.tar.gz/regression_tests/html5_video/basic_url.js -> v0.6.1.tar.gz/regression_tests/html5_video/basic_url.js Changed

@@ -1,26 +1,26 @@
-/*****************************************************************************************
- * Testing basic support for the HTML5 URL object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e)
-{
-	for(var propertyName in e) {
-		alert(" "+propertyName+": "+e[propertyName]);
-	}		
-}
-
-function init()
-{			
-	alert("Creating URL from nothing");
-	alert("URL: "+URL.createObjectURL());
-	alert("Creating URL from null");
-	alert("URL: "+URL.createObjectURL(null));
-	alert("Creating URL from dummy value");
-	alert("URL: "+URL.createObjectURL(1));
-	alert("Creating URL from Media Source");
-	var ms = new MediaSource();			
-	var url = URL.createObjectURL(ms);
-	alert("URL: "+ url);
+/*****************************************************************************************
+ * Testing basic support for the HTML5 URL object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e)
+{
+	for(var propertyName in e) {
+		alert(" "+propertyName+": "+e[propertyName]);
+	}		
+}
+
+function init()
+{			
+	alert("Creating URL from nothing");
+	alert("URL: "+URL.createObjectURL());
+	alert("Creating URL from null");
+	alert("URL: "+URL.createObjectURL(null));
+	alert("Creating URL from dummy value");
+	alert("URL: "+URL.createObjectURL(1));
+	alert("Creating URL from Media Source");
+	var ms = new MediaSource();			
+	var url = URL.createObjectURL(ms);
+	alert("URL: "+ url);
 }
\ No newline at end of file

v0.5.2.tar.gz/regression_tests/html5_video/basic_video.js -> v0.6.1.tar.gz/regression_tests/html5_video/basic_video.js Changed

@@ -1,81 +1,81 @@
-/*****************************************************************************************
- * Testing support for the basic HTML5 Video object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e)
-{
-	for(var propertyName in e) {
-		alert(" "+propertyName+": "+e[propertyName]);
-	}
-}
-
-function print_ranges(r) {
- alert(" time ranges length:" + r.length);
- for (var i = 0; i < r.length; i++) {
- alert(" (" + r.start(i) + "," + r.end(i) + ")");
- }
-}
-
-function print_tracks(t) {
-}
-
-function print_media_info()
-{
- var v = document.getElementById("v");
-	alert("");
-	alert("Element: "+v);
-	alert("HTMLMediaElement Properties: ");
-	alert("src: "+v.src);
-	alert("error & code: "+v.error+":"+v.error.code);
-	alert("currentSrc: "+v.currentSrc);
-	alert("crossOrigin: "+v.crossOrigin);
-	alert("networkState: "+v.networkState);
-	alert("preload: "+v.preload);
-	alert("buffered: "+v.buffered);
-	print_ranges(v.buffered);
-	alert("readyState: "+v.readyState);
-	alert("seeking: "+v.seeking);
-	alert("currentTime: "+v.currentTime);
-	alert("duration: "+v.duration);
-	alert("startDate: "+v.startDate);
-	alert("paused: "+v.paused);
-	alert("def playrate: "+v.defaultPlaybackRate);
-	alert("play rate: "+v.playbackRate);
-	alert("played: "+v.played);
-	print_ranges(v.played);
-	alert("seekable: "+v.seekable);
-	print_ranges(v.seekable);
-	alert("ended: "+v.ended);
-	alert("autoplay: "+v.autoplay);
-	alert("loop: "+v.loop);
-	alert("mediaGroup: "+v.mediaGroup);
-	alert("controller: "+v.controller);
-	alert("controls: "+v.controls);
-	alert("volume: "+v.volume);
-	alert("muted: "+v.muted);
-	alert("defaultMuted: "+v.defaultMuted);
-	alert("audioTracks: "+v.audioTracks+ " length ("+v.audioTracks.length+")");
-	print_tracks(v.audioTracks);
-	alert("videoTracks: "+v.videoTracks+ " length ("+v.videoTracks.length+")");
-	print_tracks(v.videoTracks);
-	alert("textTracks: "+v.textTracks+ " length ("+v.textTracks.length+")");
-	print_tracks(v.textTracks);
-	alert("");
-	alert("HTMLVideoElement specific properties: ");
-	alert("width: "+v.width);
-	alert("height: "+v.height);
-	alert("wideoWidth: "+v.videoWidth);
-	alert("videoHeight: "+v.videoHeight);
-	alert("poster: "+v.poster);
-	alert("");
-}
-
-function init()
-{	
-	var v = document.getElementById("v");
-	v.src = "media/counter-10mn_I25_640x360_160kbps_openGOP_dash.mp4";
-	v.addEventListener("click", print_media_info);
-	enumerate(v);
+/*****************************************************************************************
+ * Testing support for the basic HTML5 Video object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e)
+{
+	for(var propertyName in e) {
+		alert(" "+propertyName+": "+e[propertyName]);
+	}
+}
+
+function print_ranges(r) {
+ alert(" time ranges length:" + r.length);
+ for (var i = 0; i < r.length; i++) {
+ alert(" (" + r.start(i) + "," + r.end(i) + ")");
+ }
+}
+
+function print_tracks(t) {
+}
+
+function print_media_info()
+{
+ var v = document.getElementById("v");
+	alert("");
+	alert("Element: "+v);
+	alert("HTMLMediaElement Properties: ");
+	alert("src: "+v.src);
+	alert("error & code: "+v.error+":"+v.error.code);
+	alert("currentSrc: "+v.currentSrc);
+	alert("crossOrigin: "+v.crossOrigin);
+	alert("networkState: "+v.networkState);
+	alert("preload: "+v.preload);
+	alert("buffered: "+v.buffered);
+	print_ranges(v.buffered);
+	alert("readyState: "+v.readyState);
+	alert("seeking: "+v.seeking);
+	alert("currentTime: "+v.currentTime);
+	alert("duration: "+v.duration);
+	alert("startDate: "+v.startDate);
+	alert("paused: "+v.paused);
+	alert("def playrate: "+v.defaultPlaybackRate);
+	alert("play rate: "+v.playbackRate);
+	alert("played: "+v.played);
+	print_ranges(v.played);
+	alert("seekable: "+v.seekable);
+	print_ranges(v.seekable);
+	alert("ended: "+v.ended);
+	alert("autoplay: "+v.autoplay);
+	alert("loop: "+v.loop);
+	alert("mediaGroup: "+v.mediaGroup);
+	alert("controller: "+v.controller);
+	alert("controls: "+v.controls);
+	alert("volume: "+v.volume);
+	alert("muted: "+v.muted);
+	alert("defaultMuted: "+v.defaultMuted);
+	alert("audioTracks: "+v.audioTracks+ " length ("+v.audioTracks.length+")");
+	print_tracks(v.audioTracks);
+	alert("videoTracks: "+v.videoTracks+ " length ("+v.videoTracks.length+")");
+	print_tracks(v.videoTracks);
+	alert("textTracks: "+v.textTracks+ " length ("+v.textTracks.length+")");
+	print_tracks(v.textTracks);
+	alert("");
+	alert("HTMLVideoElement specific properties: ");
+	alert("width: "+v.width);
+	alert("height: "+v.height);
+	alert("wideoWidth: "+v.videoWidth);
+	alert("videoHeight: "+v.videoHeight);
+	alert("poster: "+v.poster);
+	alert("");
+}
+
+function init()
+{	
+	var v = document.getElementById("v");
+	v.src = "media/counter-10mn_I25_640x360_160kbps_openGOP_dash.mp4";
+	v.addEventListener("click", print_media_info);
+	enumerate(v);
 }
\ No newline at end of file

v0.5.2.tar.gz/regression_tests/html5_video/gpac-mse.js -> v0.6.1.tar.gz/regression_tests/html5_video/gpac-mse.js Changed

@@ -1,358 +1,358 @@
-'use strict';
-/*****************************************************************************************
- *
- * Example code using the Media Source Extension API with GPAC
- *
- *****************************************************************************************/
-alert("Media Source Script loaded");
-
-var DEBUG = true;
-var UPDATE_TEXT_INFO = true;
-
-function reportMessage(msg) {
-	if (DEBUG) {
-		alert(msg);
-	}
-}
-
-function createLabel(x, y, fill, textContent)
-{
- var label = document.createElement("text");
-	label.setAttribute("x", x);
-	label.setAttribute("y", y);
-	label.setAttribute("fill", fill);
-	label.textContent = textContent;
-	return label;
-}
-
-function createBar(x, y, w, h, fill) {
- var bar = document.createElement("rect");
-	bar.setAttribute("x", x);
-	bar.setAttribute("y", y);
-	bar.setAttribute("width", w);
-	bar.setAttribute("height", h);
-	bar.setAttribute("rx", h/2);
-	bar.setAttribute("ry", h/2);
-	bar.setAttribute("fill", fill);
-	return bar;
-}
-
-Player.prototype.createInfoStructure = function(id) {
-	this.info = {};
-	var width = 330;
- var ta;
-	var g = document.getElementById(id);
- ta = document.createElement("textArea");
- ta.setAttribute("x", 100);
- ta.setAttribute("y", -50);
-	ta.setAttribute("width", width);
- g.appendChild(ta);
-	/* status info */
- this.info.se = document.createElement("tspan");
- ta.appendChild(this.info.se);
- ta.appendChild(document.createElement("tbreak"));
-	/* Quality info */
- this.info.qe = document.createElement("tspan");
- ta.appendChild(this.info.qe);
- ta.appendChild(document.createElement("tbreak"));
-	/* Document time info */
- this.info.dte = document.createElement("tspan");
- //ta.appendChild(this.info.dte);
- //ta.appendChild(document.createElement("tbreak"));
-	/* Video time info */
- this.info.vte = document.createElement("tspan");
- //ta.appendChild(this.info.vte);
- //ta.appendChild(document.createElement("tbreak"));
-	/* Buffer info */
- this.info.be = document.createElement("tspan");
- //ta.appendChild(this.info.be);
- //ta.appendChild(document.createElement("tbreak"));
-	/* URL info */
- this.info.ue = document.createElement("tspan");
- ta.appendChild(this.info.ue);
-
-	this.ui = {};
- this.ui.playbackRect = createBar(10, 5, width-10, 5, "black");
-	g.appendChild(this.ui.playbackRect);
-	
- this.ui.bufferedRect = createBar(10, 5, 0, 5, "url(#backColor)");
-	g.appendChild(this.ui.bufferedRect);
-	this.ui.bufferedRect.max = width;
-	
- this.ui.zeroLabel = createLabel(0, 10, "black", '0');
-	g.appendChild(this.ui.zeroLabel);
-	
- this.ui.playLabel = createLabel(0, 20, "black", '');
-	g.appendChild(this.ui.playLabel);
-
- this.ui.playBar = createBar(0, 5, 1, 5, "black");
-	g.appendChild(this.ui.playBar);
-	
- this.ui.startLabel = createLabel(0, 0, "black", '');
-	g.appendChild(this.ui.startLabel);
-
- this.ui.endLabel = createLabel(width+5, 10, "black", 'end');
-	g.appendChild(this.ui.endLabel);
-}
-
-Player.prototype.updateInfo = function() {
-	if (!UPDATE_TEXT_INFO) return;
-	var start = 0;
-	var end = 1;
-	var nowVideo = this.v.currentTime.toFixed(3);
-// this.info.dte.textContent = "Document time:" + document.documentElement.getCurrentTime();
-// this.info.vte.textContent = "Video time: " + nowVideo;
-	if (this.qualityChangeRequested) {
-		this.info.qe.textContent = "Quality : " + (this.qualityIndex - this.qualityChangeRequested) + "/"+(this.segmentFiles.length-1)+", requested: "+this.qualityIndex;
-	} else {
-		this.info.qe.textContent = "Quality : " + this.qualityIndex + "/"+(this.segmentFiles.length-1);
-	}
- if (this.sb != null && this.sb.buffered.length > 0) {
-		start = this.sb.buffered.start(0).toFixed(3);
-		end = this.sb.buffered.end(0).toFixed(3);
- //this.info.be.textContent = "Media Data Buffered: (" + start + "," + end + ")";
- } else {
- //this.info.be.textContent = "empty buffer";
- }
-	this.ui.playLabel.textContent = nowVideo;
-	this.ui.playLabel.setAttribute("x", nowVideo/end*this.ui.bufferedRect.max);
-	this.ui.playBar.setAttribute("x", 10+nowVideo/end*this.ui.bufferedRect.max);
-	this.ui.startLabel.textContent = start;
-	this.ui.endLabel.textContent = end;
-	this.ui.startLabel.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
-	this.ui.bufferedRect.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
-	this.ui.bufferedRect.setAttribute("width", (end - start)/end*this.ui.bufferedRect.max-10);
-}
-
-Player.prototype.updateDownloadInfo = function(index, url, done) {
-	if (!UPDATE_TEXT_INFO) return;
- this.info.ue.textContent = "Segment #" + index + " ..." + url.slice(-30);
-	this.info.se.textContent = "Download Status:"+ (done ?" done" : " in progress");
-}
-
-Player.prototype.toggleQuality = function() {
- reportMessage("[video "+this.v.getAttribute("id")+"] Toggling quality");
-	var newQuality = (this.qualityIndex + 1) % this.segmentFiles.length;
-	this.qualityChangeRequested = (newQuality - this.qualityIndex);
- this.qualityIndex = newQuality;
- this.updateInfo();
-}
-
-Player.prototype.switchUp = function() {
- reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality up");
-	if (this.qualityIndex < this.segmentFiles.length - 1) {
-		this.qualityIndex++;
-		this.qualityChangeRequested++;
-	}
- this.updateInfo();
-}
-
-Player.prototype.switchDown = function() {
- reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality down");
-	if (this.qualityIndex > 0) {
-		this.qualityIndex--;
-		this.qualityChangeRequested--;
-	}
- this.updateInfo();
-}
-
-Player.prototype.getNextSegment = function () {
- /* apply the limit (if any) to the number of segments to download */
- if (this.maxSeg > 0 && this.fileIndex >= this.maxSeg && this.playing) return;
-
-	if (!this.qualityChangeRequested) {
-		/* we increment the segment index only when we need a media segment (not an init segment) */
-		this.fileIndex++;
-	} 
-
- /* apply the segment reordering pattern (if any) */
- if (this.appendOrder != null && this.fileIndex < this.appendOrder.length) {
- this.fileIndexReordered = this.appendOrder[this.fileIndex];
- reportMessage("[video "+this.v.getAttribute("id")+"] Changing file index from: " + this.fileIndex + "to : " + this.fileIndexReordered);
- } else {
- this.fileIndexReordered = this.fileIndex;
- reportMessage("[video "+this.v.getAttribute("id")+"] Using file index: " + this.fileIndex);
- }
-
- /* determine the url to use */
- if (this.qualityChangeRequested || this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segStartIndex) {
- /* Setting the url with the initialization segment */
- this.url = this.segmentFiles[this.qualityIndex].baseURL + this.segmentFiles[this.qualityIndex].initName;
- }
- else if (this.fileIndexReordered >= this.segmentFiles[this.qualityIndex].segStartIndex 
-	 && this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segEndIndex) {
- /* Setting the url with a regular media segment */
- this.url = this.segmentFiles[this.qualityIndex].baseURL 
-		 + this.segmentFiles[this.qualityIndex].segmentPrefix 
-				 + this.fileIndexReordered 
-				 + this.segmentFiles[this.qualityIndex].segmentSuffix;
- }
-
- reportMessage("[video "+this.v.getAttribute("id")+"] Downloading resource from url: " + this.url);
- /* starting the download */
- if (this.url) {
- this.updateDownloadInfo(this.fileIndexReordered, this.url);
- this.xhr.url = this.url;
-		this.xhr.qualityChangeRequested = this.qualityChangeRequested;
- this.xhr.open("GET", this.url);
- this.xhr.responseType = "arraybuffer";
- this.xhr.onreadystatechange = onDone;
- this.xhr.send();
- }
-
- this.updateInfo();
-}
-
-function onDone(e) {
- if (this.readyState == 4/*this.DONE*/) {
- this.player.updateDownloadInfo(this.player.fileIndexReordered, this.url, true);
- var arraybuffer = this.response;
- reportMessage("[video "+this.player.v.getAttribute("id")+"] Received ArrayBuffer (size: " + arraybuffer.byteLength + ")");
- /* Appending the downloaded segment to the SourceBuffer */
- if (this.player.sb) {
- /* if there is a discontinuity in the file index, we need to inform the SourceBuffer */
- if (this.player.prevFileIndex != 0 && this.player.fileIndexReordered != this.player.prevFileIndex + 1) {
- this.player.sb.abort("continuation");
-				reportMessage("[video "+this.player.v.getAttribute("id")+"] Changing append mode");
- }
- this.player.prevFileIndex = this.player.fileIndexReordered;
- /* we assume everything will be fine with this append */
- this.player.sb.appendBuffer(arraybuffer);
-			reportMessage("[video "+this.player.v.getAttribute("id")+"] Appending Buffer ArrayBuffer (size: " + arraybuffer.byteLength + ")");
- }
- this.player.url = null;
-		if (this.qualityChangeRequested != 0) {
-			this.player.qualityChangeRequested = 0;
-		}		
-		if (!this.player.use_regulation) {
- this.player.getNextSegment();
- }
- }
-}
-
-Player.prototype.onSourceOpen = function (event) {
- reportMessage("[video "+this.v.getAttribute("id")+"] MediaSource opened");
- var ms = event.target;
-
- reportMessage("[video "+this.v.getAttribute("id")+"] Adding Source Buffer of type video/mp4 to the MediaSource");
- ms.player.sb = ms.addSourceBuffer("video/mp4");
-	ms.player.sb.id = ms.sourceBuffers.length;
- ms.player.getNextSegment();
-}
-
-Player.prototype.checkBufferLevel = function() {
- /* don't download a new segment if:
- - the SourceBuffer is not created
- - there is already a download going on */
-	reportMessage("[video "+this.v.getAttribute("id")+"] Checking buffer level on SourceBuffer "+this.sb+" "+this.url);
- if (this.sb != null && this.url == null) {
- if (this.sb.buffered.length > 0) {
-			if (this.v.currentTime >= this.sb.buffered.end(0)) {
-				this.pause();
-			} else {
-				reportMessage("[video "+this.v.getAttribute("id")+"] Video time "+this.v.currentTime + ", Source Buffer #"+this.sb.id+" buffered data range: (" + this.sb.buffered.start(0) + "," + this.sb.buffered.end(0) + ")");
-				if (this.sb.updating == false && this.sb.buffered.end(0) - this.v.currentTime < this.TIME_THRESOLD) {
-					reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has not enough data, downloading new segment");
-					this.getNextSegment();
-				}
-			}
- }
- else {
- if (!this.sb.updating) {
- reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has no data, downloading new segment");
- this.getNextSegment();
- } else {
- reportMessage("[video "+this.v.getAttribute("id")+"] Source Buffer still updating");
-			}
- }
- }
-}
-
-/* Function called repeatedly to monitor the playback time versus download time difference 
-and to trigger a new download if needed */
-Player.prototype.repeatFunc = function() {
-	if (!this.playing) return;
- this.updateInfo();
-	this.checkBufferLevel();
-}
-
-Player.prototype.play = function() {
- reportMessage("[video "+this.v.getAttribute("id")+"] Starting video playback");
- this.playing = true;
- this.v.play();
-}
-
-Player.prototype.pause = function() {
- reportMessage("[video "+this.v.getAttribute("id")+"] Pausing video playback");
- this.playing = false;
- this.v.pause();
-}
-
-Player.prototype.changeSegmentList = function(newSegments) {
- this.segmentFiles = newSegments;
- this.qualityChangeRequested++;
-}
-
-/* 
- vId: id of the video element
- iId: id of a group where debug info will be displayed 
- aId: id of a animation used to refresh downloads
-*/
-function Player(vId, iId, aId, segmentFiles, segmentOrder) {
-	reportMessage("[video "+vId+"] Creating Player");
-	/* Boolean to define the download policy: 
-		- depending on the buffer occupancy (true) (see TIME_THRESOLD below), 
-		- as fast as possible (false) */
-	this.use_regulation = true;
-	/* difference in seconds between the latest media time downloaded and the media time being played, 
-	used to trigger a new download when the regulation mode is on */
-	this.TIME_THRESOLD = 2;
-	/* Current file being downloaded */
-	this.fileIndex = -1;
-	/* URL of the segment being downloaded */
-	this.url = null;
-	/* Current quality being downloaded */
-	this.qualityIndex = 0;
-	this.qualityChangeRequested = 0;
-	/* using 1 XHR for all downloads */
-	this.xhr = new XMLHttpRequest();
-	this.xhr.player = this;
-	/* The source buffer used by the player (only one at the moment) */
-	this.sb = null;
-	/* maximum number of segments to download */
-	this.maxSeg = Infinity;
-	this.playing = false;
-	/* Array representing the download order of each segments (for out-of-order append), 
-	 segments not listed are downloaded in the right order */
-	this.appendOrder = segmentOrder; 
-	this.fileIndexReordered = 0;
-	this.prevFileIndex = 0;
-	/* references to objects used to display information regarding this player */
-	this.info = null;
-
-	this.segmentFiles = segmentFiles;
-	
- if (this.use_regulation) {
- /* GPAC workaround: adding the event listener on the repeatEvent of a dummy animation to simulate window.setInterval */
-		var animation = document.getElementById(aId);
- animation.addEventListener("repeatEvent", this.repeatFunc.bind(this));
- reportMessage("[video "+vId+"] Using buffer regulation to download segments ");
- } else {
- reportMessage("[video "+vId+"] Not using any regulation - downloading segments as fast as possible");
- }
-
- this.createInfoStructure(iId);
-
- reportMessage("[video "+vId+"] Creating new MediaSource");
- this.ms = new MediaSource();
-	this.ms.player = this;
-
- var bloburl = URL.createObjectURL(this.ms);
- reportMessage("[video "+vId+"] Attaching Media Source " + bloburl + " to video element");
-
- this.v = document.getElementById(vId);
- this.ms.addEventListener("sourceopen", this.onSourceOpen.bind(this));
- this.v.src = bloburl;
-
-	return this;
-}
+'use strict';
+/*****************************************************************************************
+ *
+ * Example code using the Media Source Extension API with GPAC
+ *
+ *****************************************************************************************/
+alert("Media Source Script loaded");
+
+var DEBUG = true;
+var UPDATE_TEXT_INFO = true;
+
+function reportMessage(msg) {
+	if (DEBUG) {
+		alert(msg);
+	}
+}
+
+function createLabel(x, y, fill, textContent)
+{
+ var label = document.createElement("text");
+	label.setAttribute("x", x);
+	label.setAttribute("y", y);
+	label.setAttribute("fill", fill);
+	label.textContent = textContent;
+	return label;
+}
+
+function createBar(x, y, w, h, fill) {
+ var bar = document.createElement("rect");
+	bar.setAttribute("x", x);
+	bar.setAttribute("y", y);
+	bar.setAttribute("width", w);
+	bar.setAttribute("height", h);
+	bar.setAttribute("rx", h/2);
+	bar.setAttribute("ry", h/2);
+	bar.setAttribute("fill", fill);
+	return bar;
+}
+
+Player.prototype.createInfoStructure = function(id) {
+	this.info = {};
+	var width = 330;
+ var ta;
+	var g = document.getElementById(id);
+ ta = document.createElement("textArea");
+ ta.setAttribute("x", 100);
+ ta.setAttribute("y", -50);
+	ta.setAttribute("width", width);
+ g.appendChild(ta);
+	/* status info */
+ this.info.se = document.createElement("tspan");
+ ta.appendChild(this.info.se);
+ ta.appendChild(document.createElement("tbreak"));
+	/* Quality info */
+ this.info.qe = document.createElement("tspan");
+ ta.appendChild(this.info.qe);
+ ta.appendChild(document.createElement("tbreak"));
+	/* Document time info */
+ this.info.dte = document.createElement("tspan");
+ //ta.appendChild(this.info.dte);
+ //ta.appendChild(document.createElement("tbreak"));
+	/* Video time info */
+ this.info.vte = document.createElement("tspan");
+ //ta.appendChild(this.info.vte);
+ //ta.appendChild(document.createElement("tbreak"));
+	/* Buffer info */
+ this.info.be = document.createElement("tspan");
+ //ta.appendChild(this.info.be);
+ //ta.appendChild(document.createElement("tbreak"));
+	/* URL info */
+ this.info.ue = document.createElement("tspan");
+ ta.appendChild(this.info.ue);
+
+	this.ui = {};
+ this.ui.playbackRect = createBar(10, 5, width-10, 5, "black");
+	g.appendChild(this.ui.playbackRect);
+	
+ this.ui.bufferedRect = createBar(10, 5, 0, 5, "url(#backColor)");
+	g.appendChild(this.ui.bufferedRect);
+	this.ui.bufferedRect.max = width;
+	
+ this.ui.zeroLabel = createLabel(0, 10, "black", '0');
+	g.appendChild(this.ui.zeroLabel);
+	
+ this.ui.playLabel = createLabel(0, 20, "black", '');
+	g.appendChild(this.ui.playLabel);
+
+ this.ui.playBar = createBar(0, 5, 1, 5, "black");
+	g.appendChild(this.ui.playBar);
+	
+ this.ui.startLabel = createLabel(0, 0, "black", '');
+	g.appendChild(this.ui.startLabel);
+
+ this.ui.endLabel = createLabel(width+5, 10, "black", 'end');
+	g.appendChild(this.ui.endLabel);
+}
+
+Player.prototype.updateInfo = function() {
+	if (!UPDATE_TEXT_INFO) return;
+	var start = 0;
+	var end = 1;
+	var nowVideo = this.v.currentTime.toFixed(3);
+// this.info.dte.textContent = "Document time:" + document.documentElement.getCurrentTime();
+// this.info.vte.textContent = "Video time: " + nowVideo;
+	if (this.qualityChangeRequested) {
+		this.info.qe.textContent = "Quality : " + (this.qualityIndex - this.qualityChangeRequested) + "/"+(this.segmentFiles.length-1)+", requested: "+this.qualityIndex;
+	} else {
+		this.info.qe.textContent = "Quality : " + this.qualityIndex + "/"+(this.segmentFiles.length-1);
+	}
+ if (this.sb != null && this.sb.buffered.length > 0) {
+		start = this.sb.buffered.start(0).toFixed(3);
+		end = this.sb.buffered.end(0).toFixed(3);
+ //this.info.be.textContent = "Media Data Buffered: (" + start + "," + end + ")";
+ } else {
+ //this.info.be.textContent = "empty buffer";
+ }
+	this.ui.playLabel.textContent = nowVideo;
+	this.ui.playLabel.setAttribute("x", nowVideo/end*this.ui.bufferedRect.max);
+	this.ui.playBar.setAttribute("x", 10+nowVideo/end*this.ui.bufferedRect.max);
+	this.ui.startLabel.textContent = start;
+	this.ui.endLabel.textContent = end;
+	this.ui.startLabel.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
+	this.ui.bufferedRect.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
+	this.ui.bufferedRect.setAttribute("width", (end - start)/end*this.ui.bufferedRect.max-10);
+}
+
+Player.prototype.updateDownloadInfo = function(index, url, done) {
+	if (!UPDATE_TEXT_INFO) return;
+ this.info.ue.textContent = "Segment #" + index + " ..." + url.slice(-30);
+	this.info.se.textContent = "Download Status:"+ (done ?" done" : " in progress");
+}
+
+Player.prototype.toggleQuality = function() {
+ reportMessage("[video "+this.v.getAttribute("id")+"] Toggling quality");
+	var newQuality = (this.qualityIndex + 1) % this.segmentFiles.length;
+	this.qualityChangeRequested = (newQuality - this.qualityIndex);
+ this.qualityIndex = newQuality;
+ this.updateInfo();
+}
+
+Player.prototype.switchUp = function() {
+ reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality up");
+	if (this.qualityIndex < this.segmentFiles.length - 1) {
+		this.qualityIndex++;
+		this.qualityChangeRequested++;
+	}
+ this.updateInfo();
+}
+
+Player.prototype.switchDown = function() {
+ reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality down");
+	if (this.qualityIndex > 0) {
+		this.qualityIndex--;
+		this.qualityChangeRequested--;
+	}
+ this.updateInfo();
+}
+
+Player.prototype.getNextSegment = function () {
+ /* apply the limit (if any) to the number of segments to download */
+ if (this.maxSeg > 0 && this.fileIndex >= this.maxSeg && this.playing) return;
+
+	if (!this.qualityChangeRequested) {
+		/* we increment the segment index only when we need a media segment (not an init segment) */
+		this.fileIndex++;
+	} 
+
+ /* apply the segment reordering pattern (if any) */
+ if (this.appendOrder != null && this.fileIndex < this.appendOrder.length) {
+ this.fileIndexReordered = this.appendOrder[this.fileIndex];
+ reportMessage("[video "+this.v.getAttribute("id")+"] Changing file index from: " + this.fileIndex + "to : " + this.fileIndexReordered);
+ } else {
+ this.fileIndexReordered = this.fileIndex;
+ reportMessage("[video "+this.v.getAttribute("id")+"] Using file index: " + this.fileIndex);
+ }
+
+ /* determine the url to use */
+ if (this.qualityChangeRequested || this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segStartIndex) {
+ /* Setting the url with the initialization segment */
+ this.url = this.segmentFiles[this.qualityIndex].baseURL + this.segmentFiles[this.qualityIndex].initName;
+ }
+ else if (this.fileIndexReordered >= this.segmentFiles[this.qualityIndex].segStartIndex 
+	 && this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segEndIndex) {
+ /* Setting the url with a regular media segment */
+ this.url = this.segmentFiles[this.qualityIndex].baseURL 
+		 + this.segmentFiles[this.qualityIndex].segmentPrefix 
+				 + this.fileIndexReordered 
+				 + this.segmentFiles[this.qualityIndex].segmentSuffix;
+ }
+
+ reportMessage("[video "+this.v.getAttribute("id")+"] Downloading resource from url: " + this.url);
+ /* starting the download */
+ if (this.url) {
+ this.updateDownloadInfo(this.fileIndexReordered, this.url);
+ this.xhr.url = this.url;
+		this.xhr.qualityChangeRequested = this.qualityChangeRequested;
+ this.xhr.open("GET", this.url);
+ this.xhr.responseType = "arraybuffer";
+ this.xhr.onreadystatechange = onDone;
+ this.xhr.send();
+ }
+
+ this.updateInfo();
+}
+
+function onDone(e) {
+ if (this.readyState == 4/*this.DONE*/) {
+ this.player.updateDownloadInfo(this.player.fileIndexReordered, this.url, true);
+ var arraybuffer = this.response;
+ reportMessage("[video "+this.player.v.getAttribute("id")+"] Received ArrayBuffer (size: " + arraybuffer.byteLength + ")");
+ /* Appending the downloaded segment to the SourceBuffer */
+ if (this.player.sb) {
+ /* if there is a discontinuity in the file index, we need to inform the SourceBuffer */
+ if (this.player.prevFileIndex != 0 && this.player.fileIndexReordered != this.player.prevFileIndex + 1) {
+ this.player.sb.abort("continuation");
+				reportMessage("[video "+this.player.v.getAttribute("id")+"] Changing append mode");
+ }
+ this.player.prevFileIndex = this.player.fileIndexReordered;
+ /* we assume everything will be fine with this append */
+ this.player.sb.appendBuffer(arraybuffer);
+			reportMessage("[video "+this.player.v.getAttribute("id")+"] Appending Buffer ArrayBuffer (size: " + arraybuffer.byteLength + ")");
+ }
+ this.player.url = null;
+		if (this.qualityChangeRequested != 0) {
+			this.player.qualityChangeRequested = 0;
+		}		
+		if (!this.player.use_regulation) {
+ this.player.getNextSegment();
+ }
+ }
+}
+
+Player.prototype.onSourceOpen = function (event) {
+ reportMessage("[video "+this.v.getAttribute("id")+"] MediaSource opened");
+ var ms = event.target;
+
+ reportMessage("[video "+this.v.getAttribute("id")+"] Adding Source Buffer of type video/mp4 to the MediaSource");
+ ms.player.sb = ms.addSourceBuffer("video/mp4");
+	ms.player.sb.id = ms.sourceBuffers.length;
+ ms.player.getNextSegment();
+}
+
+Player.prototype.checkBufferLevel = function() {
+ /* don't download a new segment if:
+ - the SourceBuffer is not created
+ - there is already a download going on */
+	reportMessage("[video "+this.v.getAttribute("id")+"] Checking buffer level on SourceBuffer "+this.sb+" "+this.url);
+ if (this.sb != null && this.url == null) {
+ if (this.sb.buffered.length > 0) {
+			if (this.v.currentTime >= this.sb.buffered.end(0)) {
+				this.pause();
+			} else {
+				reportMessage("[video "+this.v.getAttribute("id")+"] Video time "+this.v.currentTime + ", Source Buffer #"+this.sb.id+" buffered data range: (" + this.sb.buffered.start(0) + "," + this.sb.buffered.end(0) + ")");
+				if (this.sb.updating == false && this.sb.buffered.end(0) - this.v.currentTime < this.TIME_THRESOLD) {
+					reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has not enough data, downloading new segment");
+					this.getNextSegment();
+				}
+			}
+ }
+ else {
+ if (!this.sb.updating) {
+ reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has no data, downloading new segment");
+ this.getNextSegment();
+ } else {
+ reportMessage("[video "+this.v.getAttribute("id")+"] Source Buffer still updating");
+			}
+ }
+ }
+}
+
+/* Function called repeatedly to monitor the playback time versus download time difference 
+and to trigger a new download if needed */
+Player.prototype.repeatFunc = function() {
+	if (!this.playing) return;
+ this.updateInfo();
+	this.checkBufferLevel();
+}
+
+Player.prototype.play = function() {
+ reportMessage("[video "+this.v.getAttribute("id")+"] Starting video playback");
+ this.playing = true;
+ this.v.play();
+}
+
+Player.prototype.pause = function() {
+ reportMessage("[video "+this.v.getAttribute("id")+"] Pausing video playback");
+ this.playing = false;
+ this.v.pause();
+}
+
+Player.prototype.changeSegmentList = function(newSegments) {
+ this.segmentFiles = newSegments;
+ this.qualityChangeRequested++;
+}
+
+/* 
+ vId: id of the video element
+ iId: id of a group where debug info will be displayed 
+ aId: id of a animation used to refresh downloads
+*/
+function Player(vId, iId, aId, segmentFiles, segmentOrder) {
+	reportMessage("[video "+vId+"] Creating Player");
+	/* Boolean to define the download policy: 
+		- depending on the buffer occupancy (true) (see TIME_THRESOLD below), 
+		- as fast as possible (false) */
+	this.use_regulation = true;
+	/* difference in seconds between the latest media time downloaded and the media time being played, 
+	used to trigger a new download when the regulation mode is on */
+	this.TIME_THRESOLD = 2;
+	/* Current file being downloaded */
+	this.fileIndex = -1;
+	/* URL of the segment being downloaded */
+	this.url = null;
+	/* Current quality being downloaded */
+	this.qualityIndex = 0;
+	this.qualityChangeRequested = 0;
+	/* using 1 XHR for all downloads */
+	this.xhr = new XMLHttpRequest();
+	this.xhr.player = this;
+	/* The source buffer used by the player (only one at the moment) */
+	this.sb = null;
+	/* maximum number of segments to download */
+	this.maxSeg = Infinity;
+	this.playing = false;
+	/* Array representing the download order of each segments (for out-of-order append), 
+	 segments not listed are downloaded in the right order */
+	this.appendOrder = segmentOrder; 
+	this.fileIndexReordered = 0;
+	this.prevFileIndex = 0;
+	/* references to objects used to display information regarding this player */
+	this.info = null;
+
+	this.segmentFiles = segmentFiles;
+	
+ if (this.use_regulation) {
+ /* GPAC workaround: adding the event listener on the repeatEvent of a dummy animation to simulate window.setInterval */
+		var animation = document.getElementById(aId);
+ animation.addEventListener("repeatEvent", this.repeatFunc.bind(this));
+ reportMessage("[video "+vId+"] Using buffer regulation to download segments ");
+ } else {
+ reportMessage("[video "+vId+"] Not using any regulation - downloading segments as fast as possible");
+ }
+
+ this.createInfoStructure(iId);
+
+ reportMessage("[video "+vId+"] Creating new MediaSource");
+ this.ms = new MediaSource();
+	this.ms.player = this;
+
+ var bloburl = URL.createObjectURL(this.ms);
+ reportMessage("[video "+vId+"] Attaching Media Source " + bloburl + " to video element");
+
+ this.v = document.getElementById(vId);
+ this.ms.addEventListener("sourceopen", this.onSourceOpen.bind(this));
+ this.v.src = bloburl;
+
+	return this;
+}

v0.5.2.tar.gz/regression_tests/html5_video/video.svg -> v0.6.1.tar.gz/regression_tests/html5_video/video.svg Changed

@@ -1,30 +1,30 @@
-<svg width="800" height="800" viewBox="0 0 800 800" 
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="init()">
-
- 
- <rect id="r" fill="orange" x="10" y="10" width="180" height="40" rx="5"/>
- <text x="30" y="30">Click to toggle quality</text>
-
- 
- <g id="t" transform="translate(10, 60)"/>
-
- <video id="v" y="100" width="800" height="600"/>
-
- 
- <g>
- <animate id="a" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
- </g>
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <script type="application/ecmascript" xlink:href="mse-events.js"/>
+<svg width="800" height="800" viewBox="0 0 800 800" 
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="init()">
+
+ 
+ <rect id="r" fill="orange" x="10" y="10" width="180" height="40" rx="5"/>
+ <text x="30" y="30">Click to toggle quality</text>
+
+ 
+ <g id="t" transform="translate(10, 60)"/>
+
+ <video id="v" y="100" width="800" height="600"/>
+
+ 
+ <g>
+ <animate id="a" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
+ </g>
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ <script type="application/ecmascript" xlink:href="mse-events.js"/>
 </svg>
\ No newline at end of file

v0.5.2.tar.gz/regression_tests/html5_video/xhr.svg -> v0.6.1.tar.gz/regression_tests/html5_video/xhr.svg Changed

v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_prefix.ttml Added

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tt:tt xml:lang="de" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ttp="http://www.w3.org/ns/ttml#parameter" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:tt="http://www.w3.org/ns/ttml" xmlns:ebuttm="urn:ebu:tt:metadata" ttp:timeBase="media" ttp:cellResolution="50 30">
+ <tt:head>
+ <tt:metadata>
+ <ebuttm:documentMetadata>
+ <ebuttm:documentEbuttVersion>v1.0</ebuttm:documentEbuttVersion>
+ </ebuttm:documentMetadata>
+ </tt:metadata>
+ <tt:styling>
+ <tt:style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial" tts:fontSize="100%" tts:lineHeight="normal"/>
+ <tt:style xml:id="textWhite" tts:color="#ffffff" tts:backgroundColor="#000000c2" tts:fontSize="160%"/>
+ <tt:style xml:id="textCenter" tts:textAlign="center" />
+ <tt:style xml:id="textLeft" tts:textAlign="left" />
+ <tt:style xml:id="textRight" tts:textAlign="right" />
+ </tt:styling>
+ <tt:layout>
+ <tt:region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%" tts:displayAlign="after"/>
+ </tt:layout>
+ </tt:head>
+ <tt:body>
+ <tt:div style="defaultStyle">
+ <tt:p xml:id="subtitle1" region="bottom" begin="00:00:02.000" end="00:00:03.000" style="textLeft">
+ <tt:span style="textWhite">second text</tt:span>
+ </tt:p>
+ <tt:p xml:id="subtitle1" region="bottom" begin="00:00:03.040" end="00:00:04.000" style="textLeft">
+ <tt:span style="textWhite">second text</tt:span>
+ </tt:p>
+ </tt:div>
+ </tt:body>
+</tt:tt>

v0.5.2.tar.gz/regression_tests/ttml/ebu-ttd_sample.ttml -> v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_sample.ttml Changed

@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
- xmlns:tts="http://www.w3.org/ns/ttml#styling"
- ttp:timeBase="media"
- ttp:cellResolution="50 30"
- xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	 <head>
-		 <styling>
-			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
- tts:fontSize="160%"
- tts:lineHeight="125%"
- tts:color="#ffffff"
- tts:backgroundColor="#000000c2"
- tts:textAlign="center"/>
-		 </styling>
-		 <layout>
-			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
- tts:displayAlign="after"/>
-		 </layout>
-	 </head>
-	 <body>
-		 <div style="defaultStyle">
-			 00:00:00.000 00:00:01.400
-			 00:00:02.120 00:00:03.800
-			 00:00:22.720 00:00:25.840
-			 00:00:26.080 00:00:29.120
-			 00:00:29.120 00:00:30.640
-			 00:00:30.960 00:00:33.200
-			 00:00:33.200 00:00:36.320
-			 00:00:36.320 00:00:40.040
-			 00:00:40.040 00:00:43.520
-			 00:00:43.520 00:00:46.920
-			 00:00:46.920 00:00:51.040
-			 00:00:51.080 00:00:54.160
-			 00:00:54.480 00:00:58.240
-		 </div>
-	 </body>
-</tt>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:02.120 00:00:03.800
+			 00:00:22.720 00:00:25.840
+			 00:00:26.080 00:00:29.120
+			 00:00:29.120 00:00:30.640
+			 00:00:30.960 00:00:33.200
+			 00:00:33.200 00:00:36.320
+			 00:00:36.320 00:00:40.040
+			 00:00:40.040 00:00:43.520
+			 00:00:43.520 00:00:46.920
+			 00:00:46.920 00:00:51.040
+			 00:00:51.080 00:00:54.160
+			 00:00:54.480 00:00:58.240
+		 </div>
+	 </body>
+</tt>
+

v0.5.2.tar.gz/regression_tests/ttml/ebu-ttd_sample_invalid_ns.ttml -> v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_sample_invalid_ns.ttml Changed

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ttxxx xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
- xmlns:tts="http://www.w3.org/ns/ttml#styling"
- ttp:timeBase="media"
- ttp:cellResolution="50 30"
- xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	 <head>
-		 <styling>
-			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
- tts:fontSize="160%"
- tts:lineHeight="125%"
- tts:color="#ffffff"
- tts:backgroundColor="#000000c2"
- tts:textAlign="center"/>
-		 </styling>
-		 <layout>
-			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
- tts:displayAlign="after"/>
-		 </layout>
-	 </head>
-	 <body>
-		 <div style="defaultStyle">
-			 00:00:00.000 00:00:01.400
-			 00:00:02.120 00:00:03.800
-		 </div>
-	 </body>
-</ttxxx>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<ttxxx xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:02.120 00:00:03.800
+		 </div>
+	 </body>
+</ttxxx>
+

v0.5.2.tar.gz/regression_tests/ttml/ebu-ttd_sample_span.ttml -> v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_sample_span.ttml Changed

@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
- xmlns:tts="http://www.w3.org/ns/ttml#styling"
- ttp:timeBase="media"
- ttp:cellResolution="50 30"
- xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	 <head>
-		 <styling>
-			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
- tts:fontSize="160%"
- tts:lineHeight="125%"
- tts:color="#ffffff"
- tts:backgroundColor="#000000c2"
- tts:textAlign="center"/>
-		 </styling>
-		 <layout>
-			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
- tts:displayAlign="after"/>
-		 </layout>
-	 </head>
-	 <body>
-		 <div style="defaultStyle">
-			 00:00:00.000 00:00:01.400
-			 00:00:02.120 00:00:03.800
-			 00:00:22.720 00:00:25.840
-		 </div>
-	 </body>
-</tt>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:02.120 00:00:03.800
+			 00:00:22.720 00:00:25.840
+		 </div>
+	 </body>
+</tt>
+

v0.5.2.tar.gz/regression_tests/ttml/ebu-ttd_timing_contiguous.ttml -> v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_timing_contiguous.ttml Changed

@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
- xmlns:tts="http://www.w3.org/ns/ttml#styling"
- ttp:timeBase="media"
- ttp:cellResolution="50 30"
- xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	 <head>
-		 <styling>
-			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
- tts:fontSize="160%"
- tts:lineHeight="125%"
- tts:color="#ffffff"
- tts:backgroundColor="#000000c2"
- tts:textAlign="center"/>
-		 </styling>
-		 <layout>
-			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
- tts:displayAlign="after"/>
-		 </layout>
-	 </head>
-	 <body>
-		 <div style="defaultStyle">
-			 00:00:00.000 00:00:01.400
-			 00:00:01.400 00:00:02.120
-			 00:00:02.120 00:00:03.800
-			 00:00:03.800 00:00:25.840
-		 </div>
-	 </body>
-</tt>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:01.400 00:00:02.120
+			 00:00:02.120 00:00:03.800
+			 00:00:03.800 00:00:25.840
+		 </div>
+	 </body>
+</tt>
+

v0.5.2.tar.gz/regression_tests/ttml/ebu-ttd_timing_non-contiguous.ttml -> v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_timing_non-contiguous.ttml Changed

@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
- xmlns:tts="http://www.w3.org/ns/ttml#styling"
- ttp:timeBase="media"
- ttp:cellResolution="50 30"
- xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	 <head>
-		 <styling>
-			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
- tts:fontSize="160%"
- tts:lineHeight="125%"
- tts:color="#ffffff"
- tts:backgroundColor="#000000c2"
- tts:textAlign="center"/>
-		 </styling>
-		 <layout>
-			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
- tts:displayAlign="after"/>
-		 </layout>
-	 </head>
-	 <body>
-		 <div style="defaultStyle">
-			 00:00:00.000 00:00:01.400
-			 00:00:02.120 00:00:03.800
-			 00:00:22.720 00:00:25.840
-			 00:00:26.080 00:00:29.120
-		 </div>
-	 </body>
-</tt>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:02.120 00:00:03.800
+			 00:00:22.720 00:00:25.840
+			 00:00:26.080 00:00:29.120
+		 </div>
+	 </body>
+</tt>
+

v0.5.2.tar.gz/regression_tests/ttml/ebu-ttd_timing_overlapping_fail.ttml -> v0.6.1.tar.gz/regression_tests/ttml/ebu-ttd_timing_overlapping_fail.ttml Changed

@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
- xmlns:tts="http://www.w3.org/ns/ttml#styling"
- ttp:timeBase="media"
- ttp:cellResolution="50 30"
- xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	 <head>
-		 <styling>
-			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
- tts:fontSize="160%"
- tts:lineHeight="125%"
- tts:color="#ffffff"
- tts:backgroundColor="#000000c2"
- tts:textAlign="center"/>
-		 </styling>
-		 <layout>
-			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
- tts:displayAlign="after"/>
-		 </layout>
-	 </head>
-	 <body>
-		 <div style="defaultStyle">
-			 00:00:00.000 00:00:01.400
-			 00:00:01.120 00:00:23.800
-			 00:00:22.720 00:00:25.840
-		 </div>
-	 </body>
-</tt>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:01.120 00:00:23.800
+			 00:00:22.720 00:00:25.840
+		 </div>
+	 </body>
+</tt>
+

v0.5.2.tar.gz/regression_tests/webvtt/counter.vtt -> v0.6.1.tar.gz/regression_tests/webvtt/counter.vtt Changed

@@ -1,4502 +1,4502 @@
-WEBVTT
-
-00:00.000	--> 	00:00.040	
-0	-	00:00.000	
-
-00:00.040	--> 	00:00.080	
-1	-	00:00.040	
-
-00:00.080	--> 	00:00.120	
-2	-	00:00.080	
-
-00:00.120	--> 	00:00.160	
-3	-	00:00.120	
-
-00:00.160	--> 	00:00.200	
-4	-	00:00.160	
-
-00:00.200	--> 	00:00.240	
-5	-	00:00.200	
-
-00:00.240	--> 	00:00.280	
-6	-	00:00.240	
-
-00:00.280	--> 	00:00.320	
-7	-	00:00.280	
-
-00:00.320	--> 	00:00.360	
-8	-	00:00.320	
-
-00:00.360	--> 	00:00.400	
-9	-	00:00.360	
-
-00:00.400	--> 	00:00.440	
-10	-	00:00.400	
-
-00:00.440	--> 	00:00.480	
-11	-	00:00.440	
-
-00:00.480	--> 	00:00.520	
-12	-	00:00.480	
-
-00:00.520	--> 	00:00.560	
-13	-	00:00.520	
-
-00:00.560	--> 	00:00.600	
-14	-	00:00.560	
-
-00:00.600	--> 	00:00.640	
-15	-	00:00.600	
-
-00:00.640	--> 	00:00.680	
-16	-	00:00.640	
-
-00:00.680	--> 	00:00.720	
-17	-	00:00.680	
-
-00:00.720	--> 	00:00.760	
-18	-	00:00.720	
-
-00:00.760	--> 	00:00.800	
-19	-	00:00.760	
-
-00:00.800	--> 	00:00.840	
-20	-	00:00.800	
-
-00:00.840	--> 	00:00.880	
-21	-	00:00.840	
-
-00:00.880	--> 	00:00.920	
-22	-	00:00.880	
-
-00:00.920	--> 	00:00.960	
-23	-	00:00.920	
-
-00:00.960	--> 	00:01.000	
-24	-	00:00.960	
-
-00:01.000	--> 	00:01.040	
-25	-	00:01.000	
-
-00:01.040	--> 	00:01.080	
-26	-	00:01.040	
-
-00:01.080	--> 	00:01.120	
-27	-	00:01.080	
-
-00:01.120	--> 	00:01.160	
-28	-	00:01.120	
-
-00:01.160	--> 	00:01.200	
-29	-	00:01.160	
-
-00:01.200	--> 	00:01.240	
-30	-	00:01.200	
-
-00:01.240	--> 	00:01.280	
-31	-	00:01.240	
-
-00:01.280	--> 	00:01.320	
-32	-	00:01.280	
-
-00:01.320	--> 	00:01.360	
-33	-	00:01.320	
-
-00:01.360	--> 	00:01.400	
-34	-	00:01.360	
-
-00:01.400	--> 	00:01.440	
-35	-	00:01.400	
-
-00:01.440	--> 	00:01.480	
-36	-	00:01.440	
-
-00:01.480	--> 	00:01.520	
-37	-	00:01.480	
-
-00:01.520	--> 	00:01.560	
-38	-	00:01.520	
-
-00:01.560	--> 	00:01.600	
-39	-	00:01.560	
-
-00:01.600	--> 	00:01.640	
-40	-	00:01.600	
-
-00:01.640	--> 	00:01.680	
-41	-	00:01.640	
-
-00:01.680	--> 	00:01.720	
-42	-	00:01.680	
-
-00:01.720	--> 	00:01.760	
-43	-	00:01.720	
-
-00:01.760	--> 	00:01.800	
-44	-	00:01.760	
-
-00:01.800	--> 	00:01.840	
-45	-	00:01.800	
-
-00:01.840	--> 	00:01.880	
-46	-	00:01.840	
-
-00:01.880	--> 	00:01.920	
-47	-	00:01.880	
-
-00:01.920	--> 	00:01.960	
-48	-	00:01.920	
-
-00:01.960	--> 	00:02.000	
-49	-	00:01.960	
-
-00:02.000	--> 	00:02.040	
-50	-	00:02.000	
-
-00:02.040	--> 	00:02.080	
-51	-	00:02.040	
-
-00:02.080	--> 	00:02.120	
-52	-	00:02.080	
-
-00:02.120	--> 	00:02.160	
-53	-	00:02.120	
-
-00:02.160	--> 	00:02.200	
-54	-	00:02.160	
-
-00:02.200	--> 	00:02.240	
-55	-	00:02.200	
-
-00:02.240	--> 	00:02.280	
-56	-	00:02.240	
-
-00:02.280	--> 	00:02.320	
-57	-	00:02.280	
-
-00:02.320	--> 	00:02.360	
-58	-	00:02.320	
-
-00:02.360	--> 	00:02.400	
-59	-	00:02.360	
-
-00:02.400	--> 	00:02.440	
-60	-	00:02.400	
-
-00:02.440	--> 	00:02.480	
-61	-	00:02.440	
-
-00:02.480	--> 	00:02.520	
-62	-	00:02.480	
-
-00:02.520	--> 	00:02.560	
-63	-	00:02.520	
-
-00:02.560	--> 	00:02.600	
-64	-	00:02.560	
-
-00:02.600	--> 	00:02.640	
-65	-	00:02.600	
-
-00:02.640	--> 	00:02.680	
-66	-	00:02.640	
-
-00:02.680	--> 	00:02.720	
-67	-	00:02.680	
-
-00:02.720	--> 	00:02.760	
-68	-	00:02.720	
-
-00:02.760	--> 	00:02.800	
-69	-	00:02.760	
-
-00:02.800	--> 	00:02.840	
-70	-	00:02.800	
-
-00:02.840	--> 	00:02.880	
-71	-	00:02.840	
-
-00:02.880	--> 	00:02.920	
-72	-	00:02.880	
-
-00:02.920	--> 	00:02.960	
-73	-	00:02.920	
-
-00:02.960	--> 	00:03.000	
-74	-	00:02.960	
-
-00:03.000	--> 	00:03.040	
-75	-	00:03.000	
-
-00:03.040	--> 	00:03.080	
-76	-	00:03.040	
-
-00:03.080	--> 	00:03.120	
-77	-	00:03.080	
-
-00:03.120	--> 	00:03.160	
-78	-	00:03.120	
-
-00:03.160	--> 	00:03.200	
-79	-	00:03.160	
-
-00:03.200	--> 	00:03.240	
-80	-	00:03.200	
-
-00:03.240	--> 	00:03.280	
-81	-	00:03.240	
-
-00:03.280	--> 	00:03.320	
-82	-	00:03.280	
-
-00:03.320	--> 	00:03.360	
-83	-	00:03.320	
-
-00:03.360	--> 	00:03.400	
-84	-	00:03.360	
-
-00:03.400	--> 	00:03.440	
-85	-	00:03.400	
-
-00:03.440	--> 	00:03.480	
-86	-	00:03.440	
-
-00:03.480	--> 	00:03.520	
-87	-	00:03.480	
-
-00:03.520	--> 	00:03.560	
-88	-	00:03.520	
-
-00:03.560	--> 	00:03.600	
-89	-	00:03.560	
-
-00:03.600	--> 	00:03.640	
-90	-	00:03.600	
-
-00:03.640	--> 	00:03.680	
-91	-	00:03.640	
-
-00:03.680	--> 	00:03.720	
-92	-	00:03.680	
-
-00:03.720	--> 	00:03.760	
-93	-	00:03.720	
-
-00:03.760	--> 	00:03.800	
-94	-	00:03.760	
-
-00:03.800	--> 	00:03.840	
-95	-	00:03.800	
-
-00:03.840	--> 	00:03.880	
-96	-	00:03.840	
-
-00:03.880	--> 	00:03.920	
-97	-	00:03.880	
-
-00:03.920	--> 	00:03.960	
-98	-	00:03.920	
-
-00:03.960	--> 	00:04.000	
-99	-	00:03.960	
-
-00:04.000	--> 	00:04.040	
-100	-	00:04.000	
-
-00:04.040	--> 	00:04.080	
-101	-	00:04.040	
-
-00:04.080	--> 	00:04.120	
-102	-	00:04.080	
-
-00:04.120	--> 	00:04.160	
-103	-	00:04.120	
-
-00:04.160	--> 	00:04.200	
-104	-	00:04.160	
-
-00:04.200	--> 	00:04.240	
-105	-	00:04.200	
-
-00:04.240	--> 	00:04.280	
-106	-	00:04.240	
-
-00:04.280	--> 	00:04.320	
-107	-	00:04.280	
-
-00:04.320	--> 	00:04.360	
-108	-	00:04.320	
-
-00:04.360	--> 	00:04.400	
-109	-	00:04.360	
-
-00:04.400	--> 	00:04.440	
-110	-	00:04.400	
-
-00:04.440	--> 	00:04.480	
-111	-	00:04.440	
-
-00:04.480	--> 	00:04.520	
-112	-	00:04.480	
-
-00:04.520	--> 	00:04.560	
-113	-	00:04.520	
-
-00:04.560	--> 	00:04.600	
-114	-	00:04.560	
-
-00:04.600	--> 	00:04.640	
-115	-	00:04.600	
-
-00:04.640	--> 	00:04.680	
-116	-	00:04.640	
-
-00:04.680	--> 	00:04.720	
-117	-	00:04.680	
-
-00:04.720	--> 	00:04.760	
-118	-	00:04.720	
-
-00:04.760	--> 	00:04.800	
-119	-	00:04.760	
-
-00:04.800	--> 	00:04.840	
-120	-	00:04.800	
-
-00:04.840	--> 	00:04.880	
-121	-	00:04.840	
-
-00:04.880	--> 	00:04.920	
-122	-	00:04.880	
-
-00:04.920	--> 	00:04.960	
-123	-	00:04.920	
-
-00:04.960	--> 	00:05.000	
-124	-	00:04.960	
-
-00:05.000	--> 	00:05.040	
-125	-	00:05.000	
-
-00:05.040	--> 	00:05.080	
-126	-	00:05.040	
-
-00:05.080	--> 	00:05.120	
-127	-	00:05.080	
-
-00:05.120	--> 	00:05.160	
-128	-	00:05.120	
-
-00:05.160	--> 	00:05.200	
-129	-	00:05.160	
-
-00:05.200	--> 	00:05.240	
-130	-	00:05.200	
-
-00:05.240	--> 	00:05.280	
-131	-	00:05.240	
-
-00:05.280	--> 	00:05.320	
-132	-	00:05.280	
-
-00:05.320	--> 	00:05.360	
-133	-	00:05.320	
-
-00:05.360	--> 	00:05.400	
-134	-	00:05.360	
-
-00:05.400	--> 	00:05.440	
-135	-	00:05.400	
-
-00:05.440	--> 	00:05.480	
-136	-	00:05.440	
-
-00:05.480	--> 	00:05.520	
-137	-	00:05.480	
-
-00:05.520	--> 	00:05.560	
-138	-	00:05.520	
-
-00:05.560	--> 	00:05.600	
-139	-	00:05.560	
-
-00:05.600	--> 	00:05.640	
-140	-	00:05.600	
-
-00:05.640	--> 	00:05.680	
-141	-	00:05.640	
-
-00:05.680	--> 	00:05.720	
-142	-	00:05.680	
-
-00:05.720	--> 	00:05.760	
-143	-	00:05.720	
-
-00:05.760	--> 	00:05.800	
-144	-	00:05.760	
-
-00:05.800	--> 	00:05.840	
-145	-	00:05.800	
-
-00:05.840	--> 	00:05.880	
-146	-	00:05.840	
-
-00:05.880	--> 	00:05.920	
-147	-	00:05.880	
-
-00:05.920	--> 	00:05.960	
-148	-	00:05.920	
-
-00:05.960	--> 	00:06.000	
-149	-	00:05.960	
-
-00:06.000	--> 	00:06.040	
-150	-	00:06.000	
-
-00:06.040	--> 	00:06.080	
-151	-	00:06.040	
-
-00:06.080	--> 	00:06.120	
-152	-	00:06.080	
-
-00:06.120	--> 	00:06.160	
-153	-	00:06.120	
-
-00:06.160	--> 	00:06.200	
-154	-	00:06.160	
-
-00:06.200	--> 	00:06.240	
-155	-	00:06.200	
-
-00:06.240	--> 	00:06.280	
-156	-	00:06.240	
-
-00:06.280	--> 	00:06.320	
-157	-	00:06.280	
-
-00:06.320	--> 	00:06.360	
-158	-	00:06.320	
-
-00:06.360	--> 	00:06.400	
-159	-	00:06.360	
-
-00:06.400	--> 	00:06.440	
-160	-	00:06.400	
-
-00:06.440	--> 	00:06.480	
-161	-	00:06.440	
-
-00:06.480	--> 	00:06.520	
-162	-	00:06.480	
-
-00:06.520	--> 	00:06.560	
-163	-	00:06.520	
-
-00:06.560	--> 	00:06.600	
-164	-	00:06.560	
-
-00:06.600	--> 	00:06.640	
-165	-	00:06.600	
-
-00:06.640	--> 	00:06.680	
-166	-	00:06.640	
-
-00:06.680	--> 	00:06.720	
-167	-	00:06.680	
-
-00:06.720	--> 	00:06.760	
-168	-	00:06.720	
-
-00:06.760	--> 	00:06.800	
-169	-	00:06.760	
-
-00:06.800	--> 	00:06.840	
-170	-	00:06.800	
-
-00:06.840	--> 	00:06.880	
-171	-	00:06.840	
-
-00:06.880	--> 	00:06.920	
-172	-	00:06.880	
-
-00:06.920	--> 	00:06.960	
-173	-	00:06.920	
-
-00:06.960	--> 	00:07.000	
-174	-	00:06.960	
-
-00:07.000	--> 	00:07.040	
-175	-	00:07.000	
-
-00:07.040	--> 	00:07.080	
-176	-	00:07.040	
-
-00:07.080	--> 	00:07.120	
-177	-	00:07.080	
-
-00:07.120	--> 	00:07.160	
-178	-	00:07.120	
-
-00:07.160	--> 	00:07.200	
-179	-	00:07.160	
-
-00:07.200	--> 	00:07.240	
-180	-	00:07.200	
-
-00:07.240	--> 	00:07.280	
-181	-	00:07.240	
-
-00:07.280	--> 	00:07.320	
-182	-	00:07.280	
-
-00:07.320	--> 	00:07.360	
-183	-	00:07.320	
-
-00:07.360	--> 	00:07.400	
-184	-	00:07.360	
-
-00:07.400	--> 	00:07.440	
-185	-	00:07.400	
-
-00:07.440	--> 	00:07.480	
-186	-	00:07.440	
-
-00:07.480	--> 	00:07.520	
-187	-	00:07.480	
-
-00:07.520	--> 	00:07.560	
-188	-	00:07.520	
-
-00:07.560	--> 	00:07.600	
-189	-	00:07.560	
-
-00:07.600	--> 	00:07.640	
-190	-	00:07.600	
-
-00:07.640	--> 	00:07.680	
-191	-	00:07.640	
-
-00:07.680	--> 	00:07.720	
-192	-	00:07.680	
-
-00:07.720	--> 	00:07.760	
-193	-	00:07.720	
-
-00:07.760	--> 	00:07.800	
-194	-	00:07.760	
-
-00:07.800	--> 	00:07.840	
-195	-	00:07.800	
-
-00:07.840	--> 	00:07.880	
-196	-	00:07.840	
-
-00:07.880	--> 	00:07.920	
-197	-	00:07.880	
-
-00:07.920	--> 	00:07.960	
-198	-	00:07.920	
-
-00:07.960	--> 	00:08.000	
-199	-	00:07.960	
-
-00:08.000	--> 	00:08.040	
-200	-	00:08.000	
-
-00:08.040	--> 	00:08.080	
-201	-	00:08.040	
-
-00:08.080	--> 	00:08.120	
-202	-	00:08.080	
-
-00:08.120	--> 	00:08.160	
-203	-	00:08.120	
-
-00:08.160	--> 	00:08.200	
-204	-	00:08.160	
-
-00:08.200	--> 	00:08.240	
-205	-	00:08.200	
-
-00:08.240	--> 	00:08.280	
-206	-	00:08.240	
-
-00:08.280	--> 	00:08.320	
-207	-	00:08.280	
-
-00:08.320	--> 	00:08.360	
-208	-	00:08.320	
-
-00:08.360	--> 	00:08.400	
-209	-	00:08.360	
-
-00:08.400	--> 	00:08.440	
-210	-	00:08.400	
-
-00:08.440	--> 	00:08.480	
-211	-	00:08.440	
-
-00:08.480	--> 	00:08.520	
-212	-	00:08.480	
-
-00:08.520	--> 	00:08.560	
-213	-	00:08.520	
-
-00:08.560	--> 	00:08.600	
-214	-	00:08.560	
-
-00:08.600	--> 	00:08.640	
-215	-	00:08.600	
-
-00:08.640	--> 	00:08.680	
-216	-	00:08.640	
-
-00:08.680	--> 	00:08.720	
-217	-	00:08.680	
-
-00:08.720	--> 	00:08.760	
-218	-	00:08.720	
-
-00:08.760	--> 	00:08.800	
-219	-	00:08.760	
-
-00:08.800	--> 	00:08.840	
-220	-	00:08.800	
-
-00:08.840	--> 	00:08.880	
-221	-	00:08.840	
-
-00:08.880	--> 	00:08.920	
-222	-	00:08.880	
-
-00:08.920	--> 	00:08.960	
-223	-	00:08.920	
-
-00:08.960	--> 	00:09.000	
-224	-	00:08.960	
-
-00:09.000	--> 	00:09.040	
-225	-	00:09.000	
-
-00:09.040	--> 	00:09.080	
-226	-	00:09.040	
-
-00:09.080	--> 	00:09.120	
-227	-	00:09.080	
-
-00:09.120	--> 	00:09.160	
-228	-	00:09.120	
-
-00:09.160	--> 	00:09.200	
-229	-	00:09.160	
-
-00:09.200	--> 	00:09.240	
-230	-	00:09.200	
-
-00:09.240	--> 	00:09.280	
-231	-	00:09.240	
-
-00:09.280	--> 	00:09.320	
-232	-	00:09.280	
-
-00:09.320	--> 	00:09.360	
-233	-	00:09.320	
-
-00:09.360	--> 	00:09.400	
-234	-	00:09.360	
-
-00:09.400	--> 	00:09.440	
-235	-	00:09.400	
-
-00:09.440	--> 	00:09.480	
-236	-	00:09.440	
-
-00:09.480	--> 	00:09.520	
-237	-	00:09.480	
-
-00:09.520	--> 	00:09.560	
-238	-	00:09.520	
-
-00:09.560	--> 	00:09.600	
-239	-	00:09.560	
-
-00:09.600	--> 	00:09.640	
-240	-	00:09.600	
-
-00:09.640	--> 	00:09.680	
-241	-	00:09.640	
-
-00:09.680	--> 	00:09.720	
-242	-	00:09.680	
-
-00:09.720	--> 	00:09.760	
-243	-	00:09.720	
-
-00:09.760	--> 	00:09.800	
-244	-	00:09.760	
-
-00:09.800	--> 	00:09.840	
-245	-	00:09.800	
-
-00:09.840	--> 	00:09.880	
-246	-	00:09.840	
-
-00:09.880	--> 	00:09.920	
-247	-	00:09.880	
-
-00:09.920	--> 	00:09.960	
-248	-	00:09.920	
-
-00:09.960	--> 	00:10.000	
-249	-	00:09.960	
-
-00:10.000	--> 	00:10.040	
-250	-	00:10.000	
-
-00:10.040	--> 	00:10.080	
-251	-	00:10.040	
-
-00:10.080	--> 	00:10.120	
-252	-	00:10.080	
-
-00:10.120	--> 	00:10.160	
-253	-	00:10.120	
-
-00:10.160	--> 	00:10.200	
-254	-	00:10.160	
-
-00:10.200	--> 	00:10.240	
-255	-	00:10.200	
-
-00:10.240	--> 	00:10.280	
-256	-	00:10.240	
-
-00:10.280	--> 	00:10.320	
-257	-	00:10.280	
-
-00:10.320	--> 	00:10.360	
-258	-	00:10.320	
-
-00:10.360	--> 	00:10.400	
-259	-	00:10.360	
-
-00:10.400	--> 	00:10.440	
-260	-	00:10.400	
-
-00:10.440	--> 	00:10.480	
-261	-	00:10.440	
-
-00:10.480	--> 	00:10.520	
-262	-	00:10.480	
-
-00:10.520	--> 	00:10.560	
-263	-	00:10.520	
-
-00:10.560	--> 	00:10.600	
-264	-	00:10.560	
-
-00:10.600	--> 	00:10.640	
-265	-	00:10.600	
-
-00:10.640	--> 	00:10.680	
-266	-	00:10.640	
-
-00:10.680	--> 	00:10.720	
-267	-	00:10.680	
-
-00:10.720	--> 	00:10.760	
-268	-	00:10.720	
-
-00:10.760	--> 	00:10.800	
-269	-	00:10.760	
-
-00:10.800	--> 	00:10.840	
-270	-	00:10.800	
-
-00:10.840	--> 	00:10.880	
-271	-	00:10.840	
-
-00:10.880	--> 	00:10.920	
-272	-	00:10.880	
-
-00:10.920	--> 	00:10.960	
-273	-	00:10.920	
-
-00:10.960	--> 	00:11.000	
-274	-	00:10.960	
-
-00:11.000	--> 	00:11.040	
-275	-	00:11.000	
-
-00:11.040	--> 	00:11.080	
-276	-	00:11.040	
-
-00:11.080	--> 	00:11.120	
-277	-	00:11.080	
-
-00:11.120	--> 	00:11.160	
-278	-	00:11.120	
-
-00:11.160	--> 	00:11.200	
-279	-	00:11.160	
-
-00:11.200	--> 	00:11.240	
-280	-	00:11.200	
-
-00:11.240	--> 	00:11.280	
-281	-	00:11.240	
-
-00:11.280	--> 	00:11.320	
-282	-	00:11.280	
-
-00:11.320	--> 	00:11.360	
-283	-	00:11.320	
-
-00:11.360	--> 	00:11.400	
-284	-	00:11.360	
-
-00:11.400	--> 	00:11.440	
-285	-	00:11.400	
-
-00:11.440	--> 	00:11.480	
-286	-	00:11.440	
-
-00:11.480	--> 	00:11.520	
-287	-	00:11.480	
-
-00:11.520	--> 	00:11.560	
-288	-	00:11.520	
-
-00:11.560	--> 	00:11.600	
-289	-	00:11.560	
-
-00:11.600	--> 	00:11.640	
-290	-	00:11.600	
-
-00:11.640	--> 	00:11.680	
-291	-	00:11.640	
-
-00:11.680	--> 	00:11.720	
-292	-	00:11.680	
-
-00:11.720	--> 	00:11.760	
-293	-	00:11.720	
-
-00:11.760	--> 	00:11.800	
-294	-	00:11.760	
-
-00:11.800	--> 	00:11.840	
-295	-	00:11.800	
-
-00:11.840	--> 	00:11.880	
-296	-	00:11.840	
-
-00:11.880	--> 	00:11.920	
-297	-	00:11.880	
-
-00:11.920	--> 	00:11.960	
-298	-	00:11.920	
-
-00:11.960	--> 	00:12.000	
-299	-	00:11.960	
-
-00:12.000	--> 	00:12.040	
-300	-	00:12.000	
-
-00:12.040	--> 	00:12.080	
-301	-	00:12.040	
-
-00:12.080	--> 	00:12.120	
-302	-	00:12.080	
-
-00:12.120	--> 	00:12.160	
-303	-	00:12.120	
-
-00:12.160	--> 	00:12.200	
-304	-	00:12.160	
-
-00:12.200	--> 	00:12.240	
-305	-	00:12.200	
-
-00:12.240	--> 	00:12.280	
-306	-	00:12.240	
-
-00:12.280	--> 	00:12.320	
-307	-	00:12.280	
-
-00:12.320	--> 	00:12.360	
-308	-	00:12.320	
-
-00:12.360	--> 	00:12.400	
-309	-	00:12.360	
-
-00:12.400	--> 	00:12.440	
-310	-	00:12.400	
-
-00:12.440	--> 	00:12.480	
-311	-	00:12.440	
-
-00:12.480	--> 	00:12.520	
-312	-	00:12.480	
-
-00:12.520	--> 	00:12.560	
-313	-	00:12.520	
-
-00:12.560	--> 	00:12.600	
-314	-	00:12.560	
-
-00:12.600	--> 	00:12.640	
-315	-	00:12.600	
-
-00:12.640	--> 	00:12.680	
-316	-	00:12.640	
-
-00:12.680	--> 	00:12.720	
-317	-	00:12.680	
-
-00:12.720	--> 	00:12.760	
-318	-	00:12.720	
-
-00:12.760	--> 	00:12.800	
-319	-	00:12.760	
-
-00:12.800	--> 	00:12.840	
-320	-	00:12.800	
-
-00:12.840	--> 	00:12.880	
-321	-	00:12.840	
-
-00:12.880	--> 	00:12.920	
-322	-	00:12.880	
-
-00:12.920	--> 	00:12.960	
-323	-	00:12.920	
-
-00:12.960	--> 	00:13.000	
-324	-	00:12.960	
-
-00:13.000	--> 	00:13.040	
-325	-	00:13.000	
-
-00:13.040	--> 	00:13.080	
-326	-	00:13.040	
-
-00:13.080	--> 	00:13.120	
-327	-	00:13.080	
-
-00:13.120	--> 	00:13.160	
-328	-	00:13.120	
-
-00:13.160	--> 	00:13.200	
-329	-	00:13.160	
-
-00:13.200	--> 	00:13.240	
-330	-	00:13.200	
-
-00:13.240	--> 	00:13.280	
-331	-	00:13.240	
-
-00:13.280	--> 	00:13.320	
-332	-	00:13.280	
-
-00:13.320	--> 	00:13.360	
-333	-	00:13.320	
-
-00:13.360	--> 	00:13.400	
-334	-	00:13.360	
-
-00:13.400	--> 	00:13.440	
-335	-	00:13.400	
-
-00:13.440	--> 	00:13.480	
-336	-	00:13.440	
-
-00:13.480	--> 	00:13.520	
-337	-	00:13.480	
-
-00:13.520	--> 	00:13.560	
-338	-	00:13.520	
-
-00:13.560	--> 	00:13.600	
-339	-	00:13.560	
-
-00:13.600	--> 	00:13.640	
-340	-	00:13.600	
-
-00:13.640	--> 	00:13.680	
-341	-	00:13.640	
-
-00:13.680	--> 	00:13.720	
-342	-	00:13.680	
-
-00:13.720	--> 	00:13.760	
-343	-	00:13.720	
-
-00:13.760	--> 	00:13.800	
-344	-	00:13.760	
-
-00:13.800	--> 	00:13.840	
-345	-	00:13.800	
-
-00:13.840	--> 	00:13.880	
-346	-	00:13.840	
-
-00:13.880	--> 	00:13.920	
-347	-	00:13.880	
-
-00:13.920	--> 	00:13.960	
-348	-	00:13.920	
-
-00:13.960	--> 	00:14.000	
-349	-	00:13.960	
-
-00:14.000	--> 	00:14.040	
-350	-	00:14.000	
-
-00:14.040	--> 	00:14.080	
-351	-	00:14.040	
-
-00:14.080	--> 	00:14.120	
-352	-	00:14.080	
-
-00:14.120	--> 	00:14.160	
-353	-	00:14.120	
-
-00:14.160	--> 	00:14.200	
-354	-	00:14.160	
-
-00:14.200	--> 	00:14.240	
-355	-	00:14.200	
-
-00:14.240	--> 	00:14.280	
-356	-	00:14.240	
-
-00:14.280	--> 	00:14.320	
-357	-	00:14.280	
-
-00:14.320	--> 	00:14.360	
-358	-	00:14.320	
-
-00:14.360	--> 	00:14.400	
-359	-	00:14.360	
-
-00:14.400	--> 	00:14.440	
-360	-	00:14.400	
-
-00:14.440	--> 	00:14.480	
-361	-	00:14.440	
-
-00:14.480	--> 	00:14.520	
-362	-	00:14.480	
-
-00:14.520	--> 	00:14.560	
-363	-	00:14.520	
-
-00:14.560	--> 	00:14.600	
-364	-	00:14.560	
-
-00:14.600	--> 	00:14.640	
-365	-	00:14.600	
-
-00:14.640	--> 	00:14.680	
-366	-	00:14.640	
-
-00:14.680	--> 	00:14.720	
-367	-	00:14.680	
-
-00:14.720	--> 	00:14.760	
-368	-	00:14.720	
-
-00:14.760	--> 	00:14.800	
-369	-	00:14.760	
-
-00:14.800	--> 	00:14.840	
-370	-	00:14.800	
-
-00:14.840	--> 	00:14.880	
-371	-	00:14.840	
-
-00:14.880	--> 	00:14.920	
-372	-	00:14.880	
-
-00:14.920	--> 	00:14.960	
-373	-	00:14.920	
-
-00:14.960	--> 	00:15.000	
-374	-	00:14.960	
-
-00:15.000	--> 	00:15.040	
-375	-	00:15.000	
-
-00:15.040	--> 	00:15.080	
-376	-	00:15.040	
-
-00:15.080	--> 	00:15.120	
-377	-	00:15.080	
-
-00:15.120	--> 	00:15.160	
-378	-	00:15.120	
-
-00:15.160	--> 	00:15.200	
-379	-	00:15.160	
-
-00:15.200	--> 	00:15.240	
-380	-	00:15.200	
-
-00:15.240	--> 	00:15.280	
-381	-	00:15.240	
-
-00:15.280	--> 	00:15.320	
-382	-	00:15.280	
-
-00:15.320	--> 	00:15.360	
-383	-	00:15.320	
-
-00:15.360	--> 	00:15.400	
-384	-	00:15.360	
-
-00:15.400	--> 	00:15.440	
-385	-	00:15.400	
-
-00:15.440	--> 	00:15.480	
-386	-	00:15.440	
-
-00:15.480	--> 	00:15.520	
-387	-	00:15.480	
-
-00:15.520	--> 	00:15.560	
-388	-	00:15.520	
-
-00:15.560	--> 	00:15.600	
-389	-	00:15.560	
-
-00:15.600	--> 	00:15.640	
-390	-	00:15.600	
-
-00:15.640	--> 	00:15.680	
-391	-	00:15.640	
-
-00:15.680	--> 	00:15.720	
-392	-	00:15.680	
-
-00:15.720	--> 	00:15.760	
-393	-	00:15.720	
-
-00:15.760	--> 	00:15.800	
-394	-	00:15.760	
-
-00:15.800	--> 	00:15.840	
-395	-	00:15.800	
-
-00:15.840	--> 	00:15.880	
-396	-	00:15.840	
-
-00:15.880	--> 	00:15.920	
-397	-	00:15.880	
-
-00:15.920	--> 	00:15.960	
-398	-	00:15.920	
-
-00:15.960	--> 	00:16.000	
-399	-	00:15.960	
-
-00:16.000	--> 	00:16.040	
-400	-	00:16.000	
-
-00:16.040	--> 	00:16.080	
-401	-	00:16.040	
-
-00:16.080	--> 	00:16.120	
-402	-	00:16.080	
-
-00:16.120	--> 	00:16.160	
-403	-	00:16.120	
-
-00:16.160	--> 	00:16.200	
-404	-	00:16.160	
-
-00:16.200	--> 	00:16.240	
-405	-	00:16.200	
-
-00:16.240	--> 	00:16.280	
-406	-	00:16.240	
-
-00:16.280	--> 	00:16.320	
-407	-	00:16.280	
-
-00:16.320	--> 	00:16.360	
-408	-	00:16.320	
-
-00:16.360	--> 	00:16.400	
-409	-	00:16.360	
-
-00:16.400	--> 	00:16.440	
-410	-	00:16.400	
-
-00:16.440	--> 	00:16.480	
-411	-	00:16.440	
-
-00:16.480	--> 	00:16.520	
-412	-	00:16.480	
-
-00:16.520	--> 	00:16.560	
-413	-	00:16.520	
-
-00:16.560	--> 	00:16.600	
-414	-	00:16.560	
-
-00:16.600	--> 	00:16.640	
-415	-	00:16.600	
-
-00:16.640	--> 	00:16.680	
-416	-	00:16.640	
-
-00:16.680	--> 	00:16.720	
-417	-	00:16.680	
-
-00:16.720	--> 	00:16.760	
-418	-	00:16.720	
-
-00:16.760	--> 	00:16.800	
-419	-	00:16.760	
-
-00:16.800	--> 	00:16.840	
-420	-	00:16.800	
-
-00:16.840	--> 	00:16.880	
-421	-	00:16.840	
-
-00:16.880	--> 	00:16.920	
-422	-	00:16.880	
-
-00:16.920	--> 	00:16.960	
-423	-	00:16.920	
-
-00:16.960	--> 	00:17.000	
-424	-	00:16.960	
-
-00:17.000	--> 	00:17.040	
-425	-	00:17.000	
-
-00:17.040	--> 	00:17.080	
-426	-	00:17.040	
-
-00:17.080	--> 	00:17.120	
-427	-	00:17.080	
-
-00:17.120	--> 	00:17.160	
-428	-	00:17.120	
-
-00:17.160	--> 	00:17.200	
-429	-	00:17.160	
-
-00:17.200	--> 	00:17.240	
-430	-	00:17.200	
-
-00:17.240	--> 	00:17.280	
-431	-	00:17.240	
-
-00:17.280	--> 	00:17.320	
-432	-	00:17.280	
-
-00:17.320	--> 	00:17.360	
-433	-	00:17.320	
-
-00:17.360	--> 	00:17.400	
-434	-	00:17.360	
-
-00:17.400	--> 	00:17.440	
-435	-	00:17.400	
-
-00:17.440	--> 	00:17.480	
-436	-	00:17.440	
-
-00:17.480	--> 	00:17.520	
-437	-	00:17.480	
-
-00:17.520	--> 	00:17.560	
-438	-	00:17.520	
-
-00:17.560	--> 	00:17.600	
-439	-	00:17.560	
-
-00:17.600	--> 	00:17.640	
-440	-	00:17.600	
-
-00:17.640	--> 	00:17.680	
-441	-	00:17.640	
-
-00:17.680	--> 	00:17.720	
-442	-	00:17.680	
-
-00:17.720	--> 	00:17.760	
-443	-	00:17.720	
-
-00:17.760	--> 	00:17.800	
-444	-	00:17.760	
-
-00:17.800	--> 	00:17.840	
-445	-	00:17.800	
-
-00:17.840	--> 	00:17.880	
-446	-	00:17.840	
-
-00:17.880	--> 	00:17.920	
-447	-	00:17.880	
-
-00:17.920	--> 	00:17.960	
-448	-	00:17.920	
-
-00:17.960	--> 	00:18.000	
-449	-	00:17.960	
-
-00:18.000	--> 	00:18.040	
-450	-	00:18.000	
-
-00:18.040	--> 	00:18.080	
-451	-	00:18.040	
-
-00:18.080	--> 	00:18.120	
-452	-	00:18.080	
-
-00:18.120	--> 	00:18.160	
-453	-	00:18.120	
-
-00:18.160	--> 	00:18.200	
-454	-	00:18.160	
-
-00:18.200	--> 	00:18.240	
-455	-	00:18.200	
-
-00:18.240	--> 	00:18.280	
-456	-	00:18.240	
-
-00:18.280	--> 	00:18.320	
-457	-	00:18.280	
-
-00:18.320	--> 	00:18.360	
-458	-	00:18.320	
-
-00:18.360	--> 	00:18.400	
-459	-	00:18.360	
-
-00:18.400	--> 	00:18.440	
-460	-	00:18.400	
-
-00:18.440	--> 	00:18.480	
-461	-	00:18.440	
-
-00:18.480	--> 	00:18.520	
-462	-	00:18.480	
-
-00:18.520	--> 	00:18.560	
-463	-	00:18.520	
-
-00:18.560	--> 	00:18.600	
-464	-	00:18.560	
-
-00:18.600	--> 	00:18.640	
-465	-	00:18.600	
-
-00:18.640	--> 	00:18.680	
-466	-	00:18.640	
-
-00:18.680	--> 	00:18.720	
-467	-	00:18.680	
-
-00:18.720	--> 	00:18.760	
-468	-	00:18.720	
-
-00:18.760	--> 	00:18.800	
-469	-	00:18.760	
-
-00:18.800	--> 	00:18.840	
-470	-	00:18.800	
-
-00:18.840	--> 	00:18.880	
-471	-	00:18.840	
-
-00:18.880	--> 	00:18.920	
-472	-	00:18.880	
-
-00:18.920	--> 	00:18.960	
-473	-	00:18.920	
-
-00:18.960	--> 	00:19.000	
-474	-	00:18.960	
-
-00:19.000	--> 	00:19.040	
-475	-	00:19.000	
-
-00:19.040	--> 	00:19.080	
-476	-	00:19.040	
-
-00:19.080	--> 	00:19.120	
-477	-	00:19.080	
-
-00:19.120	--> 	00:19.160	
-478	-	00:19.120	
-
-00:19.160	--> 	00:19.200	
-479	-	00:19.160	
-
-00:19.200	--> 	00:19.240	
-480	-	00:19.200	
-
-00:19.240	--> 	00:19.280	
-481	-	00:19.240	
-
-00:19.280	--> 	00:19.320	
-482	-	00:19.280	
-
-00:19.320	--> 	00:19.360	
-483	-	00:19.320	
-
-00:19.360	--> 	00:19.400	
-484	-	00:19.360	
-
-00:19.400	--> 	00:19.440	
-485	-	00:19.400	
-
-00:19.440	--> 	00:19.480	
-486	-	00:19.440	
-
-00:19.480	--> 	00:19.520	
-487	-	00:19.480	
-
-00:19.520	--> 	00:19.560	
-488	-	00:19.520	
-
-00:19.560	--> 	00:19.600	
-489	-	00:19.560	
-
-00:19.600	--> 	00:19.640	
-490	-	00:19.600	
-
-00:19.640	--> 	00:19.680	
-491	-	00:19.640	
-
-00:19.680	--> 	00:19.720	
-492	-	00:19.680	
-
-00:19.720	--> 	00:19.760	
-493	-	00:19.720	
-
-00:19.760	--> 	00:19.800	
-494	-	00:19.760	
-
-00:19.800	--> 	00:19.840	
-495	-	00:19.800	
-
-00:19.840	--> 	00:19.880	
-496	-	00:19.840	
-
-00:19.880	--> 	00:19.920	
-497	-	00:19.880	
-
-00:19.920	--> 	00:19.960	
-498	-	00:19.920	
-
-00:19.960	--> 	00:20.000	
-499	-	00:19.960	
-
-00:20.000	--> 	00:20.040	
-500	-	00:20.000	
-
-00:20.040	--> 	00:20.080	
-501	-	00:20.040	
-
-00:20.080	--> 	00:20.120	
-502	-	00:20.080	
-
-00:20.120	--> 	00:20.160	
-503	-	00:20.120	
-
-00:20.160	--> 	00:20.200	
-504	-	00:20.160	
-
-00:20.200	--> 	00:20.240	
-505	-	00:20.200	
-
-00:20.240	--> 	00:20.280	
-506	-	00:20.240	
-
-00:20.280	--> 	00:20.320	
-507	-	00:20.280	
-
-00:20.320	--> 	00:20.360	
-508	-	00:20.320	
-
-00:20.360	--> 	00:20.400	
-509	-	00:20.360	
-
-00:20.400	--> 	00:20.440	
-510	-	00:20.400	
-
-00:20.440	--> 	00:20.480	
-511	-	00:20.440	
-
-00:20.480	--> 	00:20.520	
-512	-	00:20.480	
-
-00:20.520	--> 	00:20.560	
-513	-	00:20.520	
-
-00:20.560	--> 	00:20.600	
-514	-	00:20.560	
-
-00:20.600	--> 	00:20.640	
-515	-	00:20.600	
-
-00:20.640	--> 	00:20.680	
-516	-	00:20.640	
-
-00:20.680	--> 	00:20.720	
-517	-	00:20.680	
-
-00:20.720	--> 	00:20.760	
-518	-	00:20.720	
-
-00:20.760	--> 	00:20.800	
-519	-	00:20.760	
-
-00:20.800	--> 	00:20.840	
-520	-	00:20.800	
-
-00:20.840	--> 	00:20.880	
-521	-	00:20.840	
-
-00:20.880	--> 	00:20.920	
-522	-	00:20.880	
-
-00:20.920	--> 	00:20.960	
-523	-	00:20.920	
-
-00:20.960	--> 	00:21.000	
-524	-	00:20.960	
-
-00:21.000	--> 	00:21.040	
-525	-	00:21.000	
-
-00:21.040	--> 	00:21.080	
-526	-	00:21.040	
-
-00:21.080	--> 	00:21.120	
-527	-	00:21.080	
-
-00:21.120	--> 	00:21.160	
-528	-	00:21.120	
-
-00:21.160	--> 	00:21.200	
-529	-	00:21.160	
-
-00:21.200	--> 	00:21.240	
-530	-	00:21.200	
-
-00:21.240	--> 	00:21.280	
-531	-	00:21.240	
-
-00:21.280	--> 	00:21.320	
-532	-	00:21.280	
-
-00:21.320	--> 	00:21.360	
-533	-	00:21.320	
-
-00:21.360	--> 	00:21.400	
-534	-	00:21.360	
-
-00:21.400	--> 	00:21.440	
-535	-	00:21.400	
-
-00:21.440	--> 	00:21.480	
-536	-	00:21.440	
-
-00:21.480	--> 	00:21.520	
-537	-	00:21.480	
-
-00:21.520	--> 	00:21.560	
-538	-	00:21.520	
-
-00:21.560	--> 	00:21.600	
-539	-	00:21.560	
-
-00:21.600	--> 	00:21.640	
-540	-	00:21.600	
-
-00:21.640	--> 	00:21.680	
-541	-	00:21.640	
-
-00:21.680	--> 	00:21.720	
-542	-	00:21.680	
-
-00:21.720	--> 	00:21.760	
-543	-	00:21.720	
-
-00:21.760	--> 	00:21.800	
-544	-	00:21.760	
-
-00:21.800	--> 	00:21.840	
-545	-	00:21.800	
-
-00:21.840	--> 	00:21.880	
-546	-	00:21.840	
-
-00:21.880	--> 	00:21.920	
-547	-	00:21.880	
-
-00:21.920	--> 	00:21.960	
-548	-	00:21.920	
-
-00:21.960	--> 	00:22.000	
-549	-	00:21.960	
-
-00:22.000	--> 	00:22.040	
-550	-	00:22.000	
-
-00:22.040	--> 	00:22.080	
-551	-	00:22.040	
-
-00:22.080	--> 	00:22.120	
-552	-	00:22.080	
-
-00:22.120	--> 	00:22.160	
-553	-	00:22.120	
-
-00:22.160	--> 	00:22.200	
-554	-	00:22.160	
-
-00:22.200	--> 	00:22.240	
-555	-	00:22.200	
-
-00:22.240	--> 	00:22.280	
-556	-	00:22.240	
-
-00:22.280	--> 	00:22.320	
-557	-	00:22.280	
-
-00:22.320	--> 	00:22.360	
-558	-	00:22.320	
-
-00:22.360	--> 	00:22.400	
-559	-	00:22.360	
-
-00:22.400	--> 	00:22.440	
-560	-	00:22.400	
-
-00:22.440	--> 	00:22.480	
-561	-	00:22.440	
-
-00:22.480	--> 	00:22.520	
-562	-	00:22.480	
-
-00:22.520	--> 	00:22.560	
-563	-	00:22.520	
-
-00:22.560	--> 	00:22.600	
-564	-	00:22.560	
-
-00:22.600	--> 	00:22.640	
-565	-	00:22.600	
-
-00:22.640	--> 	00:22.680	
-566	-	00:22.640	
-
-00:22.680	--> 	00:22.720	
-567	-	00:22.680	
-
-00:22.720	--> 	00:22.760	
-568	-	00:22.720	
-
-00:22.760	--> 	00:22.800	
-569	-	00:22.760	
-
-00:22.800	--> 	00:22.840	
-570	-	00:22.800	
-
-00:22.840	--> 	00:22.880	
-571	-	00:22.840	
-
-00:22.880	--> 	00:22.920	
-572	-	00:22.880	
-
-00:22.920	--> 	00:22.960	
-573	-	00:22.920	
-
-00:22.960	--> 	00:23.000	
-574	-	00:22.960	
-
-00:23.000	--> 	00:23.040	
-575	-	00:23.000	
-
-00:23.040	--> 	00:23.080	
-576	-	00:23.040	
-
-00:23.080	--> 	00:23.120	
-577	-	00:23.080	
-
-00:23.120	--> 	00:23.160	
-578	-	00:23.120	
-
-00:23.160	--> 	00:23.200	
-579	-	00:23.160	
-
-00:23.200	--> 	00:23.240	
-580	-	00:23.200	
-
-00:23.240	--> 	00:23.280	
-581	-	00:23.240	
-
-00:23.280	--> 	00:23.320	
-582	-	00:23.280	
-
-00:23.320	--> 	00:23.360	
-583	-	00:23.320	
-
-00:23.360	--> 	00:23.400	
-584	-	00:23.360	
-
-00:23.400	--> 	00:23.440	
-585	-	00:23.400	
-
-00:23.440	--> 	00:23.480	
-586	-	00:23.440	
-
-00:23.480	--> 	00:23.520	
-587	-	00:23.480	
-
-00:23.520	--> 	00:23.560	
-588	-	00:23.520	
-
-00:23.560	--> 	00:23.600	
-589	-	00:23.560	
-
-00:23.600	--> 	00:23.640	
-590	-	00:23.600	
-
-00:23.640	--> 	00:23.680	
-591	-	00:23.640	
-
-00:23.680	--> 	00:23.720	
-592	-	00:23.680	
-
-00:23.720	--> 	00:23.760	
-593	-	00:23.720	
-
-00:23.760	--> 	00:23.800	
-594	-	00:23.760	
-
-00:23.800	--> 	00:23.840	
-595	-	00:23.800	
-
-00:23.840	--> 	00:23.880	
-596	-	00:23.840	
-
-00:23.880	--> 	00:23.920	
-597	-	00:23.880	
-
-00:23.920	--> 	00:23.960	
-598	-	00:23.920	
-
-00:23.960	--> 	00:24.000	
-599	-	00:23.960	
-
-00:24.000	--> 	00:24.040	
-600	-	00:24.000	
-
-00:24.040	--> 	00:24.080	
-601	-	00:24.040	
-
-00:24.080	--> 	00:24.120	
-602	-	00:24.080	
-
-00:24.120	--> 	00:24.160	
-603	-	00:24.120	
-
-00:24.160	--> 	00:24.200	
-604	-	00:24.160	
-
-00:24.200	--> 	00:24.240	
-605	-	00:24.200	
-
-00:24.240	--> 	00:24.280	
-606	-	00:24.240	
-
-00:24.280	--> 	00:24.320	
-607	-	00:24.280	
-
-00:24.320	--> 	00:24.360	
-608	-	00:24.320	
-
-00:24.360	--> 	00:24.400	
-609	-	00:24.360	
-
-00:24.400	--> 	00:24.440	
-610	-	00:24.400	
-
-00:24.440	--> 	00:24.480	
-611	-	00:24.440	
-
-00:24.480	--> 	00:24.520	
-612	-	00:24.480	
-
-00:24.520	--> 	00:24.560	
-613	-	00:24.520	
-
-00:24.560	--> 	00:24.600	
-614	-	00:24.560	
-
-00:24.600	--> 	00:24.640	
-615	-	00:24.600	
-
-00:24.640	--> 	00:24.680	
-616	-	00:24.640	
-
-00:24.680	--> 	00:24.720	
-617	-	00:24.680	
-
-00:24.720	--> 	00:24.760	
-618	-	00:24.720	
-
-00:24.760	--> 	00:24.800	
-619	-	00:24.760	
-
-00:24.800	--> 	00:24.840	
-620	-	00:24.800	
-
-00:24.840	--> 	00:24.880	
-621	-	00:24.840	
-
-00:24.880	--> 	00:24.920	
-622	-	00:24.880	
-
-00:24.920	--> 	00:24.960	
-623	-	00:24.920	
-
-00:24.960	--> 	00:25.000	
-624	-	00:24.960	
-
-00:25.000	--> 	00:25.040	
-625	-	00:25.000	
-
-00:25.040	--> 	00:25.080	
-626	-	00:25.040	
-
-00:25.080	--> 	00:25.120	
-627	-	00:25.080	
-
-00:25.120	--> 	00:25.160	
-628	-	00:25.120	
-
-00:25.160	--> 	00:25.200	
-629	-	00:25.160	
-
-00:25.200	--> 	00:25.240	
-630	-	00:25.200	
-
-00:25.240	--> 	00:25.280	
-631	-	00:25.240	
-
-00:25.280	--> 	00:25.320	
-632	-	00:25.280	
-
-00:25.320	--> 	00:25.360	
-633	-	00:25.320	
-
-00:25.360	--> 	00:25.400	
-634	-	00:25.360	
-
-00:25.400	--> 	00:25.440	
-635	-	00:25.400	
-
-00:25.440	--> 	00:25.480	
-636	-	00:25.440	
-
-00:25.480	--> 	00:25.520	
-637	-	00:25.480	
-
-00:25.520	--> 	00:25.560	
-638	-	00:25.520	
-
-00:25.560	--> 	00:25.600	
-639	-	00:25.560	
-
-00:25.600	--> 	00:25.640	
-640	-	00:25.600	
-
-00:25.640	--> 	00:25.680	
-641	-	00:25.640	
-
-00:25.680	--> 	00:25.720	
-642	-	00:25.680	
-
-00:25.720	--> 	00:25.760	
-643	-	00:25.720	
-
-00:25.760	--> 	00:25.800	
-644	-	00:25.760	
-
-00:25.800	--> 	00:25.840	
-645	-	00:25.800	
-
-00:25.840	--> 	00:25.880	
-646	-	00:25.840	
-
-00:25.880	--> 	00:25.920	
-647	-	00:25.880	
-
-00:25.920	--> 	00:25.960	
-648	-	00:25.920	
-
-00:25.960	--> 	00:26.000	
-649	-	00:25.960	
-
-00:26.000	--> 	00:26.040	
-650	-	00:26.000	
-
-00:26.040	--> 	00:26.080	
-651	-	00:26.040	
-
-00:26.080	--> 	00:26.120	
-652	-	00:26.080	
-
-00:26.120	--> 	00:26.160	
-653	-	00:26.120	
-
-00:26.160	--> 	00:26.200	
-654	-	00:26.160	
-
-00:26.200	--> 	00:26.240	
-655	-	00:26.200	
-
-00:26.240	--> 	00:26.280	
-656	-	00:26.240	
-
-00:26.280	--> 	00:26.320	
-657	-	00:26.280	
-
-00:26.320	--> 	00:26.360	
-658	-	00:26.320	
-
-00:26.360	--> 	00:26.400	
-659	-	00:26.360	
-
-00:26.400	--> 	00:26.440	
-660	-	00:26.400	
-
-00:26.440	--> 	00:26.480	
-661	-	00:26.440	
-
-00:26.480	--> 	00:26.520	
-662	-	00:26.480	
-
-00:26.520	--> 	00:26.560	
-663	-	00:26.520	
-
-00:26.560	--> 	00:26.600	
-664	-	00:26.560	
-
-00:26.600	--> 	00:26.640	
-665	-	00:26.600	
-
-00:26.640	--> 	00:26.680	
-666	-	00:26.640	
-
-00:26.680	--> 	00:26.720	
-667	-	00:26.680	
-
-00:26.720	--> 	00:26.760	
-668	-	00:26.720	
-
-00:26.760	--> 	00:26.800	
-669	-	00:26.760	
-
-00:26.800	--> 	00:26.840	
-670	-	00:26.800	
-
-00:26.840	--> 	00:26.880	
-671	-	00:26.840	
-
-00:26.880	--> 	00:26.920	
-672	-	00:26.880	
-
-00:26.920	--> 	00:26.960	
-673	-	00:26.920	
-
-00:26.960	--> 	00:27.000	
-674	-	00:26.960	
-
-00:27.000	--> 	00:27.040	
-675	-	00:27.000	
-
-00:27.040	--> 	00:27.080	
-676	-	00:27.040	
-
-00:27.080	--> 	00:27.120	
-677	-	00:27.080	
-
-00:27.120	--> 	00:27.160	
-678	-	00:27.120	
-
-00:27.160	--> 	00:27.200	
-679	-	00:27.160	
-
-00:27.200	--> 	00:27.240	
-680	-	00:27.200	
-
-00:27.240	--> 	00:27.280	
-681	-	00:27.240	
-
-00:27.280	--> 	00:27.320	
-682	-	00:27.280	
-
-00:27.320	--> 	00:27.360	
-683	-	00:27.320	
-
-00:27.360	--> 	00:27.400	
-684	-	00:27.360	
-
-00:27.400	--> 	00:27.440	
-685	-	00:27.400	
-
-00:27.440	--> 	00:27.480	
-686	-	00:27.440	
-
-00:27.480	--> 	00:27.520	
-687	-	00:27.480	
-
-00:27.520	--> 	00:27.560	
-688	-	00:27.520	
-
-00:27.560	--> 	00:27.600	
-689	-	00:27.560	
-
-00:27.600	--> 	00:27.640	
-690	-	00:27.600	
-
-00:27.640	--> 	00:27.680	
-691	-	00:27.640	
-
-00:27.680	--> 	00:27.720	
-692	-	00:27.680	
-
-00:27.720	--> 	00:27.760	
-693	-	00:27.720	
-
-00:27.760	--> 	00:27.800	
-694	-	00:27.760	
-
-00:27.800	--> 	00:27.840	
-695	-	00:27.800	
-
-00:27.840	--> 	00:27.880	
-696	-	00:27.840	
-
-00:27.880	--> 	00:27.920	
-697	-	00:27.880	
-
-00:27.920	--> 	00:27.960	
-698	-	00:27.920	
-
-00:27.960	--> 	00:28.000	
-699	-	00:27.960	
-
-00:28.000	--> 	00:28.040	
-700	-	00:28.000	
-
-00:28.040	--> 	00:28.080	
-701	-	00:28.040	
-
-00:28.080	--> 	00:28.120	
-702	-	00:28.080	
-
-00:28.120	--> 	00:28.160	
-703	-	00:28.120	
-
-00:28.160	--> 	00:28.200	
-704	-	00:28.160	
-
-00:28.200	--> 	00:28.240	
-705	-	00:28.200	
-
-00:28.240	--> 	00:28.280	
-706	-	00:28.240	
-
-00:28.280	--> 	00:28.320	
-707	-	00:28.280	
-
-00:28.320	--> 	00:28.360	
-708	-	00:28.320	
-
-00:28.360	--> 	00:28.400	
-709	-	00:28.360	
-
-00:28.400	--> 	00:28.440	
-710	-	00:28.400	
-
-00:28.440	--> 	00:28.480	
-711	-	00:28.440	
-
-00:28.480	--> 	00:28.520	
-712	-	00:28.480	
-
-00:28.520	--> 	00:28.560	
-713	-	00:28.520	
-
-00:28.560	--> 	00:28.600	
-714	-	00:28.560	
-
-00:28.600	--> 	00:28.640	
-715	-	00:28.600	
-
-00:28.640	--> 	00:28.680	
-716	-	00:28.640	
-
-00:28.680	--> 	00:28.720	
-717	-	00:28.680	
-
-00:28.720	--> 	00:28.760	
-718	-	00:28.720	
-
-00:28.760	--> 	00:28.800	
-719	-	00:28.760	
-
-00:28.800	--> 	00:28.840	
-720	-	00:28.800	
-
-00:28.840	--> 	00:28.880	
-721	-	00:28.840	
-
-00:28.880	--> 	00:28.920	
-722	-	00:28.880	
-
-00:28.920	--> 	00:28.960	
-723	-	00:28.920	
-
-00:28.960	--> 	00:29.000	
-724	-	00:28.960	
-
-00:29.000	--> 	00:29.040	
-725	-	00:29.000	
-
-00:29.040	--> 	00:29.080	
-726	-	00:29.040	
-
-00:29.080	--> 	00:29.120	
-727	-	00:29.080	
-
-00:29.120	--> 	00:29.160	
-728	-	00:29.120	
-
-00:29.160	--> 	00:29.200	
-729	-	00:29.160	
-
-00:29.200	--> 	00:29.240	
-730	-	00:29.200	
-
-00:29.240	--> 	00:29.280	
-731	-	00:29.240	
-
-00:29.280	--> 	00:29.320	
-732	-	00:29.280	
-
-00:29.320	--> 	00:29.360	
-733	-	00:29.320	
-
-00:29.360	--> 	00:29.400	
-734	-	00:29.360	
-
-00:29.400	--> 	00:29.440	
-735	-	00:29.400	
-
-00:29.440	--> 	00:29.480	
-736	-	00:29.440	
-
-00:29.480	--> 	00:29.520	
-737	-	00:29.480	
-
-00:29.520	--> 	00:29.560	
-738	-	00:29.520	
-
-00:29.560	--> 	00:29.600	
-739	-	00:29.560	
-
-00:29.600	--> 	00:29.640	
-740	-	00:29.600	
-
-00:29.640	--> 	00:29.680	
-741	-	00:29.640	
-
-00:29.680	--> 	00:29.720	
-742	-	00:29.680	
-
-00:29.720	--> 	00:29.760	
-743	-	00:29.720	
-
-00:29.760	--> 	00:29.800	
-744	-	00:29.760	
-
-00:29.800	--> 	00:29.840	
-745	-	00:29.800	
-
-00:29.840	--> 	00:29.880	
-746	-	00:29.840	
-
-00:29.880	--> 	00:29.920	
-747	-	00:29.880	
-
-00:29.920	--> 	00:29.960	
-748	-	00:29.920	
-
-00:29.960	--> 	00:30.000	
-749	-	00:29.960	
-
-00:30.000	--> 	00:30.040	
-750	-	00:30.000	
-
-00:30.040	--> 	00:30.080	
-751	-	00:30.040	
-
-00:30.080	--> 	00:30.120	
-752	-	00:30.080	
-
-00:30.120	--> 	00:30.160	
-753	-	00:30.120	
-
-00:30.160	--> 	00:30.200	
-754	-	00:30.160	
-
-00:30.200	--> 	00:30.240	
-755	-	00:30.200	
-
-00:30.240	--> 	00:30.280	
-756	-	00:30.240	
-
-00:30.280	--> 	00:30.320	
-757	-	00:30.280	
-
-00:30.320	--> 	00:30.360	
-758	-	00:30.320	
-
-00:30.360	--> 	00:30.400	
-759	-	00:30.360	
-
-00:30.400	--> 	00:30.440	
-760	-	00:30.400	
-
-00:30.440	--> 	00:30.480	
-761	-	00:30.440	
-
-00:30.480	--> 	00:30.520	
-762	-	00:30.480	
-
-00:30.520	--> 	00:30.560	
-763	-	00:30.520	
-
-00:30.560	--> 	00:30.600	
-764	-	00:30.560	
-
-00:30.600	--> 	00:30.640	
-765	-	00:30.600	
-
-00:30.640	--> 	00:30.680	
-766	-	00:30.640	
-
-00:30.680	--> 	00:30.720	
-767	-	00:30.680	
-
-00:30.720	--> 	00:30.760	
-768	-	00:30.720	
-
-00:30.760	--> 	00:30.800	
-769	-	00:30.760	
-
-00:30.800	--> 	00:30.840	
-770	-	00:30.800	
-
-00:30.840	--> 	00:30.880	
-771	-	00:30.840	
-
-00:30.880	--> 	00:30.920	
-772	-	00:30.880	
-
-00:30.920	--> 	00:30.960	
-773	-	00:30.920	
-
-00:30.960	--> 	00:31.000	
-774	-	00:30.960	
-
-00:31.000	--> 	00:31.040	
-775	-	00:31.000	
-
-00:31.040	--> 	00:31.080	
-776	-	00:31.040	
-
-00:31.080	--> 	00:31.120	
-777	-	00:31.080	
-
-00:31.120	--> 	00:31.160	
-778	-	00:31.120	
-
-00:31.160	--> 	00:31.200	
-779	-	00:31.160	
-
-00:31.200	--> 	00:31.240	
-780	-	00:31.200	
-
-00:31.240	--> 	00:31.280	
-781	-	00:31.240	
-
-00:31.280	--> 	00:31.320	
-782	-	00:31.280	
-
-00:31.320	--> 	00:31.360	
-783	-	00:31.320	
-
-00:31.360	--> 	00:31.400	
-784	-	00:31.360	
-
-00:31.400	--> 	00:31.440	
-785	-	00:31.400	
-
-00:31.440	--> 	00:31.480	
-786	-	00:31.440	
-
-00:31.480	--> 	00:31.520	
-787	-	00:31.480	
-
-00:31.520	--> 	00:31.560	
-788	-	00:31.520	
-
-00:31.560	--> 	00:31.600	
-789	-	00:31.560	
-
-00:31.600	--> 	00:31.640	
-790	-	00:31.600	
-
-00:31.640	--> 	00:31.680	
-791	-	00:31.640	
-
-00:31.680	--> 	00:31.720	
-792	-	00:31.680	
-
-00:31.720	--> 	00:31.760	
-793	-	00:31.720	
-
-00:31.760	--> 	00:31.800	
-794	-	00:31.760	
-
-00:31.800	--> 	00:31.840	
-795	-	00:31.800	
-
-00:31.840	--> 	00:31.880	
-796	-	00:31.840	
-
-00:31.880	--> 	00:31.920	
-797	-	00:31.880	
-
-00:31.920	--> 	00:31.960	
-798	-	00:31.920	
-
-00:31.960	--> 	00:32.000	
-799	-	00:31.960	
-
-00:32.000	--> 	00:32.040	
-800	-	00:32.000	
-
-00:32.040	--> 	00:32.080	
-801	-	00:32.040	
-
-00:32.080	--> 	00:32.120	
-802	-	00:32.080	
-
-00:32.120	--> 	00:32.160	
-803	-	00:32.120	
-
-00:32.160	--> 	00:32.200	
-804	-	00:32.160	
-
-00:32.200	--> 	00:32.240	
-805	-	00:32.200	
-
-00:32.240	--> 	00:32.280	
-806	-	00:32.240	
-
-00:32.280	--> 	00:32.320	
-807	-	00:32.280	
-
-00:32.320	--> 	00:32.360	
-808	-	00:32.320	
-
-00:32.360	--> 	00:32.400	
-809	-	00:32.360	
-
-00:32.400	--> 	00:32.440	
-810	-	00:32.400	
-
-00:32.440	--> 	00:32.480	
-811	-	00:32.440	
-
-00:32.480	--> 	00:32.520	
-812	-	00:32.480	
-
-00:32.520	--> 	00:32.560	
-813	-	00:32.520	
-
-00:32.560	--> 	00:32.600	
-814	-	00:32.560	
-
-00:32.600	--> 	00:32.640	
-815	-	00:32.600	
-
-00:32.640	--> 	00:32.680	
-816	-	00:32.640	
-
-00:32.680	--> 	00:32.720	
-817	-	00:32.680	
-
-00:32.720	--> 	00:32.760	
-818	-	00:32.720	
-
-00:32.760	--> 	00:32.800	
-819	-	00:32.760	
-
-00:32.800	--> 	00:32.840	
-820	-	00:32.800	
-
-00:32.840	--> 	00:32.880	
-821	-	00:32.840	
-
-00:32.880	--> 	00:32.920	
-822	-	00:32.880	
-
-00:32.920	--> 	00:32.960	
-823	-	00:32.920	
-
-00:32.960	--> 	00:33.000	
-824	-	00:32.960	
-
-00:33.000	--> 	00:33.040	
-825	-	00:33.000	
-
-00:33.040	--> 	00:33.080	
-826	-	00:33.040	
-
-00:33.080	--> 	00:33.120	
-827	-	00:33.080	
-
-00:33.120	--> 	00:33.160	
-828	-	00:33.120	
-
-00:33.160	--> 	00:33.200	
-829	-	00:33.160	
-
-00:33.200	--> 	00:33.240	
-830	-	00:33.200	
-
-00:33.240	--> 	00:33.280	
-831	-	00:33.240	
-
-00:33.280	--> 	00:33.320	
-832	-	00:33.280	
-
-00:33.320	--> 	00:33.360	
-833	-	00:33.320	
-
-00:33.360	--> 	00:33.400	
-834	-	00:33.360	
-
-00:33.400	--> 	00:33.440	
-835	-	00:33.400	
-
-00:33.440	--> 	00:33.480	
-836	-	00:33.440	
-
-00:33.480	--> 	00:33.520	
-837	-	00:33.480	
-
-00:33.520	--> 	00:33.560	
-838	-	00:33.520	
-
-00:33.560	--> 	00:33.600	
-839	-	00:33.560	
-
-00:33.600	--> 	00:33.640	
-840	-	00:33.600	
-
-00:33.640	--> 	00:33.680	
-841	-	00:33.640	
-
-00:33.680	--> 	00:33.720	
-842	-	00:33.680	
-
-00:33.720	--> 	00:33.760	
-843	-	00:33.720	
-
-00:33.760	--> 	00:33.800	
-844	-	00:33.760	
-
-00:33.800	--> 	00:33.840	
-845	-	00:33.800	
-
-00:33.840	--> 	00:33.880	
-846	-	00:33.840	
-
-00:33.880	--> 	00:33.920	
-847	-	00:33.880	
-
-00:33.920	--> 	00:33.960	
-848	-	00:33.920	
-
-00:33.960	--> 	00:34.000	
-849	-	00:33.960	
-
-00:34.000	--> 	00:34.040	
-850	-	00:34.000	
-
-00:34.040	--> 	00:34.080	
-851	-	00:34.040	
-
-00:34.080	--> 	00:34.120	
-852	-	00:34.080	
-
-00:34.120	--> 	00:34.160	
-853	-	00:34.120	
-
-00:34.160	--> 	00:34.200	
-854	-	00:34.160	
-
-00:34.200	--> 	00:34.240	
-855	-	00:34.200	
-
-00:34.240	--> 	00:34.280	
-856	-	00:34.240	
-
-00:34.280	--> 	00:34.320	
-857	-	00:34.280	
-
-00:34.320	--> 	00:34.360	
-858	-	00:34.320	
-
-00:34.360	--> 	00:34.400	
-859	-	00:34.360	
-
-00:34.400	--> 	00:34.440	
-860	-	00:34.400	
-
-00:34.440	--> 	00:34.480	
-861	-	00:34.440	
-
-00:34.480	--> 	00:34.520	
-862	-	00:34.480	
-
-00:34.520	--> 	00:34.560	
-863	-	00:34.520	
-
-00:34.560	--> 	00:34.600	
-864	-	00:34.560	
-
-00:34.600	--> 	00:34.640	
-865	-	00:34.600	
-
-00:34.640	--> 	00:34.680	
-866	-	00:34.640	
-
-00:34.680	--> 	00:34.720	
-867	-	00:34.680	
-
-00:34.720	--> 	00:34.760	
-868	-	00:34.720	
-
-00:34.760	--> 	00:34.800	
-869	-	00:34.760	
-
-00:34.800	--> 	00:34.840	
-870	-	00:34.800	
-
-00:34.840	--> 	00:34.880	
-871	-	00:34.840	
-
-00:34.880	--> 	00:34.920	
-872	-	00:34.880	
-
-00:34.920	--> 	00:34.960	
-873	-	00:34.920	
-
-00:34.960	--> 	00:35.000	
-874	-	00:34.960	
-
-00:35.000	--> 	00:35.040	
-875	-	00:35.000	
-
-00:35.040	--> 	00:35.080	
-876	-	00:35.040	
-
-00:35.080	--> 	00:35.120	
-877	-	00:35.080	
-
-00:35.120	--> 	00:35.160	
-878	-	00:35.120	
-
-00:35.160	--> 	00:35.200	
-879	-	00:35.160	
-
-00:35.200	--> 	00:35.240	
-880	-	00:35.200	
-
-00:35.240	--> 	00:35.280	
-881	-	00:35.240	
-
-00:35.280	--> 	00:35.320	
-882	-	00:35.280	
-
-00:35.320	--> 	00:35.360	
-883	-	00:35.320	
-
-00:35.360	--> 	00:35.400	
-884	-	00:35.360	
-
-00:35.400	--> 	00:35.440	
-885	-	00:35.400	
-
-00:35.440	--> 	00:35.480	
-886	-	00:35.440	
-
-00:35.480	--> 	00:35.520	
-887	-	00:35.480	
-
-00:35.520	--> 	00:35.560	
-888	-	00:35.520	
-
-00:35.560	--> 	00:35.600	
-889	-	00:35.560	
-
-00:35.600	--> 	00:35.640	
-890	-	00:35.600	
-
-00:35.640	--> 	00:35.680	
-891	-	00:35.640	
-
-00:35.680	--> 	00:35.720	
-892	-	00:35.680	
-
-00:35.720	--> 	00:35.760	
-893	-	00:35.720	
-
-00:35.760	--> 	00:35.800	
-894	-	00:35.760	
-
-00:35.800	--> 	00:35.840	
-895	-	00:35.800	
-
-00:35.840	--> 	00:35.880	
-896	-	00:35.840	
-
-00:35.880	--> 	00:35.920	
-897	-	00:35.880	
-
-00:35.920	--> 	00:35.960	
-898	-	00:35.920	
-
-00:35.960	--> 	00:36.000	
-899	-	00:35.960	
-
-00:36.000	--> 	00:36.040	
-900	-	00:36.000	
-
-00:36.040	--> 	00:36.080	
-901	-	00:36.040	
-
-00:36.080	--> 	00:36.120	
-902	-	00:36.080	
-
-00:36.120	--> 	00:36.160	
-903	-	00:36.120	
-
-00:36.160	--> 	00:36.200	
-904	-	00:36.160	
-
-00:36.200	--> 	00:36.240	
-905	-	00:36.200	
-
-00:36.240	--> 	00:36.280	
-906	-	00:36.240	
-
-00:36.280	--> 	00:36.320	
-907	-	00:36.280	
-
-00:36.320	--> 	00:36.360	
-908	-	00:36.320	
-
-00:36.360	--> 	00:36.400	
-909	-	00:36.360	
-
-00:36.400	--> 	00:36.440	
-910	-	00:36.400	
-
-00:36.440	--> 	00:36.480	
-911	-	00:36.440	
-
-00:36.480	--> 	00:36.520	
-912	-	00:36.480	
-
-00:36.520	--> 	00:36.560	
-913	-	00:36.520	
-
-00:36.560	--> 	00:36.600	
-914	-	00:36.560	
-
-00:36.600	--> 	00:36.640	
-915	-	00:36.600	
-
-00:36.640	--> 	00:36.680	
-916	-	00:36.640	
-
-00:36.680	--> 	00:36.720	
-917	-	00:36.680	
-
-00:36.720	--> 	00:36.760	
-918	-	00:36.720	
-
-00:36.760	--> 	00:36.800	
-919	-	00:36.760	
-
-00:36.800	--> 	00:36.840	
-920	-	00:36.800	
-
-00:36.840	--> 	00:36.880	
-921	-	00:36.840	
-
-00:36.880	--> 	00:36.920	
-922	-	00:36.880	
-
-00:36.920	--> 	00:36.960	
-923	-	00:36.920	
-
-00:36.960	--> 	00:37.000	
-924	-	00:36.960	
-
-00:37.000	--> 	00:37.040	
-925	-	00:37.000	
-
-00:37.040	--> 	00:37.080	
-926	-	00:37.040	
-
-00:37.080	--> 	00:37.120	
-927	-	00:37.080	
-
-00:37.120	--> 	00:37.160	
-928	-	00:37.120	
-
-00:37.160	--> 	00:37.200	
-929	-	00:37.160	
-
-00:37.200	--> 	00:37.240	
-930	-	00:37.200	
-
-00:37.240	--> 	00:37.280	
-931	-	00:37.240	
-
-00:37.280	--> 	00:37.320	
-932	-	00:37.280	
-
-00:37.320	--> 	00:37.360	
-933	-	00:37.320	
-
-00:37.360	--> 	00:37.400	
-934	-	00:37.360	
-
-00:37.400	--> 	00:37.440	
-935	-	00:37.400	
-
-00:37.440	--> 	00:37.480	
-936	-	00:37.440	
-
-00:37.480	--> 	00:37.520	
-937	-	00:37.480	
-
-00:37.520	--> 	00:37.560	
-938	-	00:37.520	
-
-00:37.560	--> 	00:37.600	
-939	-	00:37.560	
-
-00:37.600	--> 	00:37.640	
-940	-	00:37.600	
-
-00:37.640	--> 	00:37.680	
-941	-	00:37.640	
-
-00:37.680	--> 	00:37.720	
-942	-	00:37.680	
-
-00:37.720	--> 	00:37.760	
-943	-	00:37.720	
-
-00:37.760	--> 	00:37.800	
-944	-	00:37.760	
-
-00:37.800	--> 	00:37.840	
-945	-	00:37.800	
-
-00:37.840	--> 	00:37.880	
-946	-	00:37.840	
-
-00:37.880	--> 	00:37.920	
-947	-	00:37.880	
-
-00:37.920	--> 	00:37.960	
-948	-	00:37.920	
-
-00:37.960	--> 	00:38.000	
-949	-	00:37.960	
-
-00:38.000	--> 	00:38.040	
-950	-	00:38.000	
-
-00:38.040	--> 	00:38.080	
-951	-	00:38.040	
-
-00:38.080	--> 	00:38.120	
-952	-	00:38.080	
-
-00:38.120	--> 	00:38.160	
-953	-	00:38.120	
-
-00:38.160	--> 	00:38.200	
-954	-	00:38.160	
-
-00:38.200	--> 	00:38.240	
-955	-	00:38.200	
-
-00:38.240	--> 	00:38.280	
-956	-	00:38.240	
-
-00:38.280	--> 	00:38.320	
-957	-	00:38.280	
-
-00:38.320	--> 	00:38.360	
-958	-	00:38.320	
-
-00:38.360	--> 	00:38.400	
-959	-	00:38.360	
-
-00:38.400	--> 	00:38.440	
-960	-	00:38.400	
-
-00:38.440	--> 	00:38.480	
-961	-	00:38.440	
-
-00:38.480	--> 	00:38.520	
-962	-	00:38.480	
-
-00:38.520	--> 	00:38.560	
-963	-	00:38.520	
-
-00:38.560	--> 	00:38.600	
-964	-	00:38.560	
-
-00:38.600	--> 	00:38.640	
-965	-	00:38.600	
-
-00:38.640	--> 	00:38.680	
-966	-	00:38.640	
-
-00:38.680	--> 	00:38.720	
-967	-	00:38.680	
-
-00:38.720	--> 	00:38.760	
-968	-	00:38.720	
-
-00:38.760	--> 	00:38.800	
-969	-	00:38.760	
-
-00:38.800	--> 	00:38.840	
-970	-	00:38.800	
-
-00:38.840	--> 	00:38.880	
-971	-	00:38.840	
-
-00:38.880	--> 	00:38.920	
-972	-	00:38.880	
-
-00:38.920	--> 	00:38.960	
-973	-	00:38.920	
-
-00:38.960	--> 	00:39.000	
-974	-	00:38.960	
-
-00:39.000	--> 	00:39.040	
-975	-	00:39.000	
-
-00:39.040	--> 	00:39.080	
-976	-	00:39.040	
-
-00:39.080	--> 	00:39.120	
-977	-	00:39.080	
-
-00:39.120	--> 	00:39.160	
-978	-	00:39.120	
-
-00:39.160	--> 	00:39.200	
-979	-	00:39.160	
-
-00:39.200	--> 	00:39.240	
-980	-	00:39.200	
-
-00:39.240	--> 	00:39.280	
-981	-	00:39.240	
-
-00:39.280	--> 	00:39.320	
-982	-	00:39.280	
-
-00:39.320	--> 	00:39.360	
-983	-	00:39.320	
-
-00:39.360	--> 	00:39.400	
-984	-	00:39.360	
-
-00:39.400	--> 	00:39.440	
-985	-	00:39.400	
-
-00:39.440	--> 	00:39.480	
-986	-	00:39.440	
-
-00:39.480	--> 	00:39.520	
-987	-	00:39.480	
-
-00:39.520	--> 	00:39.560	
-988	-	00:39.520	
-
-00:39.560	--> 	00:39.600	
-989	-	00:39.560	
-
-00:39.600	--> 	00:39.640	
-990	-	00:39.600	
-
-00:39.640	--> 	00:39.680	
-991	-	00:39.640	
-
-00:39.680	--> 	00:39.720	
-992	-	00:39.680	
-
-00:39.720	--> 	00:39.760	
-993	-	00:39.720	
-
-00:39.760	--> 	00:39.800	
-994	-	00:39.760	
-
-00:39.800	--> 	00:39.840	
-995	-	00:39.800	
-
-00:39.840	--> 	00:39.880	
-996	-	00:39.840	
-
-00:39.880	--> 	00:39.920	
-997	-	00:39.880	
-
-00:39.920	--> 	00:39.960	
-998	-	00:39.920	
-
-00:39.960	--> 	00:40.000	
-999	-	00:39.960	
-
-00:40.000	--> 	00:40.040	
-1000	-	00:40.000	
-
-00:40.040	--> 	00:40.080	
-1001	-	00:40.040	
-
-00:40.080	--> 	00:40.120	
-1002	-	00:40.080	
-
-00:40.120	--> 	00:40.160	
-1003	-	00:40.120	
-
-00:40.160	--> 	00:40.200	
-1004	-	00:40.160	
-
-00:40.200	--> 	00:40.240	
-1005	-	00:40.200	
-
-00:40.240	--> 	00:40.280	
-1006	-	00:40.240	
-
-00:40.280	--> 	00:40.320	
-1007	-	00:40.280	
-
-00:40.320	--> 	00:40.360	
-1008	-	00:40.320	
-
-00:40.360	--> 	00:40.400	
-1009	-	00:40.360	
-
-00:40.400	--> 	00:40.440	
-1010	-	00:40.400	
-
-00:40.440	--> 	00:40.480	
-1011	-	00:40.440	
-
-00:40.480	--> 	00:40.520	
-1012	-	00:40.480	
-
-00:40.520	--> 	00:40.560	
-1013	-	00:40.520	
-
-00:40.560	--> 	00:40.600	
-1014	-	00:40.560	
-
-00:40.600	--> 	00:40.640	
-1015	-	00:40.600	
-
-00:40.640	--> 	00:40.680	
-1016	-	00:40.640	
-
-00:40.680	--> 	00:40.720	
-1017	-	00:40.680	
-
-00:40.720	--> 	00:40.760	
-1018	-	00:40.720	
-
-00:40.760	--> 	00:40.800	
-1019	-	00:40.760	
-
-00:40.800	--> 	00:40.840	
-1020	-	00:40.800	
-
-00:40.840	--> 	00:40.880	
-1021	-	00:40.840	
-
-00:40.880	--> 	00:40.920	
-1022	-	00:40.880	
-
-00:40.920	--> 	00:40.960	
-1023	-	00:40.920	
-
-00:40.960	--> 	00:41.000	
-1024	-	00:40.960	
-
-00:41.000	--> 	00:41.040	
-1025	-	00:41.000	
-
-00:41.040	--> 	00:41.080	
-1026	-	00:41.040	
-
-00:41.080	--> 	00:41.120	
-1027	-	00:41.080	
-
-00:41.120	--> 	00:41.160	
-1028	-	00:41.120	
-
-00:41.160	--> 	00:41.200	
-1029	-	00:41.160	
-
-00:41.200	--> 	00:41.240	
-1030	-	00:41.200	
-
-00:41.240	--> 	00:41.280	
-1031	-	00:41.240	
-
-00:41.280	--> 	00:41.320	
-1032	-	00:41.280	
-
-00:41.320	--> 	00:41.360	
-1033	-	00:41.320	
-
-00:41.360	--> 	00:41.400	
-1034	-	00:41.360	
-
-00:41.400	--> 	00:41.440	
-1035	-	00:41.400	
-
-00:41.440	--> 	00:41.480	
-1036	-	00:41.440	
-
-00:41.480	--> 	00:41.520	
-1037	-	00:41.480	
-
-00:41.520	--> 	00:41.560	
-1038	-	00:41.520	
-
-00:41.560	--> 	00:41.600	
-1039	-	00:41.560	
-
-00:41.600	--> 	00:41.640	
-1040	-	00:41.600	
-
-00:41.640	--> 	00:41.680	
-1041	-	00:41.640	
-
-00:41.680	--> 	00:41.720	
-1042	-	00:41.680	
-
-00:41.720	--> 	00:41.760	
-1043	-	00:41.720	
-
-00:41.760	--> 	00:41.800	
-1044	-	00:41.760	
-
-00:41.800	--> 	00:41.840	
-1045	-	00:41.800	
-
-00:41.840	--> 	00:41.880	
-1046	-	00:41.840	
-
-00:41.880	--> 	00:41.920	
-1047	-	00:41.880	
-
-00:41.920	--> 	00:41.960	
-1048	-	00:41.920	
-
-00:41.960	--> 	00:42.000	
-1049	-	00:41.960	
-
-00:42.000	--> 	00:42.040	
-1050	-	00:42.000	
-
-00:42.040	--> 	00:42.080	
-1051	-	00:42.040	
-
-00:42.080	--> 	00:42.120	
-1052	-	00:42.080	
-
-00:42.120	--> 	00:42.160	
-1053	-	00:42.120	
-
-00:42.160	--> 	00:42.200	
-1054	-	00:42.160	
-
-00:42.200	--> 	00:42.240	
-1055	-	00:42.200	
-
-00:42.240	--> 	00:42.280	
-1056	-	00:42.240	
-
-00:42.280	--> 	00:42.320	
-1057	-	00:42.280	
-
-00:42.320	--> 	00:42.360	
-1058	-	00:42.320	
-
-00:42.360	--> 	00:42.400	
-1059	-	00:42.360	
-
-00:42.400	--> 	00:42.440	
-1060	-	00:42.400	
-
-00:42.440	--> 	00:42.480	
-1061	-	00:42.440	
-
-00:42.480	--> 	00:42.520	
-1062	-	00:42.480	
-
-00:42.520	--> 	00:42.560	
-1063	-	00:42.520	
-
-00:42.560	--> 	00:42.600	
-1064	-	00:42.560	
-
-00:42.600	--> 	00:42.640	
-1065	-	00:42.600	
-
-00:42.640	--> 	00:42.680	
-1066	-	00:42.640	
-
-00:42.680	--> 	00:42.720	
-1067	-	00:42.680	
-
-00:42.720	--> 	00:42.760	
-1068	-	00:42.720	
-
-00:42.760	--> 	00:42.800	
-1069	-	00:42.760	
-
-00:42.800	--> 	00:42.840	
-1070	-	00:42.800	
-
-00:42.840	--> 	00:42.880	
-1071	-	00:42.840	
-
-00:42.880	--> 	00:42.920	
-1072	-	00:42.880	
-
-00:42.920	--> 	00:42.960	
-1073	-	00:42.920	
-
-00:42.960	--> 	00:43.000	
-1074	-	00:42.960	
-
-00:43.000	--> 	00:43.040	
-1075	-	00:43.000	
-
-00:43.040	--> 	00:43.080	
-1076	-	00:43.040	
-
-00:43.080	--> 	00:43.120	
-1077	-	00:43.080	
-
-00:43.120	--> 	00:43.160	
-1078	-	00:43.120	
-
-00:43.160	--> 	00:43.200	
-1079	-	00:43.160	
-
-00:43.200	--> 	00:43.240	
-1080	-	00:43.200	
-
-00:43.240	--> 	00:43.280	
-1081	-	00:43.240	
-
-00:43.280	--> 	00:43.320	
-1082	-	00:43.280	
-
-00:43.320	--> 	00:43.360	
-1083	-	00:43.320	
-
-00:43.360	--> 	00:43.400	
-1084	-	00:43.360	
-
-00:43.400	--> 	00:43.440	
-1085	-	00:43.400	
-
-00:43.440	--> 	00:43.480	
-1086	-	00:43.440	
-
-00:43.480	--> 	00:43.520	
-1087	-	00:43.480	
-
-00:43.520	--> 	00:43.560	
-1088	-	00:43.520	
-
-00:43.560	--> 	00:43.600	
-1089	-	00:43.560	
-
-00:43.600	--> 	00:43.640	
-1090	-	00:43.600	
-
-00:43.640	--> 	00:43.680	
-1091	-	00:43.640	
-
-00:43.680	--> 	00:43.720	
-1092	-	00:43.680	
-
-00:43.720	--> 	00:43.760	
-1093	-	00:43.720	
-
-00:43.760	--> 	00:43.800	
-1094	-	00:43.760	
-
-00:43.800	--> 	00:43.840	
-1095	-	00:43.800	
-
-00:43.840	--> 	00:43.880	
-1096	-	00:43.840	
-
-00:43.880	--> 	00:43.920	
-1097	-	00:43.880	
-
-00:43.920	--> 	00:43.960	
-1098	-	00:43.920	
-
-00:43.960	--> 	00:44.000	
-1099	-	00:43.960	
-
-00:44.000	--> 	00:44.040	
-1100	-	00:44.000	
-
-00:44.040	--> 	00:44.080	
-1101	-	00:44.040	
-
-00:44.080	--> 	00:44.120	
-1102	-	00:44.080	
-
-00:44.120	--> 	00:44.160	
-1103	-	00:44.120	
-
-00:44.160	--> 	00:44.200	
-1104	-	00:44.160	
-
-00:44.200	--> 	00:44.240	
-1105	-	00:44.200	
-
-00:44.240	--> 	00:44.280	
-1106	-	00:44.240	
-
-00:44.280	--> 	00:44.320	
-1107	-	00:44.280	
-
-00:44.320	--> 	00:44.360	
-1108	-	00:44.320	
-
-00:44.360	--> 	00:44.400	
-1109	-	00:44.360	
-
-00:44.400	--> 	00:44.440	
-1110	-	00:44.400	
-
-00:44.440	--> 	00:44.480	
-1111	-	00:44.440	
-
-00:44.480	--> 	00:44.520	
-1112	-	00:44.480	
-
-00:44.520	--> 	00:44.560	
-1113	-	00:44.520	
-
-00:44.560	--> 	00:44.600	
-1114	-	00:44.560	
-
-00:44.600	--> 	00:44.640	
-1115	-	00:44.600	
-
-00:44.640	--> 	00:44.680	
-1116	-	00:44.640	
-
-00:44.680	--> 	00:44.720	
-1117	-	00:44.680	
-
-00:44.720	--> 	00:44.760	
-1118	-	00:44.720	
-
-00:44.760	--> 	00:44.800	
-1119	-	00:44.760	
-
-00:44.800	--> 	00:44.840	
-1120	-	00:44.800	
-
-00:44.840	--> 	00:44.880	
-1121	-	00:44.840	
-
-00:44.880	--> 	00:44.920	
-1122	-	00:44.880	
-
-00:44.920	--> 	00:44.960	
-1123	-	00:44.920	
-
-00:44.960	--> 	00:45.000	
-1124	-	00:44.960	
-
-00:45.000	--> 	00:45.040	
-1125	-	00:45.000	
-
-00:45.040	--> 	00:45.080	
-1126	-	00:45.040	
-
-00:45.080	--> 	00:45.120	
-1127	-	00:45.080	
-
-00:45.120	--> 	00:45.160	
-1128	-	00:45.120	
-
-00:45.160	--> 	00:45.200	
-1129	-	00:45.160	
-
-00:45.200	--> 	00:45.240	
-1130	-	00:45.200	
-
-00:45.240	--> 	00:45.280	
-1131	-	00:45.240	
-
-00:45.280	--> 	00:45.320	
-1132	-	00:45.280	
-
-00:45.320	--> 	00:45.360	
-1133	-	00:45.320	
-
-00:45.360	--> 	00:45.400	
-1134	-	00:45.360	
-
-00:45.400	--> 	00:45.440	
-1135	-	00:45.400	
-
-00:45.440	--> 	00:45.480	
-1136	-	00:45.440	
-
-00:45.480	--> 	00:45.520	
-1137	-	00:45.480	
-
-00:45.520	--> 	00:45.560	
-1138	-	00:45.520	
-
-00:45.560	--> 	00:45.600	
-1139	-	00:45.560	
-
-00:45.600	--> 	00:45.640	
-1140	-	00:45.600	
-
-00:45.640	--> 	00:45.680	
-1141	-	00:45.640	
-
-00:45.680	--> 	00:45.720	
-1142	-	00:45.680	
-
-00:45.720	--> 	00:45.760	
-1143	-	00:45.720	
-
-00:45.760	--> 	00:45.800	
-1144	-	00:45.760	
-
-00:45.800	--> 	00:45.840	
-1145	-	00:45.800	
-
-00:45.840	--> 	00:45.880	
-1146	-	00:45.840	
-
-00:45.880	--> 	00:45.920	
-1147	-	00:45.880	
-
-00:45.920	--> 	00:45.960	
-1148	-	00:45.920	
-
-00:45.960	--> 	00:46.000	
-1149	-	00:45.960	
-
-00:46.000	--> 	00:46.040	
-1150	-	00:46.000	
-
-00:46.040	--> 	00:46.080	
-1151	-	00:46.040	
-
-00:46.080	--> 	00:46.120	
-1152	-	00:46.080	
-
-00:46.120	--> 	00:46.160	
-1153	-	00:46.120	
-
-00:46.160	--> 	00:46.200	
-1154	-	00:46.160	
-
-00:46.200	--> 	00:46.240	
-1155	-	00:46.200	
-
-00:46.240	--> 	00:46.280	
-1156	-	00:46.240	
-
-00:46.280	--> 	00:46.320	
-1157	-	00:46.280	
-
-00:46.320	--> 	00:46.360	
-1158	-	00:46.320	
-
-00:46.360	--> 	00:46.400	
-1159	-	00:46.360	
-
-00:46.400	--> 	00:46.440	
-1160	-	00:46.400	
-
-00:46.440	--> 	00:46.480	
-1161	-	00:46.440	
-
-00:46.480	--> 	00:46.520	
-1162	-	00:46.480	
-
-00:46.520	--> 	00:46.560	
-1163	-	00:46.520	
-
-00:46.560	--> 	00:46.600	
-1164	-	00:46.560	
-
-00:46.600	--> 	00:46.640	
-1165	-	00:46.600	
-
-00:46.640	--> 	00:46.680	
-1166	-	00:46.640	
-
-00:46.680	--> 	00:46.720	
-1167	-	00:46.680	
-
-00:46.720	--> 	00:46.760	
-1168	-	00:46.720	
-
-00:46.760	--> 	00:46.800	
-1169	-	00:46.760	
-
-00:46.800	--> 	00:46.840	
-1170	-	00:46.800	
-
-00:46.840	--> 	00:46.880	
-1171	-	00:46.840	
-
-00:46.880	--> 	00:46.920	
-1172	-	00:46.880	
-
-00:46.920	--> 	00:46.960	
-1173	-	00:46.920	
-
-00:46.960	--> 	00:47.000	
-1174	-	00:46.960	
-
-00:47.000	--> 	00:47.040	
-1175	-	00:47.000	
-
-00:47.040	--> 	00:47.080	
-1176	-	00:47.040	
-
-00:47.080	--> 	00:47.120	
-1177	-	00:47.080	
-
-00:47.120	--> 	00:47.160	
-1178	-	00:47.120	
-
-00:47.160	--> 	00:47.200	
-1179	-	00:47.160	
-
-00:47.200	--> 	00:47.240	
-1180	-	00:47.200	
-
-00:47.240	--> 	00:47.280	
-1181	-	00:47.240	
-
-00:47.280	--> 	00:47.320	
-1182	-	00:47.280	
-
-00:47.320	--> 	00:47.360	
-1183	-	00:47.320	
-
-00:47.360	--> 	00:47.400	
-1184	-	00:47.360	
-
-00:47.400	--> 	00:47.440	
-1185	-	00:47.400	
-
-00:47.440	--> 	00:47.480	
-1186	-	00:47.440	
-
-00:47.480	--> 	00:47.520	
-1187	-	00:47.480	
-
-00:47.520	--> 	00:47.560	
-1188	-	00:47.520	
-
-00:47.560	--> 	00:47.600	
-1189	-	00:47.560	
-
-00:47.600	--> 	00:47.640	
-1190	-	00:47.600	
-
-00:47.640	--> 	00:47.680	
-1191	-	00:47.640	
-
-00:47.680	--> 	00:47.720	
-1192	-	00:47.680	
-
-00:47.720	--> 	00:47.760	
-1193	-	00:47.720	
-
-00:47.760	--> 	00:47.800	
-1194	-	00:47.760	
-
-00:47.800	--> 	00:47.840	
-1195	-	00:47.800	
-
-00:47.840	--> 	00:47.880	
-1196	-	00:47.840	
-
-00:47.880	--> 	00:47.920	
-1197	-	00:47.880	
-
-00:47.920	--> 	00:47.960	
-1198	-	00:47.920	
-
-00:47.960	--> 	00:48.000	
-1199	-	00:47.960	
-
-00:48.000	--> 	00:48.040	
-1200	-	00:48.000	
-
-00:48.040	--> 	00:48.080	
-1201	-	00:48.040	
-
-00:48.080	--> 	00:48.120	
-1202	-	00:48.080	
-
-00:48.120	--> 	00:48.160	
-1203	-	00:48.120	
-
-00:48.160	--> 	00:48.200	
-1204	-	00:48.160	
-
-00:48.200	--> 	00:48.240	
-1205	-	00:48.200	
-
-00:48.240	--> 	00:48.280	
-1206	-	00:48.240	
-
-00:48.280	--> 	00:48.320	
-1207	-	00:48.280	
-
-00:48.320	--> 	00:48.360	
-1208	-	00:48.320	
-
-00:48.360	--> 	00:48.400	
-1209	-	00:48.360	
-
-00:48.400	--> 	00:48.440	
-1210	-	00:48.400	
-
-00:48.440	--> 	00:48.480	
-1211	-	00:48.440	
-
-00:48.480	--> 	00:48.520	
-1212	-	00:48.480	
-
-00:48.520	--> 	00:48.560	
-1213	-	00:48.520	
-
-00:48.560	--> 	00:48.600	
-1214	-	00:48.560	
-
-00:48.600	--> 	00:48.640	
-1215	-	00:48.600	
-
-00:48.640	--> 	00:48.680	
-1216	-	00:48.640	
-
-00:48.680	--> 	00:48.720	
-1217	-	00:48.680	
-
-00:48.720	--> 	00:48.760	
-1218	-	00:48.720	
-
-00:48.760	--> 	00:48.800	
-1219	-	00:48.760	
-
-00:48.800	--> 	00:48.840	
-1220	-	00:48.800	
-
-00:48.840	--> 	00:48.880	
-1221	-	00:48.840	
-
-00:48.880	--> 	00:48.920	
-1222	-	00:48.880	
-
-00:48.920	--> 	00:48.960	
-1223	-	00:48.920	
-
-00:48.960	--> 	00:49.000	
-1224	-	00:48.960	
-
-00:49.000	--> 	00:49.040	
-1225	-	00:49.000	
-
-00:49.040	--> 	00:49.080	
-1226	-	00:49.040	
-
-00:49.080	--> 	00:49.120	
-1227	-	00:49.080	
-
-00:49.120	--> 	00:49.160	
-1228	-	00:49.120	
-
-00:49.160	--> 	00:49.200	
-1229	-	00:49.160	
-
-00:49.200	--> 	00:49.240	
-1230	-	00:49.200	
-
-00:49.240	--> 	00:49.280	
-1231	-	00:49.240	
-
-00:49.280	--> 	00:49.320	
-1232	-	00:49.280	
-
-00:49.320	--> 	00:49.360	
-1233	-	00:49.320	
-
-00:49.360	--> 	00:49.400	
-1234	-	00:49.360	
-
-00:49.400	--> 	00:49.440	
-1235	-	00:49.400	
-
-00:49.440	--> 	00:49.480	
-1236	-	00:49.440	
-
-00:49.480	--> 	00:49.520	
-1237	-	00:49.480	
-
-00:49.520	--> 	00:49.560	
-1238	-	00:49.520	
-
-00:49.560	--> 	00:49.600	
-1239	-	00:49.560	
-
-00:49.600	--> 	00:49.640	
-1240	-	00:49.600	
-
-00:49.640	--> 	00:49.680	
-1241	-	00:49.640	
-
-00:49.680	--> 	00:49.720	
-1242	-	00:49.680	
-
-00:49.720	--> 	00:49.760	
-1243	-	00:49.720	
-
-00:49.760	--> 	00:49.800	
-1244	-	00:49.760	
-
-00:49.800	--> 	00:49.840	
-1245	-	00:49.800	
-
-00:49.840	--> 	00:49.880	
-1246	-	00:49.840	
-
-00:49.880	--> 	00:49.920	
-1247	-	00:49.880	
-
-00:49.920	--> 	00:49.960	
-1248	-	00:49.920	
-
-00:49.960	--> 	00:50.000	
-1249	-	00:49.960	
-
-00:50.000	--> 	00:50.040	
-1250	-	00:50.000	
-
-00:50.040	--> 	00:50.080	
-1251	-	00:50.040	
-
-00:50.080	--> 	00:50.120	
-1252	-	00:50.080	
-
-00:50.120	--> 	00:50.160	
-1253	-	00:50.120	
-
-00:50.160	--> 	00:50.200	
-1254	-	00:50.160	
-
-00:50.200	--> 	00:50.240	
-1255	-	00:50.200	
-
-00:50.240	--> 	00:50.280	
-1256	-	00:50.240	
-
-00:50.280	--> 	00:50.320	
-1257	-	00:50.280	
-
-00:50.320	--> 	00:50.360	
-1258	-	00:50.320	
-
-00:50.360	--> 	00:50.400	
-1259	-	00:50.360	
-
-00:50.400	--> 	00:50.440	
-1260	-	00:50.400	
-
-00:50.440	--> 	00:50.480	
-1261	-	00:50.440	
-
-00:50.480	--> 	00:50.520	
-1262	-	00:50.480	
-
-00:50.520	--> 	00:50.560	
-1263	-	00:50.520	
-
-00:50.560	--> 	00:50.600	
-1264	-	00:50.560	
-
-00:50.600	--> 	00:50.640	
-1265	-	00:50.600	
-
-00:50.640	--> 	00:50.680	
-1266	-	00:50.640	
-
-00:50.680	--> 	00:50.720	
-1267	-	00:50.680	
-
-00:50.720	--> 	00:50.760	
-1268	-	00:50.720	
-
-00:50.760	--> 	00:50.800	
-1269	-	00:50.760	
-
-00:50.800	--> 	00:50.840	
-1270	-	00:50.800	
-
-00:50.840	--> 	00:50.880	
-1271	-	00:50.840	
-
-00:50.880	--> 	00:50.920	
-1272	-	00:50.880	
-
-00:50.920	--> 	00:50.960	
-1273	-	00:50.920	
-
-00:50.960	--> 	00:51.000	
-1274	-	00:50.960	
-
-00:51.000	--> 	00:51.040	
-1275	-	00:51.000	
-
-00:51.040	--> 	00:51.080	
-1276	-	00:51.040	
-
-00:51.080	--> 	00:51.120	
-1277	-	00:51.080	
-
-00:51.120	--> 	00:51.160	
-1278	-	00:51.120	
-
-00:51.160	--> 	00:51.200	
-1279	-	00:51.160	
-
-00:51.200	--> 	00:51.240	
-1280	-	00:51.200	
-
-00:51.240	--> 	00:51.280	
-1281	-	00:51.240	
-
-00:51.280	--> 	00:51.320	
-1282	-	00:51.280	
-
-00:51.320	--> 	00:51.360	
-1283	-	00:51.320	
-
-00:51.360	--> 	00:51.400	
-1284	-	00:51.360	
-
-00:51.400	--> 	00:51.440	
-1285	-	00:51.400	
-
-00:51.440	--> 	00:51.480	
-1286	-	00:51.440	
-
-00:51.480	--> 	00:51.520	
-1287	-	00:51.480	
-
-00:51.520	--> 	00:51.560	
-1288	-	00:51.520	
-
-00:51.560	--> 	00:51.600	
-1289	-	00:51.560	
-
-00:51.600	--> 	00:51.640	
-1290	-	00:51.600	
-
-00:51.640	--> 	00:51.680	
-1291	-	00:51.640	
-
-00:51.680	--> 	00:51.720	
-1292	-	00:51.680	
-
-00:51.720	--> 	00:51.760	
-1293	-	00:51.720	
-
-00:51.760	--> 	00:51.800	
-1294	-	00:51.760	
-
-00:51.800	--> 	00:51.840	
-1295	-	00:51.800	
-
-00:51.840	--> 	00:51.880	
-1296	-	00:51.840	
-
-00:51.880	--> 	00:51.920	
-1297	-	00:51.880	
-
-00:51.920	--> 	00:51.960	
-1298	-	00:51.920	
-
-00:51.960	--> 	00:52.000	
-1299	-	00:51.960	
-
-00:52.000	--> 	00:52.040	
-1300	-	00:52.000	
-
-00:52.040	--> 	00:52.080	
-1301	-	00:52.040	
-
-00:52.080	--> 	00:52.120	
-1302	-	00:52.080	
-
-00:52.120	--> 	00:52.160	
-1303	-	00:52.120	
-
-00:52.160	--> 	00:52.200	
-1304	-	00:52.160	
-
-00:52.200	--> 	00:52.240	
-1305	-	00:52.200	
-
-00:52.240	--> 	00:52.280	
-1306	-	00:52.240	
-
-00:52.280	--> 	00:52.320	
-1307	-	00:52.280	
-
-00:52.320	--> 	00:52.360	
-1308	-	00:52.320	
-
-00:52.360	--> 	00:52.400	
-1309	-	00:52.360	
-
-00:52.400	--> 	00:52.440	
-1310	-	00:52.400	
-
-00:52.440	--> 	00:52.480	
-1311	-	00:52.440	
-
-00:52.480	--> 	00:52.520	
-1312	-	00:52.480	
-
-00:52.520	--> 	00:52.560	
-1313	-	00:52.520	
-
-00:52.560	--> 	00:52.600	
-1314	-	00:52.560	
-
-00:52.600	--> 	00:52.640	
-1315	-	00:52.600	
-
-00:52.640	--> 	00:52.680	
-1316	-	00:52.640	
-
-00:52.680	--> 	00:52.720	
-1317	-	00:52.680	
-
-00:52.720	--> 	00:52.760	
-1318	-	00:52.720	
-
-00:52.760	--> 	00:52.800	
-1319	-	00:52.760	
-
-00:52.800	--> 	00:52.840	
-1320	-	00:52.800	
-
-00:52.840	--> 	00:52.880	
-1321	-	00:52.840	
-
-00:52.880	--> 	00:52.920	
-1322	-	00:52.880	
-
-00:52.920	--> 	00:52.960	
-1323	-	00:52.920	
-
-00:52.960	--> 	00:53.000	
-1324	-	00:52.960	
-
-00:53.000	--> 	00:53.040	
-1325	-	00:53.000	
-
-00:53.040	--> 	00:53.080	
-1326	-	00:53.040	
-
-00:53.080	--> 	00:53.120	
-1327	-	00:53.080	
-
-00:53.120	--> 	00:53.160	
-1328	-	00:53.120	
-
-00:53.160	--> 	00:53.200	
-1329	-	00:53.160	
-
-00:53.200	--> 	00:53.240	
-1330	-	00:53.200	
-
-00:53.240	--> 	00:53.280	
-1331	-	00:53.240	
-
-00:53.280	--> 	00:53.320	
-1332	-	00:53.280	
-
-00:53.320	--> 	00:53.360	
-1333	-	00:53.320	
-
-00:53.360	--> 	00:53.400	
-1334	-	00:53.360	
-
-00:53.400	--> 	00:53.440	
-1335	-	00:53.400	
-
-00:53.440	--> 	00:53.480	
-1336	-	00:53.440	
-
-00:53.480	--> 	00:53.520	
-1337	-	00:53.480	
-
-00:53.520	--> 	00:53.560	
-1338	-	00:53.520	
-
-00:53.560	--> 	00:53.600	
-1339	-	00:53.560	
-
-00:53.600	--> 	00:53.640	
-1340	-	00:53.600	
-
-00:53.640	--> 	00:53.680	
-1341	-	00:53.640	
-
-00:53.680	--> 	00:53.720	
-1342	-	00:53.680	
-
-00:53.720	--> 	00:53.760	
-1343	-	00:53.720	
-
-00:53.760	--> 	00:53.800	
-1344	-	00:53.760	
-
-00:53.800	--> 	00:53.840	
-1345	-	00:53.800	
-
-00:53.840	--> 	00:53.880	
-1346	-	00:53.840	
-
-00:53.880	--> 	00:53.920	
-1347	-	00:53.880	
-
-00:53.920	--> 	00:53.960	
-1348	-	00:53.920	
-
-00:53.960	--> 	00:54.000	
-1349	-	00:53.960	
-
-00:54.000	--> 	00:54.040	
-1350	-	00:54.000	
-
-00:54.040	--> 	00:54.080	
-1351	-	00:54.040	
-
-00:54.080	--> 	00:54.120	
-1352	-	00:54.080	
-
-00:54.120	--> 	00:54.160	
-1353	-	00:54.120	
-
-00:54.160	--> 	00:54.200	
-1354	-	00:54.160	
-
-00:54.200	--> 	00:54.240	
-1355	-	00:54.200	
-
-00:54.240	--> 	00:54.280	
-1356	-	00:54.240	
-
-00:54.280	--> 	00:54.320	
-1357	-	00:54.280	
-
-00:54.320	--> 	00:54.360	
-1358	-	00:54.320	
-
-00:54.360	--> 	00:54.400	
-1359	-	00:54.360	
-
-00:54.400	--> 	00:54.440	
-1360	-	00:54.400	
-
-00:54.440	--> 	00:54.480	
-1361	-	00:54.440	
-
-00:54.480	--> 	00:54.520	
-1362	-	00:54.480	
-
-00:54.520	--> 	00:54.560	
-1363	-	00:54.520	
-
-00:54.560	--> 	00:54.600	
-1364	-	00:54.560	
-
-00:54.600	--> 	00:54.640	
-1365	-	00:54.600	
-
-00:54.640	--> 	00:54.680	
-1366	-	00:54.640	
-
-00:54.680	--> 	00:54.720	
-1367	-	00:54.680	
-
-00:54.720	--> 	00:54.760	
-1368	-	00:54.720	
-
-00:54.760	--> 	00:54.800	
-1369	-	00:54.760	
-
-00:54.800	--> 	00:54.840	
-1370	-	00:54.800	
-
-00:54.840	--> 	00:54.880	
-1371	-	00:54.840	
-
-00:54.880	--> 	00:54.920	
-1372	-	00:54.880	
-
-00:54.920	--> 	00:54.960	
-1373	-	00:54.920	
-
-00:54.960	--> 	00:55.000	
-1374	-	00:54.960	
-
-00:55.000	--> 	00:55.040	
-1375	-	00:55.000	
-
-00:55.040	--> 	00:55.080	
-1376	-	00:55.040	
-
-00:55.080	--> 	00:55.120	
-1377	-	00:55.080	
-
-00:55.120	--> 	00:55.160	
-1378	-	00:55.120	
-
-00:55.160	--> 	00:55.200	
-1379	-	00:55.160	
-
-00:55.200	--> 	00:55.240	
-1380	-	00:55.200	
-
-00:55.240	--> 	00:55.280	
-1381	-	00:55.240	
-
-00:55.280	--> 	00:55.320	
-1382	-	00:55.280	
-
-00:55.320	--> 	00:55.360	
-1383	-	00:55.320	
-
-00:55.360	--> 	00:55.400	
-1384	-	00:55.360	
-
-00:55.400	--> 	00:55.440	
-1385	-	00:55.400	
-
-00:55.440	--> 	00:55.480	
-1386	-	00:55.440	
-
-00:55.480	--> 	00:55.520	
-1387	-	00:55.480	
-
-00:55.520	--> 	00:55.560	
-1388	-	00:55.520	
-
-00:55.560	--> 	00:55.600	
-1389	-	00:55.560	
-
-00:55.600	--> 	00:55.640	
-1390	-	00:55.600	
-
-00:55.640	--> 	00:55.680	
-1391	-	00:55.640	
-
-00:55.680	--> 	00:55.720	
-1392	-	00:55.680	
-
-00:55.720	--> 	00:55.760	
-1393	-	00:55.720	
-
-00:55.760	--> 	00:55.800	
-1394	-	00:55.760	
-
-00:55.800	--> 	00:55.840	
-1395	-	00:55.800	
-
-00:55.840	--> 	00:55.880	
-1396	-	00:55.840	
-
-00:55.880	--> 	00:55.920	
-1397	-	00:55.880	
-
-00:55.920	--> 	00:55.960	
-1398	-	00:55.920	
-
-00:55.960	--> 	00:56.000	
-1399	-	00:55.960	
-
-00:56.000	--> 	00:56.040	
-1400	-	00:56.000	
-
-00:56.040	--> 	00:56.080	
-1401	-	00:56.040	
-
-00:56.080	--> 	00:56.120	
-1402	-	00:56.080	
-
-00:56.120	--> 	00:56.160	
-1403	-	00:56.120	
-
-00:56.160	--> 	00:56.200	
-1404	-	00:56.160	
-
-00:56.200	--> 	00:56.240	
-1405	-	00:56.200	
-
-00:56.240	--> 	00:56.280	
-1406	-	00:56.240	
-
-00:56.280	--> 	00:56.320	
-1407	-	00:56.280	
-
-00:56.320	--> 	00:56.360	
-1408	-	00:56.320	
-
-00:56.360	--> 	00:56.400	
-1409	-	00:56.360	
-
-00:56.400	--> 	00:56.440	
-1410	-	00:56.400	
-
-00:56.440	--> 	00:56.480	
-1411	-	00:56.440	
-
-00:56.480	--> 	00:56.520	
-1412	-	00:56.480	
-
-00:56.520	--> 	00:56.560	
-1413	-	00:56.520	
-
-00:56.560	--> 	00:56.600	
-1414	-	00:56.560	
-
-00:56.600	--> 	00:56.640	
-1415	-	00:56.600	
-
-00:56.640	--> 	00:56.680	
-1416	-	00:56.640	
-
-00:56.680	--> 	00:56.720	
-1417	-	00:56.680	
-
-00:56.720	--> 	00:56.760	
-1418	-	00:56.720	
-
-00:56.760	--> 	00:56.800	
-1419	-	00:56.760	
-
-00:56.800	--> 	00:56.840	
-1420	-	00:56.800	
-
-00:56.840	--> 	00:56.880	
-1421	-	00:56.840	
-
-00:56.880	--> 	00:56.920	
-1422	-	00:56.880	
-
-00:56.920	--> 	00:56.960	
-1423	-	00:56.920	
-
-00:56.960	--> 	00:57.000	
-1424	-	00:56.960	
-
-00:57.000	--> 	00:57.040	
-1425	-	00:57.000	
-
-00:57.040	--> 	00:57.080	
-1426	-	00:57.040	
-
-00:57.080	--> 	00:57.120	
-1427	-	00:57.080	
-
-00:57.120	--> 	00:57.160	
-1428	-	00:57.120	
-
-00:57.160	--> 	00:57.200	
-1429	-	00:57.160	
-
-00:57.200	--> 	00:57.240	
-1430	-	00:57.200	
-
-00:57.240	--> 	00:57.280	
-1431	-	00:57.240	
-
-00:57.280	--> 	00:57.320	
-1432	-	00:57.280	
-
-00:57.320	--> 	00:57.360	
-1433	-	00:57.320	
-
-00:57.360	--> 	00:57.400	
-1434	-	00:57.360	
-
-00:57.400	--> 	00:57.440	
-1435	-	00:57.400	
-
-00:57.440	--> 	00:57.480	
-1436	-	00:57.440	
-
-00:57.480	--> 	00:57.520	
-1437	-	00:57.480	
-
-00:57.520	--> 	00:57.560	
-1438	-	00:57.520	
-
-00:57.560	--> 	00:57.600	
-1439	-	00:57.560	
-
-00:57.600	--> 	00:57.640	
-1440	-	00:57.600	
-
-00:57.640	--> 	00:57.680	
-1441	-	00:57.640	
-
-00:57.680	--> 	00:57.720	
-1442	-	00:57.680	
-
-00:57.720	--> 	00:57.760	
-1443	-	00:57.720	
-
-00:57.760	--> 	00:57.800	
-1444	-	00:57.760	
-
-00:57.800	--> 	00:57.840	
-1445	-	00:57.800	
-
-00:57.840	--> 	00:57.880	
-1446	-	00:57.840	
-
-00:57.880	--> 	00:57.920	
-1447	-	00:57.880	
-
-00:57.920	--> 	00:57.960	
-1448	-	00:57.920	
-
-00:57.960	--> 	00:58.000	
-1449	-	00:57.960	
-
-00:58.000	--> 	00:58.040	
-1450	-	00:58.000	
-
-00:58.040	--> 	00:58.080	
-1451	-	00:58.040	
-
-00:58.080	--> 	00:58.120	
-1452	-	00:58.080	
-
-00:58.120	--> 	00:58.160	
-1453	-	00:58.120	
-
-00:58.160	--> 	00:58.200	
-1454	-	00:58.160	
-
-00:58.200	--> 	00:58.240	
-1455	-	00:58.200	
-
-00:58.240	--> 	00:58.280	
-1456	-	00:58.240	
-
-00:58.280	--> 	00:58.320	
-1457	-	00:58.280	
-
-00:58.320	--> 	00:58.360	
-1458	-	00:58.320	
-
-00:58.360	--> 	00:58.400	
-1459	-	00:58.360	
-
-00:58.400	--> 	00:58.440	
-1460	-	00:58.400	
-
-00:58.440	--> 	00:58.480	
-1461	-	00:58.440	
-
-00:58.480	--> 	00:58.520	
-1462	-	00:58.480	
-
-00:58.520	--> 	00:58.560	
-1463	-	00:58.520	
-
-00:58.560	--> 	00:58.600	
-1464	-	00:58.560	
-
-00:58.600	--> 	00:58.640	
-1465	-	00:58.600	
-
-00:58.640	--> 	00:58.680	
-1466	-	00:58.640	
-
-00:58.680	--> 	00:58.720	
-1467	-	00:58.680	
-
-00:58.720	--> 	00:58.760	
-1468	-	00:58.720	
-
-00:58.760	--> 	00:58.800	
-1469	-	00:58.760	
-
-00:58.800	--> 	00:58.840	
-1470	-	00:58.800	
-
-00:58.840	--> 	00:58.880	
-1471	-	00:58.840	
-
-00:58.880	--> 	00:58.920	
-1472	-	00:58.880	
-
-00:58.920	--> 	00:58.960	
-1473	-	00:58.920	
-
-00:58.960	--> 	00:59.000	
-1474	-	00:58.960	
-
-00:59.000	--> 	00:59.040	
-1475	-	00:59.000	
-
-00:59.040	--> 	00:59.080	
-1476	-	00:59.040	
-
-00:59.080	--> 	00:59.120	
-1477	-	00:59.080	
-
-00:59.120	--> 	00:59.160	
-1478	-	00:59.120	
-
-00:59.160	--> 	00:59.200	
-1479	-	00:59.160	
-
-00:59.200	--> 	00:59.240	
-1480	-	00:59.200	
-
-00:59.240	--> 	00:59.280	
-1481	-	00:59.240	
-
-00:59.280	--> 	00:59.320	
-1482	-	00:59.280	
-
-00:59.320	--> 	00:59.360	
-1483	-	00:59.320	
-
-00:59.360	--> 	00:59.400	
-1484	-	00:59.360	
-
-00:59.400	--> 	00:59.440	
-1485	-	00:59.400	
-
-00:59.440	--> 	00:59.480	
-1486	-	00:59.440	
-
-00:59.480	--> 	00:59.520	
-1487	-	00:59.480	
-
-00:59.520	--> 	00:59.560	
-1488	-	00:59.520	
-
-00:59.560	--> 	00:59.600	
-1489	-	00:59.560	
-
-00:59.600	--> 	00:59.640	
-1490	-	00:59.600	
-
-00:59.640	--> 	00:59.680	
-1491	-	00:59.640	
-
-00:59.680	--> 	00:59.720	
-1492	-	00:59.680	
-
-00:59.720	--> 	00:59.760	
-1493	-	00:59.720	
-
-00:59.760	--> 	00:59.800	
-1494	-	00:59.760	
-
-00:59.800	--> 	00:59.840	
-1495	-	00:59.800	
-
-00:59.840	--> 	00:59.880	
-1496	-	00:59.840	
-
-00:59.880	--> 	00:59.920	
-1497	-	00:59.880	
-
-00:59.920	--> 	00:59.960	
-1498	-	00:59.920	
-
-00:59.960	--> 	01:00.000	
-1499	-	00:59.960	
-
+WEBVTT
+
+00:00.000	--> 	00:00.040	
+0	-	00:00.000	
+
+00:00.040	--> 	00:00.080	
+1	-	00:00.040	
+
+00:00.080	--> 	00:00.120	
+2	-	00:00.080	
+
+00:00.120	--> 	00:00.160	
+3	-	00:00.120	
+
+00:00.160	--> 	00:00.200	
+4	-	00:00.160	
+
+00:00.200	--> 	00:00.240	
+5	-	00:00.200	
+
+00:00.240	--> 	00:00.280	
+6	-	00:00.240	
+
+00:00.280	--> 	00:00.320	
+7	-	00:00.280	
+
+00:00.320	--> 	00:00.360	
+8	-	00:00.320	
+
+00:00.360	--> 	00:00.400	
+9	-	00:00.360	
+
+00:00.400	--> 	00:00.440	
+10	-	00:00.400	
+
+00:00.440	--> 	00:00.480	
+11	-	00:00.440	
+
+00:00.480	--> 	00:00.520	
+12	-	00:00.480	
+
+00:00.520	--> 	00:00.560	
+13	-	00:00.520	
+
+00:00.560	--> 	00:00.600	
+14	-	00:00.560	
+
+00:00.600	--> 	00:00.640	
+15	-	00:00.600	
+
+00:00.640	--> 	00:00.680	
+16	-	00:00.640	
+
+00:00.680	--> 	00:00.720	
+17	-	00:00.680	
+
+00:00.720	--> 	00:00.760	
+18	-	00:00.720	
+
+00:00.760	--> 	00:00.800	
+19	-	00:00.760	
+
+00:00.800	--> 	00:00.840	
+20	-	00:00.800	
+
+00:00.840	--> 	00:00.880	
+21	-	00:00.840	
+
+00:00.880	--> 	00:00.920	
+22	-	00:00.880	
+
+00:00.920	--> 	00:00.960	
+23	-	00:00.920	
+
+00:00.960	--> 	00:01.000	
+24	-	00:00.960	
+
+00:01.000	--> 	00:01.040	
+25	-	00:01.000	
+
+00:01.040	--> 	00:01.080	
+26	-	00:01.040	
+
+00:01.080	--> 	00:01.120	
+27	-	00:01.080	
+
+00:01.120	--> 	00:01.160	
+28	-	00:01.120	
+
+00:01.160	--> 	00:01.200	
+29	-	00:01.160	
+
+00:01.200	--> 	00:01.240	
+30	-	00:01.200	
+
+00:01.240	--> 	00:01.280	
+31	-	00:01.240	
+
+00:01.280	--> 	00:01.320	
+32	-	00:01.280	
+
+00:01.320	--> 	00:01.360	
+33	-	00:01.320	
+
+00:01.360	--> 	00:01.400	
+34	-	00:01.360	
+
+00:01.400	--> 	00:01.440	
+35	-	00:01.400	
+
+00:01.440	--> 	00:01.480	
+36	-	00:01.440	
+
+00:01.480	--> 	00:01.520	
+37	-	00:01.480	
+
+00:01.520	--> 	00:01.560	
+38	-	00:01.520	
+
+00:01.560	--> 	00:01.600	
+39	-	00:01.560	
+
+00:01.600	--> 	00:01.640	
+40	-	00:01.600	
+
+00:01.640	--> 	00:01.680	
+41	-	00:01.640	
+
+00:01.680	--> 	00:01.720	
+42	-	00:01.680	
+
+00:01.720	--> 	00:01.760	
+43	-	00:01.720	
+
+00:01.760	--> 	00:01.800	
+44	-	00:01.760	
+
+00:01.800	--> 	00:01.840	
+45	-	00:01.800	
+
+00:01.840	--> 	00:01.880	
+46	-	00:01.840	
+
+00:01.880	--> 	00:01.920	
+47	-	00:01.880	
+
+00:01.920	--> 	00:01.960	
+48	-	00:01.920	
+
+00:01.960	--> 	00:02.000	
+49	-	00:01.960	
+
+00:02.000	--> 	00:02.040	
+50	-	00:02.000	
+
+00:02.040	--> 	00:02.080	
+51	-	00:02.040	
+
+00:02.080	--> 	00:02.120	
+52	-	00:02.080	
+
+00:02.120	--> 	00:02.160	
+53	-	00:02.120	
+
+00:02.160	--> 	00:02.200	
+54	-	00:02.160	
+
+00:02.200	--> 	00:02.240	
+55	-	00:02.200	
+
+00:02.240	--> 	00:02.280	
+56	-	00:02.240	
+
+00:02.280	--> 	00:02.320	
+57	-	00:02.280	
+
+00:02.320	--> 	00:02.360	
+58	-	00:02.320	
+
+00:02.360	--> 	00:02.400	
+59	-	00:02.360	
+
+00:02.400	--> 	00:02.440	
+60	-	00:02.400	
+
+00:02.440	--> 	00:02.480	
+61	-	00:02.440	
+
+00:02.480	--> 	00:02.520	
+62	-	00:02.480	
+
+00:02.520	--> 	00:02.560	
+63	-	00:02.520	
+
+00:02.560	--> 	00:02.600	
+64	-	00:02.560	
+
+00:02.600	--> 	00:02.640	
+65	-	00:02.600	
+
+00:02.640	--> 	00:02.680	
+66	-	00:02.640	
+
+00:02.680	--> 	00:02.720	
+67	-	00:02.680	
+
+00:02.720	--> 	00:02.760	
+68	-	00:02.720	
+
+00:02.760	--> 	00:02.800	
+69	-	00:02.760	
+
+00:02.800	--> 	00:02.840	
+70	-	00:02.800	
+
+00:02.840	--> 	00:02.880	
+71	-	00:02.840	
+
+00:02.880	--> 	00:02.920	
+72	-	00:02.880	
+
+00:02.920	--> 	00:02.960	
+73	-	00:02.920	
+
+00:02.960	--> 	00:03.000	
+74	-	00:02.960	
+
+00:03.000	--> 	00:03.040	
+75	-	00:03.000	
+
+00:03.040	--> 	00:03.080	
+76	-	00:03.040	
+
+00:03.080	--> 	00:03.120	
+77	-	00:03.080	
+
+00:03.120	--> 	00:03.160	
+78	-	00:03.120	
+
+00:03.160	--> 	00:03.200	
+79	-	00:03.160	
+
+00:03.200	--> 	00:03.240	
+80	-	00:03.200	
+
+00:03.240	--> 	00:03.280	
+81	-	00:03.240	
+
+00:03.280	--> 	00:03.320	
+82	-	00:03.280	
+
+00:03.320	--> 	00:03.360	
+83	-	00:03.320	
+
+00:03.360	--> 	00:03.400	
+84	-	00:03.360	
+
+00:03.400	--> 	00:03.440	
+85	-	00:03.400	
+
+00:03.440	--> 	00:03.480	
+86	-	00:03.440	
+
+00:03.480	--> 	00:03.520	
+87	-	00:03.480	
+
+00:03.520	--> 	00:03.560	
+88	-	00:03.520	
+
+00:03.560	--> 	00:03.600	
+89	-	00:03.560	
+
+00:03.600	--> 	00:03.640	
+90	-	00:03.600	
+
+00:03.640	--> 	00:03.680	
+91	-	00:03.640	
+
+00:03.680	--> 	00:03.720	
+92	-	00:03.680	
+
+00:03.720	--> 	00:03.760	
+93	-	00:03.720	
+
+00:03.760	--> 	00:03.800	
+94	-	00:03.760	
+
+00:03.800	--> 	00:03.840	
+95	-	00:03.800	
+
+00:03.840	--> 	00:03.880	
+96	-	00:03.840	
+
+00:03.880	--> 	00:03.920	
+97	-	00:03.880	
+
+00:03.920	--> 	00:03.960	
+98	-	00:03.920	
+
+00:03.960	--> 	00:04.000	
+99	-	00:03.960	
+
+00:04.000	--> 	00:04.040	
+100	-	00:04.000	
+
+00:04.040	--> 	00:04.080	
+101	-	00:04.040	
+
+00:04.080	--> 	00:04.120	
+102	-	00:04.080	
+
+00:04.120	--> 	00:04.160	
+103	-	00:04.120	
+
+00:04.160	--> 	00:04.200	
+104	-	00:04.160	
+
+00:04.200	--> 	00:04.240	
+105	-	00:04.200	
+
+00:04.240	--> 	00:04.280	
+106	-	00:04.240	
+
+00:04.280	--> 	00:04.320	
+107	-	00:04.280	
+
+00:04.320	--> 	00:04.360	
+108	-	00:04.320	
+
+00:04.360	--> 	00:04.400	
+109	-	00:04.360	
+
+00:04.400	--> 	00:04.440	
+110	-	00:04.400	
+
+00:04.440	--> 	00:04.480	
+111	-	00:04.440	
+
+00:04.480	--> 	00:04.520	
+112	-	00:04.480	
+
+00:04.520	--> 	00:04.560	
+113	-	00:04.520	
+
+00:04.560	--> 	00:04.600	
+114	-	00:04.560	
+
+00:04.600	--> 	00:04.640	
+115	-	00:04.600	
+
+00:04.640	--> 	00:04.680	
+116	-	00:04.640	
+
+00:04.680	--> 	00:04.720	
+117	-	00:04.680	
+
+00:04.720	--> 	00:04.760	
+118	-	00:04.720	
+
+00:04.760	--> 	00:04.800	
+119	-	00:04.760	
+
+00:04.800	--> 	00:04.840	
+120	-	00:04.800	
+
+00:04.840	--> 	00:04.880	
+121	-	00:04.840	
+
+00:04.880	--> 	00:04.920	
+122	-	00:04.880	
+
+00:04.920	--> 	00:04.960	
+123	-	00:04.920	
+
+00:04.960	--> 	00:05.000	
+124	-	00:04.960	
+
+00:05.000	--> 	00:05.040	
+125	-	00:05.000	
+
+00:05.040	--> 	00:05.080	
+126	-	00:05.040	
+
+00:05.080	--> 	00:05.120	
+127	-	00:05.080	
+
+00:05.120	--> 	00:05.160	
+128	-	00:05.120	
+
+00:05.160	--> 	00:05.200	
+129	-	00:05.160	
+
+00:05.200	--> 	00:05.240	
+130	-	00:05.200	
+
+00:05.240	--> 	00:05.280	
+131	-	00:05.240	
+
+00:05.280	--> 	00:05.320	
+132	-	00:05.280	
+
+00:05.320	--> 	00:05.360	
+133	-	00:05.320	
+
+00:05.360	--> 	00:05.400	
+134	-	00:05.360	
+
+00:05.400	--> 	00:05.440	
+135	-	00:05.400	
+
+00:05.440	--> 	00:05.480	
+136	-	00:05.440	
+
+00:05.480	--> 	00:05.520	
+137	-	00:05.480	
+
+00:05.520	--> 	00:05.560	
+138	-	00:05.520	
+
+00:05.560	--> 	00:05.600	
+139	-	00:05.560	
+
+00:05.600	--> 	00:05.640	
+140	-	00:05.600	
+
+00:05.640	--> 	00:05.680	
+141	-	00:05.640	
+
+00:05.680	--> 	00:05.720	
+142	-	00:05.680	
+
+00:05.720	--> 	00:05.760	
+143	-	00:05.720	
+
+00:05.760	--> 	00:05.800	
+144	-	00:05.760	
+
+00:05.800	--> 	00:05.840	
+145	-	00:05.800	
+
+00:05.840	--> 	00:05.880	
+146	-	00:05.840	
+
+00:05.880	--> 	00:05.920	
+147	-	00:05.880	
+
+00:05.920	--> 	00:05.960	
+148	-	00:05.920	
+
+00:05.960	--> 	00:06.000	
+149	-	00:05.960	
+
+00:06.000	--> 	00:06.040	
+150	-	00:06.000	
+
+00:06.040	--> 	00:06.080	
+151	-	00:06.040	
+
+00:06.080	--> 	00:06.120	
+152	-	00:06.080	
+
+00:06.120	--> 	00:06.160	
+153	-	00:06.120	
+
+00:06.160	--> 	00:06.200	
+154	-	00:06.160	
+
+00:06.200	--> 	00:06.240	
+155	-	00:06.200	
+
+00:06.240	--> 	00:06.280	
+156	-	00:06.240	
+
+00:06.280	--> 	00:06.320	
+157	-	00:06.280	
+
+00:06.320	--> 	00:06.360	
+158	-	00:06.320	
+
+00:06.360	--> 	00:06.400	
+159	-	00:06.360	
+
+00:06.400	--> 	00:06.440	
+160	-	00:06.400	
+
+00:06.440	--> 	00:06.480	
+161	-	00:06.440	
+
+00:06.480	--> 	00:06.520	
+162	-	00:06.480	
+
+00:06.520	--> 	00:06.560	
+163	-	00:06.520	
+
+00:06.560	--> 	00:06.600	
+164	-	00:06.560	
+
+00:06.600	--> 	00:06.640	
+165	-	00:06.600	
+
+00:06.640	--> 	00:06.680	
+166	-	00:06.640	
+
+00:06.680	--> 	00:06.720	
+167	-	00:06.680	
+
+00:06.720	--> 	00:06.760	
+168	-	00:06.720	
+
+00:06.760	--> 	00:06.800	
+169	-	00:06.760	
+
+00:06.800	--> 	00:06.840	
+170	-	00:06.800	
+
+00:06.840	--> 	00:06.880	
+171	-	00:06.840	
+
+00:06.880	--> 	00:06.920	
+172	-	00:06.880	
+
+00:06.920	--> 	00:06.960	
+173	-	00:06.920	
+
+00:06.960	--> 	00:07.000	
+174	-	00:06.960	
+
+00:07.000	--> 	00:07.040	
+175	-	00:07.000	
+
+00:07.040	--> 	00:07.080	
+176	-	00:07.040	
+
+00:07.080	--> 	00:07.120	
+177	-	00:07.080	
+
+00:07.120	--> 	00:07.160	
+178	-	00:07.120	
+
+00:07.160	--> 	00:07.200	
+179	-	00:07.160	
+
+00:07.200	--> 	00:07.240	
+180	-	00:07.200	
+
+00:07.240	--> 	00:07.280	
+181	-	00:07.240	
+
+00:07.280	--> 	00:07.320	
+182	-	00:07.280	
+
+00:07.320	--> 	00:07.360	
+183	-	00:07.320	
+
+00:07.360	--> 	00:07.400	
+184	-	00:07.360	
+
+00:07.400	--> 	00:07.440	
+185	-	00:07.400	
+
+00:07.440	--> 	00:07.480	
+186	-	00:07.440	
+
+00:07.480	--> 	00:07.520	
+187	-	00:07.480	
+
+00:07.520	--> 	00:07.560	
+188	-	00:07.520	
+
+00:07.560	--> 	00:07.600	
+189	-	00:07.560	
+
+00:07.600	--> 	00:07.640	
+190	-	00:07.600	
+
+00:07.640	--> 	00:07.680	
+191	-	00:07.640	
+
+00:07.680	--> 	00:07.720	
+192	-	00:07.680	
+
+00:07.720	--> 	00:07.760	
+193	-	00:07.720	
+
+00:07.760	--> 	00:07.800	
+194	-	00:07.760	
+
+00:07.800	--> 	00:07.840	
+195	-	00:07.800	
+
+00:07.840	--> 	00:07.880	
+196	-	00:07.840	
+
+00:07.880	--> 	00:07.920	
+197	-	00:07.880	
+
+00:07.920	--> 	00:07.960	
+198	-	00:07.920	
+
+00:07.960	--> 	00:08.000	
+199	-	00:07.960	
+
+00:08.000	--> 	00:08.040	
+200	-	00:08.000	
+
+00:08.040	--> 	00:08.080	
+201	-	00:08.040	
+
+00:08.080	--> 	00:08.120	
+202	-	00:08.080	
+
+00:08.120	--> 	00:08.160	
+203	-	00:08.120	
+
+00:08.160	--> 	00:08.200	
+204	-	00:08.160	
+
+00:08.200	--> 	00:08.240	
+205	-	00:08.200	
+
+00:08.240	--> 	00:08.280	
+206	-	00:08.240	
+
+00:08.280	--> 	00:08.320	
+207	-	00:08.280	
+
+00:08.320	--> 	00:08.360	
+208	-	00:08.320	
+
+00:08.360	--> 	00:08.400	
+209	-	00:08.360	
+
+00:08.400	--> 	00:08.440	
+210	-	00:08.400	
+
+00:08.440	--> 	00:08.480	
+211	-	00:08.440	
+
+00:08.480	--> 	00:08.520	
+212	-	00:08.480	
+
+00:08.520	--> 	00:08.560	
+213	-	00:08.520	
+
+00:08.560	--> 	00:08.600	
+214	-	00:08.560	
+
+00:08.600	--> 	00:08.640	
+215	-	00:08.600	
+
+00:08.640	--> 	00:08.680	
+216	-	00:08.640	
+
+00:08.680	--> 	00:08.720	
+217	-	00:08.680	
+
+00:08.720	--> 	00:08.760	
+218	-	00:08.720	
+
+00:08.760	--> 	00:08.800	
+219	-	00:08.760	
+
+00:08.800	--> 	00:08.840	
+220	-	00:08.800	
+
+00:08.840	--> 	00:08.880	
+221	-	00:08.840	
+
+00:08.880	--> 	00:08.920	
+222	-	00:08.880	
+
+00:08.920	--> 	00:08.960	
+223	-	00:08.920	
+
+00:08.960	--> 	00:09.000	
+224	-	00:08.960	
+
+00:09.000	--> 	00:09.040	
+225	-	00:09.000	
+
+00:09.040	--> 	00:09.080	
+226	-	00:09.040	
+
+00:09.080	--> 	00:09.120	
+227	-	00:09.080	
+
+00:09.120	--> 	00:09.160	
+228	-	00:09.120	
+
+00:09.160	--> 	00:09.200	
+229	-	00:09.160	
+
+00:09.200	--> 	00:09.240	
+230	-	00:09.200	
+
+00:09.240	--> 	00:09.280	
+231	-	00:09.240	
+
+00:09.280	--> 	00:09.320	
+232	-	00:09.280	
+
+00:09.320	--> 	00:09.360	
+233	-	00:09.320	
+
+00:09.360	--> 	00:09.400	
+234	-	00:09.360	
+
+00:09.400	--> 	00:09.440	
+235	-	00:09.400	
+
+00:09.440	--> 	00:09.480	
+236	-	00:09.440	
+
+00:09.480	--> 	00:09.520	
+237	-	00:09.480	
+
+00:09.520	--> 	00:09.560	
+238	-	00:09.520	
+
+00:09.560	--> 	00:09.600	
+239	-	00:09.560	
+
+00:09.600	--> 	00:09.640	
+240	-	00:09.600	
+
+00:09.640	--> 	00:09.680	
+241	-	00:09.640	
+
+00:09.680	--> 	00:09.720	
+242	-	00:09.680	
+
+00:09.720	--> 	00:09.760	
+243	-	00:09.720	
+
+00:09.760	--> 	00:09.800	
+244	-	00:09.760	
+
+00:09.800	--> 	00:09.840	
+245	-	00:09.800	
+
+00:09.840	--> 	00:09.880	
+246	-	00:09.840	
+
+00:09.880	--> 	00:09.920	
+247	-	00:09.880	
+
+00:09.920	--> 	00:09.960	
+248	-	00:09.920	
+
+00:09.960	--> 	00:10.000	
+249	-	00:09.960	
+
+00:10.000	--> 	00:10.040	
+250	-	00:10.000	
+
+00:10.040	--> 	00:10.080	
+251	-	00:10.040	
+
+00:10.080	--> 	00:10.120	
+252	-	00:10.080	
+
+00:10.120	--> 	00:10.160	
+253	-	00:10.120	
+
+00:10.160	--> 	00:10.200	
+254	-	00:10.160	
+
+00:10.200	--> 	00:10.240	
+255	-	00:10.200	
+
+00:10.240	--> 	00:10.280	
+256	-	00:10.240	
+
+00:10.280	--> 	00:10.320	
+257	-	00:10.280	
+
+00:10.320	--> 	00:10.360	
+258	-	00:10.320	
+
+00:10.360	--> 	00:10.400	
+259	-	00:10.360	
+
+00:10.400	--> 	00:10.440	
+260	-	00:10.400	
+
+00:10.440	--> 	00:10.480	
+261	-	00:10.440	
+
+00:10.480	--> 	00:10.520	
+262	-	00:10.480	
+
+00:10.520	--> 	00:10.560	
+263	-	00:10.520	
+
+00:10.560	--> 	00:10.600	
+264	-	00:10.560	
+
+00:10.600	--> 	00:10.640	
+265	-	00:10.600	
+
+00:10.640	--> 	00:10.680	
+266	-	00:10.640	
+
+00:10.680	--> 	00:10.720	
+267	-	00:10.680	
+
+00:10.720	--> 	00:10.760	
+268	-	00:10.720	
+
+00:10.760	--> 	00:10.800	
+269	-	00:10.760	
+
+00:10.800	--> 	00:10.840	
+270	-	00:10.800	
+
+00:10.840	--> 	00:10.880	
+271	-	00:10.840	
+
+00:10.880	--> 	00:10.920	
+272	-	00:10.880	
+
+00:10.920	--> 	00:10.960	
+273	-	00:10.920	
+
+00:10.960	--> 	00:11.000	
+274	-	00:10.960	
+
+00:11.000	--> 	00:11.040	
+275	-	00:11.000	
+
+00:11.040	--> 	00:11.080	
+276	-	00:11.040	
+
+00:11.080	--> 	00:11.120	
+277	-	00:11.080	
+
+00:11.120	--> 	00:11.160	
+278	-	00:11.120	
+
+00:11.160	--> 	00:11.200	
+279	-	00:11.160	
+
+00:11.200	--> 	00:11.240	
+280	-	00:11.200	
+
+00:11.240	--> 	00:11.280	
+281	-	00:11.240	
+
+00:11.280	--> 	00:11.320	
+282	-	00:11.280	
+
+00:11.320	--> 	00:11.360	
+283	-	00:11.320	
+
+00:11.360	--> 	00:11.400	
+284	-	00:11.360	
+
+00:11.400	--> 	00:11.440	
+285	-	00:11.400	
+
+00:11.440	--> 	00:11.480	
+286	-	00:11.440	
+
+00:11.480	--> 	00:11.520	
+287	-	00:11.480	
+
+00:11.520	--> 	00:11.560	
+288	-	00:11.520	
+
+00:11.560	--> 	00:11.600	
+289	-	00:11.560	
+
+00:11.600	--> 	00:11.640	
+290	-	00:11.600	
+
+00:11.640	--> 	00:11.680	
+291	-	00:11.640	
+
+00:11.680	--> 	00:11.720	
+292	-	00:11.680	
+
+00:11.720	--> 	00:11.760	
+293	-	00:11.720	
+
+00:11.760	--> 	00:11.800	
+294	-	00:11.760	
+
+00:11.800	--> 	00:11.840	
+295	-	00:11.800	
+
+00:11.840	--> 	00:11.880	
+296	-	00:11.840	
+
+00:11.880	--> 	00:11.920	
+297	-	00:11.880	
+
+00:11.920	--> 	00:11.960	
+298	-	00:11.920	
+
+00:11.960	--> 	00:12.000	
+299	-	00:11.960	
+
+00:12.000	--> 	00:12.040	
+300	-	00:12.000	
+
+00:12.040	--> 	00:12.080	
+301	-	00:12.040	
+
+00:12.080	--> 	00:12.120	
+302	-	00:12.080	
+
+00:12.120	--> 	00:12.160	
+303	-	00:12.120	
+
+00:12.160	--> 	00:12.200	
+304	-	00:12.160	
+
+00:12.200	--> 	00:12.240	
+305	-	00:12.200	
+
+00:12.240	--> 	00:12.280	
+306	-	00:12.240	
+
+00:12.280	--> 	00:12.320	
+307	-	00:12.280	
+
+00:12.320	--> 	00:12.360	
+308	-	00:12.320	
+
+00:12.360	--> 	00:12.400	
+309	-	00:12.360	
+
+00:12.400	--> 	00:12.440	
+310	-	00:12.400	
+
+00:12.440	--> 	00:12.480	
+311	-	00:12.440	
+
+00:12.480	--> 	00:12.520	
+312	-	00:12.480	
+
+00:12.520	--> 	00:12.560	
+313	-	00:12.520	
+
+00:12.560	--> 	00:12.600	
+314	-	00:12.560	
+
+00:12.600	--> 	00:12.640	
+315	-	00:12.600	
+
+00:12.640	--> 	00:12.680	
+316	-	00:12.640	
+
+00:12.680	--> 	00:12.720	
+317	-	00:12.680	
+
+00:12.720	--> 	00:12.760	
+318	-	00:12.720	
+
+00:12.760	--> 	00:12.800	
+319	-	00:12.760	
+
+00:12.800	--> 	00:12.840	
+320	-	00:12.800	
+
+00:12.840	--> 	00:12.880	
+321	-	00:12.840	
+
+00:12.880	--> 	00:12.920	
+322	-	00:12.880	
+
+00:12.920	--> 	00:12.960	
+323	-	00:12.920	
+
+00:12.960	--> 	00:13.000	
+324	-	00:12.960	
+
+00:13.000	--> 	00:13.040	
+325	-	00:13.000	
+
+00:13.040	--> 	00:13.080	
+326	-	00:13.040	
+
+00:13.080	--> 	00:13.120	
+327	-	00:13.080	
+
+00:13.120	--> 	00:13.160	
+328	-	00:13.120	
+
+00:13.160	--> 	00:13.200	
+329	-	00:13.160	
+
+00:13.200	--> 	00:13.240	
+330	-	00:13.200	
+
+00:13.240	--> 	00:13.280	
+331	-	00:13.240	
+
+00:13.280	--> 	00:13.320	
+332	-	00:13.280	
+
+00:13.320	--> 	00:13.360	
+333	-	00:13.320	
+
+00:13.360	--> 	00:13.400	
+334	-	00:13.360	
+
+00:13.400	--> 	00:13.440	
+335	-	00:13.400	
+
+00:13.440	--> 	00:13.480	
+336	-	00:13.440	
+
+00:13.480	--> 	00:13.520	
+337	-	00:13.480	
+
+00:13.520	--> 	00:13.560	
+338	-	00:13.520	
+
+00:13.560	--> 	00:13.600	
+339	-	00:13.560	
+
+00:13.600	--> 	00:13.640	
+340	-	00:13.600	
+
+00:13.640	--> 	00:13.680	
+341	-	00:13.640	
+
+00:13.680	--> 	00:13.720	
+342	-	00:13.680	
+
+00:13.720	--> 	00:13.760	
+343	-	00:13.720	
+
+00:13.760	--> 	00:13.800	
+344	-	00:13.760	
+
+00:13.800	--> 	00:13.840	
+345	-	00:13.800	
+
+00:13.840	--> 	00:13.880	
+346	-	00:13.840	
+
+00:13.880	--> 	00:13.920	
+347	-	00:13.880	
+
+00:13.920	--> 	00:13.960	
+348	-	00:13.920	
+
+00:13.960	--> 	00:14.000	
+349	-	00:13.960	
+
+00:14.000	--> 	00:14.040	
+350	-	00:14.000	
+
+00:14.040	--> 	00:14.080	
+351	-	00:14.040	
+
+00:14.080	--> 	00:14.120	
+352	-	00:14.080	
+
+00:14.120	--> 	00:14.160	
+353	-	00:14.120	
+
+00:14.160	--> 	00:14.200	
+354	-	00:14.160	
+
+00:14.200	--> 	00:14.240	
+355	-	00:14.200	
+
+00:14.240	--> 	00:14.280	
+356	-	00:14.240	
+
+00:14.280	--> 	00:14.320	
+357	-	00:14.280	
+
+00:14.320	--> 	00:14.360	
+358	-	00:14.320	
+
+00:14.360	--> 	00:14.400	
+359	-	00:14.360	
+
+00:14.400	--> 	00:14.440	
+360	-	00:14.400	
+
+00:14.440	--> 	00:14.480	
+361	-	00:14.440	
+
+00:14.480	--> 	00:14.520	
+362	-	00:14.480	
+
+00:14.520	--> 	00:14.560	
+363	-	00:14.520	
+
+00:14.560	--> 	00:14.600	
+364	-	00:14.560	
+
+00:14.600	--> 	00:14.640	
+365	-	00:14.600	
+
+00:14.640	--> 	00:14.680	
+366	-	00:14.640	
+
+00:14.680	--> 	00:14.720	
+367	-	00:14.680	
+
+00:14.720	--> 	00:14.760	
+368	-	00:14.720	
+
+00:14.760	--> 	00:14.800	
+369	-	00:14.760	
+
+00:14.800	--> 	00:14.840	
+370	-	00:14.800	
+
+00:14.840	--> 	00:14.880	
+371	-	00:14.840	
+
+00:14.880	--> 	00:14.920	
+372	-	00:14.880	
+
+00:14.920	--> 	00:14.960	
+373	-	00:14.920	
+
+00:14.960	--> 	00:15.000	
+374	-	00:14.960	
+
+00:15.000	--> 	00:15.040	
+375	-	00:15.000	
+
+00:15.040	--> 	00:15.080	
+376	-	00:15.040	
+
+00:15.080	--> 	00:15.120	
+377	-	00:15.080	
+
+00:15.120	--> 	00:15.160	
+378	-	00:15.120	
+
+00:15.160	--> 	00:15.200	
+379	-	00:15.160	
+
+00:15.200	--> 	00:15.240	
+380	-	00:15.200	
+
+00:15.240	--> 	00:15.280	
+381	-	00:15.240	
+
+00:15.280	--> 	00:15.320	
+382	-	00:15.280	
+
+00:15.320	--> 	00:15.360	
+383	-	00:15.320	
+
+00:15.360	--> 	00:15.400	
+384	-	00:15.360	
+
+00:15.400	--> 	00:15.440	
+385	-	00:15.400	
+
+00:15.440	--> 	00:15.480	
+386	-	00:15.440	
+
+00:15.480	--> 	00:15.520	
+387	-	00:15.480	
+
+00:15.520	--> 	00:15.560	
+388	-	00:15.520	
+
+00:15.560	--> 	00:15.600	
+389	-	00:15.560	
+
+00:15.600	--> 	00:15.640	
+390	-	00:15.600	
+
+00:15.640	--> 	00:15.680	
+391	-	00:15.640	
+
+00:15.680	--> 	00:15.720	
+392	-	00:15.680	
+
+00:15.720	--> 	00:15.760	
+393	-	00:15.720	
+
+00:15.760	--> 	00:15.800	
+394	-	00:15.760	
+
+00:15.800	--> 	00:15.840	
+395	-	00:15.800	
+
+00:15.840	--> 	00:15.880	
+396	-	00:15.840	
+
+00:15.880	--> 	00:15.920	
+397	-	00:15.880	
+
+00:15.920	--> 	00:15.960	
+398	-	00:15.920	
+
+00:15.960	--> 	00:16.000	
+399	-	00:15.960	
+
+00:16.000	--> 	00:16.040	
+400	-	00:16.000	
+
+00:16.040	--> 	00:16.080	
+401	-	00:16.040	
+
+00:16.080	--> 	00:16.120	
+402	-	00:16.080	
+
+00:16.120	--> 	00:16.160	
+403	-	00:16.120	
+
+00:16.160	--> 	00:16.200	
+404	-	00:16.160	
+
+00:16.200	--> 	00:16.240	
+405	-	00:16.200	
+
+00:16.240	--> 	00:16.280	
+406	-	00:16.240	
+
+00:16.280	--> 	00:16.320	
+407	-	00:16.280	
+
+00:16.320	--> 	00:16.360	
+408	-	00:16.320	
+
+00:16.360	--> 	00:16.400	
+409	-	00:16.360	
+
+00:16.400	--> 	00:16.440	
+410	-	00:16.400	
+
+00:16.440	--> 	00:16.480	
+411	-	00:16.440	
+
+00:16.480	--> 	00:16.520	
+412	-	00:16.480	
+
+00:16.520	--> 	00:16.560	
+413	-	00:16.520	
+
+00:16.560	--> 	00:16.600	
+414	-	00:16.560	
+
+00:16.600	--> 	00:16.640	
+415	-	00:16.600	
+
+00:16.640	--> 	00:16.680	
+416	-	00:16.640	
+
+00:16.680	--> 	00:16.720	
+417	-	00:16.680	
+
+00:16.720	--> 	00:16.760	
+418	-	00:16.720	
+
+00:16.760	--> 	00:16.800	
+419	-	00:16.760	
+
+00:16.800	--> 	00:16.840	
+420	-	00:16.800	
+
+00:16.840	--> 	00:16.880	
+421	-	00:16.840	
+
+00:16.880	--> 	00:16.920	
+422	-	00:16.880	
+
+00:16.920	--> 	00:16.960	
+423	-	00:16.920	
+
+00:16.960	--> 	00:17.000	
+424	-	00:16.960	
+
+00:17.000	--> 	00:17.040	
+425	-	00:17.000	
+
+00:17.040	--> 	00:17.080	
+426	-	00:17.040	
+
+00:17.080	--> 	00:17.120	
+427	-	00:17.080	
+
+00:17.120	--> 	00:17.160	
+428	-	00:17.120	
+
+00:17.160	--> 	00:17.200	
+429	-	00:17.160	
+
+00:17.200	--> 	00:17.240	
+430	-	00:17.200	
+
+00:17.240	--> 	00:17.280	
+431	-	00:17.240	
+
+00:17.280	--> 	00:17.320	
+432	-	00:17.280	
+
+00:17.320	--> 	00:17.360	
+433	-	00:17.320	
+
+00:17.360	--> 	00:17.400	
+434	-	00:17.360	
+
+00:17.400	--> 	00:17.440	
+435	-	00:17.400	
+
+00:17.440	--> 	00:17.480	
+436	-	00:17.440	
+
+00:17.480	--> 	00:17.520	
+437	-	00:17.480	
+
+00:17.520	--> 	00:17.560	
+438	-	00:17.520	
+
+00:17.560	--> 	00:17.600	
+439	-	00:17.560	
+
+00:17.600	--> 	00:17.640	
+440	-	00:17.600	
+
+00:17.640	--> 	00:17.680	
+441	-	00:17.640	
+
+00:17.680	--> 	00:17.720	
+442	-	00:17.680	
+
+00:17.720	--> 	00:17.760	
+443	-	00:17.720	
+
+00:17.760	--> 	00:17.800	
+444	-	00:17.760	
+
+00:17.800	--> 	00:17.840	
+445	-	00:17.800	
+
+00:17.840	--> 	00:17.880	
+446	-	00:17.840	
+
+00:17.880	--> 	00:17.920	
+447	-	00:17.880	
+
+00:17.920	--> 	00:17.960	
+448	-	00:17.920	
+
+00:17.960	--> 	00:18.000	
+449	-	00:17.960	
+
+00:18.000	--> 	00:18.040	
+450	-	00:18.000	
+
+00:18.040	--> 	00:18.080	
+451	-	00:18.040	
+
+00:18.080	--> 	00:18.120	
+452	-	00:18.080	
+
+00:18.120	--> 	00:18.160	
+453	-	00:18.120	
+
+00:18.160	--> 	00:18.200	
+454	-	00:18.160	
+
+00:18.200	--> 	00:18.240	
+455	-	00:18.200	
+
+00:18.240	--> 	00:18.280	
+456	-	00:18.240	
+
+00:18.280	--> 	00:18.320	
+457	-	00:18.280	
+
+00:18.320	--> 	00:18.360	
+458	-	00:18.320	
+
+00:18.360	--> 	00:18.400	
+459	-	00:18.360	
+
+00:18.400	--> 	00:18.440	
+460	-	00:18.400	
+
+00:18.440	--> 	00:18.480	
+461	-	00:18.440	
+
+00:18.480	--> 	00:18.520	
+462	-	00:18.480	
+
+00:18.520	--> 	00:18.560	
+463	-	00:18.520	
+
+00:18.560	--> 	00:18.600	
+464	-	00:18.560	
+
+00:18.600	--> 	00:18.640	
+465	-	00:18.600	
+
+00:18.640	--> 	00:18.680	
+466	-	00:18.640	
+
+00:18.680	--> 	00:18.720	
+467	-	00:18.680	
+
+00:18.720	--> 	00:18.760	
+468	-	00:18.720	
+
+00:18.760	--> 	00:18.800	
+469	-	00:18.760	
+
+00:18.800	--> 	00:18.840	
+470	-	00:18.800	
+
+00:18.840	--> 	00:18.880	
+471	-	00:18.840	
+
+00:18.880	--> 	00:18.920	
+472	-	00:18.880	
+
+00:18.920	--> 	00:18.960	
+473	-	00:18.920	
+
+00:18.960	--> 	00:19.000	
+474	-	00:18.960	
+
+00:19.000	--> 	00:19.040	
+475	-	00:19.000	
+
+00:19.040	--> 	00:19.080	
+476	-	00:19.040	
+
+00:19.080	--> 	00:19.120	
+477	-	00:19.080	
+
+00:19.120	--> 	00:19.160	
+478	-	00:19.120	
+
+00:19.160	--> 	00:19.200	
+479	-	00:19.160	
+
+00:19.200	--> 	00:19.240	
+480	-	00:19.200	
+
+00:19.240	--> 	00:19.280	
+481	-	00:19.240	
+
+00:19.280	--> 	00:19.320	
+482	-	00:19.280	
+
+00:19.320	--> 	00:19.360	
+483	-	00:19.320	
+
+00:19.360	--> 	00:19.400	
+484	-	00:19.360	
+
+00:19.400	--> 	00:19.440	
+485	-	00:19.400	
+
+00:19.440	--> 	00:19.480	
+486	-	00:19.440	
+
+00:19.480	--> 	00:19.520	
+487	-	00:19.480	
+
+00:19.520	--> 	00:19.560	
+488	-	00:19.520	
+
+00:19.560	--> 	00:19.600	
+489	-	00:19.560	
+
+00:19.600	--> 	00:19.640	
+490	-	00:19.600	
+
+00:19.640	--> 	00:19.680	
+491	-	00:19.640	
+
+00:19.680	--> 	00:19.720	
+492	-	00:19.680	
+
+00:19.720	--> 	00:19.760	
+493	-	00:19.720	
+
+00:19.760	--> 	00:19.800	
+494	-	00:19.760	
+
+00:19.800	--> 	00:19.840	
+495	-	00:19.800	
+
+00:19.840	--> 	00:19.880	
+496	-	00:19.840	
+
+00:19.880	--> 	00:19.920	
+497	-	00:19.880	
+
+00:19.920	--> 	00:19.960	
+498	-	00:19.920	
+
+00:19.960	--> 	00:20.000	
+499	-	00:19.960	
+
+00:20.000	--> 	00:20.040	
+500	-	00:20.000	
+
+00:20.040	--> 	00:20.080	
+501	-	00:20.040	
+
+00:20.080	--> 	00:20.120	
+502	-	00:20.080	
+
+00:20.120	--> 	00:20.160	
+503	-	00:20.120	
+
+00:20.160	--> 	00:20.200	
+504	-	00:20.160	
+
+00:20.200	--> 	00:20.240	
+505	-	00:20.200	
+
+00:20.240	--> 	00:20.280	
+506	-	00:20.240	
+
+00:20.280	--> 	00:20.320	
+507	-	00:20.280	
+
+00:20.320	--> 	00:20.360	
+508	-	00:20.320	
+
+00:20.360	--> 	00:20.400	
+509	-	00:20.360	
+
+00:20.400	--> 	00:20.440	
+510	-	00:20.400	
+
+00:20.440	--> 	00:20.480	
+511	-	00:20.440	
+
+00:20.480	--> 	00:20.520	
+512	-	00:20.480	
+
+00:20.520	--> 	00:20.560	
+513	-	00:20.520	
+
+00:20.560	--> 	00:20.600	
+514	-	00:20.560	
+
+00:20.600	--> 	00:20.640	
+515	-	00:20.600	
+
+00:20.640	--> 	00:20.680	
+516	-	00:20.640	
+
+00:20.680	--> 	00:20.720	
+517	-	00:20.680	
+
+00:20.720	--> 	00:20.760	
+518	-	00:20.720	
+
+00:20.760	--> 	00:20.800	
+519	-	00:20.760	
+
+00:20.800	--> 	00:20.840	
+520	-	00:20.800	
+
+00:20.840	--> 	00:20.880	
+521	-	00:20.840	
+
+00:20.880	--> 	00:20.920	
+522	-	00:20.880	
+
+00:20.920	--> 	00:20.960	
+523	-	00:20.920	
+
+00:20.960	--> 	00:21.000	
+524	-	00:20.960	
+
+00:21.000	--> 	00:21.040	
+525	-	00:21.000	
+
+00:21.040	--> 	00:21.080	
+526	-	00:21.040	
+
+00:21.080	--> 	00:21.120	
+527	-	00:21.080	
+
+00:21.120	--> 	00:21.160	
+528	-	00:21.120	
+
+00:21.160	--> 	00:21.200	
+529	-	00:21.160	
+
+00:21.200	--> 	00:21.240	
+530	-	00:21.200	
+
+00:21.240	--> 	00:21.280	
+531	-	00:21.240	
+
+00:21.280	--> 	00:21.320	
+532	-	00:21.280	
+
+00:21.320	--> 	00:21.360	
+533	-	00:21.320	
+
+00:21.360	--> 	00:21.400	
+534	-	00:21.360	
+
+00:21.400	--> 	00:21.440	
+535	-	00:21.400	
+
+00:21.440	--> 	00:21.480	
+536	-	00:21.440	
+
+00:21.480	--> 	00:21.520	
+537	-	00:21.480	
+
+00:21.520	--> 	00:21.560	
+538	-	00:21.520	
+
+00:21.560	--> 	00:21.600	
+539	-	00:21.560	
+
+00:21.600	--> 	00:21.640	
+540	-	00:21.600	
+
+00:21.640	--> 	00:21.680	
+541	-	00:21.640	
+
+00:21.680	--> 	00:21.720	
+542	-	00:21.680	
+
+00:21.720	--> 	00:21.760	
+543	-	00:21.720	
+
+00:21.760	--> 	00:21.800	
+544	-	00:21.760	
+
+00:21.800	--> 	00:21.840	
+545	-	00:21.800	
+
+00:21.840	--> 	00:21.880	
+546	-	00:21.840	
+
+00:21.880	--> 	00:21.920	
+547	-	00:21.880	
+
+00:21.920	--> 	00:21.960	
+548	-	00:21.920	
+
+00:21.960	--> 	00:22.000	
+549	-	00:21.960	
+
+00:22.000	--> 	00:22.040	
+550	-	00:22.000	
+
+00:22.040	--> 	00:22.080	
+551	-	00:22.040	
+
+00:22.080	--> 	00:22.120	
+552	-	00:22.080	
+
+00:22.120	--> 	00:22.160	
+553	-	00:22.120	
+
+00:22.160	--> 	00:22.200	
+554	-	00:22.160	
+
+00:22.200	--> 	00:22.240	
+555	-	00:22.200	
+
+00:22.240	--> 	00:22.280	
+556	-	00:22.240	
+
+00:22.280	--> 	00:22.320	
+557	-	00:22.280	
+
+00:22.320	--> 	00:22.360	
+558	-	00:22.320	
+
+00:22.360	--> 	00:22.400	
+559	-	00:22.360	
+
+00:22.400	--> 	00:22.440	
+560	-	00:22.400	
+
+00:22.440	--> 	00:22.480	
+561	-	00:22.440	
+
+00:22.480	--> 	00:22.520	
+562	-	00:22.480	
+
+00:22.520	--> 	00:22.560	
+563	-	00:22.520	
+
+00:22.560	--> 	00:22.600	
+564	-	00:22.560	
+
+00:22.600	--> 	00:22.640	
+565	-	00:22.600	
+
+00:22.640	--> 	00:22.680	
+566	-	00:22.640	
+
+00:22.680	--> 	00:22.720	
+567	-	00:22.680	
+
+00:22.720	--> 	00:22.760	
+568	-	00:22.720	
+
+00:22.760	--> 	00:22.800	
+569	-	00:22.760	
+
+00:22.800	--> 	00:22.840	
+570	-	00:22.800	
+
+00:22.840	--> 	00:22.880	
+571	-	00:22.840	
+
+00:22.880	--> 	00:22.920	
+572	-	00:22.880	
+
+00:22.920	--> 	00:22.960	
+573	-	00:22.920	
+
+00:22.960	--> 	00:23.000	
+574	-	00:22.960	
+
+00:23.000	--> 	00:23.040	
+575	-	00:23.000	
+
+00:23.040	--> 	00:23.080	
+576	-	00:23.040	
+
+00:23.080	--> 	00:23.120	
+577	-	00:23.080	
+
+00:23.120	--> 	00:23.160	
+578	-	00:23.120	
+
+00:23.160	--> 	00:23.200	
+579	-	00:23.160	
+
+00:23.200	--> 	00:23.240	
+580	-	00:23.200	
+
+00:23.240	--> 	00:23.280	
+581	-	00:23.240	
+
+00:23.280	--> 	00:23.320	
+582	-	00:23.280	
+
+00:23.320	--> 	00:23.360	
+583	-	00:23.320	
+
+00:23.360	--> 	00:23.400	
+584	-	00:23.360	
+
+00:23.400	--> 	00:23.440	
+585	-	00:23.400	
+
+00:23.440	--> 	00:23.480	
+586	-	00:23.440	
+
+00:23.480	--> 	00:23.520	
+587	-	00:23.480	
+
+00:23.520	--> 	00:23.560	
+588	-	00:23.520	
+
+00:23.560	--> 	00:23.600	
+589	-	00:23.560	
+
+00:23.600	--> 	00:23.640	
+590	-	00:23.600	
+
+00:23.640	--> 	00:23.680	
+591	-	00:23.640	
+
+00:23.680	--> 	00:23.720	
+592	-	00:23.680	
+
+00:23.720	--> 	00:23.760	
+593	-	00:23.720	
+
+00:23.760	--> 	00:23.800	
+594	-	00:23.760	
+
+00:23.800	--> 	00:23.840	
+595	-	00:23.800	
+
+00:23.840	--> 	00:23.880	
+596	-	00:23.840	
+
+00:23.880	--> 	00:23.920	
+597	-	00:23.880	
+
+00:23.920	--> 	00:23.960	
+598	-	00:23.920	
+
+00:23.960	--> 	00:24.000	
+599	-	00:23.960	
+
+00:24.000	--> 	00:24.040	
+600	-	00:24.000	
+
+00:24.040	--> 	00:24.080	
+601	-	00:24.040	
+
+00:24.080	--> 	00:24.120	
+602	-	00:24.080	
+
+00:24.120	--> 	00:24.160	
+603	-	00:24.120	
+
+00:24.160	--> 	00:24.200	
+604	-	00:24.160	
+
+00:24.200	--> 	00:24.240	
+605	-	00:24.200	
+
+00:24.240	--> 	00:24.280	
+606	-	00:24.240	
+
+00:24.280	--> 	00:24.320	
+607	-	00:24.280	
+
+00:24.320	--> 	00:24.360	
+608	-	00:24.320	
+
+00:24.360	--> 	00:24.400	
+609	-	00:24.360	
+
+00:24.400	--> 	00:24.440	
+610	-	00:24.400	
+
+00:24.440	--> 	00:24.480	
+611	-	00:24.440	
+
+00:24.480	--> 	00:24.520	
+612	-	00:24.480	
+
+00:24.520	--> 	00:24.560	
+613	-	00:24.520	
+
+00:24.560	--> 	00:24.600	
+614	-	00:24.560	
+
+00:24.600	--> 	00:24.640	
+615	-	00:24.600	
+
+00:24.640	--> 	00:24.680	
+616	-	00:24.640	
+
+00:24.680	--> 	00:24.720	
+617	-	00:24.680	
+
+00:24.720	--> 	00:24.760	
+618	-	00:24.720	
+
+00:24.760	--> 	00:24.800	
+619	-	00:24.760	
+
+00:24.800	--> 	00:24.840	
+620	-	00:24.800	
+
+00:24.840	--> 	00:24.880	
+621	-	00:24.840	
+
+00:24.880	--> 	00:24.920	
+622	-	00:24.880	
+
+00:24.920	--> 	00:24.960	
+623	-	00:24.920	
+
+00:24.960	--> 	00:25.000	
+624	-	00:24.960	
+
+00:25.000	--> 	00:25.040	
+625	-	00:25.000	
+
+00:25.040	--> 	00:25.080	
+626	-	00:25.040	
+
+00:25.080	--> 	00:25.120	
+627	-	00:25.080	
+
+00:25.120	--> 	00:25.160	
+628	-	00:25.120	
+
+00:25.160	--> 	00:25.200	
+629	-	00:25.160	
+
+00:25.200	--> 	00:25.240	
+630	-	00:25.200	
+
+00:25.240	--> 	00:25.280	
+631	-	00:25.240	
+
+00:25.280	--> 	00:25.320	
+632	-	00:25.280	
+
+00:25.320	--> 	00:25.360	
+633	-	00:25.320	
+
+00:25.360	--> 	00:25.400	
+634	-	00:25.360	
+
+00:25.400	--> 	00:25.440	
+635	-	00:25.400	
+
+00:25.440	--> 	00:25.480	
+636	-	00:25.440	
+
+00:25.480	--> 	00:25.520	
+637	-	00:25.480	
+
+00:25.520	--> 	00:25.560	
+638	-	00:25.520	
+
+00:25.560	--> 	00:25.600	
+639	-	00:25.560	
+
+00:25.600	--> 	00:25.640	
+640	-	00:25.600	
+
+00:25.640	--> 	00:25.680	
+641	-	00:25.640	
+
+00:25.680	--> 	00:25.720	
+642	-	00:25.680	
+
+00:25.720	--> 	00:25.760	
+643	-	00:25.720	
+
+00:25.760	--> 	00:25.800	
+644	-	00:25.760	
+
+00:25.800	--> 	00:25.840	
+645	-	00:25.800	
+
+00:25.840	--> 	00:25.880	
+646	-	00:25.840	
+
+00:25.880	--> 	00:25.920	
+647	-	00:25.880	
+
+00:25.920	--> 	00:25.960	
+648	-	00:25.920	
+
+00:25.960	--> 	00:26.000	
+649	-	00:25.960	
+
+00:26.000	--> 	00:26.040	
+650	-	00:26.000	
+
+00:26.040	--> 	00:26.080	
+651	-	00:26.040	
+
+00:26.080	--> 	00:26.120	
+652	-	00:26.080	
+
+00:26.120	--> 	00:26.160	
+653	-	00:26.120	
+
+00:26.160	--> 	00:26.200	
+654	-	00:26.160	
+
+00:26.200	--> 	00:26.240	
+655	-	00:26.200	
+
+00:26.240	--> 	00:26.280	
+656	-	00:26.240	
+
+00:26.280	--> 	00:26.320	
+657	-	00:26.280	
+
+00:26.320	--> 	00:26.360	
+658	-	00:26.320	
+
+00:26.360	--> 	00:26.400	
+659	-	00:26.360	
+
+00:26.400	--> 	00:26.440	
+660	-	00:26.400	
+
+00:26.440	--> 	00:26.480	
+661	-	00:26.440	
+
+00:26.480	--> 	00:26.520	
+662	-	00:26.480	
+
+00:26.520	--> 	00:26.560	
+663	-	00:26.520	
+
+00:26.560	--> 	00:26.600	
+664	-	00:26.560	
+
+00:26.600	--> 	00:26.640	
+665	-	00:26.600	
+
+00:26.640	--> 	00:26.680	
+666	-	00:26.640	
+
+00:26.680	--> 	00:26.720	
+667	-	00:26.680	
+
+00:26.720	--> 	00:26.760	
+668	-	00:26.720	
+
+00:26.760	--> 	00:26.800	
+669	-	00:26.760	
+
+00:26.800	--> 	00:26.840	
+670	-	00:26.800	
+
+00:26.840	--> 	00:26.880	
+671	-	00:26.840	
+
+00:26.880	--> 	00:26.920	
+672	-	00:26.880	
+
+00:26.920	--> 	00:26.960	
+673	-	00:26.920	
+
+00:26.960	--> 	00:27.000	
+674	-	00:26.960	
+
+00:27.000	--> 	00:27.040	
+675	-	00:27.000	
+
+00:27.040	--> 	00:27.080	
+676	-	00:27.040	
+
+00:27.080	--> 	00:27.120	
+677	-	00:27.080	
+
+00:27.120	--> 	00:27.160	
+678	-	00:27.120	
+
+00:27.160	--> 	00:27.200	
+679	-	00:27.160	
+
+00:27.200	--> 	00:27.240	
+680	-	00:27.200	
+
+00:27.240	--> 	00:27.280	
+681	-	00:27.240	
+
+00:27.280	--> 	00:27.320	
+682	-	00:27.280	
+
+00:27.320	--> 	00:27.360	
+683	-	00:27.320	
+
+00:27.360	--> 	00:27.400	
+684	-	00:27.360	
+
+00:27.400	--> 	00:27.440	
+685	-	00:27.400	
+
+00:27.440	--> 	00:27.480	
+686	-	00:27.440	
+
+00:27.480	--> 	00:27.520	
+687	-	00:27.480	
+
+00:27.520	--> 	00:27.560	
+688	-	00:27.520	
+
+00:27.560	--> 	00:27.600	
+689	-	00:27.560	
+
+00:27.600	--> 	00:27.640	
+690	-	00:27.600	
+
+00:27.640	--> 	00:27.680	
+691	-	00:27.640	
+
+00:27.680	--> 	00:27.720	
+692	-	00:27.680	
+
+00:27.720	--> 	00:27.760	
+693	-	00:27.720	
+
+00:27.760	--> 	00:27.800	
+694	-	00:27.760	
+
+00:27.800	--> 	00:27.840	
+695	-	00:27.800	
+
+00:27.840	--> 	00:27.880	
+696	-	00:27.840	
+
+00:27.880	--> 	00:27.920	
+697	-	00:27.880	
+
+00:27.920	--> 	00:27.960	
+698	-	00:27.920	
+
+00:27.960	--> 	00:28.000	
+699	-	00:27.960	
+
+00:28.000	--> 	00:28.040	
+700	-	00:28.000	
+
+00:28.040	--> 	00:28.080	
+701	-	00:28.040	
+
+00:28.080	--> 	00:28.120	
+702	-	00:28.080	
+
+00:28.120	--> 	00:28.160	
+703	-	00:28.120	
+
+00:28.160	--> 	00:28.200	
+704	-	00:28.160	
+
+00:28.200	--> 	00:28.240	
+705	-	00:28.200	
+
+00:28.240	--> 	00:28.280	
+706	-	00:28.240	
+
+00:28.280	--> 	00:28.320	
+707	-	00:28.280	
+
+00:28.320	--> 	00:28.360	
+708	-	00:28.320	
+
+00:28.360	--> 	00:28.400	
+709	-	00:28.360	
+
+00:28.400	--> 	00:28.440	
+710	-	00:28.400	
+
+00:28.440	--> 	00:28.480	
+711	-	00:28.440	
+
+00:28.480	--> 	00:28.520	
+712	-	00:28.480	
+
+00:28.520	--> 	00:28.560	
+713	-	00:28.520	
+
+00:28.560	--> 	00:28.600	
+714	-	00:28.560	
+
+00:28.600	--> 	00:28.640	
+715	-	00:28.600	
+
+00:28.640	--> 	00:28.680	
+716	-	00:28.640	
+
+00:28.680	--> 	00:28.720	
+717	-	00:28.680	
+
+00:28.720	--> 	00:28.760	
+718	-	00:28.720	
+
+00:28.760	--> 	00:28.800	
+719	-	00:28.760	
+
+00:28.800	--> 	00:28.840	
+720	-	00:28.800	
+
+00:28.840	--> 	00:28.880	
+721	-	00:28.840	
+
+00:28.880	--> 	00:28.920	
+722	-	00:28.880	
+
+00:28.920	--> 	00:28.960	
+723	-	00:28.920	
+
+00:28.960	--> 	00:29.000	
+724	-	00:28.960	
+
+00:29.000	--> 	00:29.040	
+725	-	00:29.000	
+
+00:29.040	--> 	00:29.080	
+726	-	00:29.040	
+
+00:29.080	--> 	00:29.120	
+727	-	00:29.080	
+
+00:29.120	--> 	00:29.160	
+728	-	00:29.120	
+
+00:29.160	--> 	00:29.200	
+729	-	00:29.160	
+
+00:29.200	--> 	00:29.240	
+730	-	00:29.200	
+
+00:29.240	--> 	00:29.280	
+731	-	00:29.240	
+
+00:29.280	--> 	00:29.320	
+732	-	00:29.280	
+
+00:29.320	--> 	00:29.360	
+733	-	00:29.320	
+
+00:29.360	--> 	00:29.400	
+734	-	00:29.360	
+
+00:29.400	--> 	00:29.440	
+735	-	00:29.400	
+
+00:29.440	--> 	00:29.480	
+736	-	00:29.440	
+
+00:29.480	--> 	00:29.520	
+737	-	00:29.480	
+
+00:29.520	--> 	00:29.560	
+738	-	00:29.520	
+
+00:29.560	--> 	00:29.600	
+739	-	00:29.560	
+
+00:29.600	--> 	00:29.640	
+740	-	00:29.600	
+
+00:29.640	--> 	00:29.680	
+741	-	00:29.640	
+
+00:29.680	--> 	00:29.720	
+742	-	00:29.680	
+
+00:29.720	--> 	00:29.760	
+743	-	00:29.720	
+
+00:29.760	--> 	00:29.800	
+744	-	00:29.760	
+
+00:29.800	--> 	00:29.840	
+745	-	00:29.800	
+
+00:29.840	--> 	00:29.880	
+746	-	00:29.840	
+
+00:29.880	--> 	00:29.920	
+747	-	00:29.880	
+
+00:29.920	--> 	00:29.960	
+748	-	00:29.920	
+
+00:29.960	--> 	00:30.000	
+749	-	00:29.960	
+
+00:30.000	--> 	00:30.040	
+750	-	00:30.000	
+
+00:30.040	--> 	00:30.080	
+751	-	00:30.040	
+
+00:30.080	--> 	00:30.120	
+752	-	00:30.080	
+
+00:30.120	--> 	00:30.160	
+753	-	00:30.120	
+
+00:30.160	--> 	00:30.200	
+754	-	00:30.160	
+
+00:30.200	--> 	00:30.240	
+755	-	00:30.200	
+
+00:30.240	--> 	00:30.280	
+756	-	00:30.240	
+
+00:30.280	--> 	00:30.320	
+757	-	00:30.280	
+
+00:30.320	--> 	00:30.360	
+758	-	00:30.320	
+
+00:30.360	--> 	00:30.400	
+759	-	00:30.360	
+
+00:30.400	--> 	00:30.440	
+760	-	00:30.400	
+
+00:30.440	--> 	00:30.480	
+761	-	00:30.440	
+
+00:30.480	--> 	00:30.520	
+762	-	00:30.480	
+
+00:30.520	--> 	00:30.560	
+763	-	00:30.520	
+
+00:30.560	--> 	00:30.600	
+764	-	00:30.560	
+
+00:30.600	--> 	00:30.640	
+765	-	00:30.600	
+
+00:30.640	--> 	00:30.680	
+766	-	00:30.640	
+
+00:30.680	--> 	00:30.720	
+767	-	00:30.680	
+
+00:30.720	--> 	00:30.760	
+768	-	00:30.720	
+
+00:30.760	--> 	00:30.800	
+769	-	00:30.760	
+
+00:30.800	--> 	00:30.840	
+770	-	00:30.800	
+
+00:30.840	--> 	00:30.880	
+771	-	00:30.840	
+
+00:30.880	--> 	00:30.920	
+772	-	00:30.880	
+
+00:30.920	--> 	00:30.960	
+773	-	00:30.920	
+
+00:30.960	--> 	00:31.000	
+774	-	00:30.960	
+
+00:31.000	--> 	00:31.040	
+775	-	00:31.000	
+
+00:31.040	--> 	00:31.080	
+776	-	00:31.040	
+
+00:31.080	--> 	00:31.120	
+777	-	00:31.080	
+
+00:31.120	--> 	00:31.160	
+778	-	00:31.120	
+
+00:31.160	--> 	00:31.200	
+779	-	00:31.160	
+
+00:31.200	--> 	00:31.240	
+780	-	00:31.200	
+
+00:31.240	--> 	00:31.280	
+781	-	00:31.240	
+
+00:31.280	--> 	00:31.320	
+782	-	00:31.280	
+
+00:31.320	--> 	00:31.360	
+783	-	00:31.320	
+
+00:31.360	--> 	00:31.400	
+784	-	00:31.360	
+
+00:31.400	--> 	00:31.440	
+785	-	00:31.400	
+
+00:31.440	--> 	00:31.480	
+786	-	00:31.440	
+
+00:31.480	--> 	00:31.520	
+787	-	00:31.480	
+
+00:31.520	--> 	00:31.560	
+788	-	00:31.520	
+
+00:31.560	--> 	00:31.600	
+789	-	00:31.560	
+
+00:31.600	--> 	00:31.640	
+790	-	00:31.600	
+
+00:31.640	--> 	00:31.680	
+791	-	00:31.640	
+
+00:31.680	--> 	00:31.720	
+792	-	00:31.680	
+
+00:31.720	--> 	00:31.760	
+793	-	00:31.720	
+
+00:31.760	--> 	00:31.800	
+794	-	00:31.760	
+
+00:31.800	--> 	00:31.840	
+795	-	00:31.800	
+
+00:31.840	--> 	00:31.880	
+796	-	00:31.840	
+
+00:31.880	--> 	00:31.920	
+797	-	00:31.880	
+
+00:31.920	--> 	00:31.960	
+798	-	00:31.920	
+
+00:31.960	--> 	00:32.000	
+799	-	00:31.960	
+
+00:32.000	--> 	00:32.040	
+800	-	00:32.000	
+
+00:32.040	--> 	00:32.080	
+801	-	00:32.040	
+
+00:32.080	--> 	00:32.120	
+802	-	00:32.080	
+
+00:32.120	--> 	00:32.160	
+803	-	00:32.120	
+
+00:32.160	--> 	00:32.200	
+804	-	00:32.160	
+
+00:32.200	--> 	00:32.240	
+805	-	00:32.200	
+
+00:32.240	--> 	00:32.280	
+806	-	00:32.240	
+
+00:32.280	--> 	00:32.320	
+807	-	00:32.280	
+
+00:32.320	--> 	00:32.360	
+808	-	00:32.320	
+
+00:32.360	--> 	00:32.400	
+809	-	00:32.360	
+
+00:32.400	--> 	00:32.440	
+810	-	00:32.400	
+
+00:32.440	--> 	00:32.480	
+811	-	00:32.440	
+
+00:32.480	--> 	00:32.520	
+812	-	00:32.480	
+
+00:32.520	--> 	00:32.560	
+813	-	00:32.520	
+
+00:32.560	--> 	00:32.600	
+814	-	00:32.560	
+
+00:32.600	--> 	00:32.640	
+815	-	00:32.600	
+
+00:32.640	--> 	00:32.680	
+816	-	00:32.640	
+
+00:32.680	--> 	00:32.720	
+817	-	00:32.680	
+
+00:32.720	--> 	00:32.760	
+818	-	00:32.720	
+
+00:32.760	--> 	00:32.800	
+819	-	00:32.760	
+
+00:32.800	--> 	00:32.840	
+820	-	00:32.800	
+
+00:32.840	--> 	00:32.880	
+821	-	00:32.840	
+
+00:32.880	--> 	00:32.920	
+822	-	00:32.880	
+
+00:32.920	--> 	00:32.960	
+823	-	00:32.920	
+
+00:32.960	--> 	00:33.000	
+824	-	00:32.960	
+
+00:33.000	--> 	00:33.040	
+825	-	00:33.000	
+
+00:33.040	--> 	00:33.080	
+826	-	00:33.040	
+
+00:33.080	--> 	00:33.120	
+827	-	00:33.080	
+
+00:33.120	--> 	00:33.160	
+828	-	00:33.120	
+
+00:33.160	--> 	00:33.200	
+829	-	00:33.160	
+
+00:33.200	--> 	00:33.240	
+830	-	00:33.200	
+
+00:33.240	--> 	00:33.280	
+831	-	00:33.240	
+
+00:33.280	--> 	00:33.320	
+832	-	00:33.280	
+
+00:33.320	--> 	00:33.360	
+833	-	00:33.320	
+
+00:33.360	--> 	00:33.400	
+834	-	00:33.360	
+
+00:33.400	--> 	00:33.440	
+835	-	00:33.400	
+
+00:33.440	--> 	00:33.480	
+836	-	00:33.440	
+
+00:33.480	--> 	00:33.520	
+837	-	00:33.480	
+
+00:33.520	--> 	00:33.560	
+838	-	00:33.520	
+
+00:33.560	--> 	00:33.600	
+839	-	00:33.560	
+
+00:33.600	--> 	00:33.640	
+840	-	00:33.600	
+
+00:33.640	--> 	00:33.680	
+841	-	00:33.640	
+
+00:33.680	--> 	00:33.720	
+842	-	00:33.680	
+
+00:33.720	--> 	00:33.760	
+843	-	00:33.720	
+
+00:33.760	--> 	00:33.800	
+844	-	00:33.760	
+
+00:33.800	--> 	00:33.840	
+845	-	00:33.800	
+
+00:33.840	--> 	00:33.880	
+846	-	00:33.840	
+
+00:33.880	--> 	00:33.920	
+847	-	00:33.880	
+
+00:33.920	--> 	00:33.960	
+848	-	00:33.920	
+
+00:33.960	--> 	00:34.000	
+849	-	00:33.960	
+
+00:34.000	--> 	00:34.040	
+850	-	00:34.000	
+
+00:34.040	--> 	00:34.080	
+851	-	00:34.040	
+
+00:34.080	--> 	00:34.120	
+852	-	00:34.080	
+
+00:34.120	--> 	00:34.160	
+853	-	00:34.120	
+
+00:34.160	--> 	00:34.200	
+854	-	00:34.160	
+
+00:34.200	--> 	00:34.240	
+855	-	00:34.200	
+
+00:34.240	--> 	00:34.280	
+856	-	00:34.240	
+
+00:34.280	--> 	00:34.320	
+857	-	00:34.280	
+
+00:34.320	--> 	00:34.360	
+858	-	00:34.320	
+
+00:34.360	--> 	00:34.400	
+859	-	00:34.360	
+
+00:34.400	--> 	00:34.440	
+860	-	00:34.400	
+
+00:34.440	--> 	00:34.480	
+861	-	00:34.440	
+
+00:34.480	--> 	00:34.520	
+862	-	00:34.480	
+
+00:34.520	--> 	00:34.560	
+863	-	00:34.520	
+
+00:34.560	--> 	00:34.600	
+864	-	00:34.560	
+
+00:34.600	--> 	00:34.640	
+865	-	00:34.600	
+
+00:34.640	--> 	00:34.680	
+866	-	00:34.640	
+
+00:34.680	--> 	00:34.720	
+867	-	00:34.680	
+
+00:34.720	--> 	00:34.760	
+868	-	00:34.720	
+
+00:34.760	--> 	00:34.800	
+869	-	00:34.760	
+
+00:34.800	--> 	00:34.840	
+870	-	00:34.800	
+
+00:34.840	--> 	00:34.880	
+871	-	00:34.840	
+
+00:34.880	--> 	00:34.920	
+872	-	00:34.880	
+
+00:34.920	--> 	00:34.960	
+873	-	00:34.920	
+
+00:34.960	--> 	00:35.000	
+874	-	00:34.960	
+
+00:35.000	--> 	00:35.040	
+875	-	00:35.000	
+
+00:35.040	--> 	00:35.080	
+876	-	00:35.040	
+
+00:35.080	--> 	00:35.120	
+877	-	00:35.080	
+
+00:35.120	--> 	00:35.160	
+878	-	00:35.120	
+
+00:35.160	--> 	00:35.200	
+879	-	00:35.160	
+
+00:35.200	--> 	00:35.240	
+880	-	00:35.200	
+
+00:35.240	--> 	00:35.280	
+881	-	00:35.240	
+
+00:35.280	--> 	00:35.320	
+882	-	00:35.280	
+
+00:35.320	--> 	00:35.360	
+883	-	00:35.320	
+
+00:35.360	--> 	00:35.400	
+884	-	00:35.360	
+
+00:35.400	--> 	00:35.440	
+885	-	00:35.400	
+
+00:35.440	--> 	00:35.480	
+886	-	00:35.440	
+
+00:35.480	--> 	00:35.520	
+887	-	00:35.480	
+
+00:35.520	--> 	00:35.560	
+888	-	00:35.520	
+
+00:35.560	--> 	00:35.600	
+889	-	00:35.560	
+
+00:35.600	--> 	00:35.640	
+890	-	00:35.600	
+
+00:35.640	--> 	00:35.680	
+891	-	00:35.640	
+
+00:35.680	--> 	00:35.720	
+892	-	00:35.680	
+
+00:35.720	--> 	00:35.760	
+893	-	00:35.720	
+
+00:35.760	--> 	00:35.800	
+894	-	00:35.760	
+
+00:35.800	--> 	00:35.840	
+895	-	00:35.800	
+
+00:35.840	--> 	00:35.880	
+896	-	00:35.840	
+
+00:35.880	--> 	00:35.920	
+897	-	00:35.880	
+
+00:35.920	--> 	00:35.960	
+898	-	00:35.920	
+
+00:35.960	--> 	00:36.000	
+899	-	00:35.960	
+
+00:36.000	--> 	00:36.040	
+900	-	00:36.000	
+
+00:36.040	--> 	00:36.080	
+901	-	00:36.040	
+
+00:36.080	--> 	00:36.120	
+902	-	00:36.080	
+
+00:36.120	--> 	00:36.160	
+903	-	00:36.120	
+
+00:36.160	--> 	00:36.200	
+904	-	00:36.160	
+
+00:36.200	--> 	00:36.240	
+905	-	00:36.200	
+
+00:36.240	--> 	00:36.280	
+906	-	00:36.240	
+
+00:36.280	--> 	00:36.320	
+907	-	00:36.280	
+
+00:36.320	--> 	00:36.360	
+908	-	00:36.320	
+
+00:36.360	--> 	00:36.400	
+909	-	00:36.360	
+
+00:36.400	--> 	00:36.440	
+910	-	00:36.400	
+
+00:36.440	--> 	00:36.480	
+911	-	00:36.440	
+
+00:36.480	--> 	00:36.520	
+912	-	00:36.480	
+
+00:36.520	--> 	00:36.560	
+913	-	00:36.520	
+
+00:36.560	--> 	00:36.600	
+914	-	00:36.560	
+
+00:36.600	--> 	00:36.640	
+915	-	00:36.600	
+
+00:36.640	--> 	00:36.680	
+916	-	00:36.640	
+
+00:36.680	--> 	00:36.720	
+917	-	00:36.680	
+
+00:36.720	--> 	00:36.760	
+918	-	00:36.720	
+
+00:36.760	--> 	00:36.800	
+919	-	00:36.760	
+
+00:36.800	--> 	00:36.840	
+920	-	00:36.800	
+
+00:36.840	--> 	00:36.880	
+921	-	00:36.840	
+
+00:36.880	--> 	00:36.920	
+922	-	00:36.880	
+
+00:36.920	--> 	00:36.960	
+923	-	00:36.920	
+
+00:36.960	--> 	00:37.000	
+924	-	00:36.960	
+
+00:37.000	--> 	00:37.040	
+925	-	00:37.000	
+
+00:37.040	--> 	00:37.080	
+926	-	00:37.040	
+
+00:37.080	--> 	00:37.120	
+927	-	00:37.080	
+
+00:37.120	--> 	00:37.160	
+928	-	00:37.120	
+
+00:37.160	--> 	00:37.200	
+929	-	00:37.160	
+
+00:37.200	--> 	00:37.240	
+930	-	00:37.200	
+
+00:37.240	--> 	00:37.280	
+931	-	00:37.240	
+
+00:37.280	--> 	00:37.320	
+932	-	00:37.280	
+
+00:37.320	--> 	00:37.360	
+933	-	00:37.320	
+
+00:37.360	--> 	00:37.400	
+934	-	00:37.360	
+
+00:37.400	--> 	00:37.440	
+935	-	00:37.400	
+
+00:37.440	--> 	00:37.480	
+936	-	00:37.440	
+
+00:37.480	--> 	00:37.520	
+937	-	00:37.480	
+
+00:37.520	--> 	00:37.560	
+938	-	00:37.520	
+
+00:37.560	--> 	00:37.600	
+939	-	00:37.560	
+
+00:37.600	--> 	00:37.640	
+940	-	00:37.600	
+
+00:37.640	--> 	00:37.680	
+941	-	00:37.640	
+
+00:37.680	--> 	00:37.720	
+942	-	00:37.680	
+
+00:37.720	--> 	00:37.760	
+943	-	00:37.720	
+
+00:37.760	--> 	00:37.800	
+944	-	00:37.760	
+
+00:37.800	--> 	00:37.840	
+945	-	00:37.800	
+
+00:37.840	--> 	00:37.880	
+946	-	00:37.840	
+
+00:37.880	--> 	00:37.920	
+947	-	00:37.880	
+
+00:37.920	--> 	00:37.960	
+948	-	00:37.920	
+
+00:37.960	--> 	00:38.000	
+949	-	00:37.960	
+
+00:38.000	--> 	00:38.040	
+950	-	00:38.000	
+
+00:38.040	--> 	00:38.080	
+951	-	00:38.040	
+
+00:38.080	--> 	00:38.120	
+952	-	00:38.080	
+
+00:38.120	--> 	00:38.160	
+953	-	00:38.120	
+
+00:38.160	--> 	00:38.200	
+954	-	00:38.160	
+
+00:38.200	--> 	00:38.240	
+955	-	00:38.200	
+
+00:38.240	--> 	00:38.280	
+956	-	00:38.240	
+
+00:38.280	--> 	00:38.320	
+957	-	00:38.280	
+
+00:38.320	--> 	00:38.360	
+958	-	00:38.320	
+
+00:38.360	--> 	00:38.400	
+959	-	00:38.360	
+
+00:38.400	--> 	00:38.440	
+960	-	00:38.400	
+
+00:38.440	--> 	00:38.480	
+961	-	00:38.440	
+
+00:38.480	--> 	00:38.520	
+962	-	00:38.480	
+
+00:38.520	--> 	00:38.560	
+963	-	00:38.520	
+
+00:38.560	--> 	00:38.600	
+964	-	00:38.560	
+
+00:38.600	--> 	00:38.640	
+965	-	00:38.600	
+
+00:38.640	--> 	00:38.680	
+966	-	00:38.640	
+
+00:38.680	--> 	00:38.720	
+967	-	00:38.680	
+
+00:38.720	--> 	00:38.760	
+968	-	00:38.720	
+
+00:38.760	--> 	00:38.800	
+969	-	00:38.760	
+
+00:38.800	--> 	00:38.840	
+970	-	00:38.800	
+
+00:38.840	--> 	00:38.880	
+971	-	00:38.840	
+
+00:38.880	--> 	00:38.920	
+972	-	00:38.880	
+
+00:38.920	--> 	00:38.960	
+973	-	00:38.920	
+
+00:38.960	--> 	00:39.000	
+974	-	00:38.960	
+
+00:39.000	--> 	00:39.040	
+975	-	00:39.000	
+
+00:39.040	--> 	00:39.080	
+976	-	00:39.040	
+
+00:39.080	--> 	00:39.120	
+977	-	00:39.080	
+
+00:39.120	--> 	00:39.160	
+978	-	00:39.120	
+
+00:39.160	--> 	00:39.200	
+979	-	00:39.160	
+
+00:39.200	--> 	00:39.240	
+980	-	00:39.200	
+
+00:39.240	--> 	00:39.280	
+981	-	00:39.240	
+
+00:39.280	--> 	00:39.320	
+982	-	00:39.280	
+
+00:39.320	--> 	00:39.360	
+983	-	00:39.320	
+
+00:39.360	--> 	00:39.400	
+984	-	00:39.360	
+
+00:39.400	--> 	00:39.440	
+985	-	00:39.400	
+
+00:39.440	--> 	00:39.480	
+986	-	00:39.440	
+
+00:39.480	--> 	00:39.520	
+987	-	00:39.480	
+
+00:39.520	--> 	00:39.560	
+988	-	00:39.520	
+
+00:39.560	--> 	00:39.600	
+989	-	00:39.560	
+
+00:39.600	--> 	00:39.640	
+990	-	00:39.600	
+
+00:39.640	--> 	00:39.680	
+991	-	00:39.640	
+
+00:39.680	--> 	00:39.720	
+992	-	00:39.680	
+
+00:39.720	--> 	00:39.760	
+993	-	00:39.720	
+
+00:39.760	--> 	00:39.800	
+994	-	00:39.760	
+
+00:39.800	--> 	00:39.840	
+995	-	00:39.800	
+
+00:39.840	--> 	00:39.880	
+996	-	00:39.840	
+
+00:39.880	--> 	00:39.920	
+997	-	00:39.880	
+
+00:39.920	--> 	00:39.960	
+998	-	00:39.920	
+
+00:39.960	--> 	00:40.000	
+999	-	00:39.960	
+
+00:40.000	--> 	00:40.040	
+1000	-	00:40.000	
+
+00:40.040	--> 	00:40.080	
+1001	-	00:40.040	
+
+00:40.080	--> 	00:40.120	
+1002	-	00:40.080	
+
+00:40.120	--> 	00:40.160	
+1003	-	00:40.120	
+
+00:40.160	--> 	00:40.200	
+1004	-	00:40.160	
+
+00:40.200	--> 	00:40.240	
+1005	-	00:40.200	
+
+00:40.240	--> 	00:40.280	
+1006	-	00:40.240	
+
+00:40.280	--> 	00:40.320	
+1007	-	00:40.280	
+
+00:40.320	--> 	00:40.360	
+1008	-	00:40.320	
+
+00:40.360	--> 	00:40.400	
+1009	-	00:40.360	
+
+00:40.400	--> 	00:40.440	
+1010	-	00:40.400	
+
+00:40.440	--> 	00:40.480	
+1011	-	00:40.440	
+
+00:40.480	--> 	00:40.520	
+1012	-	00:40.480	
+
+00:40.520	--> 	00:40.560	
+1013	-	00:40.520	
+
+00:40.560	--> 	00:40.600	
+1014	-	00:40.560	
+
+00:40.600	--> 	00:40.640	
+1015	-	00:40.600	
+
+00:40.640	--> 	00:40.680	
+1016	-	00:40.640	
+
+00:40.680	--> 	00:40.720	
+1017	-	00:40.680	
+
+00:40.720	--> 	00:40.760	
+1018	-	00:40.720	
+
+00:40.760	--> 	00:40.800	
+1019	-	00:40.760	
+
+00:40.800	--> 	00:40.840	
+1020	-	00:40.800	
+
+00:40.840	--> 	00:40.880	
+1021	-	00:40.840	
+
+00:40.880	--> 	00:40.920	
+1022	-	00:40.880	
+
+00:40.920	--> 	00:40.960	
+1023	-	00:40.920	
+
+00:40.960	--> 	00:41.000	
+1024	-	00:40.960	
+
+00:41.000	--> 	00:41.040	
+1025	-	00:41.000	
+
+00:41.040	--> 	00:41.080	
+1026	-	00:41.040	
+
+00:41.080	--> 	00:41.120	
+1027	-	00:41.080	
+
+00:41.120	--> 	00:41.160	
+1028	-	00:41.120	
+
+00:41.160	--> 	00:41.200	
+1029	-	00:41.160	
+
+00:41.200	--> 	00:41.240	
+1030	-	00:41.200	
+
+00:41.240	--> 	00:41.280	
+1031	-	00:41.240	
+
+00:41.280	--> 	00:41.320	
+1032	-	00:41.280	
+
+00:41.320	--> 	00:41.360	
+1033	-	00:41.320	
+
+00:41.360	--> 	00:41.400	
+1034	-	00:41.360	
+
+00:41.400	--> 	00:41.440	
+1035	-	00:41.400	
+
+00:41.440	--> 	00:41.480	
+1036	-	00:41.440	
+
+00:41.480	--> 	00:41.520	
+1037	-	00:41.480	
+
+00:41.520	--> 	00:41.560	
+1038	-	00:41.520	
+
+00:41.560	--> 	00:41.600	
+1039	-	00:41.560	
+
+00:41.600	--> 	00:41.640	
+1040	-	00:41.600	
+
+00:41.640	--> 	00:41.680	
+1041	-	00:41.640	
+
+00:41.680	--> 	00:41.720	
+1042	-	00:41.680	
+
+00:41.720	--> 	00:41.760	
+1043	-	00:41.720	
+
+00:41.760	--> 	00:41.800	
+1044	-	00:41.760	
+
+00:41.800	--> 	00:41.840	
+1045	-	00:41.800	
+
+00:41.840	--> 	00:41.880	
+1046	-	00:41.840	
+
+00:41.880	--> 	00:41.920	
+1047	-	00:41.880	
+
+00:41.920	--> 	00:41.960	
+1048	-	00:41.920	
+
+00:41.960	--> 	00:42.000	
+1049	-	00:41.960	
+
+00:42.000	--> 	00:42.040	
+1050	-	00:42.000	
+
+00:42.040	--> 	00:42.080	
+1051	-	00:42.040	
+
+00:42.080	--> 	00:42.120	
+1052	-	00:42.080	
+
+00:42.120	--> 	00:42.160	
+1053	-	00:42.120	
+
+00:42.160	--> 	00:42.200	
+1054	-	00:42.160	
+
+00:42.200	--> 	00:42.240	
+1055	-	00:42.200	
+
+00:42.240	--> 	00:42.280	
+1056	-	00:42.240	
+
+00:42.280	--> 	00:42.320	
+1057	-	00:42.280	
+
+00:42.320	--> 	00:42.360	
+1058	-	00:42.320	
+
+00:42.360	--> 	00:42.400	
+1059	-	00:42.360	
+
+00:42.400	--> 	00:42.440	
+1060	-	00:42.400	
+
+00:42.440	--> 	00:42.480	
+1061	-	00:42.440	
+
+00:42.480	--> 	00:42.520	
+1062	-	00:42.480	
+
+00:42.520	--> 	00:42.560	
+1063	-	00:42.520	
+
+00:42.560	--> 	00:42.600	
+1064	-	00:42.560	
+
+00:42.600	--> 	00:42.640	
+1065	-	00:42.600	
+
+00:42.640	--> 	00:42.680	
+1066	-	00:42.640	
+
+00:42.680	--> 	00:42.720	
+1067	-	00:42.680	
+
+00:42.720	--> 	00:42.760	
+1068	-	00:42.720	
+
+00:42.760	--> 	00:42.800	
+1069	-	00:42.760	
+
+00:42.800	--> 	00:42.840	
+1070	-	00:42.800	
+
+00:42.840	--> 	00:42.880	
+1071	-	00:42.840	
+
+00:42.880	--> 	00:42.920	
+1072	-	00:42.880	
+
+00:42.920	--> 	00:42.960	
+1073	-	00:42.920	
+
+00:42.960	--> 	00:43.000	
+1074	-	00:42.960	
+
+00:43.000	--> 	00:43.040	
+1075	-	00:43.000	
+
+00:43.040	--> 	00:43.080	
+1076	-	00:43.040	
+
+00:43.080	--> 	00:43.120	
+1077	-	00:43.080	
+
+00:43.120	--> 	00:43.160	
+1078	-	00:43.120	
+
+00:43.160	--> 	00:43.200	
+1079	-	00:43.160	
+
+00:43.200	--> 	00:43.240	
+1080	-	00:43.200	
+
+00:43.240	--> 	00:43.280	
+1081	-	00:43.240	
+
+00:43.280	--> 	00:43.320	
+1082	-	00:43.280	
+
+00:43.320	--> 	00:43.360	
+1083	-	00:43.320	
+
+00:43.360	--> 	00:43.400	
+1084	-	00:43.360	
+
+00:43.400	--> 	00:43.440	
+1085	-	00:43.400	
+
+00:43.440	--> 	00:43.480	
+1086	-	00:43.440	
+
+00:43.480	--> 	00:43.520	
+1087	-	00:43.480	
+
+00:43.520	--> 	00:43.560	
+1088	-	00:43.520	
+
+00:43.560	--> 	00:43.600	
+1089	-	00:43.560	
+
+00:43.600	--> 	00:43.640	
+1090	-	00:43.600	
+
+00:43.640	--> 	00:43.680	
+1091	-	00:43.640	
+
+00:43.680	--> 	00:43.720	
+1092	-	00:43.680	
+
+00:43.720	--> 	00:43.760	
+1093	-	00:43.720	
+
+00:43.760	--> 	00:43.800	
+1094	-	00:43.760	
+
+00:43.800	--> 	00:43.840	
+1095	-	00:43.800	
+
+00:43.840	--> 	00:43.880	
+1096	-	00:43.840	
+
+00:43.880	--> 	00:43.920	
+1097	-	00:43.880	
+
+00:43.920	--> 	00:43.960	
+1098	-	00:43.920	
+
+00:43.960	--> 	00:44.000	
+1099	-	00:43.960	
+
+00:44.000	--> 	00:44.040	
+1100	-	00:44.000	
+
+00:44.040	--> 	00:44.080	
+1101	-	00:44.040	
+
+00:44.080	--> 	00:44.120	
+1102	-	00:44.080	
+
+00:44.120	--> 	00:44.160	
+1103	-	00:44.120	
+
+00:44.160	--> 	00:44.200	
+1104	-	00:44.160	
+
+00:44.200	--> 	00:44.240	
+1105	-	00:44.200	
+
+00:44.240	--> 	00:44.280	
+1106	-	00:44.240	
+
+00:44.280	--> 	00:44.320	
+1107	-	00:44.280	
+
+00:44.320	--> 	00:44.360	
+1108	-	00:44.320	
+
+00:44.360	--> 	00:44.400	
+1109	-	00:44.360	
+
+00:44.400	--> 	00:44.440	
+1110	-	00:44.400	
+
+00:44.440	--> 	00:44.480	
+1111	-	00:44.440	
+
+00:44.480	--> 	00:44.520	
+1112	-	00:44.480	
+
+00:44.520	--> 	00:44.560	
+1113	-	00:44.520	
+
+00:44.560	--> 	00:44.600	
+1114	-	00:44.560	
+
+00:44.600	--> 	00:44.640	
+1115	-	00:44.600	
+
+00:44.640	--> 	00:44.680	
+1116	-	00:44.640	
+
+00:44.680	--> 	00:44.720	
+1117	-	00:44.680	
+
+00:44.720	--> 	00:44.760	
+1118	-	00:44.720	
+
+00:44.760	--> 	00:44.800	
+1119	-	00:44.760	
+
+00:44.800	--> 	00:44.840	
+1120	-	00:44.800	
+
+00:44.840	--> 	00:44.880	
+1121	-	00:44.840	
+
+00:44.880	--> 	00:44.920	
+1122	-	00:44.880	
+
+00:44.920	--> 	00:44.960	
+1123	-	00:44.920	
+
+00:44.960	--> 	00:45.000	
+1124	-	00:44.960	
+
+00:45.000	--> 	00:45.040	
+1125	-	00:45.000	
+
+00:45.040	--> 	00:45.080	
+1126	-	00:45.040	
+
+00:45.080	--> 	00:45.120	
+1127	-	00:45.080	
+
+00:45.120	--> 	00:45.160	
+1128	-	00:45.120	
+
+00:45.160	--> 	00:45.200	
+1129	-	00:45.160	
+
+00:45.200	--> 	00:45.240	
+1130	-	00:45.200	
+
+00:45.240	--> 	00:45.280	
+1131	-	00:45.240	
+
+00:45.280	--> 	00:45.320	
+1132	-	00:45.280	
+
+00:45.320	--> 	00:45.360	
+1133	-	00:45.320	
+
+00:45.360	--> 	00:45.400	
+1134	-	00:45.360	
+
+00:45.400	--> 	00:45.440	
+1135	-	00:45.400	
+
+00:45.440	--> 	00:45.480	
+1136	-	00:45.440	
+
+00:45.480	--> 	00:45.520	
+1137	-	00:45.480	
+
+00:45.520	--> 	00:45.560	
+1138	-	00:45.520	
+
+00:45.560	--> 	00:45.600	
+1139	-	00:45.560	
+
+00:45.600	--> 	00:45.640	
+1140	-	00:45.600	
+
+00:45.640	--> 	00:45.680	
+1141	-	00:45.640	
+
+00:45.680	--> 	00:45.720	
+1142	-	00:45.680	
+
+00:45.720	--> 	00:45.760	
+1143	-	00:45.720	
+
+00:45.760	--> 	00:45.800	
+1144	-	00:45.760	
+
+00:45.800	--> 	00:45.840	
+1145	-	00:45.800	
+
+00:45.840	--> 	00:45.880	
+1146	-	00:45.840	
+
+00:45.880	--> 	00:45.920	
+1147	-	00:45.880	
+
+00:45.920	--> 	00:45.960	
+1148	-	00:45.920	
+
+00:45.960	--> 	00:46.000	
+1149	-	00:45.960	
+
+00:46.000	--> 	00:46.040	
+1150	-	00:46.000	
+
+00:46.040	--> 	00:46.080	
+1151	-	00:46.040	
+
+00:46.080	--> 	00:46.120	
+1152	-	00:46.080	
+
+00:46.120	--> 	00:46.160	
+1153	-	00:46.120	
+
+00:46.160	--> 	00:46.200	
+1154	-	00:46.160	
+
+00:46.200	--> 	00:46.240	
+1155	-	00:46.200	
+
+00:46.240	--> 	00:46.280	
+1156	-	00:46.240	
+
+00:46.280	--> 	00:46.320	
+1157	-	00:46.280	
+
+00:46.320	--> 	00:46.360	
+1158	-	00:46.320	
+
+00:46.360	--> 	00:46.400	
+1159	-	00:46.360	
+
+00:46.400	--> 	00:46.440	
+1160	-	00:46.400	
+
+00:46.440	--> 	00:46.480	
+1161	-	00:46.440	
+
+00:46.480	--> 	00:46.520	
+1162	-	00:46.480	
+
+00:46.520	--> 	00:46.560	
+1163	-	00:46.520	
+
+00:46.560	--> 	00:46.600	
+1164	-	00:46.560	
+
+00:46.600	--> 	00:46.640	
+1165	-	00:46.600	
+
+00:46.640	--> 	00:46.680	
+1166	-	00:46.640	
+
+00:46.680	--> 	00:46.720	
+1167	-	00:46.680	
+
+00:46.720	--> 	00:46.760	
+1168	-	00:46.720	
+
+00:46.760	--> 	00:46.800	
+1169	-	00:46.760	
+
+00:46.800	--> 	00:46.840	
+1170	-	00:46.800	
+
+00:46.840	--> 	00:46.880	
+1171	-	00:46.840	
+
+00:46.880	--> 	00:46.920	
+1172	-	00:46.880	
+
+00:46.920	--> 	00:46.960	
+1173	-	00:46.920	
+
+00:46.960	--> 	00:47.000	
+1174	-	00:46.960	
+
+00:47.000	--> 	00:47.040	
+1175	-	00:47.000	
+
+00:47.040	--> 	00:47.080	
+1176	-	00:47.040	
+
+00:47.080	--> 	00:47.120	
+1177	-	00:47.080	
+
+00:47.120	--> 	00:47.160	
+1178	-	00:47.120	
+
+00:47.160	--> 	00:47.200	
+1179	-	00:47.160	
+
+00:47.200	--> 	00:47.240	
+1180	-	00:47.200	
+
+00:47.240	--> 	00:47.280	
+1181	-	00:47.240	
+
+00:47.280	--> 	00:47.320	
+1182	-	00:47.280	
+
+00:47.320	--> 	00:47.360	
+1183	-	00:47.320	
+
+00:47.360	--> 	00:47.400	
+1184	-	00:47.360	
+
+00:47.400	--> 	00:47.440	
+1185	-	00:47.400	
+
+00:47.440	--> 	00:47.480	
+1186	-	00:47.440	
+
+00:47.480	--> 	00:47.520	
+1187	-	00:47.480	
+
+00:47.520	--> 	00:47.560	
+1188	-	00:47.520	
+
+00:47.560	--> 	00:47.600	
+1189	-	00:47.560	
+
+00:47.600	--> 	00:47.640	
+1190	-	00:47.600	
+
+00:47.640	--> 	00:47.680	
+1191	-	00:47.640	
+
+00:47.680	--> 	00:47.720	
+1192	-	00:47.680	
+
+00:47.720	--> 	00:47.760	
+1193	-	00:47.720	
+
+00:47.760	--> 	00:47.800	
+1194	-	00:47.760	
+
+00:47.800	--> 	00:47.840	
+1195	-	00:47.800	
+
+00:47.840	--> 	00:47.880	
+1196	-	00:47.840	
+
+00:47.880	--> 	00:47.920	
+1197	-	00:47.880	
+
+00:47.920	--> 	00:47.960	
+1198	-	00:47.920	
+
+00:47.960	--> 	00:48.000	
+1199	-	00:47.960	
+
+00:48.000	--> 	00:48.040	
+1200	-	00:48.000	
+
+00:48.040	--> 	00:48.080	
+1201	-	00:48.040	
+
+00:48.080	--> 	00:48.120	
+1202	-	00:48.080	
+
+00:48.120	--> 	00:48.160	
+1203	-	00:48.120	
+
+00:48.160	--> 	00:48.200	
+1204	-	00:48.160	
+
+00:48.200	--> 	00:48.240	
+1205	-	00:48.200	
+
+00:48.240	--> 	00:48.280	
+1206	-	00:48.240	
+
+00:48.280	--> 	00:48.320	
+1207	-	00:48.280	
+
+00:48.320	--> 	00:48.360	
+1208	-	00:48.320	
+
+00:48.360	--> 	00:48.400	
+1209	-	00:48.360	
+
+00:48.400	--> 	00:48.440	
+1210	-	00:48.400	
+
+00:48.440	--> 	00:48.480	
+1211	-	00:48.440	
+
+00:48.480	--> 	00:48.520	
+1212	-	00:48.480	
+
+00:48.520	--> 	00:48.560	
+1213	-	00:48.520	
+
+00:48.560	--> 	00:48.600	
+1214	-	00:48.560	
+
+00:48.600	--> 	00:48.640	
+1215	-	00:48.600	
+
+00:48.640	--> 	00:48.680	
+1216	-	00:48.640	
+
+00:48.680	--> 	00:48.720	
+1217	-	00:48.680	
+
+00:48.720	--> 	00:48.760	
+1218	-	00:48.720	
+
+00:48.760	--> 	00:48.800	
+1219	-	00:48.760	
+
+00:48.800	--> 	00:48.840	
+1220	-	00:48.800	
+
+00:48.840	--> 	00:48.880	
+1221	-	00:48.840	
+
+00:48.880	--> 	00:48.920	
+1222	-	00:48.880	
+
+00:48.920	--> 	00:48.960	
+1223	-	00:48.920	
+
+00:48.960	--> 	00:49.000	
+1224	-	00:48.960	
+
+00:49.000	--> 	00:49.040	
+1225	-	00:49.000	
+
+00:49.040	--> 	00:49.080	
+1226	-	00:49.040	
+
+00:49.080	--> 	00:49.120	
+1227	-	00:49.080	
+
+00:49.120	--> 	00:49.160	
+1228	-	00:49.120	
+
+00:49.160	--> 	00:49.200	
+1229	-	00:49.160	
+
+00:49.200	--> 	00:49.240	
+1230	-	00:49.200	
+
+00:49.240	--> 	00:49.280	
+1231	-	00:49.240	
+
+00:49.280	--> 	00:49.320	
+1232	-	00:49.280	
+
+00:49.320	--> 	00:49.360	
+1233	-	00:49.320	
+
+00:49.360	--> 	00:49.400	
+1234	-	00:49.360	
+
+00:49.400	--> 	00:49.440	
+1235	-	00:49.400	
+
+00:49.440	--> 	00:49.480	
+1236	-	00:49.440	
+
+00:49.480	--> 	00:49.520	
+1237	-	00:49.480	
+
+00:49.520	--> 	00:49.560	
+1238	-	00:49.520	
+
+00:49.560	--> 	00:49.600	
+1239	-	00:49.560	
+
+00:49.600	--> 	00:49.640	
+1240	-	00:49.600	
+
+00:49.640	--> 	00:49.680	
+1241	-	00:49.640	
+
+00:49.680	--> 	00:49.720	
+1242	-	00:49.680	
+
+00:49.720	--> 	00:49.760	
+1243	-	00:49.720	
+
+00:49.760	--> 	00:49.800	
+1244	-	00:49.760	
+
+00:49.800	--> 	00:49.840	
+1245	-	00:49.800	
+
+00:49.840	--> 	00:49.880	
+1246	-	00:49.840	
+
+00:49.880	--> 	00:49.920	
+1247	-	00:49.880	
+
+00:49.920	--> 	00:49.960	
+1248	-	00:49.920	
+
+00:49.960	--> 	00:50.000	
+1249	-	00:49.960	
+
+00:50.000	--> 	00:50.040	
+1250	-	00:50.000	
+
+00:50.040	--> 	00:50.080	
+1251	-	00:50.040	
+
+00:50.080	--> 	00:50.120	
+1252	-	00:50.080	
+
+00:50.120	--> 	00:50.160	
+1253	-	00:50.120	
+
+00:50.160	--> 	00:50.200	
+1254	-	00:50.160	
+
+00:50.200	--> 	00:50.240	
+1255	-	00:50.200	
+
+00:50.240	--> 	00:50.280	
+1256	-	00:50.240	
+
+00:50.280	--> 	00:50.320	
+1257	-	00:50.280	
+
+00:50.320	--> 	00:50.360	
+1258	-	00:50.320	
+
+00:50.360	--> 	00:50.400	
+1259	-	00:50.360	
+
+00:50.400	--> 	00:50.440	
+1260	-	00:50.400	
+
+00:50.440	--> 	00:50.480	
+1261	-	00:50.440	
+
+00:50.480	--> 	00:50.520	
+1262	-	00:50.480	
+
+00:50.520	--> 	00:50.560	
+1263	-	00:50.520	
+
+00:50.560	--> 	00:50.600	
+1264	-	00:50.560	
+
+00:50.600	--> 	00:50.640	
+1265	-	00:50.600	
+
+00:50.640	--> 	00:50.680	
+1266	-	00:50.640	
+
+00:50.680	--> 	00:50.720	
+1267	-	00:50.680	
+
+00:50.720	--> 	00:50.760	
+1268	-	00:50.720	
+
+00:50.760	--> 	00:50.800	
+1269	-	00:50.760	
+
+00:50.800	--> 	00:50.840	
+1270	-	00:50.800	
+
+00:50.840	--> 	00:50.880	
+1271	-	00:50.840	
+
+00:50.880	--> 	00:50.920	
+1272	-	00:50.880	
+
+00:50.920	--> 	00:50.960	
+1273	-	00:50.920	
+
+00:50.960	--> 	00:51.000	
+1274	-	00:50.960	
+
+00:51.000	--> 	00:51.040	
+1275	-	00:51.000	
+
+00:51.040	--> 	00:51.080	
+1276	-	00:51.040	
+
+00:51.080	--> 	00:51.120	
+1277	-	00:51.080	
+
+00:51.120	--> 	00:51.160	
+1278	-	00:51.120	
+
+00:51.160	--> 	00:51.200	
+1279	-	00:51.160	
+
+00:51.200	--> 	00:51.240	
+1280	-	00:51.200	
+
+00:51.240	--> 	00:51.280	
+1281	-	00:51.240	
+
+00:51.280	--> 	00:51.320	
+1282	-	00:51.280	
+
+00:51.320	--> 	00:51.360	
+1283	-	00:51.320	
+
+00:51.360	--> 	00:51.400	
+1284	-	00:51.360	
+
+00:51.400	--> 	00:51.440	
+1285	-	00:51.400	
+
+00:51.440	--> 	00:51.480	
+1286	-	00:51.440	
+
+00:51.480	--> 	00:51.520	
+1287	-	00:51.480	
+
+00:51.520	--> 	00:51.560	
+1288	-	00:51.520	
+
+00:51.560	--> 	00:51.600	
+1289	-	00:51.560	
+
+00:51.600	--> 	00:51.640	
+1290	-	00:51.600	
+
+00:51.640	--> 	00:51.680	
+1291	-	00:51.640	
+
+00:51.680	--> 	00:51.720	
+1292	-	00:51.680	
+
+00:51.720	--> 	00:51.760	
+1293	-	00:51.720	
+
+00:51.760	--> 	00:51.800	
+1294	-	00:51.760	
+
+00:51.800	--> 	00:51.840	
+1295	-	00:51.800	
+
+00:51.840	--> 	00:51.880	
+1296	-	00:51.840	
+
+00:51.880	--> 	00:51.920	
+1297	-	00:51.880	
+
+00:51.920	--> 	00:51.960	
+1298	-	00:51.920	
+
+00:51.960	--> 	00:52.000	
+1299	-	00:51.960	
+
+00:52.000	--> 	00:52.040	
+1300	-	00:52.000	
+
+00:52.040	--> 	00:52.080	
+1301	-	00:52.040	
+
+00:52.080	--> 	00:52.120	
+1302	-	00:52.080	
+
+00:52.120	--> 	00:52.160	
+1303	-	00:52.120	
+
+00:52.160	--> 	00:52.200	
+1304	-	00:52.160	
+
+00:52.200	--> 	00:52.240	
+1305	-	00:52.200	
+
+00:52.240	--> 	00:52.280	
+1306	-	00:52.240	
+
+00:52.280	--> 	00:52.320	
+1307	-	00:52.280	
+
+00:52.320	--> 	00:52.360	
+1308	-	00:52.320	
+
+00:52.360	--> 	00:52.400	
+1309	-	00:52.360	
+
+00:52.400	--> 	00:52.440	
+1310	-	00:52.400	
+
+00:52.440	--> 	00:52.480	
+1311	-	00:52.440	
+
+00:52.480	--> 	00:52.520	
+1312	-	00:52.480	
+
+00:52.520	--> 	00:52.560	
+1313	-	00:52.520	
+
+00:52.560	--> 	00:52.600	
+1314	-	00:52.560	
+
+00:52.600	--> 	00:52.640	
+1315	-	00:52.600	
+
+00:52.640	--> 	00:52.680	
+1316	-	00:52.640	
+
+00:52.680	--> 	00:52.720	
+1317	-	00:52.680	
+
+00:52.720	--> 	00:52.760	
+1318	-	00:52.720	
+
+00:52.760	--> 	00:52.800	
+1319	-	00:52.760	
+
+00:52.800	--> 	00:52.840	
+1320	-	00:52.800	
+
+00:52.840	--> 	00:52.880	
+1321	-	00:52.840	
+
+00:52.880	--> 	00:52.920	
+1322	-	00:52.880	
+
+00:52.920	--> 	00:52.960	
+1323	-	00:52.920	
+
+00:52.960	--> 	00:53.000	
+1324	-	00:52.960	
+
+00:53.000	--> 	00:53.040	
+1325	-	00:53.000	
+
+00:53.040	--> 	00:53.080	
+1326	-	00:53.040	
+
+00:53.080	--> 	00:53.120	
+1327	-	00:53.080	
+
+00:53.120	--> 	00:53.160	
+1328	-	00:53.120	
+
+00:53.160	--> 	00:53.200	
+1329	-	00:53.160	
+
+00:53.200	--> 	00:53.240	
+1330	-	00:53.200	
+
+00:53.240	--> 	00:53.280	
+1331	-	00:53.240	
+
+00:53.280	--> 	00:53.320	
+1332	-	00:53.280	
+
+00:53.320	--> 	00:53.360	
+1333	-	00:53.320	
+
+00:53.360	--> 	00:53.400	
+1334	-	00:53.360	
+
+00:53.400	--> 	00:53.440	
+1335	-	00:53.400	
+
+00:53.440	--> 	00:53.480	
+1336	-	00:53.440	
+
+00:53.480	--> 	00:53.520	
+1337	-	00:53.480	
+
+00:53.520	--> 	00:53.560	
+1338	-	00:53.520	
+
+00:53.560	--> 	00:53.600	
+1339	-	00:53.560	
+
+00:53.600	--> 	00:53.640	
+1340	-	00:53.600	
+
+00:53.640	--> 	00:53.680	
+1341	-	00:53.640	
+
+00:53.680	--> 	00:53.720	
+1342	-	00:53.680	
+
+00:53.720	--> 	00:53.760	
+1343	-	00:53.720	
+
+00:53.760	--> 	00:53.800	
+1344	-	00:53.760	
+
+00:53.800	--> 	00:53.840	
+1345	-	00:53.800	
+
+00:53.840	--> 	00:53.880	
+1346	-	00:53.840	
+
+00:53.880	--> 	00:53.920	
+1347	-	00:53.880	
+
+00:53.920	--> 	00:53.960	
+1348	-	00:53.920	
+
+00:53.960	--> 	00:54.000	
+1349	-	00:53.960	
+
+00:54.000	--> 	00:54.040	
+1350	-	00:54.000	
+
+00:54.040	--> 	00:54.080	
+1351	-	00:54.040	
+
+00:54.080	--> 	00:54.120	
+1352	-	00:54.080	
+
+00:54.120	--> 	00:54.160	
+1353	-	00:54.120	
+
+00:54.160	--> 	00:54.200	
+1354	-	00:54.160	
+
+00:54.200	--> 	00:54.240	
+1355	-	00:54.200	
+
+00:54.240	--> 	00:54.280	
+1356	-	00:54.240	
+
+00:54.280	--> 	00:54.320	
+1357	-	00:54.280	
+
+00:54.320	--> 	00:54.360	
+1358	-	00:54.320	
+
+00:54.360	--> 	00:54.400	
+1359	-	00:54.360	
+
+00:54.400	--> 	00:54.440	
+1360	-	00:54.400	
+
+00:54.440	--> 	00:54.480	
+1361	-	00:54.440	
+
+00:54.480	--> 	00:54.520	
+1362	-	00:54.480	
+
+00:54.520	--> 	00:54.560	
+1363	-	00:54.520	
+
+00:54.560	--> 	00:54.600	
+1364	-	00:54.560	
+
+00:54.600	--> 	00:54.640	
+1365	-	00:54.600	
+
+00:54.640	--> 	00:54.680	
+1366	-	00:54.640	
+
+00:54.680	--> 	00:54.720	
+1367	-	00:54.680	
+
+00:54.720	--> 	00:54.760	
+1368	-	00:54.720	
+
+00:54.760	--> 	00:54.800	
+1369	-	00:54.760	
+
+00:54.800	--> 	00:54.840	
+1370	-	00:54.800	
+
+00:54.840	--> 	00:54.880	
+1371	-	00:54.840	
+
+00:54.880	--> 	00:54.920	
+1372	-	00:54.880	
+
+00:54.920	--> 	00:54.960	
+1373	-	00:54.920	
+
+00:54.960	--> 	00:55.000	
+1374	-	00:54.960	
+
+00:55.000	--> 	00:55.040	
+1375	-	00:55.000	
+
+00:55.040	--> 	00:55.080	
+1376	-	00:55.040	
+
+00:55.080	--> 	00:55.120	
+1377	-	00:55.080	
+
+00:55.120	--> 	00:55.160	
+1378	-	00:55.120	
+
+00:55.160	--> 	00:55.200	
+1379	-	00:55.160	
+
+00:55.200	--> 	00:55.240	
+1380	-	00:55.200	
+
+00:55.240	--> 	00:55.280	
+1381	-	00:55.240	
+
+00:55.280	--> 	00:55.320	
+1382	-	00:55.280	
+
+00:55.320	--> 	00:55.360	
+1383	-	00:55.320	
+
+00:55.360	--> 	00:55.400	
+1384	-	00:55.360	
+
+00:55.400	--> 	00:55.440	
+1385	-	00:55.400	
+
+00:55.440	--> 	00:55.480	
+1386	-	00:55.440	
+
+00:55.480	--> 	00:55.520	
+1387	-	00:55.480	
+
+00:55.520	--> 	00:55.560	
+1388	-	00:55.520	
+
+00:55.560	--> 	00:55.600	
+1389	-	00:55.560	
+
+00:55.600	--> 	00:55.640	
+1390	-	00:55.600	
+
+00:55.640	--> 	00:55.680	
+1391	-	00:55.640	
+
+00:55.680	--> 	00:55.720	
+1392	-	00:55.680	
+
+00:55.720	--> 	00:55.760	
+1393	-	00:55.720	
+
+00:55.760	--> 	00:55.800	
+1394	-	00:55.760	
+
+00:55.800	--> 	00:55.840	
+1395	-	00:55.800	
+
+00:55.840	--> 	00:55.880	
+1396	-	00:55.840	
+
+00:55.880	--> 	00:55.920	
+1397	-	00:55.880	
+
+00:55.920	--> 	00:55.960	
+1398	-	00:55.920	
+
+00:55.960	--> 	00:56.000	
+1399	-	00:55.960	
+
+00:56.000	--> 	00:56.040	
+1400	-	00:56.000	
+
+00:56.040	--> 	00:56.080	
+1401	-	00:56.040	
+
+00:56.080	--> 	00:56.120	
+1402	-	00:56.080	
+
+00:56.120	--> 	00:56.160	
+1403	-	00:56.120	
+
+00:56.160	--> 	00:56.200	
+1404	-	00:56.160	
+
+00:56.200	--> 	00:56.240	
+1405	-	00:56.200	
+
+00:56.240	--> 	00:56.280	
+1406	-	00:56.240	
+
+00:56.280	--> 	00:56.320	
+1407	-	00:56.280	
+
+00:56.320	--> 	00:56.360	
+1408	-	00:56.320	
+
+00:56.360	--> 	00:56.400	
+1409	-	00:56.360	
+
+00:56.400	--> 	00:56.440	
+1410	-	00:56.400	
+
+00:56.440	--> 	00:56.480	
+1411	-	00:56.440	
+
+00:56.480	--> 	00:56.520	
+1412	-	00:56.480	
+
+00:56.520	--> 	00:56.560	
+1413	-	00:56.520	
+
+00:56.560	--> 	00:56.600	
+1414	-	00:56.560	
+
+00:56.600	--> 	00:56.640	
+1415	-	00:56.600	
+
+00:56.640	--> 	00:56.680	
+1416	-	00:56.640	
+
+00:56.680	--> 	00:56.720	
+1417	-	00:56.680	
+
+00:56.720	--> 	00:56.760	
+1418	-	00:56.720	
+
+00:56.760	--> 	00:56.800	
+1419	-	00:56.760	
+
+00:56.800	--> 	00:56.840	
+1420	-	00:56.800	
+
+00:56.840	--> 	00:56.880	
+1421	-	00:56.840	
+
+00:56.880	--> 	00:56.920	
+1422	-	00:56.880	
+
+00:56.920	--> 	00:56.960	
+1423	-	00:56.920	
+
+00:56.960	--> 	00:57.000	
+1424	-	00:56.960	
+
+00:57.000	--> 	00:57.040	
+1425	-	00:57.000	
+
+00:57.040	--> 	00:57.080	
+1426	-	00:57.040	
+
+00:57.080	--> 	00:57.120	
+1427	-	00:57.080	
+
+00:57.120	--> 	00:57.160	
+1428	-	00:57.120	
+
+00:57.160	--> 	00:57.200	
+1429	-	00:57.160	
+
+00:57.200	--> 	00:57.240	
+1430	-	00:57.200	
+
+00:57.240	--> 	00:57.280	
+1431	-	00:57.240	
+
+00:57.280	--> 	00:57.320	
+1432	-	00:57.280	
+
+00:57.320	--> 	00:57.360	
+1433	-	00:57.320	
+
+00:57.360	--> 	00:57.400	
+1434	-	00:57.360	
+
+00:57.400	--> 	00:57.440	
+1435	-	00:57.400	
+
+00:57.440	--> 	00:57.480	
+1436	-	00:57.440	
+
+00:57.480	--> 	00:57.520	
+1437	-	00:57.480	
+
+00:57.520	--> 	00:57.560	
+1438	-	00:57.520	
+
+00:57.560	--> 	00:57.600	
+1439	-	00:57.560	
+
+00:57.600	--> 	00:57.640	
+1440	-	00:57.600	
+
+00:57.640	--> 	00:57.680	
+1441	-	00:57.640	
+
+00:57.680	--> 	00:57.720	
+1442	-	00:57.680	
+
+00:57.720	--> 	00:57.760	
+1443	-	00:57.720	
+
+00:57.760	--> 	00:57.800	
+1444	-	00:57.760	
+
+00:57.800	--> 	00:57.840	
+1445	-	00:57.800	
+
+00:57.840	--> 	00:57.880	
+1446	-	00:57.840	
+
+00:57.880	--> 	00:57.920	
+1447	-	00:57.880	
+
+00:57.920	--> 	00:57.960	
+1448	-	00:57.920	
+
+00:57.960	--> 	00:58.000	
+1449	-	00:57.960	
+
+00:58.000	--> 	00:58.040	
+1450	-	00:58.000	
+
+00:58.040	--> 	00:58.080	
+1451	-	00:58.040	
+
+00:58.080	--> 	00:58.120	
+1452	-	00:58.080	
+
+00:58.120	--> 	00:58.160	
+1453	-	00:58.120	
+
+00:58.160	--> 	00:58.200	
+1454	-	00:58.160	
+
+00:58.200	--> 	00:58.240	
+1455	-	00:58.200	
+
+00:58.240	--> 	00:58.280	
+1456	-	00:58.240	
+
+00:58.280	--> 	00:58.320	
+1457	-	00:58.280	
+
+00:58.320	--> 	00:58.360	
+1458	-	00:58.320	
+
+00:58.360	--> 	00:58.400	
+1459	-	00:58.360	
+
+00:58.400	--> 	00:58.440	
+1460	-	00:58.400	
+
+00:58.440	--> 	00:58.480	
+1461	-	00:58.440	
+
+00:58.480	--> 	00:58.520	
+1462	-	00:58.480	
+
+00:58.520	--> 	00:58.560	
+1463	-	00:58.520	
+
+00:58.560	--> 	00:58.600	
+1464	-	00:58.560	
+
+00:58.600	--> 	00:58.640	
+1465	-	00:58.600	
+
+00:58.640	--> 	00:58.680	
+1466	-	00:58.640	
+
+00:58.680	--> 	00:58.720	
+1467	-	00:58.680	
+
+00:58.720	--> 	00:58.760	
+1468	-	00:58.720	
+
+00:58.760	--> 	00:58.800	
+1469	-	00:58.760	
+
+00:58.800	--> 	00:58.840	
+1470	-	00:58.800	
+
+00:58.840	--> 	00:58.880	
+1471	-	00:58.840	
+
+00:58.880	--> 	00:58.920	
+1472	-	00:58.880	
+
+00:58.920	--> 	00:58.960	
+1473	-	00:58.920	
+
+00:58.960	--> 	00:59.000	
+1474	-	00:58.960	
+
+00:59.000	--> 	00:59.040	
+1475	-	00:59.000	
+
+00:59.040	--> 	00:59.080	
+1476	-	00:59.040	
+
+00:59.080	--> 	00:59.120	
+1477	-	00:59.080	
+
+00:59.120	--> 	00:59.160	
+1478	-	00:59.120	
+
+00:59.160	--> 	00:59.200	
+1479	-	00:59.160	
+
+00:59.200	--> 	00:59.240	
+1480	-	00:59.200	
+
+00:59.240	--> 	00:59.280	
+1481	-	00:59.240	
+
+00:59.280	--> 	00:59.320	
+1482	-	00:59.280	
+
+00:59.320	--> 	00:59.360	
+1483	-	00:59.320	
+
+00:59.360	--> 	00:59.400	
+1484	-	00:59.360	
+
+00:59.400	--> 	00:59.440	
+1485	-	00:59.400	
+
+00:59.440	--> 	00:59.480	
+1486	-	00:59.440	
+
+00:59.480	--> 	00:59.520	
+1487	-	00:59.480	
+
+00:59.520	--> 	00:59.560	
+1488	-	00:59.520	
+
+00:59.560	--> 	00:59.600	
+1489	-	00:59.560	
+
+00:59.600	--> 	00:59.640	
+1490	-	00:59.600	
+
+00:59.640	--> 	00:59.680	
+1491	-	00:59.640	
+
+00:59.680	--> 	00:59.720	
+1492	-	00:59.680	
+
+00:59.720	--> 	00:59.760	
+1493	-	00:59.720	
+
+00:59.760	--> 	00:59.800	
+1494	-	00:59.760	
+
+00:59.800	--> 	00:59.840	
+1495	-	00:59.800	
+
+00:59.840	--> 	00:59.880	
+1496	-	00:59.840	
+
+00:59.880	--> 	00:59.920	
+1497	-	00:59.880	
+
+00:59.920	--> 	00:59.960	
+1498	-	00:59.920	
+
+00:59.960	--> 	01:00.000	
+1499	-	00:59.960	
+

v0.5.2.tar.gz/regression_tests/webvtt/simple.vtt -> v0.6.1.tar.gz/regression_tests/webvtt/simple.vtt Changed

@@ -1,32 +1,32 @@
-WEBVTT
-
-00:00.000 --> 00:02.000
-Hello, this is a first sample
-
-00:02.000 --> 00:04.000
-And now a second sample
-on two lines
-
-00:04.000 --> 00:06.000
-And now with a italic text
-
-00:06.000 --> 00:08.000
-Or bold text
-
-00:08.000 --> 00:10.000
-Or underlined text
-
-00:10.000 --> 00:12.000
-<v Jean>What is it for?<v Cyril>I don't care...
-
-00:12.000 --> 00:14.000
-Some text <00:13.000>and some later text
-
-00:14.000 --> 00:16.000
-<c.myClass>Classed text</c>
-
-00:16.000 --> 00:18.000
-<lang fr>En français</lang>
-
-00:18.000 --> 00:20.000
+WEBVTT
+
+00:00.000 --> 00:02.000
+Hello, this is a first sample
+
+00:02.000 --> 00:04.000
+And now a second sample
+on two lines
+
+00:04.000 --> 00:06.000
+And now with a italic text
+
+00:06.000 --> 00:08.000
+Or bold text
+
+00:08.000 --> 00:10.000
+Or underlined text
+
+00:10.000 --> 00:12.000
+<v Jean>What is it for?<v Cyril>I don't care...
+
+00:12.000 --> 00:14.000
+Some text <00:13.000>and some later text
+
+00:14.000 --> 00:16.000
+<c.myClass>Classed text</c>
+
+00:16.000 --> 00:18.000
+<lang fr>En français</lang>
+
+00:18.000 --> 00:20.000
 And also bold and italic nested
\ No newline at end of file

v0.6.1.tar.gz/regression_tests/xmlin4 Added

v0.6.1.tar.gz/regression_tests/xmlin4/anim.swf Added

v0.6.1.tar.gz/regression_tests/xmlin4/ebu-ttd_sample.ttml Added

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
+ xmlns:tts="http://www.w3.org/ns/ttml#styling"
+ ttp:timeBase="media"
+ ttp:cellResolution="50 30"
+ xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
+	 <head>
+		 <styling>
+			 <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
+ tts:fontSize="160%"
+ tts:lineHeight="125%"
+ tts:color="#ffffff"
+ tts:backgroundColor="#000000c2"
+ tts:textAlign="center"/>
+		 </styling>
+		 <layout>
+			 <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
+ tts:displayAlign="after"/>
+		 </layout>
+	 </head>
+	 <body>
+		 <div style="defaultStyle">
+			 00:00:00.000 00:00:01.400
+			 00:00:02.120 00:00:03.800
+			 00:00:22.720 00:00:25.840
+			 00:00:26.080 00:00:29.120
+			 00:00:29.120 00:00:30.640
+			 00:00:30.960 00:00:33.200
+			 00:00:33.200 00:00:36.320
+			 00:00:36.320 00:00:40.040
+			 00:00:40.040 00:00:43.520
+			 00:00:43.520 00:00:46.920
+			 00:00:46.920 00:00:51.040
+			 00:00:51.080 00:00:54.160
+			 00:00:54.480 00:00:58.240
+		 </div>
+	 </body>
+</tt>
+

v0.6.1.tar.gz/regression_tests/xmlin4/first.xml Added

v0.6.1.tar.gz/regression_tests/xmlin4/input.txt Added

@@ -0,0 +1,13 @@
+This is a test file containing some text.
+
+1st paragraph
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vehicula suscipit ligula, quis dignissim ipsum auctor quis. Vestibulum condimentum pharetra quam, id aliquet libero euismod quis. Sed sollicitudin ullamcorper arcu, sit amet maximus tortor gravida vel. Duis in dolor in lorem consectetur eleifend. Donec ac suscipit ante. Praesent pharetra vestibulum felis et aliquet. In hac habitasse platea dictumst. Vestibulum orci urna, auctor vel tempus vitae, mattis at enim. Donec porttitor sollicitudin ex, vitae congue dolor dapibus sit amet. Integer vitae quam a erat dignissim eleifend. Aliquam sagittis leo ut leo luctus pulvinar. Fusce ut porta eros, eget bibendum justo. Mauris nunc quam, ullamcorper in hendrerit et, tristique elementum erat. Vivamus convallis pellentesque dignissim.
+
+2nd paragraph
+Vivamus sed euismod ligula, non tempus sapien. Ut iaculis arcu quis cursus placerat. Phasellus vitae ipsum justo. Curabitur pretium nulla ut lorem pulvinar, quis lobortis augue congue. Donec mattis placerat elit, non tincidunt nunc bibendum et. Sed fermentum urna sit amet quam ultrices gravida. Suspendisse vulputate nisl enim. Duis euismod luctus enim vel dapibus. Vestibulum at elementum diam. Mauris commodo pharetra bibendum.
+
+3rd paragraph
+Ut eget quam mauris. Cras tincidunt tincidunt est, id dapibus massa gravida gravida. Mauris sed congue nisl, quis dignissim orci. Proin ac fringilla orci. Morbi malesuada elit id arcu ullamcorper efficitur. Etiam eget leo arcu. Donec vestibulum diam odio, ac porta libero bibendum pharetra. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed vel ullamcorper dui. Donec vel blandit mauris. Nunc eleifend maximus tristique.
+
+4th paragraph
+Praesent turpis lorem, maximus ut luctus eget, sodales ut enim. Ut malesuada mollis efficitur. In mi urna, laoreet sit amet imperdiet quis, fermentum sed ipsum. Sed enim augue, dignissim at sollicitudin non, consectetur sit amet elit. Donec lobortis leo sapien, non cursus nisl ullamcorper eu. Proin id massa porta, mollis dui non, rhoncus ipsum. Cras eu est a eros dictum tincidunt nec nec turpis. Quisque nec arcu a ex blandit semper ac et libero. Sed at augue sed tellus congue imperdiet eu id ex. Fusce ac accumsan augue.

v0.6.1.tar.gz/regression_tests/xmlin4/input.xml Added

v0.6.1.tar.gz/regression_tests/xmlin4/last.xml Added

v0.6.1.tar.gz/regression_tests/xmlin4/meta-mett-no-mime.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/meta-mett-xml-header.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/meta-mett-xml.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/meta-mett.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/meta-metx-no-namespace.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/meta-metx.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/run_one_test.sh Added

v0.6.1.tar.gz/regression_tests/xmlin4/run_tests.sh Added

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+echo -e "*************** Running text tests ..."
+
+echo -e "\nTesting simple 'metx'"
+./run_one_test.sh meta-metx
+
+echo -e "\nTesting 'metx' import when namespace is not given, shoud fail"
+MP4Box -add meta-metx-no-namespace.nhml -new meta-metx-no-namespace.mp4 
+
+echo -e "\nTesting simple 'mett'"
+./run_one_test.sh meta-mett
+
+echo -e "\nTesting 'mett' when no mime type is provided, should default to text/plain"
+./run_one_test.sh meta-mett-no-mime
+
+echo -e "\nTesting 'mett' with an XML document"
+./run_one_test.sh meta-mett-xml
+
+echo -e "\nTesting 'mett' with an XML document and a header"
+./run_one_test.sh meta-mett-xml-header
+
+echo -e "\nTesting 'stpp' import"
+./run_one_test.sh subt-stpp
+
+echo -e "\nTesting 'stpp' import when namespace is not provided, should fail"
+MP4Box -add subt-stpp-no-namespace.nhml -new subt-stpp-no-namespace.mp4
+
+echo -e "\nTesting 'sbtt' import"
+./run_one_test.sh subt-sbtt
+
+echo -e "\nTesting 'sbtt' import without mime, default to text/plain"
+./run_one_test.sh subt-sbtt-no-mime
+
+echo -e "\nTesting simple 'stxt' import"
+./run_one_test.sh text-stxt
+
+echo -e "\nTesting 'stxt' import without mime, default to text/plain"
+./run_one_test.sh text-stxt-no-mime
+
+echo -e "\nTesting 'stxt' import with header"
+./run_one_test.sh text-stxt-header
+
+echo -e "\n**************** Testing SWF conversion as SVG and import as 'stxt' stream "
+MP4Box -add anim.swf:fmt=svg -new text-stxt-svg.mp4
+MP4Box -info text-stxt-svg.mp4
+MP4Box -raw 1 text-stxt-svg.mp4
+MP4Box -raws 1 text-stxt-svg.mp4
+
+#MP4Box -mp4 anim.swf
+
+echo -e "\n**************** Testing TTML import as 'stpp' stream "
+MP4Box -add ebu-ttd_sample.ttml -new subt-stpp-ttml.mp4
+MP4Box -info subt-stpp-ttml.mp4
+MP4Box -raw 1 subt-stpp-ttml.mp4
+MP4Box -raws 1 subt-stpp-ttml.mp4
+
+echo -e "\n**************** Generating file with all text variants text-all.mp4 "
+MP4Box -add meta-mett.mp4 -add meta-mett-xml.mp4 -add meta-mett-xml-header.mp4 -add meta-metx.mp4 -add subt-sbtt.mp4 -add subt-stpp.mp4 -add subt-stpp-ttml.mp4 -add text-stxt.mp4 -add text-stxt-header.mp4 -add text-stxt-svg.mp4 -new text-all.mp4
\ No newline at end of file

v0.6.1.tar.gz/regression_tests/xmlin4/second.xml Added

v0.6.1.tar.gz/regression_tests/xmlin4/subt-sbtt-no-mime.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/subt-sbtt.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/subt-stpp-no-namespace.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/subt-stpp.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/text-stxt-header.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/text-stxt-no-mime.nhml Added

v0.6.1.tar.gz/regression_tests/xmlin4/text-stxt.nhml Added

v0.6.1.tar.gz/shaders Added

v0.6.1.tar.gz/shaders/fragment.glsl Added

@@ -0,0 +1,373 @@
+/**
+ * Shader implementing: Clipping, Texturing (RGB and YUV), Lighting, Fog
+ **/
+
+//version defined first, at shader compilation
+
+#if defined(GL_ES)
+#if defined(GL_FRAGMENT_PRECISION_HIGH)
+precision highp float;	//ES2.0 supporting highp
+#else
+precision mediump float;	//Default
+#endif
+#endif
+
+//#pragma STDGL invariant(all)	//removed due to incompatibility with the emulator
+
+//LIGHTS_MAX and CLIP_MAX defined at shader compilation
+
+
+#ifdef GF_GL_HAS_LIGHT
+
+#define FOG_TYPE_LINEAR 0
+#define FOG_TYPE_EXP 1
+#define FOG_TYPE_EXP2 2
+
+#define L_DIRECTIONAL	0
+#define L_SPOT		 1
+#define L_POINT			2
+
+//Light Structure
+struct gfLight{
+#if defined(GL_ES)
+	lowp int type;
+#else
+	int type;
+#endif
+	vec4 position;
+	vec4 direction;
+	vec3 attenuation;
+	vec4 color;
+	float ambientIntensity;	//it is not used - we calculate it inside the shader
+	float intensity;
+	float beamWidth;	//it is not used - we calculate it inside the shader
+	float cutOffAngle;
+};
+
+//Generic (Scene) Uniforms
+#if defined(GL_ES)
+uniform lowp int gfNumLights;
+#else
+uniform int gfNumLights;
+#endif
+uniform bool gfLightTwoSide;
+uniform gfLight lights[LIGHTS_MAX];
+
+//Material and Lighting Properties
+uniform vec4 gfAmbientColor;
+uniform vec4 gfDiffuseColor;
+uniform vec4 gfSpecularColor;
+uniform float gfShininess;	//a.k.a. specular exponent
+uniform vec4 gfLightDiffuse;
+uniform vec4 gfLightAmbient;
+uniform vec4 gfLightSpecular;
+
+//Fog
+uniform bool gfFogEnabled;
+uniform vec3 gfFogColor;
+
+#endif
+
+uniform bool hasMaterial2D;
+uniform vec4 gfEmissionColor;
+
+#ifdef GF_GL_HAS_COLOR
+uniform bool hasMeshColor;
+#endif
+
+#ifdef GF_GL_HAS_CLIP
+#if defined(GL_ES)
+uniform lowp int gfNumClippers;
+#else
+uniform int gfNumClippers;
+#endif
+#endif
+
+//Color Matrix
+uniform mat4 gfColorMatrix;
+uniform bool hasColorMatrix;
+uniform vec4 gfTranslationVector;
+	
+//Color Key
+uniform vec3 gfKeyColor;
+uniform float gfKeyAlpha;
+uniform float gfKeyLow;
+uniform float gfKeyHigh;
+uniform bool hasColorKey;
+
+#ifdef GF_GL_HAS_TEXTURE
+
+uniform int gfNumTextures;
+
+//Texture samplers
+#ifdef GF_GL_IS_YUV
+uniform bool isNV21PixelFormat;
+uniform sampler2D y_plane;
+uniform sampler2D u_plane;
+uniform sampler2D v_plane;
+#else
+uniform sampler2D img;
+#endif
+
+//Texture other
+uniform float alpha;
+const vec3 offset = vec3(-0.0625, -0.5, -0.5);
+const vec3 R_mul = vec3(1.164, 0.000, 1.596);
+const vec3 G_mul = vec3(1.164, -0.391, -0.813);
+const vec3 B_mul = vec3(1.164, 2.018, 0.000);
+
+#endif
+
+
+//Varyings
+#ifdef GF_GL_HAS_LIGHT
+varying vec3 m_normal;
+varying vec4 gfEye;
+varying vec3 lightVector[LIGHTS_MAX];
+varying float gfFogFactor;
+#endif
+
+#ifdef GF_GL_HAS_TEXTURE
+varying vec2 TexCoord;
+#endif
+
+#ifdef GF_GL_HAS_COLOR
+varying vec4 m_color;
+#endif
+
+#ifdef GF_GL_HAS_CLIP
+varying float clipDistance[CLIPS_MAX];
+#endif
+
+//constants
+const float zero_float = 0.0;
+const float one_float = 1.0;
+
+
+#ifdef GF_GL_HAS_LIGHT
+vec4 doLighting(int i){
+
+	vec4 lightColor = vec4(zero_float, zero_float, zero_float, zero_float);
+	float att = zero_float;
+	gfLight tempLight;	//we use a temp gfLight, because array of straucts in fragment are not supported in android
+	vec3 lightVnorm; //normalized lightVector
+	vec3 lightV; //temp lightVector
+	vec3 halfVnorm; //temp lightVector
+
+	//FIXME - couldn't we use a light[i]. something here ?
+	if(i==0) {	//ES2 does not support switch() statements
+		tempLight = lights[0];
+		lightV = lightVector[0];
+		halfVnorm = normalize( lightVector[0] + gfEye.xyz );
+	} else if (i==1) {
+		tempLight = lights[1];
+		lightV = lightVector[1];
+		halfVnorm = normalize( lightVector[1] + gfEye.xyz );
+	} else if(i==2) {
+		tempLight = lights[2];
+		lightV = lightVector[2];
+		halfVnorm = normalize( lightVector[2] + gfEye.xyz );
+	}
+	
+	lightVnorm = normalize(lightV);
+	vec3 normal = normalize(m_normal);
+
+	if (gfLightTwoSide && (!gl_FrontFacing)){//light back face
+		//originally: normal *=-1; -> Not compliant with Shading Language v1.0
+		normal *= vec3(-1.0, -1.0, -1.0);
+	}
+	
+	float light_cos = max(zero_float, dot(normal, lightVnorm));	//ndotl
+	float half_cos = dot(normal, halfVnorm);
+
+	if (tempLight.type == L_POINT) {	//we have a point
+		float distance = length(lightV);	
+		att = 1.0 / (tempLight.attenuation.x + tempLight.attenuation.y * distance + tempLight.attenuation.z * distance * distance);
+
+		if (att <= 0.0)
+			return lightColor;
+			
+		lightColor += light_cos * tempLight.color * gfDiffuseColor;
+		
+		if (light_cos > 0.0) {
+			float dotNormHalf = max(dot(normal, halfVnorm),0.0);	//ndoth
+			lightColor += (pow(dotNormHalf, gfShininess) * gfSpecularColor * tempLight.color);
+			lightColor *= att;
+		}
+		lightColor.a = gfDiffuseColor.a;
+		return lightColor;
+		
+	} else if (tempLight.type == L_SPOT) {	//we have a spot
+		if (light_cos > 0.0) {
+			float spot = dot(normalize(tempLight.direction.xyz), lightVnorm);	//it should be -direction, but we invert it before parsing
+			if (spot > tempLight.cutOffAngle) {
+				float distance = length(lightV);	
+				float dotNormHalf = max(dot(normal, halfVnorm),0.0);	//ndoth
+				spot = pow(spot, tempLight.intensity);
+				att = spot / (tempLight.attenuation.x + tempLight.attenuation.y * distance + tempLight.attenuation.z * distance * distance);
+				lightColor += att * (light_cos * tempLight.color * gfDiffuseColor);
+				lightColor += att * (pow(dotNormHalf, gfShininess) * gfSpecularColor * tempLight.color);
+			}
+		}
+		return lightColor;
+
+	} else if(tempLight.position.w == zero_float || tempLight.type == L_DIRECTIONAL) { //we have a direction
+		vec3 lightDirection = vec3(tempLight.position);
+		lightColor = (gfDiffuseColor * gfLightDiffuse) * light_cos; 
+		if (half_cos > zero_float) {
+			lightColor += (gfSpecularColor * gfLightSpecular) * pow(half_cos, gfShininess);
+		}
+		lightColor.a = gfDiffuseColor.a;
+		return lightColor;
+	}
+
+	return vec4(zero_float);
+}
+#endif //GF_GL_HAS_LIGHT
+
+void main()
+{
+#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
+	bool do_clip=false;
+#endif
+	int i;
+	vec2 texc;
+	vec3 yuv, rgb;
+	vec4 rgba, fragColor;
+
+#ifdef GF_GL_HAS_CLIP
+	//clipping
+	for (int i=0; i<CLIPS_MAX; i++) {
+		if (i==gfNumClippers) break;
+		if (clipDistance[i]<0.0) {
+			//do not discard on GLES too slow on most devices
+#if defined(GL_ES)
+			do_clip=true;
+			break;
+#else
+			discard;
+#endif
+		}
+	}
+#endif
+	
+#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
+	if (do_clip) {
+		gl_FragColor = vec4(zero_float);
+	} else {
+#endif
+		
+		
+#ifdef GF_GL_HAS_COLOR
+	fragColor = m_color;
+#else
+	fragColor = vec4(zero_float);
+#endif
+
+	if (hasMaterial2D) {
+		fragColor = gfEmissionColor;
+	}
+
+#if defined (GF_GL_HAS_LIGHT)
+	if (gfNumLights>0) {
+#ifdef GF_GL_HAS_COLOR
+		fragColor += (gfAmbientColor * gfLightAmbient);
+#else
+		fragColor = gfEmissionColor + (gfAmbientColor * gfLightAmbient);
+#endif
+	}
+#endif
+
+#ifdef GF_GL_HAS_LIGHT
+	if (gfNumLights > 0) {
+		for (int i=0; i<LIGHTS_MAX; i++) {
+			if (i==gfNumLights) break;
+			fragColor += doLighting(i);
+		}
+		fragColor.a = gfDiffuseColor.a;
+	}
+#endif
+	
+	fragColor = clamp(fragColor, zero_float, one_float);
+
+#ifdef GF_GL_HAS_TEXTURE
+	
+	//currently supporting 1 texture
+	if (gfNumTextures>0) {
+#ifdef GF_GL_IS_YUV
+		texc = TexCoord.st;
+		yuv.x = texture2D(y_plane, texc).r;
+		if (isNV21PixelFormat) {
+			yuv.y = texture2D(u_plane, texc).a;
+			yuv.z = texture2D(u_plane, texc).r;
+		}
+		else {
+			yuv.y = texture2D(u_plane, texc).r;
+			yuv.z = texture2D(v_plane, texc).r;
+		}
+		yuv += offset;
+		rgb.r = dot(yuv, R_mul);
+		rgb.g = dot(yuv, G_mul);
+		rgb.b = dot(yuv, B_mul);
+
+		rgba = vec4(rgb, alpha);
+#else
+		rgba = texture2D(img, TexCoord);
+#endif
+
+#ifdef GF_GL_HAS_LIGHT
+		if (gfNumLights>0) {	//RGB texture
+			fragColor = rgba;
+		}
+		//RGB texture with material 2D [TODO: check]
+		else if(gfNumLights==0)
+#endif
+		{
+			fragColor = rgba;
+		}
+
+		//we have mat 2D + texture
+		if (hasMaterial2D) {
+			if(gfEmissionColor.a > 0.0 && gfEmissionColor.a <1.0) {
+				fragColor *= gfEmissionColor;
+			} else if(fragColor.rgb == vec3(0.0, 0.0, 0.0)){
+				fragColor.rgb = gfEmissionColor.rgb;
+			}
+		}
+	}
+	
+#endif // GF_GL_HAS_TEXTURE
+	
+	
+	if (hasColorMatrix) {
+		fragColor = gfColorMatrix * fragColor;
+		fragColor += gfTranslationVector;
+		fragColor = clamp(fragColor, zero_float, one_float);
+	}
+	
+	if (hasColorKey) {
+		vec3 tempColour = vec3(0.0, 0.0, 0.0);
+		float mean = 0.0;
+		
+		tempColour.r = abs(gfKeyColor.r-fragColor.r);
+		tempColour.g = abs(gfKeyColor.g-fragColor.g);
+		tempColour.b = abs(gfKeyColor.b-fragColor.b);
+		mean = (tempColour.r + tempColour.g + tempColour.b)/3.0;
+		
+		if (mean<gfKeyLow) {
+			fragColor.a =0.0;
+		} else if(mean<=gfKeyHigh) {
+			fragColor.a = (mean-gfKeyLow) * gfKeyAlpha / (gfKeyHigh - gfKeyLow);
+		}
+	}
+	
+#ifdef GF_GL_HAS_LIGHT
+	if (gfFogEnabled)
+		fragColor = fragColor * gfFogFactor + vec4(gfFogColor, zero_float) * (one_float - gfFogFactor);
+#endif
+	gl_FragColor = fragColor;
+
+#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
+	}
+#endif
+}

v0.6.1.tar.gz/shaders/vertex.glsl Added

@@ -0,0 +1,196 @@
+/**
+ * Shader implementing: Clipping, Texturing (RGB and YUV), Lighting, Fog
+ **/
+
+//version defined first, at shader compilation
+
+#if defined(GL_ES)
+#if defined(GL_FRAGMENT_PRECISION_HIGH)
+precision highp float;	//ES2.0 supporting highp
+#else
+precision mediump float;	//Default
+#endif
+#endif
+
+//#pragma STDGL invariant(all)	//removed due to incompatibility with the emulator
+
+//LIGHTS_MAX and CLIP_MAX defined at shader compilation
+
+
+//lights definitions
+#ifdef GF_GL_HAS_LIGHT
+
+#define FOG_TYPE_LINEAR 0
+#define FOG_TYPE_EXP 1
+#define FOG_TYPE_EXP2 2
+
+#define L_DIRECTIONAL	0
+#define L_SPOT		 1
+#define L_POINT			2
+
+
+//Light Structure
+struct gfLight{
+#if defined(GL_ES)
+	lowp int type;
+#else
+	int type;
+#endif
+	vec4 position;
+	vec4 direction;
+	vec3 attenuation;
+	vec4 color;
+	float ambientIntensity;	//it is not used - we calculate it inside the shader
+	float intensity;
+	float beamWidth;	//it is not used - we calculate it inside the shader
+	float cutOffAngle;
+};
+#endif
+
+
+//Attributes
+attribute vec4 gfVertex;
+
+#ifdef GF_GL_HAS_LIGHT
+attribute vec3 gfNormal;
+#endif
+
+#ifdef GF_GL_HAS_TEXTURE
+attribute vec4 gfMultiTexCoord;
+#endif
+
+#ifdef GF_GL_HAS_COLOR
+attribute vec4 gfMeshColor;
+#endif
+
+
+#ifdef GF_GL_HAS_LIGHT
+//Generic (Scene) uniforms
+uniform gfLight lights[LIGHTS_MAX];
+#if defined(GL_ES)
+uniform lowp int gfNumLights;
+#else
+uniform int gfNumLights;
+#endif
+
+//Fog
+uniform bool gfFogEnabled; 
+uniform vec3 gfFogColor; 
+uniform float gfFogDensity; 
+uniform int gfFogType; 
+uniform float gfFogVisibility; 
+
+#endif
+
+//Matrices
+uniform mat4 gfModelViewMatrix;
+uniform mat4 gfProjectionMatrix;
+
+#ifdef GF_GL_HAS_LIGHT
+uniform mat4 gfNormalMatrix;
+#endif
+
+#ifdef GF_GL_HAS_TEXTURE
+uniform mat4 gfTextureMatrix;
+uniform bool hasTextureMatrix;
+#endif
+
+//Clipping
+#ifdef GF_GL_HAS_CLIP
+#if defined(GL_ES)
+uniform lowp int gfNumClippers;
+#else
+uniform int gfNumClippers;
+#endif
+uniform vec4 clipPlane[CLIPS_MAX];
+#endif
+
+//Varyings
+#ifdef GF_GL_HAS_LIGHT
+
+varying vec4 gfEye;	//camera
+
+varying vec3 m_normal;		//normal
+varying vec3 lightVector[LIGHTS_MAX];
+varying float gfFogFactor;
+#endif
+
+#ifdef GF_GL_HAS_TEXTURE
+varying vec2 TexCoord;
+#endif
+
+#ifdef GF_GL_HAS_COLOR
+varying vec4 m_color;
+#endif
+
+#ifdef GF_GL_HAS_CLIP
+varying float clipDistance[CLIPS_MAX];
+#endif
+
+
+#ifdef GF_GL_HAS_LIGHT
+float fog()
+{
+	
+	float fog, eyeDist = length(gfEye-gfVertex);
+	
+	if(gfFogType==FOG_TYPE_LINEAR){
+		fog= (gfFogVisibility-eyeDist)/gfFogVisibility;
+	}else if(gfFogType==FOG_TYPE_EXP){
+		fog= exp(-(gfEye.z * gfFogDensity));
+	}else if(gfFogType==FOG_TYPE_EXP2){
+		fog= (gfEye.z * gfFogDensity);
+		fog = exp(-(fog * fog));
+	}
+	return clamp(fog, 0.0, 1.0);
+}
+#endif
+
+void main(void)
+{
+#ifndef GF_GL_HAS_LIGHT
+	vec4 gfEye;
+#endif
+	
+	gfEye = gfModelViewMatrix * gfVertex;
+	
+#ifdef GF_GL_HAS_COLOR
+	m_color = gfMeshColor;
+#endif
+	
+#ifdef GF_GL_HAS_LIGHT
+	m_normal = normalize( vec3(gfNormalMatrix * vec4(gfNormal, 0.0)) );
+	
+	for(int i=0; i<LIGHTS_MAX; i++){
+		if (i==gfNumLights) break;
+		
+		if ( lights[i].type == L_SPOT || lights[i].type == L_POINT ) {
+			lightVector[i] = lights[i].position.xyz - gfEye.xyz;
+		} else {
+			//if it is a directional light, position SHOULD indicate direction (modified implementation - check before committing)
+			lightVector[i] = lights[i].direction.xyz;
+		}
+	}
+	gfFogFactor = gfFogEnabled ? fog() : 1.0;
+	
+#endif
+	
+#ifdef GF_GL_HAS_TEXTURE
+	if (hasTextureMatrix) {
+		TexCoord = vec2(gfTextureMatrix * gfMultiTexCoord);
+	} else {
+		TexCoord = vec2(gfMultiTexCoord);
+	}
+#endif
+	
+	
+#ifdef GF_GL_HAS_CLIP
+	//clipPlane are given in eye coordinate
+	for (int i=0; i<CLIPS_MAX; i++) {
+		if (i==gfNumClippers) break;
+		clipDistance[i] = dot(gfEye.xyz, clipPlane[i].xyz) + clipPlane[i].w;
+	}
+#endif
+	
+	gl_Position = gfProjectionMatrix * gfEye;
+}

v0.5.2.tar.gz/src/Makefile -> v0.6.1.tar.gz/src/Makefile Changed

@@ -37,7 +37,7 @@
 endif
 
 ## libgpac objects gathering: src/isomedia
-LIBGPAC_ISOM=isomedia/avc_ext.o isomedia/box_code_3gpp.o isomedia/box_code_apple.o isomedia/box_code_base.o isomedia/box_code_drm.o isomedia/box_code_meta.o isomedia/box_dump.o isomedia/box_funcs.o isomedia/data_map.o isomedia/drm_sample.o isomedia/isom_intern.o isomedia/isom_read.o isomedia/isom_store.o isomedia/isom_write.o isomedia/media.o isomedia/media_odf.o isomedia/meta.o isomedia/movie_fragments.o isomedia/sample_descs.o isomedia/stbl_read.o isomedia/stbl_write.o isomedia/track.o isomedia/tx3g.o  
+LIBGPAC_ISOM=isomedia/avc_ext.o isomedia/box_code_3gpp.o isomedia/box_code_apple.o isomedia/box_code_base.o isomedia/box_code_drm.o isomedia/box_code_meta.o isomedia/box_dump.o isomedia/box_funcs.o isomedia/data_map.o isomedia/drm_sample.o isomedia/isom_intern.o isomedia/isom_read.o isomedia/isom_store.o isomedia/isom_write.o isomedia/media.o isomedia/media_odf.o isomedia/meta.o isomedia/movie_fragments.o isomedia/sample_descs.o isomedia/stbl_read.o isomedia/stbl_write.o isomedia/track.o isomedia/tx3g.o isomedia/iff.o   
 ifeq ($(DISABLE_ISOFF_HINT), no)
 LIBGPAC_ISOM+=isomedia/hint_track.o isomedia/hinting.o
 endif
@@ -206,359 +206,18 @@
 ## libgpac objects gathering: 
 OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_MCRYPT) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER)
 
-
-# configure static modules
-ifeq ($(STATIC_MODULES), yes)
-
-CFLAGS+= -DGPAC_STATIC_MODULES
-
-OBJS+=../modules/aac_in/aac_in.o
-ifneq ($(CONFIG_FAAD), no)
-OBJS+=../modules/aac_in/faad_dec.o
-CFLAGS+=-DGPAC_HAS_FAAD
-EXTRALIBS+= -lfaad
-endif
-
-OBJS+=../modules/ac3_in/ac3_in.o
-ifneq ($(CONFIG_A52), no)
-OBJS+=../modules/ac3_in/liba52_dec.o
-CFLAGS+=-DGPAC_HAS_LIBA52
-EXTRALIBS+= -la52
-endif
-
-ifeq ($(CONFIG_ALSA), yes)
-OBJS+=../modules/alsa/alsa.o
-CFLAGS+=-DGPAC_HAS_ALSA
-EXTRALIBS+= -lasound
-endif
-
-OBJS+=../modules/audio_filter/audio_filter.o
-OBJS+=../modules/bifs_dec/bifs_dec.o
-
-ifeq ($(DISABLE_SMGR), no)
-OBJS+=../modules/ctx_load/ctx_load.o
-OBJS+=../modules/svg_in/svg_in.o
-endif
-
-OBJS+=../modules/dummy_in/dummy_in.o
-OBJS+=../modules/ismacryp/isma_ea.o
-ifneq ($(CONFIG_JS), no)
-CFLAGS+=$(JS_FLAGS)
-OBJS+=../modules/gpac_js/gpac_js.o
-endif
-ifeq ($(DISABLE_SVG), no)
-OBJS+=../modules/laser_dec/laser_dec.o
-endif
-OBJS+=../modules/soft_raster/ftgrays.o ../modules/soft_raster/raster_load.o ../modules/soft_raster/raster_565.o ../modules/soft_raster/raster_argb.o ../modules/soft_raster/raster_rgb.o ../modules/soft_raster/stencil.o ../modules/soft_raster/surface.o
-
-OBJS+=../modules/mp3_in/mp3_in.o
-ifneq ($(CONFIG_MAD), no)
-OBJS+=../modules/mp3_in/mad_dec.o
-CFLAGS+=-DGPAC_HAS_MAD
-EXTRALIBS+= -lmad
-endif
-OBJS+=../modules/isom_in/load.o ../modules/isom_in/read.o ../modules/isom_in/read_ch.o ../modules/isom_in/isom_cache.o
-OBJS+=../modules/odf_dec/odf_dec.o
-OBJS+=../modules/rtp_in/rtp_in.o ../modules/rtp_in/rtp_session.o ../modules/rtp_in/rtp_signaling.o ../modules/rtp_in/rtp_stream.o ../modules/rtp_in/sdp_fetch.o ../modules/rtp_in/sdp_load.o
-OBJS+=../modules/saf_in/saf_in.o
-ifeq ($(DISABLE_DASH_CLIENT), no)
-OBJS+=../modules/mpd_in/mpd_in.o
-ifneq ($(CONFIG_JS),no)
-OBJS+=../modules/mse_in/mse_in.o
-endif
-endif
-OBJS+=../modules/timedtext/timedtext_dec.o ../modules/timedtext/timedtext_in.o
-OBJS+=../modules/validator/validator.o
-OBJS+=../modules/raw_out/raw_video.o
-
-OBJS+=../modules/img_in/img_dec.o ../modules/img_in/img_in.o ../modules/img_in/bmp_dec.o ../modules/img_in/png_dec.o ../modules/img_in/jpeg_dec.o
-ifneq ($(CONFIG_JP2), no)
-OBJS+=../modules/img_in/jp2_dec.o
-EXTRALIBS+= -lopenjpeg
-CFLAGS+=-DGPAC_HAS_JP2
-endif
-
-ifneq ($(CONFIG_FT), no)
-OBJS+=../modules/ft_font/ft_font.o 
-EXTRALIBS+= $(FT_LIBS)
-CFLAGS+=-DGPAC_HAS_FREETYPE $(FT_CFLAGS)
-endif
-
-ifeq ($(DISABLE_MEDIA_IMPORT), no)
-OBJS+=../modules/mpegts_in/mpegts_in.o 
-endif
-
-ifeq ($(DISABLE_LOADER_BT), no)
-OBJS+=../modules/osd/osd.o
-endif
-
-#cf comment for openHEVC - we cannot build ffmpeg and openhevc as static modules for the current time :(
-ifneq ($(CONFIG_FFMPEG), no)
-ifneq ($(CONFIG_OPENHEVC),yes)
-OBJS+=../modules/ffmpeg_in/ffmpeg_decode.o ../modules/ffmpeg_in/ffmpeg_demux.o ../modules/ffmpeg_in/ffmpeg_load.o
-CFLAGS+=-DGPAC_HAS_FFMPEG -Wno-deprecated-declarations -I"$(SRC_PATH)/include" $(ffmpeg_cflags)
-EXTRALIBS+= $(ffmpeg_lflags)
-#fix it first
-#OBJS+=../modules/redirect_av/redirect_av.o  
-endif
-endif
-
-ifneq ($(CONFIG_XVID), no)
-OBJS+=../modules/xvid_dec/xvid_dec.o
-CFLAGS+=-DGPAC_HAS_XVID
-EXTRALIBS+= -lxvidcore 
-endif
-
-ifneq ($(CONFIG_OGG), no)
-OBJS+=../modules/ogg/ogg_load.o ../modules/ogg/ogg_in.o ../modules/ogg/theora_dec.o ../modules/ogg/vorbis_dec.o
-CFLAGS+=-DGPAC_HAS_OGG
-EXTRALIBS+= -logg
-ifneq ($(CONFIG_VORBIS), no)
-CFLAGS+=-DGPAC_HAS_VORBIS
-EXTRALIBS+= -lvorbis
-endif
-ifneq ($(CONFIG_THEORA), no)
-CFLAGS+=-DGPAC_HAS_THEORA
-EXTRALIBS+= -ltheora
-endif
-
-endif
-
-
-ifeq ($(CONFIG_SDL), yes)
-CFLAGS+=-DGPAC_HAS_SDL $(SDL_CFLAGS)
-EXTRALIBS+= $(SDL_LIBS)
-OBJS+=../modules/sdl_out/sdl_out.o ../modules/sdl_out/audio.o ../modules/sdl_out/video.o
-endif
-
-
-ifeq ($(DISABLE_SVG), no)
-OBJS+=../modules/widgetman/widgetman.o ../modules/widgetman/unzip.o ../modules/widgetman/widget.o ../modules/widgetman/wgt_load.o
-endif
-
-ifeq ($(CONFIG_OPENSVC),yes)
-OBJS+= ../modules/opensvc_dec/opensvc_dec.o
-CFLAGS+=-DGPAC_HAS_OPENSVC $(OSVC_CFLAGS)
-EXTRALIBS+=$(OSVC_LDFLAGS)
-endif
-
-#cannot include openhevc and ffmpeg (yet) here since it uses avcodec_* calls which are relocated to libavcodec.so ...
-ifeq ($(CONFIG_OPENHEVC),yes)
-ifeq ($(CONFIG_FFMPEG), no)
-OBJS+= ../modules/openhevc_dec/openhevc_dec.o
-CFLAGS+=-DGPAC_HAS_OPENHEVC $(OHEVC_CFLAGS)
-EXTRALIBS+=$(OHEVC_LDFLAGS)
-endif
-endif
-
-ifeq ($(CONFIG_X11),yes)
-OBJS+= ../modules/x11_out/x11_out.o
-CFLAGS+=-DGPAC_HAS_X11
-ifneq ($(X11_INC_PATH), )
-CFLAGS+=-I$(X11_INC_PATH)
-endif
-
-ifneq ($(X11_LIB_PATH), )
-EXTRALIBS+=-L$(X11_LIB_PATH)
-endif
-EXTRALIBS+=-lX11
-
-ifeq ($(USE_X11_XV), yes)
-CFLAGS+=-DGPAC_HAS_X11_XV
-EXTRALIBS+=-lXv
-endif
-
-ifeq ($(USE_X11_XV), yes)
-CFLAGS+=-DGPAC_HAS_X11_XV
-EXTRALIBS+=-lXv
-endif
-
-ifeq ($(USE_X11_SHM), yes)
-CFLAGS+=-DGPAC_HAS_X11_SHM
-EXTRALIBS+=-lXext
-endif
-
-ifeq ($(HAS_OPENGL), yes)
-ifeq ($(CONFIG_DARWIN),yes)
-EXTRALIBS+=-lGL -lGLU
-endif
-endif
-
-#end of x11
-endif
-
-
-ifeq ($(CONFIG_JACK), yes)
-OBJS+= ../modules/jack/jack.o
-CFLAGS+=-DGPAC_HAS_JACK
-EXTRALIBS+=-ljack
-endif
-
-ifneq ($(CONFIG_OSS_AUDIO), no)
-OBJS+= ../modules/oss_audio/oss.o
-CFLAGS+=-DGPAC_HAS_OSS $(OSS_CFLAGS)
-EXTRALIBS+=$(OSS_LDFLAGS)
-ifneq ($(OSS_INC_TYPE), yes)
-CFLAGS+=-DOSS_FIX_INC
-endif
-ifeq ($(TARGET_ARCH_ARMV4L), yes)
-CFLAGS+=-DFORCE_SR_LIMIT
-endif
-
-endif
-
-
-ifeq ($(CONFIG_PULSEAUDIO), yes)
-OBJS+= ../modules/pulseaudio/pulseaudio.o
-CFLAGS+=-DGPAC_HAS_PULSEAUDIO
-EXTRALIBS+=-lpulse -lpulse-simple
-endif
-
-
-ifeq ($(CONFIG_DIRECTFB),yes)
-OBJS+= ../modules/directfb_out/directfb_out.o ../modules/directfb_out/directfb_wrapper.o
-CFLAGS+=-DGPAC_HAS_DIRECTFB -I$(DIRECTFB_INC_PATH)
-EXTRALIBS+=$(DIRECTFB_LIB)
-endif
-
-ifeq ($(CONFIG_WIN32),yes)
-OBJS+= ../modules/wav_out/wav_out.o
-EXTRALIBS+=-DGPAC_HAS_WAVEOUT -DDISABLE_WAVE_EX
-endif
-
-ifeq ($(CONFIG_DIRECTX),yes)
-OBJS+= ../dx_hw/dx_hw/dx_audio.o  ../dx_hw/dx_hw/dx_video.o  ../dx_hw/dx_hw/dx_window.o  ../dx_hw/dx_hw/dx_2d.o  ../dx_hw/dx_hw/copy_pixels.o
-CFLAGS+=-DGPAC_HAS_DIRECTX -DDIRECTSOUND_VERSION=0x0500
-ifneq ($(DX_PATH), system)
-EXTRALIBS+=-L$(DX_PATH)/lib
-CFLAGS+= -I$(DX_PATH)/include
-endif
-EXTRALIBS+=-ldsound -ldxguid -lddraw -lole32 -lgdi32 -lopengl32
-endif
-
-
-ifneq ($(CONFIG_FREENECT), no)
-OBJS+= ../modules/freenect/freenect.o
-CFLAGS+=-DGPAC_HAS_FREENECT $(FREENECT_CFLAGS)
-ifeq ($(CONFIG_FREENECT), local)
-CFLAGS+= -I"$(LOCAL_INC_PATH)"
-EXTRALIBS+=-L../../extra_lib/lib/gcc
-endif
-EXTRALIBS+=-lfreenect
-endif
-
-#end of static modules
-
-endif
-
-
-NEED_LOCAL_LIB="no"
-LINKLIBS=
 SCENEGRAPH_CFLAGS=
 MEDIATOOLS_CFLAGS=$(JS_FLAGS)
 
-ifeq ($(DISABLE_CORE_TOOLS), no)
-
-#1 - zlib support
-ifeq ($(CONFIG_ZLIB), local)
-CFLAGS+= -I"$(LOCAL_INC_PATH)/zlib"
-NEED_LOCAL_LIB="yes"
-endif
-ifneq ($(CONFIG_ZLIB), no)
-LINKLIBS+=-lz
-endif
-
-#2 - ssl support
-ifeq ($(HAS_OPENSSL), yes)
-LINKLIBS+=$(SSL_LIBS)
-endif
+##include static modules and other deps for libgpac
+include ../static.mak
 
-#3 - spidermonkey support
-ifeq ($(CONFIG_JS),no)
-else
-SCENEGRAPH_CFLAGS+=$(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB="yes"
-endif
-LINKLIBS+=$(JS_LIBS)
-endif
-
-endif
-
-#4 - JPEG support
-ifeq ($(CONFIG_JPEG), no)
-else
-LINKLIBS+= -ljpeg
-#local lib
-ifeq ($(CONFIG_JPEG), local)
-NEED_LOCAL_LIB="yes"
-MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/jpeg"
-endif
-endif
-
-
-#5 - PNG support
-ifeq ($(CONFIG_PNG), no)
-else
-LINKLIBS+= -lpng
-ifeq ($(CONFIG_PNG), local)
-NEED_LOCAL_LIB="yes"
-MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
-endif
-endif
-
-
-## libgpac compositor compilation options
-COMPOSITOR_CFLAGS=
-
-## Add prefix before every lib
-ifneq ($(prefix), /usr/local)
-EXTRALIBS+=-L$(prefix)/lib
-else
-ifneq ($(prefix), /usr)
-EXTRALIBS+=-L$(prefix)/lib
-endif
-endif
-
-## OpenGL available
-ifeq ($(HAS_OPENGL),yes)
-EXTRALIBS+= $(OGL_LIBS)
-COMPOSITOR_CFLAGS+=$(OGL_INCLS)
-endif
-
-ifeq ($(NEED_LOCAL_LIB), "yes")
-EXTRALIBS+=-L../extra_lib/lib/gcc
-endif
-EXTRALIBS+=$(LINKLIBS)
-
-ifeq ($(GPAC_USE_TINYGL), yes)
-COMPOSITOR_CFLAGS+=-I"$(SRC_PATH)/../TinyGL/include"
-else
-COMPOSITOR_CFLAGS+=-DGPAC_HAS_GLU
-endif
-
-ifeq ($(ENABLE_JOYSTICK), yes)
-COMPOSITOR_CFLAGS+=-DENABLE_JOYSTICK
-endif
-
-
-## libgpac media tools compilation options
-ifeq ($(GPACREADONLY), yes)
-MEDIATOOLS_CFLAGS=-DGPAC_READ_ONLY
-endif
-
-
-ifeq ($(GPAC_ENST), yes)
-OBJS+=$(LIBGPAC_ENST)
-EXTRALIBS+=-liconv
-MEDIATOOLS_CFLAGS+=-DGPAC_ENST_PRIVATE
-endif
 
 
 ##libgpac library output
-LIB=libgpac.$(DYN_LIB_SUFFIX)
+LIB=libgpac$(DYN_LIB_SUFFIX)
 ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-Wl,-out-implib=../bin/gcc/libgpac.a
+LDFLAGS+=-Wl,-out-implib=../bin/gcc/libgpac.dll.a
 else
 ifeq ($(CONFIG_DARWIN),yes)
 LDFLAGS+=-dynamiclib -install_name $(prefix)/lib/$(LIB)
@@ -573,7 +232,7 @@
 
 ifeq ($(CONFIG_SUNOS), yes)
 LD_SONAME="-Wl,-h,$(LIB)"
-LINKLIBS+= -lrt
+EXTRALIBS+= -lrt
 endif
 
 SRCS := $(OBJS:.o=.c) 
@@ -605,22 +264,26 @@
 ../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph media_tools mcrypt $(OBJS)
 	@echo "OBJS $(OBJS)"
 	@echo "LIBS $(EXTRALIBS)"
+
 ifeq ($(CONFIG_DARWIN),yes)
+
 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
 	$(RANLIB) ../bin/gcc/libgpac_static.a
+ifneq ($(STATICBUILD),yes)
 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+endif
+
 else
+
 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
 	$(RANLIB) ../bin/gcc/libgpac_static.a
-	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
-ifeq (,$(findstring yes, $(CONFIG_WIN32)))
+ifneq ($(STATICBUILD),yes)
+	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)	
 	mv $@ $@.$(VERSION_SONAME)
 	ln -sf $(notdir $@).$(VERSION_SONAME) $@.$(VERSION_MAJOR)
 	ln -sf $(notdir $@).$(VERSION_SONAME) $@
-else
-	ln -sf $@ $(notdir $@).a
-	mv $(notdir $@).a $@.a
 endif
+
 endif
 ifeq ($(shell fgrep "Libs.private:" ../gpac.pc),)
 	@echo "Libs.private: $(EXTRALIBS)" >> ../gpac.pc

v0.5.2.tar.gz/src/bifs/bifs_codec.c -> v0.6.1.tar.gz/src/bifs/bifs_codec.c Changed

@@ -39,19 +39,19 @@
 	info->config.elementaryMasks = NULL	;
 
 	if (version==2) {
-		info->config.Use3DMeshCoding = gf_bs_read_int(bs, 1);
-		info->config.UsePredictiveMFField = gf_bs_read_int(bs, 1);
+		info->config.Use3DMeshCoding = (Bool)gf_bs_read_int(bs, 1);
+		info->config.UsePredictiveMFField = (Bool)gf_bs_read_int(bs, 1);
 	}
 	info->config.NodeIDBits = gf_bs_read_int(bs, 5);
 	info->config.RouteIDBits = gf_bs_read_int(bs, 5);
 	if (version==2) {
 		info->config.ProtoIDBits = gf_bs_read_int(bs, 5);
 	}
-	cmd_stream = gf_bs_read_int(bs, 1);
+	cmd_stream = (Bool)gf_bs_read_int(bs, 1);
 
 	if (cmd_stream) {
-		info->config.PixelMetrics = gf_bs_read_int(bs, 1);
-		hasSize = gf_bs_read_int(bs, 1);
+		info->config.PixelMetrics = (Bool)gf_bs_read_int(bs, 1);
+		hasSize = (Bool)gf_bs_read_int(bs, 1);
 		if (hasSize) {
 			info->config.Width = gf_bs_read_int(bs, 16);
 			info->config.Height = gf_bs_read_int(bs, 16);
@@ -61,7 +61,7 @@
 		if (gf_bs_get_size(bs) != gf_bs_get_position(bs)) return GF_ODF_INVALID_DESCRIPTOR;
 		return GF_OK;
 	} else {
-		info->config.BAnimRAP = gf_bs_read_int(bs, 1);
+		info->config.BAnimRAP = (Bool)gf_bs_read_int(bs, 1);
 		info->config.elementaryMasks = gf_list_new();
 		while (1) {
 			/*u32 node_id = */gf_bs_read_int(bs, info->config.NodeIDBits);
@@ -99,8 +99,8 @@
 	tmp->scenegraph = scenegraph;
 	tmp->command_buffers = gf_list_new();
 	if (command_dec) {
-		tmp->dec_memory_mode = 1;
-		tmp->force_keep_qp = 1;
+		tmp->dec_memory_mode = GF_TRUE;
+		tmp->force_keep_qp = GF_TRUE;
 	}
 	tmp->current_graph = NULL;
 	return tmp;
@@ -132,7 +132,7 @@
 		/* Hack for T-DMB non compliant streams */
 		GF_SAFEALLOC(pInfo, BIFSStreamInfo);
 		pInfo->ESID = ESID;
-		pInfo->config.PixelMetrics = 1;
+		pInfo->config.PixelMetrics = GF_TRUE;
 		pInfo->config.version = (objectTypeIndication==2) ? 1 : 2;
 		assert( codec );
 		assert( codec->streamInfo );
@@ -181,7 +181,7 @@
 GF_EXPORT
 void gf_bifs_decoder_ignore_size_info(GF_BifsDecoder *codec)
 {
-	if (codec) codec->ignore_size = 1;
+	if (codec) codec->ignore_size = GF_TRUE;
 }

v0.5.2.tar.gz/src/bifs/com_dec.c -> v0.6.1.tar.gz/src/bifs/com_dec.c Changed

@@ -23,7 +23,7 @@
 *
 */
 
-#include "math.h"
+#include <gpac/maths.h>
 #include <gpac/internal/bifs_dev.h>
 #include "quant.h"
 
@@ -180,7 +180,7 @@
 				memcpy(&sffield, &targetField, sizeof(GF_FieldInfo));
 				sffield.fieldType = sftype;
 				sffield.far_ptr = slot_ptr;
-				gf_bifs_dec_sf_field(codec, bs, target, &sffield, 0);
+				gf_bifs_dec_sf_field(codec, bs, target, &sffield, GF_FALSE);
 			}
 		}
 		gf_bifs_check_field_change(target, &targetField);
@@ -215,7 +215,7 @@
 			list = * ((GF_ChildNodeItem **) targetField.far_ptr);
 			prev=NULL;
 			while (list) {
-				cur = gf_malloc(sizeof(GF_ChildNodeItem));
+				cur = (GF_ChildNodeItem*)gf_malloc(sizeof(GF_ChildNodeItem));
 				cur->next = NULL;
 				cur->node = list->node;
 				if (prev) {
@@ -228,7 +228,7 @@
 				list = list->next;
 			}
 		} else {
-			e = gf_bifs_dec_field(codec, bs, target, &targetField, 0);
+			e = gf_bifs_dec_field(codec, bs, target, &targetField, GF_FALSE);
 			if (e) return e;
 		}
 		if (previous)
@@ -246,7 +246,7 @@
 			if (fromField.fieldType == targetField.fieldType)
 				gf_sg_vrml_field_clone(targetField.far_ptr, fromField.far_ptr, targetField.fieldType, codec->current_graph);
 		} else {
-			e = gf_bifs_dec_field(codec, bs, target, &targetField, 0);
+			e = gf_bifs_dec_field(codec, bs, target, &targetField, GF_FALSE);
 		}
 		break;
 	}
@@ -333,7 +333,7 @@
 
 		e = gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, & sffield.far_ptr, pos);
 		if (e) return e;
-		e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, 0);
+		e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, GF_FALSE);
 		if (e) break;
 		count--;
 	}
@@ -353,9 +353,9 @@
 
 	flag = gf_bs_read_int(bs, 1);
 	if (flag) {
-		e = gf_bifs_dec_node_mask(codec, bs, node, 0);
+		e = gf_bifs_dec_node_mask(codec, bs, node, GF_FALSE);
 	} else {
-		e = gf_bifs_dec_node_list(codec, bs, node, 0);
+		e = gf_bifs_dec_node_list(codec, bs, node, GF_FALSE);
 	}
 	return e;
 }
@@ -393,7 +393,7 @@
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 	node = gf_sg_find_node(codec->current_graph, NodeID);
 	if (!node) return GF_NON_COMPLIANT_BITSTREAM;
-	return gf_node_replace(node, NULL, 1);
+	return gf_node_replace(node, NULL, GF_TRUE);
 }
 
 #ifdef GPAC_UNUSED_FUNC
@@ -642,7 +642,7 @@
 			e = gf_sg_vrml_mf_insert(field.far_ptr, field.fieldType, & sffield.far_ptr, pos);
 		}
 		if (e) return e;
-		e = gf_bifs_dec_sf_field(codec, bs, def, &sffield, 0);
+		e = gf_bifs_dec_sf_field(codec, bs, def, &sffield, GF_FALSE);
 		if (!e) gf_bifs_check_field_change(def, &field);
 	}
 	return e;
@@ -663,7 +663,7 @@
 	case 2:
 		return BD_DecIndexInsert(codec, bs);
 	case 3:
-		return gf_bifs_dec_route(codec, bs, 1);
+		return gf_bifs_dec_route(codec, bs, GF_TRUE);
 	default:
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -740,7 +740,7 @@
 		if (!n) return GF_OK;
 #endif
 		/*this is a delete of a DEF node, remove ALL INSTANCES*/
-		return gf_node_replace(n, NULL, 0);
+		return gf_node_replace(n, NULL, GF_FALSE);
 	case 2:
 		return BD_DecIndexDelete(codec, bs);
 	case 3:
@@ -770,7 +770,7 @@
 	new_node = gf_bifs_dec_node(codec, bs, NDT_SFWorldNode);
 	if (!new_node && codec->LastError) return codec->LastError;
 
-	e = gf_node_replace(node, new_node, 0);
+	e = gf_node_replace(node, new_node, GF_FALSE);
 	return e;
 }
 
@@ -809,9 +809,9 @@
 	}
 
 	/*parse the field*/
-	codec->is_com_dec = 1;
-	e = gf_bifs_dec_field(codec, bs, node, &field, 0);
-	codec->is_com_dec = 0;
+	codec->is_com_dec = GF_TRUE;
+	e = gf_bifs_dec_field(codec, bs, node, &field, GF_FALSE);
+	codec->is_com_dec = GF_FALSE;
 	/*remove prev nodes*/
 	if (field.fieldType == GF_SG_VRML_SFNODE) {
 		if (prev_node) e = gf_node_unregister(prev_node, node);
@@ -887,7 +887,7 @@
 
 		e = gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, & sffield.far_ptr, pos);
 		if (e) return e;
-		e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, 0);
+		e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, GF_FALSE);
 		if (!e) gf_bifs_check_field_change(node, &field);
 	}
 
@@ -1018,7 +1018,7 @@
 			sprintf(name, "Proto%d", numProtos);
 		}
 		/*create a proto in the current graph*/
-		proto = gf_sg_proto_new(codec->current_graph, ID, name, proto_list ? 1 : 0);
+		proto = gf_sg_proto_new(codec->current_graph, ID, name, proto_list ? GF_TRUE : GF_FALSE);
 		if (proto_list) gf_list_add(proto_list, proto);
 
 		/*during parsing, this proto is the current active one - all nodes/proto defined/declared
@@ -1049,7 +1049,7 @@
 			case GF_SG_EVENT_FIELD:
 				/*parse default value except nodes ...*/
 				if (gf_sg_vrml_is_sf_field(field_type)) {
-					e = gf_bifs_dec_sf_field(codec, bs, NULL, &field, 0);
+					e = gf_bifs_dec_sf_field(codec, bs, NULL, &field, GF_FALSE);
 				} else {
 					f = 0;
 					if (codec->info->config.UsePredictiveMFField) {
@@ -1139,7 +1139,7 @@
 				if (flag) {
 					/*list route*/
 					while (flag) {
-						e = gf_bifs_dec_route(codec, bs, 0);
+						e = gf_bifs_dec_route(codec, bs, GF_FALSE);
 						if (e) goto exit;
 						flag = gf_bs_read_int(bs, 1);
 					}
@@ -1148,7 +1148,7 @@
 					i = gf_bs_read_int(bs, 5);
 					NbRoutes = gf_bs_read_int(bs, i);
 					for (i=0; i<NbRoutes; i++) {
-						e = gf_bifs_dec_route(codec, bs, 0);
+						e = gf_bifs_dec_route(codec, bs, GF_FALSE);
 						if (e) goto exit;
 					}
 				}
@@ -1193,12 +1193,12 @@
 					qp_min_value = gf_sg_vrml_field_pointer_new(qpsftype);
 					field.name = "QPMinValue";
 					field.far_ptr = qp_min_value;
-					gf_bifs_dec_sf_field(codec, bs, NULL, &field, 0);
+					gf_bifs_dec_sf_field(codec, bs, NULL, &field, GF_FALSE);
 
 					qp_max_value = gf_sg_vrml_field_pointer_new(qpsftype);
 					field.name = "QPMaxValue";
 					field.far_ptr = qp_max_value;
-					gf_bifs_dec_sf_field(codec, bs, NULL, &field, 0);
+					gf_bifs_dec_sf_field(codec, bs, NULL, &field, GF_FALSE);
 				}
 
 				/*and store*/
@@ -1297,7 +1297,7 @@
 	/*reserved*/
 	i = gf_bs_read_int(bs, 6);
 
-	codec->UseName = gf_bs_read_int(bs, 1);
+	codec->UseName = (Bool)gf_bs_read_int(bs, 1);
 	/*parse PROTOS*/
 	e = gf_bifs_dec_proto_list(codec, bs, proto_list);
 	if (e) goto exit;
@@ -1325,7 +1325,7 @@
 		if (flag) {
 			/*list*/
 			while (flag) {
-				e = gf_bifs_dec_route(codec, bs, 0);
+				e = gf_bifs_dec_route(codec, bs, GF_FALSE);
 				if (e) goto exit;
 				flag = gf_bs_read_int(bs, 1);
 			}
@@ -1334,7 +1334,7 @@
 			i = gf_bs_read_int(bs, 5);
 			nbR = gf_bs_read_int(bs, i);
 			for (i=0; i<nbR; i++) {
-				e = gf_bifs_dec_route(codec, bs, 0);
+				e = gf_bifs_dec_route(codec, bs, GF_FALSE);
 				if (e) goto exit;
 			}
 		}
@@ -1372,7 +1372,7 @@
 	}
 
 	while (gf_list_count(codec->QPs)) {
-		gf_bifs_dec_qp_remove(codec, 1);
+		gf_bifs_dec_qp_remove(codec, GF_TRUE);
 	}
 	gf_bifs_flush_command_list(codec);

v0.5.2.tar.gz/src/bifs/com_enc.c -> v0.6.1.tar.gz/src/bifs/com_enc.c Changed

@@ -183,10 +183,10 @@
 	gf_bs_write_int(bs, gf_node_get_id(com->node)-1, codec->info->config.NodeIDBits);
 
 	count = gf_list_count(com->command_fields);
-	use_list = 1;
+	use_list = GF_TRUE;
 	numFields = gf_node_get_num_fields_in_mode(com->node, GF_SG_FIELD_CODING_DEF);
 	nbBits = gf_get_bit_size(numFields - 1);
-	if (count < 1+count*(1+nbBits)) use_list = 0;
+	if (count < 1+count*(1+nbBits)) use_list = GF_FALSE;
 	GF_BIFS_WRITE_INT(codec, bs, use_list ? 0 : 1, 1, "isMask", NULL);
 
 	for (i=0; i<numFields; i++) {
@@ -251,9 +251,9 @@
 static GF_Err BE_EncProtoDelete(GF_BifsEncoder * codec, GF_Command *com, GF_BitStream *bs)
 {
 	u32 nbBits, i;
-	Bool use_list = 0;
+	Bool use_list = GF_FALSE;
 	nbBits = gf_get_bit_size(com->del_proto_list_size);
-	if (nbBits+5>com->del_proto_list_size) use_list = 1;
+	if (nbBits+5>com->del_proto_list_size) use_list = GF_TRUE;
 	GF_BIFS_WRITE_INT(codec, bs, use_list, 1, "isList", NULL);
 	if (!use_list) {
 		GF_BIFS_WRITE_INT(codec, bs, nbBits, 5, "len", NULL);
@@ -435,11 +435,11 @@
 	field.far_ptr = inf->field_ptr;
 
 	/* Warning: To be changed when proper solution is found */
-	if (gf_sg_vrml_get_sf_type(field.fieldType) == GF_SG_VRML_SFSCRIPT) codec->is_encoding_command = 1;
+	if (gf_sg_vrml_get_sf_type(field.fieldType) == GF_SG_VRML_SFSCRIPT) codec->is_encoding_command = GF_TRUE;
 
 	e = gf_bifs_enc_field(codec, bs, com->node, &field);
 
-	codec->is_encoding_command = 0;
+	codec->is_encoding_command = GF_FALSE;
 	return e;
 }
 
@@ -902,7 +902,7 @@
 		case GF_SG_ROUTE_REPLACE:
 			GF_BIFS_WRITE_INT(codec, bs, 2, 2, "Replace", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, 3, 2, "Route", NULL);
-			e = BE_RouteReplace(codec, com, bs, 0);
+			e = BE_RouteReplace(codec, com, bs, GF_FALSE);
 			break;
 		case GF_SG_NODE_INSERT:
 			GF_BIFS_WRITE_INT(codec, bs, 0, 2, "Insert", NULL);
@@ -917,7 +917,7 @@
 		case GF_SG_ROUTE_INSERT:
 			GF_BIFS_WRITE_INT(codec, bs, 0, 2, "Insert", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, 3, 2, "Route", NULL);
-			e = BE_RouteReplace(codec, com, bs, 1);
+			e = BE_RouteReplace(codec, com, bs, GF_TRUE);
 			break;
 		case GF_SG_NODE_DELETE:
 			GF_BIFS_WRITE_INT(codec, bs, 1, 2, "Delete", NULL);
@@ -944,7 +944,7 @@
 		GF_BIFS_WRITE_INT(codec, bs, (i+1==count) ? 0 : 1, 1, "moreCommands", NULL);
 	}
 
-	while (gf_list_count(codec->QPs)) gf_bifs_enc_qp_remove(codec, 1);
+	while (gf_list_count(codec->QPs)) gf_bifs_enc_qp_remove(codec, GF_TRUE);
 	return e;
 }

v0.5.2.tar.gz/src/bifs/conditional.c -> v0.6.1.tar.gz/src/bifs/conditional.c Changed

v0.5.2.tar.gz/src/bifs/field_decode.c -> v0.6.1.tar.gz/src/bifs/field_decode.c Changed

@@ -127,13 +127,13 @@
 			M_CacheTexture *ct = (M_CacheTexture *) node;
 			ct->data_len = length;
 			if (ct->data) gf_free(ct->data);
-			ct->data = gf_malloc(sizeof(char)*length);
+			ct->data = (u8*)gf_malloc(sizeof(char)*length);
 			gf_bs_read_data(bs, (char*)ct->data, length);
 		} else if (node && (node->sgprivate->tag==TAG_MPEG4_BitWrapper) ) {
 			M_BitWrapper *bw = (M_BitWrapper*) node;
 			if (bw->buffer.buffer) gf_free(bw->buffer.buffer);
 			bw->buffer_len = length;
-			bw->buffer.buffer = gf_malloc(sizeof(char)*length);
+			bw->buffer.buffer = (char*)gf_malloc(sizeof(char)*length);
 			gf_bs_read_data(bs, (char*)bw->buffer.buffer, length);
 		} else {
 			if ( ((SFString *)field->far_ptr)->buffer ) gf_free( ((SFString *)field->far_ptr)->buffer);
@@ -296,7 +296,7 @@
 		e = GF_OK;;
 		if (field->fieldType != GF_SG_VRML_MFNODE) {
 			e = gf_sg_vrml_mf_append(field->far_ptr, field->fieldType, & sffield.far_ptr);
-			e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, 0);
+			e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, GF_FALSE);
 		} else {
 			new_node = gf_bifs_dec_node(codec, bs, field->NDTtype);
 			//append
@@ -310,13 +310,13 @@
 					if (gf_node_get_tag(new_node) == TAG_MPEG4_QuantizationParameter) {
 						qp_local = ((M_QuantizationParameter *)new_node)->isLocal;
 						//we have a QP in the same scope, remove previous
-						if (qp_on) gf_bifs_dec_qp_remove(codec, 0);
+						if (qp_on) gf_bifs_dec_qp_remove(codec, GF_FALSE);
 						e = gf_bifs_dec_qp_set(codec, new_node);
 						if (e) return e;
 						qp_on = 1;
 						if (qp_local) qp_local = 2;
 						if (codec->force_keep_qp) {
-							e = gf_node_list_add_child_last( field->far_ptr, new_node, &last);
+							e = gf_node_list_add_child_last(field->far_ptr, new_node, &last);
 						} else {
 							gf_node_register(new_node, NULL);
 							gf_node_unregister(new_node, node);
@@ -395,7 +395,7 @@
 		for (i=0; i<nbFields; i++) {
 			e = gf_sg_vrml_mf_get_item(field->far_ptr, field->fieldType, & sffield.far_ptr, i);
 			if (e) return e;
-			e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, 0);
+			e = gf_bifs_dec_sf_field(codec, bs, node, &sffield, GF_FALSE);
 		}
 	} else {
 		last = NULL;
@@ -412,7 +412,7 @@
 						/*we have a QP in the same scope, remove previous
 						NB: we assume this is the right behaviour, the spec doesn't say
 						whether QP is cumulative or not*/
-						if (qp_on) gf_bifs_dec_qp_remove(codec, 0);
+						if (qp_on) gf_bifs_dec_qp_remove(codec, GF_FALSE);
 
 						e = gf_bifs_dec_qp_set(codec, new_node);
 						if (e) return e;
@@ -450,7 +450,7 @@
 		}
 	}
 	/*finally delete the QP if any (local or not) as we get out of this node*/
-	if (qp_on) gf_bifs_dec_qp_remove(codec, 1);
+	if (qp_on) gf_bifs_dec_qp_remove(codec, GF_TRUE);
 	return GF_OK;
 }
 
@@ -584,7 +584,7 @@
 		if (e) return e;
 		e = gf_node_get_field(node, field_all, &field);
 		if (e) return e;
-		e = gf_bifs_dec_field(codec, bs, node, &field, 0);
+		e = gf_bifs_dec_field(codec, bs, node, &field, GF_FALSE);
 		if (e) return e;
 		flag = gf_bs_read_int(bs, 1);
 
@@ -622,7 +622,7 @@
 			else {
 				e = gf_node_get_field(node, i, &field);
 				if (e) return e;
-				e = gf_bifs_dec_field(codec, bs, node, &field, 0);
+				e = gf_bifs_dec_field(codec, bs, node, &field, GF_FALSE);
 			}
 			if (e) return e;
 		}
@@ -636,7 +636,7 @@
 			gf_bifs_get_field_index(node, i, GF_SG_FIELD_CODING_DEF, &index);
 			e = gf_node_get_field(node, index, &field);
 			if (e) return e;
-			e = gf_bifs_dec_field(codec, bs, node, &field, 0);
+			e = gf_bifs_dec_field(codec, bs, node, &field, GF_FALSE);
 			if (e) return e;
 
 			if (is_proto) gf_sg_proto_mark_field_loaded(node, &field);
@@ -728,17 +728,17 @@
 			case TAG_MPEG4_Coordinate:
 			{
 				u32 nbCoord = ((M_Coordinate *)new_node)->point.count;
-				gf_bifs_dec_qp14_enter(codec, 1);
+				gf_bifs_dec_qp14_enter(codec, GF_TRUE);
 				gf_bifs_dec_qp14_set_length(codec, nbCoord);
-				gf_bifs_dec_qp14_enter(codec, 0);
+				gf_bifs_dec_qp14_enter(codec, GF_FALSE);
 			}
 			break;
 			case TAG_MPEG4_Coordinate2D:
 			{
 				u32 nbCoord = ((M_Coordinate2D *)new_node)->point.count;
-				gf_bifs_dec_qp14_enter(codec, 1);
+				gf_bifs_dec_qp14_enter(codec, GF_TRUE);
 				gf_bifs_dec_qp14_set_length(codec, nbCoord);
-				gf_bifs_dec_qp14_enter(codec, 0);
+				gf_bifs_dec_qp14_enter(codec, GF_FALSE);
 			}
 			break;
 			}
@@ -815,7 +815,7 @@
 	}
 
 	new_node = NULL;
-	skip_init = 0;
+	skip_init = GF_FALSE;
 
 	/*don't check node IDs duplicate since VRML may use them...*/
 #if 0
@@ -845,7 +845,7 @@
 
 	if (!new_node) {
 		if (proto) {
-			skip_init = 1;
+			skip_init = GF_TRUE;
 			/*create proto interface*/
 			new_node = gf_sg_proto_create_instance(codec->current_graph, proto);
 		} else {
@@ -873,7 +873,7 @@
 	/*update default time fields except in proto parsing*/
 	if (!codec->pCurrentProto) UpdateTimeNode(codec, new_node);
 	/*nodes are only init outside protos */
-	else skip_init = 1;
+	else skip_init = GF_TRUE;
 
 	/*if coords were not stored for QP14 before coding this node, reset QP14 it when leaving*/
 	reset_qp14 = !codec->coord_stored;
@@ -884,13 +884,13 @@
 	switch (node_tag) {
 	case TAG_MPEG4_Coordinate:
 	case TAG_MPEG4_Coordinate2D:
-		gf_bifs_dec_qp14_enter(codec, 1);
+		gf_bifs_dec_qp14_enter(codec, GF_TRUE);
 	}
 
 	if (gf_bs_read_int(bs, 1)) {
-		e = gf_bifs_dec_node_mask(codec, bs, new_node, proto ? 1 : 0);
+		e = gf_bifs_dec_node_mask(codec, bs, new_node, proto ? GF_TRUE : GF_FALSE);
 	} else {
-		e = gf_bifs_dec_node_list(codec, bs, new_node, proto ? 1 : 0);
+		e = gf_bifs_dec_node_list(codec, bs, new_node, proto ? GF_TRUE : GF_FALSE);
 	}
 	if (codec->coord_stored && reset_qp14)
 		gf_bifs_dec_qp14_reset(codec);
@@ -910,7 +910,7 @@
 	switch (node_tag) {
 	case TAG_MPEG4_Coordinate:
 	case TAG_MPEG4_Coordinate2D:
-		gf_bifs_dec_qp14_enter(codec, 0);
+		gf_bifs_dec_qp14_enter(codec, GF_FALSE);
 		break;
 	case TAG_MPEG4_Script:
 		/*load script if in main graph (useless to load in proto declaration)*/

v0.5.2.tar.gz/src/bifs/field_encode.c -> v0.6.1.tar.gz/src/bifs/field_encode.c Changed

@@ -27,6 +27,7 @@
 
 #include <gpac/internal/bifs_dev.h>
 #include <gpac/internal/bifs_tables.h>
+#include <gpac/network.h>
 #include "quant.h"
 #include "script.h"
 
@@ -99,18 +100,18 @@
 			FILE *f;
 			if (codec->src_url) res_src = gf_url_concatenate(codec->src_url, src);
 
-			f = gf_f64_open(res_src ? res_src : src, "rb");
+			f = gf_fopen(res_src ? res_src : src, "rb");
 			if (!f) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[BIFS] Cannot open source file %s for encoding CacheTexture\n", res_src ? res_src : src));
 				return GF_URL_ERROR;
 			}
 			if (res_src) gf_free(res_src);
-			gf_f64_seek(f, 0, SEEK_END);
-			size = (u32) gf_f64_tell(f);
+			gf_fseek(f, 0, SEEK_END);
+			size = (u32) gf_ftell(f);
 			val = gf_get_bit_size(size);
 			GF_BIFS_WRITE_INT(codec, bs, val, 5, "nbBits", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, size, val, "length", NULL);
-			gf_f64_seek(f, 0, SEEK_SET);
+			gf_fseek(f, 0, SEEK_SET);
 			while (size) {
 				u32 read = (u32) fread(buf, 1, 4096, f);
 				gf_bs_write_data(bs, buf, read);
@@ -261,9 +262,9 @@
 	}
 
 	/*do we work in list or vector*/
-	use_list = 0;
+	use_list = GF_FALSE;
 	nbBits = gf_get_bit_size(nbF);
-	if (nbBits + 5 > nbF + 1) use_list = 1;
+	if (nbBits + 5 > nbF + 1) use_list = GF_TRUE;
 
 	GF_BIFS_WRITE_INT(codec, bs, use_list, 1, "isList", NULL);
 	if (!use_list) {
@@ -276,8 +277,9 @@
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field->fieldType);
 	sffield.NDTtype = field->NDTtype;
 
-	initial_qp = qp_on = qp_local = 0;
-	initial_qp = codec->ActiveQP ? 1 : 0;
+	initial_qp = qp_on = GF_FALSE;
+	qp_local = 0;
+	initial_qp = codec->ActiveQP ? GF_TRUE : GF_FALSE;
 	for (i=0; i<nbF; i++) {
 
 		if (use_list) GF_BIFS_WRITE_INT(codec, bs, 0, 1, "end", NULL);
@@ -292,10 +294,10 @@
 			/*activate QP*/
 			if (list->node->sgprivate->tag == TAG_MPEG4_QuantizationParameter) {
 				qp_local = ((M_QuantizationParameter *)list->node)->isLocal;
-				if (qp_on) gf_bifs_enc_qp_remove(codec, 0);
+				if (qp_on) gf_bifs_enc_qp_remove(codec, GF_FALSE);
 				e = gf_bifs_enc_qp_set(codec, list->node);
 				if (e) return e;
-				qp_on = 1;
+				qp_on = GF_TRUE;
 				if (qp_local) qp_local = 2;
 			}
 			list = list->next;
@@ -307,7 +309,7 @@
 			if (qp_local == 2) qp_local -= 1;
 			else {
 				gf_bifs_enc_qp_remove(codec, initial_qp);
-				qp_local = qp_on = 0;
+				qp_local = qp_on = GF_FALSE;
 			}
 		}
 	}
@@ -372,10 +374,9 @@
 	GF_Err e;
 	s32 *enc_fields;
 	u32 numBitsALL, numBitsDEF, allInd, count, i, nbBitsProto, nbFinal;
-	Bool use_list, nodeIsFDP = 0;
+	Bool use_list, nodeIsFDP = GF_FALSE;
 	GF_FieldInfo field, clone_field;
 
-
 	e = GF_OK;
 
 	if (codec->encoding_proto) {
@@ -467,19 +468,19 @@
 	}
 	if (clone) gf_node_unregister(clone, NULL);
 
-	use_list = 1;
+	use_list = GF_TRUE;
 	/* patch for FDP node : */
 	/* cannot use default field sorting due to spec "mistake", so use list to imply inversion between field 2 and field 3 of FDP*/
 	if (node->sgprivate->tag == TAG_MPEG4_FDP) {
 		s32 s4SwapValue = enc_fields[2];
 		enc_fields[2] = enc_fields[3];
 		enc_fields[3] = s4SwapValue;
-		nodeIsFDP = 1;
-		use_list = 1;
+		nodeIsFDP = GF_TRUE;
+		use_list = GF_TRUE;
 	}
 	/*number of bits in mask node is count*1, in list node is 1+nbFinal*(1+numBitsDEF) */
 	else if (count < 1+nbFinal*(1+numBitsDEF))
-		use_list = 0;
+		use_list = GF_FALSE;
 
 	GF_BIFS_WRITE_INT(codec, bs, use_list ? 0 : 1, 1, "isMask", NULL);
 
@@ -545,13 +546,13 @@
 Bool BE_NodeIsUSE(GF_BifsEncoder * codec, GF_Node *node)
 {
 	u32 i, count;
-	if (!node || !gf_node_get_id(node) ) return 0;
+	if (!node || !gf_node_get_id(node) ) return GF_FALSE;
 	count = gf_list_count(codec->encoded_nodes);
 	for (i=0; i<count; i++) {
-		if (gf_list_get(codec->encoded_nodes, i) == node) return 1;
+		if (gf_list_get(codec->encoded_nodes, i) == node) return GF_TRUE;
 	}
 	gf_list_add(codec->encoded_nodes, node);
-	return 0;
+	return GF_FALSE;
 }
 
 GF_Err gf_bifs_enc_node(GF_BifsEncoder * codec, GF_Node *node, u32 NDT_Tag, GF_BitStream *bs, GF_Node *parent_node)
@@ -586,17 +587,17 @@
 		case TAG_MPEG4_Coordinate:
 		{
 			u32 nbCoord = ((M_Coordinate *)new_node)->point.count;
-			gf_bifs_enc_qp14_enter(codec, 1);
+			gf_bifs_enc_qp14_enter(codec, GF_TRUE);
 			gf_bifs_enc_qp14_set_length(codec, nbCoord);
-			gf_bifs_enc_qp14_enter(codec, 0);
+			gf_bifs_enc_qp14_enter(codec, GF_FALSE);
 		}
 		break;
 		case TAG_MPEG4_Coordinate2D:
 		{
 			u32 nbCoord = ((M_Coordinate2D *)new_node)->point.count;
-			gf_bifs_enc_qp14_enter(codec, 1);
+			gf_bifs_enc_qp14_enter(codec, GF_TRUE);
 			gf_bifs_enc_qp14_set_length(codec, nbCoord);
-			gf_bifs_enc_qp14_enter(codec, 0);
+			gf_bifs_enc_qp14_enter(codec, GF_FALSE);
 		}
 		break;
 		}
@@ -646,7 +647,7 @@
 	switch (node_tag) {
 	case TAG_MPEG4_Coordinate:
 	case TAG_MPEG4_Coordinate2D:
-		gf_bifs_enc_qp14_enter(codec, 1);
+		gf_bifs_enc_qp14_enter(codec, GF_TRUE);
 	}
 
 	e = EncNodeFields(codec, bs, node);
@@ -658,7 +659,7 @@
 	switch (node_tag) {
 	case TAG_MPEG4_Coordinate:
 	case TAG_MPEG4_Coordinate2D:
-		gf_bifs_enc_qp14_enter(codec, 0);
+		gf_bifs_enc_qp14_enter(codec, GF_FALSE);
 		break;
 	}
 	return GF_OK;

v0.5.2.tar.gz/src/bifs/memory_decoder.c -> v0.6.1.tar.gz/src/bifs/memory_decoder.c Changed

@@ -80,7 +80,7 @@
 			gf_node_register(inf->new_node, NULL);
 		} else {
 			field.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
-			e = gf_bifs_dec_sf_field(codec, bs, node, &field, 1);
+			e = gf_bifs_dec_sf_field(codec, bs, node, &field, GF_TRUE);
 			if (e) goto err;
 		}
 		count--;
@@ -127,7 +127,7 @@
 			} else {
 				field.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 			}
-			e = gf_bifs_dec_field(codec, bs, node, &field, 1);
+			e = gf_bifs_dec_field(codec, bs, node, &field, GF_TRUE);
 			if (e) goto exit;
 		}
 	} else {
@@ -149,7 +149,7 @@
 			} else {
 				field.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 			}
-			e = gf_bifs_dec_field(codec, bs, node, &field, 1);
+			e = gf_bifs_dec_field(codec, bs, node, &field, GF_TRUE);
 			if (e) goto exit;
 			flag = gf_bs_read_int(bs, 1);
 		}
@@ -343,7 +343,7 @@
 	} else {
 		decfield.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 	}
-	e = gf_bifs_dec_sf_field(codec, bs, target, &decfield, 1);
+	e = gf_bifs_dec_sf_field(codec, bs, target, &decfield, GF_TRUE);
 	if (e) return e;
 
 	gf_list_add(com_list, com);
@@ -512,7 +512,7 @@
 		inf->fieldIndex = field_ind;
 		inf->fieldType = sffield.fieldType;
 		sffield.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(sffield.fieldType);
-		codec->LastError = gf_bifs_dec_sf_field(codec, bs, def, &sffield, 1);
+		codec->LastError = gf_bifs_dec_sf_field(codec, bs, def, &sffield, GF_TRUE);
 		gf_list_add(com_list, com);
 	}
 	return codec->LastError;
@@ -724,7 +724,7 @@
 		field.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(field.fieldType);
 	}
 	/*parse the field*/
-	codec->LastError = gf_bifs_dec_field(codec, bs, node, &field, 1);
+	codec->LastError = gf_bifs_dec_field(codec, bs, node, &field, GF_TRUE);
 
 	gf_list_add(com_list, com);
 	return codec->LastError;
@@ -784,7 +784,7 @@
 		sffield.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
 		inf->fieldType = sffield.fieldType;
 		sffield.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(sffield.fieldType);
-		codec->LastError = gf_bifs_dec_sf_field(codec, bs, node, &sffield, 1);
+		codec->LastError = gf_bifs_dec_sf_field(codec, bs, node, &sffield, GF_TRUE);
 	}
 	gf_list_add(com_list, com);
 	return codec->LastError;
@@ -918,7 +918,7 @@
 
 	}
 	while (gf_list_count(codec->QPs)) {
-		gf_bifs_dec_qp_remove(codec, 1);
+		gf_bifs_dec_qp_remove(codec, GF_TRUE);
 	}
 	return GF_OK;
 }

v0.5.2.tar.gz/src/bifs/quantize.c -> v0.6.1.tar.gz/src/bifs/quantize.c Changed

v0.5.2.tar.gz/src/bifs/script_dec.c -> v0.6.1.tar.gz/src/bifs/script_dec.c Changed

@@ -113,7 +113,7 @@
 	gf_list_add(parser->identifiers, gf_strdup(name));
 
 	if (parser->codec->pCurrentProto) {
-		Bool isISfield = gf_bs_read_int(parser->bs, 1);
+		Bool isISfield = (Bool)gf_bs_read_int(parser->bs, 1);
 		if (isISfield) {
 			u32 numProtoField = gf_sg_proto_get_field_count(parser->codec->pCurrentProto);
 			u32 numBits = gf_get_bit_size(numProtoField - 1);
@@ -129,7 +129,7 @@
 		if (gf_bs_read_int(parser->bs, 1)) {
 			e = gf_sg_script_field_get_info(field, &info);
 			if (e) return e;
-			gf_bifs_dec_field(parser->codec, parser->bs, parser->script, &info, 0);
+			gf_bifs_dec_field(parser->codec, parser->bs, parser->script, &info, GF_FALSE);
 		}
 	}
 
@@ -205,9 +205,9 @@
 	while (gf_bs_read_int(bs, 1)) {
 		SFS_AddString(&parser, "function ");
 		SFS_Identifier(&parser);
-		SFS_Arguments(&parser, 0);
+		SFS_Arguments(&parser, GF_FALSE);
 		SFS_Space(&parser);
-		SFS_StatementBlock(&parser, 1);
+		SFS_StatementBlock(&parser, GF_TRUE);
 		SFS_Line(&parser);
 	}
 
@@ -333,13 +333,13 @@
 	SFS_AddString(parser, "if (");
 	SFS_CompoundExpression(parser);
 	SFS_AddString(parser, ") ");
-	SFS_StatementBlock(parser, 0);
+	SFS_StatementBlock(parser, GF_FALSE);
 	//has else
 	if (gf_bs_read_int(parser->bs, 1)) {
 		SFS_Line(parser);
 		SFS_Indent(parser);
 		SFS_AddString(parser, "else ");
-		SFS_StatementBlock(parser, 0);
+		SFS_StatementBlock(parser, GF_FALSE);
 	}
 }
 
@@ -363,7 +363,7 @@
 		SFS_AddString(parser, ":");
 		SFS_Line(parser);
 		SFS_Indent(parser);
-		SFS_StatementBlock(parser, 0);
+		SFS_StatementBlock(parser, GF_FALSE);
 		SFS_Line(parser);
 	}
 	while (gf_bs_read_int(parser->bs, 1));
@@ -372,7 +372,7 @@
 	if (gf_bs_read_int(parser->bs, 1)) {
 		SFS_AddString(parser, "default:");
 		SFS_Line(parser);
-		SFS_StatementBlock(parser, 0);
+		SFS_StatementBlock(parser, GF_FALSE);
 	}
 	SFS_AddString(parser, "}");
 }
@@ -388,7 +388,7 @@
 	SFS_OptionalExpression(parser);
 	SFS_AddString(parser, ")");
 
-	SFS_StatementBlock(parser, 0);
+	SFS_StatementBlock(parser, GF_FALSE);
 }
 
 void SFS_WhileStatement(ScriptParser *parser)
@@ -398,7 +398,7 @@
 	SFS_CompoundExpression(parser);
 	SFS_AddString(parser, ")");
 
-	SFS_StatementBlock(parser, 0);
+	SFS_StatementBlock(parser, GF_FALSE);
 }
 
 void SFS_ReturnStatement(ScriptParser *parser)
@@ -664,12 +664,12 @@
 		break;
 	case ET_VAR:
 		SFS_AddString(parser, "var ");
-		SFS_Arguments(parser, 1);
+		SFS_Arguments(parser, GF_TRUE);
 		break;
 	case ET_FUNCTION_ASSIGN:
 		SFS_AddString(parser, "function ");
-		SFS_Arguments(parser, 0);
-		SFS_StatementBlock(parser, 1);
+		SFS_Arguments(parser, GF_FALSE);
+		SFS_StatementBlock(parser, GF_TRUE);
 		break;
 	default:
 		assert(0);

v0.5.2.tar.gz/src/bifs/script_enc.c -> v0.6.1.tar.gz/src/bifs/script_enc.c Changed

@@ -67,9 +67,9 @@
 	GF_FieldInfo info;
 
 	nbFields = gf_node_get_num_fields_in_mode(sc_enc->script, GF_SG_FIELD_CODING_ALL) - 3;
-	use_list = 1;
+	use_list = GF_TRUE;
 	nbBits = gf_get_bit_size(nbFields);
-	if (nbFields+1 > 4 + gf_get_bit_size(nbFields)) use_list = 0;
+	if (nbFields+1 > 4 + gf_get_bit_size(nbFields)) use_list = GF_FALSE;
 	if (!nbFields) {
 		GF_BIFS_WRITE_INT(sc_enc->codec, sc_enc->bs, 1, 1, "Script::isList", NULL);
 		GF_BIFS_WRITE_INT(sc_enc->codec, sc_enc->bs, 1, 1, "end", NULL);
@@ -293,7 +293,7 @@
 Bool SFE_GetNumber(ScriptEnc *sc_enc)
 {
 	u32 i = 0;
-	Bool exp = 0;
+	Bool exp = GF_FALSE;
 	while ( isdigit(sc_enc->cur_buf[i])
 	 || (toupper(sc_enc->cur_buf[i])=='X')
 	 || ((toupper(sc_enc->cur_buf[i]) >='A') && (toupper(sc_enc->cur_buf[i])<='F'))
@@ -302,24 +302,24 @@
 	 || (exp && (sc_enc->cur_buf[i] == '-'))
 	 ) {
 		sc_enc->token[i] = sc_enc->cur_buf[i];
-		if (tolower(sc_enc->cur_buf[i])=='e') exp = 1;
+		if (tolower(sc_enc->cur_buf[i])=='e') exp = GF_TRUE;
 		i++;
 		if (!sc_enc->cur_buf[i]) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: Invalid number syntax (%s)\n", sc_enc->cur_buf));
 			sc_enc->err = GF_BAD_PARAM;
-			return 0;
+			return GF_FALSE;
 		}
 	}
 	sc_enc->token[i] = 0;
 	sc_enc->cur_buf += i;
 	sc_enc->token_code = TOK_NUMBER;
-	return 1;
+	return GF_TRUE;
 }
 
 Bool SFE_NextToken(ScriptEnc *sc_enc)
 {
 	u32 i;
-	if (sc_enc->err) return 0;
+	if (sc_enc->err) return GF_FALSE;
 	while (strchr(" \t\r\n", sc_enc->cur_buf[0])) {
 		if (sc_enc->cur_buf[0]=='\n') sc_enc->cur_line ++;
 		sc_enc->cur_buf++;
@@ -331,7 +331,7 @@
 			if (!sc_enc->cur_buf[0] || !sc_enc->cur_buf[1]) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: cannot find closing comment */\n"));
 				sc_enc->err = GF_BAD_PARAM;
-				return 0;
+				return GF_FALSE;
 			}
 		}
 		sc_enc->cur_buf+=2;
@@ -351,13 +351,13 @@
 		for (i=0; i<NUMBER_OF_KEYWORD; i++) {
 			if (!strcmp(sc_enc->token, sc_keywords[i])) {
 				sc_enc->token_code = i;
-				return 1;
+				return GF_TRUE;
 			}
 		}
 		if (!stricmp(sc_enc->token, "TRUE") || !stricmp(sc_enc->token, "FALSE") ) {
 			sc_enc->token_code = TOK_BOOLEAN;
 		}
-		return 1;
+		return GF_TRUE;
 	}
 	/*get a number*/
 	if (isdigit(sc_enc->cur_buf[i])) return SFE_GetNumber(sc_enc);
@@ -366,10 +366,10 @@
 	 || ((sc_enc->cur_buf[i]=='\\') && (sc_enc->cur_buf[i+1]=='\"'))
 	 ) {
 		char end;
-		Bool skip_last = 0;
+		Bool skip_last = GF_FALSE;
 		end = sc_enc->cur_buf[i];
 		if (sc_enc->cur_buf[i]=='\\') {
-			skip_last = 1;
+			skip_last = GF_TRUE;
 			sc_enc->cur_buf++;
 		}
 		while (sc_enc->cur_buf[i+1] != end) {
@@ -380,14 +380,14 @@
 		sc_enc->cur_buf += i+2;
 		if (skip_last) sc_enc->cur_buf++;
 		sc_enc->token_code = TOK_STRING;
-		return 1;
+		return GF_TRUE;
 	}
 	/*all other codes*/
 	switch (sc_enc->cur_buf[i]) {
 	case '.':
 		if (isdigit(sc_enc->cur_buf[i+1])) {
 			SFE_GetNumber(sc_enc);
-			return 1;
+			return GF_TRUE;
 		} else {
 			sc_enc->token_code = TOK_PERIOD;
 		}
@@ -402,6 +402,11 @@
 		break;
 	case '=':
 		if (sc_enc->cur_buf[i+1]=='=') {
+			if (sc_enc->cur_buf[i+2]=='=') {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BIFSEnc] JavaScript token '===' not supported by standard\n"));
+				sc_enc->err = GF_NOT_SUPPORTED;
+				return GF_FALSE;
+			}
 			sc_enc->token_code = TOK_EQ;
 			sc_enc->cur_buf ++;
 		} else {
@@ -560,19 +565,19 @@
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: Unrecognized symbol %c\n", sc_enc->cur_buf[i]));
 		sc_enc->err = GF_BAD_PARAM;
-		return 0;
+		return GF_FALSE;
 	}
 	sc_enc->cur_buf ++;
-	return 1;
+	return GF_TRUE;
 }
 
 Bool SFE_CheckToken(ScriptEnc *sc_enc, u32 token)
 {
 	if (sc_enc->token_code != token) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: Bad token (expecting \"%s\" got \"%s\")\n", tok_names[token] , tok_names[sc_enc->token_code]));
-		return 0;
+		return GF_FALSE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 void SFE_PutIdentifier(ScriptEnc *sc_enc, char *id)
@@ -671,7 +676,7 @@
 			goto break_loop;
 		}
 
-		if (sc_enc->token_code==TOK_VAR) is_var = 1;
+		if (sc_enc->token_code==TOK_VAR) is_var = GF_TRUE;
 		if (!is_var || (sc_enc->token_code!=TOK_COMMA)) {
 			sc_enc->expr_toks[sc_enc->expr_toks_len] = sc_enc->token_code;
 			sc_enc->expr_toks_len++;
@@ -703,6 +708,8 @@
 			} while ( (sc_enc->token_code != close_code) || count);
 		}
 		SFE_NextToken(sc_enc);
+
+		if (sc_enc->err) break;
 	}
 
 break_loop:
@@ -766,10 +773,10 @@
 		nbExp = SFE_ScanExpression(sc_enc, start, end, expr_sep);
 	}
 
-	SFE_Expression(sc_enc, expr_sep[0], expr_sep[1], 0);
+	SFE_Expression(sc_enc, expr_sep[0], expr_sep[1], GF_FALSE);
 	for (i=1; i<nbExp; i++) {
 		SFE_WRITE_INT(sc_enc, 1, 1, isPar ? "hasParam" : "hasExpression", NULL);
-		SFE_Expression(sc_enc, expr_sep[i]+1, expr_sep[i+1], 0);
+		SFE_Expression(sc_enc, expr_sep[i]+1, expr_sep[i+1], GF_FALSE);
 	}
 	SFE_WRITE_INT(sc_enc, 0, 1, isPar ? "hasParam" : "hasExpression", NULL);
 }
@@ -914,7 +921,7 @@
 	buf_bck = sc_enc->cur_buf;
 	tok_bck = sc_enc->token_code;
 	prev_emu = sc_enc->emul;
-	sc_enc->emul = 1;
+	sc_enc->emul = GF_TRUE;
 
 	SFE_NextToken(sc_enc);
 	while (sc_enc->token_code == TOK_CASE) {
@@ -1594,8 +1601,8 @@
 	case ET_OR:
 	case ET_LAND:
 	case ET_LOR:
-		SFE_Expression(sc_enc, start, finalPos, 0);
-		SFE_Expression(sc_enc, finalPos+1, end, 0);
+		SFE_Expression(sc_enc, start, finalPos, GF_FALSE);
+		SFE_Expression(sc_enc, finalPos+1, end, GF_FALSE);
 		break;
 	case ET_ASSIGN:
 	case ET_PLUSEQ:
@@ -1610,13 +1617,13 @@
 	case ET_XOREQ:
 	case ET_OREQ:
 	{
-		u32 ret = SFE_Expression(sc_enc, start, finalPos, 0);
+		u32 ret = SFE_Expression(sc_enc, start, finalPos, GF_FALSE);
 		if ( ret != ET_IDENTIFIER && ret != ET_OBJECT_MEMBER_ACCESS && ret != ET_ARRAY_DEREFERENCE ) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: LeftVariable expected, %s returned\n", expr_name[ret]));
 			sc_enc->err = GF_BAD_PARAM;
 			return expr;
 		}
-		SFE_Expression(sc_enc, finalPos+1, end, 0);
+		SFE_Expression(sc_enc, finalPos+1, end, GF_FALSE);
 	}
 	break;
 
@@ -1664,14 +1671,14 @@
 	case ET_DECREMENT:
 	case ET_NOT:
 	case ET_ONESCOMP:
-		SFE_Expression(sc_enc, finalPos+1, end, 0);
+		SFE_Expression(sc_enc, finalPos+1, end, GF_FALSE);
 		break;
 	case ET_CURVED_EXPR:
 		SFE_CompoundExpression(sc_enc, finalPos+1, end-1, 0);
 		break;
 	case ET_POST_INCREMENT :
 	case ET_POST_DECREMENT :
-		SFE_Expression(sc_enc, start, finalPos, 0);
+		SFE_Expression(sc_enc, start, finalPos, GF_FALSE);
 		break;
 	case ET_FUNCTION_CALL:
 		SFE_FunctionCall(sc_enc, start, end);
@@ -1731,7 +1738,7 @@
 	u32 curTok;
 	char *str;
 
-	SFE_Expression(sc_enc, start, op, 1);
+	SFE_Expression(sc_enc, start, op, GF_TRUE);
 	curTok = sc_enc->expr_toks[op];
 	CHECK_TOK(TOK_PERIOD);
 	curTok = sc_enc->expr_toks[end-1];
@@ -1747,7 +1754,7 @@
 	u32 curTok;
 	char *str;
 
-	SFE_Expression(sc_enc, start, op, 0);
+	SFE_Expression(sc_enc, start, op, GF_FALSE);
 	curTok = sc_enc->expr_toks[op];
 	CHECK_TOK(TOK_PERIOD);
 	curTok = sc_enc->expr_toks[op+1];
@@ -1767,7 +1774,7 @@
 {
 	u32 curTok;
 
-	SFE_Expression(sc_enc, start, op, 0);
+	SFE_Expression(sc_enc, start, op, GF_FALSE);
 	curTok = sc_enc->expr_toks[op];
 	CHECK_TOK(TOK_LEFT_BRACKET);
 	SFE_CompoundExpression(sc_enc, op+1, end-1, 0);
@@ -1799,15 +1806,15 @@
 {
 	u32 curTok;
 
-	SFE_Expression(sc_enc, start, op, 0);
+	SFE_Expression(sc_enc, start, op, GF_FALSE);
 	curTok = sc_enc->expr_toks[op];
 	CHECK_TOK(TOK_CONDTEST);
 	start = op+1;
 	op = MoveToToken(sc_enc, TOK_CONDSEP, op, end-1);
-	SFE_Expression(sc_enc, start, op, 0);
+	SFE_Expression(sc_enc, start, op, GF_FALSE);
 	curTok = sc_enc->expr_toks[op];
 	CHECK_TOK(TOK_CONDSEP);
-	SFE_Expression(sc_enc, op+1, end, 0);
+	SFE_Expression(sc_enc, op+1, end, GF_FALSE);
 }
 
 void SFE_Params(ScriptEnc *sc_enc, u32 start, u32 end)

v0.5.2.tar.gz/src/bifs/unquantize.c -> v0.6.1.tar.gz/src/bifs/unquantize.c Changed

@@ -38,17 +38,17 @@
 void gf_bifs_dec_qp14_enter(GF_BifsDecoder * codec, Bool Enter)
 {
 	if (!codec->ActiveQP) return;
-	if (Enter) codec->storing_coord = 1;
+	if (Enter) codec->storing_coord = GF_TRUE;
 	else {
-		if (codec->storing_coord) codec->coord_stored = 1;
-		codec->storing_coord = 0;
+		if (codec->storing_coord) codec->coord_stored = GF_TRUE;
+		codec->storing_coord = GF_FALSE;
 	}
 }
 
 void gf_bifs_dec_qp14_reset(GF_BifsDecoder * codec)
 {
-	codec->coord_stored = 0;
-	codec->storing_coord = 0;
+	codec->coord_stored = GF_FALSE;
+	codec->storing_coord = GF_FALSE;
 	codec->NumCoord = 0;
 }
 
@@ -127,7 +127,7 @@
 {
 	switch (q_type) {
 	case QC_3DPOS:
-		if (!qp->position3DQuant) return 0;
+		if (!qp->position3DQuant) return GF_FALSE;
 		*NbBits = qp->position3DNbBits;
 		b_min->x = MAX(b_min->x, qp->position3DMin.x);
 		b_min->y = MAX(b_min->y, qp->position3DMin.y);
@@ -135,47 +135,47 @@
 		b_max->x = MIN(b_max->x, qp->position3DMax.x);
 		b_max->y = MIN(b_max->y, qp->position3DMax.y);
 		b_max->z = MIN(b_max->z, qp->position3DMax.z);
-		return 1;
+		return GF_TRUE;
 	case QC_2DPOS:
-		if (!qp->position2DQuant) return 0;
+		if (!qp->position2DQuant) return GF_FALSE;
 		*NbBits = qp->position2DNbBits;
 		b_min->x = MAX(b_min->x, qp->position2DMin.x);
 		b_min->y = MAX(b_min->y, qp->position2DMin.y);
 		b_max->x = MIN(b_max->x, qp->position2DMax.x);
 		b_max->y = MIN(b_max->y, qp->position2DMax.y);
-		return 1;
+		return GF_TRUE;
 	case QC_ORDER:
-		if (!qp->drawOrderQuant) return 0;
+		if (!qp->drawOrderQuant) return GF_FALSE;
 		*NbBits = qp->drawOrderNbBits;
 		b_min->x = MAX(b_min->x, qp->drawOrderMin);
 		b_max->x = MIN(b_max->x, qp->drawOrderMax);
-		return 1;
+		return GF_TRUE;
 	case QC_COLOR:
-		if (!qp->colorQuant) return 0;
+		if (!qp->colorQuant) return GF_FALSE;
 		*NbBits = qp->colorNbBits;
 		b_min->x = b_min->y = b_min->z = MAX(b_min->x, qp->colorMin);
 		b_max->x = b_max->y = b_max->z = MIN(b_max->x, qp->colorMax);
-		return 1;
+		return GF_TRUE;
 	case QC_TEXTURE_COORD:
-		if (!qp->textureCoordinateQuant) return 0;
+		if (!qp->textureCoordinateQuant) return GF_FALSE;
 		*NbBits = qp->textureCoordinateNbBits;
 		b_min->x = b_min->y = b_min->z = MAX(b_min->x, qp->textureCoordinateMin);
 		b_max->x = b_max->y = b_max->z = MIN(b_max->x, qp->textureCoordinateMax);
-		return 1;
+		return GF_TRUE;
 	case QC_ANGLE:
-		if (!qp->angleQuant) return 0;
+		if (!qp->angleQuant) return GF_FALSE;
 		*NbBits = qp->angleNbBits;
 		b_min->x = b_min->y = b_min->z = MAX(b_min->x, qp->angleMin);
 		b_max->x = b_max->y = b_max->z = MIN(b_max->x, qp->angleMax);
-		return 1;
+		return GF_TRUE;
 	case QC_SCALE:
-		if (!qp->scaleQuant) return 0;
+		if (!qp->scaleQuant) return GF_FALSE;
 		*NbBits = qp->scaleNbBits;
 		b_min->x = b_min->y = b_min->z = MAX(b_min->x, qp->scaleMin);
 		b_max->x = b_max->y = b_max->z = MIN(b_max->x, qp->scaleMax);
-		return 1;
+		return GF_TRUE;
 	case QC_INTERPOL_KEYS:
-		if (!qp->keyQuant) return 0;
+		if (!qp->keyQuant) return GF_FALSE;
 		*NbBits = qp->keyNbBits;
 		b_min->x = MAX(b_min->x, qp->keyMin);
 		b_min->y = MAX(b_min->y, qp->keyMin);
@@ -183,44 +183,44 @@
 		b_max->x = MIN(b_max->x, qp->keyMax);
 		b_max->y = MIN(b_max->y, qp->keyMax);
 		b_max->z = MIN(b_max->z, qp->keyMax);
-		return 1;
+		return GF_TRUE;
 	case QC_NORMALS:
-		if (!qp->normalQuant) return 0;
+		if (!qp->normalQuant) return GF_FALSE;
 		*NbBits = qp->normalNbBits;
 		b_min->x = b_min->y = b_min->z = 0;
 		b_max->x = b_max->y = b_max->z = FIX_ONE;
-		return 1;
+		return GF_TRUE;
 	case QC_ROTATION:
-		if (!qp->normalQuant) return 0;
+		if (!qp->normalQuant) return GF_FALSE;
 		*NbBits = qp->normalNbBits;
 		b_min->x = b_min->y = b_min->z = 0;
 		b_max->x = b_max->y = b_max->z = FIX_ONE;
-		return 1;
+		return GF_TRUE;
 	case QC_SIZE_3D:
-		if (!qp->sizeQuant) return 0;
+		if (!qp->sizeQuant) return GF_FALSE;
 		*NbBits = qp->sizeNbBits;
 		b_min->x = b_min->y = b_min->z = MAX(b_min->x, qp->sizeMin);
 		b_max->x = b_max->y = b_max->z = MIN(b_max->x, qp->sizeMax);
-		return 1;
+		return GF_TRUE;
 	case QC_SIZE_2D:
-		if (!qp->sizeQuant) return 0;
+		if (!qp->sizeQuant) return GF_FALSE;
 		*NbBits = qp->sizeNbBits;
 		b_min->x = b_min->y = b_min->z = MAX(b_min->x, qp->sizeMin);
 		b_max->x = b_max->y = b_max->z = MIN(b_max->x, qp->sizeMax);
-		return 1;
+		return GF_TRUE;
 
 	//cf specs, from here ALWAYS ON
 	case QC_LINEAR_SCALAR:
 		//nbBits is the one from the FCT - DO NOT CHANGE IT
-		return 1;
+		return GF_TRUE;
 	case QC_COORD_INDEX:
 		//nbBits has to be recomputed on the fly
-		return 1;
+		return GF_TRUE;
 	case QC_RESERVED:
 		*NbBits = 0;
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }

v0.5.2.tar.gz/src/compositor/audio_input.c -> v0.6.1.tar.gz/src/compositor/audio_input.c Changed

@@ -30,6 +30,9 @@
 /*diff time in ms to consider an audio frame too late and drop it - we should try to dynamically figure this out
 since the drift may be high on TS for example, where PTS-PCR>500ms is quite common*/
 #define MAX_RESYNC_TIME		1000
+//if drift between audio object time and clock varies more is than this value (in ms) between two drift computation, clock is adjusted. We don't adjust for lower values otherwise we would
+//introduce oscillations in the clock and non-smooth playback
+#define MIN_DRIFT_ADJUST	75
 
 struct __audiofilteritem
 {
@@ -69,15 +72,17 @@
 
 	/*no more data or not enough data, reset syncro drift*/
 	if (!frame) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] No data in audio object (eos %d)\n", ai->stream_finished));
+		if (!ai->stream_finished) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] No data in audio object\n"));
+		}
 		gf_mo_adjust_clock(ai->stream, 0);
 		*size = 0;
 		return NULL;
 	}
-	ai->need_release = 1;
+	ai->need_release = GF_TRUE;
 
 	//step mode, return the frame without sync check
-	if (ai->compositor->audio_renderer->step_mode) 
+	if (ai->compositor->audio_renderer->step_mode)
 		return frame;
 
 	speed = gf_mo_get_current_speed(ai->stream);
@@ -95,7 +100,7 @@
 	/*too early (silence insertions), skip*/
 	if (drift < 0) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] audio too early of %d (CTS %u at OTB %u with audio delay %d ms)\n", drift + audio_delay_ms, ts, obj_time, audio_delay_ms));
-		ai->need_release = 0;
+		ai->need_release = GF_FALSE;
 		gf_mo_release_data(ai->stream, 0, -1);
 		*size = 0;
 		return NULL;
@@ -108,11 +113,16 @@
 		if (drift>resync_delay) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] Audio data too late obj time %d - CTS %d - drift %d ms - resync forced\n", obj_time - audio_delay_ms, ts, drift));
 			gf_mo_release_data(ai->stream, *size, 2);
-			ai->need_release = 0;
+			ai->need_release = GF_FALSE;
 			return gf_audio_input_fetch_frame(callback, size, audio_delay_ms);
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[Audio Input] Audio clock: delay %d - obj time %d - CTS %d - adjust drift %d\n", audio_delay_ms, obj_time - audio_delay_ms, ts, drift));
-		gf_mo_adjust_clock(ai->stream, drift);
+		resync_delay = gf_mo_get_clock_drift(ai->stream) - drift;
+		if (resync_delay < 0) resync_delay = -resync_delay;
+
+		if (resync_delay > MIN_DRIFT_ADJUST) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[Audio Input] Audio clock: delay %d - obj time %d - audio delay %d - CTS %d - adjust drift %d\n", audio_delay_ms, obj_time, audio_delay_ms, ts, drift));
+			gf_mo_adjust_clock(ai->stream, drift);
+		}
 	}
 	return frame;
 }
@@ -122,7 +132,7 @@
 	GF_AudioInput *ai = (GF_AudioInput *) callback;
 	if (!ai->stream) return;
 	gf_mo_release_data(ai->stream, nb_bytes, 1);
-	ai->need_release = 0;
+	ai->need_release = GF_FALSE;
 }
 
 static Fixed gf_audio_input_get_speed(void *callback)
@@ -138,36 +148,37 @@
 		return ai->snd->GetChannelVolume(ai->snd->owner, vol);
 	} else {
 		vol[0] = vol[1] = vol[2] = vol[3] = vol[4] = vol[5] = ai->intensity;
-		return (ai->intensity==FIX_ONE) ? 0 : 1;
+		return (ai->intensity==FIX_ONE) ? GF_FALSE : GF_TRUE;
 	}
 }
 
 static Bool gf_audio_input_is_muted(void *callback)
 {
 	GF_AudioInput *ai = (GF_AudioInput *) callback;
-	if (!ai->stream) return 1;
+	if (!ai->stream) return GF_TRUE;
 	if (ai->is_muted)
-		return 1;
+		return GF_TRUE;
 	return gf_mo_is_muted(ai->stream);
 }
 
 static Bool gf_audio_input_get_config(GF_AudioInterface *aifc, Bool for_recf)
 {
 	GF_AudioInput *ai = (GF_AudioInput *) aifc->callback;
-	if (!ai->stream) return 0;
+	if (!ai->stream) return GF_FALSE;
 	/*watchout for object reuse*/
-	if (aifc->samplerate && (gf_mo_get_flags(ai->stream) & GF_MO_IS_INIT)) return 1;
-	if (!for_recf)
-		return 0;
+	if (aifc->samplerate && (gf_mo_get_flags(ai->stream) & GF_MO_IS_INIT)) return GF_TRUE;
 
 	gf_mo_get_audio_info(ai->stream, &aifc->samplerate, &aifc->bps , &aifc->chan, &aifc->ch_cfg);
 
+	if (!for_recf)
+		return aifc->samplerate ? GF_TRUE : GF_FALSE;
+
 	if (aifc->samplerate * aifc->chan * aifc->bps && ((aifc->chan<=2) || aifc->ch_cfg)) {
-		gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, 1);
-		return 1;
+		gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, GF_TRUE);
+		return GF_TRUE;
 	}
-	gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, 0);
-	return 0;
+	gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, GF_FALSE);
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -206,16 +217,16 @@
 	if (ai->is_open) return GF_BAD_PARAM;
 
 	/*get media object*/
-	ai->stream = gf_mo_register(ai->owner, url, lock_timeline, 0);
+	ai->stream = gf_mo_register(ai->owner, url, lock_timeline, GF_FALSE);
 	/*bad URL*/
 	if (!ai->stream) return GF_NOT_SUPPORTED;
 
 	/*request play*/
-	gf_mo_play(ai->stream, clipBegin, clipEnd, 0);
+	gf_mo_play(ai->stream, clipBegin, clipEnd, GF_FALSE);
 
-	ai->stream_finished = 0;
+	ai->stream_finished = GF_FALSE;
 	ai->is_open = 1;
-	gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, 0);
+	gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, GF_FALSE);
 
 	if (ai->filter) gf_af_del(ai->filter);
 	ai->filter = NULL;
@@ -236,7 +247,7 @@
 	if (!ai->is_open) return;
 
 	/*we must make sure audio mixer is not using the stream otherwise we may leave it dirty (with unrelease frame)*/
-	gf_mixer_lock(ai->compositor->audio_renderer->mixer, 1);
+	gf_mixer_lock(ai->compositor->audio_renderer->mixer, GF_TRUE);
 
 	assert(!ai->need_release);
 
@@ -248,7 +259,7 @@
 	if (ai->filter) gf_af_del(ai->filter);
 	ai->filter = NULL;
 
-	gf_mixer_lock(ai->compositor->audio_renderer->mixer, 0);
+	gf_mixer_lock(ai->compositor->audio_renderer->mixer, GF_FALSE);
 
 }
 
@@ -257,8 +268,8 @@
 {
 	if (!ai->is_open) return;
 	if (ai->need_release) gf_mo_release_data(ai->stream, 0xFFFFFFFF, 2);
-	ai->need_release = 0;
-	ai->stream_finished = 0;
+	ai->need_release = GF_FALSE;
+	ai->stream_finished = GF_FALSE;
 	if (ai->filter) gf_af_reset(ai->filter);
 	gf_mo_restart(ai->stream);
 }
@@ -292,21 +303,21 @@
 		if (ai->register_with_parent) return;
 		if (ai->register_with_renderer) {
 			gf_sc_ar_remove_src(ai->compositor->audio_renderer, aifce);
-			ai->register_with_renderer = 0;
+			ai->register_with_renderer = GF_FALSE;
 		}
 		tr_state->audio_parent->add_source(tr_state->audio_parent, ai);
-		ai->register_with_parent = 1;
+		ai->register_with_parent = GF_TRUE;
 		ai->snd = tr_state->sound_holder;
 	} else if (!ai->register_with_renderer) {
 
 		if (ai->register_with_parent) {
-			ai->register_with_parent = 0;
+			ai->register_with_parent = GF_FALSE;
 			/*if used in a parent audio group, do a complete traverse to rebuild the group*/
 			gf_sc_invalidate(ai->compositor, NULL);
 		}
 
 		gf_sc_ar_add_src(ai->compositor->audio_renderer, aifce);
-		ai->register_with_renderer = 1;
+		ai->register_with_renderer = GF_TRUE;
 		ai->snd = tr_state->sound_holder;
 	}
 }
@@ -318,7 +329,7 @@
 	if (ai->filter) aifce = &ai->filter->input;
 
 	if (ai->register_with_renderer) {
-		ai->register_with_renderer = 0;
+		ai->register_with_renderer = GF_FALSE;
 		gf_sc_ar_remove_src(ai->compositor->audio_renderer, aifce);
 	} else {
 		/*if used in a parent audio group, do a complete traverse to rebuild the group*/
@@ -386,8 +397,8 @@
 	GF_AudioFilterItem *af = (GF_AudioFilterItem *)ai->callback;
 
 	Bool res = af->src->GetConfig(af->src, for_reconf);
-	if (!res) return 0;
-	if (!for_reconf) return 1;
+	if (!res) return GF_FALSE;
+	if (!for_reconf) return GF_TRUE;
 
 
 	af->input.bps = af->src->bps;
@@ -399,9 +410,9 @@
 	if (gf_afc_setup(&af->filter_chain, af->input.bps, af->input.samplerate, af->src->chan, af->src->ch_cfg, &af->input.chan, &af->input.ch_cfg)!=GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[Audio Input] Failed to configure audio filter chain\n"));
 
-		return 0;
+		return GF_FALSE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 GF_AudioFilterItem *gf_af_new(GF_Compositor *compositor, GF_AudioInterface *src, char *filter_name)

v0.5.2.tar.gz/src/compositor/audio_mixer.c -> v0.6.1.tar.gz/src/compositor/audio_mixer.c Changed

@@ -87,7 +87,7 @@
 	memset(am, 0, sizeof(GF_AudioMixer));
 	am->mx = gf_mx_new("AudioMix");
 	am->sources = gf_list_new();
-	am->isEmpty = 1;
+	am->isEmpty = GF_TRUE;
 	am->ar = ar;
 	am->sample_rate = 44100;
 	am->bits_per_sample = 16;
@@ -113,7 +113,7 @@
 void gf_mixer_remove_all(GF_AudioMixer *am)
 {
 	u32 j;
-	gf_mixer_lock(am, 1);
+	gf_mixer_lock(am, GF_TRUE);
 	while (gf_list_count(am->sources)) {
 		MixerInput *in = (MixerInput *)gf_list_get(am->sources, 0);
 		gf_list_rem(am->sources, 0);
@@ -122,8 +122,8 @@
 		}
 		gf_free(in);
 	}
-	am->isEmpty = 1,
-	 gf_mixer_lock(am, 0);
+	am->isEmpty = GF_TRUE,
+	 gf_mixer_lock(am, GF_FALSE);
 }
 
 Bool gf_mixer_is_src_present(GF_AudioMixer *am, GF_AudioInterface *ifce)
@@ -131,9 +131,9 @@
 	MixerInput *in;
 	u32 i = 0;
 	while ((in = (MixerInput *)gf_list_enum(am->sources, &i))) {
-		if (in->src == ifce) return 1;
+		if (in->src == ifce) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 u32 gf_mixer_get_src_count(GF_AudioMixer *am)
 {
@@ -142,7 +142,7 @@
 
 void gf_mixer_force_chanel_out(GF_AudioMixer *am, u32 num_channels)
 {
-	am->force_channel_out = 1;
+	am->force_channel_out = GF_TRUE;
 	am->nb_channels = num_channels;
 }
 
@@ -173,20 +173,20 @@
 {
 	MixerInput *in;
 	if (gf_mixer_is_src_present(am, src)) return;
-	gf_mixer_lock(am, 1);
+	gf_mixer_lock(am, GF_TRUE);
 	GF_SAFEALLOC(in, MixerInput);
 	in->src = src;
 	gf_list_add(am->sources, in);
-	am->must_reconfig = 1;
-	am->isEmpty = 0;
-	gf_mixer_lock(am, 0);
+	am->must_reconfig = GF_TRUE;
+	am->isEmpty = GF_FALSE;
+	gf_mixer_lock(am, GF_FALSE);
 }
 
 void gf_mixer_remove_input(GF_AudioMixer *am, GF_AudioInterface *src)
 {
 	u32 i, j, count;
 	if (am->isEmpty) return;
-	gf_mixer_lock(am, 1);
+	gf_mixer_lock(am, GF_TRUE);
 	count = gf_list_count(am->sources);
 	for (i=0; i<count; i++) {
 		MixerInput *in = (MixerInput *)gf_list_get(am->sources, i);
@@ -198,9 +198,9 @@
 		gf_free(in);
 		break;
 	}
-	am->isEmpty = gf_list_count(am->sources) ? 0 : 1;
+	am->isEmpty = gf_list_count(am->sources) ? GF_FALSE : GF_TRUE;
 	/*we don't ask for reconfig when removing a node*/
-	gf_mixer_lock(am, 0);
+	gf_mixer_lock(am, GF_FALSE);
 }
 
 
@@ -226,7 +226,7 @@
 	if ((am->bits_per_sample == outBPS) && (am->nb_channels == outCH)
 	 && (am->sample_rate==outSR) && (am->channel_cfg == outChCfg)) return;
 
-	gf_mixer_lock(am, 1);
+	gf_mixer_lock(am, GF_TRUE);
 	am->bits_per_sample = outBPS;
 	if (!am->force_channel_out) am->nb_channels = outCH;
 	if (get_best_samplerate(am, &outSR, &outCH, &outBPS) == GF_OK) {
@@ -236,19 +236,26 @@
 		else am->channel_cfg = GF_AUDIO_CH_FRONT_LEFT;
 	}
 	/*if main mixer recfg output*/
-	if (am->ar)	am->ar->need_reconfig = 1;
-	gf_mixer_lock(am, 0);
+	if (am->ar)	am->ar->need_reconfig = GF_TRUE;
+	gf_mixer_lock(am, GF_FALSE);
 }
 
 GF_EXPORT
 Bool gf_mixer_reconfig(GF_AudioMixer *am)
 {
 	u32 i, count, numInit, max_sample_rate, max_channels, max_bps, cfg_changed, ch_cfg;
-	gf_mixer_lock(am, 1);
+	gf_mixer_lock(am, GF_TRUE);
 	if (am->isEmpty || !am->must_reconfig) {
-		gf_mixer_lock(am, 0);
-		return 0;
+		gf_mixer_lock(am, GF_FALSE);
+		return GF_FALSE;
+	}
+
+	if (am->ar && am->ar->config_forced) {
+		am->must_reconfig = GF_FALSE;
+		gf_mixer_lock(am, GF_FALSE);
+		return GF_FALSE;
 	}
+
 	numInit = 0;
 	max_sample_rate = am->sample_rate;
 	max_channels = am->nb_channels;
@@ -263,7 +270,7 @@
 	for (i=0; i<count; i++) {
 		Bool has_cfg;
 		MixerInput *in = (MixerInput *) gf_list_get(am->sources, i);
-		has_cfg = in->src->GetConfig(in->src, 1);
+		has_cfg = in->src->GetConfig(in->src, GF_TRUE);
 		if (has_cfg) {
 			/*check same cfg...*/
 			if (in->src->samplerate * in->src->chan * in->src->bps == 8*in->bytes_per_sec) {
@@ -302,7 +309,7 @@
 		in->bytes_per_sec = in->src->samplerate * in->src->chan * in->src->bps / 8;
 		/*cfg has changed, we must reconfig everything*/
 		if (cfg_changed || (max_sample_rate != am->sample_rate) ) {
-			in->has_prev = 0;
+			in->has_prev = GF_FALSE;
 			memset(&in->last_channels, 0, sizeof(s16)*GF_SR_MAX_CHANNELS);
 		}
 	}
@@ -329,9 +336,10 @@
 		gf_mixer_set_config(am, max_sample_rate, max_channels, max_bps, ch_cfg);
 	}
 
-	if (numInit == count) am->must_reconfig = 0;
+	if (numInit == count) am->must_reconfig = GF_FALSE;
+	if (am->ar) cfg_changed = 1;
 
-	gf_mixer_lock(am, 0);
+	gf_mixer_lock(am, GF_FALSE);
 	return cfg_changed;
 }
 
@@ -457,7 +465,7 @@
 
 	in_s8 = (s8 *) in->src->FetchFrame(in->src->callback, &src_size, audio_delay);
 	if (!in_s8) {
-		in->has_prev = 0;
+		in->has_prev = GF_FALSE;
 		/*done, stop fill*/
 		in->out_samples_to_write = 0;
 		return;
@@ -477,7 +485,7 @@
 	/*just in case, if only 1 sample available in src, copy over and discard frame since we cannot
 	interpolate audio*/
 	if (src_samp==1) {
-		in->has_prev = 1;
+		in->has_prev = GF_TRUE;
 		for (j=0; j<in_ch; j++) in->last_channels[j] = in_s16 ? in_s16[j] : in_s8[j];
 		in->in_bytes_used = src_size;
 		return;
@@ -495,7 +503,7 @@
 		frac = (i*ratio) - 255*prev;
 		if (frac && (next==src_samp)) break;
 		if (use_prev && prev)
-			use_prev = 0;
+			use_prev = GF_FALSE;
 
 		if (in_s16) {
 			for (j=0; j<in_ch; j++) {
@@ -523,14 +531,14 @@
 	}
 
 	if (!(ratio%255)) {
-		in->has_prev = 0;
+		in->has_prev = GF_FALSE;
 		if (next==src_samp) {
 			in->in_bytes_used = src_size;
 		} else {
 			in->in_bytes_used = MIN(src_size, prev*in->src->bps * in->src->chan / 8);
 		}
 	} else {
-		in->has_prev = 1;
+		in->has_prev = GF_TRUE;
 		if (next==src_samp) {
 			for (j=0; j<in_ch; j++) in->last_channels[j] = inChanNext[j];
 			in->in_bytes_used = src_size;
@@ -563,14 +571,16 @@
 	s32 *out_mix, nb_act_src;
 	char *data, *ptr;
 
+	//reset buffer whatever the state of the mixer is
+	memset(buffer, 0, buffer_size);
+
 	/*the config has changed we don't write to output since settings change*/
 	if (gf_mixer_reconfig(am)) return 0;
 
-	gf_mixer_lock(am, 1);
+	gf_mixer_lock(am, GF_TRUE);
 	count = gf_list_count(am->sources);
 	if (!count) {
-		memset(buffer, 0, buffer_size);
-		gf_mixer_lock(am, 0);
+		gf_mixer_lock(am, GF_FALSE);
 		return 0;
 	}
 
@@ -579,12 +589,11 @@
 	if (am->force_channel_out) goto do_mix;
 	single_source = (MixerInput *) gf_list_get(am->sources, 0);
 	/*if cfg changed or unknown, reconfigure the mixer if the audio renderer is attached. Otherwise, the mixer config never changes internally*/
-	if (!single_source->src->GetConfig(single_source->src, 0)) {
+	if (!single_source->src->GetConfig(single_source->src, GF_FALSE)) {
 		if (am->ar) {
-			am->must_reconfig = 1;
+			am->must_reconfig = GF_TRUE;
 			gf_mixer_reconfig(am);
-			memset(buffer, 0, buffer_size);
-			gf_mixer_lock(am, 0);
+			gf_mixer_lock(am, GF_FALSE);
 			return 0;
 		}
 	}
@@ -610,9 +619,7 @@
 		if (!data || !size) break;
 		/*don't copy more than possible*/
 		if (size > buffer_size) size = buffer_size;
-		if (is_muted) {
-			memset(ptr, 0, size);
-		} else {
+		if (!is_muted) {
 			memcpy(ptr, data, size);
 		}
 		buffer_size -= size;
@@ -627,9 +634,8 @@
 			if (!data) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioMixer] not enough input data (%d still to fill)\n", buffer_size));
 			}
-			memset(ptr, 0, buffer_size);
 		}
-		gf_mixer_lock(am, 0);
+		gf_mixer_lock(am, GF_FALSE);
 		return (in_size - buffer_size);
 	}
 
@@ -668,14 +674,14 @@
 		in->in_bytes_used = 0;
 
 		/*if cfg unknown or changed (AudioBuffer child...) invalidate cfg settings*/
-		if (!in->src->GetConfig(in->src, 0)) {
+		if (!in->src->GetConfig(in->src, GF_FALSE)) {
 			if (am->ar) {
 				if (!am->must_reconfig) {
-					am->must_reconfig = 1;
+					am->must_reconfig = GF_TRUE;
 					/*if main mixer reconfig asap*/
 					gf_mixer_reconfig(am);
 				}
-				in->muted = 1;
+				in->muted = GF_TRUE;
 				continue;
 			}
 			//otherwise fallthrou, mixer keeps the same config
@@ -702,8 +708,7 @@
 		}
 	}
 	if (!nb_act_src) {
-		memset(buffer, 0, sizeof(char)*buffer_size);
-		gf_mixer_lock(am, 0);
+		gf_mixer_lock(am, GF_FALSE);
 		return 0;
 	}
 
@@ -723,9 +728,9 @@
 				in->out_samples_to_write = 0;
 				continue;
 			}
-			if (in->out_samples_to_write>in->out_samples_written) {
-				gf_mixer_fetch_input(am, in, delay + 8000 * i / am->bits_per_sample / am->sample_rate / am->nb_channels);
-				if (in->out_samples_to_write>in->out_samples_written) nb_to_fill++;
+			if (in->out_samples_to_write > in->out_samples_written) {
+				gf_mixer_fetch_input(am, in, delay /*+ 8000 * i / am->bits_per_sample / am->sample_rate / am->nb_channels*/ );
+				if (in->out_samples_to_write > in->out_samples_written) nb_to_fill++;
 			}
 		}
 		/*release - this is done in 2 steps in case 2 audio object use the same source...*/
@@ -736,6 +741,8 @@
 			in->in_bytes_used = 0;
 		}
 		if (!nb_to_fill) break;
+		//only resync on the first fill
+		delay=0;
 	}
 	/*step 3, mix the final buffer*/
 	memset(am->output, 0, sizeof(s32) * buffer_size);
@@ -757,8 +764,7 @@
 	}
 
 	if (!nb_written) {
-		memset(buffer, 0, sizeof(char)*buffer_size);
-		gf_mixer_lock(am, 0);
+		gf_mixer_lock(am, GF_FALSE);
 		return 0;
 	}
 
@@ -791,10 +797,8 @@
 	}
 
 	nb_written *= am->nb_channels*am->bits_per_sample/8;
-	if (buffer_size > nb_written)
-		memset((char *)buffer + nb_written, 0, sizeof(char)*(buffer_size-nb_written));
 
-	gf_mixer_lock(am, 0);
+	gf_mixer_lock(am, GF_FALSE);
 	return nb_written;
 }

v0.5.2.tar.gz/src/compositor/audio_render.c -> v0.6.1.tar.gz/src/compositor/audio_render.c Changed

@@ -89,7 +89,7 @@
 	afc->max_block_size = 0;
 	afc->delay_ms = 0;
 
-	not_in_place = 0;
+	not_in_place = GF_FALSE;
 
 	entry = afc->filters;
 	while (entry) {
@@ -107,25 +107,25 @@
 			out_block_size = och * bps * block_len / 8;
 			if (afc->max_block_size < out_block_size) afc->max_block_size = out_block_size;
 
-			entry->enable = 1;
+			entry->enable = GF_TRUE;
 			chan = och;
 			ch_cfg = ocfg;
 
-			if (!entry->in_place) not_in_place = 1;
+			if (!entry->in_place) not_in_place = GF_TRUE;
 
 			afc->delay_ms += entry->delay_ms;
 		} else {
-			entry->enable = 0;
+			entry->enable = GF_FALSE;
 		}
 		entry = entry->next;
 	}
 
 	if (!afc->max_block_size) afc->max_block_size = 1000;
 	if (!afc->min_block_size) afc->min_block_size = afc->max_block_size * in_ch / chan;
-	afc->tmp_block1 = gf_malloc(sizeof(char) * afc->max_block_size * 2);
+	afc->tmp_block1 = (char*)gf_malloc(sizeof(char) * afc->max_block_size * 2);
 	if (!afc->tmp_block1) return GF_OUT_OF_MEM;
 	if (not_in_place) {
-		afc->tmp_block2 = gf_malloc(sizeof(char) * afc->max_block_size * 2);
+		afc->tmp_block2 = (char*)gf_malloc(sizeof(char) * afc->max_block_size * 2);
 		if (!afc->tmp_block2) return GF_OUT_OF_MEM;
 	}
 
@@ -133,14 +133,14 @@
 	entry = afc->filters;
 	while (entry) {
 		if (entry->enable && entry->in_block_size) {
-			entry->in_block = gf_malloc(sizeof(char) * (entry->in_block_size + afc->max_block_size) );
+			entry->in_block = (char*)gf_malloc(sizeof(char) * (entry->in_block_size + afc->max_block_size) );
 			if (!entry->in_block) return GF_OUT_OF_MEM;
 		}
 		entry = entry->next;
 	}
 	*ch_out = chan;
 	*ch_cfg_out = ch_cfg;
-	afc->enable_filters = 1;
+	afc->enable_filters = GF_TRUE;
 	return GF_OK;
 }
 
@@ -178,7 +178,7 @@
 				entry->nb_bytes -= entry->in_block_size;
 				processed += entry->in_block_size;
 			}
-			/*move remaining data at the begining of the buffer*/
+			/*move remaining data at the beginning of the buffer*/
 			if (processed && entry->nb_bytes)
 				memmove(entry->in_block, entry->in_block+processed, entry->nb_bytes);
 
@@ -254,7 +254,7 @@
 			nb_bits = in_bps;
 			freq = in_freq;
 			nb_chan = in_ch;
-			ar->filter_chain.enable_filters = 0;
+			ar->filter_chain.enable_filters = GF_FALSE;
 			e = ar->audio_out->ConfigureOutput(ar->audio_out, &freq, &nb_chan, &nb_bits, ch_cfg);
 		}
 	} else {
@@ -277,16 +277,41 @@
 	ar->audio_out->SetVolume(ar->audio_out, ar->volume);
 	ar->audio_out->SetPan(ar->audio_out, ar->pan);
 
+	ar->time_at_last_config = ar->current_time;
+	ar->bytes_requested = 0;
+	ar->bytes_per_second = freq * nb_chan * nb_bits / 8;
+
 	if (ar->audio_listeners) {
 		u32 k=0;
 		GF_AudioListener *l;
-		while ((l = gf_list_enum(ar->audio_listeners, &k))) {
+		while ((l = (GF_AudioListener*)gf_list_enum(ar->audio_listeners, &k))) {
 			l->on_audio_reconfig(l->udta, in_freq, in_bps, in_ch, in_cfg);
 		}
 	}
 	return GF_OK;
 }
 
+static void gf_ar_pause(GF_AudioRenderer *ar, Bool DoFreeze, Bool for_reconfig, Bool reset_hw_buffer)
+{
+	gf_mixer_lock(ar->mixer, GF_TRUE);
+	if (DoFreeze) {
+		if (!ar->Frozen) {
+			ar->freeze_time = gf_sys_clock_high_res();
+			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, 0);
+			ar->Frozen = GF_TRUE;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[Audio] pausing master clock - time "LLD" (sys time "LLD")\n", ar->freeze_time, gf_sys_clock_high_res()));
+		}
+	} else {
+		if (ar->Frozen) {
+			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, reset_hw_buffer ? 2 : 1);
+			ar->Frozen = GF_FALSE;
+			ar->start_time += gf_sys_clock_high_res() - ar->freeze_time;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[Audio] resuming master clock - new time "LLD" (sys time "LLD") \n", ar->start_time, gf_sys_clock_high_res()));
+		}
+	}
+	gf_mixer_lock(ar->mixer, GF_FALSE);
+}
+
 
 static u32 gf_ar_fill_output(void *ptr, char *buffer, u32 buffer_size)
 {
@@ -295,11 +320,15 @@
 	if (!ar->need_reconfig) {
 		u32 delay_ms = ar->disable_resync ?	0 : ar->audio_delay;
 
-		gf_mixer_lock(ar->mixer, 1);
+		if (ar->Frozen) {
+			memset(buffer, 0, buffer_size);
+			return buffer_size;
+		}
+
+		gf_mixer_lock(ar->mixer, GF_TRUE);
 
 		if (ar->filter_chain.enable_filters) {
 			char *ptr = buffer;
-			u32 res = buffer_size;
 			written = 0;
 			delay_ms += ar->filter_chain.delay_ms;
 
@@ -328,31 +357,58 @@
 				ar->nb_used += to_copy;
 				if (ar->nb_used==ar->nb_filled) ar->nb_used = 0;
 			}
-			assert(res==written);
 		} else {
 			written = gf_mixer_get_output(ar->mixer, buffer, buffer_size, delay_ms);
 		}
-		ar->step_mode = 0;
-		gf_mixer_lock(ar->mixer, 0);
-
-		if (ar->audio_listeners && written) {
-			u32 k=0;
-			GF_AudioListener *l;
-			while ((l = gf_list_enum(ar->audio_listeners, &k))) {
-				l->on_audio_frame(l->udta, buffer, written, gf_sc_ar_get_clock(ar), delay_ms);
+		gf_mixer_lock(ar->mixer, GF_FALSE);
+
+		//done with one sim step, go back in pause
+		if (ar->step_mode) {
+			ar->step_mode = GF_FALSE;
+			gf_ar_pause(ar, GF_TRUE, GF_FALSE, GF_FALSE);
+		}
+
+		if (!ar->need_reconfig) {
+			if (ar->audio_listeners) {
+				u32 k=0;
+				GF_AudioListener *l;
+				while ((l = (GF_AudioListener*)gf_list_enum(ar->audio_listeners, &k))) {
+					l->on_audio_frame(l->udta, buffer, buffer_size, gf_sc_ar_get_clock(ar), delay_ms);
+				}
 			}
+
+			ar->bytes_requested += buffer_size;
+			ar->current_time = ar->time_at_last_config + (u32) (ar->bytes_requested * 1000 / ar->bytes_per_second);
 		}
-		return written;
+		//always return buffer size (eg requested input size to be filled), since the clock is always increased by buffer_size (cf above line)
+		return buffer_size;
 	}
 	return 0;
 }
 
-GF_EXPORT
 void gf_sc_flush_next_audio(GF_Compositor *compositor)
 {
-	gf_mixer_lock(compositor->audio_renderer->mixer, 1);
-	compositor->audio_renderer->step_mode = 1;
-	gf_mixer_lock(compositor->audio_renderer->mixer, 0);
+	if (!compositor->audio_renderer->audio_out)
+		return;
+
+	gf_mixer_lock(compositor->audio_renderer->mixer, GF_TRUE);
+	compositor->audio_renderer->step_mode = GF_TRUE;
+	//resume for one frame
+	if (compositor->audio_renderer->Frozen) {
+		gf_ar_pause(compositor->audio_renderer, GF_FALSE, GF_FALSE, GF_FALSE);
+	}
+	gf_mixer_lock(compositor->audio_renderer->mixer, GF_FALSE);
+}
+
+Bool gf_sc_check_audio_pending(GF_Compositor *compositor)
+{
+	Bool res = GF_FALSE;
+	gf_mixer_lock(compositor->audio_renderer->mixer, GF_TRUE);
+	if (compositor->audio_renderer->step_mode)
+		res = GF_FALSE;
+	gf_mixer_lock(compositor->audio_renderer->mixer, GF_FALSE);
+
+	return res;
 }
 
 u32 gf_ar_proc(void *p)
@@ -363,21 +419,20 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[AudioRender] Entering audio thread ID %d\n", gf_th_id() ));
 
-	gf_mixer_lock(ar->mixer, 1);
-	ar->need_reconfig = 1;
+	gf_mixer_lock(ar->mixer, GF_TRUE);
+	ar->need_reconfig = GF_TRUE;
 	gf_sc_ar_reconfig(ar);
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 
 	while (ar->audio_th_state == 1) {
-		gf_mixer_lock(ar->mixer, 1);
 		//do mix even if mixer is empty, otherwise we will push the same buffer over and over to the sound card
-		if (ar->Frozen ) {
-			gf_mixer_lock(ar->mixer, 0);
-			gf_sleep(33);
-		} else {
+		/*
+				if (ar->Frozen ) {
+					gf_sleep(0);
+				} else
+		*/		{
 			if (ar->need_reconfig) gf_sc_ar_reconfig(ar);
 			ar->audio_out->WriteAudio(ar->audio_out);
-			gf_mixer_lock(ar->mixer, 0);
 		}
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioRender] Exiting audio thread\n"));
@@ -407,9 +462,9 @@
 	}
 
 	sOpt = gf_cfg_get_key(user->config, "Audio", "NoResync");
-	ar->disable_resync = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	ar->disable_resync = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 	sOpt = gf_cfg_get_key(user->config, "Audio", "DisableMultiChannel");
-	ar->disable_multichannel = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	ar->disable_multichannel = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 
 	ar->mixer = gf_mixer_new(ar);
 	ar->user = user;
@@ -485,11 +540,16 @@
 				}
 			}
 		}
-		if (!ar->audio_out) gf_cfg_set_key(user->config, "Audio", "DriverName", "No Audio Output Available");
+		if (!ar->audio_out) {
+			gf_cfg_set_key(user->config, "Audio", "DriverName", "No Audio Output Available");
+		} else {
+			if (user->init_flags & GF_TERM_USE_AUDIO_HW_CLOCK)
+				ar->clock_use_audio_out = GF_TRUE;
+		}
 	}
-
 	/*init compositor timer*/
-	ar->startTime = gf_sys_clock();
+	ar->start_time = gf_sys_clock_high_res();
+	ar->current_time = 0;
 	return ar;
 }
 
@@ -499,7 +559,7 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioRender] Destroying compositor\n"));
 	/*resume if paused (might cause deadlock otherwise)*/
-	if (ar->Frozen) gf_sc_ar_control(ar, 1);
+	if (ar->Frozen) gf_sc_ar_control(ar, GF_SC_AR_RESUME);
 	/*stop and shutdown*/
 	if (ar->audio_out) {
 		/*kill audio thread*/
@@ -514,12 +574,12 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioRender] audio thread destroyed\n"));
 		}
 		/*lock access before shutdown and emulate a reconfig (avoids mixer lock from self-threaded modules)*/
-		ar->need_reconfig = 1;
-		gf_mixer_lock(ar->mixer, 1);
+		ar->need_reconfig = GF_TRUE;
+		gf_mixer_lock(ar->mixer, GF_TRUE);
 		if (ar->audio_out->SelfThreaded) ar->audio_out->Shutdown(ar->audio_out);
 		gf_modules_close_interface((GF_BaseInterface *)ar->audio_out);
 		ar->audio_out = NULL;
-		gf_mixer_lock(ar->mixer, 0);
+		gf_mixer_lock(ar->mixer, GF_FALSE);
 	}
 	gf_mixer_del(ar->mixer);
 
@@ -535,56 +595,37 @@
 	gf_mixer_remove_all(ar->mixer);
 }
 
-static void gf_ar_freeze_intern(GF_AudioRenderer *ar, Bool DoFreeze, Bool for_reconfig, Bool reset_hw_buffer)
-{
-	gf_mixer_lock(ar->mixer, 1);
-	if (DoFreeze) {
-		if (!ar->Frozen) {
-			ar->FreezeTime = gf_sys_clock();
-			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, 0);
-			ar->Frozen = 1;
-		}
-	} else {
-		if (ar->Frozen) {
-			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, reset_hw_buffer ? 2 : 1);
-			ar->Frozen = 0;
-			ar->startTime += gf_sys_clock() - ar->FreezeTime;
-		}
-	}
-	gf_mixer_lock(ar->mixer, 0);
-}
-
 void gf_sc_ar_control(GF_AudioRenderer *ar, u32 PauseType)
 {
-	gf_ar_freeze_intern(ar, !PauseType, 0, (PauseType==2) ? 1 : 0);
+	gf_ar_pause(ar, (PauseType==GF_SC_AR_PAUSE) ? GF_TRUE : GF_FALSE, GF_FALSE, (PauseType==GF_SC_AR_RESET_HW_AND_PLAY) ? GF_TRUE : GF_FALSE);
 }
 
 void gf_sc_ar_set_volume(GF_AudioRenderer *ar, u32 Volume)
 {
 	char sOpt[10];
-	gf_mixer_lock(ar->mixer, 1);
+	gf_mixer_lock(ar->mixer, GF_TRUE);
 	ar->volume = MIN(Volume, 100);
 	if (ar->audio_out) ar->audio_out->SetVolume(ar->audio_out, ar->volume);
 	sprintf(sOpt, "%d", ar->volume);
 	gf_cfg_set_key(ar->user->config, "Audio", "Volume", sOpt);
 
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 }
 
 void gf_sc_ar_mute(GF_AudioRenderer *ar, Bool mute)
 {
-	gf_mixer_lock(ar->mixer, 1);
+	gf_mixer_lock(ar->mixer, GF_TRUE);
 	ar->mute = mute;
 	if (ar->audio_out) ar->audio_out->SetVolume(ar->audio_out, mute ? 0 : ar->volume);
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 }
 
 void gf_sc_ar_set_pan(GF_AudioRenderer *ar, u32 Balance)
 {
-	gf_mixer_lock(ar->mixer, 1);
+	gf_mixer_lock(ar->mixer, GF_TRUE);
 	ar->pan = MIN(Balance, 100);
 	if (ar->audio_out) ar->audio_out->SetPan(ar->audio_out, ar->pan);
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 }
 
 
@@ -593,7 +634,7 @@
 	Bool recfg;
 	if (!ar) return;
 	/*lock mixer*/
-	gf_mixer_lock(ar->mixer, 1);
+	gf_mixer_lock(ar->mixer, GF_TRUE);
 	gf_mixer_add_input(ar->mixer, source);
 	/*if changed reconfig*/
 	recfg = gf_mixer_reconfig(ar->mixer);
@@ -602,7 +643,7 @@
 	if (!gf_mixer_empty(ar->mixer) && ar->audio_out && ar->audio_out->Play)
 		ar->audio_out->Play(ar->audio_out, 1);
 	/*unlock mixer*/
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 }
 
 void gf_sc_ar_remove_src(GF_AudioRenderer *ar, GF_AudioInterface *source)
@@ -628,15 +669,15 @@
 {
 	if (!ar->need_reconfig || !ar->audio_out) return;
 	/*lock mixer*/
-	gf_mixer_lock(ar->mixer, 1);
+	gf_mixer_lock(ar->mixer, GF_TRUE);
 
-	gf_ar_freeze_intern(ar, 1, 1, 0);
-	ar->need_reconfig = 0;
+	gf_ar_pause(ar, GF_TRUE, GF_TRUE, GF_FALSE);
+	ar->need_reconfig = GF_FALSE;
 	gf_ar_setup_output_format(ar);
-	gf_ar_freeze_intern(ar, 0, 1, 0);
+	gf_ar_pause(ar, GF_FALSE, GF_TRUE, GF_FALSE);
 
 	/*unlock mixer*/
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 }
 
 u32 gf_sc_ar_get_delay(GF_AudioRenderer *ar)
@@ -647,8 +688,13 @@
 
 u32 gf_sc_ar_get_clock(GF_AudioRenderer *ar)
 {
-	if (ar->Frozen) return ar->FreezeTime - ar->startTime;
-	return gf_sys_clock() - ar->startTime;
+	if (ar->clock_use_audio_out) return ar->current_time;
+
+	if (ar->Frozen) {
+		return (u32) ((ar->freeze_time - ar->start_time) / 1000);
+	}
+
+	return (u32) ((gf_sys_clock_high_res() - ar->start_time) / 1000);
 }
 
 GF_EXPORT
@@ -657,17 +703,17 @@
 	GF_AudioRenderer *ar = compositor->audio_renderer;
 	if (!ar) return;
 
-	gf_mixer_lock(ar->mixer, 1);
+	gf_mixer_lock(ar->mixer, GF_TRUE);
 
 	gf_afc_unload(&ar->filter_chain);
 	gf_afc_load(&ar->filter_chain, ar->user, (char*)gf_cfg_get_key(ar->user->config, "Audio", "Filter"));
 
-	gf_ar_freeze_intern(ar, 1, 1, 0);
-	ar->need_reconfig = 0;
+	gf_ar_pause(ar, GF_TRUE, GF_TRUE, GF_FALSE);
+	ar->need_reconfig = GF_FALSE;
 	gf_ar_setup_output_format(ar);
-	gf_ar_freeze_intern(ar, 0, 1, 0);
+	gf_ar_pause(ar, GF_FALSE, GF_TRUE, GF_FALSE);
 
-	gf_mixer_lock(ar->mixer, 0);
+	gf_mixer_lock(ar->mixer, GF_FALSE);
 }
 
 GF_EXPORT
@@ -679,7 +725,7 @@
 	if (!compositor->audio_renderer) return GF_NOT_SUPPORTED;
 
 	mixer = compositor->audio_renderer->mixer;
-	gf_mixer_lock(mixer, 1);
+	gf_mixer_lock(mixer, GF_TRUE);
 
 	if (!compositor->audio_renderer->audio_listeners) compositor->audio_renderer->audio_listeners = gf_list_new();
 	gf_list_add(compositor->audio_renderer->audio_listeners, al);
@@ -688,7 +734,7 @@
 
 	al->on_audio_reconfig(al->udta, sr, bps, ch, ch_cfg);
 
-	gf_mixer_lock(mixer, 0);
+	gf_mixer_lock(mixer, GF_FALSE);
 	return GF_OK;
 }
 
@@ -698,12 +744,12 @@
 	if (!compositor || !al) return GF_BAD_PARAM;
 	if (!compositor->audio_renderer) return GF_NOT_SUPPORTED;
 
-	gf_mixer_lock(compositor->audio_renderer->mixer, 1);
+	gf_mixer_lock(compositor->audio_renderer->mixer, GF_TRUE);
 	gf_list_del_item(compositor->audio_renderer->audio_listeners, al);
 	if (!gf_list_count(compositor->audio_renderer->audio_listeners)) {
 		gf_list_del(compositor->audio_renderer->audio_listeners);
 		compositor->audio_renderer->audio_listeners = NULL;
 	}
-	gf_mixer_lock(compositor->audio_renderer->mixer, 0);
+	gf_mixer_lock(compositor->audio_renderer->mixer, GF_FALSE);
 	return GF_OK;
 }

v0.5.2.tar.gz/src/compositor/bindable.c -> v0.6.1.tar.gz/src/compositor/bindable.c Changed

@@ -62,7 +62,7 @@
 
 Bool Bindable_GetIsBound(GF_Node *bindable)
 {
-	if (!bindable) return 0;
+	if (!bindable) return GF_FALSE;
 	switch (gf_node_get_tag(bindable)) {
 	case TAG_MPEG4_Background2D:
 		return ((M_Background2D*)bindable)->isBound;
@@ -89,13 +89,13 @@
 #endif
 		return ((M_Fog*)bindable)->isBound;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
 void Bindable_SetIsBound(GF_Node *bindable, Bool val)
 {
-	Bool has_bind_time = 0;
+	Bool has_bind_time = GF_FALSE;
 	if (!bindable) return;
 	switch (gf_node_get_tag(bindable)) {
 	case TAG_MPEG4_Background2D:
@@ -106,14 +106,14 @@
 		if ( ((M_Viewport*)bindable)->isBound == val) return;
 		((M_Viewport*)bindable)->isBound = val;
 		((M_Viewport*)bindable)->bindTime = gf_node_get_scene_time(bindable);
-		has_bind_time = 1;
+		has_bind_time = GF_TRUE;
 		break;
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Background:
 		if ( ((X_Background*)bindable)->isBound == val) return;
 		((X_Background*)bindable)->isBound = val;
 		((X_Background*)bindable)->bindTime = gf_node_get_scene_time(bindable);
-		has_bind_time = 1;
+		has_bind_time = GF_TRUE;
 		break;
 #endif
 	case TAG_MPEG4_Background:
@@ -125,7 +125,7 @@
 		if ( ((X_NavigationInfo*)bindable)->isBound == val) return;
 		((X_NavigationInfo*)bindable)->isBound = val;
 		((X_NavigationInfo*)bindable)->bindTime = gf_node_get_scene_time(bindable);
-		has_bind_time = 1;
+		has_bind_time = GF_TRUE;
 		break;
 #endif
 	case TAG_MPEG4_NavigationInfo:
@@ -139,14 +139,14 @@
 		if ( ((M_Viewpoint*)bindable)->isBound == val) return;
 		((M_Viewpoint*)bindable)->isBound = val;
 		((M_Viewpoint*)bindable)->bindTime = gf_node_get_scene_time(bindable);
-		has_bind_time = 1;
+		has_bind_time = GF_TRUE;
 		break;
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Fog:
 		if ( ((X_Fog*)bindable)->isBound == val) return;
 		((X_Fog*)bindable)->isBound = val;
 		((X_Fog*)bindable)->bindTime = gf_node_get_scene_time(bindable);
-		has_bind_time = 1;
+		has_bind_time = GF_TRUE;
 		break;
 #endif
 	case TAG_MPEG4_Fog:
@@ -159,13 +159,13 @@
 	gf_node_event_out_str(bindable, "isBound");
 	if (has_bind_time) gf_node_event_out_str(bindable, "bindTime");
 	/*force invalidate of the bindable stack's owner*/
-	gf_node_dirty_set(bindable, 0, 1);
+	gf_node_dirty_set(bindable, 0, GF_TRUE);
 }
 
 
 Bool Bindable_GetSetBind(GF_Node *bindable)
 {
-	if (!bindable) return 0;
+	if (!bindable) return GF_FALSE;
 	switch (gf_node_get_tag(bindable)) {
 	case TAG_MPEG4_Background2D:
 		return ((M_Background2D*)bindable)->set_bind;
@@ -192,7 +192,7 @@
 #endif
 		return ((M_Fog*)bindable)->set_bind;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -262,22 +262,22 @@
 	while ((stack = (GF_List*)gf_list_enum(stack_list, &i))) {
 		if (for_stack && (for_stack!=stack)) continue;
 
-		on_top = (gf_list_get(stack, 0)==bindable) ? 1 : 0;
+		on_top = (gf_list_get(stack, 0)==bindable) ? GF_TRUE : GF_FALSE;
 
 		if (!set_bind) {
-			if (is_bound) Bindable_SetIsBound(bindable, 0);
+			if (is_bound) Bindable_SetIsBound(bindable, GF_FALSE);
 			if (on_top && (gf_list_count(stack)>1)) {
 				gf_list_rem(stack, 0);
 				gf_list_add(stack, bindable);
 				node = (GF_Node*)gf_list_get(stack, 0);
-				Bindable_SetIsBound(node, 1);
+				Bindable_SetIsBound(node, GF_TRUE);
 			}
 		} else {
-			if (!is_bound) Bindable_SetIsBound(bindable, 1);
+			if (!is_bound) Bindable_SetIsBound(bindable, GF_TRUE);
 			if (!on_top) {
 				/*push old top one down and unbind*/
 				node = (GF_Node*)gf_list_get(stack, 0);
-				Bindable_SetIsBound(node, 0);
+				Bindable_SetIsBound(node, GF_FALSE);
 				/*insert new top*/
 				gf_list_del_item(stack, bindable);
 				gf_list_insert(stack, bindable, 0);
@@ -285,7 +285,7 @@
 		}
 	}
 	/*force invalidate of the bindable stack's owner*/
-	gf_node_dirty_set(bindable, 0, 1);
+	gf_node_dirty_set(bindable, 0, GF_TRUE);
 	/*and redraw scene*/
 	gf_sc_invalidate(gf_sc_get_compositor(bindable), NULL);
 }
@@ -305,11 +305,10 @@
 	gf_list_del(stack);
 }
 
-
 void PreDestroyBindable(GF_Node *bindable, GF_List *stack_list)
 {
 	Bool is_bound = Bindable_GetIsBound(bindable);
-	Bindable_SetIsBound(bindable, 0);
+	Bindable_SetIsBound(bindable, GF_FALSE);
 
 	while (gf_list_count(stack_list)) {
 		GF_Node *stack_top;
@@ -318,7 +317,7 @@
 		gf_list_del_item(stack, bindable);
 		if (is_bound) {
 			stack_top = (GF_Node*)gf_list_get(stack, 0);
-			if (stack_top) Bindable_SetSetBind(stack_top, 1);
+			if (stack_top) Bindable_SetSetBind(stack_top, GF_TRUE);
 		}
 	}
 }

v0.5.2.tar.gz/src/compositor/camera.c -> v0.6.1.tar.gz/src/compositor/camera.c Changed

@@ -47,7 +47,7 @@
 {
 	/*forces recompute of default viewpoint*/
 	cam->had_viewpoint = 2;
-	cam->had_nav_info = 1;
+	cam->had_nav_info = GF_TRUE;
 	cam->flags = CAM_IS_DIRTY;
 	cam->navigate_mode = GF_NAVIGATE_NONE;
 }
@@ -192,7 +192,7 @@
 
 void camera_set_2d(GF_Camera *cam)
 {
-	cam->is_3D = 0;
+	cam->is_3D = GF_FALSE;
 #ifdef FORCE_CAMERA_3D
 	cam->position.x = cam->position.y = 0;
 	cam->position.z = INT2FIX(NEAR_PLANE_2D);
@@ -490,7 +490,7 @@
 	if (cam->jumping) return;
 	cam->anim_start = 0;
 	cam->anim_len = 1000;
-	cam->jumping = 1;
+	cam->jumping = GF_TRUE;
 	cam->flags |= CAM_IS_DIRTY;
 }
 
@@ -499,13 +499,13 @@
 {
 	u32 now;
 	Fixed frac;
-	if (!cam->anim_len) return 0;
+	if (!cam->anim_len) return GF_FALSE;
 
 	if (cam->jumping) {
 		if (!cam->anim_start) {
 			cam->anim_start = gf_sys_clock();
 			cam->dheight = 0;
-			return 1;
+			return GF_TRUE;
 		}
 		cam->position.y -= cam->dheight;
 		cam->target.y -= cam->dheight;
@@ -513,9 +513,9 @@
 		now = gf_sys_clock() - cam->anim_start;
 		if (now > cam->anim_len) {
 			cam->anim_len = 0;
-			cam->jumping = 0;
+			cam->jumping = GF_FALSE;
 			cam->flags |= CAM_IS_DIRTY;
-			return 1;
+			return GF_TRUE;
 		}
 		frac = FLT2FIX ( ((Float) now) / cam->anim_len);
 		if (frac>FIX_ONE / 2) frac = FIX_ONE - frac;
@@ -523,7 +523,7 @@
 		cam->position.y += cam->dheight;
 		cam->target.y += cam->dheight;
 		cam->flags |= CAM_IS_DIRTY;
-		return 1;
+		return GF_TRUE;
 	}
 
 	if (!cam->anim_start) {
@@ -553,7 +553,7 @@
 				cam->vp_fov = cam->fieldOfView;
 				cam->vp_orientation = camera_get_orientation(cam->position, cam->target, cam->up);
 			}
-			return 1;
+			return GF_TRUE;
 		} else {
 			frac = FLT2FIX( ((Float) now) / cam->anim_len);
 		}
@@ -574,7 +574,7 @@
 		cam->end_zoom = frac + gf_mulfix((FIX_ONE-frac), cam->start_zoom);
 		camera_set_vectors(cam, pos, rot, fov);
 	}
-	return 1;
+	return GF_TRUE;
 }

v0.5.2.tar.gz/src/compositor/compositor.c -> v0.6.1.tar.gz/src/compositor/compositor.c Changed

@@ -38,16 +38,22 @@
 #define SC_DEF_WIDTH	320
 #define SC_DEF_HEIGHT	240
 
-
-void gf_sc_simulation_tick(GF_Compositor *compositor);
-
-
 void gf_sc_next_frame_state(GF_Compositor *compositor, u32 state)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Forcing frame redraw state: %d\n", state));
-	compositor->frame_draw_type = state;
-	if (state==GF_SC_DRAW_FLUSH)
+//	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Forcing frame redraw state: %d\n", state));
+	if (state==GF_SC_DRAW_FLUSH) {
 		compositor->skip_flush = 2;
+		//if in openGL mode ignore refresh events (content of the window is still OK). This is only used for overlays in 2d
+		if (!compositor->frame_draw_type
+#ifndef GPAC_DISABLE_3D
+		 && !compositor->visual->type_3d && !compositor->hybrid_opengl
+#endif
+		 ) {
+			compositor->frame_draw_type = state;
+		}
+	} else {
+		compositor->frame_draw_type = state;
+	}
 }
 
 
@@ -60,8 +66,12 @@
 	/*move to FS*/
 	compositor->fullscreen = !compositor->fullscreen;
 
-	gf_sc_ar_control(compositor->audio_renderer, 0);
+	//gf_sc_ar_control(compositor->audio_renderer, GF_SC_AR_PAUSE);
 
+	//in windows (and other?) we may get blocked by SetWindowPos in the fullscreen method until another window thread dispatches a resize event,
+	//which would try to grab the compositor mutex and thus deadlock us
+	//to avoid this, unlock the compositor just for the SetFullscreen
+	gf_mx_v(compositor->mx);
 	if (compositor->fullscreen && (compositor->scene_width>=compositor->scene_height)
 #ifndef GPAC_DISABLE_3D
 	 && !compositor->visual->type_3d
@@ -71,8 +81,9 @@
 	} else {
 		e = compositor->video_out->SetFullScreen(compositor->video_out, compositor->fullscreen, &compositor->display_width, &compositor->display_height);
 	}
+	gf_mx_p(compositor->mx);
 
-	gf_sc_ar_control(compositor->audio_renderer, 1);
+	//gf_sc_ar_control(compositor->audio_renderer, GF_SC_AR_RESUME);
 
 	if (e) {
 		GF_Event evt;
@@ -131,18 +142,23 @@
 		if (compositor->msg_type & GF_SR_CFG_SET_SIZE) {
 			u32 fs_width, fs_height;
 			Bool restore_fs = compositor->fullscreen;
-			compositor->msg_type &= ~GF_SR_CFG_SET_SIZE;
 
 			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Changing display size to %d x %d\n", compositor->new_width, compositor->new_height));
 			fs_width = fs_height = 0;
 			if (restore_fs) {
+				if ((compositor->new_width>compositor->display_width) || (compositor->new_height>compositor->display_height)) {
+					u32 w = compositor->display_width;
+					compositor->display_width = compositor->display_height;
+					compositor->display_height = w;
+					compositor->recompute_ar = 1;
+				}
 				fs_width = compositor->display_width;
 				fs_height = compositor->display_height;
 			}
 			evt.type = GF_EVENT_SIZE;
 			evt.size.width = compositor->new_width;
 			evt.size.height = compositor->new_height;
-			compositor->new_width = compositor->new_height = 0;
+
 			/*send resize event*/
 			if (!(compositor->msg_type & GF_SR_CFG_WINDOWSIZE_NOTIF)) {
 				compositor->video_out->ProcessEvent(compositor->video_out, &evt);
@@ -162,7 +178,9 @@
 				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 			}
 			notif_size=1;
-
+			compositor->new_width = compositor->new_height = 0;
+			compositor->msg_type &= ~GF_SR_CFG_SET_SIZE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Display size changed to %d x %d\n", compositor->new_width, compositor->new_height));
 		}
 		/*aspect ratio modif*/
 		if (compositor->msg_type & GF_SR_CFG_AR) {
@@ -212,19 +230,20 @@
 }
 
 GF_EXPORT
-Bool gf_sc_draw_frame(GF_Compositor *compositor, Bool no_flush, u32 *ms_till_next)
+Bool gf_sc_draw_frame(GF_Compositor *compositor, Bool no_flush, s32 *ms_till_next)
 {
 	if (no_flush)
 		compositor->skip_flush=1;
-	gf_sc_simulation_tick(compositor);
+	gf_sc_render_frame(compositor);
 
 	if (ms_till_next) {
-		if ((s32) compositor->next_frame_delay == -1)
+		if ( compositor->ms_until_next_frame == GF_INT_MAX)
 			*ms_till_next = compositor->frame_duration;
 		else
-			*ms_till_next = MIN(compositor->next_frame_delay, compositor->frame_duration);
+			*ms_till_next = compositor->ms_until_next_frame;
 	}
-	if (compositor->frame_delay<0) return 1;
+	//next frame is late, we should redraw
+	if (compositor->ms_until_next_frame < 0) return 1;
 	if (compositor->frame_draw_type) return 1;
 	if (compositor->fonts_pending) return 1;
 	return GF_FALSE;
@@ -283,6 +302,9 @@
 	compositor->visual = visual_new(compositor);
 	compositor->visual->GetSurfaceAccess = compositor_2d_get_video_access;
 	compositor->visual->ReleaseSurfaceAccess = compositor_2d_release_video_access;
+	compositor->visual->CheckAttached = compositor_2d_check_attached;
+	compositor->visual->ClearSurface = compositor_2d_clear_surface;
+
 	if (compositor->video_out->FlushRectangles)
 		compositor->visual->direct_flush = GF_TRUE;
 
@@ -333,7 +355,7 @@
 			compositor->video_out->evt_cbk_hdl = compositor;
 			compositor->video_out->on_event = gf_sc_on_event;
 			/*init hw*/
-			if (compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags) != GF_OK) {
+			if (!compositor->video_out->Setup || compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags) != GF_OK) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Failed to Setup Video Driver %s!\n", sOpt));
 				gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
 				compositor->video_out = NULL;
@@ -358,7 +380,7 @@
 			}
 
 			/*init hw*/
-			if (compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags)==GF_OK) {
+			if (compositor->video_out->Setup && compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags)==GF_OK) {
 				gf_cfg_set_key(compositor->user->config, "Video", "DriverName", compositor->video_out->module_name);
 				break;
 			}
@@ -374,7 +396,7 @@
 		}
 	}
 	if (!compositor->video_out ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to create compositor->video_out, did not find any suitable driver."));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to create compositor->video_out, did not find any suitable driver.\n"));
 		return GF_IO_ERR;
 	}
 
@@ -408,7 +430,7 @@
 		if (compositor->rasterizer) gf_cfg_set_key(compositor->user->config, "Compositor", "Raster2D", compositor->rasterizer->module_name);
 	}
 	if (!compositor->rasterizer) {
-		compositor->video_out->Shutdown(compositor->video_out);
+		if (compositor->video_out->Shutdown) compositor->video_out->Shutdown(compositor->video_out);
 		gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
 		compositor->video_out = NULL;
 		return GF_IO_ERR;
@@ -479,13 +501,8 @@
 
 	compositor->video_th_state = GF_COMPOSITOR_THREAD_RUN;
 	while (compositor->video_th_state == GF_COMPOSITOR_THREAD_RUN) {
-		if (compositor->is_hidden==1) {
-			if (!compositor->bench_mode) {
-				compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
-			}
-			gf_sleep(compositor->frame_duration);
-		} else
-			gf_sc_simulation_tick(compositor);
+		//simulation tick is self-regulating. Call it regardless of the visibility status
+		gf_sc_render_frame(compositor);
 	}
 
 #ifndef GPAC_DISABLE_3D
@@ -556,12 +573,12 @@
 		tmp->no_regulation = GF_TRUE;
 
 #if 1
- /*set default size if owning output*/
+	/*set default size if owning output*/
 	if (!tmp->user->os_window_handler) {
 		gf_sc_set_size(tmp, SC_DEF_WIDTH, SC_DEF_HEIGHT);
 	}
 #endif
- 
+
 	/*try to load GL extensions*/
 #ifndef GPAC_DISABLE_3D
 	gf_sc_load_opengl_extensions(tmp, GF_FALSE);
@@ -629,6 +646,8 @@
 
 #ifndef GPAC_DISABLE_3D
 	if (compositor->unit_bbox) mesh_free(compositor->unit_bbox);
+
+	if (compositor->screen_buffer) gf_free(compositor->screen_buffer);
 #endif
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Unloading visual compositor module\n"));
@@ -645,7 +664,7 @@
 		}
 		gf_list_del(compositor->proto_modules);
 	}
-	gf_mx_p(compositor->evq_mx);
+	if (compositor->evq_mx) gf_mx_p(compositor->evq_mx);
 	while (gf_list_count(compositor->event_queue)) {
 		GF_QueuedEvent *qev = (GF_QueuedEvent *)gf_list_get(compositor->event_queue, 0);
 		gf_list_rem(compositor->event_queue, 0);
@@ -656,8 +675,8 @@
 		gf_list_rem(compositor->event_queue, 0);
 		gf_free(qev);
 	}
-	gf_mx_v(compositor->evq_mx);
-	gf_mx_del(compositor->evq_mx);
+	if (compositor->evq_mx) gf_mx_v(compositor->evq_mx);
+	if (compositor->evq_mx) gf_mx_del(compositor->evq_mx);
 	gf_list_del(compositor->event_queue);
 	gf_list_del(compositor->event_queue_back);
 
@@ -705,30 +724,20 @@
 	/*step mode*/
 	if (PlayState==GF_STATE_STEP_PAUSE) {
 		compositor->step_mode = 1;
-		compositor->audio_renderer->step_mode = 1;
-		if (!compositor->paused)
-			gf_term_set_option(compositor->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		else {
-			u32 dur = compositor->frame_duration;
-			u32 i, count = gf_list_count(compositor->textures);
-			for (i=0; i<count; i++) {
-				GF_TextureHandler *txh = (GF_TextureHandler *) gf_list_get(compositor->textures, i);
-				if (txh->stream) {
-					u32 d = gf_mo_get_min_frame_dur(txh->stream);
-					if (d && d<dur) dur = d;
-				}
-			}
-			gf_term_step_clocks(compositor->term, dur);
-		}
+		gf_sc_flush_next_audio(compositor);
+		compositor->paused = 1;
 	} else {
 		compositor->step_mode = 0;
-		if (compositor->audio_renderer) gf_sc_ar_control(compositor->audio_renderer, (compositor->paused && (PlayState==0xFF)) ? 2 : compositor->paused);
+		if (compositor->audio_renderer) gf_sc_ar_control(compositor->audio_renderer, (compositor->paused && (PlayState==0xFF)) ? GF_SC_AR_RESET_HW_AND_PLAY : (compositor->paused ? GF_SC_AR_RESUME : GF_SC_AR_PAUSE) );
 		compositor->paused = (PlayState==GF_STATE_PAUSED) ? 1 : 0;
 	}
 }
 
 u32 gf_sc_get_clock(GF_Compositor *compositor)
 {
+	if (!compositor->bench_mode) {
+		return gf_sc_ar_get_clock(compositor->audio_renderer);
+	}
 	return compositor->scene_sampled_clock;
 }
 
@@ -938,7 +947,13 @@
 #endif
 
 		/*default back color is black*/
-		if (! (compositor->user->init_flags & GF_TERM_WINDOWLESS)) compositor->back_color = 0xFF000000;
+		if (! (compositor->user->init_flags & GF_TERM_WINDOWLESS)) {
+			if (compositor->default_back_color) {
+				compositor->back_color = compositor->default_back_color;
+			} else {
+				compositor->back_color = 0xFF000000;
+			}
+		}
 
 #ifndef GPAC_DISABLE_SVG
 		top_node = gf_sg_get_root_node(compositor->scene);
@@ -1072,6 +1087,10 @@
 GF_Err gf_sc_set_size(GF_Compositor *compositor, u32 NewWidth, u32 NewHeight)
 {
 	Bool lock_ok;
+
+	if ((compositor->display_width == NewWidth) && (compositor->display_height == NewHeight))
+		return GF_OK;
+
 	if (!NewWidth || !NewHeight) {
 		compositor->override_size_flags &= ~2;
 		compositor->msg_type |= GF_SR_CFG_AR;
@@ -1084,6 +1103,7 @@
 	compositor->new_width = NewWidth;
 	compositor->new_height = NewHeight;
 	compositor->msg_type |= GF_SR_CFG_SET_SIZE;
+	assert(compositor->new_width);
 
 	/*if same size only request for video setup */
 	compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
@@ -1148,24 +1168,6 @@
 	if (sOpt) sscanf(sOpt, "%x", &compositor->text_sel_color);
 	if (!compositor->text_sel_color) compositor->text_sel_color = 0xFFAAAAFF;
 
-	/*load options*/
-	if (compositor->video_out->hw_caps & GF_VIDEO_HW_DIRECT_ONLY) {
-		compositor->traverse_state->immediate_draw = 1;
-	} else {
-		sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DrawMode");
-		if (!sOpt) {
-			sOpt = "defer";
-			gf_cfg_set_key(compositor->user->config, "Compositor", "DrawMode", sOpt);
-		}
-
-		if (!strcmp(sOpt, "immediate")) compositor->traverse_state->immediate_draw = 1;
-		else if (!strcmp(sOpt, "defer-debug")) {
-			compositor->traverse_state->immediate_draw = 0;
-			compositor->debug_defer = 1;
-		}
-		else compositor->traverse_state->immediate_draw = 0;
-	}
-
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ScalableZoom");
 	compositor->scalable_zoom = (!sOpt || !stricmp(sOpt, "yes") ) ? 1 : 0;
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableYUV");
@@ -1224,16 +1226,26 @@
 #ifndef GPAC_DISABLE_3D
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "OpenGLMode");
-	compositor->force_opengl_2d = (sOpt && !strcmp(sOpt, "always")) ? 1 : 0;
-	if (!sOpt) {
-		compositor->recompute_ar = 1;
-		compositor->autoconfig_opengl = 1;
+
+	if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL)) {
+		if (sOpt && strcmp(sOpt, "disable")) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL mode %s requested but no opengl-capable output - disabling openGL\n", sOpt));
+		}
+		compositor->force_opengl_2d = 0;
+		compositor->autoconfig_opengl = 0;
+		compositor->hybrid_opengl = 0;
 	} else {
-		compositor->hybrid_opengl = !strcmp(sOpt, "hybrid") ? 1 : 0;
+		compositor->force_opengl_2d = (sOpt && !strcmp(sOpt, "always")) ? 1 : 0;
+		if (!sOpt) {
+			compositor->recompute_ar = 1;
+			compositor->autoconfig_opengl = 1;
+		} else {
+			compositor->hybrid_opengl = !strcmp(sOpt, "hybrid") ? 1 : 0;
 #ifdef OPENGL_RASTER
-		compositor->opengl_raster = !strcmp(sOpt, "raster") ? 1 : 0;
-		if (compositor->opengl_raster) compositor->traverse_state->immediate_draw = GF_TRUE;
+			compositor->opengl_raster = !strcmp(sOpt, "raster") ? 1 : 0;
+			if (compositor->opengl_raster) compositor->traverse_state->immediate_draw = GF_TRUE;
 #endif
+		}
 	}
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EnablePBO");
@@ -1252,7 +1264,7 @@
 	/*currently:
 	- no support for npow2 textures, and no support for DrawPixels
 	*/
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EmulatePOW2");
 	compositor->emul_pow2 = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
 #else
@@ -1331,8 +1343,23 @@
 	else if (!strcmp(sOpt, "Anaglyph")) compositor->visual->autostereo_type = GF_3D_STEREO_ANAGLYPH;
 	else if (!strcmp(sOpt, "Columns")) compositor->visual->autostereo_type = GF_3D_STEREO_COLUMNS;
 	else if (!strcmp(sOpt, "Rows")) compositor->visual->autostereo_type = GF_3D_STEREO_ROWS;
-	else if (!strcmp(sOpt, "SPV19")) compositor->visual->autostereo_type = GF_3D_STEREO_5VSP19;
-
+	else if (!strcmp(sOpt, "SPV19")) {
+		compositor->visual->autostereo_type = GF_3D_STEREO_5VSP19;
+		if (compositor->visual->nb_views != 5) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] SPV19 interleaving used but only %d views indicated - adjusting to 5 view\n", compositor->visual->nb_views ));
+			compositor->visual->nb_views = 5;
+			gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "5");
+		}
+	}
+	else if (!strcmp(sOpt, "ALIO")) {
+		compositor->visual->autostereo_type = GF_3D_STEREO_8VALIO;
+		if (compositor->visual->nb_views != 8) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] ALIO interleaving used but only %d views indicated - adjusting to 8 view\n", compositor->visual->nb_views ));
+			compositor->visual->nb_views = 8;
+			gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "8");
+		}
+	}
+	else if (!strcmp(sOpt, "StereoHeadset")) compositor->visual->autostereo_type = GF_3D_STEREO_HEADSET;
 	else {
 		compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
 		compositor->visual->nb_views = 1;
@@ -1345,6 +1372,7 @@
 	case GF_3D_STEREO_COLUMNS:
 	case GF_3D_STEREO_ROWS:
 		if (compositor->visual->nb_views != 2) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Stereo interleaving used but %d views indicated - adjusting to 2 view\n", compositor->visual->nb_views ));
 			compositor->visual->nb_views = 2;
 			gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "2");
 		}
@@ -1371,6 +1399,26 @@
 
 #endif //GPAC_DISABLE_3D
 
+
+	/*load defer mode only once hybrid_opengl is known. If no hybrid openGL and no backbuffer 2D, disable defer rendering*/
+	if (!compositor->hybrid_opengl && compositor->video_out->hw_caps & GF_VIDEO_HW_DIRECT_ONLY) {
+		compositor->traverse_state->immediate_draw = 1;
+	} else {
+		sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DrawMode");
+		if (!sOpt) {
+			sOpt = "defer";
+			gf_cfg_set_key(compositor->user->config, "Compositor", "DrawMode", sOpt);
+		}
+
+		if (!strcmp(sOpt, "immediate")) compositor->traverse_state->immediate_draw = 1;
+		else if (!strcmp(sOpt, "defer-debug")) {
+			compositor->traverse_state->immediate_draw = 0;
+			compositor->debug_defer = 1;
+		}
+		else compositor->traverse_state->immediate_draw = 0;
+	}
+
+
 #ifdef GF_SR_USE_DEPTH
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "AutoStereoCalibration");
 	compositor->auto_calibration = (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0;
@@ -1486,6 +1534,13 @@
 		compositor->freeze_display = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
+	case GF_OPT_FORCE_AUDIO_CONFIG:
+		if (value) {
+			compositor->audio_renderer->config_forced++;
+		} else if (compositor->audio_renderer->config_forced) {
+			compositor->audio_renderer->config_forced --;
+		}
+		break;
 	case GF_OPT_RELOAD_CONFIG:
 		gf_sc_reload_config(compositor);
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
@@ -1530,44 +1585,18 @@
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_NAVIGATION:
-		if (compositor->navigation_disabled) {
+		if (! gf_sc_navigation_supported(compositor, value)) {
 			e = GF_NOT_SUPPORTED;
-		} else
+		}
 #ifndef GPAC_DISABLE_3D
-			if (compositor->visual->type_3d || compositor->active_layer) {
-				GF_Camera *cam = compositor_3d_get_camera(compositor);
-				if (cam->navigation_flags & NAV_ANY) {
-					/*if not specifying mode, try to (un)bind top*/
-					if (!value) {
-#ifndef GPAC_DISABLE_VRML
-						if (compositor->active_layer) {
-							compositor_layer3d_bind_camera(compositor->active_layer, 0, value);
-						} else {
-							GF_Node *n = (GF_Node*)gf_list_get(compositor->visual->navigation_stack, 0);
-							if (n)
-								Bindable_SetSetBind(n, 0);
-							else
-								cam->navigate_mode = value;
-						}
-#else
-						cam->navigate_mode = value;
-#endif
-					} else {
-						cam->navigate_mode = value;
-					}
-					break;
-				}
-			} else
+		else if (compositor->visual->type_3d || compositor->active_layer) {
+			GF_Camera *cam = compositor_3d_get_camera(compositor);
+			cam->navigate_mode = value;
+		}
 #endif
-			{
-				if ((value!=GF_NAVIGATE_NONE) && (value!=GF_NAVIGATE_SLIDE) && (value!=GF_NAVIGATE_EXAMINE)) {
-					e = GF_NOT_SUPPORTED;
-					break;
-				}
-				compositor->navigate_mode = value;
-				break;
-			}
-		e = GF_NOT_SUPPORTED;
+		else {
+			compositor->navigate_mode = value;
+		}
 		break;
 
 	case GF_OPT_HEADLIGHT:
@@ -1744,6 +1773,7 @@
 		if (compositor->navigation_disabled) return GF_NAVIGATE_TYPE_NONE;
 		if (compositor->visual->type_3d || compositor->active_layer) {
 			GF_Camera *cam = compositor_3d_get_camera(compositor);
+			if ((cam->navigation_flags & NAV_SELECTABLE)) return GF_NAVIGATE_TYPE_3D;
 			if (!(cam->navigation_flags & NAV_ANY)) return GF_NAVIGATE_TYPE_NONE;
 //			return ((cam->is_3D || compositor->active_layer) ? GF_NAVIGATE_TYPE_3D : GF_NAVIGATE_TYPE_2D);
 			return GF_NAVIGATE_TYPE_3D;
@@ -1778,7 +1808,7 @@
 	case GF_OPT_NUM_STEREO_VIEWS:
 #ifndef GPAC_DISABLE_3D
 		if (compositor->visual->type_3d) {
-			if (compositor->visual->nb_views && compositor->visual->autostereo_type>GF_3D_STEREO_SIDE)
+			if (compositor->visual->nb_views && compositor->visual->autostereo_type > GF_3D_STEREO_LAST_SINGLE_BUFFER)
 				return compositor->visual->nb_views;
 		}
 #endif
@@ -1823,7 +1853,7 @@
 {
 	if (!compositor || !framebuffer) return GF_BAD_PARAM;
 #ifndef GPAC_DISABLE_3D
-	if (compositor->visual->type_3d && compositor->visual->nb_views && (compositor->visual->autostereo_type>GF_3D_STEREO_SIDE)) {
+	if (compositor->visual->type_3d && compositor->visual->nb_views && (compositor->visual->autostereo_type > GF_3D_STEREO_LAST_SINGLE_BUFFER)) {
 		GF_Err e;
 		gf_mx_p(compositor->mx);
 		e = compositor_3d_get_offscreen_buffer(compositor, framebuffer, view_idx, depth_dump_mode);
@@ -1917,11 +1947,17 @@
 
 static void gf_sc_recompute_ar(GF_Compositor *compositor, GF_Node *top_node)
 {
+	Bool force_pause = compositor->audio_renderer->Frozen ? 0 : 1;
+
+	force_pause = GF_FALSE;
 
 #ifndef GPAC_DISABLE_LOG
 	compositor->visual_config_time = 0;
 #endif
 	if (compositor->recompute_ar) {
+#ifndef GPAC_DISABLE_3D
+		u32 prev_type_3d = compositor->visual->type_3d;
+#endif
 #ifndef GPAC_DISABLE_LOG
 		u32 time=0;
 
@@ -1929,8 +1965,9 @@
 			time = gf_sys_clock();
 		}
 #endif
+		if (force_pause)
+			gf_sc_ar_control(compositor->audio_renderer, GF_SC_AR_PAUSE);
 
-		gf_sc_ar_control(compositor->audio_renderer, 0);
 #ifndef GPAC_DISABLE_3D
 		if (compositor->autoconfig_opengl) {
 			compositor->visual->type_3d = 1;
@@ -1938,21 +1975,23 @@
 		if (compositor->visual->type_3d) {
 			compositor_3d_set_aspect_ratio(compositor);
 			gf_sc_load_opengl_extensions(compositor, compositor->visual->type_3d);
-			if (compositor->autoconfig_opengl) {
-#ifndef GPAC_USE_OGL_ES
-				visual_3d_init_shaders(compositor->visual);
+#ifndef GPAC_USE_GLES1X
+			visual_3d_init_shaders(compositor->visual);
 #endif
+			if (compositor->autoconfig_opengl) {
 				compositor->autoconfig_opengl = 0;
-				compositor->visual->type_3d = 0;
 				compositor->force_opengl_2d = 0;
+				compositor->visual->type_3d = prev_type_3d;
 
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 				//enable hybrid mode by default
-				if (compositor->visual->yuv_rect_glsl_program) {
+				if (compositor->visual->compositor->shader_only_mode) {
 					gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLMode", "hybrid");
 					compositor->hybrid_opengl = 1;
 				} else {
 					gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLMode", "disable");
 				}
+#endif
 			}
 
 		}
@@ -1963,7 +2002,7 @@
 #ifndef GPAC_DISABLE_3D
 			if (compositor->hybrid_opengl) {
 				gf_sc_load_opengl_extensions(compositor, GF_TRUE);
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 				visual_3d_init_shaders(compositor->visual);
 #endif
 				if (!compositor->visual->hybgl_drawn.list) {
@@ -1973,7 +2012,8 @@
 #endif
 		}
 
-		gf_sc_ar_control(compositor->audio_renderer, 1);
+		if (force_pause )
+			gf_sc_ar_control(compositor->audio_renderer, GF_SC_AR_RESUME);
 
 #ifndef GPAC_DISABLE_LOG
 		if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) {
@@ -2084,7 +2124,6 @@
 		/*request for OpenGL drawing in 2D*/
 		else if (compositor->force_opengl_2d && !compositor->visual->type_3d) {
 			compositor->visual->type_3d = 1;
-			camera_set_2d(&compositor->visual->camera);
 			if (compositor->force_opengl_2d==2) force_navigate=1;
 		}
 
@@ -2093,6 +2132,9 @@
 			compositor->visual->camera.is_3D = 0;
 		}
 		compositor->visual->camera.is_3D = (compositor->visual->type_3d>1) ? 1 : 0;
+		if (!compositor->visual->camera.is_3D)
+			camera_set_2d(&compositor->visual->camera);
+
 		camera_invalidate(&compositor->visual->camera);
 		if (force_navigate) {
 			compositor->visual->camera.navigate_mode = GF_NAVIGATE_EXAMINE;
@@ -2119,8 +2161,8 @@
 
 	if (!top_node && !compositor->visual->last_had_back && !compositor->visual->cur_context) {
 		//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Scene has no root node, nothing to draw\n"));
- //nothing to draw, skip flush
- compositor->skip_flush = 1;
+		//nothing to draw, skip flush
+		compositor->skip_flush = 1;
 		return;
 	}
 
@@ -2194,7 +2236,7 @@
 	gf_sc_lock(compositor, 1);
 }
 
-void gf_sc_simulation_tick(GF_Compositor *compositor)
+void gf_sc_render_frame(GF_Compositor *compositor)
 {
 #ifndef GPAC_DISABLE_SCENEGRAPH
 	GF_SceneGraph *sg;
@@ -2208,6 +2250,7 @@
 
 	/*lock compositor for the whole cycle*/
 	gf_sc_lock(compositor, 1);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Entering render_frame \n"));
 
 	in_time = gf_sys_clock();
 
@@ -2293,7 +2336,7 @@
 
 	//first update all natural textures to figure out timing
 	compositor->frame_delay = 0;
-	compositor->next_frame_delay = (u32) -1;
+	compositor->ms_until_next_frame = GF_INT_MAX;
 	frame_duration = compositor->frame_duration;
 
 #ifndef GPAC_DISABLE_LOG
@@ -2340,12 +2383,14 @@
 	if (gf_smil_notify_timed_elements(compositor->scene)) {
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 	}
+#ifndef GPAC_DISABLE_SCENEGRAPH
 	i = 0;
 	while ((sg = (GF_SceneGraph*)gf_list_enum(compositor->extra_scenes, &i))) {
 		if (gf_smil_notify_timed_elements(sg)) {
 			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		}
 	}
+#endif
 
 #ifndef GPAC_DISABLE_LOG
 	smil_timing_time = gf_sys_clock() - smil_timing_time;
@@ -2400,10 +2445,13 @@
 #endif
 
 	gf_sg_activate_routes(compositor->scene);
+
+#ifndef GPAC_DISABLE_SCENEGRAPH
 	i = 0;
 	while ((sg = (GF_SceneGraph*)gf_list_enum(compositor->extra_scenes, &i))) {
 		gf_sg_activate_routes(sg);
 	}
+#endif
 
 #ifndef GPAC_DISABLE_LOG
 	route_time = gf_sys_clock() - route_time;
@@ -2463,7 +2511,8 @@
 		compositor->frame_draw_type=GF_SC_DRAW_FRAME;
 	}
 
-	if (compositor->is_hidden) {
+	//if hidden and no listener, do not draw the scene
+	if (compositor->is_hidden && !compositor->video_listeners) {
 		compositor->frame_draw_type = 0;
 	}
 
@@ -2478,15 +2527,19 @@
 		time_spent_in_anim = 0;
 #endif
 
+		if (compositor->traverse_state->immediate_draw) {
+			compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+		}
+
 		/*video flush only*/
 		if (compositor->frame_draw_type==GF_SC_DRAW_FLUSH) {
 			compositor->frame_draw_type = 0;
+
 		}
 		/*full render*/
 		else {
 			compositor->frame_draw_type = 0;
 
-
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Redrawing scene - STB %d\n", compositor->scene_sampled_clock));
 			gf_sc_draw_scene(compositor);
 #ifndef GPAC_DISABLE_LOG
@@ -2606,22 +2659,28 @@
 	}
 
 	//we have a pending frame, return asap - we could sleep until frames matures but this give weird regulation
-	if (compositor->next_frame_delay != (u32) -1) {
-		if (compositor->next_frame_delay>end_time) compositor->next_frame_delay-=end_time;
-		else compositor->next_frame_delay=0;
-
-		compositor->next_frame_delay = MIN(compositor->next_frame_delay, 2*frame_duration);
-		if (compositor->next_frame_delay>2) {
-			u32 diff=0;
+	if (compositor->ms_until_next_frame != GF_INT_MAX) {
+		compositor->ms_until_next_frame -= end_time;
+
+		if (compositor->ms_until_next_frame<=0) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Next frame already due (%d ms late) - not going to sleep\n", - compositor->ms_until_next_frame));
+			compositor->ms_until_next_frame=0;
+			return;
+		}
+
+		compositor->ms_until_next_frame = MIN(compositor->ms_until_next_frame, (s32) frame_duration );
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Next frame due in %d ms\n", compositor->ms_until_next_frame));
+		if (compositor->ms_until_next_frame > 2) {
+			u64 start = gf_sys_clock_high_res();
+			u64 diff=0;
+			u64 wait_for = 1000 * (u64) compositor->ms_until_next_frame;
 			while (! compositor->msg_type && ! compositor->video_frame_pending) {
 				gf_sleep(1);
-				diff = gf_sys_clock() - in_time;
-				if (diff >= (u32) compositor->next_frame_delay)
+				diff = gf_sys_clock_high_res() - start;
+				if (diff >= wait_for)
 					break;
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept %d ms until next frame due in %d ms\n", diff, compositor->next_frame_delay));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Next frame due in %d ms - not going to sleep\n", compositor->next_frame_delay));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept %d ms until next frame (msg type %d - frame pending %d)\n", diff/1000, compositor->msg_type, compositor->video_frame_pending));
 		}
 		return;
 	}
@@ -2699,13 +2758,14 @@
 			of bindable stacks and gives us free 2D/3D integration*/
 			if (tag==TAG_MPEG4_OrderedGroup) {
 				new_tag = TAG_MPEG4_Layer2D;
-			} else if ((tag==TAG_MPEG4_Group)
+			} else if (tag==TAG_MPEG4_Group) {
+				new_tag = TAG_MPEG4_Layer3D;
+			}
 #ifndef GPAC_DISABLE_X3D
-			 || (tag==TAG_X3D_Group)
-#endif
-			 ) {
+			else if (tag==TAG_X3D_Group) {
 				new_tag = TAG_MPEG4_Layer3D;
 			}
+#endif
 		}
 #if !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_3D)
 		/*if the inlined root node is a 3D one except Layer3D and we are not in a 3D context, insert
@@ -2862,7 +2922,9 @@
 	/*we're reconfiguring the video output, cancel all messages except GL reconfig (context lost)*/
 	if (compositor->msg_type & GF_SR_IN_RECONFIG) {
 		if (event->type==GF_EVENT_VIDEO_SETUP) {
-			gf_sc_reset_graphics(compositor);
+			if (event->setup.hw_reset)
+				gf_sc_reset_graphics(compositor);
+
 			if (event->setup.back_buffer)
 				compositor->recompute_ar = 1;
 		}
@@ -2876,26 +2938,21 @@
 		break;
 
 	case GF_EVENT_MOVE_NOTIF:
-	case GF_EVENT_REFRESH:
-		if (!compositor->frame_draw_type) {
-			/*when refreshing the window in 3D or with overlays we redraw the scene */
-			if (compositor->last_had_overlays
-#ifndef GPAC_DISABLE_3D
-			 || compositor->visual->type_3d
-#endif
-			 ) {
-				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
-			}
-			/*reflush only*/
-			else
-				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FLUSH);
+		if (compositor->last_had_overlays) {
+			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		}
 		break;
+	case GF_EVENT_REFRESH:
+		/*when refreshing a window with overlays we redraw the scene */
+		gf_sc_next_frame_state(compositor, compositor->last_had_overlays ? GF_SC_DRAW_FRAME : GF_SC_DRAW_FLUSH);
+		break;
 	case GF_EVENT_VIDEO_SETUP:
 	{
 		Bool locked = gf_mx_try_lock(compositor->mx);
-		if (event->setup.hw_reset)
+		if (event->setup.hw_reset) {
 			gf_sc_reset_graphics(compositor);
+			compositor->reset_graphics = 2;
+		}
 
 		if (event->setup.back_buffer)
 			compositor->recompute_ar = 1;
@@ -2914,14 +2971,22 @@
 			*/
 			Bool lock_ok = gf_mx_try_lock(compositor->mx);
 			if ((compositor->display_width!=event->size.width) || (compositor->display_height!=event->size.height)) {
+
+				//OSX bug with SDL when requesting 4k window we get max screen height but 4k width ...
+#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
+				if (compositor->display_width==event->size.width) {
+					if (compositor->display_height > 2*event->size.height) {
+						event->size.width = compositor->display_width * event->size.height / compositor->display_height;
+					}
+				}
+#endif
 				compositor->new_width = event->size.width;
 				compositor->new_height = event->size.height;
 				compositor->msg_type |= GF_SR_CFG_SET_SIZE;
 				if (from_user) compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 			} else {
-				/*remove pending resize notif*/
-				compositor->msg_type &= ~GF_SR_CFG_SET_SIZE;
- compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
+				/*remove pending resize notif but not resize requests*/
+				compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 			}
 			if (lock_ok) gf_sc_lock(compositor, GF_FALSE);
 		}
@@ -3454,3 +3519,39 @@
 	sc_cleanup_event_queue(compositor->event_queue_back, node, sg);
 	gf_mx_v(compositor->evq_mx);
 }
+
+GF_EXPORT
+Bool gf_sc_navigation_supported(GF_Compositor *compositor, u32 type)
+{
+	if (compositor->navigation_disabled ) return GF_FALSE;
+#ifndef GPAC_DISABLE_3D
+	if (compositor->visual->type_3d || compositor->active_layer) {
+		GF_Camera *cam = compositor_3d_get_camera(compositor);
+		if (cam->navigation_flags & NAV_ANY) {
+			return GF_TRUE;
+		} else {
+#ifndef GPAC_DISABLE_VRML
+			M_NavigationInfo *ni = (M_NavigationInfo *)gf_list_get(compositor->visual->navigation_stack, 0);
+			if (ni) {
+				u32 i;
+				for (i=0; i<ni->type.count; i++) {
+					if (!ni->type.vals[i]) continue;
+					if (!stricmp(ni->type.vals[i], "WALK") && (type==GF_NAVIGATE_WALK)) return GF_TRUE;
+					else if (!stricmp(ni->type.vals[i], "NONE") && (type==GF_NAVIGATE_NONE)) return GF_TRUE;
+					else if (!stricmp(ni->type.vals[i], "EXAMINE") && (type==GF_NAVIGATE_EXAMINE)) return GF_TRUE;
+					else if (!stricmp(ni->type.vals[i], "FLY") && (type==GF_NAVIGATE_FLY)) return GF_TRUE;
+					else if (!stricmp(ni->type.vals[i], "VR") && (type==GF_NAVIGATE_VR)) return GF_TRUE;
+					else if (!stricmp(ni->type.vals[i], "GAME") && (type==GF_NAVIGATE_GAME)) return GF_TRUE;
+					else if (!stricmp(ni->type.vals[i], "ORBIT") && (type==GF_NAVIGATE_ORBIT)) return GF_TRUE;
+				}
+			}
+#endif
+			return GF_FALSE;
+		}
+	} else
+#endif
+		if ((type!=GF_NAVIGATE_NONE) && (type!=GF_NAVIGATE_SLIDE) && (type!=GF_NAVIGATE_EXAMINE)) {
+			return GF_FALSE;
+		}
+	return GF_TRUE;
+}

v0.5.2.tar.gz/src/compositor/compositor_2d.c -> v0.6.1.tar.gz/src/compositor/compositor_2d.c Changed

@@ -31,13 +31,13 @@
 #include <gpac/internal/terminal_dev.h>
 #include "texturing.h"
 
-#ifdef OPENGL_RASTER
 #include "gl_inc.h"
 
+#ifdef OPENGL_RASTER
+
 static void c2d_gl_fill_no_alpha(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color)
 {
-	return;
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 	GLfloat line[4];
 
 	line[0] = FIX2FLT(x);
@@ -64,8 +64,7 @@
 
 static void c2d_gl_fill_alpha(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color, u8 alpha)
 {
-	return;
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 	GLfloat line[4];
 
 	line[0] = FIX2FLT(x);
@@ -96,7 +95,7 @@
 static void c2d_gl_fill_rect(void *cbk, u32 x, u32 y, u32 width, u32 height, GF_Color color)
 {
 	return;
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 	GLfloat line[8];
 
 	line[0] = FIX2FLT(x);
@@ -144,7 +143,7 @@
 	Fixed alpha = INT2FIX( GF_COL_A(BackColor) )/255;
 	if (!visual->is_attached) return;
 
-	if (!BackColor && !visual->offscreen) {
+	if (!BackColor && !visual->offscreen && !is_offscreen_clear) {
 		if (!visual->compositor->user || !(visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
 			BackColor = visual->compositor->back_color & 0x00FFFFFF;
 		}
@@ -187,14 +186,17 @@
 	if (!compositor->visual->nb_objects_on_canvas_since_last_ogl_flush)
 		goto exit;
 
+	memset(&a_tr_state, 0, sizeof(GF_TraverseState));
+	a_tr_state.color_mat.identity = 1;
 	a_tr_state.visual = compositor->visual;
 	a_tr_state.camera = &compositor->visual->camera;
 	gf_mx_init(a_tr_state.model_matrix);
 
-	visual_3d_set_state(compositor->visual, V3D_STATE_LIGHT, 0);
-	visual_3d_enable_antialias(compositor->visual, 0);
+	visual_3d_set_state(compositor->visual, V3D_STATE_LIGHT, GF_FALSE);
+	visual_3d_enable_antialias(compositor->visual, GF_FALSE);
 	gf_sc_texture_set_blend_mode(compositor->hybgl_txh, TX_MODULATE);
-	visual_3d_set_material_2d_argb(compositor->visual, 0xFFFFFFFF);
+	//visual_3d_set_material_2d_argb(compositor->visual, 0xFFFFFFFF);
+	compositor->visual->has_material_2d = 0;
 	a_tr_state.mesh_num_textures = gf_sc_texture_enable(compositor->hybgl_txh, NULL);
 	if (a_tr_state.mesh_num_textures ) {
 		if (area) {
@@ -206,7 +208,7 @@
 
 			orig.x = INT2FIX(area->x);
 			orig.y = INT2FIX(area->y);
-			mesh_new_rectangle(compositor->hybgl_mesh, size, &orig, 1);
+			mesh_new_rectangle(compositor->hybgl_mesh, size, &orig, GF_TRUE);
 
 			orig.x = INT2FIX(area->x) + INT2FIX(compositor->vp_width)/2;
 			orig.y = INT2FIX(compositor->vp_height)/2 - INT2FIX(area->y) + INT2FIX(area->height);
@@ -237,7 +239,7 @@
 			SFVec2f size;
 			size.x = INT2FIX(compositor->vp_width);
 			size.y = INT2FIX(compositor->vp_height);
-			mesh_new_rectangle(compositor->hybgl_mesh, size, NULL, 1);
+			mesh_new_rectangle(compositor->hybgl_mesh, size, NULL, GF_TRUE);
 		}
 	}
 
@@ -256,21 +258,21 @@
 	compositor->visual->nb_objects_on_canvas_since_last_ogl_flush = 0;
 }
 
-Bool c2d_gl_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key)
+Bool c2d_gl_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx)
 {
 	u8 alpha = GF_COL_A(ctx->aspect.fill_color);
 
-	if (ctx->transform.m[1] || ctx->transform.m[3]) return 0;
+	if (ctx->transform.m[1] || ctx->transform.m[3]) return GF_FALSE;
 
-	visual_3d_set_state(visual, V3D_STATE_LIGHT, 0);
-	visual_3d_enable_antialias(visual, 0);
+	visual_3d_set_state(visual, V3D_STATE_LIGHT, GF_FALSE);
+	visual_3d_enable_antialias(visual, GF_FALSE);
 	if (alpha && (alpha != 0xFF)) {
 		visual_3d_set_material_2d_argb(visual, ctx->aspect.fill_color);
 		gf_sc_texture_set_blend_mode(ctx->aspect.fill_texture, TX_MODULATE);
 	} else if (gf_sc_texture_is_transparent(ctx->aspect.fill_texture)) {
 		gf_sc_texture_set_blend_mode(ctx->aspect.fill_texture, TX_REPLACE);
 	} else {
-		visual_3d_set_state(visual, V3D_STATE_BLEND, 0);
+		visual_3d_set_state(visual, V3D_STATE_BLEND, GF_FALSE);
 	}
 #ifndef GPAC_DISABLE_VRML
 	/*ignore texture transform for bitmap*/
@@ -280,42 +282,50 @@
 		GF_Mesh *mesh;
 		size.x = ctx->bi->unclip.width;
 		size.y = ctx->bi->unclip.height;
+# ifdef OPENGL_RASTER
 		if (visual->compositor->opengl_raster) {
 			orig.x = ctx->bi->unclip.x + INT2FIX(visual->compositor->vp_width)/2;
 			orig.y = INT2FIX(visual->compositor->vp_height)/2 - ctx->bi->unclip.y + ctx->bi->unclip.height;
 		}
+#endif
 		mesh = new_mesh();
-		mesh_new_rectangle(mesh, size, &orig, 1);
+		mesh_new_rectangle(mesh, size, &orig, GF_TRUE);
 		visual_3d_mesh_paint(tr_state, mesh);
 		mesh_free(mesh);
 		gf_sc_texture_disable(ctx->aspect.fill_texture);
 		tr_state->mesh_num_textures = 0;
-		return 1;
+		return GF_TRUE;
 	}
 #endif
-	return 0;
+	return GF_FALSE;
 }
 
-Bool compositor_2d_hybgl_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key)
+Bool compositor_2d_hybgl_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx)
 {
+	GF_Node *txtrans = NULL;
 	//for anything but background use regular routines
-	if (!(ctx->flags & CTX_IS_BACKGROUND)) return 0;
+	if (!(ctx->flags & CTX_IS_BACKGROUND)) return GF_FALSE;
+
+#ifndef GPAC_DISABLE_VRML
+	if (tr_state->appear ) txtrans = ((M_Appearance *)tr_state->appear)->textureTransform;
+#endif
 
 	/*ignore texture transform for bitmap*/
-	tr_state->mesh_num_textures = gf_sc_texture_enable(ctx->aspect.fill_texture, tr_state->appear ? ((M_Appearance *)tr_state->appear)->textureTransform : NULL);
+	tr_state->mesh_num_textures = gf_sc_texture_enable(ctx->aspect.fill_texture, txtrans);
+
 	if (tr_state->mesh_num_textures) {
 		SFVec2f size, orig;
 		size.x = ctx->bi->unclip.width;
 		size.y = ctx->bi->unclip.height;
 		orig.x = ctx->bi->unclip.x ;
 		orig.y = ctx->bi->unclip.y;
-		mesh_new_rectangle(visual->compositor->hybgl_mesh_background, size, &orig, 0);
+		mesh_new_rectangle(visual->compositor->hybgl_mesh_background, size, &orig, GF_FALSE);
 
 		visual_3d_mesh_paint(tr_state, visual->compositor->hybgl_mesh_background);
 		gf_sc_texture_disable(ctx->aspect.fill_texture);
 		tr_state->mesh_num_textures = 0;
 	}
-	return 1;
+	return GF_TRUE;
 }
 #endif
 
@@ -345,139 +355,126 @@
 
 static GF_Err compositor_2d_setup_opengl(GF_VisualManager *visual)
 {
-	Fixed hh, hw;
 	GF_Compositor *compositor = visual->compositor;
-	visual->is_attached = 1;
+	visual->is_attached = GF_TRUE;
 
 	visual_3d_setup(visual);
 	visual->compositor->traverse_state->camera = &visual->camera;
 
 
-	glClear(GL_DEPTH_BUFFER_BIT);
 	glViewport(0, 0, compositor->vp_width, compositor->vp_height);
 
-	glClear(GL_COLOR_BUFFER_BIT);
+	visual->camera.vp.x = visual->camera.vp.y = 0;
+	visual->camera.vp.width = visual->camera.width = INT2FIX(compositor->vp_width);
+	visual->camera.vp.height = visual->camera.height = INT2FIX(compositor->vp_height);
+	visual->camera.up.y = FIX_ONE;
+	visual->camera.end_zoom = FIX_ONE;
+	visual->camera.position.z = INT2FIX(1000);
+	visual->camera.flags = CAM_IS_DIRTY;
 
-	glLineWidth(1.0f);
+	camera_update(&visual->camera, NULL, visual->compositor->hybrid_opengl ? GF_TRUE : visual->center_coords);
 
-#ifndef GPAC_USE_OGL_ES
-	glDisable(GL_POLYGON_SMOOTH);
-#endif
-	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-
-	glDisable(GL_NORMALIZE);
-	glDisable(GL_DEPTH_TEST);
-	//glDepthFunc(GL_LEQUAL);
-
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-	if (compositor->opengl_raster) {
-		glDisable(GL_LINE_SMOOTH);
-	} else {
-		glEnable(GL_LINE_SMOOTH);
-	}
-
-	hw = INT2FIX(compositor->vp_width)/2;
-	hh = INT2FIX(compositor->vp_height)/2;
-	gf_mx_ortho(&visual->camera.projection, -hw, hw, -hh, hh, 50, -50);
 	visual_3d_projection_matrix_modified(visual);
 
-	gf_mx_init(visual->camera.modelview);
-
 #ifdef OPENGL_RASTER
 	if (compositor->opengl_raster) {
-		gf_mx_add_scale(&visual->camera.modelview, 1, -1, 1);
-		gf_mx_add_translation(&visual->camera.modelview, -hw, -hh, 0);
+		gf_mx_add_scale(&visual->camera.modelview, FIX_ONE, -FIX_ONE, FIX_ONE);
+		gf_mx_add_translation(&visual->camera.modelview, -visual->camera.width/2, -visual->camera.height/2, 0);
 	}
 #endif
 	return GF_OK;
 }
 #endif
 
-GF_Err compositor_2d_get_video_access(GF_VisualManager *visual)
+#ifdef OPENGL_RASTER
+static GF_Err c2d_video_access_opengl_raster(GF_VisualManager *visual)
 {
 	GF_Err e;
 	GF_Compositor *compositor = visual->compositor;
+	GF_RasterCallback callbacks;
 
-	if (!visual->raster_surface) return GF_BAD_PARAM;
+	callbacks.cbk = visual;
+	callbacks.fill_run_alpha = c2d_gl_fill_alpha;
+	callbacks.fill_run_no_alpha = c2d_gl_fill_no_alpha;
+	callbacks.fill_rect = c2d_gl_fill_rect;
 
-#ifdef OPENGL_RASTER
-	if (compositor->opengl_raster && compositor->rasterizer->surface_attach_to_callbacks) {
-		GF_RasterCallback callbacks;
-		callbacks.cbk = visual;
-		callbacks.fill_run_alpha = c2d_gl_fill_alpha;
-		callbacks.fill_run_no_alpha = c2d_gl_fill_no_alpha;
-		callbacks.fill_rect = c2d_gl_fill_rect;
-
-		visual->DrawBitmap = c2d_gl_draw_bitmap;
+	visual->DrawBitmap = c2d_gl_draw_bitmap;
 
-		e = compositor->rasterizer->surface_attach_to_callbacks(visual->raster_surface, &callbacks, compositor->vp_width, compositor->vp_height);
-		if (e) return e;
+	e = compositor->rasterizer->surface_attach_to_callbacks(visual->raster_surface, &callbacks, compositor->vp_width, compositor->vp_height);
+	if (e) return e;
 
-		return compositor_2d_setup_opengl(visual);
-	}
+	return compositor_2d_setup_opengl(visual);
+}
 #endif
 
 #ifndef GPAC_DISABLE_3D
-	if (compositor->hybrid_opengl) {
 
-		if (!compositor->hybgl_txh) {
-			GF_SAFEALLOC(compositor->hybgl_txh, GF_TextureHandler);
-			if (!compositor->hybgl_txh) return GF_IO_ERR;
-			compositor->hybgl_txh->compositor = compositor;
-		}
+static GF_Err c2d_video_access_hybrid_opengl(GF_VisualManager *visual)
+{
+	GF_Err e;
+	GF_Compositor *compositor = visual->compositor;
 
-		if ((compositor->hybgl_txh->width != compositor->vp_width) || (compositor->hybgl_txh->height != compositor->vp_height)) {
-			SFVec2f size;
-			compositor->hybgl_txh->data = gf_realloc(compositor->hybgl_txh->data, 4*compositor->vp_width*compositor->vp_height);
+	if (!compositor->hybgl_txh) {
+		GF_SAFEALLOC(compositor->hybgl_txh, GF_TextureHandler);
+		if (!compositor->hybgl_txh) return GF_IO_ERR;
+		compositor->hybgl_txh->compositor = compositor;
+	}
+
+	if ((compositor->hybgl_txh->width != compositor->vp_width) || (compositor->hybgl_txh->height != compositor->vp_height)) {
+		SFVec2f size;
+		compositor->hybgl_txh->data = (char*)gf_realloc(compositor->hybgl_txh->data, 4*compositor->vp_width*compositor->vp_height);
 
-			if (compositor->hybgl_txh->tx_io)
-				gf_sc_texture_release(compositor->hybgl_txh);
+		if (compositor->hybgl_txh->tx_io)
+			gf_sc_texture_release(compositor->hybgl_txh);
 
-			compositor->hybgl_txh->width = compositor->vp_width;
-			compositor->hybgl_txh->height = compositor->vp_height;
-			compositor->hybgl_txh->stride = 4*compositor->vp_width;
-			compositor->hybgl_txh->pixelformat = GF_PIXEL_RGBA;
-			compositor->hybgl_txh->transparent = 1;
-			compositor->hybgl_txh->flags = GF_SR_TEXTURE_PRIVATE_MEDIA | GF_SR_TEXTURE_NO_GL_FLIP;
+		compositor->hybgl_txh->width = compositor->vp_width;
+		compositor->hybgl_txh->height = compositor->vp_height;
+		compositor->hybgl_txh->stride = 4*compositor->vp_width;
+		compositor->hybgl_txh->pixelformat = GF_PIXEL_RGBA;
+		compositor->hybgl_txh->transparent = GF_TRUE;
+		compositor->hybgl_txh->flags = GF_SR_TEXTURE_PRIVATE_MEDIA | GF_SR_TEXTURE_NO_GL_FLIP;
 
-			memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
-			gf_sc_texture_allocate(compositor->hybgl_txh);
-			gf_sc_texture_set_data(compositor->hybgl_txh);
+		memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
+		gf_sc_texture_allocate(compositor->hybgl_txh);
+		gf_sc_texture_set_data(compositor->hybgl_txh);
 
-			if (!compositor->hybgl_mesh)
-				compositor->hybgl_mesh = new_mesh();
+		if (!compositor->hybgl_mesh)
+			compositor->hybgl_mesh = new_mesh();
 
-			if (!compositor->hybgl_mesh_background)
-				compositor->hybgl_mesh_background = new_mesh();
+		if (!compositor->hybgl_mesh_background)
+			compositor->hybgl_mesh_background = new_mesh();
 
-			size.x = INT2FIX(compositor->vp_width);
-			size.y = INT2FIX(compositor->vp_height);
-			mesh_new_rectangle(compositor->hybgl_mesh, size, NULL, 1);
-			mesh_new_rectangle(compositor->hybgl_mesh_background, size, NULL, 0);
-		}
-		if (!compositor->hybgl_txh->data) return GF_IO_ERR;
-
-		if (visual->compositor->traverse_state->immediate_draw)
-			memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
-
-		e = compositor->rasterizer->surface_attach_to_buffer(visual->raster_surface, compositor->hybgl_txh->data,
-		 compositor->hybgl_txh->width,
-		 compositor->hybgl_txh->height,
-		 0,
-		 compositor->hybgl_txh->width * 4,
-		 (GF_PixelFormat) GF_PIXEL_RGBA);
-		if (e) return e;
-		e = compositor_2d_setup_opengl(visual);
-		if (e) return e;
-		visual->ClearSurface = compositor_2d_hybgl_clear_surface;
-		visual->DrawBitmap = compositor_2d_hybgl_draw_bitmap;
-		return GF_OK;
+		size.x = INT2FIX(compositor->vp_width);
+		size.y = INT2FIX(compositor->vp_height);
+		mesh_new_rectangle(compositor->hybgl_mesh, size, NULL, GF_TRUE);
+		mesh_new_rectangle(compositor->hybgl_mesh_background, size, NULL, GF_FALSE);
 	}
+	if (!compositor->hybgl_txh->data) return GF_IO_ERR;
+
+	if (visual->compositor->traverse_state->immediate_draw)
+		memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
+
+	e = compositor->rasterizer->surface_attach_to_buffer(visual->raster_surface, compositor->hybgl_txh->data,
+	 compositor->hybgl_txh->width,
+	 compositor->hybgl_txh->height,
+	 0,
+	 compositor->hybgl_txh->width * 4,
+	 (GF_PixelFormat) GF_PIXEL_RGBA);
+	if (e) return e;
+	e = compositor_2d_setup_opengl(visual);
+	if (e) return e;
+	visual->ClearSurface = compositor_2d_hybgl_clear_surface;
+	visual->DrawBitmap = compositor_2d_hybgl_draw_bitmap;
+	return GF_OK;
+}
 #endif
 
-	compositor->hw_locked = 0;
+static GF_Err c2d_get_video_access_normal(GF_VisualManager *visual)
+{
+	GF_Err e;
+	GF_Compositor *compositor = visual->compositor;
+
+	compositor->hw_locked = GF_FALSE;
 	e = GF_IO_ERR;
 
 	/*try from video memory handle (WIN32) if supported*/
@@ -485,15 +482,15 @@
 	 && compositor->rasterizer->surface_attach_to_device
 	 && compositor->video_out->LockOSContext
 	 ) {
-		compositor->hw_context = compositor->video_out->LockOSContext(compositor->video_out, 1);
+		compositor->hw_context = compositor->video_out->LockOSContext(compositor->video_out, GF_TRUE);
 		if (compositor->hw_context) {
 			e = compositor->rasterizer->surface_attach_to_device(visual->raster_surface, compositor->hw_context, compositor->vp_width, compositor->vp_height);
 			if (!e) {
-				visual->is_attached = 1;
+				visual->is_attached = GF_TRUE;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Video surface handle attached to raster\n"));
 				return GF_OK;
 			}
-			compositor->video_out->LockOSContext(compositor->video_out, 0);
+			compositor->video_out->LockOSContext(compositor->video_out, GF_FALSE);
 			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Cannot attach video surface handle to raster: %s\n", gf_error_to_string(e) ));
 		}
 	}
@@ -501,7 +498,7 @@
 	if (compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_LINE_BLIT) {
 		e = compositor->rasterizer->surface_attach_to_callbacks(visual->raster_surface, &compositor->raster_callbacks, compositor->vp_width, compositor->vp_height);
 		if (!e) {
-			visual->is_attached = 1;
+			visual->is_attached = GF_TRUE;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Video surface callbacks attached to raster\n"));
 			return GF_OK;
 		}
@@ -510,9 +507,9 @@
 
 	e = GF_NOT_SUPPORTED;
 
-	e = compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, 1);
+	e = compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, GF_TRUE);
 	if (e==GF_OK) {
-		compositor->hw_locked = 1;
+		compositor->hw_locked = GF_TRUE;
 
 		e = compositor->rasterizer->surface_attach_to_buffer(visual->raster_surface, compositor->hw_surface.video_buffer,
 		 compositor->hw_surface.width,
@@ -521,26 +518,108 @@
 		 compositor->hw_surface.pitch_y,
 		 (GF_PixelFormat) compositor->hw_surface.pixel_format);
 		if (!e) {
-			visual->is_attached = 1;
+			visual->is_attached = GF_TRUE;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Video surface memory attached to raster - w=%d h=%d pitch_x=%d pitch_y=%d\n", compositor->hw_surface.width, compositor->hw_surface.height, compositor->hw_surface.pitch_x, compositor->hw_surface.pitch_y));
 			return GF_OK;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Cannot attach video surface memory to raster: %s\n", gf_error_to_string(e) ));
-		compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, 0);
+		compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, GF_FALSE);
 	}
-	compositor->hw_locked = 0;
-	visual->is_attached = 0;
+	compositor->hw_locked = GF_FALSE;
+	visual->is_attached = GF_FALSE;
 	/*if using BlitTexture, return OK to still be able to blit images*/
 	if (compositor->video_out->BlitTexture) e = GF_OK;
 	return e;
 }
 
+GF_Err compositor_2d_get_video_access(GF_VisualManager *visual)
+{
+	if (!visual->raster_surface) return GF_BAD_PARAM;
+
+#ifdef OPENGL_RASTER
+	if (visual->compositor->opengl_raster && visual->compositor->rasterizer->surface_attach_to_callbacks) {
+		return c2d_video_access_opengl_raster(visual);
+	}
+#endif
+
+#ifndef GPAC_DISABLE_3D
+	if (visual->compositor->hybrid_opengl) {
+		return c2d_video_access_hybrid_opengl(visual);
+	}
+#endif
+	//do nothing until asked to really attach
+	return GF_OK;
+}
+
+Bool compositor_2d_check_attached(GF_VisualManager *visual)
+{
+	if (!visual->is_attached) {
+		c2d_get_video_access_normal(visual);
+	}
+
+	return visual->is_attached;
+}
+
+void compositor_2d_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool offscreen_clear)
+{
+	//visual not attached on main (direct video) visual, use texture bliting
+	if (!visual->is_attached && visual->compositor->video_out->Blit && (visual->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB)) {
+		char data[12];
+		GF_Err e;
+		GF_VideoSurface video_src;
+		GF_Window src_wnd, dst_wnd;
+
+		if (!BackColor && !visual->offscreen) {
+			if (!visual->compositor->user || !(visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
+				BackColor = visual->compositor->back_color;
+			}
+		}
+
+		data[0] = data[3] = data[6] = data[9] = GF_COL_R(BackColor);
+		data[1] = data[4] = data[7] = data[10] = GF_COL_G(BackColor);
+		data[2] = data[5] = data[8] = data[11] = GF_COL_B(BackColor);
+
+		memset(&video_src, 0, sizeof(GF_VideoSurface));
+		video_src.height = 2;
+		video_src.width = 2;
+		video_src.pitch_x = 0;
+		video_src.pitch_y = 6;
+		video_src.pixel_format = GF_PIXEL_RGB_24;
+		video_src.video_buffer = data;
+
+		src_wnd.x = src_wnd.y = 0;
+		src_wnd.w = src_wnd.h = 1;
+		if (rc) {
+			if (visual->center_coords) {
+				dst_wnd.x = rc->x + visual->width/2;
+				dst_wnd.y = visual->height/2 - rc->y;
+			} else {
+				dst_wnd.x = rc->x;
+				dst_wnd.y = rc->y - visual->height/2;
+			}
+			dst_wnd.w = rc->width;
+			dst_wnd.h = rc->height;
+		} else {
+			dst_wnd.x = dst_wnd.y = 0;
+			dst_wnd.w = visual->width;
+			dst_wnd.h = visual->height;
+		}
+
+		e = visual->compositor->video_out->Blit(visual->compositor->video_out, &video_src, &src_wnd, &dst_wnd, 0);
+		if (e==GF_OK) return;
+	}
+
+	visual_2d_clear_surface(visual, rc, BackColor, offscreen_clear);
+}
+
+
+
 void compositor_2d_release_video_access(GF_VisualManager *visual)
 {
 	GF_Compositor *compositor = visual->compositor;
 	if (visual->is_attached) {
 		compositor->rasterizer->surface_detach(visual->raster_surface);
-		visual->is_attached = 0;
+		visual->is_attached = GF_FALSE;
 	}
 
 #ifndef GPAC_DISABLE_3D
@@ -551,11 +630,11 @@
 #endif //GPAC_DISABLE_3D
 
 	if (compositor->hw_context) {
-		compositor->video_out->LockOSContext(compositor->video_out, 0);
+		compositor->video_out->LockOSContext(compositor->video_out, GF_FALSE);
 		compositor->hw_context = NULL;
 	} else if (compositor->hw_locked) {
-		compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, 0);
-		compositor->hw_locked = 0;
+		compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, GF_FALSE);
+		compositor->hw_locked = GF_FALSE;
 	}
 }
 
@@ -601,7 +680,7 @@
 	h_scale = final.height / txh->height;
 
 	if ((w_scale != FIX_ONE) || (h_scale!=FIX_ONE)) {
-		if (has_scale) *has_scale = 1;
+		if (has_scale) *has_scale = GF_TRUE;
 	}
 
 	if (visual->offscreen) {
@@ -629,12 +708,12 @@
 	if (clipped_final.x<0) {
 		clipped_final.width += clipped_final.x;
 		clipped_final.x = 0;
-		if (clipped_final.width <= 0) return 0;
+		if (clipped_final.width <= 0) return GF_FALSE;
 	}
 	if (clipped_final.y<0) {
 		clipped_final.height += clipped_final.y;
 		clipped_final.y = 0;
-		if (clipped_final.height <= 0) return 0;
+		if (clipped_final.height <= 0) return GF_FALSE;
 	}
 	if (clipped_final.x + clipped_final.width > (s32) output_width) {
 		clipped_final.width = output_width - clipped_final.x;
@@ -646,7 +725,7 @@
 	}
 	/*needed in direct drawing since clipping is not performed*/
 	if (clipped_final.width<=0 || clipped_final.height <=0)
-		return 0;
+		return GF_FALSE;
 
 	if (clipped_final.width-1>= FIX2INT(final.width) ) clipped_final.width = FIX2INT(final.width);
 	if (clipped_final.height-1>= FIX2INT(final.height) ) clipped_final.height = FIX2INT(final.height);
@@ -657,7 +736,7 @@
 	dst->w = (u32) clipped_final.width;
 	dst->h = (u32) clipped_final.height;
 
-	if (!dst->w || !dst->h) return 0;
+	if (!dst->w || !dst->h) return GF_FALSE;
 
 #ifdef GPAC_FIXED_POINT
 #define ROUND_FIX(_v)	\
@@ -678,38 +757,45 @@
 	if (ABS(tmp) > FIX_EPSILON) use_blit = 0;
 #endif
 
-	use_blit = 1;
-	/*compute SRC window*/
-	tmp = gf_divfix(INT2FIX(clipped_final.x) - final.x, w_scale);
-	if (tmp<0) tmp=0;
-	CEILING(src->x);
+	use_blit = GF_TRUE;
+
+	if (txh->data && !txh->size && (txh->width==2) && (txh->height==2) ) {
+		src->x = src->y = 0;
+		src->w = 1;
+		src->h = 1;
+	} else {
+		/*compute SRC window*/
+		tmp = gf_divfix(INT2FIX(clipped_final.x) - final.x, w_scale);
+		if (tmp<0) tmp=0;
+		CEILING(src->x);
 
-	tmp = gf_divfix(INT2FIX(clipped_final.y) - final.y, h_scale);
-	if (tmp<0) tmp=0;
-	CEILING(src->y);
+		tmp = gf_divfix(INT2FIX(clipped_final.y) - final.y, h_scale);
+		if (tmp<0) tmp=0;
+		CEILING(src->y);
 
-	tmp = gf_divfix(INT2FIX(clip->width), w_scale);
-	ROUND_FIX(src->w);
+		tmp = gf_divfix(INT2FIX(clip->width), w_scale);
+		ROUND_FIX(src->w);
 
-	tmp = gf_divfix(INT2FIX(clip->height), h_scale);
-	ROUND_FIX(src->h);
+		tmp = gf_divfix(INT2FIX(clip->height), h_scale);
+		ROUND_FIX(src->h);
 
-#undef ROUND_FIX
 
-	if (src->w>txh->width) src->w=txh->width;
-	if (src->h>txh->height) src->h=txh->height;
+		if (src->w>txh->width) src->w=txh->width;
+		if (src->h>txh->height) src->h=txh->height;
 
-	if (!src->w || !src->h) return GF_FALSE;
+		if (!src->w || !src->h) return GF_FALSE;
 
-	/*make sure we lie in src bounds*/
-	if (src->x + src->w>txh->width) src->w = txh->width - src->x;
-	if (src->y + src->h>txh->height) src->h = txh->height - src->y;
+		/*make sure we lie in src bounds*/
+		if (src->x + src->w>txh->width) src->w = txh->width - src->x;
+		if (src->y + src->h>txh->height) src->h = txh->height - src->y;
+	}
+#undef ROUND_FIX
 
 	if (disable_blit) *disable_blit = use_blit ? GF_FALSE : GF_TRUE;
 	return GF_TRUE;
 }
 
-static Bool compositor_2d_draw_bitmap_ex(GF_VisualManager *visual, GF_TextureHandler *txh, DrawableContext *ctx, GF_IRect *clip, GF_Rect *unclip, u8 alpha, GF_ColorKey *col_key, GF_TraverseState *tr_state, Bool force_soft_blt)
+static Bool compositor_2d_draw_bitmap_ex(GF_VisualManager *visual, GF_TextureHandler *txh, DrawableContext *ctx, GF_IRect *clip, GF_Rect *unclip, u8 alpha, GF_TraverseState *tr_state, Bool force_soft_blt)
 {
 	GF_VideoSurface video_src;
 	GF_Err e;
@@ -761,8 +847,12 @@
 		case GF_PIXEL_RGBD:
 //		case GF_PIXEL_RGB_555:
 //		case GF_PIXEL_RGB_565:
-			if (hw_caps & GF_VIDEO_HW_HAS_RGB)
+			if ((alpha==0xFF) && (hw_caps & GF_VIDEO_HW_HAS_RGB)) {
+				use_soft_stretch = GF_FALSE;
+			}
+			else if ((alpha!=0xFF) && (hw_caps & GF_VIDEO_HW_HAS_RGBA)) {
 				use_soft_stretch = GF_FALSE;
+			}
 			break;
 		case GF_PIXEL_ARGB:
 		case GF_PIXEL_RGBA:
@@ -786,7 +876,7 @@
 		}
 		/*disable based on settings*/
 		if (!visual->compositor->enable_yuv_hw
-		 || (ctx->col_mat || (alpha!=0xFF) || !visual->compositor->video_out->Blit)
+		 || (ctx->col_mat || !visual->compositor->video_out->Blit)
 		 ) {
 			use_soft_stretch = GF_TRUE;
 			overlay_type = 0;
@@ -796,7 +886,7 @@
 		}
 
 		/*disable HW color keying - not compatible with MPEG-4 MaterialKey*/
-		if (col_key) {
+		if (tr_state->col_key) {
 			use_soft_stretch = GF_TRUE;
 			overlay_type = 0;
 		}
@@ -813,8 +903,8 @@
 			}
 			/*OK we can overlay this video - if full display, don't flush*/
 			if (overlay_type==1) {
-				if (dst_wnd.w==visual->compositor->display_width) flush_video = 0;
-				else if (dst_wnd.h==visual->compositor->display_height) flush_video = 0;
+				if (dst_wnd.w==visual->compositor->display_width) flush_video = GF_FALSE;
+				else if (dst_wnd.h==visual->compositor->display_height) flush_video = GF_FALSE;
 				else flush_video = visual->has_modif;
 			}
 			/*if no color keying, we cannot queue the overlay*/
@@ -842,6 +932,7 @@
 		video_src.u_ptr = (char *) txh->pU;
 		video_src.v_ptr = (char *) txh->pV;
 	}
+	video_src.global_alpha = alpha;
 
 	//overlay queing
 	if (overlay_type==2) {
@@ -871,7 +962,7 @@
 
 		o_rc.width = dst_wnd.w;
 		o_rc.height = dst_wnd.h;
-		visual->ClearSurface(visual, &o_rc, visual->compositor->video_out->overlay_color_key, 0);
+		visual->ClearSurface(visual, &o_rc, visual->compositor->video_out->overlay_color_key, GF_FALSE);
 		visual->has_overlays = GF_TRUE;
 		/*mark drawable as overlay*/
 		ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
@@ -960,7 +1051,7 @@
 		e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_TRUE);
 		if (!e) {
 			u32 push_time = gf_sys_clock();
-			gf_stretch_bits(&backbuffer, &video_src, &dst_wnd, &src_wnd, alpha, 0, col_key, ctx->col_mat);
+			gf_stretch_bits(&backbuffer, &video_src, &dst_wnd, &src_wnd, alpha, GF_FALSE, tr_state->col_key, ctx->col_mat);
 #ifndef GPAC_DISABLE_LOG
 			log_blit_times(txh, push_time);
 #endif
@@ -985,32 +1076,32 @@
 
 
 
-Bool compositor_2d_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key)
+Bool compositor_2d_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx)
 {
 	u8 alpha = 0xFF;
 
-	if (!ctx->aspect.fill_texture) return 1;
-	/*check if texture is ready*/
-	if (!ctx->aspect.fill_texture->data) return 0;
-	if (ctx->transform.m[0]<0) return 0;
+	if (!ctx->aspect.fill_texture) return GF_TRUE;
+	/*check if texture is ready - if not pretend we drew it*/
+	if (!ctx->aspect.fill_texture->data) return GF_TRUE;
+	if (ctx->transform.m[0]<0) return GF_FALSE;
 	/*check if the <0 value is due to a flip in he scene description or
 	due to bifs<->svg... context switching*/
 	if (ctx->transform.m[4]<0) {
-		if (!(ctx->flags & CTX_FLIPED_COORDS)) return 0;
+		if (!(ctx->flags & CTX_FLIPED_COORDS)) return GF_FALSE;
 	} else {
-		if (ctx->flags & CTX_FLIPED_COORDS) return 0;
+		if (ctx->flags & CTX_FLIPED_COORDS) return GF_FALSE;
 	}
-	if (ctx->transform.m[1] || ctx->transform.m[3]) return 0;
+	if (ctx->transform.m[1] || ctx->transform.m[3]) return GF_FALSE;
 #ifndef GPAC_DISABLE_VRML
 	if ((ctx->flags & CTX_HAS_APPEARANCE) && ctx->appear && ((M_Appearance*)ctx->appear)->textureTransform)
-		return 0;
+		return GF_FALSE;
 #endif
 
 	alpha = GF_COL_A(ctx->aspect.fill_color);
 	/*THIS IS A HACK, will not work when setting filled=0, transparency and XLineProps*/
 	if (!alpha) alpha = GF_COL_A(ctx->aspect.line_color);
 
-	if (!alpha) return 1;
+	if (!alpha) return GF_TRUE;
 
 	switch (ctx->aspect.fill_texture->pixelformat) {
 	case GF_PIXEL_ALPHAGREY:
@@ -1051,7 +1142,7 @@
 	/*direct drawing, no clippers */
 	if (tr_state->immediate_draw) {
 		if (visual->compositor->video_out->BlitTexture) {
-			if (! visual->compositor->video_out->BlitTexture(visual->compositor->video_out, ctx->aspect.fill_texture, &ctx->transform, &ctx->bi->clip, alpha, col_key
+			if (! visual->compositor->video_out->BlitTexture(visual->compositor->video_out, ctx->aspect.fill_texture, &ctx->transform, &ctx->bi->clip, alpha, tr_state->col_key
 #ifdef GF_SR_USE_DEPTH
 			 , ctx->depth_offset, ctx->depth_gain
 #else
@@ -1060,7 +1151,7 @@
 			 ))
 				return GF_FALSE;
 		} else {
-			if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &ctx->bi->clip, &ctx->bi->unclip, alpha, col_key, tr_state, 0))
+			if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &ctx->bi->clip, &ctx->bi->unclip, alpha, tr_state, GF_FALSE))
 				return GF_FALSE;
 		}
 	}
@@ -1077,29 +1168,29 @@
 			gf_irect_intersect(&clip, &tr_state->visual->to_redraw.list[i].rect);
 			if (clip.width && clip.height) {
 				if (visual->compositor->video_out->BlitTexture) {
-					if (!visual->compositor->video_out->BlitTexture(visual->compositor->video_out, ctx->aspect.fill_texture, &ctx->transform, &ctx->bi->clip, alpha, col_key
+					if (!visual->compositor->video_out->BlitTexture(visual->compositor->video_out, ctx->aspect.fill_texture, &ctx->transform, &ctx->bi->clip, alpha, tr_state->col_key
 #ifdef GF_SR_USE_DEPTH
 					 , ctx->depth_offset, ctx->depth_gain
 #else
 					 , 0, 0
 #endif
 					 ))
-						return 0;
-				} else if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &clip, &ctx->bi->unclip, alpha, col_key, tr_state, 0)) {
-					return 0;
+						return GF_FALSE;
+				} else if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &clip, &ctx->bi->unclip, alpha, tr_state, GF_FALSE)) {
+					return GF_FALSE;
 				}
 			}
 		}
 	}
 	ctx->aspect.fill_texture->flags |= GF_SR_TEXTURE_USED;
-	return 1;
+	return GF_TRUE;
 }
 
 
 GF_Err compositor_2d_set_aspect_ratio(GF_Compositor *compositor)
 {
 	u32 old_vp_width, old_vp_height;
-	Bool changed = 0;
+	Bool changed = GF_FALSE;
 	Double ratio;
 	GF_Event evt;
 	GF_Err e;
@@ -1114,7 +1205,7 @@
 	old_vp_height = compositor->vp_height;
 
 	/*force complete clean*/
-	compositor->traverse_state->invalidate_all = 1;
+	compositor->traverse_state->invalidate_all = GF_TRUE;
 
 	if (!compositor->has_size_info && !(compositor->override_size_flags & 2) ) {
 		compositor->output_width = compositor->display_width;
@@ -1181,10 +1272,6 @@
 
 			scaleX = scaleY = FIX_ONE;
 		} else {
-			/*
-						compositor->output_width = compositor->vp_width;
-						compositor->output_height = compositor->vp_height;
-			*/
 			compositor->output_width = compositor->display_width;
 			compositor->output_height = compositor->display_height;
 			compositor->vp_width = compositor->display_width;
@@ -1201,30 +1288,30 @@
 	evt.setup.height = compositor->vp_height;
 	evt.setup.opengl_mode = 0;
 	/*copy over settings*/
-	evt.setup.system_memory = compositor->video_memory ? 0 : 1;
-	if (compositor->request_video_memory) evt.setup.system_memory = 0;
-	compositor->request_video_memory = 0;
+	evt.setup.system_memory = compositor->video_memory ? GF_FALSE : GF_TRUE;
+	if (compositor->request_video_memory) evt.setup.system_memory = GF_FALSE;
+	compositor->request_video_memory = GF_FALSE;
 
 #ifdef OPENGL_RASTER
 	if (compositor->opengl_raster) {
 		evt.setup.opengl_mode = 1;
-		evt.setup.system_memory = 0;
-		evt.setup.back_buffer = 1;
+		evt.setup.system_memory = GF_FALSE;
+		evt.setup.back_buffer = GF_TRUE;
 	}
 #endif
 
 #ifndef GPAC_DISABLE_3D
 	if (compositor->hybrid_opengl) {
 		evt.setup.opengl_mode = 1;
-		evt.setup.system_memory = 0;
-		evt.setup.back_buffer = 1;
+		evt.setup.system_memory = GF_FALSE;
+		evt.setup.back_buffer = GF_TRUE;
 	}
 #endif
 
-	if (compositor->was_system_memory != evt.setup.system_memory) changed = 1;
-	else if (old_vp_width != compositor->vp_width) changed=1;
-	else if (old_vp_height != compositor->vp_height) changed=1;
-	else if (compositor->is_opengl != evt.setup.opengl_mode) changed=1;
+	if (compositor->was_system_memory != evt.setup.system_memory) changed = GF_TRUE;
+	else if (old_vp_width != compositor->vp_width) changed = GF_TRUE;
+	else if (old_vp_height != compositor->vp_height) changed = GF_TRUE;
+	else if (compositor->is_opengl != evt.setup.opengl_mode) changed = GF_TRUE;
 
 
 	if (changed) {
@@ -1236,7 +1323,7 @@
 		if (e) {
 #ifndef GPAC_DISABLE_3D
 			if (!compositor->hybrid_opengl) {
-				compositor->hybrid_opengl=1;
+				compositor->hybrid_opengl = GF_TRUE;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Failed to configure 2D output (%s) - retrying in OpenGL mode\n", gf_error_to_string(e) ));
 				return compositor_2d_set_aspect_ratio(compositor);
 			}
@@ -1260,6 +1347,7 @@
 		compositor->traverse_state->vp_size.x = INT2FIX(compositor->output_width);
 		compositor->traverse_state->vp_size.y = INT2FIX(compositor->output_height);
 	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Reconfigured display size %d x %d done\n", evt.setup.width, evt.setup.height));
 
 	/*set scale factor*/
 	compositor_set_ar_scale(compositor, scaleX, scaleY);
@@ -1323,7 +1411,7 @@
 	Fixed ratio;
 	Fixed old_tx, old_ty, old_z;
 
-	gf_sc_lock(compositor, 1);
+	gf_sc_lock(compositor, GF_TRUE);
 	old_tx = tx;
 	old_ty = ty;
 	old_z = compositor->zoom;
@@ -1337,7 +1425,7 @@
 		compositor->trans_x = gf_mulfix(compositor->trans_x, ratio);
 		compositor->trans_y = gf_mulfix(compositor->trans_y, ratio);
 		compositor->zoom = zoom;
-		compositor->zoom_changed = 1;
+		compositor->zoom_changed = GF_TRUE;
 
 		/*recenter visual*/
 		if (!compositor->visual->center_coords) {
@@ -1377,12 +1465,12 @@
 
 
 	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
-	compositor->traverse_state->invalidate_all = 1;
+	compositor->traverse_state->invalidate_all = GF_TRUE;
 
 	/*for zoom&pan, send the event right away. For resize/scroll, wait for the frame to be drawn before sending it
 	otherwise viewport info of SVG nodes won't be correct*/
-	if (!is_resize) compositor_send_resize_event(compositor, NULL, old_z, old_tx, old_ty, 0);
-	gf_sc_lock(compositor, 0);
+	if (!is_resize) compositor_send_resize_event(compositor, NULL, old_z, old_tx, old_ty, GF_FALSE);
+	gf_sc_lock(compositor, GF_FALSE);
 }
 
 
@@ -1434,7 +1522,7 @@
 	}
 	if (for_layer) {
 		tr_state->layer_clipper = clip;
-		tr_state->has_layer_clip = 1;
+		tr_state->has_layer_clip = GF_TRUE;
 #ifndef GPAC_DISABLE_3D
 		if (tr_state->visual->type_3d) {
 			gf_mx_copy(tr_state->layer_matrix, tr_state->model_matrix);
@@ -1454,7 +1542,7 @@
 
 			gf_mx2d_apply_rect(&tr_state->transform, &tr_state->clipper);
 
-		tr_state->has_clip = 1;
+		tr_state->has_clip = GF_TRUE;
 	}
 	return clip;
 }
@@ -1466,7 +1554,7 @@
 	u32 res = 0;
 	GF_OverlayStack *ol;
 	GF_Compositor *compositor = visual->compositor;
-	if (compositor->visual != visual) return 0;
+	if (compositor->visual != visual) return GF_FALSE;
 
 	ol = visual->overlays;
 	while (ol) {
@@ -1499,7 +1587,7 @@
 		ra_union_rect(&ol->ra, &clip);
 		ol = ol->next;
 	}
-	return res ? 1 : 0;
+	return res ? GF_TRUE : GF_FALSE;
 }
 
 void visual_2d_flush_overlay_areas(GF_VisualManager *visual, GF_TraverseState *tr_state)
@@ -1514,7 +1602,7 @@
 	ol = visual->overlays;
 	while (ol) {
 		u32 i;
-		Bool needs_draw = 1;
+		Bool needs_draw = GF_TRUE;
 		GF_IRect the_clip, vid_clip;
 
 		ra_refresh(&ol->ra);
@@ -1533,9 +1621,9 @@
 						if ((ctx->flags & CTX_IS_TRANSPARENT) || !gf_irect_inside(&prev_clip, &the_clip)) {
 							vid_clip = ol->ra.list[i].rect;
 							gf_irect_intersect(&vid_clip, &ol->ctx->bi->clip);
-							compositor_2d_draw_bitmap_ex(visual, ol->ctx->aspect.fill_texture, ol->ctx, &vid_clip, &ol->ctx->bi->unclip, 0xFF, NULL, tr_state, 1);
+							compositor_2d_draw_bitmap_ex(visual, ol->ctx->aspect.fill_texture, ol->ctx, &vid_clip, &ol->ctx->bi->unclip, 0xFF, tr_state, GF_TRUE);
 						}
-						needs_draw = 0;
+						needs_draw = GF_FALSE;
 					}
 					gf_irect_intersect(&ctx->bi->clip, &the_clip);
 					tr_state->ctx = ctx;

v0.5.2.tar.gz/src/compositor/compositor_3d.c -> v0.6.1.tar.gz/src/compositor/compositor_3d.c Changed

@@ -105,12 +105,12 @@
 	evt.type = GF_EVENT_VIDEO_SETUP;
 	evt.setup.width = compositor->display_width;
 	evt.setup.height = compositor->display_height;
-	evt.setup.back_buffer = 1;
+	evt.setup.back_buffer = GF_TRUE;
 #ifdef GPAC_USE_TINYGL
 	evt.setup.opengl_mode = 0;
 #else
 	evt.setup.opengl_mode = 1;
-	compositor->is_opengl = 1;
+	compositor->is_opengl = GF_TRUE;
 #endif
 
 	if (compositor->video_out->ProcessEvent(compositor->video_out, &evt)<0) {
@@ -171,10 +171,10 @@
 {
 	GF_Camera *cam = compositor_3d_get_camera(compositor);
 	if (cam) {
-		camera_reset_viewpoint(cam, 1);
+		camera_reset_viewpoint(cam, GF_TRUE);
 		gf_sc_invalidate(compositor, NULL);
 	}
-	if (compositor->active_layer) gf_node_dirty_set(compositor->active_layer, 0, 1);
+	if (compositor->active_layer) gf_node_dirty_set(compositor->active_layer, 0, GF_TRUE);
 }
 
 void compositor_3d_draw_bitmap(Drawable *stack, DrawAspect2D *asp, GF_TraverseState *tr_state, Fixed width, Fixed height, Fixed bmp_scale_x, Fixed bmp_scale_y)
@@ -201,15 +201,15 @@
 	/*THIS IS A HACK, will not work when setting filled=0, transparency and XLineProps*/
 	if (!alpha) alpha = GF_COL_A(asp->line_color);
 
-	visual_3d_set_state(tr_state->visual, V3D_STATE_LIGHT, 0);
-	visual_3d_enable_antialias(tr_state->visual, 0);
+	visual_3d_set_state(tr_state->visual, V3D_STATE_LIGHT, GF_FALSE);
+	visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
 	if (alpha && (alpha != 0xFF)) {
 		visual_3d_set_material_2d_argb(tr_state->visual, GF_COL_ARGB(alpha, 0xFF, 0xFF, 0xFF));
 		gf_sc_texture_set_blend_mode(txh, TX_MODULATE);
 	} else if (gf_sc_texture_is_transparent(txh)) {
 		gf_sc_texture_set_blend_mode(txh, TX_REPLACE);
 	} else {
-		visual_3d_set_state(tr_state->visual, V3D_STATE_BLEND, 0);
+		visual_3d_set_state(tr_state->visual, V3D_STATE_BLEND, GF_FALSE);
 	}
 	/*ignore texture transform for bitmap*/
 	tr_state->mesh_num_textures = gf_sc_texture_enable(txh, NULL);
@@ -222,7 +222,7 @@
 				size.y = height;
 
 				stack->mesh = new_mesh();
-				mesh_new_rectangle(stack->mesh, size, NULL, 0);
+				mesh_new_rectangle(stack->mesh, size, NULL, GF_FALSE);
 			}
 		}
 		if (stack->mesh) {

v0.5.2.tar.gz/src/compositor/compositor_node_init.c -> v0.6.1.tar.gz/src/compositor/compositor_node_init.c Changed

@@ -32,7 +32,7 @@
 
 void compositor_init_afx_node(GF_Compositor *compositor, GF_Node *node, MFURL *url)
 {
-	GF_MediaObject *mo = gf_mo_register(node, url, 0, 0);
+	GF_MediaObject *mo = gf_mo_register(node, url, GF_FALSE, GF_FALSE);
 	if (!mo) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] AFX Decoder not found for node %s - node may not be completely/correctly rendered\n", gf_node_get_class_name(node)));
 	}
@@ -532,7 +532,7 @@
 		compositor_init_svg_video(compositor, node);
 		break;
 	case TAG_SVG_audio:
-		compositor_init_svg_audio(compositor, node, 0);
+		compositor_init_svg_audio(compositor, node, GF_FALSE);
 		break;
 
 	/*SVG font support - note that we initialize the font when parsing the font-face element, not the font element*/
@@ -647,7 +647,7 @@
 	default:
 		/*for all nodes, invalidate parent graph - note we do that for sensors as well to force recomputing
 		sensor list cached at grouping node level*/
-		gf_node_dirty_set(byObj, 0, 1);
+		gf_node_dirty_set(byObj, 0, GF_TRUE);
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	}

v0.5.2.tar.gz/src/compositor/drawable.c -> v0.6.1.tar.gz/src/compositor/drawable.c Changed

v0.5.2.tar.gz/src/compositor/events.c -> v0.6.1.tar.gz/src/compositor/events.c Changed

@@ -45,26 +45,26 @@
 
 static Bool exec_text_selection(GF_Compositor *compositor, GF_Event *event)
 {
-	if (event->type>GF_EVENT_MOUSEMOVE) return 0;
+	if (event->type>GF_EVENT_MOUSEMOVE) return GF_FALSE;
 
 	if (compositor->edited_text)
-		return 0;
+		return GF_FALSE;
 	if (compositor->text_selection )
-		return compositor->hit_text ? 1 : 0;
+		return compositor->hit_text ? GF_TRUE : GF_FALSE;
 	switch (event->type) {
 	case GF_EVENT_MOUSEMOVE:
 		if (compositor->text_selection && compositor->hit_text)
-			return 1;
+			return GF_TRUE;
 		break;
 	case GF_EVENT_MOUSEDOWN:
 		if (compositor->hit_text) {
 			compositor->text_selection = compositor->hit_text;
 			/*return 0: the event may be consumed by the tree*/
-			return 0;
+			return GF_FALSE;
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static void flush_text_node_edit(GF_Compositor *compositor, Bool final_flush)
@@ -89,7 +89,7 @@
 	}
 	if (compositor->sel_buffer_len) {
 		const u16 *lptr;
-		txt = gf_malloc(sizeof(char)*2*compositor->sel_buffer_len);
+		txt = (char*)gf_malloc(sizeof(char)*2*compositor->sel_buffer_len);
 		lptr = compositor->sel_buffer;
 		len = gf_utf8_wcstombs(txt, 2*compositor->sel_buffer_len, &lptr);
 		txt[len] = 0;
@@ -98,9 +98,9 @@
 	}
 
 	signal = final_flush;
-	if ((compositor->focus_text_type==4) && (final_flush==1)) signal = 0;
+	if ((compositor->focus_text_type==4) && (final_flush==1)) signal = GF_FALSE;
 
-	gf_node_dirty_set(compositor->focus_node, 0, 1);
+	gf_node_dirty_set(compositor->focus_node, 0, GF_TRUE);
 	//(compositor->focus_text_type==2));
 	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 	/*notify compositor that text has been edited, in order to update composite textures*/
@@ -141,24 +141,24 @@
 	len = strlen(text);
 	if (!len) return GF_OK;
 
-	gf_sc_lock(compositor, 1);
+	gf_sc_lock(compositor, GF_TRUE);
 
-	conv_buf = gf_malloc(sizeof(u16)*(len+1));
+	conv_buf = (u16*)gf_malloc(sizeof(u16)*(len+1));
 	len = gf_utf8_mbstowcs(conv_buf, len, &text);
 
 	compositor->sel_buffer_alloc += (u32) len;
 	if (compositor->sel_buffer_len == compositor->sel_buffer_alloc)
 		compositor->sel_buffer_alloc++;
 
-	compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
+	compositor->sel_buffer = (u16*)gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 	memmove(&compositor->sel_buffer[compositor->caret_pos+len], &compositor->sel_buffer[compositor->caret_pos], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos));
 	memcpy(&compositor->sel_buffer[compositor->caret_pos], conv_buf, sizeof(u16)*len);
 	gf_free(conv_buf);
 	compositor->sel_buffer_len += (u32) len;
 	compositor->caret_pos += (u32) len;
 	compositor->sel_buffer[compositor->sel_buffer_len]=0;
-	flush_text_node_edit(compositor, 0);
-	gf_sc_lock(compositor, 0);
+	flush_text_node_edit(compositor, GF_FALSE);
+	gf_sc_lock(compositor, GF_FALSE);
 
 	return GF_OK;
 }
@@ -169,12 +169,12 @@
 	s32 caret_pos;
 	Bool append;
 #ifndef GPAC_DISABLE_SVG
-	Bool delete_cr = 0;
+	Bool delete_cr = GF_FALSE;
 #endif
 
 	caret_pos = -1;
 
-	append = 0;
+	append = GF_FALSE;
 	switch (cmd_type) {
 	/*load last text chunk*/
 	case 0:
@@ -183,10 +183,10 @@
 	/*load prev text chunk*/
 	case 4:
 #ifndef GPAC_DISABLE_SVG
-		delete_cr = 1;
+		delete_cr = GF_TRUE;
 #endif
 	case 1:
-		if (compositor->dom_text_pos ==0) return 0;
+		if (compositor->dom_text_pos == 0) return GF_FALSE;
 		pos = compositor->dom_text_pos - 1;
 		break;
 	/*load next text chunk*/
@@ -196,7 +196,7 @@
 		break;
 	/*split text chunk/append new*/
 	case 3:
-		append=1;
+		append = GF_TRUE;
 		pos = compositor->dom_text_pos;
 		caret_pos = 0;
 		break;
@@ -218,7 +218,7 @@
 			compositor->dom_text_pos = pos;
 		} else {
 			compositor->dom_text_pos = prev_pos;
-			return 0;
+			return GF_FALSE;
 		}
 
 		if (compositor->picked_span_idx >=0) {
@@ -228,14 +228,14 @@
 		/*take care of loading empty text nodes*/
 		if (!mf->count) {
 			mf->count = 1;
-			mf->vals = gf_malloc(sizeof(char*));
+			mf->vals = (char**)gf_malloc(sizeof(char*));
 			mf->vals[0] = gf_strdup("");
 		}
 		if (!mf->vals[0]) mf->vals[0] = gf_strdup("");
 
 		if (!compositor->dom_text_pos || (compositor->dom_text_pos>mf->count)) {
 			compositor->dom_text_pos = prev_pos;
-			return 0;
+			return GF_FALSE;
 		}
 		res = &mf->vals[compositor->dom_text_pos-1];
 		if (compositor->picked_glyph_idx>=0) {
@@ -294,7 +294,7 @@
 							end = compositor->sel_buffer[compositor->caret_pos];
 							compositor->sel_buffer[compositor->caret_pos] = 0;
 							len = gf_utf8_wcslen(compositor->sel_buffer);
-							cur->textContent = gf_malloc(sizeof(char)*(len+1));
+							cur->textContent = (char*)gf_malloc(sizeof(char)*(len+1));
 							srcp = compositor->sel_buffer;
 							len = gf_utf8_wcstombs(cur->textContent, len, &srcp);
 							cur->textContent[len] = 0;
@@ -302,7 +302,7 @@
 
 							if (compositor->caret_pos+1<compositor->sel_buffer_len) {
 								len = gf_utf8_wcslen(compositor->sel_buffer + compositor->caret_pos + 1);
-								ntext->textContent = gf_malloc(sizeof(char)*(len+1));
+								ntext->textContent = (char*)gf_malloc(sizeof(char)*(len+1));
 								srcp = compositor->sel_buffer + compositor->caret_pos + 1;
 								len = gf_utf8_wcstombs(ntext->textContent, len, &srcp);
 								ntext->textContent[len] = 0;
@@ -325,12 +325,12 @@
 								GF_DOMText *n2 = (GF_DOMText *)child->next->node;
 
 								if (compositor->edited_text) {
-									flush_text_node_edit(compositor, 1);
+									flush_text_node_edit(compositor, GF_TRUE);
 								}
 								if (!n1->textContent) n1->textContent = gf_strdup("");
 								caret_pos = (u32) strlen(n1->textContent);
 								if (n2->textContent) {
-									n1->textContent = gf_realloc(n1->textContent, sizeof(char)*(strlen(n1->textContent)+strlen(n2->textContent)+1));
+									n1->textContent = (char*)gf_realloc(n1->textContent, sizeof(char)*(strlen(n1->textContent)+strlen(n2->textContent)+1));
 									strcat(n1->textContent, n2->textContent);
 								}
 								gf_node_list_del_child(&children, (GF_Node*)n2);
@@ -365,19 +365,19 @@
 
 			if (!res) {
 				compositor->dom_text_pos = prev_pos;
-				return 0;
+				return GF_FALSE;
 			}
 #endif
 		}
 
 	if (compositor->edited_text) {
-		flush_text_node_edit(compositor, 1);
+		flush_text_node_edit(compositor, GF_TRUE);
 	}
 
 	if (res && *res && strlen(*res) ) {
 		const char *src = *res;
 		compositor->sel_buffer_alloc = 2 + (u32) strlen(src);
-		compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
+		compositor->sel_buffer = (u16*)gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 
 		if (caret_pos>=0) {
 			size_t l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
@@ -396,21 +396,21 @@
 		compositor->sel_buffer[compositor->sel_buffer_len]=0;
 	} else {
 		compositor->sel_buffer_alloc = 2;
-		compositor->sel_buffer = gf_malloc(sizeof(u16)*2);
+		compositor->sel_buffer = (u16*)gf_malloc(sizeof(u16)*2);
 		compositor->sel_buffer[0] = GF_CARET_CHAR;
 		compositor->sel_buffer[1] = 0;
 		compositor->caret_pos = 0;
 		compositor->sel_buffer_len = 1;
 	}
 	compositor->edited_text = res;
-	compositor->text_edit_changed = 1;
-	flush_text_node_edit(compositor, 0);
-	return 1;
+	compositor->text_edit_changed = GF_TRUE;
+	flush_text_node_edit(compositor, GF_FALSE);
+	return GF_TRUE;
 }
 
 static void exec_text_input(GF_Compositor *compositor, GF_Event *event)
 {
-	Bool is_end = 0;
+	Bool is_end = GF_FALSE;
 
 	if (!event) {
 		load_text_node(compositor, 0);
@@ -441,7 +441,7 @@
 
 			if (compositor->sel_buffer_len + 1 == compositor->sel_buffer_alloc) {
 				compositor->sel_buffer_alloc += 10;
-				compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
+				compositor->sel_buffer = (u16*)gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 			}
 			memmove(&compositor->sel_buffer[compositor->caret_pos+1], &compositor->sel_buffer[compositor->caret_pos], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos));
 			compositor->sel_buffer[compositor->caret_pos] = unicode_char;
@@ -455,7 +455,7 @@
 		switch (event->key.key_code) {
 		/*end of edit mode*/
 		case GF_KEY_ESCAPE:
-			is_end = 1;
+			is_end = GF_TRUE;
 			break;
 		case GF_KEY_LEFT:
 			if (compositor->caret_pos) {
@@ -494,7 +494,7 @@
 			break;
 		case GF_KEY_TAB:
 			if (!load_text_node(compositor, (event->key.flags & GF_KEY_MOD_SHIFT) ? 1 : 2)) {
-				is_end = 1;
+				is_end = GF_TRUE;
 				break;
 			}
 			return;
@@ -504,7 +504,7 @@
 				memmove(&compositor->sel_buffer[compositor->caret_pos-1], &compositor->sel_buffer[compositor->caret_pos], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos+1));
 				compositor->sel_buffer[compositor->sel_buffer_len]=0;
 				compositor->caret_pos--;
-				flush_text_node_edit(compositor, 0);
+				flush_text_node_edit(compositor, GF_FALSE);
 			} else {
 				load_text_node(compositor, 4);
 			}
@@ -514,7 +514,7 @@
 				if (compositor->sel_buffer_len) compositor->sel_buffer_len--;
 				memmove(&compositor->sel_buffer[compositor->caret_pos+1], &compositor->sel_buffer[compositor->caret_pos+2], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos-1));
 				compositor->sel_buffer[compositor->sel_buffer_len]=0;
-				flush_text_node_edit(compositor, 0);
+				flush_text_node_edit(compositor, GF_FALSE);
 				return;
 			}
 			break;
@@ -541,11 +541,17 @@
 	flush_text_node_edit(compositor, is_end);
 }
 
-static void fireTermEvent(GF_Compositor * compositor, u32 eventType) {
+static void toggle_keyboard(GF_Compositor * compositor, Bool do_show)
+{
+	GF_Event evt;
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = do_show ? GF_EVENT_TEXT_EDITING_START : GF_EVENT_TEXT_EDITING_END;
+
+	if (compositor->video_out) {
+		GF_Err e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
+		if (e == GF_OK) return;
+	}
 	if (compositor->term) {
-		GF_Event evt;
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = eventType;
 		gf_term_user_event(compositor->term, &evt);
 	}
 }
@@ -558,38 +564,42 @@
 	u32 tag;
 	GF_Node *text = check_focus_node ? compositor->focus_node : compositor->hit_node;
 	if (!text) {
-		fireTermEvent(compositor, GF_EVENT_TEXT_EDITING_END);
-		return 0;
+		toggle_keyboard(compositor, GF_FALSE);
+		return GF_FALSE;
 	}
-	if (compositor->hit_node==compositor->focus_node) return compositor->focus_text_type ? 1 : 0;
+	if (compositor->hit_node==compositor->focus_node) return compositor->focus_text_type ? GF_TRUE : GF_FALSE;
 
 	tag = gf_node_get_tag(text);
 
 #ifndef GPAC_DISABLE_VRML
-	if ( (tag==TAG_MPEG4_Text)
+	switch (tag) {
+	case TAG_MPEG4_Text:
 #ifndef GPAC_DISABLE_X3D
-	 || (tag==TAG_X3D_Text)
+	case TAG_X3D_Text:
 #endif
-	 ) {
+	{
 		M_FontStyle *fs = (M_FontStyle *) ((M_Text *)text)->fontStyle;
-		if (!fs || !fs->style.buffer) return 0;
+		if (!fs || !fs->style.buffer) return GF_FALSE;
 		if (strstr(fs->style.buffer, "editable") || strstr(fs->style.buffer, "EDITABLE")) {
 			compositor->focus_text_type = 3;
 		} else if (strstr(fs->style.buffer, "simple_edit") || strstr(fs->style.buffer, "SIMPLE_EDIT")) {
 			compositor->focus_text_type = 4;
 		} else {
-			fireTermEvent(compositor, GF_EVENT_TEXT_EDITING_END);
-			return 0;
+			toggle_keyboard(compositor, GF_FALSE);
+			return GF_FALSE;
 		}
 		compositor->focus_node = text;
-		fireTermEvent(compositor, compositor->focus_text_type > 2 ? GF_EVENT_TEXT_EDITING_START : GF_EVENT_TEXT_EDITING_END);
-		return 1;
+		toggle_keyboard(compositor, compositor->focus_text_type > 2 ? GF_TRUE : GF_FALSE);
+		return GF_TRUE;
+	}
+	default:
+		break;
 	}
 #endif /*GPAC_DISABLE_VRML*/
-	if (tag <= GF_NODE_FIRST_DOM_NODE_TAG) return 0;
+	if (tag <= GF_NODE_FIRST_DOM_NODE_TAG) return GF_FALSE;
 #ifndef GPAC_DISABLE_SVG
 	gf_svg_flatten_attributes((SVG_Element *)text, &atts);
-	if (!atts.editable || !*atts.editable) return 0;
+	if (!atts.editable || !*atts.editable) return GF_FALSE;
 	switch (tag) {
 	case TAG_SVG_text:
 	case TAG_SVG_textArea:
@@ -599,7 +609,7 @@
 		compositor->focus_text_type = 2;
 		break;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 	if (compositor->focus_node != text) {
 		GF_DOM_Event evt;
@@ -611,12 +621,12 @@
 		compositor->focus_node = text;
 		evt.type = GF_EVENT_FOCUSIN;
 		gf_dom_event_fire(compositor->focus_node, &evt);
-		compositor->focus_uses_dom_events = 1;
+		compositor->focus_uses_dom_events = GF_TRUE;
 	}
 	compositor->hit_node = NULL;
-	fireTermEvent(compositor, compositor->focus_text_type > 0 ? GF_EVENT_TEXT_EDITING_START : GF_EVENT_TEXT_EDITING_END);
+	toggle_keyboard(compositor, compositor->focus_text_type > 0 ? GF_TRUE : GF_FALSE);
 #endif
-	return 1;
+	return GF_TRUE;
 }
 
 #ifndef GPAC_DISABLE_SVG
@@ -626,14 +636,14 @@
 	GF_FieldInfo info;
 	if (!node) return NULL;
 
-	if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_focusable, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_focusable, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if ( *(SVG_Focusable*)info.far_ptr == SVG_FOCUSABLE_TRUE) return node;
 	}
 	parent = gf_node_get_parent(node, 0);
 	if (cur_idx) {
-		GF_Node *n = gf_list_get(hit_use_stack, cur_idx-1);
+		GF_Node *n = (GF_Node*)gf_list_get(hit_use_stack, cur_idx-1);
 		if (n==node) {
-			parent = gf_list_get(hit_use_stack, cur_idx-2);
+			parent = (GF_Node*)gf_list_get(hit_use_stack, cur_idx-2);
 			if (cur_idx>1) cur_idx-=2;
 			else cur_idx=0;
 		}
@@ -648,7 +658,7 @@
 #ifndef GPAC_DISABLE_SVG
 	GF_DOM_Event evt;
 	u32 cursor_type;
-	Bool ret = 0;
+	Bool ret = GF_FALSE;
 
 	cursor_type = GF_CURSOR_NORMAL;
 	/*all mouse events*/
@@ -665,8 +675,8 @@
 
 		if (compositor->hit_node) {
 			GF_Node *focus;
-			Bool hit_changed = 0;
-			GF_Node *current_use = gf_list_last(compositor->hit_use_stack);
+			Bool hit_changed = GF_FALSE;
+			GF_Node *current_use = (GF_Node*)gf_list_last(compositor->hit_use_stack);
 			cursor_type = compositor->sensor_type;
 			memset(&evt, 0, sizeof(GF_DOM_Event));
 			evt.clientX = evt.screenX = FIX2INT(X);
@@ -692,7 +702,7 @@
 				/*mouse over*/
 				evt.type = GF_EVENT_MOUSEOVER;
 				ret += gf_dom_event_fire_ex(compositor->grab_node, &evt, compositor->hit_use_stack);
-				hit_changed = 1;
+				hit_changed = GF_TRUE;
 			}
 			switch (event->type) {
 			case GF_EVENT_MOUSEMOVE:
@@ -716,8 +726,8 @@
 
 				/*change focus*/
 				focus = get_parent_focus(compositor->grab_node, compositor->hit_use_stack, gf_list_count(compositor->hit_use_stack));
-				if (focus) gf_sc_focus_switch_ring(compositor, 0, focus, 1);
-				else if (compositor->focus_node) gf_sc_focus_switch_ring(compositor, 0, NULL, 1);
+				if (focus) gf_sc_focus_switch_ring(compositor, GF_FALSE, focus, 1);
+				else if (compositor->focus_node) gf_sc_focus_switch_ring(compositor, GF_FALSE, NULL, 1);
 
 				break;
 			case GF_EVENT_MOUSEUP:
@@ -760,7 +770,7 @@
 
 			/*reset focus*/
 			if (compositor->focus_node && (event->type==GF_EVENT_MOUSEDOWN))
-				gf_sc_focus_switch_ring(compositor, 0, NULL, 1);
+				gf_sc_focus_switch_ring(compositor, GF_FALSE, NULL, 1);
 
 			compositor->grab_node = NULL;
 			compositor->grab_use = NULL;
@@ -856,7 +866,7 @@
 	/*reset previous composite texture*/
 	if (compositor->prev_hit_appear != compositor->hit_appear) {
 		if (compositor->prev_hit_appear) {
-			compositor_compositetexture_handle_event(compositor, compositor->prev_hit_appear, ev, 1);
+			compositor_compositetexture_handle_event(compositor, compositor->prev_hit_appear, ev, GF_TRUE);
 			if (!compositor->grabbed_sensor) compositor->prev_hit_appear = NULL;
 		}
 	}
@@ -864,7 +874,7 @@
 	/*composite texture*/
 	if (compositor->hit_appear) {
 		GF_Node *appear = compositor->hit_appear;
-		if (compositor_compositetexture_handle_event(compositor, compositor->hit_appear, ev, 0)) {
+		if (compositor_compositetexture_handle_event(compositor, compositor->hit_appear, ev, GF_FALSE)) {
 			if (compositor->hit_appear) compositor->prev_hit_appear = appear;
 
 
@@ -875,14 +885,14 @@
 				hs = (GF_SensorHandler*)gf_list_get(compositor->previous_sensors, i);
 				/*if sensor is grabbed, add it to the list of active sensor for next pick*/
 				if (hs->grabbed) {
-					hs->OnUserEvent(hs, 0, 1, ev, compositor);
+					hs->OnUserEvent(hs, GF_FALSE, GF_TRUE, ev, compositor);
 					gf_list_add(compositor->sensors, hs);
 					compositor->grabbed_sensor = 1;
 					stype = gf_node_get_tag(hs->sensor);
 				}
 			}
 
-			return 1;
+			return GF_TRUE;
 		}
 //		compositor->prev_hit_appear = compositor->grabbed_sensor ? compositor->hit_appear : NULL;
 		compositor->prev_hit_appear = compositor->hit_appear;
@@ -896,22 +906,25 @@
 	stype = GF_CURSOR_NORMAL;
 	for (i=0; i<count; i++) {
 		GF_Node *keynav;
+		Bool check_anchor = GF_FALSE;
 		hs = (GF_SensorHandler*)gf_list_get(compositor->sensors, i);
 
 		/*try to remove this sensor from the previous sensor list*/
 		gf_list_del_item(compositor->previous_sensors, hs);
-		stype = gf_node_get_tag(hs->sensor);
+		if (gf_node_get_id(hs->sensor))
+			stype = gf_node_get_tag(hs->sensor);
+
 		keynav = gf_scene_get_keynav(gf_node_get_graph(hs->sensor), hs->sensor);
 		if (keynav) gf_sc_change_key_navigator(compositor, keynav);
 
 		/*call the sensor LAST, as this may triger a destroy of the scene the sensor is in
 		this is only true for anchors, as other other sensors output events are queued as routes untill next pass*/
-		res += hs->OnUserEvent(hs, 1, 0, ev, compositor);
-		if ((stype == TAG_MPEG4_Anchor)
+		res += hs->OnUserEvent(hs, GF_TRUE, GF_FALSE, ev, compositor);
+		if (stype == TAG_MPEG4_Anchor) check_anchor = GF_TRUE;
 #ifndef GPAC_DISABLE_X3D
-		 || (stype == TAG_X3D_Anchor)
+		else if (stype == TAG_X3D_Anchor) check_anchor = GF_TRUE;
 #endif
-		 ) {
+		if (check_anchor) {
 			/*subscene with active sensor has been deleted, we cannot continue process the sensors stack*/
 			if (count != gf_list_count(compositor->sensors))
 				break;
@@ -922,7 +935,7 @@
 	count = gf_list_count(compositor->previous_sensors);
 	for (i=0; i<count; i++) {
 		hs = (GF_SensorHandler*)gf_list_get(compositor->previous_sensors, i);
-		res += hs->OnUserEvent(hs, 0, 0, ev, compositor);
+		res += hs->OnUserEvent(hs, GF_FALSE, GF_FALSE, ev, compositor);
 		/*if sensor is grabbed, add it to the list of active sensor for next pick*/
 		if (hs->grabbed) {
 			gf_list_add(compositor->sensors, hs);
@@ -1006,7 +1019,7 @@
 #endif
 		return 1;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -1016,11 +1029,11 @@
 	GF_ChildNodeItem *child;
 	u32 ret = 0;
 	if (!node) node = compositor->focus_node;
-	if (!node) return 0;
+	if (!node) return GF_FALSE;
 
 	switch (gf_node_get_tag(node)) {
 	case TAG_MPEG4_Text:
-		return 0;
+		return GF_FALSE;
 	case TAG_MPEG4_Layout:
 		hdl = compositor_mpeg4_layout_get_sensor_handler(node);
 		break;
@@ -1029,7 +1042,7 @@
 		break;
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Text:
-		return 0;
+		return GF_FALSE;
 	case TAG_X3D_Anchor:
 		hdl = compositor_mpeg4_get_sensor_handler(node);
 		break;
@@ -1037,17 +1050,17 @@
 	}
 	child = ((GF_ParentNode*)node)->children;
 	if (hdl) {
-		ret += hdl->OnUserEvent(hdl, is_focus_out ? 0 : 1, 0, ev, compositor);
+		ret += hdl->OnUserEvent(hdl, is_focus_out ? GF_FALSE : GF_TRUE, GF_FALSE, ev, compositor);
 	} else {
 		while (child) {
 			hdl = compositor_mpeg4_get_sensor_handler(child->node);
 			if (hdl) {
-				ret += hdl->OnUserEvent(hdl, is_focus_out ? 0 : 1, 0, ev, compositor);
+				ret += hdl->OnUserEvent(hdl, is_focus_out ? GF_FALSE : GF_TRUE, GF_FALSE, ev, compositor);
 			}
 			child = child->next;
 		}
 	}
-	return ret ? 1 : 0;
+	return ret ? GF_TRUE : GF_FALSE;
 }
 
 #endif /*GPAC_DISABLE_VRML*/
@@ -1055,7 +1068,7 @@
 Bool visual_execute_event(GF_VisualManager *visual, GF_TraverseState *tr_state, GF_Event *ev, GF_ChildNodeItem *children)
 {
 	Bool ret;
-	Bool reset_sel = 0;
+	Bool reset_sel = GF_FALSE;
 	GF_List *temp_stack;
 	GF_Compositor *compositor = visual->compositor;
 	tr_state->traversing_mode = TRAVERSE_PICK;
@@ -1070,21 +1083,21 @@
 				if (compositor->store_text_state==GF_SC_TSEL_ACTIVE)
 					compositor->store_text_state = GF_SC_TSEL_FROZEN;
 				else {
-					reset_sel = 1;
+					reset_sel = GF_TRUE;
 				}
 			}
 			else if (ev->type==GF_EVENT_MOUSEDOWN) {
-				reset_sel = 1;
+				reset_sel = GF_TRUE;
 			}
 		} else if (compositor->edited_text) {
 			if (ev->type==GF_EVENT_MOUSEDOWN)
-				reset_sel = 1;
+				reset_sel = GF_TRUE;
 		}
 		if (ev->type==GF_EVENT_MOUSEUP) {
-			if (hit_node_editable(compositor, 0)) {
+			if (hit_node_editable(compositor, GF_FALSE)) {
 				compositor->text_selection = NULL;
 				exec_text_input(compositor, NULL);
-				return 1;
+				return GF_TRUE;
 			}
 #if 0
 			else if (!compositor->focus_node) {
@@ -1093,7 +1106,7 @@
 #endif
 		}
 		if (reset_sel) {
-			flush_text_node_edit(compositor, 1);
+			flush_text_node_edit(compositor, GF_TRUE);
 
 			compositor->store_text_state = GF_SC_TSEL_RELEASED;
 			compositor->text_selection = NULL;
@@ -1105,7 +1118,7 @@
 			compositor->sel_buffer_len = 0;
 
 			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
-			compositor->text_edit_changed = 1;
+			compositor->text_edit_changed = GF_TRUE;
 		} else if (compositor->store_text_state == GF_SC_TSEL_RELEASED) {
 			compositor->store_text_state = GF_SC_TSEL_NONE;
 		}
@@ -1132,13 +1145,14 @@
 	gf_list_reset(tr_state->vrml_sensors);
 
 	if (exec_text_selection(compositor, ev))
-		return 1;
+		return GF_TRUE;
 
 	if (compositor->hit_use_dom_events) {
 		ret = exec_event_dom(compositor, ev);
-		if (ret) return 1;
+		if (ret) return GF_TRUE;
 		/*no vrml sensors above*/
-		if (!gf_list_count(compositor->sensors) && !gf_list_count(compositor->previous_sensors)) return 0;
+		if (!gf_list_count(compositor->sensors) && !gf_list_count(compositor->previous_sensors))
+			return GF_FALSE;
 	}
 #ifndef GPAC_DISABLE_VRML
 	return gf_sc_exec_event_vrml(compositor, ev);
@@ -1185,7 +1199,7 @@
 		if (!focus->target.string) return 0;
 		focus->target.target = gf_sg_find_node_by_name(compositor->scene, focus->target.string+1);
 	}
-	n = focus->target.target;
+	n = (GF_Node*)focus->target.target;
 
 	ret = 0;
 	if (n != compositor->focus_node) {
@@ -1220,27 +1234,27 @@
 	u32 tag = gf_node_get_tag(elt);
 	switch (tag) {
 	case TAG_SVG_a:
-		return 1;
+		return GF_TRUE;
 
 #ifndef GPAC_DISABLE_VRML
 	case TAG_MPEG4_Anchor:
-		return 1;
+		return GF_TRUE;
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Anchor:
-		return 1;
+		return GF_TRUE;
 #endif
 #endif
 
 	default:
 		break;
 	}
-	if (tag<=GF_NODE_FIRST_DOM_NODE_TAG) return 0;
+	if (tag<=GF_NODE_FIRST_DOM_NODE_TAG) return GF_FALSE;
 
 	count = gf_dom_listener_count(elt);
 	for (i=0; i<count; i++) {
 		GF_FieldInfo info;
 		GF_Node *l = gf_dom_listener_get(elt, i);
-		if (gf_node_get_attribute_by_tag(l, TAG_XMLEV_ATT_event, 0, 0, &info)==GF_OK) {
+		if (gf_node_get_attribute_by_tag(l, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 			switch ( ((XMLEV_Event*)info.far_ptr)->type) {
 			case GF_EVENT_FOCUSIN:
 			case GF_EVENT_FOCUSOUT:
@@ -1249,13 +1263,13 @@
 			case GF_EVENT_KEYDOWN:
 			case GF_EVENT_KEYUP:
 			case GF_EVENT_LONGKEYPRESS:
-				return 1;
+				return GF_TRUE;
 			default:
 				break;
 			}
 		}
 	}
-	return 0;
+	return GF_FALSE;
 }
 #endif /*GPAC_DISABLE_SVG*/
 
@@ -1296,7 +1310,7 @@
 
 	/*all return in this function shall be preceeded with gf_node_set_cyclic_traverse_flag(elt, 0)
 	this ensures that we don't go into cyclic references when moving focus, hence stack overflow*/
-	if (! gf_node_set_cyclic_traverse_flag(elt, 1)) return NULL;
+	if (! gf_node_set_cyclic_traverse_flag(elt, GF_TRUE)) return NULL;
 
 	tag = gf_node_get_tag(elt);
 	if (tag <= GF_NODE_FIRST_DOM_NODE_TAG) {
@@ -1306,7 +1320,7 @@
 		{
 			M_Transform *tr=(M_Transform *)elt;
 			if (!tr->scale.x || !tr->scale.y || !tr->scale.z) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return NULL;
 			}
 			goto test_grouping;
@@ -1315,7 +1329,7 @@
 		{
 			M_Transform2D *tr=(M_Transform2D *)elt;
 			if (!tr->scale.x || !tr->scale.y) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return NULL;
 			}
 			goto test_grouping;
@@ -1325,7 +1339,7 @@
 		{
 			M_Layer2D *l=(M_Layer2D *)elt;
 			if (!l->size.x || !l->size.y) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return NULL;
 			}
 			goto test_grouping;
@@ -1354,7 +1368,7 @@
 				/*get the base grouping stack (*/
 				BaseGroupingStack *grp = (BaseGroupingStack*)gf_node_get_private(elt);
 				if (grp && (grp->flags & (GROUP_HAS_SENSORS | GROUP_IS_ANCHOR) )) {
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				}
 			}
@@ -1377,7 +1391,7 @@
 				wc = ((M_Switch*)elt)->whichChoice;
 			}
 			if (wc==-1) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return NULL;
 			}
 			i=0;
@@ -1385,7 +1399,7 @@
 				if (i==wc) CALL_SET_FOCUS(child->node);
 				child = child->next;
 			}
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return NULL;
 		}
 
@@ -1393,7 +1407,7 @@
 #ifndef GPAC_DISABLE_X3D
 		case TAG_X3D_Text:
 #endif
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 
 			if (!current_focus) {
 				M_FontStyle *fs = (M_FontStyle *) ((M_Text *)elt)->fontStyle;
@@ -1414,11 +1428,11 @@
 		{
 			M_Layout *l=(M_Layout*)elt;
 			if (!l->size.x || !l->size.y) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return NULL;
 			}
 			if (!current_focus && (compositor_mpeg4_layout_get_sensor_handler(elt)!=NULL)) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return elt;
 			}
 		}
@@ -1432,12 +1446,12 @@
 					/*get the base grouping stack (*/
 					BaseGroupingStack *grp = (BaseGroupingStack*)gf_node_get_private(elt);
 					if (grp && (grp->flags & (GROUP_HAS_SENSORS | GROUP_IS_ANCHOR) )) {
-						gf_node_set_cyclic_traverse_flag(elt, 0);
+						gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 						return elt;
 					}
 				}
 				if ( (gf_node_get_field_by_name(elt, "children", &info) != GF_OK) || (info.fieldType != GF_SG_VRML_MFNODE)) {
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return NULL;
 				}
 				child = *(GF_ChildNodeItem **) info.far_ptr;
@@ -1461,11 +1475,11 @@
 			n = set_focus(compositor, ((M_Shape*)elt)->geometry, current_focus, prev_focus);
 			if (!n) n = set_focus(compositor, ((M_Shape*)elt)->appearance, current_focus, prev_focus);
 			if (n) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return n;
 			}
 			gf_list_rem_last(compositor->focus_ancestors);
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return NULL;
 
 		case TAG_MPEG4_Appearance:
@@ -1480,7 +1494,7 @@
 			child = ((GF_ParentNode*)elt)->children;
 			while (child) {
 				if (compositor_mpeg4_get_sensor_handler(child->node) != NULL) {
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				}
 				child = child->next;
@@ -1490,7 +1504,7 @@
 #endif /*GPAC_DISABLE_VRML*/
 
 		default:
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return NULL;
 		}
 		if (!child)
@@ -1500,26 +1514,26 @@
 		SVGAllAttributes atts;
 
 		if (tag==TAG_SVG_defs) {
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return NULL;
 		}
 		gf_svg_flatten_attributes((SVG_Element *)elt, &atts);
 
 		if (atts.display && (*atts.display==SVG_DISPLAY_NONE)) {
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return NULL;
 		}
 		if (!current_focus) {
-			Bool is_auto = 1;
+			Bool is_auto = GF_TRUE;
 			if (atts.focusable) {
 				if (*atts.focusable==SVG_FOCUSABLE_TRUE) {
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				}
-				if (*atts.focusable==SVG_FOCUSABLE_FALSE) is_auto = 0;
+				if (*atts.focusable==SVG_FOCUSABLE_FALSE) is_auto = GF_FALSE;
 			}
 			if (is_auto && is_focus_target(elt)) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return elt;
 			}
 
@@ -1528,11 +1542,11 @@
 				case TAG_SVG_text:
 				case TAG_SVG_textArea:
 					compositor->focus_text_type = 1;
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				case TAG_SVG_tspan:
 					compositor->focus_text_type = 2;
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				default:
 					break;
@@ -1545,19 +1559,19 @@
 				switch (atts.nav_prev->type) {
 				case SVG_FOCUS_SELF:
 					/*focus locked on element*/
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				case SVG_FOCUS_IRI:
 					if (!atts.nav_prev->target.target) {
 						if (!atts.nav_prev->target.string) {
-							gf_node_set_cyclic_traverse_flag(elt, 0);
+							gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 							return NULL;
 						}
 						atts.nav_prev->target.target = gf_sg_find_node_by_name(compositor->scene, atts.nav_prev->target.string+1);
 					}
 					if (atts.nav_prev->target.target) {
 						rebuild_focus_ancestor(compositor, atts.nav_prev->target.target);
-						gf_node_set_cyclic_traverse_flag(elt, 0);
+						gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 						return atts.nav_prev->target.target;
 					}
 				default:
@@ -1570,19 +1584,19 @@
 				switch (atts.nav_next->type) {
 				case SVG_FOCUS_SELF:
 					/*focus locked on element*/
-					gf_node_set_cyclic_traverse_flag(elt, 0);
+					gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 					return elt;
 				case SVG_FOCUS_IRI:
 					if (!atts.nav_next->target.target) {
 						if (!atts.nav_next->target.string) {
-							gf_node_set_cyclic_traverse_flag(elt, 0);
+							gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 							return NULL;
 						}
 						atts.nav_next->target.target = gf_sg_find_node_by_name(compositor->scene, atts.nav_next->target.string+1);
 					}
 					if (atts.nav_next->target.target) {
 						rebuild_focus_ancestor(compositor, atts.nav_next->target.target);
-						gf_node_set_cyclic_traverse_flag(elt, 0);
+						gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 						return atts.nav_next->target.target;
 					}
 				default:
@@ -1608,7 +1622,7 @@
 		u32 count, i;
 		/*check all children except if current focus*/
 		if (current_focus) {
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return NULL;
 		}
 		gf_list_add(compositor->focus_ancestors, elt);
@@ -1616,9 +1630,9 @@
 		for (i=count; i>0; i--) {
 			/*get in the subtree*/
 			n = gf_node_list_get_child( child, i-1);
-			n = set_focus(compositor, n, 0, 1);
+			n = set_focus(compositor, n, GF_FALSE, GF_TRUE);
 			if (n) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return n;
 			}
 		}
@@ -1627,9 +1641,9 @@
 		gf_list_add(compositor->focus_ancestors, elt);
 		while (child) {
 			/*get in the subtree*/
-			n = set_focus(compositor, child->node, 0, 0);
+			n = set_focus(compositor, child->node, GF_FALSE, GF_FALSE);
 			if (n) {
-				gf_node_set_cyclic_traverse_flag(elt, 0);
+				gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 				return n;
 			}
 			child = child->next;
@@ -1638,24 +1652,24 @@
 	if (use_node) {
 		gf_list_add(compositor->focus_use_stack, use_node);
 		gf_list_add(compositor->focus_use_stack, elt);
-		n = set_focus(compositor, use_node, 0, 0);
+		n = set_focus(compositor, use_node, GF_FALSE, GF_FALSE);
 		if (n) {
 			compositor->focus_used = elt;
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return n;
 		}
 		gf_list_rem_last(compositor->focus_use_stack);
 		gf_list_rem_last(compositor->focus_use_stack);
 	} else if (anim_node) {
-		n = set_focus(compositor, anim_node, 0, 0);
+		n = set_focus(compositor, anim_node, GF_FALSE, GF_FALSE);
 		if (n) {
-			gf_node_set_cyclic_traverse_flag(elt, 0);
+			gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 			return n;
 		}
 	}
 
 	gf_list_rem_last(compositor->focus_ancestors);
-	gf_node_set_cyclic_traverse_flag(elt, 0);
+	gf_node_set_cyclic_traverse_flag(elt, GF_FALSE);
 	return NULL;
 }
 
@@ -1667,7 +1681,7 @@
 	GF_Node *n;
 	GF_Node *par;
 
-	par = gf_list_last(compositor->focus_ancestors);
+	par = (GF_Node*)gf_list_last(compositor->focus_ancestors);
 	if (!par) return NULL;
 
 	tag = gf_node_get_tag(par);
@@ -1748,7 +1762,7 @@
 		for (i=idx; i>0; i--) {
 			n = gf_node_list_get_child(child, i-1);
 			/*get in the subtree*/
-			n = set_focus(compositor, n, 0, 1);
+			n = set_focus(compositor, n, GF_FALSE, GF_TRUE);
 			if (n) return n;
 		}
 	} else {
@@ -1756,7 +1770,7 @@
 		while (child) {
 			if (idx<0) {
 				/*get in the subtree*/
-				n = set_focus(compositor, child->node, 0, 0);
+				n = set_focus(compositor, child->node, GF_FALSE, GF_FALSE);
 				if (n) return n;
 			}
 			idx--;
@@ -1771,7 +1785,7 @@
 GF_EXPORT
 u32 gf_sc_focus_switch_ring(GF_Compositor *compositor, Bool move_prev, GF_Node *focus, u32 force_focus)
 {
-	Bool current_focus = 1;
+	Bool current_focus = GF_TRUE;
 #ifndef GPAC_DISABLE_SVG
 	Bool prev_uses_dom_events;
 	GF_Node *prev_use;
@@ -1786,13 +1800,13 @@
 	prev_use = compositor->focus_used;
 	prev_uses_dom_events = compositor->focus_uses_dom_events;
 #endif
-	compositor->focus_uses_dom_events = 0;
+	compositor->focus_uses_dom_events = GF_FALSE;
 
 	if (!compositor->focus_node) {
 		compositor->focus_node = (force_focus==2) ? focus : gf_sg_get_root_node(compositor->scene);
 		gf_list_reset(compositor->focus_ancestors);
 		if (!compositor->focus_node) return 0;
-		current_focus = 0;
+		current_focus = GF_FALSE;
 	}
 
 	if (compositor->focus_used) {
@@ -1809,7 +1823,7 @@
 		gf_list_reset(compositor->focus_ancestors);
 		n = focus;
 		if (force_focus==2) {
-			current_focus=0;
+			current_focus = GF_FALSE;
 			n = set_focus(compositor, focus, current_focus, move_prev);
 			if (!n) n = browse_parent_for_focus(compositor, focus, move_prev);
 		}
@@ -1824,7 +1838,7 @@
 	}
 
 	if (n && gf_node_get_tag(n)>=GF_NODE_FIRST_DOM_NODE_TAG) {
-		compositor->focus_uses_dom_events = 1;
+		compositor->focus_uses_dom_events = GF_TRUE;
 	}
 	compositor->focus_node = n;
 
@@ -1846,7 +1860,7 @@
 			}
 #ifndef GPAC_DISABLE_VRML
 			else {
-				exec_vrml_key_event(compositor, prev, &ev, 1);
+				exec_vrml_key_event(compositor, prev, &ev, GF_TRUE);
 			}
 #endif
 		}
@@ -1860,24 +1874,24 @@
 			}
 #ifndef GPAC_DISABLE_VRML
 			else {
-				exec_vrml_key_event(compositor, NULL, &ev, 0);
+				exec_vrml_key_event(compositor, NULL, &ev, GF_FALSE);
 			}
 #endif
 		}
 		/*because of offscreen caches and composite texture, we must invalidate subtrees of previous and new focus to force a redraw*/
-		if (prev) gf_node_dirty_set(prev, GF_SG_NODE_DIRTY, 1);
-		if (compositor->focus_node) gf_node_dirty_set(compositor->focus_node, GF_SG_NODE_DIRTY, 1);
+		if (prev) gf_node_dirty_set(prev, GF_SG_NODE_DIRTY, GF_TRUE);
+		if (compositor->focus_node) gf_node_dirty_set(compositor->focus_node, GF_SG_NODE_DIRTY, GF_TRUE);
 		/*invalidate in case we draw focus rect*/
 		gf_sc_invalidate(compositor, NULL);
 	}
 #endif /*GPAC_DISABLE_SVG*/
 	if (cloned_use) gf_list_del(cloned_use);
 
-	if (hit_node_editable(compositor, 1)) {
+	if (hit_node_editable(compositor, GF_TRUE)) {
 		compositor->text_selection = NULL;
 		exec_text_input(compositor, NULL);
 		/*invalidate parent graphs*/
-		gf_node_dirty_set(compositor->focus_node, GF_SG_NODE_DIRTY, 1);
+		gf_node_dirty_set(compositor->focus_node, GF_SG_NODE_DIRTY, GF_TRUE);
 	}
 	return ret;
 }
@@ -1886,11 +1900,11 @@
 {
 	/*filter mouse events and other events (key...)*/
 	if (ev->type>GF_EVENT_MOUSEWHEEL) {
-		Bool ret = 0;
+		Bool ret = GF_FALSE;
 		/*send text edit*/
 		if (compositor->edited_text) {
 			exec_text_input(compositor, ev);
-			if (compositor->edited_text) return 1;
+			if (compositor->edited_text) return GF_TRUE;
 			/*if text is no longer edited, this is focus change so process as usual*/
 		}
 		/*FIXME - this is not working for mixed docs*/
@@ -1898,7 +1912,7 @@
 			ret = exec_event_dom(compositor, ev);
 #ifndef GPAC_DISABLE_VRML
 		else
-			ret = exec_vrml_key_event(compositor, compositor->focus_node, ev, 0);
+			ret = exec_vrml_key_event(compositor, compositor->focus_node, ev, GF_FALSE);
 #endif
 
 		if (ev->type==GF_EVENT_KEYDOWN) {
@@ -1906,11 +1920,11 @@
 			case GF_KEY_ENTER:
 				if (0&&compositor->focus_text_type) {
 					exec_text_input(compositor, NULL);
-					ret = 1;
+					ret = GF_TRUE;
 #ifndef GPAC_DISABLE_VRML
 				} else if (compositor->keynav_node && ((M_KeyNavigator*)compositor->keynav_node)->select) {
 					gf_sc_change_key_navigator(compositor, ((M_KeyNavigator*)compositor->keynav_node)->select);
-					ret=1;
+					ret = GF_TRUE;
 #endif
 				}
 				break;
@@ -1943,7 +1957,7 @@
 #endif
 					if (next_nav) {
 						gf_sc_change_key_navigator(compositor, next_nav);
-						ret=1;
+						ret = GF_TRUE;
 					}
 				}
 				break;
@@ -1957,8 +1971,8 @@
 
 static Bool forward_event(GF_Compositor *compositor, GF_Event *ev, Bool consumed)
 {
-	Bool ret = gf_term_forward_event(compositor->term, ev, consumed, 0);
-	if (consumed) return 0;
+	Bool ret = gf_term_forward_event(compositor->term, ev, consumed, GF_FALSE);
+	if (consumed) return GF_FALSE;
 
 	if ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) {
 		u32 now;
@@ -1974,22 +1988,22 @@
 		}
 		compositor->last_click_time = now;
 	}
-	return ret ? 1 : 0;
+	return ret ? GF_TRUE : GF_FALSE;
 }
 
 
 Bool gf_sc_exec_event(GF_Compositor *compositor, GF_Event *evt)
 {
 	s32 x=0, y=0;
-	Bool switch_coords=0;
-	Bool ret=0;
+	Bool switch_coords = GF_FALSE;
+	Bool ret = GF_FALSE;
 	if (evt->type<=GF_EVENT_MOUSEWHEEL) {
 		if (compositor->visual->center_coords) {
 			x = evt->mouse.x;
 			y = evt->mouse.y;
 			evt->mouse.x = evt->mouse.x - compositor->display_width/2;
 			evt->mouse.y = compositor->display_height/2 - evt->mouse.y;
-			switch_coords=1;
+			switch_coords = GF_TRUE;
 		}
 	}
 
@@ -1999,25 +2013,28 @@
 		res = gf_sc_execute_event(compositor, compositor->traverse_state, evt, NULL);
 		if (res) {
 			compositor->navigation_state = 0;
-			ret = 1;
+			ret = GF_TRUE;
 		}
 	}
 	if (switch_coords) {
 		evt->mouse.x = x;
 		evt->mouse.y = y;
 	}
-	ret += forward_event(compositor, evt, ret);
 
 	if (!ret) {
 #ifndef GPAC_DISABLE_3D
 		/*remember active layer on mouse click - may be NULL*/
 		if ((evt->type==GF_EVENT_MOUSEDOWN) && (evt->mouse.button==GF_MOUSE_LEFT)) compositor->active_layer = compositor->traverse_state->layer3d;
 #endif
+	}
+	if (!ret) {
+		ret = forward_event(compositor, evt, ret);
+	}
+	if (!ret) {
 		/*process navigation events*/
 		if (compositor->interaction_level & GF_INTERACT_NAVIGATION)
 			ret = compositor_handle_navigation(compositor, evt);
 	}
-
 	return ret;
 }
 
@@ -2044,7 +2061,7 @@
 	par = n ? kn->sensor : NULL;
 	if (par) par = gf_node_get_parent(par, 0);
 
-	gf_sc_focus_switch_ring(sr, 0, par, 1);
+	gf_sc_focus_switch_ring(sr, GF_FALSE, par, 1);
 #endif
 }

v0.5.2.tar.gz/src/compositor/font_engine.c -> v0.6.1.tar.gz/src/compositor/font_engine.c Changed

@@ -940,21 +940,25 @@
 			}
 
 			if (can_texture_text && span_setup_texture(tr_state->visual->compositor, span, 1, tr_state)) {
-				tr_state->mesh_num_textures = 1;
-				gf_sc_texture_enable(span->ext->txh, NULL);
-				visual_3d_mesh_paint(tr_state, span->ext->tx_mesh);
-				gf_sc_texture_disable(span->ext->txh);
+				tr_state->mesh_num_textures = gf_sc_texture_enable(span->ext->txh, NULL);
+				if (tr_state->mesh_num_textures) {
+					Bool has_mat_2d = tr_state->visual->compositor->visual->has_material_2d;
+					visual_3d_mesh_paint(tr_state, span->ext->tx_mesh);
+					gf_sc_texture_disable(span->ext->txh);
+					tr_state->mesh_num_textures = 0;
+					tr_state->visual->has_material_2d = has_mat_2d;
+				}
 			} else {
 				span_fill_3d(span, tr_state);
 			}
 
 			if (tr_state->text_split_idx) break;
 		}
+		tr_state->visual->has_material_2d = 0;
 
 		/*reset texturing in case of line texture*/
 		if (!asp) visual_3d_disable_texture(tr_state);
 	}
-
 	visual_3d_set_state(tr_state->visual, V3D_STATE_BLEND, 0);
 
 	if (asp && asp->pen_props.width) {
@@ -1251,7 +1255,7 @@
 				compositor->sel_buffer_alloc = 2*compositor->sel_buffer_alloc;
 				compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 			}
-			compositor->sel_buffer[compositor->sel_buffer_len] = span->glyphs[i]->utf_name;
+			compositor->sel_buffer[compositor->sel_buffer_len] = (u16) span->glyphs[i]->utf_name;
 			compositor->sel_buffer_len++;
 		}
 
@@ -1321,7 +1325,7 @@
 	for(; i<count; i++) {
 		span = (GF_TextSpan *)gf_list_get(spans, i);
 		if (compositor->text_selection)
-			gf_font_spans_select(span, tr_state, ctx, (i+1<count) ? 1 : 0, (i==0)?1:0, &rc);
+			gf_font_spans_select(span, tr_state, ctx, (i+1<count) ? 1 : 0, (i==0)? GF_TRUE : GF_FALSE, &rc);
 		else if (hl_color)
 			visual_2d_fill_rect(tr_state->visual, ctx, &span->bounds, hl_color, 0, tr_state);

v0.5.2.tar.gz/src/compositor/gl_inc.h -> v0.6.1.tar.gz/src/compositor/gl_inc.h Changed

@@ -33,23 +33,17 @@
 #ifndef GPAC_DISABLE_3D
 #include <gpac/internal/compositor_dev.h>
 
-#ifdef GPAC_USE_OGL_ES
-
-#ifndef GPAC_FIXED_POINT
-//#error "OpenGL ES defined without fixed-point support - unsupported."
-#endif
+#ifdef GPAC_USE_GLES1X
 
 #ifdef GPAC_ANDROID
 #include "GLES/gl.h"
-#else
-#ifdef GPAC_IPHONE
+#elif defined(GPAC_IPHONE)
 #include "OpenGLES/ES1/gl.h"
 #include "OpenGLES/ES1/glext.h"
 #include "glues.h"
 #else
 #include "GLES/egl.h"
 #endif
-#endif
 
 #if defined(GPAC_HAS_GLU) && !defined (GPAC_IPHONE)
 /*WARNING - this is NOT a standard include, GLU is not supported by GLES*/
@@ -76,6 +70,24 @@
 
 
 #define GL_GLEXT_PROTOTYPES
+
+#ifdef GPAC_USE_OGLES1X
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+
+#elif defined(GPAC_USE_GLES2)
+
+#ifdef GPAC_IPHONE
+#include "OpenGLES/ES2/gl.h"
+#include "glues.h"
+#else
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#endif
+
+#else
+
 #include <GL/gl.h>
 
 #ifdef GPAC_HAS_GLU
@@ -84,6 +96,8 @@
 
 #endif
 
+#endif
+
 
 #define GL_CHECK_ERR {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
 
@@ -105,7 +119,7 @@
 
 #if defined GPAC_USE_TINYGL
 //no extensions with TinyGL
-#elif defined (GPAC_USE_OGL_ES)
+#elif defined (GPAC_USE_GLES1X)
 //no extensions with OpenGL ES
 #elif defined(WIN32) || defined (GPAC_CONFIG_WIN32)
 #define LOAD_GL_FUNCS
@@ -119,8 +133,15 @@
 #define GET_GLFUN(funname) funname = (proc_ ## funname) glXGetProcAddress(#funname)
 #endif
 
+#ifndef YCBCR_MESA
+#define YCBCR_MESA	0x8757
+#endif
 
-#if !defined(GPAC_USE_OGL_ES)
+#ifndef YCBCR_422_APPLE
+#define YCBCR_422_APPLE			0x85B9
+#endif
+
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 
 /*redefine all ext needed*/
 
@@ -142,14 +163,6 @@
 #define GL_RESCALE_NORMAL 0x803A
 #endif
 
-#ifndef YCBCR_MESA
-#define YCBCR_MESA	0x8757
-#endif
-
-#ifndef YCBCR_422_APPLE
-#define YCBCR_422_APPLE			0x85B9
-#endif
-
 #ifndef UNSIGNED_SHORT_8_8_MESA
 #define UNSIGNED_SHORT_8_8_MESA 0x85BA /* same as Apple's */
 #define UNSIGNED_SHORT_8_8_REV_MESA 0x85BB /* same as Apple's */
@@ -322,6 +335,7 @@
 #endif
 
 #define GL_ARRAY_BUFFER	0x8892
+#define GL_ELEMENT_ARRAY_BUFFER	0x8893
 #define GL_STREAM_DRAW	0x88E0
 #define GL_STATIC_DRAW	0x88E4
 #define GL_DYNAMIC_DRAW 0x88E8
@@ -470,6 +484,8 @@
 GLDECL(void, glUniformMatrix4x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) )
 GLDECL(void, glUniformMatrix3x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) )
 GLDECL(void, glUniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) )
+GLDECL(void, glGetProgramiv, (GLuint program, GLenum pname, GLint *params) )
+GLDECL(void, glGetProgramInfoLog, (GLuint program, GLsizei maxLength, GLsizei *length, char *infoLog) )
 
 #ifndef GPAC_ANDROID
 GLDECL(void, glEnableVertexAttribArray, (GLuint index) )
@@ -482,9 +498,8 @@
 
 #endif //GL_VERSION_2_0
 
-#endif //GPAC_USE_OGL_ES 
+#endif //GPAC_USE_GLES1X 
 
 #endif	/*GPAC_DISABLE_3D*/
 
 #endif	/*_GL_INC_H_*/
-

v0.5.2.tar.gz/src/compositor/hardcoded_protos.c -> v0.6.1.tar.gz/src/compositor/hardcoded_protos.c Changed

@@ -54,31 +54,31 @@
 {
 	GF_FieldInfo field;
 	memset(path_ext, 0, sizeof(PathExtrusion));
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFNODE) return GF_FALSE;
 	path_ext->geometry = * (GF_Node **) field.far_ptr;
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFVEC3F) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFVEC3F) return GF_FALSE;
 	path_ext->spine = (MFVec3f *) field.far_ptr;
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
 	path_ext->beginCap = *(SFBool *) field.far_ptr;
-	if (gf_node_get_field(node, 3, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (gf_node_get_field(node, 3, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
 	path_ext->endCap = *(SFBool *) field.far_ptr;
-	if (gf_node_get_field(node, 4, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 4, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	path_ext->creaseAngle = *(SFFloat *) field.far_ptr;
-	if (gf_node_get_field(node, 5, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFROTATION) return 0;
+	if (gf_node_get_field(node, 5, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFROTATION) return GF_FALSE;
 	path_ext->orientation = (MFRotation *) field.far_ptr;
-	if (gf_node_get_field(node, 6, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFVEC2F) return 0;
+	if (gf_node_get_field(node, 6, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFVEC2F) return GF_FALSE;
 	path_ext->scale = (MFVec2f *) field.far_ptr;
-	if (gf_node_get_field(node, 7, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (gf_node_get_field(node, 7, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
 	path_ext->txAlongSpine = *(SFBool *) field.far_ptr;
-	return 1;
+	return GF_TRUE;
 }
 
 static void TraversePathExtrusion(GF_Node *node, void *rs, Bool is_destroy)
@@ -154,37 +154,37 @@
 {
 	GF_FieldInfo field;
 	memset(path_ext, 0, sizeof(PathExtrusion));
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFNODE) return GF_FALSE;
 	path_ext->geometry = * (GF_Node **) field.far_ptr;
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFNODE) return GF_FALSE;
 	path_ext->spine = * (GF_Node **) field.far_ptr;
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
 	path_ext->beginCap = *(SFBool *) field.far_ptr;
-	if (gf_node_get_field(node, 3, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (gf_node_get_field(node, 3, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
 	path_ext->endCap = *(SFBool *) field.far_ptr;
-	if (gf_node_get_field(node, 4, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 4, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	path_ext->creaseAngle = *(SFFloat *) field.far_ptr;
-	if (gf_node_get_field(node, 5, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFFLOAT) return 0;
+	if (gf_node_get_field(node, 5, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFFLOAT) return GF_FALSE;
 	path_ext->orientationKeys = (MFFloat *) field.far_ptr;
-	if (gf_node_get_field(node, 6, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFROTATION) return 0;
+	if (gf_node_get_field(node, 6, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFROTATION) return GF_FALSE;
 	path_ext->orientation = (MFRotation *) field.far_ptr;
-	if (gf_node_get_field(node, 7, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFFLOAT) return 0;
+	if (gf_node_get_field(node, 7, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFFLOAT) return GF_FALSE;
 	path_ext->scaleKeys = (MFFloat *) field.far_ptr;
-	if (gf_node_get_field(node, 8, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFVEC2F) return 0;
+	if (gf_node_get_field(node, 8, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFVEC2F) return GF_FALSE;
 	path_ext->scale = (MFVec2f *) field.far_ptr;
-	if (gf_node_get_field(node, 9, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
+	if (gf_node_get_field(node, 9, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
 	path_ext->txAlongSpine = *(SFBool *) field.far_ptr;
-	return 1;
+	return GF_TRUE;
 }
 
 static void TraversePlanarExtrusion(GF_Node *node, void *rs, Bool is_destroy)
@@ -382,16 +382,16 @@
 	memset(pc, 0, sizeof(PlaneClipper));
 	pc->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFVEC3F) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFVEC3F) return GF_FALSE;
 	pc->plane.normal = * (SFVec3f *) field.far_ptr;
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	pc->plane.d = * (SFFloat *) field.far_ptr;
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFNODE) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFNODE) return GF_FALSE;
 	pc->children = *(GF_ChildNodeItem **) field.far_ptr;
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -417,7 +417,7 @@
 	if (tr_state->traversing_mode == TRAVERSE_SORT) {
 		GF_Matrix mx;
 		gf_mx_copy(mx, tr_state->model_matrix);
-		visual_3d_set_clip_plane(tr_state->visual, stack->pc.plane, &mx, 0);
+		visual_3d_set_clip_plane(tr_state->visual, stack->pc.plane, &mx, GF_FALSE);
 		tr_state->num_clip_planes++;
 
 		group_3d_traverse((GF_Node*)&stack->pc, (GroupingNode*)stack, tr_state);
@@ -445,7 +445,7 @@
 		gf_node_set_private(node, stack);
 		gf_node_set_callback_function(node, TraversePlaneClipper);
 		/*we're a grouping node, force bounds rebuild as soon as loaded*/
-		gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, 0);
+		gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, GF_FALSE);
 
 		stack->pc = pc;
 		gf_node_proto_set_grouping(node);
@@ -483,18 +483,18 @@
 	memset(og, 0, sizeof(OffscreenGroup));
 	og->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFNODE) return GF_FALSE;
 	og->children = *(GF_ChildNodeItem **) field.far_ptr;
 
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFINT32) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFINT32) return GF_FALSE;
 	og->offscreen = * (SFInt32 *) field.far_ptr;
 
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	og->opacity = * (SFFloat *) field.far_ptr;
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -527,14 +527,14 @@
 			}
 			gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 			/*flag is not set for PROTO*/
-			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, 0);
+			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, GF_FALSE);
 		}
 		if (stack->cache) {
 			if (stack->detached)
 				gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
 
 			tr_state->subscene_not_over = 0;
-			group_cache_traverse((GF_Node *)&stack->og, stack->cache, tr_state, stack->cache->force_recompute, 1, stack->detached ? 1 : 0);
+			group_cache_traverse((GF_Node *)&stack->og, stack->cache, tr_state, stack->cache->force_recompute, GF_TRUE, stack->detached ? GF_TRUE : GF_FALSE);
 
 			if (gf_node_dirty_get(node)) {
 				gf_node_dirty_clear(node, GF_SG_CHILD_DIRTY);
@@ -543,7 +543,7 @@
 				if (gf_node_get_field(node, 0, &field) == GF_OK) {
 					gf_node_unregister_children(node, *(GF_ChildNodeItem **) field.far_ptr);
 					*(GF_ChildNodeItem **) field.far_ptr = NULL;
-					stack->detached = 1;
+					stack->detached = GF_TRUE;
 				}
 				if (gf_node_get_field(node, 3, &field) == GF_OK) {
 					*(SFBool *) field.far_ptr = 1;
@@ -608,22 +608,22 @@
 	memset(dg, 0, sizeof(DepthGroup));
 	dg->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFNODE) return GF_FALSE;
 	dg->children = *(GF_ChildNodeItem **) field.far_ptr;
 
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFINT32) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFINT32) return GF_FALSE;
 
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	dg->depth_gain = * (SFFloat *) field.far_ptr;
 
-	if (gf_node_get_field(node, 3, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 3, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	dg->depth_offset = * (SFFloat *) field.far_ptr;
 
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -646,7 +646,7 @@
 
 			gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 			/*flag is not set for PROTO*/
-			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, 0);
+			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, GF_FALSE);
 		}
 	}
 	DepthGroup_GetNode(node, &stack->dg);
@@ -728,7 +728,7 @@
 			tr_state->visual->depth_vp_range = *(SFFloat *) field.far_ptr;
 		}
 #ifndef GPAC_DISABLE_3D
-		if (tr_state->layer3d) gf_node_dirty_set(tr_state->layer3d, GF_SG_NODE_DIRTY, 0);
+		if (tr_state->layer3d) gf_node_dirty_set(tr_state->layer3d, GF_SG_NODE_DIRTY, GF_FALSE);
 #endif
 		gf_sc_invalidate(tr_state->visual->compositor, NULL);
 	}
@@ -761,23 +761,23 @@
 
 	ic2d->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFNODE) return GF_FALSE;
 	ic2d->point = * (GF_Node **) field.far_ptr;
 
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
 	ic2d->fineness = *(SFFloat *) field.far_ptr;
 
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFINT32) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFINT32) return GF_FALSE;
 	ic2d->type = *(MFInt32 *) field.far_ptr;
 
-	if (gf_node_get_field(node, 3, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFINT32) return 0;
+	if (gf_node_get_field(node, 3, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFINT32) return GF_FALSE;
 	ic2d->index = *(MFInt32 *) field.far_ptr;
 
-	return 1;
+	return GF_TRUE;
 }
 
 void curve2d_check_changes(GF_Node *node, Drawable *stack, GF_TraverseState *tr_state, MFInt32 *idx);
@@ -855,11 +855,11 @@
 	memset(tr, 0, sizeof(Untransform));
 	tr->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFNODE) return GF_FALSE;
 	tr->children = *(GF_ChildNodeItem **) field.far_ptr;
 
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -894,10 +894,10 @@
 
 
 		camera_invalidate(tr_state->camera);
-		tr_state->camera->is_3D=0;
+		tr_state->camera->is_3D = GF_FALSE;
 		tr_state->camera->flags |= CAM_NO_LOOKAT;
 		tr_state->camera->end_zoom = FIX_ONE;
-		camera_update(tr_state->camera, NULL, 1);
+		camera_update(tr_state->camera, NULL, GF_TRUE);
 
 
 		if (tr_state->traversing_mode == TRAVERSE_SORT) {
@@ -991,21 +991,21 @@
 	memset(sg, 0, sizeof(StyleGroup));
 	sg->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_MFNODE) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_MFNODE) return GF_FALSE;
 	sg->children = *(GF_ChildNodeItem **) field.far_ptr;
 
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFNODE) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFNODE) return GF_FALSE;
 	sg->appearance = *(GF_Node **)field.far_ptr;
 
-	return 1;
+	return GF_TRUE;
 }
 
 
 static void TraverseStyleGroup(GF_Node *node, void *rs, Bool is_destroy)
 {
-	Bool set = 0;
+	Bool set = GF_FALSE;
 	StyleGroupStack *stack = (StyleGroupStack *)gf_node_get_private(node);
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
 
@@ -1019,13 +1019,13 @@
 
 			gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 			/*flag is not set for PROTO*/
-			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, 0);
+			gf_node_dirty_set(node, GF_SG_CHILD_DIRTY, GF_FALSE);
 		}
 	}
 	StyleGroup_GetNode(node, &stack->sg);
 
 	if (!tr_state->override_appearance) {
-		set = 1;
+		set = GF_TRUE;
 		tr_state->override_appearance = stack->sg.appearance;
 	}
 	group_2d_traverse((GF_Node *)&stack->sg, (GroupingNode2D*)stack, tr_state);
@@ -1058,7 +1058,7 @@
 	BASE_NODE
 
 	Bool onTrigger;
-	Float value;
+	Fixed value;
 } TestSensor;
 
 typedef struct
@@ -1072,21 +1072,21 @@
 	memset(ts, 0, sizeof(TestSensor));
 	ts->sgprivate = node->sgprivate;
 
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return 0;
-	if (field.eventType != GF_SG_EVENT_IN) return 0;
+	if (gf_node_get_field(node, 0, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFBOOL) return GF_FALSE;
+	if (field.eventType != GF_SG_EVENT_IN) return GF_FALSE;
 	ts->onTrigger = *(SFBool *)field.far_ptr;
 
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
-	if (field.eventType != GF_SG_EVENT_EXPOSED_FIELD) return 0;
+	if (gf_node_get_field(node, 1, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
+	if (field.eventType != GF_SG_EVENT_EXPOSED_FIELD) return GF_FALSE;
 	ts->value = *(SFFloat *)field.far_ptr;
 
-	if (gf_node_get_field(node, 2, &field) != GF_OK) return 0;
-	if (field.fieldType != GF_SG_VRML_SFFLOAT) return 0;
-	if (field.eventType != GF_SG_EVENT_OUT) return 0;
+	if (gf_node_get_field(node, 2, &field) != GF_OK) return GF_FALSE;
+	if (field.fieldType != GF_SG_VRML_SFFLOAT) return GF_FALSE;
+	if (field.eventType != GF_SG_EVENT_OUT) return GF_FALSE;
 
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -1103,7 +1103,7 @@
 void TestSensor_OnTrigger(GF_Node *node, struct _route *route)
 {
 	GF_FieldInfo field;
-	Float value;
+	Fixed value;
 	TestSensorStack *stack = (TestSensorStack *)gf_node_get_private(node);
 	TestSensor_GetNode(node, &stack->ts);
 
@@ -1225,11 +1225,11 @@
 		GF_HardcodedProto *ifce;
 		while ( (ifce = (GF_HardcodedProto *)gf_list_enum(compositor->proto_modules, &j) )) {
 			if ( ifce->can_load_proto(uri)) {
-				return 1;
+				return GF_TRUE;
 			}
 		}
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 #endif /*GPAC_DISABLE_VRML*/

v0.5.2.tar.gz/src/compositor/hc_flash_shape.c -> v0.6.1.tar.gz/src/compositor/hc_flash_shape.c Changed

@@ -56,7 +56,7 @@
 {
 	/*delete all path objects*/
 	while (gf_list_count(stack->items)) {
-		FSItem *it = gf_list_get(stack->items, 0);
+		FSItem *it = (FSItem*)gf_list_get(stack->items, 0);
 		gf_list_rem(stack->items, 0);
 		if (it->path) gf_path_del(it->path);
 #ifndef GPAC_DISABLE_3D
@@ -97,21 +97,21 @@
 
 	/*get all fields*/
 	gf_node_get_field(node, 0, &field);
-	coords = field.far_ptr;
+	coords = (MFVec2f*)field.far_ptr;
 	gf_node_get_field(node, 1, &field);
-	com = field.far_ptr;
+	com = (MFInt32*)field.far_ptr;
 	gf_node_get_field(node, 2, &field);
-	widths = field.far_ptr;
+	widths = (MFFloat*)field.far_ptr;
 	gf_node_get_field(node, 3, &field);
-	colors = field.far_ptr;
+	colors = (MFColor*)field.far_ptr;
 	gf_node_get_field(node, 4, &field);
-	widthIndex = field.far_ptr;
+	widthIndex = (MFInt32*)field.far_ptr;
 	gf_node_get_field(node, 5, &field);
-	lineIndex = field.far_ptr;
+	lineIndex = (MFInt32*)field.far_ptr;
 	gf_node_get_field(node, 6, &field);
-	fillIndex = field.far_ptr;
+	fillIndex = (MFInt32*)field.far_ptr;
 	gf_node_get_field(node, 7, &field);
-	coordIndex = field.far_ptr;
+	coordIndex = (MFInt32*)field.far_ptr;
 
 	wi = li = fi = ci = 0;
 	w = 0;
@@ -119,7 +119,7 @@
 	st->max_width = 0;
 	cur.x = cur.y = 0;
 	fill_item = line_item = NULL;
-	need_line = need_fill = 0;
+	need_line = need_fill = GF_FALSE;
 	cur.x = cur.y = 0;
 	has_ci = coordIndex->count ? 1 : 0;
 	pts = coords->vals;
@@ -170,7 +170,7 @@
 			if (!w)
 				line_item = NULL;
 			else {
-				need_line = 1;
+				need_line = GF_TRUE;
 				if (st->max_width<w) st->max_width = w;
 			}
 			wi++;
@@ -180,7 +180,7 @@
 			if (li > lineIndex->count) return;
 			if (w) {
 				line_col = SFCOL_MAKE_ARGB(colors->vals[lineIndex->vals[li]]);
-				need_line = 1;
+				need_line = GF_TRUE;
 			}
 			li++;
 			break;
@@ -192,7 +192,7 @@
 				fill_item = NULL;
 			} else {
 				fill_col = SFCOL_MAKE_ARGB(colors->vals[fillIndex->vals[fi]]);
-				need_fill = 1;
+				need_fill = GF_TRUE;
 			}
 			fi++;
 			break;
@@ -201,11 +201,11 @@
 			if ((has_ci && ci >= coordIndex->count) || (!has_ci && ci >= coords->count) ) return;
 			if (need_fill) {
 				fill_item = new_fs_item(st, 0, fill_col, 0);
-				need_fill = 0;
+				need_fill = GF_FALSE;
 			}
 			if (need_line) {
 				line_item = new_fs_item(st, line_col, 0, w);
-				need_line = 0;
+				need_line = GF_FALSE;
 			}
 			if (has_ci) {
 				pt = pts[coordIndex->vals[ci]];
@@ -224,12 +224,12 @@
 			if (need_fill) {
 				fill_item = new_fs_item(st, 0, fill_col, 0);
 				gf_path_add_move_to(fill_item->path, cur.x, cur.y);
-				need_fill = 0;
+				need_fill = GF_FALSE;
 			}
 			if (need_line) {
 				line_item = new_fs_item(st, line_col, 0, w);
 				gf_path_add_move_to(line_item->path, cur.x, cur.y);
-				need_line = 0;
+				need_line = GF_FALSE;
 			}
 			if (has_ci) {
 				pt = pts[coordIndex->vals[ci]];
@@ -247,12 +247,12 @@
 			if (need_fill) {
 				fill_item = new_fs_item(st, 0, fill_col, 0);
 				gf_path_add_move_to(fill_item->path, cur.x, cur.y);
-				need_fill = 0;
+				need_fill = GF_FALSE;
 			}
 			if (need_line) {
 				line_item = new_fs_item(st, line_col, 0, w);
 				gf_path_add_move_to(line_item->path, cur.x, cur.y);
-				need_line = 0;
+				need_line = GF_FALSE;
 			}
 			if (has_ci) {
 				ct1 = pts[coordIndex->vals[ci]];
@@ -275,12 +275,12 @@
 			if (need_fill) {
 				fill_item = new_fs_item(st, 0, fill_col, 0);
 				gf_path_add_move_to(fill_item->path, cur.x, cur.y);
-				need_fill = 0;
+				need_fill = GF_FALSE;
 			}
 			if (need_line) {
 				line_item = new_fs_item(st, line_col, 0, w);
 				gf_path_add_move_to(line_item->path, cur.x, cur.y);
-				need_line = 0;
+				need_line = GF_FALSE;
 			}
 			ct1.x = 2*cur.x - ct1.x;
 			ct1.y = 2*cur.y - ct1.y;
@@ -303,12 +303,12 @@
 			if (need_fill) {
 				fill_item = new_fs_item(st, 0, fill_col, 0);
 				gf_path_add_move_to(fill_item->path, cur.x, cur.y);
-				need_fill = 0;
+				need_fill = GF_FALSE;
 			}
 			if (need_line) {
 				line_item = new_fs_item(st, line_col, 0, w);
 				gf_path_add_move_to(line_item->path, cur.x, cur.y);
-				need_line = 0;
+				need_line = GF_FALSE;
 			}
 			if (has_ci) {
 				ct1 = pts[coordIndex->vals[ci]];
@@ -328,12 +328,12 @@
 			if (need_fill) {
 				fill_item = new_fs_item(st, 0, fill_col, 0);
 				gf_path_add_move_to(fill_item->path, cur.x, cur.y);
-				need_fill = 0;
+				need_fill = GF_FALSE;
 			}
 			if (need_line) {
 				line_item = new_fs_item(st, line_col, 0, w);
 				gf_path_add_move_to(line_item->path, cur.x, cur.y);
-				need_line = 0;
+				need_line = GF_FALSE;
 			}
 			ct1.x = 2*cur.x - ct1.x;
 			ct1.y = 2*cur.y - ct1.y;
@@ -358,7 +358,7 @@
 	/*compute bounds*/
 	st->bounds.width = st->bounds.height = 0;
 	for (i=0; i<gf_list_count(st->items); i++) {
-		line_item = gf_list_get(st->items, i);
+		line_item = (FSItem*)gf_list_get(st->items, i);
 		gf_path_get_bounds(line_item->path, &rc);
 		gf_rect_union(&st->bounds, &rc);
 	}
@@ -390,7 +390,7 @@
 	case TRAVERSE_DRAW_2D:
 		ctx = tr_state->ctx;
 		for (i=0; i<gf_list_count(st->items); i++) {
-			FSItem *item = gf_list_get(st->items, i);
+			FSItem *item = (FSItem*)gf_list_get(st->items, i);
 			ctx->flags &= ~(CTX_PATH_FILLED | CTX_PATH_STROKE);
 			memset(&ctx->aspect, 0, sizeof(DrawAspect2D));
 			if (item->fill_col) {
@@ -408,7 +408,7 @@
 	case TRAVERSE_DRAW_3D:
 		ctx = tr_state->ctx;
 		for (i=0; i<gf_list_count(st->items); i++) {
-			FSItem *item = gf_list_get(st->items, i);
+			FSItem *item = (FSItem*)gf_list_get(st->items, i);
 			memset(&ctx->aspect, 0, sizeof(DrawAspect2D));
 			if (item->fill_col) {
 				ctx->aspect.fill_color = item->fill_col;

v0.5.2.tar.gz/src/compositor/mesh.c -> v0.6.1.tar.gz/src/compositor/mesh.c Changed

@@ -81,6 +81,10 @@
 		glDeleteBuffers(1, &mesh->vbo);
 		mesh->vbo = 0;
 	}
+	if (mesh->vbo_idx) {
+		glDeleteBuffers(1, &mesh->vbo_idx);
+		mesh->vbo_idx = 0;
+	}
 }
 
 void mesh_free(GF_Mesh *mesh)
@@ -598,8 +602,13 @@
 			coords[i * num_steps + j].x = gf_mulfix(radius, x);
 			coords[i * num_steps + j].y = gf_mulfix(radius, y);
 			coords[i * num_steps + j].z = gf_mulfix(radius, z);
-			texcoords[i * num_steps + j].x = FIX_ONE - (j+1)*FIX_ONE/num_steps;
-			texcoords[i * num_steps + j].y = i*FIX_ONE/num_steps;
+			if (radius>0) {
+				texcoords[i * num_steps + j].x = FIX_ONE - (j+1)*FIX_ONE/num_steps;
+				texcoords[i * num_steps + j].y = i*FIX_ONE/num_steps;
+			} else {
+				texcoords[i * num_steps + j].x = j*FIX_ONE/num_steps;
+				texcoords[i * num_steps + j].y = FIX_ONE - i*FIX_ONE/num_steps;
+			}
 		}
 	}
 }
@@ -621,7 +630,7 @@
 
 	for (i=0; i<num_steps-1; i++) {
 		u32 n = i * num_steps;
-
+		Fixed last_tx_coord;
 		for (j=0; j<num_steps; j++) {
 			mesh_set_vertex(mesh, coords[n + j + num_steps].x, coords[n + j + num_steps].y, coords[n + j + num_steps].z,
 			 coords[n + j + num_steps].x, coords[n + j + num_steps].y, coords[n + j + num_steps].z,
@@ -637,12 +646,14 @@
 			}
 
 		}
+
+		last_tx_coord = (radius>0) ? 0 : FIX_ONE;
 		mesh_set_vertex(mesh, coords[n + num_steps].x, coords[n + num_steps].y, coords[n + num_steps].z,
 		 coords[n + num_steps].x, coords[n + num_steps].y, coords[n + num_steps].z,
-		 0/*FIX_ONE*/, texcoords[n + num_steps].y);
+		 last_tx_coord, texcoords[n + num_steps].y);
 		mesh_set_vertex(mesh, coords[n].x, coords[n].y, coords[n].z,
 		 coords[n].x, coords[n].y, coords[n].z,
-		 0/*FIX_ONE*/, texcoords[n].y);
+		 last_tx_coord, texcoords[n].y);
 		mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-4, mesh->v_count-2);
 		mesh_set_triangle(mesh, mesh->v_count-3, mesh->v_count-2, mesh->v_count-1);
 	}

v0.5.2.tar.gz/src/compositor/mesh_collide.c -> v0.6.1.tar.gz/src/compositor/mesh_collide.c Changed

@@ -135,7 +135,7 @@
 		aab_par->depth --;
 		return;
 	}
-	do_split = 1;
+	do_split = GF_TRUE;
 
 	gf_vec_diff(extend, node->max, node->min);
 	extend = gf_vec_scale(extend, FIX_ONE/2);
@@ -175,12 +175,12 @@
 			}
 		}
 		axis = 0;
-		do_split = 0;
+		do_split = GF_FALSE;
 		while (!do_split && (axis!=3)) {
 			num_pos = aabb_split(mesh, node, sorted[axis]);
 			// Check the subdivision has been successful
 			if (!num_pos || (num_pos==node->nb_idx)) axis++;
-			else do_split = 1;
+			else do_split = GF_TRUE;
 		}
 	}
 	else if (aab_par->split_type==AABB_SPLATTER) {
@@ -209,10 +209,10 @@
 		num_pos = aabb_split(mesh, node, axis);
 	}
 	else if (aab_par->split_type==AABB_FIFTY) {
-		do_split = 0;
+		do_split = GF_FALSE;
 	}
 
-	if (!num_pos || (num_pos==node->nb_idx)) do_split = 0;
+	if (!num_pos || (num_pos==node->nb_idx)) do_split = GF_FALSE;
 
 	if (!do_split) {
 		if (aab_par->split_type==AABB_FIFTY) {
@@ -298,7 +298,7 @@
 
 	/*check bbox intersection*/
 	inters = gf_ray_hit_box(ray, n->min, n->max, NULL);
-	if (!inters) return 0;
+	if (!inters) return GF_FALSE;
 
 	if (n->pos) {
 		/*we really want to check all possible intersections to get the closest point on ray*/
@@ -310,7 +310,7 @@
 
 
 	inters_idx = 0;
-	inters = 0;
+	inters = GF_FALSE;
 	dist = (*closest);
 
 	/*leaf, check for all faces*/
@@ -323,7 +323,7 @@
 			if ((res>0) && (res<dist)) {
 				dist = res;
 				inters_idx = i;
-				inters = 1;
+				inters = GF_TRUE;
 			}
 		}
 	}
@@ -361,7 +361,7 @@
 	u32 i, inters_idx;
 	Fixed closest;
 	/*no intersection on linesets/pointsets*/
-	if (mesh->mesh_type != MESH_TRIANGLES) return 0;
+	if (mesh->mesh_type != MESH_TRIANGLES) return GF_FALSE;
 
 	/*use aabbtree*/
 	if (mesh->aabb_root) {
@@ -371,10 +371,10 @@
 
 	/*check bbox intersection*/
 	inters = gf_ray_hit_box(ray, mesh->bounds.min_edge, mesh->bounds.max_edge, NULL);
-	if (!inters) return 0;
+	if (!inters) return GF_FALSE;
 
 	inters_idx = 0;
-	inters = 0;
+	inters = GF_FALSE;
 	closest = FIX_MAX;
 	for (i=0; i<mesh->i_count; i+=3) {
 		Fixed res;
@@ -385,7 +385,7 @@
 			if ((res>0) && (res<closest)) {
 				closest = res;
 				inters_idx = i;
-				inters = 1;
+				inters = GF_TRUE;
 			}
 		}
 	}
@@ -436,20 +436,20 @@
 	pvec = gf_vec_cross(ray->dir, edge2);
 	/* if determinant is near zero, ray lies in plane of triangle */
 	det = gf_vec_dot(edge1, pvec);
-	if (ABS(det) < FIX_EPSILON) return 0;
+	if (ABS(det) < FIX_EPSILON) return GF_FALSE;
 	/* calculate distance from vert0 to ray origin */
 	gf_vec_diff(tvec, ray->orig, *v0);
 	/* calculate U parameter and test bounds */
 	u = gf_divfix(gf_vec_dot(tvec, pvec), det);
-	if ((u < 0) || (u > FIX_ONE)) return 0;
+	if ((u < 0) || (u > FIX_ONE)) return GF_FALSE;
 	/* prepare to test V parameter */
 	qvec = gf_vec_cross(tvec, edge1);
 	/* calculate V parameter and test bounds */
 	v = gf_divfix(gf_vec_dot(ray->dir, qvec), det);
-	if ((v < 0) || (u + v > FIX_ONE)) return 0;
+	if ((v < 0) || (u + v > FIX_ONE)) return GF_FALSE;
 	/* calculate t, ray intersects triangle */
 	*dist = gf_divfix(gf_vec_dot(edge2, qvec), det);
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -481,7 +481,7 @@
 		s = tmp - ext;
 		if (s>0) d += gf_mulfix(s, s);
 	}
-	return (d<=sq_rad) ? 1 : 0;
+	return (d<=sq_rad) ? GF_TRUE : GF_FALSE;
 }
 
 Bool gf_mesh_closest_face_aabb(GF_Mesh *mesh, AABBNode *node, SFVec3f pos, Fixed min_dist, Fixed min_sq_dist, Fixed *min_col_dist, SFVec3f *outPoint)
@@ -489,17 +489,17 @@
 	GF_Ray r;
 	u32 i;
 	SFVec3f v1, v2, n, resn;
-	Bool inters, has_inter, need_norm = 0;
+	Bool inters, has_inter, need_norm = GF_FALSE;
 	Fixed d;
-	if (!sphere_box_overlap(pos, min_sq_dist, node->min, node->max)) return 0;
+	if (!sphere_box_overlap(pos, min_sq_dist, node->min, node->max)) return GF_FALSE;
 	if (node->pos) {
-		if (gf_mesh_closest_face_aabb(mesh, node->pos, pos, min_dist, min_sq_dist, min_col_dist, outPoint)) return 1;
+		if (gf_mesh_closest_face_aabb(mesh, node->pos, pos, min_dist, min_sq_dist, min_col_dist, outPoint)) return GF_TRUE;
 		return gf_mesh_closest_face_aabb(mesh, node->neg, pos, min_dist, min_sq_dist, min_col_dist, outPoint);
 	}
 
-	need_norm = (mesh->flags & MESH_IS_SMOOTHED) ? 1 : 0,
+	need_norm = (mesh->flags & MESH_IS_SMOOTHED) ? GF_TRUE : GF_FALSE,
 	r.orig = pos;
-	has_inter = 0;
+	has_inter = GF_FALSE;
 	for (i=0; i<node->nb_idx; i++) {
 		IDX_TYPE *idx = &mesh->indices[3*node->indices[i]];
 		if (need_norm) {
@@ -525,7 +525,7 @@
 				n = r.dir;
 			}
 			if (d<=(*min_col_dist)) {
-				has_inter = 1;
+				has_inter = GF_TRUE;
 				(*min_col_dist) = d;
 				resn = n;
 			}
@@ -548,7 +548,7 @@
 
 	/*check bounds*/
 	gf_vec_diff(v1, mesh->bounds.center, pos);
-	if (gf_vec_len(v1)>min_dist+mesh->bounds.radius) return 0;
+	if (gf_vec_len(v1)>min_dist+mesh->bounds.radius) return GF_FALSE;
 
 	if (mesh->aabb_root) {
 		d = min_dist * min_dist;
@@ -556,10 +556,10 @@
 		return gf_mesh_closest_face_aabb(mesh, mesh->aabb_root, pos, min_dist, d, &dmax, outPoint);
 	}
 
-	need_norm = (mesh->flags & MESH_IS_SMOOTHED) ? 1 : 0,
+	need_norm = (mesh->flags & MESH_IS_SMOOTHED) ? GF_TRUE : GF_FALSE,
 
 	r.orig = pos;
-	has_inter = 0;
+	has_inter = GF_FALSE;
 	dmax = min_dist;
 	for (i=0; i<mesh->i_count; i+=3) {
 		IDX_TYPE *idx = &mesh->indices[i];
@@ -593,7 +593,7 @@
 				n = r.dir;
 			}
 			if (d<=dmax) {
-				has_inter = 1;
+				has_inter = GF_TRUE;
 				dmax = d;
 				resn = n;
 			}

v0.5.2.tar.gz/src/compositor/mpeg4_audio.c -> v0.6.1.tar.gz/src/compositor/mpeg4_audio.c Changed

@@ -39,8 +39,8 @@
 
 static void audioclip_activate(AudioClipStack *st, M_AudioClip *ac)
 {
-	if (gf_sc_audio_open(&st->input, &ac->url, 0, -1, 0) != GF_OK) {
-		st->failure = 1;
+	if (gf_sc_audio_open(&st->input, &ac->url, 0, -1, GF_FALSE) != GF_OK) {
+		st->failure = GF_TRUE;
 		return;
 	}
 	ac->isActive = 1;
@@ -57,7 +57,7 @@
 	ac->isActive = 0;
 	gf_node_event_out((GF_Node *)ac, 7/*"isActive"*/);
 
-	st->time_handle.needs_unregister = 1;
+	st->time_handle.needs_unregister = GF_TRUE;
 }
 
 static void audioclip_traverse(GF_Node *node, void *rs, Bool is_destroy)
@@ -91,7 +91,7 @@
 	if (st->set_duration && st->input.stream) {
 		ac->duration_changed = gf_mo_get_duration(st->input.stream);
 		gf_node_event_out(node, 6/*"duration_changed"*/);
-		st->set_duration = 0;
+		st->set_duration = GF_FALSE;
 	}
 
 	/*store mute flag*/
@@ -102,14 +102,14 @@
 {
 	Double time;
 	M_AudioClip *ac = (M_AudioClip *)tn->udta;
-	AudioClipStack *st = (AudioClipStack *)gf_node_get_private(tn->udta);
+	AudioClipStack *st = (AudioClipStack *)gf_node_get_private((GF_Node*)tn->udta);
 
 	if (st->failure) return;
 	if (! ac->isActive) {
 		st->start_time = ac->startTime;
 		st->input.speed = ac->pitch;
 	}
-	time = gf_node_get_scene_time(tn->udta);
+	time = gf_node_get_scene_time((GF_Node*)tn->udta);
 	if ((time<st->start_time) || (st->start_time<0)) return;
 
 	if (ac->isActive) {
@@ -130,7 +130,7 @@
 
 	st->time_handle.UpdateTimeNode = audioclip_update_time;
 	st->time_handle.udta = node;
-	st->set_duration = 1;
+	st->set_duration = GF_TRUE;
 
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, audioclip_traverse);
@@ -144,13 +144,13 @@
 	AudioClipStack *st = (AudioClipStack *) gf_node_get_private(node);
 	if (!st) return;
 
-	st->failure = 0;
+	st->failure = GF_FALSE;
 
 	/*MPEG4 spec is not clear about that , so this is not forbidden*/
 	if (st->input.is_open) {
 		if (gf_sc_audio_check_url(&st->input, &ac->url)) {
 			gf_sc_audio_stop(&st->input);
-			gf_sc_audio_open(&st->input, &ac->url, 0, -1, 0);
+			gf_sc_audio_open(&st->input, &ac->url, 0, -1, GF_FALSE);
 			/*force unregister to resetup audio cfg*/
 			gf_sc_audio_unregister(&st->input);
 			gf_sc_invalidate(st->input.compositor, NULL);
@@ -168,7 +168,7 @@
 	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->input.compositor, &st->time_handle);
 	else
-		st->time_handle.needs_unregister = 0;
+		st->time_handle.needs_unregister = GF_FALSE;
 }
 
 
@@ -182,9 +182,9 @@
 
 static void audiosource_activate(AudioSourceStack *st, M_AudioSource *as)
 {
-	if (gf_sc_audio_open(&st->input, &as->url, 0, -1, 0) != GF_OK)
+	if (gf_sc_audio_open(&st->input, &as->url, 0, -1, GF_FALSE) != GF_OK)
 		return;
-	st->is_active = 1;
+	st->is_active = GF_TRUE;
 	gf_mo_set_speed(st->input.stream, st->input.speed);
 	/*traverse all graph to get parent audio group*/
 	gf_sc_invalidate(st->input.compositor, NULL);
@@ -193,8 +193,8 @@
 static void audiosource_deactivate(AudioSourceStack *st, M_AudioSource *as)
 {
 	gf_sc_audio_stop(&st->input);
-	st->is_active = 0;
-	st->time_handle.needs_unregister = 1;
+	st->is_active = GF_FALSE;
+	st->time_handle.needs_unregister = GF_TRUE;
 }
 
 static void audiosource_traverse(GF_Node *node, void *rs, Bool is_destroy)
@@ -216,7 +216,7 @@
 
 	/*check end of stream*/
 	if (st->input.stream && st->input.stream_finished) {
-		if (gf_mo_get_loop(st->input.stream, 0)) {
+		if (gf_mo_get_loop(st->input.stream, GF_FALSE)) {
 			gf_sc_audio_restart(&st->input);
 		} else if (st->is_active && gf_mo_should_deactivate(st->input.stream)) {
 			/*deactivate*/
@@ -235,13 +235,13 @@
 {
 	Double time;
 	M_AudioSource *as = (M_AudioSource *)tn->udta;
-	AudioSourceStack *st = (AudioSourceStack *)gf_node_get_private(tn->udta);
+	AudioSourceStack *st = (AudioSourceStack *)gf_node_get_private((GF_Node*)tn->udta);
 
 	if (! st->is_active) {
 		st->start_time = as->startTime;
 		st->input.speed = as->speed;
 	}
-	time = gf_node_get_scene_time(tn->udta);
+	time = gf_node_get_scene_time((GF_Node*)tn->udta);
 	if ((time<st->start_time) || (st->start_time<0)) return;
 
 	if (st->input.input_ifce.GetSpeed(st->input.input_ifce.callback) && st->is_active) {
@@ -282,7 +282,7 @@
 		gf_sc_audio_unregister(&st->input);
 		gf_sc_invalidate(st->input.compositor, NULL);
 
-		if (st->is_active) gf_sc_audio_open(&st->input, &as->url, 0, -1, 0);
+		if (st->is_active) gf_sc_audio_open(&st->input, &as->url, 0, -1, GF_FALSE);
 	}
 
 	//update state if we're active
@@ -295,7 +295,7 @@
 	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->input.compositor, &st->time_handle);
 	else
-		st->time_handle.needs_unregister = 0;
+		st->time_handle.needs_unregister = GF_FALSE;
 }
 
 
@@ -354,18 +354,18 @@
 		l = l->next;
 	}
 
-	gf_mixer_lock(st->am, 1);
+	gf_mixer_lock(st->am, GF_TRUE);
 
 	/*if no new inputs don't change mixer config*/
-	update_mixer = gf_list_count(st->new_inputs) ? 1 : 0;
+	update_mixer = gf_list_count(st->new_inputs) ? GF_TRUE : GF_FALSE;
 
 	if (gf_mixer_get_src_count(st->am) == gf_list_count(st->new_inputs)) {
 		u32 count = gf_list_count(st->new_inputs);
-		update_mixer = 0;
+		update_mixer = GF_FALSE;
 		for (j=0; j<count; j++) {
 			GF_AudioInput *cur = (GF_AudioInput *)gf_list_get(st->new_inputs, j);
 			if (!gf_mixer_is_src_present(st->am, &cur->input_ifce)) {
-				update_mixer = 1;
+				update_mixer = GF_TRUE;
 				break;
 			}
 		}
@@ -382,7 +382,7 @@
 		if (update_mixer) gf_mixer_add_input(st->am, &src->input_ifce);
 	}
 
-	gf_mixer_lock(st->am, 0);
+	gf_mixer_lock(st->am, GF_FALSE);
 	tr_state->audio_parent = parent;
 
 	/*Note the audio buffer is ALWAYS registered untill destroyed since buffer filling shall happen even when inactive*/
@@ -401,7 +401,7 @@
 	gf_node_event_out((GF_Node *)ab, 17/*"isActive"*/);
 	/*rerender all graph to get parent audio group*/
 	gf_sc_invalidate(st->output.compositor, NULL);
-	st->done = 0;
+	st->done = GF_FALSE;
 	st->read_pos = 0;
 }
 
@@ -409,19 +409,19 @@
 {
 	ab->isActive = 0;
 	gf_node_event_out((GF_Node *)ab, 17/*"isActive"*/);
-	st->time_handle.needs_unregister = 1;
+	st->time_handle.needs_unregister = GF_TRUE;
 }
 
 static void audiobuffer_update_time(GF_TimeNode *tn)
 {
 	Double time;
 	M_AudioBuffer *ab = (M_AudioBuffer *)tn->udta;
-	AudioBufferStack *st = (AudioBufferStack *)gf_node_get_private(tn->udta);
+	AudioBufferStack *st = (AudioBufferStack *)gf_node_get_private((GF_Node*)tn->udta);
 
 	if (! ab->isActive) {
 		st->start_time = ab->startTime;
 	}
-	time = gf_node_get_scene_time(tn->udta);
+	time = gf_node_get_scene_time((GF_Node*)tn->udta);
 	if ((time<st->start_time) || (st->start_time<0)) return;
 
 	if (ab->isActive) {
@@ -449,7 +449,7 @@
 
 	if (!st->is_init) return NULL;
 	if (!st->buffer) {
-		st->done = 0;
+		st->done = GF_FALSE;
 		st->buffer_size = (u32) ceil(FIX2FLT(ab->length) * st->output.input_ifce.bps*st->output.input_ifce.samplerate*st->output.input_ifce.chan/8);
 		blockAlign = gf_mixer_get_block_align(st->am);
 		/*BLOCK ALIGN*/
@@ -492,7 +492,7 @@
 		} else if ( ((M_AudioBuffer*)st->output.owner)->loop) {
 			st->read_pos = 0;
 		} else {
-			st->done = 1;
+			st->done = GF_TRUE;
 		}
 	}
 }
@@ -511,7 +511,7 @@
 		return ai->snd->GetChannelVolume(ai->snd->owner, vol);
 	} else {
 		vol[0] = vol[1] = vol[2] = vol[3] = vol[4] = vol[5] = FIX_ONE;
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -533,11 +533,11 @@
 		}
 
 		gf_mixer_get_config(st->am, &aifc->samplerate, &aifc->chan, &aifc->bps, &aifc->ch_cfg);
-		st->is_init = (aifc->samplerate && aifc->chan && aifc->bps) ? 1 : 0;
+		st->is_init = (aifc->samplerate && aifc->chan && aifc->bps) ? GF_TRUE : GF_FALSE;
 		assert(st->is_init);
 		if (!st->is_init) aifc->samplerate = aifc->chan = aifc->bps = aifc->ch_cfg = 0;
 		/*this will force invalidation*/
-		return (for_reconf && st->is_init) ? 1 : 0;
+		return (for_reconf && st->is_init) ? GF_TRUE : GF_FALSE;
 	}
 	return st->is_init;
 }
@@ -580,7 +580,7 @@
 
 	st->time_handle.UpdateTimeNode = audiobuffer_update_time;
 	st->time_handle.udta = node;
-	st->set_duration = 1;
+	st->set_duration = GF_TRUE;
 
 	st->am = gf_mixer_new(NULL);
 	st->new_inputs = gf_list_new();
@@ -605,7 +605,7 @@
 	if (!st->time_handle.is_registered && !st->time_handle.needs_unregister)
 		gf_sc_register_time_node(st->output.compositor, &st->time_handle);
 	else
-		st->time_handle.needs_unregister = 0;
+		st->time_handle.needs_unregister = GF_FALSE;
 }
 
 #endif /*GPAC_DISABLE_VRML*/

v0.5.2.tar.gz/src/compositor/mpeg4_background.c -> v0.6.1.tar.gz/src/compositor/mpeg4_background.c Changed

@@ -267,7 +267,6 @@
 {
 	M_Background *bck;
 	BackgroundStack *st;
-	SFColor bcol;
 	SFVec4f res;
 	Fixed scale;
 	Bool has_sky, has_ground, front_tx, back_tx, top_tx, bottom_tx, right_tx, left_tx;
@@ -316,6 +315,11 @@
 	if (tr_state->traversing_mode != TRAVERSE_BINDABLE) {
 		if (tr_state->traversing_mode == TRAVERSE_SORT) {
 			gf_mx_copy(st->current_mx, tr_state->model_matrix);
+			if (!tr_state->pixel_metrics && tr_state->visual->compositor->inherit_type_3d) {
+				Fixed scale = gf_divfix(FIX_ONE, tr_state->min_hsize);
+				gf_mx_add_scale(&st->current_mx, scale, scale, scale);
+
+			}
 		}
 		return;
 	}
@@ -329,11 +333,14 @@
 
 	has_sky = ((bck->skyColor.count>1) && bck->skyAngle.count) ? 1 : 0;
 	has_ground = ((bck->groundColor.count>1) && bck->groundAngle.count) ? 1 : 0;
-	bcol.red = bcol.green = bcol.blue = 0;
-	if (bck->skyColor.count) bcol = bck->skyColor.vals[0];
 
 	/*if we clear the main visual clear it entirely - ONLY IF NOT IN LAYER*/
 	if ((tr_state->visual == compositor->visual) && (tr_state->visual->back_stack == tr_state->backgrounds)) {
+		SFColor bcol;
+		bcol.red = INT2FIX( GF_COL_R(tr_state->visual->compositor->back_color)) / 255;
+		bcol.green = INT2FIX( GF_COL_G(tr_state->visual->compositor->back_color)) / 255;
+		bcol.blue = INT2FIX( GF_COL_B(tr_state->visual->compositor->back_color)) / 255;
+
 		visual_3d_clear(tr_state->visual, bcol, FIX_ONE);
 		if (!has_sky && !has_ground && !front_tx && !back_tx && !top_tx && !bottom_tx && !left_tx && !right_tx) {
 			return;
@@ -371,7 +378,7 @@
 #ifdef GPAC_FIXED_POINT
 		scale = (tr_state->camera->z_far/10)*8;
 #else
-		scale = 9*tr_state->camera->z_far/10;
+		scale = 8*tr_state->camera->z_far/10;
 #endif
 		gf_mx_add_scale(&mx, scale, scale, scale);
 
@@ -398,7 +405,7 @@
 #ifdef GPAC_FIXED_POINT
 		scale = (tr_state->camera->z_far/100)*70;
 #else
-		scale = 85*tr_state->camera->z_far/100;
+		scale = 70*tr_state->camera->z_far/100;
 #endif
 		gf_mx_add_scale(&mx, scale, -scale, scale);
 
@@ -415,11 +422,12 @@
 		gf_mx_init(mx);
 		gf_mx_add_translation(&mx, res.x, res.y, res.z);
 #ifdef GPAC_FIXED_POINT
-		scale = (tr_state->camera->z_far/100)*99;
-		gf_mx_add_scale(&mx, scale, scale, scale);
+		scale = (tr_state->camera->z_far/100)*90;
 #else
-		gf_mx_add_scale(&mx, tr_state->camera->z_far, tr_state->camera->z_far, tr_state->camera->z_far);
+		scale = (tr_state->camera->z_far/100)*90;
 #endif
+		gf_mx_add_scale(&mx, scale, scale, scale);
+
 		visual_3d_enable_antialias(tr_state->visual, 1);
 
 		gf_mx_add_matrix(&tr_state->model_matrix, &mx);

v0.5.2.tar.gz/src/compositor/mpeg4_background2d.c -> v0.6.1.tar.gz/src/compositor/mpeg4_background2d.c Changed

@@ -104,6 +104,7 @@
 {
 	Bool clear_all = GF_TRUE;
 	u32 color;
+	Bool use_texture;
 	Bool is_offscreen = GF_FALSE;
 	Background2DStack *stack;
 	if (!ctx || !ctx->drawable || !ctx->drawable->node) return;
@@ -114,9 +115,19 @@
 	stack->flags &= ~CTX_PATH_FILLED;
 	color = ctx->aspect.fill_color;
 
-	if (back_use_texture((M_Background2D *)ctx->drawable->node)) {
+	use_texture = back_use_texture((M_Background2D *)ctx->drawable->node);
+	if (!use_texture && !tr_state->visual->is_attached) {
+		use_texture = 1;
+		stack->txh.data = stack->col_tx;
+		stack->txh.width = 2;
+		stack->txh.height = 2;
+		stack->txh.stride = 6;
+		stack->txh.pixelformat = GF_PIXEL_RGB_24;
+	}
+
+	if (use_texture) {
 
-		if (!tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx, NULL)) {
+		if (!tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx)) {
 			/*set target rect*/
 			gf_path_reset(stack->drawable->path);
 			gf_path_add_rect_center(stack->drawable->path,
@@ -127,6 +138,12 @@
 			/*draw texture*/
 			visual_2d_texture_path(tr_state->visual, stack->drawable->path, ctx, tr_state);
 		}
+		//a quick hack, if texture not ready return (we don't have direct notification of this through the above functions
+#ifndef GPAC_DISABLE_3D
+		if (tr_state->visual->compositor->hybrid_opengl && !stack->txh.tx_io)
+			return;
+#endif
+
 		stack->flags &= ~(CTX_APP_DIRTY | CTX_TEXTURE_DIRTY);
 		tr_state->visual->has_modif = 1;
 #ifndef GPAC_DISABLE_3D
@@ -142,13 +159,15 @@
 
 
 #ifndef GPAC_DISABLE_3D
-	if (clear_all && !tr_state->visual->offscreen && tr_state->visual->compositor->hybrid_opengl) {
-		if (ctx->flags & CTX_BACKROUND_NOT_LAYER) {
-			color &= 0x00FFFFFF;
+	if (ctx->flags & CTX_BACKROUND_NOT_LAYER) {
+		if (clear_all && !tr_state->visual->offscreen && tr_state->visual->compositor->hybrid_opengl) {
 			compositor_2d_hybgl_clear_surface(tr_state->visual, NULL, color, GF_FALSE);
 			is_offscreen = GF_TRUE;
+			color &= 0x00FFFFFF;
 			//we may need to clear the canvas for immediate mode
 		}
+	} else {
+		is_offscreen = GF_TRUE;
 	}
 #endif
 	/*direct drawing, draw without clippers */
@@ -337,6 +356,8 @@
 	if (!status) return;
 
 	if (gf_node_dirty_get(node)) {
+		u32 i;
+
 		stack->flags |= CTX_APP_DIRTY;
 		gf_node_dirty_clear(node, 0);
 
@@ -346,6 +367,11 @@
 			status->ctx.aspect.fill_color = col;
 			stack->flags |= CTX_APP_DIRTY;
 		}
+		for (i=0; i<4; i++) {
+			stack->col_tx[3*i] = FIX2INT(255 * bck->backColor.red);
+			stack->col_tx[3*i+1] = FIX2INT(255 * bck->backColor.green);
+			stack->col_tx[3*i+2] = FIX2INT(255 * bck->backColor.blue);
+		}
 	}
 
 	if (back_use_texture(bck) ) {
@@ -363,6 +389,8 @@
 		status->ctx.flags = stack->flags | CTX_BACKROUND_NOT_LAYER;
 	} else {
 		status->ctx.flags = stack->flags;
+		if (tr_state->is_layer)
+			status->ctx.flags &= ~CTX_BACKROUND_NOT_LAYER;
 	}

v0.5.2.tar.gz/src/compositor/mpeg4_bitmap.c -> v0.6.1.tar.gz/src/compositor/mpeg4_bitmap.c Changed

@@ -35,7 +35,7 @@
 {
 	Drawable *graph;
 	/*cached size for 3D mode*/
-	SFVec2f size;
+	SFVec2f size, scale;
 	u32 prev_tx_w, prev_tx_h;
 	GF_Rect rc;
 } BitmapStack;
@@ -63,8 +63,9 @@
 		return;
 	}
 	/*no change in scale and same texture size*/
-	if (!gf_node_dirty_get(node) && (st->prev_tx_w == txh->width) && (st->prev_tx_h == txh->height)) {
+	if ((st->scale.x==bmp->scale.x) && (st->scale.y==bmp->scale.y) && (st->prev_tx_w == txh->width) && (st->prev_tx_h == txh->height)) {
 		*out_rc = st->rc;
+		gf_node_dirty_clear(node, 0);
 		return;
 	}
 
@@ -75,6 +76,7 @@
 	if (sx<0) sx = FIX_ONE;
 	sy = bmp->scale.y;
 	if (sy<0) sy = FIX_ONE;
+	st->scale = bmp->scale;
 
 	compositor_adjust_scale(txh->owner, &sx, &sy);
 
@@ -112,8 +114,9 @@
 #ifndef GPAC_DISABLE_3D
 static void draw_bitmap_3d(GF_Node *node, GF_TraverseState *tr_state)
 {
+	GF_Node *appear;
 	DrawAspect2D asp;
-
+	GF_ColorKey keyColor;
 	BitmapStack *st = (BitmapStack *)gf_node_get_private(node);
 	M_Bitmap *bmp = (M_Bitmap *)node;
 
@@ -123,13 +126,33 @@
 	memset(&asp, 0, sizeof(DrawAspect2D));
 	drawable_get_aspect_2d_mpeg4(node, &asp, tr_state);
 
+	appear = tr_state->override_appearance ? tr_state->override_appearance : tr_state->appear;
+	/*check for material key materialKey*/
+	if (appear) {
+		M_Appearance *app = (M_Appearance *)appear;
+		if ( app->material && (gf_node_get_tag((GF_Node *)app->material)==TAG_MPEG4_MaterialKey) ) {
+			M_MaterialKey*mk = (M_MaterialKey*)app->material;
+			if (mk->isKeyed) {
+				keyColor.r = FIX2INT(mk->keyColor.red * 255);
+				keyColor.g = FIX2INT(mk->keyColor.green * 255);
+				keyColor.b = FIX2INT(mk->keyColor.blue * 255);
+				keyColor.alpha = FIX2INT( (FIX_ONE - mk->transparency) * 255);
+				keyColor.low = FIX2INT(mk->lowThreshold * 255);
+				keyColor.high = FIX2INT(mk->highThreshold * 255);
+				tr_state->col_key = &keyColor;
+			}
+		}
+	}
+
 	compositor_3d_draw_bitmap(st->graph, &asp, tr_state, st->size.x, st->size.y, bmp->scale.x, bmp->scale.y);
+
+	tr_state->col_key = NULL;
 }
 #endif
 
 static void draw_bitmap_2d(GF_Node *node, GF_TraverseState *tr_state)
 {
-	GF_ColorKey *key, keyColor;
+	GF_ColorKey keyColor;
 	DrawableContext *ctx = tr_state->ctx;
 	BitmapStack *st = (BitmapStack *) gf_node_get_private(node);
 
@@ -138,7 +161,6 @@
 	ctx->transform.m[1] = ctx->transform.m[3] = 0;
 
 	/*check for material key materialKey*/
-	key = NULL;
 	if (ctx->appear) {
 		M_Appearance *app = (M_Appearance *)ctx->appear;
 		if ( app->material && (gf_node_get_tag((GF_Node *)app->material)==TAG_MPEG4_MaterialKey) ) {
@@ -150,14 +172,14 @@
 				keyColor.alpha = FIX2INT( (FIX_ONE - mk->transparency) * 255);
 				keyColor.low = FIX2INT(mk->lowThreshold * 255);
 				keyColor.high = FIX2INT(mk->highThreshold * 255);
-				key = &keyColor;
+				tr_state->col_key = &keyColor;
 
 			}
 		}
 	}
 
 	/*no HW, fall back to the graphics driver*/
-	if (!tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx, key)) {
+	if (!tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx)) {
 		GF_Matrix2D _mat;
 		GF_Rect rc = gf_rect_center(ctx->bi->unclip.width, ctx->bi->unclip.height);
 		gf_mx2d_copy(_mat, ctx->transform);
@@ -168,9 +190,8 @@
 		gf_path_add_rect_center(st->graph->path, 0, 0, rc.width, rc.height);
 		ctx->flags |= CTX_NO_ANTIALIAS;
 		visual_2d_texture_path(tr_state->visual, st->graph->path, ctx, tr_state);
-		return;
 	}
-
+	tr_state->col_key = NULL;
 }
 
 static void TraverseBitmap(GF_Node *node, void *rs, Bool is_destroy)

v0.5.2.tar.gz/src/compositor/mpeg4_composite.c -> v0.6.1.tar.gz/src/compositor/mpeg4_composite.c Changed

@@ -53,7 +53,7 @@
 } CompositeTextureStack;
 
 
-static Bool composite2d_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, struct _drawable_context *ctx, GF_ColorKey *col_key)
+static Bool composite2d_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, struct _drawable_context *ctx)
 {
 	u8 alpha = 0xFF;
 	GF_VideoSurface offscreen_dst, video_src;
@@ -103,7 +103,7 @@
 	offscreen_dst.pixel_format = st->txh.pixelformat;
 	offscreen_dst.video_buffer = st->txh.data;
 
-	gf_stretch_bits(&offscreen_dst, &video_src, &dst_wnd, &src_wnd, alpha, 0, col_key, ctx->col_mat);
+	gf_stretch_bits(&offscreen_dst, &video_src, &dst_wnd, &src_wnd, alpha, 0, tr_state->col_key, ctx->col_mat);
 	return 1;
 }
 
@@ -139,6 +139,7 @@
 #ifdef GPAC_USE_TINYGL
 		if (st->tgl_ctx) ostgl_delete_context(st->tgl_ctx);
 #endif
+
 		gf_list_del(st->sensors);
 		gf_list_del(st->previous_sensors);
 
@@ -285,12 +286,12 @@
 
 #ifndef GPAC_DISABLE_3D
 	/*no alpha support in offscreen rendering*/
-	if ( (st->visual->type_3d) && !(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA))
+	if (!compositor->visual->type_3d && !compositor->hybrid_opengl && (st->visual->type_3d) && !(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA))
 		new_pixel_format = GF_PIXEL_RGB_24;
 #endif
 
 	/*in OpenGL_ES, only RGBA can be safelly used with glReadPixels*/
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	new_pixel_format = GF_PIXEL_RGBA;
 #endif
 
@@ -416,12 +417,12 @@
 		st->visual->height = txh->height;
 
 		stencil = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
-		/*TODO - add support for compositeTexture3D when root is 2D visual*/
+
 #ifndef GPAC_DISABLE_3D
 		if (st->visual->type_3d) {
 			GF_Compositor *compositor = st->visual->compositor;
 			/*figure out what to do if main visual (eg video out) is not in OpenGL ...*/
-			if (!compositor->visual->type_3d) {
+			if (!compositor->visual->type_3d && !compositor->hybrid_opengl) {
 				/*create an offscreen window for OpenGL rendering*/
 				if ((compositor->offscreen_width < st->txh.width) || (compositor->offscreen_height < st->txh.height)) {
 #ifndef GPAC_USE_TINYGL
@@ -472,389 +473,413 @@
 	}
 	if (!txh->tx_io) return;
 
-	stencil = gf_sc_texture_get_stencil(txh);
-	if (!stencil) return;
-
+#ifndef GPAC_DISABLE_3D
+	if (st->visual->camera.is_3D) {
 #ifdef GPAC_USE_TINYGL
-	if (st->tgl_ctx) ostgl_make_current(st->tgl_ctx, 0);
+		st->visual->type_3d = 2;
+#else
+		if (compositor->visual->type_3d) {
+			st->visual->type_3d = 2;
+		} else if (compositor->hybrid_opengl) {
+			st->visual->type_3d = 2;
+		} else if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN)) {
+			st->visual->type_3d = 0;
+		} else {
+			st->visual->type_3d = 2;
+		}
+	}
+#endif
+
 #endif
 
-	GF_SAFEALLOC(tr_state, GF_TraverseState);
-	tr_state->vrml_sensors = gf_list_new();
-	tr_state->visual = st->visual;
-	tr_state->invalidate_all = invalidate_all;
+		stencil = gf_sc_texture_get_stencil(txh);
+		if (!stencil) return;
+
+#ifdef GPAC_USE_TINYGL
+		if (st->tgl_ctx) ostgl_make_current(st->tgl_ctx, 0);
+#endif
 
-	tr_state->immediate_draw = st->visual->compositor->traverse_state->immediate_draw;
+		GF_SAFEALLOC(tr_state, GF_TraverseState);
+		tr_state->vrml_sensors = gf_list_new();
+		tr_state->visual = st->visual;
+		tr_state->invalidate_all = invalidate_all;
 
-	gf_mx2d_init(tr_state->transform);
-	gf_cmx_init(&tr_state->color_mat);
+		tr_state->immediate_draw = st->visual->compositor->traverse_state->immediate_draw;
 
-	tr_state->backgrounds = st->visual->back_stack;
-	tr_state->viewpoints = st->visual->view_stack;
-	tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(st->txh.owner));
-	tr_state->min_hsize = INT2FIX( MIN(txh->width, txh->height) ) / 2;
-	tr_state->vp_size.x = INT2FIX(txh->width);
-	tr_state->vp_size.y = INT2FIX(txh->height);
+		gf_mx2d_init(tr_state->transform);
+		gf_cmx_init(&tr_state->color_mat);
 
-	composite_do_bindable(st->txh.owner, tr_state, st->first);
-	st->first = 0;
+		tr_state->backgrounds = st->visual->back_stack;
+		tr_state->viewpoints = st->visual->view_stack;
+		tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(st->txh.owner));
+		tr_state->min_hsize = INT2FIX( MIN(txh->width, txh->height) ) / 2;
+		tr_state->vp_size.x = INT2FIX(txh->width);
+		tr_state->vp_size.y = INT2FIX(txh->height);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Entering draw cycle\n"));
+		composite_do_bindable(st->txh.owner, tr_state, st->first);
+		st->first = 0;
 
-	txh->needs_refresh = visual_draw_frame(st->visual, st->txh.owner, tr_state, 0);
-	txh->transparent = (st->visual->last_had_back==2) ? 0 : 1;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Entering draw cycle\n"));
 
+		txh->needs_refresh = visual_draw_frame(st->visual, st->txh.owner, tr_state, 0);
+		txh->transparent = (st->visual->last_had_back==2) ? 0 : 1;
 
-	if (!compositor->edited_text && st->visual->has_text_edit)
-		st->visual->has_text_edit = 0;
+		if (!compositor->edited_text && st->visual->has_text_edit)
+			st->visual->has_text_edit = 0;
 
 
-	/*set active viewport in image coordinates top-left=(0, 0), not in BIFS*/
-	if (0 && gf_list_count(st->visual->view_stack)) {
-		M_Viewport *vp = (M_Viewport *)gf_list_get(st->visual->view_stack, 0);
+		/*set active viewport in image coordinates top-left=(0, 0), not in BIFS*/
+		if (0 && gf_list_count(st->visual->view_stack)) {
+			M_Viewport *vp = (M_Viewport *)gf_list_get(st->visual->view_stack, 0);
 
-		if (vp->isBound) {
-			SFVec2f size = vp->size;
-			if (size.x >=0 && size.y>=0) {
-				/*FIXME - we need tracking of VP changes*/
-				txh->needs_refresh = 1;
+			if (vp->isBound) {
+				SFVec2f size = vp->size;
+				if (size.x >=0 && size.y>=0) {
+					/*FIXME - we need tracking of VP changes*/
+					txh->needs_refresh = 1;
+				}
 			}
 		}
-	}
 
-	if (txh->needs_refresh) {
+		if (txh->needs_refresh) {
 #ifndef GPAC_DISABLE_3D
-		if (st->visual->camera.is_3D) {
-			if (st->visual->compositor->visual->type_3d) {
+			//for composite 3D, store current buffer to texture - TODO: use FBOs to avoid the copy ...
+			if (st->visual->camera.is_3D && (st->visual->compositor->visual->type_3d || st->visual->compositor->hybrid_opengl)) {
 #ifndef GPAC_USE_TINYGL
 				gf_sc_copy_to_texture(&st->txh);
+#endif
+			}
+			else if (st->visual->camera.is_3D) {
+				if (st->visual->compositor->visual->type_3d) {
+#ifndef GPAC_USE_TINYGL
+					gf_sc_copy_to_texture(&st->txh);
 #else
-				/*in TinyGL we only need to push associated bitmap to the texture*/
-				gf_sc_texture_push_image(&st->txh, 0, 0);
+					/*in TinyGL we only need to push associated bitmap to the texture*/
+					gf_sc_texture_push_image(&st->txh, 0, 0);
 #endif
-			} else {
+				} else {
 
 #ifndef GPAC_USE_TINYGL
-				gf_sc_copy_to_stencil(&st->txh);
+					gf_sc_copy_to_stencil(&st->txh);
 
 #else
 
-				if (txh->pixelformat==GF_PIXEL_RGBDS) gf_get_tinygl_depth(&st->txh);
+					if (txh->pixelformat==GF_PIXEL_RGBDS) gf_get_tinygl_depth(&st->txh);
 #endif
-			}
-		} else
+				}
+			} else
 #endif
-		{
-			if (raster->stencil_texture_modified) raster->stencil_texture_modified(stencil);
-			gf_sc_texture_set_stencil(txh, stencil);
+			{
+				if (raster->stencil_texture_modified) raster->stencil_texture_modified(stencil);
+				gf_sc_texture_set_stencil(txh, stencil);
+			}
+			gf_sc_invalidate(st->txh.compositor, NULL);
 		}
-		gf_sc_invalidate(st->txh.compositor, NULL);
+		gf_list_del(tr_state->vrml_sensors);
+		gf_free(tr_state);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Leaving draw cycle\n"));
 	}
-	gf_list_del(tr_state->vrml_sensors);
-	gf_free(tr_state);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Leaving draw cycle\n"));
-}
 
 
-GF_Err composite_get_video_access(GF_VisualManager *visual)
-{
-	GF_STENCIL stencil;
-	GF_Err e;
-	CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(visual->offscreen);
-
-	if (!st->txh.tx_io || !visual->raster_surface) return GF_BAD_PARAM;
-	stencil = gf_sc_texture_get_stencil(&st->txh);
-	if (!stencil) return GF_BAD_PARAM;
-	e = visual->compositor->rasterizer->surface_attach_to_texture(visual->raster_surface, stencil);
-	if (!e) visual->is_attached = 1;
-	return e;
-}
+	GF_Err composite_get_video_access(GF_VisualManager *visual)
+	{
+		GF_STENCIL stencil;
+		GF_Err e;
+		CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(visual->offscreen);
+
+		if (!st->txh.tx_io || !visual->raster_surface) return GF_BAD_PARAM;
+		stencil = gf_sc_texture_get_stencil(&st->txh);
+		if (!stencil) return GF_BAD_PARAM;
+		e = visual->compositor->rasterizer->surface_attach_to_texture(visual->raster_surface, stencil);
+		if (!e) visual->is_attached = 1;
+		return e;
+	}
 
-void composite_release_video_access(GF_VisualManager *visual)
-{
-	visual->compositor->rasterizer->surface_detach(visual->raster_surface);
-}
+	void composite_release_video_access(GF_VisualManager *visual)
+	{
+		visual->compositor->rasterizer->surface_detach(visual->raster_surface);
+	}
 
-void compositor_init_compositetexture2d(GF_Compositor *compositor, GF_Node *node)
-{
-	M_CompositeTexture2D *c2d = (M_CompositeTexture2D *)node;
-	CompositeTextureStack *st;
-	GF_SAFEALLOC(st, CompositeTextureStack);
-	st->sensors = gf_list_new();
-	st->previous_sensors = gf_list_new();
-	gf_sc_texture_setup(&st->txh, compositor, node);
-	/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
-	gf_list_del_item(compositor->textures, &st->txh);
-	gf_list_add(compositor->textures, &st->txh);
-
-	st->txh.update_texture_fcnt = composite_update;
-
-	if ((c2d->repeatSandT==1) || (c2d->repeatSandT==3) ) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
-	if (c2d->repeatSandT>1) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
-
-	/*create composite visual*/
-	st->visual = visual_new(compositor);
-	st->visual->offscreen = node;
-	st->visual->GetSurfaceAccess = composite_get_video_access;
-	st->visual->ReleaseSurfaceAccess = composite_release_video_access;
-	st->visual->raster_surface = compositor->rasterizer->surface_new(compositor->rasterizer, 1);
-	st->visual->DrawBitmap = composite2d_draw_bitmap;
-
-	st->first = 1;
-	st->visual->compositor = compositor;
-	gf_node_set_private(node, st);
-	gf_node_set_callback_function(node, composite_traverse);
-	gf_sc_visual_register(compositor, st->visual);
-}
+	Bool composite_check_visual_attached(GF_VisualManager *visual)
+	{
+		return visual->is_attached;
+	}
+
+	void compositor_init_compositetexture2d(GF_Compositor *compositor, GF_Node *node)
+	{
+		M_CompositeTexture2D *c2d = (M_CompositeTexture2D *)node;
+		CompositeTextureStack *st;
+		GF_SAFEALLOC(st, CompositeTextureStack);
+		st->sensors = gf_list_new();
+		st->previous_sensors = gf_list_new();
+		gf_sc_texture_setup(&st->txh, compositor, node);
+		/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
+		gf_list_del_item(compositor->textures, &st->txh);
+		gf_list_add(compositor->textures, &st->txh);
+
+		st->txh.update_texture_fcnt = composite_update;
+
+		if ((c2d->repeatSandT==1) || (c2d->repeatSandT==3) ) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
+		if (c2d->repeatSandT>1) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
+
+		/*create composite visual*/
+		st->visual = visual_new(compositor);
+		st->visual->offscreen = node;
+		st->visual->GetSurfaceAccess = composite_get_video_access;
+		st->visual->ReleaseSurfaceAccess = composite_release_video_access;
+		st->visual->DrawBitmap = composite2d_draw_bitmap;
+		st->visual->CheckAttached = composite_check_visual_attached;
+
+		st->visual->raster_surface = compositor->rasterizer->surface_new(compositor->rasterizer, 1);
+
+
+		st->first = 1;
+		st->visual->compositor = compositor;
+		gf_node_set_private(node, st);
+		gf_node_set_callback_function(node, composite_traverse);
+		gf_sc_visual_register(compositor, st->visual);
+	}
 
 
 #ifndef GPAC_DISABLE_3D
-void compositor_init_compositetexture3d(GF_Compositor *compositor, GF_Node *node)
-{
-	M_CompositeTexture3D *c3d = (M_CompositeTexture3D *)node;
-	CompositeTextureStack *st;
-	GF_SAFEALLOC(st, CompositeTextureStack);
-	st->sensors = gf_list_new();
-	st->previous_sensors = gf_list_new();
-	gf_sc_texture_setup(&st->txh, compositor, node);
-	/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
-	gf_list_del_item(compositor->textures, &st->txh);
-	gf_list_add(compositor->textures, &st->txh);
-
-	st->txh.update_texture_fcnt = composite_update;
-
-	if (c3d->repeatS) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
-	if (c3d->repeatT) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
-
-	/*create composite visual*/
-	st->visual = visual_new(compositor);
-	st->visual->offscreen = node;
-	st->visual->GetSurfaceAccess = composite_get_video_access;
-	st->visual->ReleaseSurfaceAccess = composite_release_video_access;
-
-	st->first = 1;
-	st->visual->compositor = compositor;
-	gf_node_set_private(node, st);
-	gf_node_set_callback_function(node, composite_traverse);
-	gf_sc_visual_register(compositor, st->visual);
+	void compositor_init_compositetexture3d(GF_Compositor *compositor, GF_Node *node)
+	{
+		M_CompositeTexture3D *c3d = (M_CompositeTexture3D *)node;
+		CompositeTextureStack *st;
+		GF_SAFEALLOC(st, CompositeTextureStack);
+		st->sensors = gf_list_new();
+		st->previous_sensors = gf_list_new();
+		gf_sc_texture_setup(&st->txh, compositor, node);
+		/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
+		gf_list_del_item(compositor->textures, &st->txh);
+		gf_list_add(compositor->textures, &st->txh);
+
+		st->txh.update_texture_fcnt = composite_update;
+
+		if (c3d->repeatS) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
+		if (c3d->repeatT) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
+
+		/*create composite visual*/
+		st->visual = visual_new(compositor);
+		st->visual->offscreen = node;
+		st->visual->GetSurfaceAccess = composite_get_video_access;
+		st->visual->ReleaseSurfaceAccess = composite_release_video_access;
+		st->visual->CheckAttached = composite_check_visual_attached;
 
-#ifdef GPAC_USE_TINYGL
-	st->visual->type_3d = 2;
-	st->visual->camera.is_3D = 1;
-#else
-	if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN)) {
-		st->visual->type_3d = 0;
-		st->visual->camera.is_3D = 0;
-	} else {
-		st->visual->type_3d = 2;
 		st->visual->camera.is_3D = 1;
+		st->first = 1;
+		st->visual->compositor = compositor;
+		gf_node_set_private(node, st);
+		gf_node_set_callback_function(node, composite_traverse);
+		gf_sc_visual_register(compositor, st->visual);
+
+		camera_invalidate(&st->visual->camera);
 	}
 #endif
-	camera_invalidate(&st->visual->camera);
-}
-#endif
 
-GF_TextureHandler *compositor_get_composite_texture(GF_Node *node)
-{
-	CompositeTextureStack *st = (CompositeTextureStack*) gf_node_get_private(node);
-	return &st->txh;
-}
+	GF_TextureHandler *compositor_get_composite_texture(GF_Node *node)
+	{
+		CompositeTextureStack *st = (CompositeTextureStack*) gf_node_get_private(node);
+		return &st->txh;
+	}
 
-Bool compositor_compositetexture_handle_event(GF_Compositor *compositor, GF_Node *composite_appear, GF_Event *ev, Bool is_flush)
-{
-	GF_Ray ray;
-	Fixed dist;
-	Bool had_text_sel=0;
-	GF_Matrix mx;
-	GF_TraverseState *tr_state;
-	GF_ChildNodeItem *children, *l;
-	Bool res;
-	SFVec3f txcoord, loc_pt, world_pt;
-	GF_Matrix l2w_mx, w2l_mx;
-	CompositeTextureStack *stack;
-	GF_Node *appear, *prev_appear;
-	M_Appearance *ap = (M_Appearance *)composite_appear;
-	assert(ap && ap->texture);
-
-	if (ev->type > GF_EVENT_MOUSEMOVE) return 0;
-	stack = gf_node_get_private(ap->texture);
-	if (!stack->txh.tx_io) return 0;
-
-	tr_state = NULL;
-	children = NULL;
-
-
-	if (!is_flush) {
-		txcoord.x = compositor->hit_texcoords.x;
-		txcoord.y = compositor->hit_texcoords.y;
-		txcoord.z = 0;
-		if (gf_sc_texture_get_transform(&stack->txh, ap->textureTransform, &mx, 1)) {
-			/*tx coords are inverted when mapping, thus applying directly the matrix will give us the
-			untransformed coords*/
-			gf_mx_apply_vec(&mx, &txcoord);
-			while (txcoord.x<0) txcoord.x += FIX_ONE;
-			while (txcoord.x>FIX_ONE) txcoord.x -= FIX_ONE;
-			while (txcoord.y<0) txcoord.y += FIX_ONE;
-			while (txcoord.y>FIX_ONE) txcoord.y -= FIX_ONE;
-		}
-
-		/*convert to tx space*/
-		ev->mouse.x = FIX2INT( (txcoord.x - FIX_ONE/2) * stack->visual->width + FIX_ONE/2);
-		ev->mouse.y = FIX2INT( (txcoord.y - FIX_ONE/2) * stack->visual->height + FIX_ONE/2);
+	Bool compositor_compositetexture_handle_event(GF_Compositor *compositor, GF_Node *composite_appear, GF_Event *ev, Bool is_flush)
+	{
+		GF_Ray ray;
+		Fixed dist;
+		Bool had_text_sel=0;
+		GF_Matrix mx;
+		GF_TraverseState *tr_state;
+		GF_ChildNodeItem *children, *l;
+		Bool res;
+		SFVec3f txcoord, loc_pt, world_pt;
+		GF_Matrix l2w_mx, w2l_mx;
+		CompositeTextureStack *stack;
+		GF_Node *appear, *prev_appear;
+		M_Appearance *ap = (M_Appearance *)composite_appear;
+		assert(ap && ap->texture);
+
+		if (ev->type > GF_EVENT_MOUSEMOVE) return 0;
+		stack = gf_node_get_private(ap->texture);
+		if (!stack->txh.tx_io) return 0;
+
+		tr_state = NULL;
+		children = NULL;
+
+
+		if (!is_flush) {
+			txcoord.x = compositor->hit_texcoords.x;
+			txcoord.y = compositor->hit_texcoords.y;
+			txcoord.z = 0;
+			if (gf_sc_texture_get_transform(&stack->txh, ap->textureTransform, &mx, 1)) {
+				/*tx coords are inverted when mapping, thus applying directly the matrix will give us the
+				untransformed coords*/
+				gf_mx_apply_vec(&mx, &txcoord);
+				while (txcoord.x<0) txcoord.x += FIX_ONE;
+				while (txcoord.x>FIX_ONE) txcoord.x -= FIX_ONE;
+				while (txcoord.y<0) txcoord.y += FIX_ONE;
+				while (txcoord.y>FIX_ONE) txcoord.y -= FIX_ONE;
+			}
 
+			/*convert to tx space*/
+			ev->mouse.x = FIX2INT( (txcoord.x - FIX_ONE/2) * stack->visual->width + FIX_ONE/2);
+			ev->mouse.y = FIX2INT( (txcoord.y - FIX_ONE/2) * stack->visual->height + FIX_ONE/2);
 
-		GF_SAFEALLOC(tr_state, GF_TraverseState);
-		tr_state->vrml_sensors = gf_list_new();
-		tr_state->visual = stack->visual;
-		tr_state->traversing_mode = TRAVERSE_PICK;
-		tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(ap->texture));
-		tr_state->vp_size.x = INT2FIX(stack->txh.width);
-		tr_state->vp_size.y = INT2FIX(stack->txh.height);
-		tr_state->color_mat.identity = 1;
 
-		gf_mx2d_init(tr_state->transform);
+			GF_SAFEALLOC(tr_state, GF_TraverseState);
+			tr_state->vrml_sensors = gf_list_new();
+			tr_state->visual = stack->visual;
+			tr_state->traversing_mode = TRAVERSE_PICK;
+			tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(ap->texture));
+			tr_state->vp_size.x = INT2FIX(stack->txh.width);
+			tr_state->vp_size.y = INT2FIX(stack->txh.height);
+			tr_state->color_mat.identity = 1;
+
+			gf_mx2d_init(tr_state->transform);
 #ifndef GPAC_DISABLE_3D
-		gf_mx_init(tr_state->model_matrix);
+			gf_mx_init(tr_state->model_matrix);
 #endif
-		/*collect sensors but not anchors*/
-		l = children = ((M_CompositeTexture2D*)ap->texture)->children;
-		while (l) {
-			GF_SensorHandler *hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
-			if (hsens) gf_list_add(tr_state->vrml_sensors, hsens);
-			l = l->next;
+			/*collect sensors but not anchors*/
+			l = children = ((M_CompositeTexture2D*)ap->texture)->children;
+			while (l) {
+				GF_SensorHandler *hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
+				if (hsens) gf_list_add(tr_state->vrml_sensors, hsens);
+				l = l->next;
+			}
 		}
-	}
 
-	stack->temp_sensors = compositor->sensors;
-	stack->temp_previous_sensors = compositor->previous_sensors;
-	compositor->sensors = stack->sensors;
-	compositor->previous_sensors = stack->previous_sensors;
+		stack->temp_sensors = compositor->sensors;
+		stack->temp_previous_sensors = compositor->previous_sensors;
+		compositor->sensors = stack->sensors;
+		compositor->previous_sensors = stack->previous_sensors;
 
-	ray = compositor->hit_world_ray;
-	dist = compositor->hit_square_dist;
-	prev_appear = compositor->prev_hit_appear;
+		ray = compositor->hit_world_ray;
+		dist = compositor->hit_square_dist;
+		prev_appear = compositor->prev_hit_appear;
 
-	/*protect against destrucion in case of self-destroy*/
-	if (prev_appear) {
-		gf_node_register(prev_appear, NULL);
-	}
-	compositor->prev_hit_appear = stack->prev_hit_appear;
-	appear = compositor->hit_appear;
-	compositor->hit_appear = NULL;
-
-	/*also backup current hit state in case we hit a node in the texture but don't consume the event*/
-	loc_pt = compositor->hit_local_point;
-	world_pt = compositor->hit_world_point;
-	gf_mx_copy(l2w_mx, compositor->hit_local_to_world);
-	gf_mx_copy(w2l_mx, compositor->hit_world_to_local);
-
-	if (compositor->text_selection) had_text_sel=1;
-
-	if (is_flush) {
-		res = 0;
-		gf_list_reset(stack->sensors);
-		gf_sc_exec_event_vrml(compositor, ev);
-	} else {
-		res = visual_execute_event(stack->visual, tr_state, ev, children);
-	}
-
-	if (!had_text_sel && compositor->edited_text) {
-		stack->visual->has_text_edit = 1;
-	} else if (!compositor->text_selection) {
-		stack->visual->has_text_edit = 0;
-	}
-
-	if (!res) {
-		compositor->hit_local_point = loc_pt;
-		gf_mx_copy(compositor->hit_local_to_world, l2w_mx);
-		gf_mx_copy(compositor->hit_world_to_local, w2l_mx);
-	}
+		/*protect against destrucion in case of self-destroy*/
+		if (prev_appear) {
+			gf_node_register(prev_appear, NULL);
+		}
+		compositor->prev_hit_appear = stack->prev_hit_appear;
+		appear = compositor->hit_appear;
+		compositor->hit_appear = NULL;
+
+		/*also backup current hit state in case we hit a node in the texture but don't consume the event*/
+		loc_pt = compositor->hit_local_point;
+		world_pt = compositor->hit_world_point;
+		gf_mx_copy(l2w_mx, compositor->hit_local_to_world);
+		gf_mx_copy(w2l_mx, compositor->hit_world_to_local);
+
+		if (compositor->text_selection) had_text_sel=1;
+
+		if (is_flush) {
+			res = 0;
+			gf_list_reset(stack->sensors);
+			gf_sc_exec_event_vrml(compositor, ev);
+		} else {
+			res = visual_execute_event(stack->visual, tr_state, ev, children);
+		}
 
-	stack->prev_hit_appear = compositor->prev_hit_appear;
+		if (!had_text_sel && compositor->edited_text) {
+			stack->visual->has_text_edit = 1;
+		} else if (!compositor->text_selection) {
+			stack->visual->has_text_edit = 0;
+		}
 
-	if (prev_appear) {
-		if (prev_appear->sgprivate->num_instances>1) {
-			compositor->prev_hit_appear = prev_appear;
-			compositor->hit_appear = appear;
-		} else {
-			compositor->prev_hit_appear = NULL;
-			compositor->hit_appear = NULL;
+		if (!res) {
+			compositor->hit_local_point = loc_pt;
+			gf_mx_copy(compositor->hit_local_to_world, l2w_mx);
+			gf_mx_copy(compositor->hit_world_to_local, w2l_mx);
 		}
-		gf_node_unregister(prev_appear, NULL);
-	} else {
-		compositor->prev_hit_appear = prev_appear;
-		compositor->hit_appear = appear;
-	}
 
-	compositor->hit_world_point = world_pt;
-	compositor->hit_world_ray = ray;
-	compositor->hit_square_dist = dist;
+		compositor->hit_world_point = world_pt;
+		compositor->hit_world_ray = ray;
+		compositor->hit_square_dist = dist;
 
-	stack->sensors = compositor->sensors;
-	stack->previous_sensors = compositor->previous_sensors;
-	compositor->sensors = stack->temp_sensors;
-	stack->temp_sensors = NULL;
-	compositor->previous_sensors = stack->temp_previous_sensors;
-	stack->temp_previous_sensors = NULL;
+		stack->sensors = compositor->sensors;
+		stack->previous_sensors = compositor->previous_sensors;
+		compositor->sensors = stack->temp_sensors;
+		stack->temp_sensors = NULL;
+		compositor->previous_sensors = stack->temp_previous_sensors;
+		stack->temp_previous_sensors = NULL;
 
 
-	if (!is_flush) {
-		gf_list_del(tr_state->vrml_sensors);
+		if (!is_flush) {
+			gf_list_del(tr_state->vrml_sensors);
 #ifndef GPAC_DISABLE_3D
-		if (tr_state->layer3d) compositor->traverse_state->layer3d = tr_state->layer3d;
+			if (tr_state->layer3d) compositor->traverse_state->layer3d = tr_state->layer3d;
 #endif
-		gf_free(tr_state);
-	}
-	return res;
-}
+			gf_free(tr_state);
+		}
 
-void compositor_compositetexture_sensor_delete(GF_Node *composite_appear, GF_SensorHandler *hdl)
-{
-	CompositeTextureStack *stack = gf_node_get_private(composite_appear);
-	gf_list_del_item(stack->previous_sensors, hdl);
-	gf_list_del_item(stack->sensors, hdl);
-	if (stack->temp_sensors)
-		gf_list_del_item(stack->temp_sensors, hdl);
-	if (stack->temp_previous_sensors)
-		gf_list_del_item(stack->temp_previous_sensors, hdl);
-}
+		stack->prev_hit_appear = compositor->prev_hit_appear;
 
+		//finally unregister the node, this may destroy the stack !
+		if (prev_appear) {
+			if (prev_appear->sgprivate->num_instances>1) {
+				compositor->prev_hit_appear = prev_appear;
+				compositor->hit_appear = appear;
+			} else {
+				compositor->prev_hit_appear = NULL;
+				compositor->hit_appear = NULL;
+			}
+			gf_node_unregister(prev_appear, NULL);
+		} else {
+			compositor->prev_hit_appear = prev_appear;
+			compositor->hit_appear = appear;
+		}
 
-void compositor_adjust_scale(GF_Node *node, Fixed *sx, Fixed *sy)
-{
-	switch (gf_node_get_tag(node)) {
-	case TAG_MPEG4_CompositeTexture2D:
-	case TAG_MPEG4_CompositeTexture3D:
+		return res;
+	}
+
+	void compositor_compositetexture_sensor_delete(GF_Node *composite_appear, GF_SensorHandler *hdl)
 	{
-		CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(node);
-		(*sx) = gf_divfix(*sx, st->sx);
-		(*sy) = gf_divfix(*sy, st->sy);
-		break;
+		CompositeTextureStack *stack = gf_node_get_private(composite_appear);
+		gf_list_del_item(stack->previous_sensors, hdl);
+		gf_list_del_item(stack->sensors, hdl);
+		if (stack->temp_sensors)
+			gf_list_del_item(stack->temp_sensors, hdl);
+		if (stack->temp_previous_sensors)
+			gf_list_del_item(stack->temp_previous_sensors, hdl);
 	}
-	default:
-		return;
+
+
+	void compositor_adjust_scale(GF_Node *node, Fixed *sx, Fixed *sy)
+	{
+		switch (gf_node_get_tag(node)) {
+		case TAG_MPEG4_CompositeTexture2D:
+		case TAG_MPEG4_CompositeTexture3D:
+		{
+			CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(node);
+			(*sx) = gf_divfix(*sx, st->sx);
+			(*sy) = gf_divfix(*sy, st->sy);
+			break;
+		}
+		default:
+			return;
+		}
 	}
-}
 
-Bool compositor_is_composite_texture(GF_Node *appear)
-{
-	u32 tag;
-	if (!appear) return 0;
-	tag = gf_node_get_tag(appear);
-	if ((tag==TAG_MPEG4_Appearance)
+	Bool compositor_is_composite_texture(GF_Node *appear)
+	{
+		M_Appearance *ap = NULL;
+		u32 tag;
+		if (!appear) return 0;
+
+		tag = gf_node_get_tag(appear);
+		if (tag==TAG_MPEG4_Appearance) ap = (M_Appearance *)appear;
 #ifndef GPAC_DISABLE_X3D
-	 || (tag==TAG_X3D_Appearance)
+		else if (tag==TAG_X3D_Appearance) ap = (M_Appearance *)appear;
 #endif
-	 ) {
-		M_Appearance *ap = (M_Appearance *)appear;
+		if (!ap) return 0;
 		if (!ap->texture) return 0;
 		switch (gf_node_get_tag(((M_Appearance *)appear)->texture)) {
 		case TAG_MPEG4_CompositeTexture2D:
 		case TAG_MPEG4_CompositeTexture3D:
 			return 1;
 		}
+		return 0;
 	}
-	return 0;
-}
 
 #endif /*GPAC_DISABLE_VRML*/

v0.5.2.tar.gz/src/compositor/mpeg4_form.c -> v0.6.1.tar.gz/src/compositor/mpeg4_form.c Changed

@@ -233,8 +233,8 @@
 		if (fm->size.y>=0) st->clip.height = fm->size.y;
 		st->bounds = st->clip = gf_rect_center(st->clip.width, st->clip.height);
 	}
-	recompute_form = 0;
-	if (gf_node_dirty_get(n)) recompute_form = 1;
+	recompute_form = GF_FALSE;
+	if (gf_node_dirty_get(n)) recompute_form = GF_TRUE;
 
 #if FORM_CLIPS
 	if ((tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) && !tr_state->for_node) {
@@ -339,17 +339,26 @@
 	/*update clipper*/
 	if (tr_state->traversing_mode==TRAVERSE_SORT) {
 		prev_clip = tr_state->visual->top_clipper;
-		compositor_2d_update_clipper(tr_state, st->clip, &had_clip, &prev_clipper, 0);
+		compositor_2d_update_clipper(tr_state, st->clip, &had_clip, &prev_clipper, GF_FALSE);
 		if (tr_state->has_clip) {
 			tr_state->visual->top_clipper = gf_rect_pixelize(&tr_state->clipper);
 			gf_irect_intersect(&tr_state->visual->top_clipper, &prev_clip);
 		}
 
+#ifndef GPAC_DISABLE_3D
+		if (tr_state->visual->type_3d)
+			visual_3d_reset_clipper_2d(tr_state->visual);
+#endif
+
 		i=0;
-		while ((cg = gf_list_enum(st->groups, &i))) {
+		while ((cg = (ChildGroup*)gf_list_enum(st->groups, &i))) {
 			parent_node_child_traverse(cg, tr_state);
 		}
 
+#ifndef GPAC_DISABLE_3D
+		if (tr_state->visual->type_3d)
+			visual_3d_reset_clipper_2d(tr_state->visual);
+#endif
 		tr_state->visual->top_clipper = prev_clip;
 		if (had_clip) tr_state->clipper = prev_clipper;
 		tr_state->has_clip = had_clip;
@@ -357,7 +366,7 @@
 #endif
 	{
 		i=0;
-		while ((cg = gf_list_enum(st->groups, &i))) {
+		while ((cg = (ChildGroup*)gf_list_enum(st->groups, &i))) {
 			parent_node_child_traverse(cg, tr_state);
 		}
 	}

v0.5.2.tar.gz/src/compositor/mpeg4_geometry_2d.c -> v0.6.1.tar.gz/src/compositor/mpeg4_geometry_2d.c Changed

v0.5.2.tar.gz/src/compositor/mpeg4_geometry_3d.c -> v0.6.1.tar.gz/src/compositor/mpeg4_geometry_3d.c Changed

v0.5.2.tar.gz/src/compositor/mpeg4_gradients.c -> v0.6.1.tar.gz/src/compositor/mpeg4_gradients.c Changed

@@ -155,6 +155,8 @@
 	txh->compositor->rasterizer->stencil_set_linear_gradient(stencil, lg->startPoint.x, lg->startPoint.y, lg->endPoint.x, lg->endPoint.y);
 }
 
+//TODO - replace this with shader-based code ...
+
 static void BuildLinearGradientTexture(GF_TextureHandler *txh)
 {
 	u32 i;
@@ -169,6 +171,7 @@
 	GF_Path *path;
 	GF_Err e;
 	Bool transparent;
+	u32 pix_fmt = 0;
 	M_LinearGradient *lg = (M_LinearGradient *) txh->owner;
 	GradientStack *st = (GradientStack *) gf_node_get_private(txh->owner);
 	GF_Raster2D *raster = txh->compositor->rasterizer;
@@ -181,11 +184,6 @@
 			gf_list_insert(txh->compositor->textures, txh, 0);
 	}
 
-	if (st->tx_data) {
-		gf_free(st->tx_data);
-		st->tx_data = NULL;
-	}
-
 	if (lg->key.count<2) return;
 	if (lg->key.count != lg->keyValue.count) return;
 
@@ -204,6 +202,7 @@
 	}
 
 	if (st->txh.flags & GF_SR_TEXTURE_GRAD_NO_RGB) transparent = 1;
+
 	if (st->tx_data && (st->txh.transparent != transparent)) {
 		gf_free(st->tx_data);
 		st->tx_data = NULL;
@@ -212,10 +211,15 @@
 	if (transparent) {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
-		} else {
-			memset(st->tx_data, 0, sizeof(char)*txh->stride*txh->height);
 		}
-		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, 1);
+		memset(st->tx_data, 0, sizeof(char)*txh->stride*txh->height);
+
+		pix_fmt = GF_PIXEL_RGBA;
+		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+		if (e) {
+			pix_fmt = GF_PIXEL_ARGB;
+			e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+		}
 	} else {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*3);
@@ -304,17 +308,19 @@
 	if (transparent) {
 		u32 j;
 		txh->stride = GRAD_TEXTURE_SIZE*4;
+		txh->pixelformat = GF_PIXEL_RGBA;
 
 		/*back to RGBA texturing*/
-		txh->pixelformat = GF_PIXEL_RGBA;
-		for (i=0; i<txh->height; i++) {
-			char *data = txh->data + i*txh->stride;
-			for (j=0; j<txh->width; j++) {
-				u32 val = *(u32 *) &data[4*j];
-				data[4*j] = (val>>16) & 0xFF;
-				data[4*j+1] = (val>>8) & 0xFF;
-				data[4*j+2] = (val) & 0xFF;
-				data[4*j+3] = (val>>24) & 0xFF;
+		if (pix_fmt != GF_PIXEL_RGBA) {
+			for (i=0; i<txh->height; i++) {
+				char *data = txh->data + i*txh->stride;
+				for (j=0; j<txh->width; j++) {
+					u32 val = *(u32 *) &data[4*j];
+					data[4*j] = (val>>16) & 0xFF;
+					data[4*j+1] = (val>>8) & 0xFF;
+					data[4*j+2] = (val) & 0xFF;
+					data[4*j+3] = (val>>24) & 0xFF;
+				}
 			}
 		}
 	} else {
@@ -356,6 +362,7 @@
 	GF_STENCIL texture2D;
 	GF_Path *path;
 	GF_Err e;
+	u32 pix_fmt = 0;
 	Bool transparent;
 	M_RadialGradient *rg = (M_RadialGradient*) txh->owner;
 	GradientStack *st = (GradientStack *) gf_node_get_private(txh->owner);
@@ -370,11 +377,6 @@
 			gf_list_insert(txh->compositor->textures, txh, 0);
 	}
 
-	if (st->tx_data) {
-		gf_free(st->tx_data);
-		st->tx_data = NULL;
-	}
-
 	if (rg->key.count<2) return;
 	if (rg->key.count != rg->keyValue.count) return;
 
@@ -390,6 +392,7 @@
 	}
 
 	if (st->txh.flags & GF_SR_TEXTURE_GRAD_NO_RGB) transparent = 1;
+
 	if (st->tx_data && (st->txh.transparent != transparent)) {
 		gf_free(st->tx_data);
 		st->tx_data = NULL;
@@ -398,10 +401,17 @@
 	if (transparent) {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
-		} else {
-			memset(st->tx_data, 0, sizeof(char)*txh->stride*txh->height);
 		}
-		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, 1);
+		memset(st->tx_data, 0, sizeof(char)*txh->stride*txh->height);
+
+		pix_fmt = GF_PIXEL_RGBA;
+
+		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+
+		if (e) {
+			pix_fmt = GF_PIXEL_ARGB;
+			e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+		}
 	} else {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*3);
@@ -496,17 +506,19 @@
 	if (transparent) {
 		u32 j;
 		txh->stride = GRAD_TEXTURE_SIZE*4;
+		txh->pixelformat = GF_PIXEL_RGBA;
 
 		/*back to RGBA texturing*/
-		txh->pixelformat = GF_PIXEL_RGBA;
-		for (i=0; i<txh->height; i++) {
-			char *data = txh->data + i*txh->stride;
-			for (j=0; j<txh->width; j++) {
-				u32 val = *(u32 *) &data[4*j];
-				data[4*j] = (val>>16) & 0xFF;
-				data[4*j+1] = (val>>8) & 0xFF;
-				data[4*j+2] = (val) & 0xFF;
-				data[4*j+3] = (val>>24) & 0xFF;
+		if (pix_fmt == GF_PIXEL_ARGB) {
+			for (i=0; i<txh->height; i++) {
+				char *data = txh->data + i*txh->stride;
+				for (j=0; j<txh->width; j++) {
+					u32 val = *(u32 *) &data[4*j];
+					data[4*j] = (val>>16) & 0xFF;
+					data[4*j+1] = (val>>8) & 0xFF;
+					data[4*j+2] = (val) & 0xFF;
+					data[4*j+3] = (val>>24) & 0xFF;
+				}
 			}
 		}
 	} else {

v0.5.2.tar.gz/src/compositor/mpeg4_grouping.c -> v0.6.1.tar.gz/src/compositor/mpeg4_grouping.c Changed

@@ -43,6 +43,7 @@
 	backup = gf_node_dirty_get(node);
 	if (backup & GF_SG_CHILD_DIRTY) {
 		GF_SensorHandler *hsens;
+		Bool check_anchor=0;
 		u32 ntag = gf_node_get_tag(node);
 		group->flags &= ~GROUP_HAS_SENSORS;
 		if (group->sensors) gf_list_reset(group->sensors);
@@ -53,11 +54,11 @@
 		but still mark the group as empty*/
 		group->bounds.width = 0;
 		/*special case for anchor which is a parent node acting as a sensor*/
-		if ((ntag==TAG_MPEG4_Anchor)
+		if (ntag==TAG_MPEG4_Anchor) check_anchor=1;
 #ifndef GPAC_DISABLE_X3D
-		        || (ntag==TAG_X3D_Anchor)
+		else if (ntag==TAG_X3D_Anchor) check_anchor=1;
 #endif
-		   ) {
+		if (check_anchor) {
 			GF_SensorHandler *gf_sc_anchor_get_handler(GF_Node *n);
 
 			hsens = gf_sc_anchor_get_handler(node);
@@ -220,16 +221,17 @@
 	backup = gf_node_dirty_get(node);
 	if (backup & GF_SG_CHILD_DIRTY) {
 		GF_SensorHandler *hsens;
+		Bool check_anchor=0;
 		/*never trigger bounds recompute in 2D since we don't cull 2D groups*/
 		u32 ntag = gf_node_get_tag(node);
 		group->flags &= ~GROUP_HAS_SENSORS;
 		drawable_reset_group_highlight(tr_state, node);
 		/*special case for anchor which is a parent node acting as a sensor*/
-		if ((ntag==TAG_MPEG4_Anchor)
+		if (ntag==TAG_MPEG4_Anchor) check_anchor=1;
 #ifndef GPAC_DISABLE_X3D
-		        || (ntag==TAG_X3D_Anchor)
+		else if (ntag==TAG_X3D_Anchor) check_anchor=1;
 #endif
-		   ) {
+		if (check_anchor) {
 			GF_SensorHandler *gf_sc_anchor_get_handler(GF_Node *n);
 
 			hsens = gf_sc_anchor_get_handler(node);
@@ -677,15 +679,16 @@
 	GF_ChildNodeItem *l;
 
 	if (gf_node_dirty_get(node) & GF_SG_CHILD_DIRTY) {
+		Bool check_anchor=0;
 		/*parent groups must recompute their bounds themselves since they modify children layout*/
 		u32 ntag = gf_node_get_tag(node);
 		group->flags &= ~GROUP_HAS_SENSORS;
 		/*special case for anchor which is a parent node acting as a sensor*/
-		if ((ntag==TAG_MPEG4_Anchor)
+		if (ntag==TAG_MPEG4_Anchor) check_anchor=1;
 #ifndef GPAC_DISABLE_X3D
-		        || (ntag==TAG_X3D_Anchor)
+		else if (ntag==TAG_X3D_Anchor) check_anchor=1;
 #endif
-		   ) {
+		if (check_anchor) {
 			group->flags |= GROUP_HAS_SENSORS | GROUP_IS_ANCHOR;
 		} else {
 			l = ((GF_ParentNode *)node)->children;

v0.5.2.tar.gz/src/compositor/mpeg4_layer_2d.c -> v0.6.1.tar.gz/src/compositor/mpeg4_layer_2d.c Changed

v0.5.2.tar.gz/src/compositor/mpeg4_layer_3d.c -> v0.6.1.tar.gz/src/compositor/mpeg4_layer_3d.c Changed

@@ -160,7 +160,7 @@
 //		new_pixel_format = GF_PIXEL_RGB_24;
 
 	/*in OpenGL_ES, only RGBA can be safelly used with glReadPixels*/
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	new_pixel_format = GF_PIXEL_RGBA;
 #else
 	/*no support for alpha in offscreen rendering*/
@@ -282,7 +282,7 @@
 static void layer3d_draw_2d(GF_Node *node, GF_TraverseState *tr_state)
 {
 	DrawableContext *ctx = tr_state->ctx;
-	if (tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx, NULL))
+	if (tr_state->visual->DrawBitmap(tr_state->visual, tr_state, ctx))
 		return;
 
 	visual_2d_texture_path(tr_state->visual, ctx->drawable->path, ctx, tr_state);
@@ -345,9 +345,12 @@
 	GF_Matrix2D mx2d_backup;
 	GF_Camera *prev_cam;
 	GF_VisualManager *old_visual;
+	GF_Matrix2D *transform;
 	M_Layer3D *l = (M_Layer3D *)node;
 	Layer3DStack *st = (Layer3DStack *) gf_node_get_private(node);
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
+	GF_TraverseState a_tr;
+	u32 old_type_3d;
 
 	if (is_destroy) {
 		DestroyLayer3D(node);
@@ -355,6 +358,8 @@
 	}
 	if (st->unsupported) return;
 
+	memcpy(&a_tr, tr_state, sizeof(GF_TraverseState));
+
 	if (gf_node_dirty_get(node)) {
 
 		/*main visual in pixel metrics, use output width*/
@@ -372,6 +377,18 @@
 		changed = 1;
 	}
 
+	transform = &tr_state->transform;
+
+	/*layer3D maintains its own stacks*/
+	oldb = tr_state->backgrounds;
+	oldv = tr_state->viewpoints;
+	oldf = tr_state->fogs;
+	oldn = tr_state->navigations;
+	old_visual = tr_state->visual;
+	prev_layer = tr_state->is_layer;
+	prev_cam = tr_state->camera;
+
+
 	switch (tr_state->traversing_mode) {
 	case TRAVERSE_GET_BOUNDS:
 		if (!tr_state->for_node) {
@@ -380,11 +397,30 @@
 			return;
 		}
 	case TRAVERSE_PICK:
+		/*layers can only be used in a 2D context*/
+		if (tr_state->camera && tr_state->camera->is_3D)
+			return;
+		break;
+
 	case TRAVERSE_SORT:
 		/*layers can only be used in a 2D context*/
-		if (tr_state->camera && tr_state->camera->is_3D) return;
+		if (tr_state->camera && tr_state->camera->is_3D)
+			return;
+
+		if (tr_state->visual->compositor->hybrid_opengl) {
+			DrawableContext *ctx = drawable_init_context_mpeg4(st->drawable, tr_state);
+			if (!ctx) goto l3d_exit;
+			ctx->aspect.fill_texture = &st->txh;
+			ctx->flags |= CTX_APP_DIRTY | CTX_IS_TRANSPARENT;
+			drawable_finalize_sort(ctx, tr_state, &st->clip);
+			return;
+		}
 		break;
 	case TRAVERSE_DRAW_2D:
+		if (tr_state->visual->compositor->hybrid_opengl) {
+			transform = &tr_state->ctx->transform;
+			break;
+		}
 		layer3d_draw_2d(node, tr_state);
 		return;
 	case TRAVERSE_DRAW_3D:
@@ -393,51 +429,35 @@
 	}
 
 	/*layer3D maintains its own stacks*/
-	oldb = tr_state->backgrounds;
-	oldv = tr_state->viewpoints;
-	oldf = tr_state->fogs;
-	oldn = tr_state->navigations;
 	tr_state->backgrounds = st->visual->back_stack;
 	tr_state->viewpoints = st->visual->view_stack;
 	tr_state->navigations = st->visual->navigation_stack;
 	tr_state->fogs = st->visual->fog_stack;
-	prev_layer = tr_state->is_layer;
 	tr_state->is_layer = 1;
-
-	prev_cam = tr_state->camera;
 	tr_state->camera = &st->visual->camera;
-	old_visual = tr_state->visual;
 
 	bbox_backup = tr_state->bbox;
 	gf_mx_copy(model_backup, tr_state->model_matrix);
 	gf_mx2d_copy(mx2d_backup, tr_state->transform);
 
-
 	/*compute viewport in visual coordinate*/
 	rc = st->clip;
 	if (prev_cam) {
+
 		gf_mx_apply_rect(&tr_state->model_matrix, &rc);
 
-		gf_mx_apply_rect(&prev_cam->modelview, &rc);
+		if (tr_state->visual->compositor->hybrid_opengl) {
+			gf_mx2d_apply_rect(transform, &rc);
+		} else {
+			gf_mx_apply_rect(&prev_cam->modelview, &rc);
+		}
+
 		if (tr_state->camera->flags & CAM_HAS_VIEWPORT)
 			gf_mx_apply_rect(&prev_cam->viewport, &rc);
-#if 0
-		if (tr_state->visual->compositor->visual==tr_state->visual) {
-			GF_Matrix mx;
-			gf_mx_init(mx);
-			gf_mx_add_scale(&mx, tr_state->visual->compositor->scale_x, tr_state->visual->compositor->scale_y, FIX_ONE);
-			gf_mx_apply_rect(&mx, &rc);
-		}
-#endif
+
 	} else {
 		gf_mx2d_apply_rect(&tr_state->transform, &rc);
 
-		/*		if (tr_state->visual->compositor->visual==tr_state->visual) {
-					gf_mx2d_init(mx2d_backup);
-					gf_mx2d_add_scale(&mx2d_backup, tr_state->visual->compositor->scale_x, tr_state->visual->compositor->scale_y);
-					gf_mx2d_apply_rect(&mx2d_backup, &rc);
-				}
-		*/
 		/*switch visual*/
 		tr_state->visual = st->visual;
 	}
@@ -446,12 +466,12 @@
 	/*check bindables*/
 	gf_mx_init(tr_state->model_matrix);
 	l3d_CheckBindables(node, tr_state, st->first);
-	if (prev_cam) gf_mx_copy(tr_state->model_matrix, model_backup);
 
+	if (prev_cam) gf_mx_copy(tr_state->model_matrix, model_backup);
 
 	/*drawing a layer means drawing all subelements as a whole (no depth sorting with parents)*/
-	if (tr_state->traversing_mode==TRAVERSE_SORT) {
-		u32 old_type_3d = tr_state->visual->type_3d;
+	if ((tr_state->traversing_mode==TRAVERSE_SORT) || (tr_state->traversing_mode==TRAVERSE_DRAW_2D)) {
+		u32 trav_mode = tr_state->traversing_mode;
 
 		if (gf_node_dirty_get(node)) changed = 1;
 		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY|GF_SG_VRML_BINDABLE_DIRTY);
@@ -473,18 +493,26 @@
 			if (st->tgl_ctx) ostgl_make_current(st->tgl_ctx, 0);
 #endif
 
-			/*note that we don't backup the state as a layer3D cannot be declared in a layer3D*/
-			tr_state->layer3d = node;
-
 			rc = st->vp;
 			/*setup GL*/
 			visual_3d_setup(tr_state->visual);
 		}
+		/*note that we don't backup the state as a layer3D cannot be declared in a layer3D*/
+		tr_state->layer3d = node;
+
+
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Layer3D] Redrawing\n"));
 
 		layer3d_setup_clip(st, tr_state, prev_cam ? 1 : 0, rc);
 
+		//this only happens in hybridGL mode
+		if (trav_mode==TRAVERSE_DRAW_2D) {
+			visual_2d_flush_hybgl_canvas(tr_state->visual, NULL, tr_state->ctx, tr_state);
+		}
+
+		old_type_3d = tr_state->visual->type_3d;
 		tr_state->visual->type_3d = 2;
+
 		visual_3d_clear_all_lights(tr_state->visual);
 
 		cur_lights = tr_state->visual->num_lights;
@@ -493,7 +521,7 @@
 		if no previous camera, we're using offscreen rendering, force clear */
 		visual_3d_init_draw(tr_state, prev_cam ? 1 : 2);
 
-		visual_3d_check_collisions(tr_state, l->children);
+		visual_3d_check_collisions(tr_state, NULL, l->children);
 		tr_state->traversing_mode = TRAVERSE_SORT;
 
 		/*shortcut node list*/
@@ -513,19 +541,13 @@
 			visual_3d_remove_last_light(tr_state->visual);
 		}
 
-		tr_state->traversing_mode = TRAVERSE_SORT;
+		tr_state->traversing_mode = trav_mode ;
 		tr_state->visual->type_3d = old_type_3d;
-
-		//reload previous projection matrix
-		if (prev_cam) {
-			visual_3d_projection_matrix_modified(tr_state->visual);
-		}
-
+		tr_state->layer3d = NULL;
 
 		/*!! we were in a 2D mode, create drawable context!!*/
-		if (!prev_cam) {
+		if (!prev_cam ) {
 			DrawableContext *ctx;
-
 			/*with TinyGL we draw directly to the offscreen buffer*/
 #ifndef GPAC_USE_TINYGL
 			gf_sc_copy_to_stencil(&st->txh);
@@ -543,12 +565,11 @@
 
 			/*restore visual*/
 			tr_state->visual = old_visual;
-			tr_state->layer3d = NULL;
 			tr_state->appear = NULL;
 			//	tr_state->camera = prev_cam;
 
 			ctx = drawable_init_context_mpeg4(st->drawable, tr_state);
-			if (!ctx) return;
+			if (!ctx) goto l3d_exit;
 			ctx->aspect.fill_texture = &st->txh;
 			ctx->flags |= CTX_NO_ANTIALIAS;
 			if (changed) ctx->flags |= CTX_APP_DIRTY;
@@ -568,16 +589,22 @@
 
 		layer3d_setup_clip(st, tr_state, prev_cam ? 1 : 0, rc);
 
+		old_type_3d = tr_state->visual->type_3d;
+		tr_state->visual->type_3d = 2;
+
 		if (tr_state->visual->compositor->active_layer==node) {
 			do_pick = (tr_state->visual->compositor->grabbed_sensor || tr_state->visual->compositor->navigation_state) ? 1 : 0;
 		}
 
-		if (!prev_cam) gf_mx_from_mx2d(&tr_state->model_matrix, &tr_state->transform);
+		if (!prev_cam || tr_state->visual->compositor->hybrid_opengl) gf_mx_from_mx2d(&tr_state->model_matrix, &tr_state->transform);
 
 		if (!do_pick && !gf_list_count(tr_state->visual->compositor->sensors))
 			do_pick = gf_sc_pick_in_clipper(tr_state, &st->clip);
 
-		if (!do_pick) goto l3d_exit;
+		if (!do_pick) {
+			tr_state->visual->type_3d = old_type_3d;
+			goto l3d_exit;
+		}
 
 		prev_r = tr_state->ray;
 
@@ -596,6 +623,7 @@
 		}
 
 		visual_3d_setup_projection(tr_state, 1);
+
 		in_x = 2 * gf_divfix(start.x, st->visual->camera.width);
 		in_y = 2 * gf_divfix(start.y, st->visual->camera.height);
 
@@ -604,7 +632,10 @@
 		res.z = -FIX_ONE;
 		res.q = FIX_ONE;
 		gf_mx_apply_vec_4x4(&st->visual->camera.unprojection, &res);
-		if (!res.q) goto l3d_exit;
+		if (!res.q) {
+			tr_state->visual->type_3d = old_type_3d;
+			goto l3d_exit;
+		}
 		start.x = gf_divfix(res.x, res.q);
 		start.y = gf_divfix(res.y, res.q);
 		start.z = gf_divfix(res.z, res.q);
@@ -614,7 +645,10 @@
 		res.z = FIX_ONE;
 		res.q = FIX_ONE;
 		gf_mx_apply_vec_4x4(&st->visual->camera.unprojection, &res);
-		if (!res.q) goto l3d_exit;
+		if (!res.q) {
+			tr_state->visual->type_3d = old_type_3d;
+			goto l3d_exit;
+		}
 		end.x = gf_divfix(res.x, res.q);
 		end.y = gf_divfix(res.y, res.q);
 		end.z = gf_divfix(res.z, res.q);
@@ -628,6 +662,8 @@
 		group_3d_traverse(node, (GroupingNode *)st, tr_state);
 		tr_state->ray = prev_r;
 
+		tr_state->visual->type_3d = old_type_3d;
+
 		/*store info if navigation allowed - we just override any layer3D picked first since we are picking 2D
 		objects*/
 		if (tr_state->camera->navigate_mode || (tr_state->camera->navigation_flags & NAV_ANY))
@@ -637,9 +673,16 @@
 	}
 
 l3d_exit:
+
 	/*restore camera*/
 	tr_state->camera = prev_cam;
-	if (prev_cam) visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+	if (prev_cam) {
+		//remember to reload previous projection matrix
+		visual_3d_projection_matrix_modified(tr_state->visual);
+		if (tr_state->visual == old_visual) {
+			visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+		}
+	}
 	tr_state->visual = old_visual;
 
 	/*restore traversing state*/

v0.5.2.tar.gz/src/compositor/mpeg4_lighting.c -> v0.6.1.tar.gz/src/compositor/mpeg4_lighting.c Changed

@@ -40,7 +40,7 @@
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
 
 	if (is_destroy) {
-		Bool *vis = gf_node_get_private(n);
+		Bool *vis = (Bool*)gf_node_get_private(n);
 		gf_free(vis);
 		return;
 	}
@@ -53,19 +53,19 @@
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
 		GF_BBox b;
 		SFVec3f size;
-		Bool *visible = gf_node_get_private(n);
+		Bool *visible = (Bool*)gf_node_get_private(n);
 		size.x = size.y = size.z = sl->radius;
 		gf_vec_add(b.max_edge, sl->location, size);
 		gf_vec_diff(b.min_edge, sl->location, size);
 		gf_bbox_refresh(&b);
-		*visible = visual_3d_node_cull(tr_state, &b, 0);
+		*visible = visual_3d_node_cull(tr_state, &b, GF_FALSE);
 		/*if visible, disable culling on our parent branch - this is not very efficient but
 		we only store one bound per grouping node, and we don't want the lights to interfere with it*/
-		if (*visible) tr_state->disable_cull = 1;
+		if (*visible) tr_state->disable_cull = GF_TRUE;
 		return;
 	}
 	else if (tr_state->traversing_mode == TRAVERSE_LIGHTING) {
-		Bool *visible = gf_node_get_private(n);
+		Bool *visible = (Bool*)gf_node_get_private(n);
 		if (*visible) {
 			visual_3d_add_spot_light(tr_state->visual, sl->ambientIntensity, sl->attenuation, sl->beamWidth,
 			                         sl->color, sl->cutOffAngle, sl->direction, sl->intensity, sl->location, &tr_state->model_matrix);
@@ -77,8 +77,8 @@
 
 void compositor_init_spot_light(GF_Compositor *compositor, GF_Node *node)
 {
-	Bool *vis = gf_malloc(sizeof(Bool));
-	*vis = 0;
+	Bool *vis = (Bool*)gf_malloc(sizeof(Bool));
+	*vis = GF_FALSE;
 	gf_node_set_private(node, vis);
 	/*no need for a stck*/
 	gf_node_set_callback_function(node, TraverseSpotLight);
@@ -90,7 +90,7 @@
 	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
 
 	if (is_destroy) {
-		Bool *vis = gf_node_get_private(n);
+		Bool *vis = (Bool*)gf_node_get_private(n);
 		gf_free(vis);
 		return;
 	}
@@ -103,18 +103,18 @@
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
 		SFVec3f size;
 		GF_BBox b;
-		Bool *visible = gf_node_get_private(n);
+		Bool *visible = (Bool*)gf_node_get_private(n);
 		size.x = size.y = size.z = pl->radius;
 		gf_vec_add(b.max_edge, pl->location, size);
 		gf_vec_diff(b.min_edge, pl->location, size);
 		gf_bbox_refresh(&b);
-		*visible = visual_3d_node_cull(tr_state, &b, 0);
+		*visible = visual_3d_node_cull(tr_state, &b, GF_FALSE);
 		/*if visible, disable culling on our parent branch*/
-		if (*visible) tr_state->disable_cull = 1;
+		if (*visible) tr_state->disable_cull = GF_TRUE;
 		return;
 	}
 	else if (tr_state->traversing_mode == TRAVERSE_LIGHTING) {
-		Bool *visible = gf_node_get_private(n);
+		Bool *visible = (Bool*)gf_node_get_private(n);
 		if (*visible) {
 			visual_3d_add_point_light(tr_state->visual, pl->ambientIntensity, pl->attenuation, pl->color,
 			                          pl->intensity, pl->location, &tr_state->model_matrix);
@@ -126,8 +126,8 @@
 
 void compositor_init_point_light(GF_Compositor *compositor, GF_Node *node)
 {
-	Bool *vis = gf_malloc(sizeof(Bool));
-	*vis = 0;
+	Bool *vis = (Bool*)gf_malloc(sizeof(Bool));
+	*vis = GF_FALSE;
 	gf_node_set_private(node, vis);
 	/*no need for a stck*/
 	gf_node_set_callback_function(node, TraversePointLight);
@@ -157,15 +157,15 @@
 		*stack = visual_3d_add_directional_light(tr_state->visual, dl->ambientIntensity, dl->color, dl->intensity, dl->direction, &tr_state->model_matrix);
 	} else {
 		if (*stack) visual_3d_remove_last_light(tr_state->visual);
-		*stack = 0;
+		*stack = GF_FALSE;
 		visual_3d_has_inactive_light(tr_state->visual);
 	}
 }
 
 void compositor_init_directional_light(GF_Compositor *compositor, GF_Node *node)
 {
-	Bool *stack = gf_malloc(sizeof(Bool));
-	*stack = 0;
+	Bool *stack = (Bool*)gf_malloc(sizeof(Bool));
+	*stack = GF_FALSE;
 	gf_node_set_private(node, stack);
 	gf_node_set_callback_function(node, TraverseDirectionalLight);
 }

v0.5.2.tar.gz/src/compositor/mpeg4_text.c -> v0.6.1.tar.gz/src/compositor/mpeg4_text.c Changed

@@ -76,7 +76,7 @@
 static void build_text_split(TextStack *st, M_Text *txt, GF_TraverseState *tr_state)
 {
 	u32 i, j, k, len, styles, idx, first_char;
-	Bool split_words = 0;
+	Bool split_words = GF_FALSE;
 	GF_Font *font;
 	GF_TextSpan *tspan;
 	GF_FontManager *ft_mgr = tr_state->visual->compositor->font_manager;
@@ -117,14 +117,14 @@
 
 	st->bounds.width = st->bounds.x = st->bounds.height = 0;
 	idx = 0;
-	split_words = (tr_state->text_split_mode==1) ? 1 : 0;
+	split_words = (tr_state->text_split_mode==1) ? GF_TRUE : GF_FALSE;
 
 	for (i=0; i < txt->string.count; i++) {
 
 		char *str = txt->string.vals[i];
 		if (!str || !strlen(str)) continue;
 
-		tspan = gf_font_manager_create_span(ft_mgr, font, str, fontSize, 0, 0, 0, NULL, 0, styles, (GF_Node*)txt);
+		tspan = gf_font_manager_create_span(ft_mgr, font, str, fontSize, GF_FALSE, GF_FALSE, GF_FALSE, NULL, GF_FALSE, styles, (GF_Node*)txt);
 		if (!tspan) continue;
 
 		len = tspan->nb_glyphs;
@@ -149,7 +149,7 @@
 
 			span->nb_glyphs = split_words ? (j - first_char) : 1;
 			if (split_words && !is_space) span->nb_glyphs++;
-			span->glyphs = gf_malloc(sizeof(void *)*span->nb_glyphs);
+			span->glyphs = (GF_Glyph**)gf_malloc(sizeof(void *)*span->nb_glyphs);
 
 			span->bounds.height = st->ascent + st->descent;
 			span->bounds.y = start_y;
@@ -170,7 +170,7 @@
 			gf_list_add(st->spans, span);
 
 			/*request a context (first one is always valid when entering sort phase)*/
-			if (idx) parent_node_start_group(tr_state->parent, NULL, 0);
+			if (idx) parent_node_start_group(tr_state->parent, NULL, GF_FALSE);
 
 			idx++;
 			parent_node_end_text_group(tr_state->parent, &span->bounds, st->ascent, st->descent, idx);
@@ -179,7 +179,7 @@
 				span = (GF_TextSpan*) gf_malloc(sizeof(GF_TextSpan));
 				memcpy(span, tspan, sizeof(GF_TextSpan));
 				span->nb_glyphs = 1;
-				span->glyphs = gf_malloc(sizeof(void *));
+				span->glyphs = (GF_Glyph**)gf_malloc(sizeof(void *));
 
 				gf_list_add(st->spans, span);
 				span->bounds.height = st->ascent + st->descent;
@@ -237,7 +237,7 @@
 	trim_size = 0;
 
 	if (maxExtent<0) {
-		trim_tspan = gf_font_manager_create_span(ft_mgr, font, "...", fontSize, 0, 0, 0, NULL, 0, styles, (GF_Node*)txt);
+		trim_tspan = gf_font_manager_create_span(ft_mgr, font, "...", fontSize, GF_FALSE, GF_FALSE, GF_FALSE, NULL, GF_FALSE, styles, (GF_Node*)txt);
 		for (i=0; i<trim_tspan->nb_glyphs; i++) {
 			if (horizontal) {
 				trim_size += trim_tspan->glyphs[i] ? trim_tspan->glyphs[i]->horiz_advance : trim_tspan->font->max_advance_h;
@@ -253,7 +253,7 @@
 		char *str = txt->string.vals[i];
 		if (!str) continue;
 
-		tspan = gf_font_manager_create_span(ft_mgr, font, txt->string.vals[i], fontSize, 0, 0, 0, NULL, 0, styles, (GF_Node*)txt);
+		tspan = gf_font_manager_create_span(ft_mgr, font, txt->string.vals[i], fontSize, GF_FALSE, GF_FALSE, GF_FALSE, NULL, GF_FALSE, styles, (GF_Node*)txt);
 		if (!tspan) continue;
 
 		if (horizontal) tspan->flags |= GF_TEXT_SPAN_HORIZONTAL;
@@ -421,7 +421,7 @@
 
 	count = gf_list_count(st->spans);
 	for (i=0; i < count; i++) {
-		GF_TextSpan *span = gf_list_get(st->spans, i);
+		GF_TextSpan *span = (GF_TextSpan*)gf_list_get(st->spans, i);
 		switch (int_major) {
 		/*major-justification MIDDLE*/
 		case 0:
@@ -497,7 +497,7 @@
 		}
 	}
 	*force_texture = st->texture_text_flag;
-	if (strstr(fs_style, "TEXTURED")) *force_texture = 1;
+	if (strstr(fs_style, "TEXTURED")) *force_texture = GF_TRUE;
 	if (strstr(fs_style, "OUTLINED")) {
 		if (!asp->pen_props.width) {
 			asp->pen_props.width = FIX_ONE/2;
@@ -515,11 +515,11 @@
 static Bool text_is_3d_material(GF_TraverseState *tr_state)
 {
 	GF_Node *__mat;
-	if (!tr_state->appear) return 0;
+	if (!tr_state->appear) return GF_FALSE;
 	__mat = ((M_Appearance *)tr_state->appear)->material;
-	if (!__mat) return 0;
-	if (gf_node_get_tag(__mat)==TAG_MPEG4_Material2D) return 0;
-	return 1;
+	if (!__mat) return GF_FALSE;
+	if (gf_node_get_tag(__mat)==TAG_MPEG4_Material2D) return GF_FALSE;
+	return GF_TRUE;
 }
 
 static void text_draw_3d(GF_TraverseState *tr_state, GF_Node *node, TextStack *st)
@@ -572,7 +572,7 @@
 
 	if (tr_state->visual->compositor->edited_text && (tr_state->visual->compositor->focus_node==node)) {
 		drawable_mark_modified(stack->graph, tr_state);
-		tr_state->visual->has_text_edit = 1;
+		tr_state->visual->has_text_edit = GF_TRUE;
 		if (!stack->bounds.width) stack->bounds.width = INT2FIX(1)/100;
 		if (!stack->bounds.height) stack->bounds.height = INT2FIX(1)/100;
 	}
@@ -597,7 +597,7 @@
 	if (!txt->string.count) return;
 
 	if (tr_state->text_split_mode) {
-		st->is_dirty = gf_node_dirty_get(n) ? 1 : 0;
+		st->is_dirty = gf_node_dirty_get(n) ? GF_TRUE : GF_FALSE;
 		gf_node_dirty_clear(n, 0);
 		text_clean_paths(tr_state->visual->compositor, st);
 		build_text_split(st, txt, tr_state);
@@ -617,7 +617,7 @@
 #endif
 	case TRAVERSE_PICK:
 		tr_state->text_parent = n;
-		gf_font_spans_pick(n, st->spans, tr_state, &st->bounds, 0, NULL);
+		gf_font_spans_pick(n, st->spans, tr_state, &st->bounds, GF_FALSE, NULL);
 		tr_state->text_parent = NULL;
 		return;
 	case TRAVERSE_GET_BOUNDS:
@@ -659,8 +659,8 @@
 	 ) {
 		GF_TextSpan *span;
 		u32 i = 0;
-		Bool unselect = (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED) ? 1 : 0;
-		while ((span = gf_list_enum(st->spans, &i))) {
+		Bool unselect = (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED) ? GF_TRUE : GF_FALSE;
+		while ((span = (GF_TextSpan*)gf_list_enum(st->spans, &i))) {
 			if (span->flags & GF_TEXT_SPAN_SELECTED) {
 				if (unselect) span->flags &= ~GF_TEXT_SPAN_SELECTED;
 				ctx->flags |= CTX_APP_DIRTY;

v0.5.2.tar.gz/src/compositor/mpeg4_textures.c -> v0.6.1.tar.gz/src/compositor/mpeg4_textures.c Changed

@@ -169,6 +169,7 @@
 	equal to startTime, an isActive TRUE event is generated and the time-dependent node becomes active 	*/
 
 	if (! mt->isActive) movietexture_activate(stack, mt, time);
+	stack->txh.stream_finished = GF_FALSE;
 }
 
 void compositor_init_movietexture(GF_Compositor *compositor, GF_Node *node)
@@ -228,12 +229,12 @@
 
 		/*cleanup cache if needed*/
 		if (gf_node_get_tag(node)==TAG_MPEG4_CacheTexture) {
-			char section[16];
+			char section[64];
 			const char *opt, *file;
 			Bool delete_file = 1;
 			M_CacheTexture *ct = (M_CacheTexture*)node;
 
-			sprintf(section, "@cache=%08X", (u32) (PTR_TO_U_CAST ct));
+			sprintf(section, "@cache=%p", ct);
 			file = gf_cfg_get_key(txh->compositor->user->config, section, "cacheFile");
 			opt = gf_cfg_get_key(txh->compositor->user->config, section, "expireAfterNTP");
 
@@ -292,10 +293,10 @@
 			if (ct->image.buffer) {
 				char *par = (char *) gf_scene_get_service_url( gf_node_get_graph(txh->owner ) );
 				char *src_url = gf_url_concatenate(par, ct->image.buffer);
-				FILE *test = fopen( src_url ? src_url : ct->image.buffer, "rb");
+				FILE *test = gf_fopen( src_url ? src_url : ct->image.buffer, "rb");
 				if (test) {
 					fseek(test, 0, SEEK_END);
-					ct->data_len = ftell(test);
+					ct->data_len = (u32) gf_ftell(test);
 					ct->data = gf_malloc(sizeof(char)*ct->data_len);
 					fseek(test, 0, SEEK_SET);
 					if (ct->data_len != fread(ct->data, 1, ct->data_len, test)) {
@@ -304,7 +305,7 @@
 						ct->data = NULL;
 						ct->data_len = 0;
 					}
-					fclose(test);
+					gf_fclose(test);
 				} else {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to load CacheTexture data from file %s: not found\n", src_url ? src_url : ct->image.buffer ) );
 				}
@@ -347,7 +348,7 @@
 				}
 				break;
 			}
-			
+
 #endif // GPAC_DISABLE_AV_PARSERS
 
 			/*cacheURL is specified, store the image*/
@@ -355,7 +356,7 @@
 				u32 i;
 				u8 hash[20];
 				FILE *cached_texture;
-				char szExtractName[GF_MAX_PATH], section[16], *opt, *src_url;
+				char szExtractName[GF_MAX_PATH], section[64], *opt, *src_url;
 				opt = (char *) gf_cfg_get_key(txh->compositor->user->config, "General", "CacheDirectory");
 				if (opt) {
 					strcpy(szExtractName, opt);
@@ -377,15 +378,15 @@
 				strcat(szExtractName, "_");
 
 				strcat(szExtractName, ct->cacheURL.buffer);
-				cached_texture = gf_f64_open(szExtractName, "wb");
+				cached_texture = gf_fopen(szExtractName, "wb");
 				if (cached_texture) {
 					gf_fwrite(ct->data, 1, ct->data_len, cached_texture);
-					fclose(cached_texture);
+					gf_fclose(cached_texture);
 				}
 
 				/*and write cache info*/
 				if (ct->expirationDate!=0) {
-					sprintf(section, "@cache=%08X", (u32) (PTR_TO_U_CAST ct));
+					sprintf(section, "@cache=%p", ct);
 					gf_cfg_set_key(txh->compositor->user->config, section, "serviceURL", src_url);
 					gf_cfg_set_key(txh->compositor->user->config, section, "cacheFile", szExtractName);
 					gf_cfg_set_key(txh->compositor->user->config, section, "cacheName", ct->cacheURL.buffer);

v0.5.2.tar.gz/src/compositor/mpeg4_viewport.c -> v0.6.1.tar.gz/src/compositor/mpeg4_viewport.c Changed

@@ -422,6 +422,7 @@
 {
 	u32 i;
 #ifndef GPAC_DISABLE_3D
+	u32 nb_select_mode;
 	SFVec3f start, end;
 	Fixed scale;
 	ViewStack *st = (ViewStack *) gf_node_get_private(node);
@@ -474,18 +475,25 @@
 	if (!gf_node_dirty_get(node)) return;
 	gf_node_dirty_clear(node, 0);
 
+	nb_select_mode = 0;
 	tr_state->camera->navigation_flags = 0;
 	tr_state->camera->navigate_mode = 0;
 	for (i=0; i<ni->type.count; i++) {
 		if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "ANY")) tr_state->camera->navigation_flags |= NAV_ANY;
+		else {
+			nb_select_mode++;
+		}
+
 		if (!tr_state->camera->navigate_mode) {
 			if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "NONE")) tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
 			else if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "WALK")) tr_state->camera->navigate_mode = GF_NAVIGATE_WALK;
 			else if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "EXAMINE")) tr_state->camera->navigate_mode = GF_NAVIGATE_EXAMINE;
 			else if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "FLY")) tr_state->camera->navigate_mode = GF_NAVIGATE_FLY;
-			else if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "QTVR")) tr_state->camera->navigate_mode = GF_NAVIGATE_VR;
+			else if (ni->type.vals[i] && !stricmp(ni->type.vals[i], "VR")) tr_state->camera->navigate_mode = GF_NAVIGATE_VR;
 		}
 	}
+	if (nb_select_mode>1) tr_state->camera->navigation_flags |= NAV_SELECTABLE;
+
 	if (ni->headlight) tr_state->camera->navigation_flags |= NAV_HEADLIGHT;
 
 	start.x = start.y = start.z = 0;

v0.5.2.tar.gz/src/compositor/navigate.c -> v0.6.1.tar.gz/src/compositor/navigate.c Changed

@@ -119,26 +119,37 @@
 	camera_changed(compositor, cam);
 }
 
+static void update_pan_up(GF_Compositor *compositor, GF_Camera *cam)
+{
+	SFVec3f axis, dir;
+	/*update up vector so that right is always horizontal (no y component)*/
+	dir = camera_get_pos_dir(cam);
+	axis = camera_get_right_dir(cam);
+	axis.y = 0;
+	gf_vec_norm(&axis);
+	cam->up = gf_vec_cross(dir, axis);
+	gf_vec_norm(&cam->up);
+
+	camera_changed(compositor, cam);
+}
+
 static void view_pan_x(GF_Compositor *compositor, GF_Camera *cam, Fixed dx)
 {
 	GF_Matrix mx;
 	if (!dx) return;
 	gf_mx_rotation_matrix(&mx, cam->position, cam->up, dx);
 	gf_mx_apply_vec(&mx, &cam->target);
-	camera_changed(compositor, cam);
+
+	update_pan_up(compositor, cam);
 }
 static void view_pan_y(GF_Compositor *compositor, GF_Camera *cam, Fixed dy)
 {
 	GF_Matrix mx;
-	SFVec3f axis;
 	if (!dy) return;
-	axis = camera_get_right_dir(cam);
-	gf_mx_rotation_matrix(&mx, cam->position, axis, dy);
+	gf_mx_rotation_matrix(&mx, cam->position, camera_get_right_dir(cam), dy);
 	gf_mx_apply_vec(&mx, &cam->target);
-	/*update up vector*/
-	cam->up = gf_vec_cross(camera_get_pos_dir(cam), axis);
-	gf_vec_norm(&cam->up);
-	camera_changed(compositor, cam);
+
+	update_pan_up(compositor, cam);
 }
 
 /*for translation moves when jumping*/
@@ -290,6 +301,7 @@
 		is_pixel_metrics = compositor->traverse_state->pixel_metrics;
 #endif
 	}
+	if (!cam || (cam->navigate_mode==GF_NAVIGATE_NONE)) return 0;
 
 	keys = compositor->key_states;
 	if (!cam->navigate_mode && !(keys & GF_KEY_MOD_ALT) ) return 0;
@@ -309,6 +321,8 @@
 #else
 	trans_scale = cam->width/20;
 	key_trans = cam->avatar_size.x/2;
+	//if default VP is quite far from center use larger dz/dy moves
+	if (cam->vp_dist>100) trans_scale *= 10;
 #endif
 
 	if (cam->world_bbox.is_set && (key_trans*5 > cam->world_bbox.radius)) {
@@ -397,8 +411,11 @@
 				view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
 				view_roll(compositor, cam, gf_mulfix(dx, trans_scale));
 			} else {
-				view_exam_x(compositor, cam, -gf_mulfix(GF_PI, dx));
-				view_exam_y(compositor, cam, gf_mulfix(GF_PI, dy));
+				if (ABS(dx) > ABS(dy)) {
+					view_exam_x(compositor, cam, -gf_mulfix(GF_PI, dx));
+				} else {
+					view_exam_y(compositor, cam, gf_mulfix(GF_PI, dy));
+				}
 			}
 			break;
 		case GF_NAVIGATE_ORBIT:
@@ -599,6 +616,7 @@
 	if (visual->type_3d) navigation_mode = visual->camera.navigate_mode;
 #endif
 
+	if (navigation_mode==GF_NAVIGATE_NONE) return 0;
 	if (!navigation_mode && !(keys & GF_KEY_MOD_ALT) ) return 0;

v0.5.2.tar.gz/src/compositor/nodes_stacks.h -> v0.6.1.tar.gz/src/compositor/nodes_stacks.h Changed

v0.5.2.tar.gz/src/compositor/offscreen_cache.c -> v0.6.1.tar.gz/src/compositor/offscreen_cache.c Changed

v0.5.2.tar.gz/src/compositor/svg_base.c -> v0.6.1.tar.gz/src/compositor/svg_base.c Changed

@@ -42,7 +42,7 @@
 
 Bool compositor_svg_is_display_off(SVGPropertiesPointers *props)
 {
-	return (props->display && (*(props->display) == SVG_DISPLAY_NONE)) ? 1 : 0;
+	return (props->display && (*(props->display) == SVG_DISPLAY_NONE)) ? GF_TRUE : GF_FALSE;
 }
 
 
@@ -50,7 +50,7 @@
 {
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d && backup_matrix) {
-		Bool is_draw = (tr_state->traversing_mode==TRAVERSE_SORT) ? 1 : 0;
+		Bool is_draw = (tr_state->traversing_mode==TRAVERSE_SORT) ? GF_TRUE : GF_FALSE;
 		gf_mx_copy(*backup_matrix, tr_state->model_matrix);
 
 		if (atts->transform && atts->transform->is_ref) {
@@ -128,100 +128,100 @@
 	Bool supported;
 } svg11_features[] =
 {
-	{ "Animation", 1},
-	{ "AnimationEventsAttribute", 1},
-	{ "BasicClip", 0},
-	{ "BasicFilter", 0},
-	{ "BasicFont", 1},
-	{ "BasicGraphicsAttribute", 1},
-	{ "BasicPaintAttribute", 1},
-	{ "BasicStructure", 1},
-	{ "BasicText", 1},
-	{ "Clip", 0},
-	{ "ColorProfile", 0},
-	{ "ConditionalProcessing", 1},
-	{ "ContainerAttribute", 1},
-	{ "CoreAttribute", 1},
-	{ "Cursor", 0},
-	{ "DocumentEventsAttribute", 1},
-	{ "Extensibility", 1},
-	{ "ExternalResourcesRequired", 0},
-	{ "Font", 1},
-	{ "Filter", 0},
-	{ "Gradient", 1},
-	{ "GraphicalEventsAttribute", 1},
-	{ "GraphicsAttribute", 1},
-	{ "Hyperlinking", 1},
-	{ "Image", 1},
-	{ "Marker", 0},
-	{ "Mask", 0},
-	{ "OpacityAttribute", 1},
-	{ "PaintAttribute", 1},
-	{ "Pattern", 0},
-	{ "Script", 1},
-	{ "Scripting", 1},
-	{ "Shape", 1},
-	{ "View", 0},	/*no support for <view> element, the rest is OK ...*/
-	{ "ViewportAttribute", 1},
-	{ "Structure", 1},
-	{ "Style", 0},
-	{ "Text", 1},
-	{ "View", 1},
-	{ "XlinkAttribute", 1},
-
-	{ "SVG", 1},
-	{ "SVG-animation", 1},
-	{ "SVG-dynamic", 1},
-	{ "SVG-static", 1},
+	{ "Animation", GF_TRUE},
+	{ "AnimationEventsAttribute", GF_TRUE},
+	{ "BasicClip", GF_FALSE},
+	{ "BasicFilter", GF_FALSE},
+	{ "BasicFont", GF_TRUE},
+	{ "BasicGraphicsAttribute", GF_TRUE},
+	{ "BasicPaintAttribute", GF_TRUE},
+	{ "BasicStructure", GF_TRUE},
+	{ "BasicText", GF_TRUE},
+	{ "Clip", GF_FALSE},
+	{ "ColorProfile", GF_FALSE},
+	{ "ConditionalProcessing", GF_TRUE},
+	{ "ContainerAttribute", GF_TRUE},
+	{ "CoreAttribute", GF_TRUE},
+	{ "Cursor", GF_FALSE},
+	{ "DocumentEventsAttribute", GF_TRUE},
+	{ "Extensibility", GF_TRUE},
+	{ "ExternalResourcesRequired", GF_FALSE},
+	{ "Font", GF_TRUE},
+	{ "Filter", GF_FALSE},
+	{ "Gradient", GF_TRUE},
+	{ "GraphicalEventsAttribute", GF_TRUE},
+	{ "GraphicsAttribute", GF_TRUE},
+	{ "Hyperlinking", GF_TRUE},
+	{ "Image", GF_TRUE},
+	{ "Marker", GF_FALSE},
+	{ "Mask", GF_FALSE},
+	{ "OpacityAttribute", GF_TRUE},
+	{ "PaintAttribute", GF_TRUE},
+	{ "Pattern", GF_FALSE},
+	{ "Script", GF_TRUE},
+	{ "Scripting", GF_TRUE},
+	{ "Shape", GF_TRUE},
+	{ "View", GF_FALSE},	/*no support for <view> element, the rest is OK ...*/
+	{ "ViewportAttribute", GF_TRUE},
+	{ "Structure", GF_TRUE},
+	{ "Style", GF_FALSE},
+	{ "Text", GF_TRUE},
+	{ "View", GF_TRUE},
+	{ "XlinkAttribute", GF_TRUE},
+
+	{ "SVG", GF_TRUE},
+	{ "SVG-animation", GF_TRUE},
+	{ "SVG-dynamic", GF_TRUE},
+	{ "SVG-static", GF_TRUE},
 	/*we don't support SVG DOM, only uDOM*/
-	{ "SVGDOM", 0},
-	{ "SVGDOM-animation", 0},
-	{ "SVGDOM-dynamic", 0},
-	{ "SVGDOM-static", 0},
+	{ "SVGDOM", GF_FALSE},
+	{ "SVGDOM-animation", GF_FALSE},
+	{ "SVGDOM-dynamic", GF_FALSE},
+	{ "SVGDOM-static", GF_FALSE},
 };
 static const struct svg_12_feature {
 	const char *name;
 	Bool supported;
 } svg12_features[] =
 {
-	{ "CoreAttribute", 1},
-	{ "NavigationAttribute", 1},
-	{ "Structure", 1},
-	{ "ConditionalProcessing", 1},
-	{ "ConditionalProcessingAttribute", 1},
-	{ "Image", 1},
-	{ "Prefetch", 1},
-	{ "Discard", 1},
-	{ "Shape", 1},
-	{ "Text", 1},
-	{ "PaintAttribute", 1},
-	{ "OpacityAttribute", 1},
-	{ "GraphicsAttribute", 1},
-	{ "Gradient", 1},
-	{ "SolidColor", 1},
-	{ "Hyperlinking", 1},
-	{ "XlinkAttribute", 1},
-	{ "ExternalResourcesRequired", 1},
-	{ "Scripting", 1},
-	{ "Handler", 1},
-	{ "Listener", 1},
-	{ "TimedAnimation", 1},
-	{ "Animation", 1},
-	{ "Audio", 1},
-	{ "Video", 1},
-	{ "Font", 1},
-	{ "Extensibility", 1},
-	{ "MediaAttribute", 1},
-	{ "TextFlow", 1},
-	{ "TransformedVideo", 1},
-	{ "ComposedVideo", 1},
-	{ "EditableTextAttribute", 1},
-
-	{ "SVG-static", 1},
-	{ "SVG-static-DOM", 1},
-	{ "SVG-animated", 1},
-	{ "SVG-all", 1},
-	{ "SVG-interactive", 1},
+	{ "CoreAttribute", GF_TRUE},
+	{ "NavigationAttribute", GF_TRUE},
+	{ "Structure", GF_TRUE},
+	{ "ConditionalProcessing", GF_TRUE},
+	{ "ConditionalProcessingAttribute", GF_TRUE},
+	{ "Image", GF_TRUE},
+	{ "Prefetch", GF_TRUE},
+	{ "Discard", GF_TRUE},
+	{ "Shape", GF_TRUE},
+	{ "Text", GF_TRUE},
+	{ "PaintAttribute", GF_TRUE},
+	{ "OpacityAttribute", GF_TRUE},
+	{ "GraphicsAttribute", GF_TRUE},
+	{ "Gradient", GF_TRUE},
+	{ "SolidColor", GF_TRUE},
+	{ "Hyperlinking", GF_TRUE},
+	{ "XlinkAttribute", GF_TRUE},
+	{ "ExternalResourcesRequired", GF_TRUE},
+	{ "Scripting", GF_TRUE},
+	{ "Handler", GF_TRUE},
+	{ "Listener", GF_TRUE},
+	{ "TimedAnimation", GF_TRUE},
+	{ "Animation", GF_TRUE},
+	{ "Audio", GF_TRUE},
+	{ "Video", GF_TRUE},
+	{ "Font", GF_TRUE},
+	{ "Extensibility", GF_TRUE},
+	{ "MediaAttribute", GF_TRUE},
+	{ "TextFlow", GF_TRUE},
+	{ "TransformedVideo", GF_TRUE},
+	{ "ComposedVideo", GF_TRUE},
+	{ "EditableTextAttribute", GF_TRUE},
+
+	{ "SVG-static", GF_TRUE},
+	{ "SVG-static-DOM", GF_TRUE},
+	{ "SVG-animated", GF_TRUE},
+	{ "SVG-all", GF_TRUE},
+	{ "SVG-interactive", GF_TRUE},
 };
 
 
@@ -235,7 +235,7 @@
 	count = atts->requiredFeatures ? gf_list_count(*atts->requiredFeatures) : 0;
 	for (i=0; i<count; i++) {
 		char *feat = NULL;
-		XMLRI *iri = gf_list_get(*atts->requiredFeatures, i);
+		XMLRI *iri = (XMLRI*)gf_list_get(*atts->requiredFeatures, i);
 		if (!iri->string) continue;
 
 		if (!strnicmp(iri->string, "org.w3c.svg", 11)) {
@@ -244,55 +244,55 @@
 				if (!stricmp(feat, "animation")) {}
 				else if (!stricmp(feat, "dynamic")) {}
 				/*no support for filters, clipping & co - SVG 1.0 featureStrings are badly designed*/
-				else return 0;
+				else return GF_FALSE;
 			}
 		}
 		else if (!strnicmp(iri->string, "http://www.w3.org/TR/SVG11/feature", 34)) {
 			feat = iri->string+35;
 			if (feat) {
-				Bool found = 0;
+				Bool found = GF_FALSE;
 				u32 j, nbf;
 				nbf = sizeof(svg11_features) / sizeof(struct svg_11_feature);
 				for (j=0; j<nbf; j++) {
 					if (!strcmp(svg11_features[j].name, feat)) {
-						found = 1;
-						if (!svg11_features[j].supported) return 0;
+						found = GF_TRUE;
+						if (!svg11_features[j].supported) return GF_FALSE;
 						break;
 					}
 				}
-				if (!found) return 0;
+				if (!found) return GF_FALSE;
 			}
 		}
 		else if (!strnicmp(iri->string, "http://www.w3.org/Graphics/SVG/feature/1.2/", 43)) {
 			feat = iri->string+44;
 			if (feat) {
-				Bool found = 0;
+				Bool found = GF_FALSE;
 				u32 j, nbf;
 				nbf = sizeof(svg12_features) / sizeof(struct svg_12_feature);
 				for (j=0; j<nbf; j++) {
 					if (!strcmp(svg12_features[j].name, feat)) {
-						found = 1;
-						if (!svg12_features[j].supported) return 0;
+						found = GF_TRUE;
+						if (!svg12_features[j].supported) return GF_FALSE;
 						break;
 					}
 				}
-				if (!found) return 0;
+				if (!found) return GF_FALSE;
 			}
 		}
 		/*unrecognized feature*/
 		else {
-			return 0;
+			return GF_FALSE;
 		}
 	}
 
 	/*process required extensions*/
 	count = atts->requiredExtensions ? gf_list_count(*atts->requiredExtensions) : 0;
-	if (count) return 0;
+	if (count) return GF_FALSE;
 
 	/*process system language*/
 	count = atts->systemLanguage ? gf_list_count(*atts->systemLanguage) : 0;
 	if (count) {
-		found = 0;
+		found = GF_FALSE;
 		lang_3cc = gf_cfg_get_key(compositor->user->config, "Systems", "Language3CC");
 		if (!lang_3cc) lang_3cc = "und";
 		lang_2cc = gf_cfg_get_key(compositor->user->config, "Systems", "Language2CC");
@@ -300,37 +300,37 @@
 	} else {
 		lang_3cc = "und";
 		lang_2cc = "un";
-		found = 1;
+		found = GF_TRUE;
 	}
 
 	for (i=0; i<count; i++) {
-		char *lang = gf_list_get(*atts->systemLanguage, i);
+		char *lang = (char*)gf_list_get(*atts->systemLanguage, i);
 		/*3 char-code*/
 		if (strlen(lang)==3) {
 			if (!stricmp(lang, lang_3cc)) {
-				found = 1;
+				found = GF_TRUE;
 				break;
 			}
 		}
 		/*2 char-code, only check first 2 chars - TODO FIXME*/
 		else if (!strnicmp(lang, lang_2cc, 2)) {
-			found = 1;
+			found = GF_TRUE;
 			break;
 		}
 	}
-	if (!found) return 0;
+	if (!found) return GF_FALSE;
 
 	/*process required formats*/
 	count = atts->requiredFormats ? gf_list_count(*atts->requiredFormats) : 0;
 	if (count) {
 		for (i=0; i<count; i++) {
 			const char *opt;
-			char *mime = gf_list_get(*atts->requiredFormats, i);
+			char *mime = (char*)gf_list_get(*atts->requiredFormats, i);
 			char *sep = strchr(mime, ';');
 			if (sep) sep[0] = 0;
 			opt = gf_cfg_get_key(compositor->user->config, "MimeTypes", mime);
 			if (sep) sep[0] = ';';
-			if (!opt) return 0;
+			if (!opt) return GF_FALSE;
 		}
 	}
 
@@ -338,14 +338,14 @@
 	count = atts->requiredFonts ? gf_list_count(*atts->requiredFonts) : 0;
 	if (count) {
 		for (i=0; i<count; i++) {
-			char *font = gf_list_get(*atts->requiredFonts, i);
-			if (gf_font_manager_set_font_ex(compositor->font_manager, &font, 1, 0, 1)==NULL)
-				return 0;
+			char *font = (char*)gf_list_get(*atts->requiredFonts, i);
+			if (gf_font_manager_set_font_ex(compositor->font_manager, &font, 1, 0, GF_TRUE)==NULL)
+				return GF_FALSE;
 		}
 	}
 
 	/*OK, we can render this one*/
-	return 1;
+	return GF_TRUE;
 }
 
 Bool compositor_svg_traverse_base(GF_Node *node, SVGAllAttributes *atts, GF_TraverseState *tr_state,
@@ -356,7 +356,7 @@
 	if (atts->requiredFeatures || atts->requiredExtensions || atts->systemLanguage
 	 || atts->requiredFonts || atts->requiredFormats) {
 		if (!compositor_svg_evaluate_conditional(tr_state->visual->compositor, atts))
-			return 0;
+			return GF_FALSE;
 	}
 
 	memcpy(backup_props, tr_state->svg_props, sizeof(SVGPropertiesPointers));
@@ -377,7 +377,7 @@
 	flags = gf_node_dirty_get(node);
 	tr_state->svg_flags |= flags;
 
-	return 1;
+	return GF_TRUE;
 }
 #endif

v0.5.2.tar.gz/src/compositor/svg_filters.c -> v0.6.1.tar.gz/src/compositor/svg_filters.c Changed

v0.5.2.tar.gz/src/compositor/svg_font.c -> v0.6.1.tar.gz/src/compositor/svg_font.c Changed

v0.5.2.tar.gz/src/compositor/svg_media.c -> v0.6.1.tar.gz/src/compositor/svg_media.c Changed

v0.5.2.tar.gz/src/compositor/svg_paint_servers.c -> v0.6.1.tar.gz/src/compositor/svg_paint_servers.c Changed

@@ -67,7 +67,7 @@
 
 	/*check gradient redirection ...*/
 	href_node = node;
-	while (href_node && gf_node_get_attribute_by_tag(href_node, TAG_XLINK_ATT_href, 0, 0, &info)==GF_OK) {
+	while (href_node && gf_node_get_attribute_by_tag(href_node, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 		XMLRI*iri = (XMLRI*)info.far_ptr;
 
 		if (iri->type != XMLRI_ELEMENTID) {
@@ -83,7 +83,7 @@
 				break;
 			}
 		}
-		href_node = ((XMLRI*)info.far_ptr)->target;
+		href_node = (GF_Node*)((XMLRI*)info.far_ptr)->target;
 		if (href_node == node) href_node = NULL;
 	}
 	if (href_node == node) href_node = NULL;
@@ -137,16 +137,16 @@
 	/*for gradients we must traverse the gradient stops to trigger animations, even if the
 	gradient is not marked as dirty*/
 	all_dirty = tr_state->svg_flags & (GF_SG_SVG_STOPCOLOR_OR_OPACITY_DIRTY|GF_SG_SVG_COLOR_DIRTY);
-	is_dirty = 0;
+	is_dirty = GF_FALSE;
 	if (gf_node_dirty_get(node)) {
-		is_dirty = all_dirty = 1;
+		is_dirty = all_dirty = GF_TRUE;
 		gf_node_dirty_clear(node, 0);
 		if (st->cols) gf_free(st->cols);
 		st->cols = NULL;
 		if (st->keys) gf_free(st->keys);
 		st->keys = NULL;
 
-		st->animated = gf_node_animation_count(node) ? 1 : 0;
+		st->animated = gf_node_animation_count(node) ? GF_TRUE : GF_FALSE;
 	}
 
 	children = ((SVG_Element *)node)->children;
@@ -173,10 +173,10 @@
 		compositor_svg_traverse_base(stop, &all_atts, tr_state, &backup_props_2, &backup_flags_2);
 
 		if (gf_node_animation_count(stop))
-			st->animated = 1;
+			st->animated = GF_TRUE;
 
 		if (all_dirty || gf_node_dirty_get(stop)) {
-			is_dirty = 1;
+			is_dirty = GF_TRUE;
 			gf_node_dirty_clear(stop, 0);
 
 			alpha = FIX_ONE;
@@ -221,10 +221,10 @@
 		/*set stencil even if assigned, this invalidates the associated bitmap state in 3D*/
 		gf_sc_texture_set_stencil(&st->txh, stencil);
 
-		st->txh.transparent = 0;
+		st->txh.transparent = GF_FALSE;
 		for (i=0; i<nb_col; i++) {
 			if (GF_COL_A(st->cols[i]) != 0xFF) {
-				st->txh.transparent = 1;
+				st->txh.transparent = GF_TRUE;
 				break;
 			}
 		}
@@ -232,9 +232,9 @@
 		st->txh.compositor->rasterizer->stencil_set_gradient_interpolation(stencil, st->keys, st->cols, nb_col);
 		st->txh.compositor->rasterizer->stencil_set_gradient_mode(stencil, /*lg->spreadMethod*/ GF_GRADIENT_MODE_PAD);
 
-		st->txh.needs_refresh = 1;
+		st->txh.needs_refresh = GF_TRUE;
 	} else {
-		st->txh.needs_refresh = 0;
+		st->txh.needs_refresh = GF_FALSE;
 	}
 
 	memcpy(tr_state->svg_props, &backup_props_1, sizeof(SVGPropertiesPointers));
@@ -251,7 +251,7 @@
 	if (!gf_node_dirty_get(node)) {
 		if (st->current_frame==st->txh.compositor->current_frame) return;
 		st->current_frame = st->txh.compositor->current_frame;
-		st->txh.needs_refresh = 0;
+		st->txh.needs_refresh = GF_FALSE;
 //		if (!st->animated) return;
 	}
 
@@ -260,13 +260,13 @@
 		gf_svg_properties_init_pointers(svgp);
 		tr_state->svg_props = svgp;
 
-		svg_gradient_traverse(node, tr_state, 0);
+		svg_gradient_traverse(node, tr_state, GF_FALSE);
 
 		gf_svg_properties_reset_pointers(svgp);
 		gf_free(svgp);
 		tr_state->svg_props = NULL;
 	} else {
-		svg_gradient_traverse(node, tr_state, 0);
+		svg_gradient_traverse(node, tr_state, GF_FALSE);
 	}
 }
 
@@ -280,7 +280,7 @@
 		return;
 	}
 	if (tr_state->traversing_mode != TRAVERSE_SORT) return;
-	svg_gradient_traverse(node, tr_state, 1);
+	svg_gradient_traverse(node, tr_state, GF_TRUE);
 }
 
 #define GRAD_TEXTURE_SIZE	128
@@ -370,14 +370,14 @@
 	/*init our 2D graphics stuff*/
 	texture2D = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
 	if (!texture2D) return;
-	surface = raster->surface_new(raster, 1);
+	surface = raster->surface_new(raster, GF_TRUE);
 	if (!surface) {
 		raster->stencil_delete(texture2D);
 		return;
 	}
 
 	transparent = st->txh.transparent;
-	if (st->txh.flags & GF_SR_TEXTURE_GRAD_NO_RGB) transparent = 1;
+	if (st->txh.flags & GF_SR_TEXTURE_GRAD_NO_RGB) transparent = GF_TRUE;
 
 	if (transparent) {
 		if (!txh->data) {
@@ -385,20 +385,20 @@
 		} else {
 			memset(txh->data, 0, sizeof(char)*txh->stride*txh->height);
 		}
-		e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, 1);
+		e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, GF_TRUE);
 	} else {
 		if (!txh->data) {
 			txh->data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*3);
 		}
-		e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB_24, GF_PIXEL_RGB_24, 1);
+		e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB_24, GF_PIXEL_RGB_24, GF_TRUE);
 		/*try with ARGB (it actually is needed for GDIplus module since GDIplus cannot handle native RGB texture (it works in BGR)*/
 		if (e) {
 			/*remember for later use*/
 			st->txh.flags |= GF_SR_TEXTURE_GRAD_NO_RGB;
-			transparent = 1;
+			transparent = GF_TRUE;
 			gf_free(txh->data);
 			txh->data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
-			e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, 1);
+			e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, GF_TRUE);
 		}
 	}
 
@@ -426,7 +426,7 @@
 	gf_path_close(path);
 
 	gf_mx2d_init(mat);
-	txh->compute_gradient_matrix(txh, NULL, &mat, 0);
+	txh->compute_gradient_matrix(txh, NULL, &mat, GF_FALSE);
 
 	gf_svg_flatten_attributes((SVG_Element*)txh->owner, &all_atts);
 
@@ -489,7 +489,7 @@
 	SVG_Element *lg = (SVG_Element *) txh->owner;
 	SVG_GradientStack *st = (SVG_GradientStack *) gf_node_get_private(txh->owner);
 
-	svg_update_gradient(st, lg->children, 1);
+	svg_update_gradient(st, lg->children, GF_TRUE);
 }
 
 
@@ -505,7 +505,7 @@
 	stencil = gf_sc_texture_get_stencil(txh);
 	if (!stencil) return;
 
-	svg_update_gradient(st, lg->children, 1);
+	svg_update_gradient(st, lg->children, GF_TRUE);
 
 	gf_svg_flatten_attributes((SVG_Element*)txh->owner, &all_atts);
 
@@ -580,7 +580,7 @@
 	st->txh.flags = GF_SR_TEXTURE_SVG;
 
 	st->txh.compute_gradient_matrix = SVG_LG_ComputeMatrix;
-	st->linear = 1;
+	st->linear = GF_TRUE;
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, svg_traverse_gradient);
 }
@@ -592,7 +592,7 @@
 	SVG_Element *rg = (SVG_Element *) txh->owner;
 	SVG_GradientStack *st = (SVG_GradientStack *) gf_node_get_private(txh->owner);
 
-	svg_update_gradient(st, rg->children, 0);
+	svg_update_gradient(st, rg->children, GF_FALSE);
 }
 
 static void SVG_RG_ComputeMatrix(GF_TextureHandler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d)
@@ -610,7 +610,7 @@
 	stencil = gf_sc_texture_get_stencil(txh);
 	if (!stencil) return;
 
-	svg_update_gradient(st, rg->children, 0);
+	svg_update_gradient(st, rg->children, GF_FALSE);
 
 	gf_svg_flatten_attributes((SVG_Element*)txh->owner, &all_atts);
 
@@ -748,10 +748,10 @@
 
 Bool compositor_svg_solid_color_dirty(GF_Compositor *compositor, GF_Node *node)
 {
-	GF_SolidColorStack *st = gf_node_get_private(node);
+	GF_SolidColorStack *st = (GF_SolidColorStack*)gf_node_get_private(node);
 	if (st->current_frame==compositor->current_frame) return st->is_dirty;
 	st->current_frame = compositor->current_frame;
-	st->is_dirty = gf_node_dirty_get(node) ? 1 : 0;
+	st->is_dirty = gf_node_dirty_get(node) ? GF_TRUE : GF_FALSE;
 	gf_node_dirty_clear(node, 0);
 	return st->is_dirty;
 }
@@ -759,11 +759,11 @@
 static void svg_traverse_solidColor(GF_Node *node, void *rs, Bool is_destroy)
 {
 	if (is_destroy) {
-		GF_SolidColorStack *st = gf_node_get_private(node);
+		GF_SolidColorStack *st = (GF_SolidColorStack*)gf_node_get_private(node);
 		gf_free(st);
 		return;
 	}
-	svg_traverse_PaintServer(node, rs, is_destroy, 1);
+	svg_traverse_PaintServer(node, rs, is_destroy, GF_TRUE);
 }
 
 
@@ -777,7 +777,7 @@
 
 static void svg_traverse_stop(GF_Node *node, void *rs, Bool is_destroy)
 {
-	svg_traverse_PaintServer(node, rs, is_destroy, 1);
+	svg_traverse_PaintServer(node, rs, is_destroy, GF_TRUE);
 }
 
 void compositor_init_svg_stop(GF_Compositor *compositor, GF_Node *node)

v0.5.2.tar.gz/src/compositor/svg_text.c -> v0.6.1.tar.gz/src/compositor/svg_text.c Changed

@@ -43,7 +43,7 @@
 static void svg_reset_text_stack(SVG_TextStack *st)
 {
 	while (gf_list_count(st->spans)) {
-		GF_TextSpan *span = gf_list_get(st->spans, 0);
+		GF_TextSpan *span = (GF_TextSpan*)gf_list_get(st->spans, 0);
 		gf_list_rem(st->spans, 0);
 		gf_font_manager_delete_span(NULL, span);
 	}
@@ -56,7 +56,7 @@
 	/*finally compute text bounds*/
 	st->bounds.width = st->bounds.height = 0;
 	st->bounds.x = st->bounds.y = 0;
-	while ( (span = gf_list_enum(st->spans, &i)) ) {
+	while ( (span = (GF_TextSpan*)gf_list_enum(st->spans, &i)) ) {
 		gf_font_manager_refresh_span_bounds(span);
 		gf_rect_union(&st->bounds, &span->bounds);
 	}
@@ -66,7 +66,7 @@
 {
 #ifndef GPAC_DISABLE_3D
 	if (tr_state->visual->type_3d) {
-		gf_font_spans_draw_3d(st->spans, tr_state, &ctx->aspect, 0, 0);
+		gf_font_spans_draw_3d(st->spans, tr_state, &ctx->aspect, 0, GF_FALSE);
 
 		drawable_check_focus_highlight(ctx->drawable->node, tr_state, &st->bounds);
 		ctx->drawable = NULL;
@@ -83,8 +83,8 @@
 	 ) {
 		GF_TextSpan *span;
 		u32 i = 0;
-		Bool unselect = (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED) ? 1 : 0;
-		while ((span = gf_list_enum(st->spans, &i))) {
+		Bool unselect = (tr_state->visual->compositor->store_text_state==GF_SC_TSEL_RELEASED) ? GF_TRUE : GF_FALSE;
+		while ((span = (GF_TextSpan*)gf_list_enum(st->spans, &i))) {
 			if (span->flags & GF_TEXT_SPAN_SELECTED) {
 				if (unselect) span->flags &= ~GF_TEXT_SPAN_SELECTED;
 				ctx->flags |= CTX_APP_DIRTY;
@@ -204,21 +204,21 @@
 
 static GF_Font *svg_set_font(GF_TraverseState * tr_state, GF_FontManager *fm)
 {
-	return gf_compositor_svg_set_font(fm, tr_state->svg_props->font_family->value, svg_get_font_styles(tr_state), 0);
+	return gf_compositor_svg_set_font(fm, tr_state->svg_props->font_family->value, svg_get_font_styles(tr_state), GF_FALSE);
 }
 
 
 
 static void svg_apply_text_anchor(GF_TraverseState * tr_state, Fixed *width)
 {
-	Bool reversed=0;
+	Bool reversed = GF_FALSE;
 	if (!tr_state->svg_props->text_anchor) {
 		*width = 0;
 		return;
 	}
 	if (*width < 0) {
 		*width *= -1;
-		reversed = 1;
+		reversed = GF_TRUE;
 	}
 	switch(*tr_state->svg_props->text_anchor) {
 	case SVG_TEXTANCHOR_MIDDLE:
@@ -241,10 +241,10 @@
 	u32 i, j, len;
 	char prev;
 
-	Bool preserve = (atts->xml_space && (*atts->xml_space==XML_SPACE_PRESERVE)) ? 1 : 0;
+	Bool preserve = (atts->xml_space && (*atts->xml_space==XML_SPACE_PRESERVE)) ? GF_TRUE : GF_FALSE;
 
 	len = (u32) strlen(textContent);
-	dup_text = gf_malloc(len+1);
+	dup_text = (char*)gf_malloc(len+1);
 
 	switch (tr_state->last_char_type) {
 	case 2:
@@ -305,7 +305,7 @@
 	if (!j) tr_state->last_char_type = 1;
 	else tr_state->last_char_type = (dup_text[j-1]==' ') ? 1 : 2;
 	/*SVG text is fliped by default (text y-axis is the inverse of SVG y-axis*/
-	span = gf_font_manager_create_span(fm, font, dup_text, font_size, x_offsets, y_offsets, rotate, lang, 1, 0, tr_state->text_parent);
+	span = gf_font_manager_create_span(fm, font, dup_text, font_size, x_offsets, y_offsets, rotate, lang, GF_TRUE, 0, tr_state->text_parent);
 	gf_free(dup_text);
 	if (span) span->flags |= GF_TEXT_SPAN_HORIZONTAL;
 	return span;
@@ -341,7 +341,7 @@
 
 
 	for (i=0; i<count; i++) {
-		textArea_state *st = gf_list_get(tr_state->x_anchors, i);
+		textArea_state *st = (textArea_state*)gf_list_get(tr_state->x_anchors, i);
 		if (remain) {
 			u32 j;
 			for (j=st->first_glyph; j<st->last_glyph; j++) {
@@ -360,13 +360,13 @@
 	u32 i, count;
 	count = gf_list_count(tr_state->x_anchors);
 	for (i=0; i<count; i++) {
-		textArea_state *st = gf_list_get(tr_state->x_anchors, i);
+		textArea_state *st = (textArea_state*)gf_list_get(tr_state->x_anchors, i);
 		if (st->span==span) {
 			st->last_glyph = last_glyph;
 			return;
 		}
 	}
-	st = gf_malloc(sizeof(textArea_state));
+	st = (textArea_state*)gf_malloc(sizeof(textArea_state));
 	st->first_glyph = first_glyph;
 	st->last_glyph = last_glyph;
 	st->span = span;
@@ -381,7 +381,7 @@
 	tr_state->refresh_children_bounds++;
 
 	for (i=0; i<count; i++) {
-		textArea_state *st = gf_list_get(tr_state->x_anchors, i);
+		textArea_state *st = (textArea_state*)gf_list_get(tr_state->x_anchors, i);
 
 		for (j=st->first_glyph; j<st->last_glyph; j++) {
 			st->span->dy[j] += diff;
@@ -409,7 +409,7 @@
 	font = svg_set_font(tr_state, fm);
 	if (!font) return;
 
-	span = svg_get_text_span(fm, font, tr_state->svg_props->font_size->value, 1, 1, 0, atts, dom_text->textContent, atts->xml_lang ? *atts->xml_lang : NULL, tr_state);
+	span = svg_get_text_span(fm, font, tr_state->svg_props->font_size->value, GF_TRUE, GF_TRUE, GF_FALSE, atts, dom_text->textContent, atts->xml_lang ? *atts->xml_lang : NULL, tr_state);
 	if (!span) return;
 
 	/*first run of the line, inc text y*/
@@ -523,7 +523,7 @@
 	font = svg_set_font(tr_state, fm);
 	if (!font) return;
 
-	span = svg_get_text_span(fm, font, tr_state->svg_props->font_size->value, (tr_state->count_x>1), (tr_state->count_y>1), 0, atts, dom_text->textContent, atts->xml_lang ? *atts->xml_lang : NULL, tr_state);
+	span = svg_get_text_span(fm, font, tr_state->svg_props->font_size->value, (tr_state->count_x>1), (tr_state->count_y>1), GF_FALSE, atts, dom_text->textContent, atts->xml_lang ? *atts->xml_lang : NULL, tr_state);
 	if (!span) return;
 
 	i=0;
@@ -563,7 +563,7 @@
 
 			gf_list_add(tr_state->x_anchors, entry);
 		} else { // (count_x == 0 && count_y == 0) otherwise increment last one
-			Fixed *prec_lw=gf_list_last(tr_state->x_anchors);
+			Fixed *prec_lw = gf_list_last(tr_state->x_anchors);
 			(*prec_lw) += block_width;
 		}
 		//force counters to 0 for next spans/DOM texts
@@ -629,7 +629,7 @@
 	font = svg_set_font(tr_state, fm);
 	if (!font) return;
 	if (font->not_loaded) {
-		tr_state->visual->compositor->reset_fonts = 1;
+		tr_state->visual->compositor->reset_fonts = GF_TRUE;
 		tr_state->visual->compositor->skip_flush = 1;
 		gf_sc_next_frame_state(tr_state->visual->compositor, GF_SC_DRAW_FRAME);
 		return;
@@ -738,7 +738,7 @@
 static void svg_compute_text_width(GF_Node *node, SVGAllAttributes *atts, GF_TraverseState *tr_state )
 {
 	GF_ChildNodeItem *child;
-	Bool is_switch = 0;
+	Bool is_switch = GF_FALSE;
 	/*compute length of all text blocks*/
 	switch (gf_node_get_tag(node)) {
 	case TAG_DOMText:
@@ -748,7 +748,7 @@
 		get_tspan_width(node, tr_state);
 		break;
 	case TAG_SVG_switch:
-		is_switch = 1;
+		is_switch = GF_TRUE;
 	case TAG_SVG_a:
 		child = ((GF_ParentNode *)node)->children;
 		while (child) {
@@ -773,18 +773,18 @@
 static void svg_traverse_text_block(GF_Node *node, SVGAllAttributes *atts, GF_TraverseState *tr_state, GF_List *spans)
 {
 	GF_ChildNodeItem *child;
-	Bool is_switch = 0;
+	Bool is_switch = GF_FALSE;
 	switch (gf_node_get_tag(node)) {
 	case TAG_DOMText:
 		svg_traverse_domtext(node, atts, tr_state, spans, NULL);
 		break;
 	case TAG_SVG_tspan:
 		/*mark tspan as dirty to force rebuild*/
-		gf_node_dirty_set(node, 0, 0);
+		gf_node_dirty_set(node, 0, GF_FALSE);
 		gf_node_traverse(node, tr_state);
 		break;
 	case TAG_SVG_switch:
-		is_switch = 1;
+		is_switch = GF_TRUE;
 	case TAG_SVG_a:
 		child = ((GF_ParentNode *)node)->children;
 		while (child) {
@@ -808,7 +808,7 @@
 
 static void svg_text_draw_2d(SVG_TextStack *st, GF_TraverseState *tr_state)
 {
-	gf_font_spans_draw_2d(st->spans, tr_state, 0, 0, &st->bounds);
+	gf_font_spans_draw_2d(st->spans, tr_state, 0, GF_FALSE, &st->bounds);
 }
 
 
@@ -819,7 +819,7 @@
 	/*finally compute text bounds*/
 	st->bounds.width = st->bounds.height = 0;
 	st->bounds.x = st->bounds.y = 0;
-	while ( (span = gf_list_enum(st->spans, &i)) ) {
+	while ( (span = (GF_TextSpan*)gf_list_enum(st->spans, &i)) ) {
 		u32 j;
 		for (j=0; j<span->nb_glyphs; j++)
 			span->dy[j] += tr_state->base_shift;
@@ -1102,7 +1102,7 @@
 
 	if (tr_state->traversing_mode==TRAVERSE_PICK) {
 		if (*tr_state->svg_props->pointer_events!=SVG_POINTEREVENTS_NONE)
-			gf_font_spans_pick(node, st->spans, tr_state, &st->bounds, 1, st->drawable);
+			gf_font_spans_pick(node, st->spans, tr_state, &st->bounds, GF_TRUE, st->drawable);
 
 		/*and browse children*/
 		child = ((GF_ParentNode *) tspan)->children;
@@ -1132,7 +1132,7 @@
 		The result of the parent (text, textArea) will thus be wrong if we try to update the tspan. We therefore
 		keep the previous computed drawable, and invalidate the parent for next frame*/
 		if (tr_state->traversing_mode==TRAVERSE_SORT) {
-			gf_node_dirty_set(node, 0, 1);
+			gf_node_dirty_set(node, 0, GF_TRUE);
 			goto skip_changes;
 		}
 
@@ -1149,7 +1149,7 @@
 				svg_traverse_domtext(child->node, &atts, tr_state, st->spans, NULL);
 				break;
 			case TAG_SVG_tspan:
-				gf_node_dirty_set(child->node, 0, 0);
+				gf_node_dirty_set(child->node, 0, GF_FALSE);
 				gf_node_traverse(child->node, tr_state);
 				break;
 			case TAG_SVG_switch:
@@ -1293,7 +1293,7 @@
 	if (tr_state->traversing_mode==TRAVERSE_PICK) {
 		if (*tr_state->svg_props->pointer_events!=SVG_POINTEREVENTS_NONE) {
 			compositor_svg_apply_local_transformation(tr_state, &atts, &backup_matrix, &mx3d);
-			gf_font_spans_pick(node, st->spans, tr_state, &st->bounds, 1, st->drawable);
+			gf_font_spans_pick(node, st->spans, tr_state, &st->bounds, GF_TRUE, st->drawable);
 
 			/*and browse children*/
 			child = ((GF_ParentNode *) node)->children;
@@ -1359,7 +1359,7 @@
 					break;
 				case TAG_SVG_tspan:
 					/*mark tspan as dirty to force rebuild*/
-					gf_node_dirty_set(child->node, 0, 0);
+					gf_node_dirty_set(child->node, 0, GF_FALSE);
 					gf_node_traverse(child->node, tr_state);
 					break;
 				case TAG_SVG_switch:
@@ -1501,7 +1501,7 @@
 		return;
 
 	svg_text_area_reset_state(tr_state);
-	/*begining of a line, force a break of current fontSize*/
+	/*beginning of a line, force a break of current fontSize*/
 	if (!tr_state->text_end_x) {
 		if (tr_state->svg_props->line_increment->type != SVG_NUMBER_AUTO) {
 			tr_state->text_end_y += tr_state->svg_props->line_increment->value;

v0.5.2.tar.gz/src/compositor/texturing.c -> v0.6.1.tar.gz/src/compositor/texturing.c Changed

@@ -172,7 +172,7 @@
 				break;
 			}
 		}
-		gf_mo_set_flag(txh->stream, GF_MO_IS_INIT, 1);
+		gf_mo_set_flag(txh->stream, GF_MO_IS_INIT, GF_TRUE);
 	}
 }
 
@@ -185,7 +185,7 @@
 	s32 ms_until_pres, ms_until_next;
 
 	/*already refreshed*/
-	if (txh->needs_refresh) return;
+	if ((txh->stream_finished && txh->tx_io) || txh->needs_refresh) return;
 
 	if (!txh->stream) {
 		txh->data = NULL;
@@ -226,7 +226,7 @@
 
 	/*if no frame or muted don't draw*/
 	if (!txh->data || !size) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("|Visual Texture] No output frame available \n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Visual Texture] No output frame available \n"));
 		/*TODO - check if this is needed */
 		if (txh->flags & GF_SR_TEXTURE_PRIVATE_MEDIA) {
 			//txh->needs_refresh = 1;
@@ -243,11 +243,13 @@
 		gf_mo_release_data(txh->stream, 0xFFFFFFFF, 0);
 		txh->needs_release = 0;
 		if (!txh->stream_finished) {
-			if (ms_until_next>0 && (txh->compositor->next_frame_delay > (u32) ms_until_next))
-				txh->compositor->next_frame_delay = ms_until_next;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual Texture] Same frame fetched (TS %d)\n", ts));
+			if (txh->compositor->ms_until_next_frame > ms_until_next)
+				txh->compositor->ms_until_next_frame = ms_until_next;
 		}
 		return;
 	}
+	txh->stream_finished = 0;
 	txh->needs_release = 1;
 	txh->last_frame_time = ts;
 	txh->size = size;
@@ -263,7 +265,8 @@
 		else ms_until_pres -= push_delay;
 	}
 
-	txh->compositor->next_frame_delay = 1;
+	if (txh->compositor->ms_until_next_frame > ms_until_next)
+		txh->compositor->ms_until_next_frame = ms_until_next;
 
 	if (!txh->tx_io) {
 		setup_texture_object(txh, 0);

v0.5.2.tar.gz/src/compositor/texturing_gl.c -> v0.6.1.tar.gz/src/compositor/texturing_gl.c Changed

@@ -33,7 +33,7 @@
 # define GLTEXENV	glTexEnvi
 # define GLTEXPARAM	glTexParameteri
 # define TexEnvType u32
-#elif defined (GPAC_USE_OGL_ES)
+#elif defined (GPAC_USE_GLES1X)
 # define GLTEXENV	glTexEnvx
 # define GLTEXPARAM	glTexParameterx
 # define TexEnvType Fixed
@@ -172,7 +172,7 @@
 {
 	txh->tx_io->flags |= TX_NEEDS_RASTER_LOAD | TX_NEEDS_HW_LOAD;
 
-#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	//PBO mode: start pushing the texture
 	if (txh->tx_io->pbo_id) {
 		u8 *ptr;
@@ -210,8 +210,18 @@
 			gf_sc_texture_release_stream(txh);
 		}
 	}
-#endif
 	return GF_OK;
+
+	//We do not have PBOs in ES2.0
+#elif !defined(GPAC_DISABLE_3D) && defined(GPAC_USE_GLES2)
+	//PBO mode: start pushing the texture
+	if (txh->tx_io->pbo_id) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] PBOs are not implemented in GL ES 2.0\n"));
+	}
+	return GF_NOT_SUPPORTED;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 void gf_sc_texture_reset(GF_TextureHandler *txh)
@@ -259,6 +269,7 @@
 {
 	if (!txh->tx_io || !txh->tx_io->id || !txh->tx_io->gl_type) return;
 
+#ifndef GPAC_USE_GLES2
 	if (!no_bind)
 		glEnable(txh->tx_io->gl_type);
 
@@ -273,7 +284,7 @@
 		break;
 	case TX_MODULATE:
 		if (txh->transparent) glEnable(GL_BLEND);
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		GLTEXENV(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 #else
 		GLTEXENV(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -288,6 +299,11 @@
 		}
 		break;
 	}
+#else
+	if (txh->transparent) glEnable(GL_BLEND);
+	//blend_mode for ES2.0 can be implemented inside the fragment shader if desired
+#endif
+
 	if (!no_bind)
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
 }
@@ -302,21 +318,24 @@
 {
 	if (txh && txh->tx_io) {
 
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		if (txh->tx_io->yuv_shader) {
-			glUseProgram(0);
+//			glUseProgram(0);
 			txh->compositor->visual->current_texture_glsl_program = 0;
-			glActiveTexture(GL_TEXTURE0);
+//			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(txh->tx_io->gl_type, 0);
 
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[GL Texture] Texture drawn (CTS %d)\n", txh->last_frame_time));
 
 		}
 #endif
+#if !defined(GPAC_USE_GLES2)
 		glDisable(txh->tx_io->gl_type);
+#endif
 		if (txh->transparent) glDisable(GL_BLEND);
 
 		gf_sc_texture_check_pause_on_first_load(txh);
+		txh->compositor->visual->glsl_flags &= ~(GF_GL_HAS_TEXTURE | GF_GL_IS_YUV);
 	}
 }
 
@@ -373,14 +392,29 @@
 	is_pow2 = ((txh->tx_io->rescale_width==txh->width) && (txh->tx_io->rescale_height==txh->height)) ? 1 : 0;
 	txh->tx_io->flags = TX_IS_POW2;
 	txh->tx_io->gl_type = GL_TEXTURE_2D;
-	use_rect = tx_can_use_rect_ext(compositor, txh);
-	if (!is_pow2 && use_rect) {
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
-		txh->tx_io->gl_type = GL_TEXTURE_RECTANGLE_EXT;
+
+	/* all textures can be used in GLES2 */
+#ifdef GPAC_USE_GLES2
+	use_rect = GF_TRUE;
+#else
+
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+	if (compositor->shader_only_mode) {
+		use_rect = GF_TRUE;
+	} else
+#endif
+	{
+		use_rect = tx_can_use_rect_ext(compositor, txh);
+
+		if (!is_pow2 && use_rect) {
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+			txh->tx_io->gl_type = GL_TEXTURE_RECTANGLE_EXT;
 #endif
-		txh->tx_io->flags = TX_IS_RECT;
+			txh->tx_io->flags = TX_IS_RECT;
+		}
+		if (!use_rect && !compositor->gl_caps.npot_texture && !is_pow2) txh->tx_io->flags = TX_MUST_SCALE;
 	}
-	if (!use_rect && !compositor->gl_caps.npot_texture && !is_pow2) txh->tx_io->flags = TX_MUST_SCALE;
+#endif
 
 	use_yuv_shaders = 0;
 	txh->tx_io->nb_comp = txh->tx_io->gl_format = 0;
@@ -415,7 +449,7 @@
 		txh->tx_io->gl_format = GL_RGBA;
 		txh->tx_io->nb_comp = 4;
 		break;
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 	case GF_PIXEL_ARGB:
 		if (!compositor->gl_caps.bgra_texture) return 0;
 		txh->tx_io->gl_format = GL_BGRA_EXT;
@@ -425,23 +459,30 @@
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_YV12_10:
 	case GF_PIXEL_NV21:
-#ifndef GPAC_USE_OGL_ES
-		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->yuv_rect_glsl_program) ) {
+#ifndef GPAC_USE_GLES1X
+		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->compositor->shader_only_mode) ) {
 			use_yuv_shaders = 1;
 			break;
-		} else if (!compositor->disable_yuvgl && compositor->gl_caps.yuv_texture && !(txh->tx_io->flags & TX_MUST_SCALE) ) {
+		}
+#ifndef GPAC_USE_GLES2
+		else if (!compositor->disable_yuvgl && compositor->gl_caps.yuv_texture && !(txh->tx_io->flags & TX_MUST_SCALE) ) {
 			txh->tx_io->gl_format = compositor->gl_caps.yuv_texture;
 			txh->tx_io->nb_comp = 3;
 			txh->tx_io->gl_dtype = UNSIGNED_SHORT_8_8_MESA;
 			break;
 		}
 #endif
+#endif
+
 	//fallthrough
 	case GF_PIXEL_YUY2:
 	case GF_PIXEL_YUVD:
-		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->yuv_rect_glsl_program) ) {
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->compositor->shader_only_mode) ) {
 			use_yuv_shaders = 1;
-		} else {
+		} else
+#endif
+		{
 			if (!use_rect && compositor->emul_pow2) txh->tx_io->flags = TX_EMULE_POW2;
 			txh->tx_io->gl_format = GL_RGB;
 			txh->tx_io->nb_comp = 3;
@@ -469,37 +510,17 @@
 	}
 	tx_id[0] = txh->tx_io->id;
 
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 	if (use_yuv_shaders && !txh->tx_io->u_id) {
 		glGenTextures(1, &txh->tx_io->u_id);
 		glGenTextures(1, &txh->tx_io->v_id);
 		tx_id[1] = txh->tx_io->u_id;
 		tx_id[2] = txh->tx_io->v_id;
 		nb_tx = 3;
-
-		if (0 && txh->tx_io->flags & TX_IS_RECT) {
-			GLint loc;
-			glUseProgram(compositor->visual->yuv_rect_glsl_program);
-			loc = glGetUniformLocation(compositor->visual->yuv_rect_glsl_program, "width");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate uniform \"width\" in YUV shader\n"));
-			} else {
-				GLfloat w = (GLfloat) txh->width;
-				glUniform1f(loc, w);
-			}
-			loc = glGetUniformLocation(compositor->visual->yuv_rect_glsl_program, "height");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate uniform \"width\" in YUV shader\n"));
-			} else {
-				GLfloat h = (GLfloat) txh->height;
-				glUniform1f(loc, h);
-			}
-			glUseProgram(0);
-		}
 	}
 #endif
 
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	if (txh->compositor->gl_caps.pbo && txh->compositor->enable_pbo) {
 		u32 size = txh->stride*txh->height;
 
@@ -538,6 +559,7 @@
 		if (txh->pixelformat==GF_PIXEL_YV12_10) {
 			txh->tx_io->gl_dtype = GL_UNSIGNED_SHORT;
 		}
+		txh->compositor->visual->yuv_pixelformat_type = txh->pixelformat;
 	}
 
 	/*note we don't free the data if existing, since this only happen when re-setting up after context loss (same size)*/
@@ -548,13 +570,25 @@
 
 	//setup all textures
 	for (i=0; i<nb_tx; i++) {
+#if !defined(GPAC_USE_GLES2)
 		glEnable(txh->tx_io->gl_type);
+#endif
 		glBindTexture(txh->tx_io->gl_type, tx_id[i] );
 
-#ifdef GPAC_USE_OGL_ES
-		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, (txh->flags & GF_SR_TEXTURE_REPEAT_S) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, (txh->flags & GF_SR_TEXTURE_REPEAT_T) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-		if (txh->tx_io->gl_type == GL_TEXTURE_2D) {
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+
+#ifdef GPAC_USE_GLES2
+		if (!is_pow2) {
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		} else
+#endif
+		{
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, (txh->flags & GF_SR_TEXTURE_REPEAT_S) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, (txh->flags & GF_SR_TEXTURE_REPEAT_T) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+		}
+
+		if (is_pow2 && txh->tx_io->gl_type == GL_TEXTURE_2D) {
 			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MAG_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
 			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MIN_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
 		} else {
@@ -586,18 +620,21 @@
 
 		if (txh->tx_io->yuv_shader && (txh->pixelformat==GF_PIXEL_YV12_10)) {
 			//will never happen on GLES for now since we don't have GLES2 support yet ...
-#ifndef GPAC_USE_OGL_ES
+			//FIXME - allow 10bit support in GLES2
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 			glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 			//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
 			glPixelTransferi(GL_RED_SCALE, 64);
 #endif
 		} else {
-#ifndef GPAC_USE_OGL_ES
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 			glPixelTransferi(GL_RED_SCALE, 1);
 #endif
 			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 		}
+#if !defined(GPAC_USE_GLES2)
 		glDisable(txh->tx_io->gl_type);
+#endif
 	}
 	return 1;
 }
@@ -823,6 +860,8 @@
 static void do_tex_image_2d(GF_TextureHandler *txh, GLint tx_mode, Bool first_load, u8 *data, u32 stride, u32 w, u32 h, u32 pbo_id)
 {
 	Bool needs_stride;
+	GL_CHECK_ERR
+
 	if (txh->tx_io->gl_dtype==GL_UNSIGNED_SHORT) {
 		needs_stride = (stride != 2*w*txh->tx_io->nb_comp) ? GF_TRUE : GF_FALSE;
 		if (needs_stride) stride /= 2;
@@ -830,21 +869,25 @@
 		needs_stride = (stride!=w*txh->tx_io->nb_comp) ? GF_TRUE : GF_FALSE;
 	}
 
-#if !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	if (needs_stride)
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
 #else
-	u32 i;
-	if (needs_stride) {
+	if (needs_stride)
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[V3D:GLSL] Texture with stride - OpenGL ES2.0 extension \"EXT_unpack_subimage\" is required\n"));
 #endif
 
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	if (txh->tx_io->pbo_pushed) {
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_id);
 		glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 	}
 	else
+#elif defined(GPAC_USE_GLES2)
+	if (txh->tx_io->pbo_pushed) {
+		glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
+	} else
 #endif
 		if (first_load) {
 			glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, data);
@@ -852,24 +895,27 @@
 			glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, h, txh->tx_io->gl_format, txh->tx_io->gl_dtype, data);
 		}
 
-#if !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	if (needs_stride)
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 	return;
 #else
-}
 
-if (!needs_stride)
-	return;
 
-//no GL_UNPACK_ROW_LENGTH on GLES, push line by line ...
-if (first_load) {
-	glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
-}
-for (i=0; i<h; i++) {
-	u8 *ptr = data + i*stride;
-	glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, 1, txh->tx_io->gl_format, txh->tx_io->gl_dtype, ptr);
-}
+	if (!needs_stride)
+		return;
+
+	//no GL_UNPACK_ROW_LENGTH on GLES, push line by line ...
+	if (first_load) {
+		glTexImage2D(txh->tx_io->gl_type, 0, tx_mode, w, h, 0, txh->tx_io->gl_format, txh->tx_io->gl_dtype, NULL);
+	}
+	{
+		u32 i;
+		for (i=0; i<h; i++) {
+			u8 *ptr = data + i*stride;
+			glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, 1, txh->tx_io->gl_format, txh->tx_io->gl_dtype, ptr);
+		}
+	}
 #endif
 }
 
@@ -942,7 +988,7 @@
 		w = txh->width;
 		h = txh->height;
 	}
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
 	tx_mode = txh->tx_io->gl_format;
 #else
 	tx_mode = txh->tx_io->nb_comp;
@@ -974,7 +1020,7 @@
 				pV = (u8 *) pU + txh->height*txh->stride/4;
 			}
 
-#ifndef GPAC_USE_OGL_ES
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 			if (txh->pixelformat==GF_PIXEL_YV12_10) {
 				glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 				//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
@@ -987,13 +1033,26 @@
 			do_tex_image_2d(txh, tx_mode, first_load, pY, txh->stride, w, h, txh->tx_io->pbo_id);
 			GL_CHECK_ERR
 
-			glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
-			do_tex_image_2d(txh, tx_mode, first_load, pU, txh->stride/2, w/2, h/2, txh->tx_io->u_pbo_id);
-			GL_CHECK_ERR
+			/*
+			 * Note: GF_PIXEL_NV21 is default for Android camera review. First wxh bytes is the Y channel,
+			 * the following (wxh)/2 bytes is UV plane.
+			 * Reference: http://stackoverflow.com/questions/22456884/how-to-render-androids-yuv-nv21-camera-image-on-the-background-in-libgdx-with-o
+			 */
+			if (txh->pixelformat == GF_PIXEL_NV21) {
+				txh->tx_io->gl_format = GL_LUMINANCE_ALPHA;
+				glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
+				do_tex_image_2d(txh, GL_LUMINANCE_ALPHA, first_load, pU, txh->stride/2, w/2, h/2, txh->tx_io->u_pbo_id);
+				txh->tx_io->gl_format = tx_mode;
+				GL_CHECK_ERR
+			} else {
+				glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
+				do_tex_image_2d(txh, tx_mode, first_load, pU, txh->stride/2, w/2, h/2, txh->tx_io->u_pbo_id);
+				GL_CHECK_ERR
 
-			glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
-			do_tex_image_2d(txh, tx_mode, first_load, pV, txh->stride/2, w/2, h/2, txh->tx_io->v_pbo_id);
-			GL_CHECK_ERR
+				glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
+				do_tex_image_2d(txh, tx_mode, first_load, pV, txh->stride/2, w/2, h/2, txh->tx_io->v_pbo_id);
+				GL_CHECK_ERR
+			}
 
 			push_time = gf_sys_clock() - push_time;
 
@@ -1004,7 +1063,7 @@
 			txh->nb_frames ++;
 			txh->upload_time += push_time;
 
-#ifndef GPAC_USE_OGL_ES
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 			if (txh->pixelformat==GF_PIXEL_YV12_10) {
 				glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 				glPixelTransferi(GL_RED_SCALE, 1);
@@ -1091,9 +1150,23 @@
 		tx_setup_format(txh);
 	}
 
+	GL_CHECK_ERR
 	tx_bind(txh);
+	GL_CHECK_ERR
+#ifdef GPAC_USE_GLES2
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+#endif
+	GL_CHECK_ERR
+
 	glCopyTexImage2D(txh->tx_io->gl_type, 0, txh->tx_io->gl_format, 0, 0, txh->width, txh->height, 0);
+#ifndef GPAC_USE_GLES2
 	glDisable(txh->tx_io->gl_type);
+#endif
+	GL_CHECK_ERR
 }
 #endif
 
@@ -1131,7 +1204,7 @@
 		//glPixelTransferf(GL_DEPTH_SCALE, txh->compositor->OGLDepthGain);
 		//glPixelTransferf(GL_DEPTH_BIAS, txh->compositor->OGLDepthOffset);
 
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		/*obtain depthmap*/
 		if (!txh->tx_io->depth_data) txh->tx_io->depth_data = (char*)gf_malloc(sizeof(char)*txh->width*txh->height);
 		glReadPixels(0, 0, txh->width, txh->height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, txh->tx_io->depth_data);
@@ -1222,7 +1295,7 @@
 			M_TextureTransform *tt = (M_TextureTransform *)tx_transform;
 			gf_mx2d_init(mat);
 
-			/*cf VRML spec: Tc' = -C × S × R × C × T × Tc*/
+			/*cf VRML spec: Tc' = -C \D7 S \D7 R \D7 C \D7 T \D7 Tc*/
 			gf_mx2d_add_translation(&mat, -tt->center.x, -tt->center.y);
 			gf_mx2d_add_scale(&mat, tt->scale.x, tt->scale.y);
 			if (fabs(tt->rotation) > FIX_EPSILON) gf_mx2d_add_rotation(&mat, tt->center.x, tt->center.y, tt->rotation);
@@ -1266,12 +1339,15 @@
 	return ret;
 }
 
-#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_VRML)
-
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_3D)
 static Bool gf_sc_texture_enable_matte_texture(GF_Node *n)
 {
+	return GF_FALSE;
+
+#if 0
+
 	GF_TextureHandler *b_surf;
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	GF_TextureHandler *matte_hdl;
 	GF_TextureHandler *a_surf;
 	GF_TextureHandler *alpha_surf;
@@ -1289,11 +1365,13 @@
 	glEnable(GL_BLEND);
 	tx_set_image(b_surf, 0);
 
-#if defined(GPAC_USE_TINYGL) || defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_TINYGL) || defined(GPAC_USE_GLES1X)
 	tx_bind(b_surf);
 	return 1;
 #else
 
+
+#ifdef LOAD_GL_1_3
 	/*To remove: gcc 4.6 introduces this warning*/
 #if __GNUC__ == 4 && __GNUC_MINOR__ >= 6
 #pragma GCC diagnostic push
@@ -1307,6 +1385,9 @@
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 6
 #pragma GCC diagnostic pop
 #endif
+
+#endif
+
 	matte_hdl = gf_node_get_private(n);
 	if (!matte_hdl->tx_io) {
 		gf_sc_texture_allocate(matte_hdl);
@@ -1592,12 +1673,11 @@
 	tx_bind(b_surf);
 	return 1;
 
-#endif /*GPAC_USE_TINYGL*/
+#endif
 
-#undef GLTEXPARAM
+#endif
 }
-#endif /* !defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_VRML) */
-
+#endif //GPAC_DISABLE_VRML
 
 Bool gf_sc_texture_is_transparent(GF_TextureHandler *txh)
 {
@@ -1619,17 +1699,24 @@
 u32 gf_sc_texture_enable_ex(GF_TextureHandler *txh, GF_Node *tx_transform, GF_Rect *bounds)
 {
 	GF_Matrix mx;
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	GF_Compositor *compositor = (GF_Compositor *)txh->compositor;
+#endif
+	GF_VisualManager *root_visual = (GF_VisualManager *) txh->compositor->visual;
+
+	if (root_visual->has_material_2d) {	// mat2d (hence no lights)
+		root_visual->glsl_flags &= ~GF_GL_HAS_LIGHT;
+	}
 
 #ifndef GPAC_DISABLE_VRML
 	if (txh->matteTexture) {
-		u32 ret = gf_sc_texture_enable_matte_texture(txh->matteTexture);
+		u32 ret = gf_sc_texture_enable_matte_texture(txh->matteTexture);	//Removed - will always return GF_FALSE
 		if (!ret) return 0;
 
 		if (gf_sc_texture_get_transform(txh, tx_transform, &mx, 0))
-			visual_3d_set_texture_matrix(compositor->visual, &mx);
+			visual_3d_set_texture_matrix(root_visual, &mx);
 		else
-			visual_3d_set_texture_matrix(compositor->visual, NULL);
+			visual_3d_set_texture_matrix(root_visual, NULL);
 
 		return ret;
 	}
@@ -1641,44 +1728,37 @@
 		compositor_gradient_update(txh);
 	}
 
-	tx_set_image(txh, 0);
+	if (! tx_set_image(txh, 0) ) {
+		return 0;
+	}
 
 	if (bounds && txh->compute_gradient_matrix) {
 		GF_Matrix2D mx2d;
 		txh->compute_gradient_matrix(txh, bounds, &mx2d, 1);
 		gf_mx_from_mx2d(&mx, &mx2d);
-		visual_3d_set_texture_matrix(compositor->visual, &mx);
+		visual_3d_set_texture_matrix(root_visual, &mx);
 	}
 	else if (gf_sc_texture_get_transform(txh, tx_transform, &mx, 0)) {
-		visual_3d_set_texture_matrix(compositor->visual, &mx);
+		visual_3d_set_texture_matrix(root_visual, &mx);
 	} else {
-		visual_3d_set_texture_matrix(compositor->visual, NULL);
+		visual_3d_set_texture_matrix(root_visual, NULL);
 	}
 
 	txh->flags |= GF_SR_TEXTURE_USED;
+	root_visual->glsl_flags |= GF_GL_HAS_TEXTURE;
+	root_visual->glsl_flags &= ~GF_GL_IS_YUV;
+
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 
-#ifndef GPAC_USE_OGL_ES
 	if (txh->tx_io->yuv_shader) {
-		GLint loc;
-		/*use our program*/
-		Bool is_rect = txh->tx_io->flags & TX_IS_RECT;
-		compositor->visual->current_texture_glsl_program = is_rect ? compositor->visual->yuv_rect_glsl_program : compositor->visual->yuv_glsl_program;
-		GL_CHECK_ERR
-		glUseProgram(compositor->visual->current_texture_glsl_program);
-		GL_CHECK_ERR
+		u32 active_shader;	//stores current shader (GLES2.0 or the old stuff)
+		root_visual->glsl_flags |= GF_GL_IS_YUV;
+		active_shader = root_visual->glsl_programs[root_visual->glsl_flags];	//Set active
 
-		glEnable(txh->tx_io->gl_type);
+		GL_CHECK_ERR
 
-		loc = glGetUniformLocation(compositor->visual->current_texture_glsl_program, "width");
-		if (loc >=0) {
-			GLfloat w = (GLfloat) txh->width;
-			glUniform1f(loc, w);
-		}
-		loc = glGetUniformLocation(compositor->visual->current_texture_glsl_program, "height");
-		if (loc >= 0) {
-			GLfloat h = (GLfloat) txh->height;
-			glUniform1f(loc, h);
-		}
+		glUseProgram(active_shader);
+		GL_CHECK_ERR
 
 		glActiveTexture(GL_TEXTURE2);
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
@@ -1686,16 +1766,33 @@
 		glActiveTexture(GL_TEXTURE1);
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
 
-		glActiveTexture(GL_TEXTURE0 );
+		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
 
+		GL_CHECK_ERR
 		tx_bind_with_mode(txh, txh->transparent, txh->tx_io->blend_mode, 1);
+#ifndef GPAC_USE_GLES2
 		glClientActiveTexture(GL_TEXTURE0);
-	} else
 #endif
-	{
+
+		return 1;
+	}
+
+	if (compositor->shader_only_mode) {
+		glUseProgram(root_visual->glsl_programs[root_visual->glsl_flags]);
+		GL_CHECK_ERR
+
+		glActiveTexture(GL_TEXTURE0);
+		GL_CHECK_ERR
+		glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
+		GL_CHECK_ERR
+
 		tx_bind(txh);
+		return 1;
 	}
+#endif
+
+	tx_bind(txh);
 	return 1;
 
 }
@@ -1727,14 +1824,16 @@
 
 void gf_sc_texture_check_pause_on_first_load(GF_TextureHandler *txh)
 {
+	return;
+
 	if (txh->stream && txh->tx_io) {
 		switch (txh->tx_io->init_pause_status) {
 		case 0:
-			gf_sc_ar_control(txh->compositor->audio_renderer, 0);
+			gf_sc_ar_control(txh->compositor->audio_renderer, GF_SC_AR_PAUSE);
 			txh->tx_io->init_pause_status = 1;
 			break;
 		case 1:
-			gf_sc_ar_control(txh->compositor->audio_renderer, 1);
+			gf_sc_ar_control(txh->compositor->audio_renderer, GF_SC_AR_RESUME);
 			txh->tx_io->init_pause_status = 2;
 			break;
 		default:

v0.5.2.tar.gz/src/compositor/visual_manager.c -> v0.6.1.tar.gz/src/compositor/visual_manager.c Changed

v0.5.2.tar.gz/src/compositor/visual_manager.h -> v0.6.1.tar.gz/src/compositor/visual_manager.h Changed

@@ -35,12 +35,34 @@
 #include "visual_manager_3d.h"
 
 
+//startof GL3/ES2.0 specifics
+
+/* number of preprocessor flags for GL3/ES2.0 */
+#define GF_GL_NUM_OF_FLAGS			5
+#define GF_GL_NB_FRAG_SHADERS		(1<<(GF_GL_NUM_OF_FLAGS) )	//=2^GF_GL_NUM_OF_FLAGS
+#define GF_GL_NB_VERT_SHADERS		(1<<(GF_GL_NUM_OF_FLAGS-1) )	//=2^GF_GL_NUM_OF_FLAGS-1 (YUV ignored in vertex shader)
+
+/* setting preprocessor flags for GL3/ES2.0 shaders */
+enum {
+	GF_GL_HAS_TEXTURE = 1,
+	GF_GL_HAS_LIGHT = (1<<1),
+	GF_GL_HAS_COLOR = (1<<2),
+	GF_GL_HAS_CLIP = (1<<3),
+	//only for fragment shaders
+	GF_GL_IS_YUV = 1<<4,
+};
+//endof
+
 enum
 {
 	GF_3D_STEREO_NONE = 0,
 	GF_3D_STEREO_TOP,
 	GF_3D_STEREO_SIDE,
-	/*all modes above GF_3D_STEREO_SIDE require shaders*/
+	GF_3D_STEREO_HEADSET,
+
+	GF_3D_STEREO_LAST_SINGLE_BUFFER = GF_3D_STEREO_HEADSET,
+
+	/*all modes above GF_3D_STEREO_LAST_SINGLE_BUFFER require shaders and textures for view storage*/
 
 	/*custom interleaving using GLSL shaders*/
 	GF_3D_STEREO_CUSTOM,
@@ -52,6 +74,8 @@
 	GF_3D_STEREO_ANAGLYPH,
 	/*SpatialView 19'' 5views interleaving*/
 	GF_3D_STEREO_5VSP19,
+	/*Alioscopy 8 views interleaving*/
+	GF_3D_STEREO_8VALIO
 };
 
 enum
@@ -130,7 +154,9 @@
 	*/
 	void (*ClearSurface)(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, Bool offscreen_clear);
 	/*draws specified texture as flat bitmap*/
-	Bool (*DrawBitmap)(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key);
+	Bool (*DrawBitmap)(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx);
+	/*checks if the visual is ready for being drawn on. Returns GF_FALSE if no draw operation can be sent*/
+	Bool (*CheckAttached)(GF_VisualManager *visual);
 
 	/*raster surface interface*/
 	GF_SURFACE raster_surface;
@@ -166,6 +192,10 @@
 	GF_List *fog_stack;
 #endif
 
+	Bool gl_setup;
+
+	GF_IRect clipper_2d;
+	Bool has_clipper_2d;
 	/*the one and only camera associated with the visual*/
 	GF_Camera camera;
 
@@ -195,20 +225,18 @@
 	GF_SHADERID autostereo_glsl_program;
 	GF_SHADERID autostereo_glsl_fragment;
 
-	GF_SHADERID yuv_glsl_program;
-	GF_SHADERID yuv_glsl_fragment;
-	GF_SHADERID yuv_rect_glsl_program;
-	GF_SHADERID yuv_rect_glsl_fragment;
-
 	GF_SHADERID current_texture_glsl_program;
 
 
+	Bool needs_projection_matrix_reload;
+
+	/*GL state to emulate with GLSL [ES2.0]*/
 	Bool has_material_2d;
 	SFColorRGBA mat_2d;
 
 	Bool has_material;
 	SFColorRGBA materials[4];
-	Float shininess;
+	Fixed shininess;
 
 	Bool state_light_on, state_blend_on, state_color_on;
 
@@ -217,8 +245,6 @@
 	Bool has_tx_matrix;
 	GF_Matrix tx_matrix;
 
-	Bool needs_projection_matrix_reload;
-
 	GF_LightInfo lights[GF_MAX_GL_LIGHTS];
 	Bool has_inactive_lights;
 
@@ -227,17 +253,31 @@
 	SFColor fog_color;
 	Fixed fog_density, fog_visibility;
 
+	/*end of GL state to emulate with GLSL*/
 
-	GF_SHADERID glsl_vertex;
-	GF_SHADERID glsl_fragment;
+//startof GL3/ES2.0 elements
+	/* shaders used for shader-only drawing */
 	GF_SHADERID glsl_program;
 
-#endif
+	/* Storing Compiled Shaders */
+	GF_SHADERID glsl_programs[GF_GL_NB_FRAG_SHADERS];
+	GF_SHADERID glsl_vertex_shaders[GF_GL_NB_VERT_SHADERS];
+	GF_SHADERID glsl_fragment_shaders[GF_GL_NB_FRAG_SHADERS];
+
+	/* If GF_TRUE the Array of Shaders is built */
+	Bool glsl_has_shaders;
+
+	/* Compilation/Features Flags for dynamic shader */
+	u32 glsl_flags;
+//endof
+
+#endif	//!GPAC_DISABLE_3D
 
 #ifdef GF_SR_USE_DEPTH
 	Fixed depth_vp_position, depth_vp_range;
 #endif
 
+	u32 yuv_pixelformat_type;
 };
 
 /*constructor/destructor*/

v0.5.2.tar.gz/src/compositor/visual_manager_2d.c -> v0.6.1.tar.gz/src/compositor/visual_manager_2d.c Changed

@@ -111,7 +111,9 @@
 	drawctx_reset(visual->cur_context);
 	visual->num_nodes_current_frame ++;
 
-	if (1) {
+	//pre-allocate some contexts
+#if 0
+	{
 		u32 i;
 		DrawableContext *last = visual->cur_context;
 		for (i=0; i<50; i++) {
@@ -122,6 +124,8 @@
 		}
 		last->next = NULL;
 	}
+#endif
+
 	return visual->cur_context;
 }
 
@@ -233,6 +237,10 @@
 
 #ifndef GPAC_DISABLE_3D
 	gf_mx_init(tr_state->model_matrix);
+	if (tr_state->camera && (visual->compositor->visual==visual)) {
+		tr_state->camera->vp.width = INT2FIX(visual->compositor->output_width);
+		tr_state->camera->vp.height = INT2FIX(visual->compositor->output_height);
+	}
 #endif
 
 	visual->top_clipper = gf_rect_pixelize(&rc);
@@ -333,6 +341,11 @@
 #endif
 	{
 		visual->ClearSurface(visual, NULL, 0, 0);
+#ifndef GPAC_DISABLE_3D
+		if (visual->compositor->hybrid_opengl) {
+			visual->ClearSurface(visual, NULL, 0, GF_TRUE);
+		}
+#endif
 	}
 	return GF_OK;
 }
@@ -519,6 +532,8 @@
 
 static void register_dirty_rect(GF_RectArray *ra, GF_IRect *rc)
 {
+	if (!rc->width || !rc->height) return;
+
 	/*technically this is correct however the gain is not that big*/
 #if 0
 
@@ -561,6 +576,7 @@
 	GF_IRect refreshRect;
 	Bool redraw_all;
 	Bool hyb_force_redraw=GF_FALSE;
+	Bool hyb_force_background=GF_FALSE;
 #ifndef GPAC_DISABLE_VRML
 	M_Background2D *bck = NULL;
 	DrawableContext *bck_ctx = NULL;
@@ -598,15 +614,18 @@
 		if (!bck->isBound) {
 			if (visual->last_had_back) {
 				if (redraw_all_on_background_change) redraw_all = 1;
-				else hyb_force_redraw = 1;
+				else hyb_force_background = 1;
 			}
 			visual->last_had_back = 0;
 		} else {
 			bck_ctx = b2d_get_context(bck, visual->back_stack);
 			if (!visual->last_had_back || (bck_ctx->flags & CTX_REDRAW_MASK) ) {
 				if (redraw_all_on_background_change) redraw_all = 1;
-				else hyb_force_redraw = 1;
 			}
+			/*in hybridGL we will have to force background draw even if no change, since backbuffer GL is not persistent*/
+			if (!redraw_all_on_background_change)
+				hyb_force_background = 1;
+
 			visual->last_had_back = (bck_ctx->aspect.fill_texture && !bck_ctx->aspect.fill_texture->transparent) ? 2 : 1;
 		}
 	} else
@@ -614,7 +633,9 @@
 		if (visual->last_had_back) {
 			visual->last_had_back = 0;
 			if (redraw_all_on_background_change) redraw_all = 1;
-			else hyb_force_redraw = 1;
+			else hyb_force_background = 1;
+		} else if (!redraw_all_on_background_change) {
+			hyb_force_background = 1;
 		}
 
 	num_nodes = 0;
@@ -625,7 +646,7 @@
 		drawctx_update_info(ctx, visual);
 		if (!redraw_all) {
 			u32 res;
-			assert( gf_irect_inside(&visual->top_clipper, &ctx->bi->clip) );
+//			assert( gf_irect_inside(&visual->top_clipper, &ctx->bi->clip) );
 			res = register_context_rect(&visual->to_redraw, ctx, num_nodes, &first_opaque);
 			if (res) {
 				num_changed ++;
@@ -690,18 +711,23 @@
 	}
 
 	/*nothing to redraw*/
-	if (!hyb_force_redraw && ra_is_empty(&visual->to_redraw) ) {
+	if (ra_is_empty(&visual->to_redraw) ) {
+		if (!hyb_force_redraw && !hyb_force_background) {
 #ifndef GPAC_DISABLE_3D
-		//force canvas draw
-		visual->nb_objects_on_canvas_since_last_ogl_flush = 1;
+			//force canvas draw
+			visual->nb_objects_on_canvas_since_last_ogl_flush = 1;
 #endif
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] No changes found since last frame - skipping redraw\n"));
-		goto exit;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] No changes found since last frame - skipping redraw\n"));
+			goto exit;
+		}
+		if (hyb_force_redraw)
+			ra_add(&visual->to_redraw, &visual->surf_rect);
 	}
 	has_changed = 1;
 	tr_state->traversing_mode = TRAVERSE_DRAW_2D;
 
-	if (!hyb_force_redraw && first_opaque && (visual->to_redraw.count==1) && gf_rect_equal(first_opaque->bi->clip, visual->to_redraw.list[0].rect)) {
+	//if only one opaque opject has changed and not moved, skip background unless hybgl mode
+	if (!visual->compositor->hybrid_opengl && !hyb_force_redraw && !hyb_force_background && first_opaque && (visual->to_redraw.count==1) && gf_rect_equal(first_opaque->bi->clip, visual->to_redraw.list[0].rect)) {
 		visual->has_modif=0;
 		goto skip_background;
 	}
@@ -729,6 +755,15 @@
 	} else
 #endif /*GPAC_DISABLE_VRML*/
 	{
+
+#ifndef GPAC_DISABLE_3D
+		//cleanup openGL screen
+		if (visual->compositor->hybrid_opengl) {
+			compositor_2d_hybgl_clear_surface(tr_state->visual, NULL, 0, GF_FALSE);
+		}
+#endif
+
+		//and clean dirty rect - for hybrid openGL this will clear the canvas, otherwise the 2D backbuffer
 		count = visual->to_redraw.count;
 		for (k=0; k<count; k++) {
 			GF_IRect rc;
@@ -739,12 +774,16 @@
 			rc = visual->to_redraw.list[k].rect;
 			visual->ClearSurface(visual, &rc, 0, 1);
 		}
+	}
+	if (!visual->to_redraw.count) {
+		visual->has_modif=0;
 #ifndef GPAC_DISABLE_3D
-		if (!count && hyb_force_redraw) {
-			compositor_2d_hybgl_clear_surface(tr_state->visual, NULL, 0, GF_FALSE);
-		}
+		//force canvas flush
+		visual->nb_objects_on_canvas_since_last_ogl_flush = 1;
 #endif
+		goto exit;
 	}
+
 	if (!redraw_all && !has_clear) visual->has_modif=0;
 
 skip_background:

v0.5.2.tar.gz/src/compositor/visual_manager_2d.h -> v0.6.1.tar.gz/src/compositor/visual_manager_2d.h Changed

v0.5.2.tar.gz/src/compositor/visual_manager_2d_draw.c -> v0.6.1.tar.gz/src/compositor/visual_manager_2d_draw.c Changed

@@ -57,7 +57,7 @@
 #ifdef SKIP_DRAW
 	return;
 #endif
-	if (!visual->is_attached) return;
+	if (! visual->CheckAttached(visual) ) return;
 
 	if (!BackColor && !visual->offscreen) {
 		if (!visual->compositor->user || !(visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
@@ -100,7 +100,7 @@
 	/*background & direct drawing : use ctx clip*/
 	if ((ctx->flags & CTX_IS_BACKGROUND) || tr_state->immediate_draw) {
 		if (ctx->bi->clip.width && ctx->bi->clip.height) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s[%s] (direct draw)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node) ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s [%s] (direct draw)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node) ));
 
 			if (stencil) {
 				raster->surface_set_clipper(visual->raster_surface, &ctx->bi->clip);
@@ -123,7 +123,7 @@
 			clip = ctx->bi->clip;
 			gf_irect_intersect(&clip, &visual->to_redraw.list[i].rect);
 			if (clip.width && clip.height) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s[%s] (indirect draw @ dirty rect idx %d)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node), i));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s [%s] (indirect draw @ dirty rect idx %d)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node), i));
 				if (stencil) {
 					raster->surface_set_clipper(visual->raster_surface, &clip);
 					raster->surface_fill(visual->raster_surface, stencil);
@@ -290,7 +290,8 @@
 	GF_ColorMatrix cmat;
 	GF_Raster2D *raster;
 
-	if (!visual->is_attached) return;
+	if (! visual->CheckAttached(visual) ) return;
+
 	raster = visual->compositor->rasterizer;
 
 	stencil = gf_sc_texture_get_stencil(txh);
@@ -349,72 +350,84 @@
 
 
 #ifndef GPAC_DISABLE_3D
-void visual_2d_texture_path_opengl_auto(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, GF_TraverseState *tr_state)
+
+void visual_2d_flush_hybgl_canvas(GF_VisualManager *visual, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_TraverseState *tr_state)
 {
-	GF_Rect clipper;
-	u32 prev_mode = tr_state->traversing_mode;
-	u32 prev_type_3d = tr_state->visual->type_3d;
+	Bool line_texture = GF_FALSE;
+	u32 i;
+	u32 prev_color;
+	Bool transparent, had_flush = 0;
+	u32 nb_obj_left_on_canvas = visual->nb_objects_on_canvas_since_last_ogl_flush;
+	u8 alpha;
+
+	if (! visual->hybgl_drawn.count)
+		return;
 
-	//we have drawn things on the canvas before this object
-	if (visual->hybgl_drawn.count) {
-		Bool line_texture = GF_FALSE;
-		u32 i;
-		u32 prev_color;
-		Bool transparent, had_flush = 0;
-		u32 nb_obj_left_on_canvas = visual->nb_objects_on_canvas_since_last_ogl_flush;
-		u8 alpha;
-
-		if (txh==ctx->aspect.line_texture) {
-			line_texture = GF_TRUE;
-			alpha = GF_COL_A(ctx->aspect.line_color);
-			prev_color = ctx->aspect.line_color;
-			ctx->aspect.line_texture = NULL;
-			ctx->aspect.line_color = 0;
-		} else {
-			alpha = GF_COL_A(ctx->aspect.fill_color);
-			if (!alpha) alpha = GF_COL_A(ctx->aspect.line_color);
-			prev_color = ctx->aspect.fill_color;
-			ctx->aspect.fill_texture = NULL;
-			ctx->aspect.fill_color = 0;
-		}
-		transparent = txh->transparent || (alpha!=0xFF);
-
-		//clear wherever we have overlap
-		for (i=0; i<visual->hybgl_drawn.count; i++) {
-			GF_IRect rc = ctx->bi->clip;
-			gf_irect_intersect(&ctx->bi->clip, &visual->hybgl_drawn.list[i].rect);
-			if (ctx->bi->clip.width && ctx->bi->clip.height) {
-				//if something behind this, flush canvas to gpu
-				if (transparent) {
-					if (!had_flush) {
-						//flush the complete area below this object, regardless of intersections
-						compositor_2d_hybgl_flush_video(visual->compositor, tr_state->immediate_draw ? NULL : &rc);
-						had_flush = 1;
-					}
-					//if object was not completely in the flush region we will need to flush the canvas
-					if (gf_irect_inside(&rc, &visual->hybgl_drawn.list[i].rect)) {
-						assert(nb_obj_left_on_canvas);
-						nb_obj_left_on_canvas--;
-					}
+	//we have drawn things on the canvas before this object, flush canvas to GPU
+
+	if (txh && (txh==ctx->aspect.line_texture)) {
+		line_texture = GF_TRUE;
+		alpha = GF_COL_A(ctx->aspect.line_color);
+		prev_color = ctx->aspect.line_color;
+		ctx->aspect.line_texture = NULL;
+		ctx->aspect.line_color = 0;
+	} else {
+		alpha = GF_COL_A(ctx->aspect.fill_color);
+		if (!alpha) alpha = GF_COL_A(ctx->aspect.line_color);
+		prev_color = ctx->aspect.fill_color;
+		ctx->aspect.fill_texture = NULL;
+		ctx->aspect.fill_color = 0;
+
+	}
+	transparent = txh ? (txh->transparent || (alpha!=0xFF)) : GF_TRUE;
+	//clear wherever we have overlap
+	for (i=0; i<visual->hybgl_drawn.count; i++) {
+		GF_IRect rc = ctx->bi->clip;
+		gf_irect_intersect(&ctx->bi->clip, &visual->hybgl_drawn.list[i].rect);
+		if (ctx->bi->clip.width && ctx->bi->clip.height) {
+			//if something behind this, flush canvas to gpu
+			if (transparent) {
+				if (!had_flush) {
+					//flush the complete area below this object, regardless of intersections
+					compositor_2d_hybgl_flush_video(visual->compositor, tr_state->immediate_draw ? NULL : &rc);
+					had_flush = 1;
+				}
+				//if object was not completely in the flush region we will need to flush the canvas
+				if (gf_irect_inside(&rc, &visual->hybgl_drawn.list[i].rect)) {
+					assert(nb_obj_left_on_canvas);
+					nb_obj_left_on_canvas--;
 				}
+			}
 
-				//erase all part of the canvas below us
+			//erase all part of the canvas below us
+			if (txh) {
 				visual_2d_draw_path_extended(visual, ctx->drawable->path, ctx, NULL, NULL, tr_state, NULL, NULL, GF_TRUE);
+			} else {
+				visual->compositor->rasterizer->surface_clear(visual->raster_surface, &ctx->bi->clip, 0);
 			}
-			ctx->bi->clip = rc;
-		}
-		if (line_texture) {
-			ctx->aspect.line_color = prev_color;
-			ctx->aspect.line_texture = txh;
-		} else {
-			ctx->aspect.fill_color = prev_color;
-			ctx->aspect.fill_texture = txh;
 		}
+		ctx->bi->clip = rc;
+	}
+	if (line_texture) {
+		ctx->aspect.line_color = prev_color;
+		ctx->aspect.line_texture = txh;
+	} else {
+		ctx->aspect.fill_color = prev_color;
+		ctx->aspect.fill_texture = txh;
+	}
 
-		if (had_flush) {
-			visual->nb_objects_on_canvas_since_last_ogl_flush = nb_obj_left_on_canvas;
-		}
+	if (had_flush) {
+		visual->nb_objects_on_canvas_since_last_ogl_flush = nb_obj_left_on_canvas;
 	}
+}
+
+void visual_2d_texture_path_opengl_auto(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, GF_TraverseState *tr_state)
+{
+	GF_Rect clipper;
+	u32 prev_mode = tr_state->traversing_mode;
+	u32 prev_type_3d = tr_state->visual->type_3d;
+
+	visual_2d_flush_hybgl_canvas(visual, txh, ctx, tr_state);
 
 	tr_state->visual->type_3d = 4;
 	tr_state->appear = ctx->appear;
@@ -428,7 +441,7 @@
 	clipper.y = INT2FIX(ctx->bi->clip.y);
 	clipper.width = INT2FIX(ctx->bi->clip.width);
 	clipper.height = INT2FIX(ctx->bi->clip.height);
-	visual_3d_set_clipper_2d(tr_state->visual, clipper, NULL, 1);
+	visual_3d_set_clipper_2d(tr_state->visual, clipper, NULL);
 
 	gf_node_allow_cyclic_traverse(ctx->drawable->node);
 	gf_node_traverse(ctx->drawable->node, tr_state);
@@ -452,7 +465,9 @@
 	GF_Matrix2D mx_texture;
 	GF_Rect orig_rc;
 	GF_Raster2D *raster;
-	if (!visual->is_attached) return;
+
+	if (! visual->CheckAttached(visual) ) return;
+
 	raster = visual->compositor->rasterizer;
 
 	if (!txh) txh = ctx->aspect.fill_texture;
@@ -580,7 +595,9 @@
 #ifdef SKIP_DRAW
 	return;
 #endif
-	if (!visual->is_attached || (ctx->flags & CTX_PATH_FILLED) || !ctx->aspect.fill_texture || visual->compositor->is_hidden) return;
+	if (! visual->CheckAttached(visual) ) return;
+
+	if ((ctx->flags & CTX_PATH_FILLED) || !ctx->aspect.fill_texture || visual->compositor->is_hidden) return;
 
 	/*this is ambiguous in the spec, what if the material is filled and the texture is transparent ?
 	let's draw, it's nicer */
@@ -604,7 +621,7 @@
 #ifdef SKIP_DRAW
 	return;
 #endif
-	if (!visual->is_attached) return;
+	if (! visual->CheckAttached(visual) ) return;
 
 	if ((ctx->flags & CTX_PATH_FILLED) && (ctx->flags & CTX_PATH_STROKE) ) {
 		if (visual->compositor->draw_bvol) draw_clipper(visual, ctx);
@@ -697,7 +714,8 @@
 	return;
 #endif
 
-	if (!visual->is_attached) return;
+	if (! visual->CheckAttached(visual) ) return;
+
 	if (!color && !strike_color) return;
 
 	if ((ctx->flags & CTX_PATH_FILLED) && (ctx->flags & CTX_PATH_STROKE) ) {
@@ -761,7 +779,9 @@
 #endif
 
 	if (!rc) return;
-	if (!visual->is_attached) return;
+
+	if (! visual->CheckAttached(visual) ) return;
+
 	if (!fill && !strike ) return;
 
 	/*no aa*/

v0.5.2.tar.gz/src/compositor/visual_manager_3d.c -> v0.6.1.tar.gz/src/compositor/visual_manager_3d.c Changed

@@ -199,7 +199,7 @@
 		z_far = max(vp_size.x, vp_size.y) * max(width, height) / (2*min(1, ar)*tg(fov/2)) )
 
 	to choose a z_far so that the size is more than one pixel, then z_far' = z_far/n_pixels*/
-	if (tr_state->camera->z_far<0) {
+	if (tr_state->camera->z_far<=0) {
 		Fixed ar = gf_divfix(tr_state->vp_size.x, tr_state->vp_size.y);
 		if (ar>FIX_ONE) ar = FIX_ONE;
 		tr_state->camera->z_far = gf_muldiv(
@@ -228,8 +228,11 @@
 	/*default VP setup - this is undocumented in the spec. Default VP pos is (0, 0, 10) but not really nice
 	in pixel metrics. We set z so that we see just the whole visual*/
 	else if (tr_state->pixel_metrics) {
-		position.z = gf_divfix(tr_state->camera->width, 2*gf_tan(fieldOfView/2) );
-
+		if (tr_state->visual != tr_state->visual->compositor->visual) {
+			position.z = gf_divfix(tr_state->camera->width, 2*gf_tan(fieldOfView/2) );
+		} else {
+			position.z = gf_mulfix(position.z, tr_state->min_hsize);
+		}
 	}
 #ifdef GF_SR_USE_DEPTH
 	/* 3D world calibration for stereoscopic screen */
@@ -281,7 +284,8 @@
 	dist = gf_vec_len(d);
 
 	if (!dist || (dist<tr_state->camera->z_near) || (dist > tr_state->camera->z_far)) {
-		if (dist > tr_state->camera->z_far) tr_state->camera->z_far = 2*dist;
+		if (dist > tr_state->camera->z_far)
+			tr_state->camera->z_far = 2*dist;
 
 		dist = 10 * tr_state->camera->avatar_size.x;
 		if ((dist<tr_state->camera->z_near) || (dist > tr_state->camera->z_far))
@@ -534,14 +538,45 @@
 	/*turn off depth buffer in 2D*/
 	visual_3d_enable_depth_buffer(tr_state->visual, tr_state->camera->is_3D);
 
-	if (tr_state->visual->autostereo_type==GF_3D_STEREO_SIDE) {
+	if ((tr_state->visual->autostereo_type==GF_3D_STEREO_SIDE) || (tr_state->visual->autostereo_type==GF_3D_STEREO_HEADSET)) {
 		GF_Rect orig_vp;
+		Fixed vp_width, vp_height;
 		orig_vp = tr_state->camera->vp;
 
-		tr_state->camera->vp.width = gf_divfix(tr_state->camera->vp.width, INT2FIX(tr_state->visual->nb_views));
-		tr_state->camera->vp.x += gf_mulfix(INT2FIX(tr_state->visual->current_view), tr_state->camera->vp.width);
+		vp_width = orig_vp.width;
+		vp_height = orig_vp.height;
+
+		//fill up the entire screen matchin AR
+		if (tr_state->visual->autostereo_type==GF_3D_STEREO_HEADSET) {
+			Fixed ratio = gf_divfix(vp_width, vp_height);
+			Fixed max_width = INT2FIX(tr_state->visual->compositor->display_width) / tr_state->visual->nb_views;
+			Fixed max_height = INT2FIX(tr_state->visual->compositor->display_height);
+
+			if (max_width < gf_mulfix(ratio, max_height) ) {
+				tr_state->camera->vp.width = max_width;
+			} else {
+				tr_state->camera->vp.width = gf_mulfix(ratio, max_height);
+			}
+			tr_state->camera->vp.height = gf_divfix(tr_state->camera->vp.width, ratio);
+			tr_state->camera->vp.x = (INT2FIX(tr_state->visual->compositor->display_width) - tr_state->visual->nb_views*tr_state->camera->vp.width)/2 + tr_state->visual->current_view * tr_state->camera->vp.width;
+			tr_state->camera->vp.y = (INT2FIX(tr_state->visual->compositor->display_height) - tr_state->camera->vp.height)/2;
+
+		} else {
+			tr_state->camera->vp.width = vp_width / tr_state->visual->nb_views;
+			tr_state->camera->vp.x += tr_state->visual->current_view * tr_state->camera->vp.width;
+		}
+		//if first view clear up the original vp
+		if (!tr_state->visual->current_view) {
+			SFColor col;
+			col.red = INT2FIX((tr_state->visual->compositor->back_color>>16)&0xFF) / 255;
+			col.green = INT2FIX((tr_state->visual->compositor->back_color>>8)&0xFF) / 255;
+			col.blue = INT2FIX((tr_state->visual->compositor->back_color)&0xFF) / 255;
+			visual_3d_set_viewport(tr_state->visual, orig_vp);
+			visual_3d_clear(tr_state->visual, col, 0);
+		}
 
 		visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+		//we must set scissor in side-by-side to avoid drawing the background outside the viewport!
 		visual_3d_set_scissor(tr_state->visual, &tr_state->camera->vp);
 
 		if (off_axis_background) {
@@ -556,15 +591,17 @@
 		GF_Rect orig_vp;
 		orig_vp = tr_state->camera->vp;
 
-		tr_state->camera->vp.height = gf_divfix(tr_state->camera->vp.height, INT2FIX(tr_state->visual->nb_views));
-		tr_state->camera->vp.y += gf_mulfix(INT2FIX(tr_state->visual->current_view), tr_state->camera->vp.height);
-//		tr_state->camera->vp.y = orig_vp.height - tr_state->camera->vp.height - tr_state->camera->vp.y;
-		if (tr_state->visual->compositor->visual==tr_state->visual)
-			tr_state->camera->vp.y = tr_state->visual->compositor->output_height - tr_state->camera->vp.y - tr_state->camera->vp.height;
-		else
-			tr_state->camera->vp.y = tr_state->visual->height - tr_state->camera->vp.y - tr_state->camera->vp.height;
+		tr_state->camera->vp.height = tr_state->camera->vp.height / tr_state->visual->nb_views;
+
+		if (tr_state->visual == tr_state->visual->compositor->visual) {
+			Fixed remain = INT2FIX(tr_state->visual->compositor->output_height - orig_vp.height) / tr_state->visual->nb_views;
 
+			tr_state->camera->vp.y = remain/2 + tr_state->visual->current_view*remain + tr_state->visual->current_view *tr_state->camera->vp.height;
+		} else {
+			tr_state->camera->vp.y = tr_state->visual->height - tr_state->camera->vp.y - tr_state->camera->vp.height;
+		}
 		visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+		//we must set scissor in top-to-bottom to avoid drawing the background outside the viewport!
 		visual_3d_set_scissor(tr_state->visual, &tr_state->camera->vp);
 
 		if (off_axis_background) {
@@ -600,7 +637,7 @@
 		visual_3d_enable_headlight(tr_state->visual, (tr_state->camera->navigation_flags & NAV_HEADLIGHT) ? 1 : 0, tr_state->camera);
 	}
 
-
+	//reset scissor
 	visual_3d_set_scissor(tr_state->visual, NULL);
 }
 
@@ -672,7 +709,7 @@
 		tr_state->traversing_mode = TRAVERSE_DRAW_3D;
 		/*layout/form clipper, set it in world coords only*/
 		if (tr_state->has_clip) {
-			visual_3d_set_clipper_2d(tr_state->visual, tr_state->clipper, NULL, 0);
+			visual_3d_set_clipper_2d(tr_state->visual, tr_state->clipper, NULL);
 		}
 
 		gf_node_traverse(geometry, tr_state);
@@ -766,7 +803,7 @@
 
 		/*clipper, set it in world coords only*/
 		if (ctx->has_clipper) {
-			visual_3d_set_clipper_2d(visual, ctx->clipper, NULL, 0);
+			visual_3d_set_clipper_2d(visual, ctx->clipper, NULL);
 		}
 
 		/*clip planes, set it in world coords only*/
@@ -825,7 +862,7 @@
 
 	/*main visual, handle collisions*/
 	if ((tr_state->visual==tr_state->visual->compositor->visual) && tr_state->camera->is_3D)
-		visual_3d_check_collisions(tr_state, NULL);
+		visual_3d_check_collisions(tr_state, root_node, NULL);
 
 #ifndef GPAC_DISABLE_VRML
 	/*setup fog*/
@@ -851,6 +888,37 @@
 	visual_3d_clear_all_lights(tr_state->visual);
 }
 
+void visual_3d_setup_clipper(GF_VisualManager *visual, GF_TraverseState *tr_state)
+{
+	GF_Rect rc;
+	/*setup top clipper*/
+	if (visual->center_coords) {
+		rc = gf_rect_center(INT2FIX(visual->width), INT2FIX(visual->height));
+	} else {
+		rc.width = INT2FIX(visual->width);
+		rc.height = INT2FIX(visual->height);
+		rc.x = 0;
+		rc.y = rc.height;
+		if (visual->compositor->visual==visual) {
+			rc.x += INT2FIX(visual->compositor->vp_x);
+			rc.y += INT2FIX(visual->compositor->vp_y);
+		}
+	}
+
+	/*setup viewport*/
+#ifndef GPAC_DISABLE_VRML
+	if (gf_list_count(visual->view_stack)) {
+		tr_state->traversing_mode = TRAVERSE_BINDABLE;
+		tr_state->bounds = rc;
+		gf_node_traverse((GF_Node *) gf_list_get(visual->view_stack, 0), tr_state);
+	}
+#endif
+
+	visual->top_clipper = gf_rect_pixelize(&rc);
+	tr_state->clipper = rc;
+	gf_mx_init(tr_state->layer_matrix);
+}
+
 Bool visual_3d_draw_frame(GF_VisualManager *visual, GF_Node *root, GF_TraverseState *tr_state, Bool is_root_visual)
 {
 #ifndef GPAC_DISABLE_LOG
@@ -858,6 +926,7 @@
 #endif
 
 	visual_3d_setup(visual);
+	visual->glsl_flags = 0;
 
 	/*setup our traversing state*/
 	visual_3d_setup_traversing_state(visual, tr_state);
@@ -865,12 +934,14 @@
 	if (is_root_visual) {
 		Bool auto_stereo = 0;
 
-		if (tr_state->visual->autostereo_type>GF_3D_STEREO_SIDE) {
+		visual_3d_setup_clipper(visual, tr_state);
+
+		if (tr_state->visual->autostereo_type > GF_3D_STEREO_LAST_SINGLE_BUFFER) {
 			visual_3d_init_autostereo(visual);
 			auto_stereo = 1;
 		}
 
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		visual_3d_init_shaders(visual);
 #endif
 
@@ -911,7 +982,7 @@
 	}
 }
 
-void visual_3d_check_collisions(GF_TraverseState *tr_state, GF_ChildNodeItem *node_list)
+void visual_3d_check_collisions(GF_TraverseState *tr_state, GF_Node *on_node, GF_ChildNodeItem *node_list)
 {
 	SFVec3f n, dir;
 	Bool go;
@@ -958,9 +1029,9 @@
 		}
 		n = gf_vec_scale(dir, diff);
 		gf_vec_add(tr_state->camera->position, tr_state->camera->last_pos, n);
-		if (!node_list) {
-			gf_node_traverse(gf_sg_get_root_node(tr_state->visual->compositor->scene), tr_state);
-		} else {
+		if (on_node) {
+			gf_node_traverse(on_node, tr_state);
+		} else if (node_list) {
 			while (node_list) {
 				gf_node_traverse(node_list->node, tr_state);
 				node_list = node_list->next;
@@ -1510,12 +1581,14 @@
 {
 	if (asp->line_texture) {
 		GF_Node *txtrans = NULL;
+#ifndef GPAC_DISABLE_VRML
 		if (tr_state->appear
 		 && (gf_node_get_tag( ((M_Appearance *)tr_state->appear)->material) == TAG_MPEG4_Material2D)
 		 && (gf_node_get_tag(((M_Material2D *) ((M_Appearance *)tr_state->appear)->material)->lineProps) == TAG_MPEG4_XLineProperties)
 		 ) {
 			txtrans = ((M_XLineProperties *) ((M_Material2D *) ((M_Appearance *)tr_state->appear)->material)->lineProps)->textureTransform;
 		}
+#endif
 
 		/*We forgot to specify this in the spec ...*/
 		gf_sc_texture_set_blend_mode(asp->line_texture, TX_REPLACE);
@@ -1838,7 +1911,7 @@
 		visual_3d_mesh_paint(tr_state, mesh);
 		visual_3d_disable_texture(tr_state);
 
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_DISABLE_X3D)
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_USE_GLES2)
 		if (tr_state->appear && gf_node_get_tag(tr_state->appear)==TAG_X3D_Appearance) {
 			X_Appearance *ap = (X_Appearance *)tr_state->appear;
 			X_FillProperties *fp = ap->fillProperties ? (X_FillProperties *) ap->fillProperties : NULL;
@@ -1865,9 +1938,10 @@
 	col.blue = col.red = col.green = FIX_ONE;
 	dir.x = dir.y = 0;
 	dir.z = -FIX_ONE;
-	if (cam->is_3D) dir = camera_get_target_dir(cam);
+//	if (cam->is_3D) dir = camera_get_target_dir(cam);
+//	visual_3d_add_directional_light(visual, 0, col, FIX_ONE, dir, &cam->modelview);
 
-	visual_3d_add_directional_light(visual, 0, col, FIX_ONE, dir, &cam->modelview);
+	visual_3d_add_directional_light(visual, 0, col, FIX_ONE, dir, NULL);
 }
 
 void visual_3d_set_material_2d(GF_VisualManager *visual, SFColor col, Fixed alpha)
@@ -1894,37 +1968,17 @@
 	}
 }
 
-void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip, GF_Matrix *mx_at_clipper, Bool is_2d_clip)
+void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip, GF_Matrix *mx_at_clipper)
 {
-	GF_Plane p;
-
-	if (visual->num_clips + 4 > visual->max_clips)
-		return;
-
-	p.normal.z = 0;
-	p.normal.y = 0;
-	p.normal.x = -FIX_ONE;
-	p.d = clip.x + clip.width;
-	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
-
-	p.normal.x = FIX_ONE;
-	p.d = -clip.x;
-	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
-
-	p.normal.x = 0;
-	p.normal.y = -FIX_ONE;
-	p.d = clip.y;
-	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
-
-	p.normal.y = FIX_ONE;
-	p.d = clip.height - clip.y;
-	visual_3d_set_clip_plane(visual, p, mx_at_clipper, is_2d_clip);
+	if (mx_at_clipper)
+		gf_mx_apply_rect(mx_at_clipper, &clip);
+	visual->clipper_2d = gf_rect_pixelize(&clip);
+	visual->has_clipper_2d = GF_TRUE;
 }
 
 void visual_3d_reset_clipper_2d(GF_VisualManager *visual)
 {
-	if (visual->num_clips < 4) return;
-	visual->num_clips -= 4;
+	visual->has_clipper_2d = GF_FALSE;
 }
 
 void visual_3d_set_clip_plane(GF_VisualManager *visual, GF_Plane p, GF_Matrix *mx_at_clipper, Bool is_2d_clip)
@@ -2017,7 +2071,16 @@
 	visual->lights[visual->num_lights].color = color;
 	visual->lights[visual->num_lights].intensity = intensity;
 	visual->lights[visual->num_lights].direction = direction;
-	memcpy(&visual->lights[visual->num_lights].light_mx, light_mx, sizeof(GF_Matrix) );
+	if (light_mx) {
+		memcpy(&visual->lights[visual->num_lights].light_mx, light_mx, sizeof(GF_Matrix) );
+	} else {
+		gf_mx_init(visual->lights[visual->num_lights].light_mx);
+		visual->lights[visual->num_lights].type = 3;
+		visual->lights[visual->num_lights].direction.x = 0;
+		visual->lights[visual->num_lights].direction.y = 0;
+		visual->lights[visual->num_lights].direction.z = -FIX_ONE;
+	}
+
 	visual->num_lights++;
 	return 1;
 }

v0.5.2.tar.gz/src/compositor/visual_manager_3d.h -> v0.6.1.tar.gz/src/compositor/visual_manager_3d.h Changed

@@ -31,8 +31,8 @@
 #ifndef GPAC_DISABLE_3D
 
 
-#define GF_MAX_GL_CLIPS	12
-#define GF_MAX_GL_LIGHTS 12
+#define GF_MAX_GL_CLIPS	8
+#define GF_MAX_GL_LIGHTS 4
 
 /*
 *	Visual 3D functions
@@ -91,9 +91,8 @@
 	- exported for text drawing*/
 void visual_3d_disable_texture(GF_TraverseState *tr_state);
 
-/*check for collisions on a list of nodes, or scene root if list is null
-	- exported for Layer3D - try to harmonize*/
-void visual_3d_check_collisions(GF_TraverseState *tr_state, GF_ChildNodeItem *node_list);
+/*check for collisions on a given node or on a list of nodes*/
+void visual_3d_check_collisions(GF_TraverseState *tr_state, GF_Node *root_node, GF_ChildNodeItem *node_list);
 
 /*init drawing pass - exported for Layer3D
 	@layer_type:
@@ -179,7 +178,6 @@
 
 typedef struct
 {
-	//0: directional - 1: spot - 2: point
 	GF_Plane p;
 	Bool is_2d_clip;
 	GF_Matrix *mx_clipper;
@@ -229,17 +227,18 @@
 
 /*setup viewport (vp: top-left, width, height)*/
 void visual_3d_set_viewport(GF_VisualManager *visual, GF_Rect vp);
+
 /*setup scissors region (vp: top-left, width, height) - if vp is NULL, disables scissors*/
 void visual_3d_set_scissor(GF_VisualManager *visual, GF_Rect *vp);
 
 /*setup rectangular cliper (clip: top-left, width, height)
-NOTE: 2D clippers can only be set from a 2D context, hence will always take the 4 first GL clip planes.
+NOTE: 2D clippers can only be set from a 2D context, and will always use glScissor.
 In order to allow multiple Layer2D in Layer2D, THERE IS ALWAYS AT MOST ONE 2D CLIPPER USED AT ANY TIME,
 it is the caller responsability to restore previous 2D clipers
 
 the matrix is not copied, care should be taken to keep it unmodified until the cliper is reset (unless desired otherwise)
 if NULL, no specific clipping transform will be used*/
-void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip, GF_Matrix *mx_at_clipper, Bool is_2d_clip);
+void visual_3d_set_clipper_2d(GF_VisualManager *visual, GF_Rect clip, GF_Matrix *mx_at_clipper);
 /*remove 2D clipper*/
 void visual_3d_reset_clipper_2d(GF_VisualManager *visual);
 
@@ -283,7 +282,7 @@
                               SFColor color, Fixed cutOffAngle, SFVec3f direction, Fixed intensity, SFVec3f location, GF_Matrix *light_mx);
 /*insert point light - returns 0 if too many lights*/
 Bool visual_3d_add_point_light(GF_VisualManager *visual, Fixed ambientIntensity, SFVec3f attenuation, SFColor color, Fixed intensity, SFVec3f location, GF_Matrix *light_mx);
-/*insert directional light - returns 0 if too many lights*/
+/*insert directional light - returns 0 if too many lights. If light_mx is null, this is the headlight*/
 Bool visual_3d_add_directional_light(GF_VisualManager *visual, Fixed ambientIntensity, SFColor color, Fixed intensity, SFVec3f direction, GF_Matrix *light_mx);
 
 void visual_3d_has_inactive_light(GF_VisualManager *visual);
@@ -296,7 +295,7 @@
 void visual_3d_point_sprite(GF_VisualManager *visual, Drawable *stack, GF_TextureHandler *txh, GF_TraverseState *tr_state);
 
 /*non-oglES functions*/
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 /*X3D hatching*/
 void visual_3d_mesh_hatch(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 hatchStyle, SFColor hatchColor);
 #endif

v0.5.2.tar.gz/src/compositor/visual_manager_3d_gl.c -> v0.6.1.tar.gz/src/compositor/visual_manager_3d_gl.c Changed

@@ -36,7 +36,7 @@
 # if defined(GPAC_USE_TINYGL)
 # pragma comment(lib, "TinyGL")
 
-# elif defined(GPAC_USE_OGL_ES)
+# elif defined(GPAC_USE_GLES1X)
 
 # if 0
 # pragma message("Using OpenGL-ES Common Lite Profile")
@@ -47,6 +47,9 @@
 # pragma comment(lib, "libGLES_CM")
 # endif
 
+# elif defined(GPAC_USE_GLES2)
+# pragma comment(lib, "libGLESv2")
+
 # else
 # pragma comment(lib, "opengl32")
 # endif
@@ -62,7 +65,7 @@
 #undef GL_MAX_CLIP_PLANES
 #endif
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 #define GL_CLAMP GL_CLAMP_TO_EDGE
 #endif
 
@@ -136,13 +139,15 @@
 GLDECL_STATIC(glUniformMatrix4x2fv);
 GLDECL_STATIC(glUniformMatrix3x4fv);
 GLDECL_STATIC(glUniformMatrix4x3fv);
+GLDECL_STATIC(glGetProgramiv);
+GLDECL_STATIC(glGetProgramInfoLog);
+GLDECL_STATIC(glGetAttribLocation);
 
 #ifndef GPAC_ANDROID
 GLDECL_STATIC(glEnableVertexAttribArray);
 GLDECL_STATIC(glDisableVertexAttribArray);
 GLDECL_STATIC(glVertexAttribPointer);
 GLDECL_STATIC(glVertexAttribIPointer);
-GLDECL_STATIC(glGetAttribLocation);
 #endif
 
 #endif //LOAD_GL_2_0
@@ -183,11 +188,17 @@
 			compositor->gl_caps.point_sprite = 2;
 		}
 	}
+
+#ifdef GPAC_USE_GLES2
+	compositor->gl_caps.vbo = 1;
+#else
 	if (CHECK_GL_EXT("GL_ARB_vertex_buffer_object")) {
 		compositor->gl_caps.vbo = 1;
 	}
+#endif
+
 
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 	if (CHECK_GL_EXT("GL_EXT_texture_rectangle") || CHECK_GL_EXT("GL_NV_texture_rectangle")) {
 		compositor->gl_caps.rect_texture = 1;
 		if (CHECK_GL_EXT("GL_MESA_ycbcr_texture")) compositor->gl_caps.yuv_texture = YCBCR_MESA;
@@ -197,6 +208,7 @@
 
 	if (!has_gl_context) return;
 
+
 	/*we have a GL context, init the rest (proc addresses & co)*/
 	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &compositor->gl_caps.max_texture_size);
 
@@ -275,6 +287,8 @@
 		GET_GLFUN(glUniformMatrix4x2fv);
 		GET_GLFUN(glUniformMatrix3x4fv);
 		GET_GLFUN(glUniformMatrix4x3fv);
+		GET_GLFUN(glGetProgramiv);
+		GET_GLFUN(glGetProgramInfoLog);
 
 		compositor->gl_caps.has_shaders = 1;
 
@@ -286,7 +300,7 @@
 		GET_GLFUN(glGetAttribLocation);
 
 		if (glGetAttribLocation != NULL) {
-			compositor->shader_only_mode = 0;
+			compositor->shader_only_mode = GF_TRUE;
 		}
 #endif
 
@@ -298,34 +312,73 @@
 
 #endif //GPAC_USE_TINYGL
 
-#ifdef GL_VERSION_2_0
-	compositor->gl_caps.has_shaders = 1;
+#ifdef GPAC_USE_GLES2
+	compositor->gl_caps.has_shaders = GF_TRUE;
+	compositor->shader_only_mode = GF_TRUE;
+#elif defined (GL_VERSION_2_0)
+	compositor->gl_caps.has_shaders = GF_TRUE;
+	compositor->shader_only_mode = GF_TRUE;
 #endif
 
-	if (!compositor->gl_caps.has_shaders && (compositor->visual->autostereo_type > GF_3D_STEREO_SIDE)) {
+	if (!compositor->gl_caps.has_shaders && (compositor->visual->autostereo_type > GF_3D_STEREO_LAST_SINGLE_BUFFER)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported - disabling auto-stereo output\n"));
 		compositor->visual->nb_views=1;
 		compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
 		compositor->visual->camera_layout = GF_3D_CAMERA_STRAIGHT;
 	}
+
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+	if (compositor->shader_only_mode) {
+		const char *shader = gf_cfg_get_key(compositor->user->config, "Compositor", "VertexShader");
+		FILE *t = shader ? fopen(shader, "rt") : NULL;
+		if (!t) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] GLES Vertex shader not found, disabling shaders\n"));
+			compositor->shader_only_mode = GF_FALSE;
+		}
+		if (t) fclose(t);
+
+		shader = gf_cfg_get_key(compositor->user->config, "Compositor", "FragmentShader");
+		t = shader ? fopen(shader, "rt") : NULL;
+		if (!t) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] GLES Fragment shader not found, disabling shaders\n"));
+			compositor->shader_only_mode = GF_FALSE;
+		}
+		if (t) fclose(t);
+	}
+#endif
 }
 
 
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+#ifdef GPAC_USE_GLES2
+#define GLES_VERSION_STRING "#version 100 \n"
+#else
+#define GLES_VERSION_STRING "#version 120 \n"
+#endif
+
+#define GLSL_PREFIX GLES_VERSION_STRING \
+	"#ifdef GL_ES"\
+	"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"\
+	"precision highp float;\n"\
+	"#else\n"\
+	"precision mediump float;\n"\
+	"#endif\n" \
+	"#endif\n"
 
 
-static char *default_glsl_vertex = "\
-	varying vec3 gfNormal;\
+static char *glsl_autostereo_vertex = GLSL_PREFIX "\
+	attribute vec4 gfVertex;\
+	attribute vec2 gfTextureCoordinates;\
+	uniform mat4 gfProjectionMatrix;\
 	varying vec2 TexCoord;\
 	void main(void)\
 	{\
-		gfNormal = normalize(gl_NormalMatrix * gl_Normal);\
-		gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\
-		gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\
-		TexCoord = vec2(gl_TextureMatrix[0] * gl_MultiTexCoord0);\
+		TexCoord = gfTextureCoordinates;\
+		gl_Position = gfProjectionMatrix * gfVertex;\
 	}";
 
-static char *glsl_view_anaglyph = "\
+static char *glsl_view_anaglyph = GLSL_PREFIX "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
 	varying vec2 TexCoord;\
@@ -339,7 +392,7 @@
 	}";
 
 #ifdef GPAC_UNUSED_FUNC
-static char *glsl_view_anaglyph_optimize = "\
+static char *glsl_view_anaglyph_optimize = GLSL_PREFIX "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
 	varying vec2 TexCoord;\
@@ -354,7 +407,7 @@
 	}";
 #endif /*GPAC_UNUSED_FUNC*/
 
-static char *glsl_view_columns = "\
+static char *glsl_view_columns = GLSL_PREFIX "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
 	varying vec2 TexCoord;\
@@ -366,7 +419,7 @@
 			gl_FragColor = texture2D(gfView2, TexCoord.st); \
 	}";
 
-static char *glsl_view_rows = "\
+static char *glsl_view_rows = GLSL_PREFIX "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
 	varying vec2 TexCoord;\
@@ -378,143 +431,115 @@
 			gl_FragColor = texture2D(gfView2, TexCoord.st); \
 	}";
 
-static char *glsl_view_5VSP19 = "\
+static char *glsl_view_5VSP19 = GLSL_PREFIX "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
 	uniform sampler2D gfView3;\
 	uniform sampler2D gfView4;\
 	uniform sampler2D gfView5;\
 	varying vec2 TexCoord;\
+	\
+	void getTextureSample(in int texID, out vec4 color) { \
+	 if (texID == 0 ) color = texture2D(gfView1, TexCoord.st); \
+	 else if (texID == 1 ) color = texture2D(gfView2, TexCoord.st); \
+	 else if (texID == 2 ) color = texture2D(gfView3, TexCoord.st); \
+	 else if (texID == 3 ) color = texture2D(gfView4, TexCoord.st); \
+	 else if (texID == 4 ) color = texture2D(gfView5, TexCoord.st); \
+	} \
+	\
 	void main(void) {\
-	vec4 color[5];\
-	color[0] = texture2D(gfView5, TexCoord.st);\
-	color[1] = texture2D(gfView4, TexCoord.st);\
-	color[2] = texture2D(gfView3, TexCoord.st);\
-	color[3] = texture2D(gfView2, TexCoord.st);\
-	color[4] = texture2D(gfView1, TexCoord.st);\
-	float pitch = 5.0 + 1.0 - mod(gl_FragCoord.y , 5.0);\
-	int col = int( mod(pitch + 3.0 * (gl_FragCoord.x), 5.0 ) );\
-	int Vr = int(col);\
-	int Vg = int(col) + 1;\
-	int Vb = int(col) + 2;\
-	if (Vg >= 5) Vg -= 5;\
-	if (Vb >= 5) Vb -= 5;\
-	gl_FragColor.r = color[Vr].r;\
-	gl_FragColor.g = color[Vg].g;\
-	gl_FragColor.b = color[Vb].b;\
+		vec4 color;\
+		float pitch = 5.0 + 1.0 - mod(gl_FragCoord.y , 5.0);\
+		int col = int( mod(pitch + 3.0 * (gl_FragCoord.x), 5.0 ) );\
+		int Vr = int(col);\
+		int Vg = int(col) + 1;\
+		int Vb = int(col) + 2;\
+		if (Vg >= 5) Vg -= 5;\
+		if (Vb >= 5) Vb -= 5;\
+		getTextureSample(Vr, color); \
+		gl_FragColor.r = color.r;\
+		getTextureSample(Vg, color); \
+		gl_FragColor.g = color.g;\
+		getTextureSample(Vb, color); \
+		gl_FragColor.b = color.b;\
 	}";
 
-static char *glsl_yuv_shader = "\
-	uniform sampler2D y_plane;\n\
-	uniform sampler2D u_plane;\n\
-	uniform sampler2D v_plane;\n\
-	uniform float alpha;\n\
-	varying vec2 TexCoord;\n\
-	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
-	const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
-	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
-	const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
-	void main(void) \n\
-	{\n\
-		vec2 texc;\n\
-		vec3 yuv, rgb;\n\
-		texc = TexCoord.st;\n\
-		yuv.x = texture2D(y_plane, texc).r;\n\
-		yuv.y = texture2D(u_plane, texc).r;\n\
-		yuv.z = texture2D(v_plane, texc).r;\n\
-		yuv += offset;\n\
-	 rgb.r = dot(yuv, R_mul);\n\
-	 rgb.g = dot(yuv, G_mul);\n\
-	 rgb.b = dot(yuv, B_mul);\n\
-		gl_FragColor = vec4(rgb, alpha);\n\
-	}\n";
-
-
-static char *glsl_yuv_rect_shader_strict = "\
-	#version 140\n\
-	#extension GL_ARB_texture_rectangle : enable\n\
-	uniform sampler2DRect y_plane;\n\
-	uniform sampler2DRect u_plane;\n\
-	uniform sampler2DRect v_plane;\n\
-	uniform float width;\n\
-	uniform float height;\n\
-	uniform float alpha;\n\
-	in vec2 TexCoord;\n\
-	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
-	const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
-	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
-	const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
-	out vec4 FragColor;\n\
-	void main(void) \n\
-	{\n\
-		vec2 texc;\n\
-		vec3 yuv, rgb;\n\
-		texc = TexCoord.st;\n\
-		texc.x *= width;\n\
-		texc.y *= height;\n\
-		yuv.x = texture2DRect(y_plane, texc).r;\n\
-		texc.x /= 2.0;\n\
-		texc.y /= 2.0;\n\
-		yuv.y = texture2DRect(u_plane, texc).r;\n\
-		yuv.z = texture2DRect(v_plane, texc).r;\n\
-		yuv += offset;\n\
-	 rgb.r = dot(yuv, R_mul);\n\
-	 rgb.g = dot(yuv, G_mul);\n\
-	 rgb.b = dot(yuv, B_mul);\n\
-		FragColor = vec4(rgb, alpha);\n\
-	}\n";
-
-static char *glsl_yuv_rect_shader_relaxed= "\
-	uniform sampler2DRect y_plane;\n\
-	uniform sampler2DRect u_plane;\n\
-	uniform sampler2DRect v_plane;\n\
-	uniform float width;\n\
-	uniform float height;\n\
-	uniform float alpha;\n\
- varying vec2 TexCoord;\n\
-	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
-	const vec3 R_mul = vec3(1.164, 0.000, 1.596);\n\
-	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
-	const vec3 B_mul = vec3(1.164, 2.018, 0.000);\n\
-	void main(void) \n\
-	{\n\
-		vec2 texc;\n\
-		vec3 yuv, rgb;\n\
-		texc = TexCoord.st;\n\
-		texc.x *= width;\n\
-		texc.y *= height;\n\
-		yuv.x = texture2DRect(y_plane, texc).r;\n\
-		texc.x /= 2.0;\n\
-		texc.y /= 2.0;\n\
-		yuv.y = texture2DRect(u_plane, texc).r;\n\
-		yuv.z = texture2DRect(v_plane, texc).r;\n\
-		yuv += offset;\n\
-	 rgb.r = dot(yuv, R_mul);\n\
-	 rgb.g = dot(yuv, G_mul);\n\
-	 rgb.b = dot(yuv, B_mul);\n\
-		gl_FragColor = vec4(rgb, alpha);\n\
-	}\n";
+static char *glsl_view_8VAlio = GLSL_PREFIX "\
+	uniform sampler2D gfView1; \
+	uniform sampler2D gfView2; \
+	uniform sampler2D gfView3; \
+	uniform sampler2D gfView4; \
+	uniform sampler2D gfView5; \
+	uniform sampler2D gfView6; \
+	uniform sampler2D gfView7; \
+	uniform sampler2D gfView8; \
+	varying vec2 TexCoord;\
+	 \
+	void getTextureSample(in int texID, out vec4 color) { \
+	 if (texID == 0 ) color = texture2D(gfView1, TexCoord.st); \
+	 else if (texID == 1 ) color = texture2D(gfView2, TexCoord.st); \
+	 else if (texID == 2 ) color = texture2D(gfView3, TexCoord.st); \
+	 else if (texID == 3 ) color = texture2D(gfView4, TexCoord.st); \
+	 else if (texID == 4 ) color = texture2D(gfView5, TexCoord.st); \
+	 else if (texID == 5 ) color = texture2D(gfView6, TexCoord.st); \
+	 else if (texID == 6 ) color = texture2D(gfView7, TexCoord.st); \
+	 else if (texID == 7 ) color = texture2D(gfView8, TexCoord.st); \
+	} \
+	 \
+	void main() \
+	{ \
+	 int x = int(gl_FragCoord.x + 0.5); \
+	 int y = int(gl_FragCoord.y + 0.5); \
+	 int modulox = x/8; \
+	 int moduloy = y/8; \
+	 modulox = x - 8 * modulox; \
+	 moduloy = y - 8 * moduloy; \
+	 \
+	 int viewLine = 7 - moduloy; \
+	 int viewPix = viewLine + 3 * modulox; \
+	 int viewR = viewPix - 8*(viewPix/8); \
+	 int viewG = viewPix + 1 - 8*((viewPix +1)/8); \
+	 int viewB = viewPix + 2 - 8*((viewPix +2)/8); \
+	 \
+	 vec4 color; \
+	 getTextureSample(viewR, color); \
+	 gl_FragColor.r = color.r; \
+	 getTextureSample(viewG, color); \
+	 gl_FragColor.g = color.g; \
+	 getTextureSample(viewB, color); \
+	 gl_FragColor.b = color.b; \
+	}";
 
 
+/**
+ parses (glShaderSource) and compiles (glCompileShader) shader source
+ \return GF_TRUE if successful
+ */
 Bool visual_3d_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
 {
 	GLint blen = 0;
 	GLsizei slen = 0;
 	s32 len;
+	GLint is_compiled=0;
 	if (!source || !shader_id) return 0;
 	len = (u32) strlen(source);
 	glShaderSource(shader_id, 1, &source, &len);
 	glCompileShader(shader_id);
 
+	glGetShaderiv(shader_id, GL_COMPILE_STATUS, &is_compiled);
+	if (is_compiled == GL_TRUE) return GF_TRUE;
+
 	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
 	if (blen > 1) {
 		char* compiler_log = (char*) gf_malloc(blen);
 #ifdef CONFIG_DARWIN_GL
 		glGetInfoLogARB((GLhandleARB) shader_id, blen, &slen, compiler_log);
+#elif defined(GPAC_USE_GLES2)
+		glGetShaderInfoLog(shader_id, blen, &slen, compiler_log);
 #else
 		glGetInfoLogARB(shader_id, blen, &slen, compiler_log);
 #endif
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile shader %s: %s\n", name, compiler_log));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile %s shader: %s\n", name, compiler_log));
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[GLSL] ***** faulty shader code ****\n%s\n**********************\n", source));
 		gf_free (compiler_log);
 		return 0;
@@ -523,17 +548,17 @@
 }
 static GF_SHADERID visual_3d_shader_from_source_file(const char *src_path, u32 shader_type)
 {
-	FILE *src = gf_f64_open(src_path, "rt");
+	FILE *src = gf_fopen(src_path, "rt");
 	GF_SHADERID shader = 0;
 	if (src) {
 		size_t size;
 		char *shader_src;
-		gf_f64_seek(src, 0, SEEK_END);
-		size = (size_t) gf_f64_tell(src);
-		gf_f64_seek(src, 0, SEEK_SET);
+		gf_fseek(src, 0, SEEK_END);
+		size = (size_t) gf_ftell(src);
+		gf_fseek(src, 0, SEEK_SET);
 		shader_src = gf_malloc(sizeof(char)*(size+1));
 		size = fread(shader_src, 1, size, src);
-		fclose(src);
+		gf_fclose(src);
 		if (size != (size_t) -1) {
 			shader_src[size]=0;
 			shader = glCreateShader(shader_type);
@@ -549,184 +574,535 @@
 	return shader;
 }
 
+#ifdef GPAC_IPHONE
+#include <errno.h>
+#include <sys/sysctl.h>
+#endif
+
+
+static GF_SHADERID visual_3d_shader_with_flags(const char *src_path, u32 shader_type, u32 flags) {
+
+	FILE *src = gf_fopen(src_path, "rt");
+	GF_SHADERID shader = 0;
+	char *shader_src;
+	char *defs, *tmp, szKey[100];
+	size_t str_size;
+
+	defs = (char *) gf_strdup(GLES_VERSION_STRING);
+	str_size = strlen(defs) + 1; //+1 for trailing \0
+
+	if (flags & GF_GL_HAS_LIGHT) {
+		sprintf(szKey, "#define GF_GL_HAS_LIGHT\n#define LIGHTS_MAX %d\n", GF_MAX_GL_LIGHTS);
+		str_size += strlen(szKey);
+		defs = (char *) gf_realloc(defs, sizeof(char)*str_size);
+		strcat(defs, szKey);
+	}
+
+	if(flags & GF_GL_HAS_COLOR) {
+		str_size += strlen("#define GF_GL_HAS_COLOR \n");
+		defs = (char *) gf_realloc(defs, sizeof(char)*str_size);
+		strcat(defs,"#define GF_GL_HAS_COLOR \n");
+	}
+
+	if(flags & GF_GL_HAS_TEXTURE) {
+		str_size += strlen("#define GF_GL_HAS_TEXTURE \n");
+		defs = (char *) gf_realloc(defs, sizeof(char)*str_size);
+		strcat(defs,"#define GF_GL_HAS_TEXTURE \n");
+	}
+
+	if(flags & GF_GL_HAS_CLIP) {
+		/*clipping is always enabled*/
+		sprintf(szKey, "#define CLIPS_MAX %d\n#define GF_GL_HAS_CLIP\n", GF_MAX_GL_CLIPS);
+		str_size += strlen(szKey);
+		defs = (char *) gf_realloc(defs, sizeof(char)*str_size);
+		strcat(defs, szKey);
+	}
+
+	if (shader_type==GL_FRAGMENT_SHADER) {
+		if(flags & GF_GL_IS_YUV) {
+			str_size += strlen("#define GF_GL_IS_YUV \n");
+			defs = (char *) gf_realloc(defs, sizeof(char)*str_size);
+			strcat(defs,"#define GF_GL_IS_YUV \n");
+		}
+	}
+
+	if (src) {
+		size_t size;
+		gf_fseek(src, 0, SEEK_END);
+		size = (size_t) gf_ftell(src);
+		gf_fseek(src, 0, SEEK_SET);
+		shader_src = gf_malloc(sizeof(char)*(size+1));
+		size = fread(shader_src, 1, size, src);
+		tmp = (char *) gf_malloc(sizeof(char)*(size+str_size+2));
+		strcpy(tmp, defs);
+		strncat(tmp, shader_src, (size));
+		fclose(src);
+		if (size != (size_t) -1) {
+			tmp[size+str_size]=0;
+			shader = glCreateShader(shader_type);
+			if (visual_3d_compile_shader(shader, (shader_type == GL_FRAGMENT_SHADER) ? "fragment" : "vertex", tmp)==GF_FALSE) {
+				glDeleteShader(shader);
+				shader = 0;
+			}
+		}
+		gf_free(shader_src);
+		gf_free(tmp);
+		gf_free(defs);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to open shader file %s\n", src_path));
+	}
+	return shader;
+}
+
+static void visual_3d_set_tx_planes(GF_VisualManager *visual)
+{
+	GLint i,j, loc;
+
+	for(i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
+		if (! (i & GF_GL_HAS_TEXTURE))
+			continue;
+
+		glUseProgram(visual->glsl_programs[i]);
+		if (i & GF_GL_IS_YUV) {
+			for (j=0; j<3; j++) {
+				const char *txname = (j==0) ? "y_plane" : (j==1) ? "u_plane" : "v_plane";
+				loc = glGetUniformLocation(visual->glsl_programs[i], txname);
+				if (loc == -1) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
+					continue;
+				}
+				glUniform1i(loc, j);
+			}
+		} else {
+			loc = glGetUniformLocation(visual->glsl_programs[i], "img");
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture img in RGB shader\n"));
+			}
+			glUniform1i(loc, 0);
+
+		}
+	}
+}
+
 void visual_3d_init_stereo_shaders(GF_VisualManager *visual)
 {
+	GLint linked;
+	Bool res;
 	if (!visual->compositor->gl_caps.has_shaders) return;
 
 	if (visual->autostereo_glsl_program) return;
 
 	visual->autostereo_glsl_program = glCreateProgram();
 
+	res = GF_TRUE;
 	if (!visual->base_glsl_vertex) {
 		visual->base_glsl_vertex = glCreateShader(GL_VERTEX_SHADER);
-		visual_3d_compile_shader(visual->base_glsl_vertex, "vertex", default_glsl_vertex);
+		res = visual_3d_compile_shader(visual->base_glsl_vertex, "vertex", glsl_autostereo_vertex);
 	}
+	if (res) {
+		switch (visual->autostereo_type) {
+		case GF_3D_STEREO_COLUMNS:
+			visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+			res = visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_columns);
+			break;
+		case GF_3D_STEREO_ROWS:
+			visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+			res = visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_rows);
+			break;
+		case GF_3D_STEREO_ANAGLYPH:
+			visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+			res = visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_anaglyph);
+			break;
+		case GF_3D_STEREO_5VSP19:
+			visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+			res = visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_5VSP19);
+			break;
+		case GF_3D_STEREO_8VALIO:
+			visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+			res = visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_8VAlio);
+			break;
 
-	switch (visual->autostereo_type) {
-	case GF_3D_STEREO_COLUMNS:
-		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_columns);
-		break;
-	case GF_3D_STEREO_ROWS:
-		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_rows);
-		break;
-	case GF_3D_STEREO_ANAGLYPH:
-		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_anaglyph);
-		break;
-	case GF_3D_STEREO_5VSP19:
-		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_5VSP19);
+		case GF_3D_STEREO_CUSTOM:
+		{
+			const char *sOpt = gf_cfg_get_key(visual->compositor->user->config, "Compositor", "InterleaverShader");
+			if (sOpt) {
+				visual->autostereo_glsl_fragment = visual_3d_shader_from_source_file(sOpt, GL_FRAGMENT_SHADER);
+				if (visual->autostereo_glsl_fragment) res = GF_TRUE;
+			}
+		}
 		break;
-	case GF_3D_STEREO_CUSTOM:
-	{
-		const char *sOpt = gf_cfg_get_key(visual->compositor->user->config, "Compositor", "InterleaverShader");
-		if (sOpt) {
-			visual->autostereo_glsl_fragment = visual_3d_shader_from_source_file(sOpt, GL_FRAGMENT_SHADER);
 		}
 	}
-	break;
+
+	if (res) {
+		glAttachShader(visual->autostereo_glsl_program, visual->base_glsl_vertex);
+		glAttachShader(visual->autostereo_glsl_program, visual->autostereo_glsl_fragment);
+		glLinkProgram(visual->autostereo_glsl_program);
+
+		glGetProgramiv(visual->autostereo_glsl_program, GL_LINK_STATUS, &linked);
+		if (!linked) {
+			int i32CharsWritten, i32InfoLogLength;
+			char pszInfoLog[2048];
+			glGetProgramiv(visual->autostereo_glsl_program, GL_INFO_LOG_LENGTH, &i32InfoLogLength);
+			glGetProgramInfoLog(visual->autostereo_glsl_program, i32InfoLogLength, &i32CharsWritten, pszInfoLog);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, (pszInfoLog));
+			res = GF_FALSE;
+		}
+		GL_CHECK_ERR
 	}
 
-	glAttachShader(visual->autostereo_glsl_program, visual->base_glsl_vertex);
-	glAttachShader(visual->autostereo_glsl_program, visual->autostereo_glsl_fragment);
-	glLinkProgram(visual->autostereo_glsl_program);
+	if (!res) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Autostereo vertex shader failed - disabling stereo support\n"));
+		visual->autostereo_type = 0;
+		visual->nb_views = 1;
+	}
 }
 
 #define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
 #define DEL_PROGRAM(_a) if (_a) { glDeleteProgram(_a); _a = 0; }
 
-static void visual_3d_init_yuv_shaders(GF_VisualManager *visual)
+
+
+static GLint gf_glGetUniformLocation(GF_SHADERID glsl_program, const char *uniform_name)
 {
-	u32 i;
-	GLint loc;
-	if (!visual->compositor->gl_caps.has_shaders) return;
+	GLint loc = glGetUniformLocation(glsl_program, uniform_name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find uniform \"%s\" in GLSL program\n", uniform_name));
+	}
+	return loc;
+}
 
+static GLint gf_glGetAttribLocation(GF_SHADERID glsl_program, const char *attrib_name)
+{
+	GLint loc = glGetAttribLocation(glsl_program, attrib_name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find attrib \"%s\" in GLSL program\n", attrib_name));
+	}
+	return loc;
+}
+
+//The following functions were used for shader testing [in ES2.0]
+#if 0
+static void gf_glQueryProgram(GF_SHADERID progObj)
+{
+	GLint err_log = -10;
 	GL_CHECK_ERR
-	if (visual->yuv_glsl_program) return;
+	glValidateProgram(progObj);
+	GL_CHECK_ERR
+	glGetProgramiv(progObj, GL_VALIDATE_STATUS, &err_log);
+	printf("GL_VALIDATE_STATUS: %d \n ",err_log);
+	glGetProgramiv(progObj, GL_LINK_STATUS, &err_log);
+	printf("GL_LINK_STATUS: %d \n ",err_log);
+	glGetProgramiv(progObj, GL_ATTACHED_SHADERS, &err_log);
+	printf("GL_ATTACHED_SHADERS: %d \n ",err_log);
+	glGetProgramiv(progObj, GL_ACTIVE_UNIFORMS, &err_log);
+	printf("GL_ACTIVE_UNIFORMS: %d \n ",err_log);
+}
+
+static void gf_glQueryUniform(GF_SHADERID progObj, const char *name, int index)
+{
+	GLint loc, i;
+	GLfloat res[16];
+
+	loc = gf_glGetUniformLocation(progObj, name);
+	if(loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("failed to locate uniform. exiting\n"));
+		return;
+	}
+	glGetUniformfv(progObj, loc, (GLfloat *) res);
+	GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("uniform %s has value of: ", name));
+	for (i =0; i<index; i++)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("%f ", res[i]));
+}
 
-	visual->yuv_glsl_program = glCreateProgram();
+//same here
+static void gf_glQueryAttrib(GF_SHADERID progObj, const char *name, int index, GLenum param)
+{
+	GLint loc, i;
+	GLfloat res[16];
 
-	if (!visual->base_glsl_vertex) {
-		visual->base_glsl_vertex = glCreateShader(GL_VERTEX_SHADER);
-		visual_3d_compile_shader(visual->base_glsl_vertex, "vertex", default_glsl_vertex);
+	loc = gf_glGetAttribLocation(progObj, name);
+	if (loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("failed to locate attribute. exiting\n"));
+		return;
 	}
+	glGetVertexAttribfv(loc, param, (GLfloat *) res);
+	GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("attribute %s has value of: ", name));
+	for( i =0; i<index; i++)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("%f ", res[i]));
+}
+
+static void gf_glQueryUniforms(GF_SHADERID progObj)
+{
+	GLint maxUniformLen;
+	GLint numUniforms;
+	char *uniformName;
+	GLint index;
+
+	glGetProgramiv(progObj, GL_ACTIVE_UNIFORMS, &numUniforms);
+	glGetProgramiv(progObj, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxUniformLen);
+	uniformName = malloc(sizeof(char) * maxUniformLen);
+	for(index = 0; index < numUniforms; index++) {
+		GLint size;
+		GLenum type;
+		GLint location;
+		// Get the Uniform Info
+		glGetActiveUniform(progObj, index, maxUniformLen, NULL, &size, &type, uniformName);
+		// Get the uniform location
+		location = glGetUniformLocation(progObj, uniformName);
+		if(location) printf("uniform %s is: ",uniformName);
+		switch(type) {
+		case GL_FLOAT:
+			printf("float \n");
+			break;
+		case GL_FLOAT_VEC2:
+			printf("floatvec2 \n");
+			break;
+		case GL_FLOAT_VEC3:
+			printf("floatvec3 \n");
+			break;
+		case GL_FLOAT_VEC4:
+			printf("floatvec4 \n");
+			break;
+		case GL_INT:
+			printf("int \n");
+			break;
+		case GL_INT_VEC2:
+		case GL_INT_VEC3:
+		case GL_INT_VEC4:
+			printf("intVec \n");
+			break;
+		case GL_FLOAT_MAT2:
+		case GL_FLOAT_MAT3:
+		case GL_FLOAT_MAT4:
+			printf("fmat \n");
+			break;
+		case GL_SAMPLER_2D:
+			printf("samp2D \n");
+			break;
+		case GL_SAMPLER_CUBE:
+			printf("sampCube \n");
+			break;
+		default:
+			printf("other \n");
+			break;
+		}
+	}
+}
 
-	visual->yuv_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-	visual_3d_compile_shader(visual->yuv_glsl_fragment, "YUV fragment", glsl_yuv_shader);
+static void gf_glQueryAttributes(GF_SHADERID progObj)
+{
+	GLint maxAttributeLen;
+	GLint numAttributes;
+	char *attributeName;
+	GLint index;
+
+	printf("Listing Attribs... \n");
+	glGetProgramiv(progObj, GL_ACTIVE_ATTRIBUTES, &numAttributes);
+	glGetProgramiv(progObj, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxAttributeLen);
+	attributeName = malloc(sizeof(char) * maxAttributeLen);
+	for(index = 0; index < numAttributes; index++) {
+		GLint size;
+		GLenum type;
+		GLint location;
+		// Get the Attribute Info
+		glGetActiveAttrib(progObj, index, maxAttributeLen, NULL, &size, &type, attributeName);
+		// Get the attribute location
+		location = glGetAttribLocation(progObj, attributeName);
+		if(location) printf("attrib %s is: ",attributeName);
+		switch(type) {
+		case GL_FLOAT:
+			printf("float \n");
+			break;
+		case GL_FLOAT_VEC2:
+			printf("floatvec2 \n");
+			break;
+		case GL_FLOAT_VEC3:
+			printf("floatvec3 \n");
+			break;
+		case GL_FLOAT_VEC4:
+			printf("floatvec4 \n");
+			break;
+		case GL_INT:
+			printf("int \n");
+			break;
+		case GL_INT_VEC2:
+		case GL_INT_VEC3:
+		case GL_INT_VEC4:
+			printf("intVec \n");
+			break;
+		case GL_FLOAT_MAT2:
+		case GL_FLOAT_MAT3:
+		case GL_FLOAT_MAT4:
+			printf("fmat \n");
+			break;
+		case GL_SAMPLER_2D:
+			printf("samp2D \n");
+			break;
+		case GL_SAMPLER_CUBE:
+			printf("sampCube \n");
+			break;
+		default:
+			printf("other \n");
+			break;
+		}
+	}
+}
+#endif
+
+static Bool visual_3d_init_generic_shaders(GF_VisualManager *visual)
+{
+	u32 i;
+	GLint err_log = -10;
+	const char *shader_file;
 
-	glAttachShader(visual->yuv_glsl_program, visual->base_glsl_vertex);
-	glAttachShader(visual->yuv_glsl_program, visual->yuv_glsl_fragment);
-	glLinkProgram(visual->yuv_glsl_program);
+	GF_Config *cfg = visual->compositor->user->config;
 
-	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
-	glUseProgram(visual->yuv_glsl_program);
-	for (i=0; i<3; i++) {
-		const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
-		loc = glGetUniformLocation(visual->yuv_glsl_program, txname);
-		if (loc == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
-			continue;
+	//FIXME: Clear error log - for Android we will always have an GL_INVALID_VALUE error
+	glGetError();
+
+	/* test if programs exist (by using flags 0)
+	 * this check was introduced due to losing program objects when switching rasterization modes
+	 * (hit '3' in runtime to recreate issue)
+	 * the program objects were not deleted though
+	 */
+	if (visual->glsl_programs[0]) {
+		glGetProgramiv(visual->glsl_programs[0], GL_VALIDATE_STATUS, &err_log);
+		if(err_log==-10) {
+			for (i=0; i<GF_GL_NB_VERT_SHADERS; i++) {
+				DEL_SHADER(visual->glsl_vertex_shaders[i]);
+			}
+			for (i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
+				DEL_SHADER(visual->glsl_fragment_shaders[i]);
+				DEL_PROGRAM(visual->glsl_programs[i]);
+			}
+			visual->glsl_has_shaders=0;
+			//Clear error log (if the program is lost we will always have an GL_INVALID_VALUE error)
+			glGetError();
 		}
-		glUniform1i(loc, i);
+	} else {
+		visual->glsl_has_shaders=0;
+		GL_CHECK_ERR;
 	}
-	glUseProgram(0);
 
-	if (visual->compositor->gl_caps.rect_texture) {
-		Bool res;
-		const char *opt;
-		visual->yuv_rect_glsl_program = glCreateProgram();
-
-		opt = gf_cfg_get_key(visual->compositor->user->config, "Compositor", "YUVRectShader");
-		visual->yuv_rect_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		if (opt && !strcmp(opt, "Relaxed")) {
-			res = visual_3d_compile_shader(visual->yuv_rect_glsl_fragment, "YUV Rect fragment (relaxed syntax)", glsl_yuv_rect_shader_relaxed);
-		} else {
-			if (opt) {
-				visual->yuv_rect_glsl_fragment = visual_3d_shader_from_source_file(opt, GL_FRAGMENT_SHADER);
-				if (!visual->yuv_rect_glsl_fragment) res = GF_FALSE;
-			}
-			res = visual_3d_compile_shader(visual->yuv_rect_glsl_fragment, "YUV Rect fragment (strict syntax)", glsl_yuv_rect_shader_strict);
-			if (!res) {
-				res = visual_3d_compile_shader(visual->yuv_rect_glsl_fragment, "YUV Rect fragment (relaxed syntax)", glsl_yuv_rect_shader_relaxed);
-				if (res) {
-					if (!opt) gf_cfg_set_key(visual->compositor->user->config, "Compositor", "YUVRectShader", "Relaxed");
-					GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Using relaxed syntax version of YUV shader\n"));
-				}
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Using strict syntax version of YUV shader\n"));
-			}
+	//nothing to do
+	if (visual->glsl_has_shaders) {
+		return GF_TRUE;
+	}
+
+	//Creating Program for the shaders
+	for(i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
+		visual->glsl_programs[i] = glCreateProgram();
+	}
+	visual->glsl_has_shaders = GF_TRUE;
+	GL_CHECK_ERR
+
+	shader_file =(char *) gf_cfg_get_key(cfg, "Compositor", "VertexShader");
+	if (!shader_file) return GF_FALSE;
+
+	for (i=0; i<GF_GL_NB_VERT_SHADERS; i++) {
+		GL_CHECK_ERR;
+		visual->glsl_vertex_shaders[i] = visual_3d_shader_with_flags(shader_file , GL_VERTEX_SHADER, i);
+		if (!visual->glsl_vertex_shaders[i]) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to compile vertex shader\n"));
+			return GF_FALSE;
 		}
-		if (!res) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Unable to compile fragment shader for rectangular extensions\n"));
-			DEL_SHADER(visual->yuv_rect_glsl_fragment);
-			DEL_PROGRAM(visual->yuv_rect_glsl_program);
+	}
+
+	shader_file =(char *) gf_cfg_get_key(cfg, "Compositor", "FragmentShader");
+	if (!shader_file) return GF_FALSE;
+
+	for (i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
+		GLint linked;
+		u32 vert_id;
+		GL_CHECK_ERR;
+		//discard unused flags combination (ie YUV with no texture)
+		if ( (i& GF_GL_IS_YUV) && ! (i & GF_GL_HAS_TEXTURE)) {
+			DEL_PROGRAM(visual->glsl_programs[i]);
+			visual->glsl_programs[i]=0;
+			visual->glsl_fragment_shaders[i] = 0;
+			continue;
 		}
 
-		if (visual->yuv_rect_glsl_program) {
-			glAttachShader(visual->yuv_rect_glsl_program, visual->base_glsl_vertex);
-			glAttachShader(visual->yuv_rect_glsl_program, visual->yuv_rect_glsl_fragment);
-			glLinkProgram(visual->yuv_rect_glsl_program);
+		visual->glsl_fragment_shaders[i] = visual_3d_shader_with_flags(shader_file , GL_FRAGMENT_SHADER, i);
+		if (!visual->glsl_fragment_shaders[i]) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to compile fragment shader\n"));
+			continue;
+		}
+		GL_CHECK_ERR;
 
-			//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
-			glUseProgram(visual->yuv_rect_glsl_program);
-			for (i=0; i<3; i++) {
-				const char *txname = (i==0) ? "y_plane" : (i==1) ? "u_plane" : "v_plane";
-				loc = glGetUniformLocation(visual->yuv_rect_glsl_program, txname);
-				if (loc == -1) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
-					continue;
-				}
-				glUniform1i(loc, i);
-			}
+		//compute vertex shader for this fragment: all YUV frag shaders are texture vert shaders
+		vert_id = i;
+		if (i & GF_GL_IS_YUV) {
+			vert_id &= ~GF_GL_IS_YUV;
+			vert_id |= GF_GL_HAS_TEXTURE;
+			assert(vert_id<GF_GL_NB_VERT_SHADERS);
+		}
+		glAttachShader(visual->glsl_programs[i], visual->glsl_vertex_shaders[vert_id]);
+		GL_CHECK_ERR;
 
-			loc = glGetUniformLocation(visual->yuv_rect_glsl_program, "width");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate width in YUV shader\n"));
-			}
+		glAttachShader(visual->glsl_programs[i], visual->glsl_fragment_shaders[i]);
+		GL_CHECK_ERR;
 
-			loc = glGetUniformLocation(visual->yuv_rect_glsl_program, "height");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate width in YUV shader\n"));
-			}
+		glLinkProgram(visual->glsl_programs[i]);
+		GL_CHECK_ERR;
 
-			glUseProgram(0);
+		glGetProgramiv(visual->glsl_programs[i], GL_LINK_STATUS, &linked);
+		if (!linked) {
+			int i32CharsWritten, i32InfoLogLength;
+			char pszInfoLog[2048];
+			glGetProgramiv(visual->glsl_programs[i], GL_INFO_LOG_LENGTH, &i32InfoLogLength);
+			glGetProgramInfoLog(visual->glsl_programs[i], i32InfoLogLength, &i32CharsWritten, pszInfoLog);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, (pszInfoLog));
 		}
-	}
-}
 
-//todo ...
-static void visual_3d_init_generic_shaders(GF_VisualManager *visual)
-{
-	if (visual->glsl_program) return;
+		glUseProgram(visual->glsl_programs[i]);
+		GL_CHECK_ERR;
+	}
 
+	/* Set texture planes*/
+	visual_3d_set_tx_planes(visual);
+	return GF_TRUE;
 }
 
 void visual_3d_init_shaders(GF_VisualManager *visual)
 {
-	if (!visual->compositor->gl_caps.has_shaders) return;
+	if (visual->compositor->visual != visual)
+		return;
+
+	if (!visual->compositor->gl_caps.has_shaders)
+		return;
 
-	visual_3d_init_yuv_shaders(visual);
 	if (visual->compositor->shader_only_mode) {
-		visual_3d_init_generic_shaders(visual);
+		//If we fail to configure shaders, force 2D mode
+		if (! visual_3d_init_generic_shaders(visual)) {
+			visual->compositor->hybrid_opengl = GF_FALSE;
+			visual->compositor->force_opengl_2d = GF_FALSE;
+			/*force resetup*/
+			visual->compositor->root_visual_setup = 0;
+			/*force texture setup when switching to OpenGL*/
+			gf_sc_reset_graphics(visual->compositor);
+			/*force redraw*/
+			gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);
+		}
 	}
-
 }
 
-#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 
 
 void visual_3d_reset_graphics(GF_VisualManager *visual)
 {
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+	u32 i;
+
+	if (visual->compositor->visual != visual)
+		return;
 
 	DEL_SHADER(visual->base_glsl_vertex);
 	DEL_SHADER(visual->autostereo_glsl_fragment);
-	DEL_SHADER(visual->yuv_glsl_fragment);
-
 	DEL_PROGRAM(visual->autostereo_glsl_program );
-	DEL_PROGRAM(visual->yuv_glsl_program );
 
 	if (visual->gl_textures) {
 		glDeleteTextures(visual->nb_views, visual->gl_textures);
@@ -737,15 +1113,84 @@
 		mesh_free(visual->autostereo_mesh);
 		visual->autostereo_mesh = NULL;
 	}
-#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+
+	for (i=0; i<GF_GL_NB_VERT_SHADERS; i++) {
+		DEL_SHADER(visual->glsl_vertex_shaders[i]);
+	}
+	for (i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
+		DEL_SHADER(visual->glsl_fragment_shaders[i]);
+		DEL_PROGRAM(visual->glsl_programs[i]);
+	}
+	visual->glsl_has_shaders=0;
+
+#endif
+}
+
+void visual_3d_set_clipper_scissor(GF_VisualManager *visual, GF_TraverseState *tr_state)
+{
+#ifndef GPAC_USE_TINYGL
+	if (visual->has_clipper_2d) {
+		u32 x, y;
+		u32 dw, dh;
+		glEnable(GL_SCISSOR_TEST);
+
+		if (visual->offscreen) {
+			dw = visual->width;
+			dh = visual->height;
+		} else {
+			dw = visual->compositor->display_width;
+			dh = visual->compositor->display_height;
+		}
+
+		if (visual->center_coords) {
+			x = visual->clipper_2d.x + dw / 2;
+			y = dh / 2 + visual->clipper_2d.y - visual->clipper_2d.height;
+		} else {
+			x = visual->clipper_2d.x;
+			y = dh - visual->clipper_2d.y;
+		}
+		glScissor(x, y, visual->clipper_2d.width, visual->clipper_2d.height);
+	} else {
+		glDisable(GL_SCISSOR_TEST);
+	}
+#endif
 }
 
 
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+static void visual_3d_load_matrix_shaders(GF_SHADERID program, Fixed *mat, const char *name)
+{
+	GLint loc;
+#ifdef GPAC_FIXED_POINT
+	Float _mat[16];
+	u32 i;
+#endif
+
+	loc = gf_glGetUniformLocation(program, name);
+	if(loc<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error (file %s line %d): Invalid matrix name", __FILE__, __LINE__));
+		return;
+	}
+	GL_CHECK_ERR
+
+#ifdef GPAC_FIXED_POINT
+	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
+	glUniformMatrix4fv(loc, 1, GL_FALSE, (GLfloat *) _mat);
+#else
+	glUniformMatrix4fv(loc, 1, GL_FALSE, mat);
+#endif
+	GL_CHECK_ERR
+}
+
+#endif
+
 GF_Err visual_3d_init_autostereo(GF_VisualManager *visual)
 {
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	u32 bw, bh;
 	SFVec2f s;
+	Bool use_npot = visual->compositor->gl_caps.npot_texture;
 	if (visual->gl_textures) return GF_OK;
 
 	visual->gl_textures = gf_malloc(sizeof(GLuint) * visual->nb_views);
@@ -759,14 +1204,18 @@
 		bh = visual->compositor->output_height;
 	}
 
-	if (visual->compositor->gl_caps.npot_texture) {
+#ifdef GPAC_USE_GLES2
+	use_npot = GF_TRUE;
+#endif
+
+	if (use_npot) {
 		visual->auto_stereo_width = bw;
 		visual->auto_stereo_height = bh;
 	} else {
 		visual->auto_stereo_width = 2;
-		while (visual->auto_stereo_width*2 < visual->width) visual->auto_stereo_width *= 2;
+		while (visual->auto_stereo_width < bw) visual->auto_stereo_width *= 2;
 		visual->auto_stereo_height = 2;
-		while (visual->auto_stereo_height < visual->height) visual->auto_stereo_height *= 2;
+		while (visual->auto_stereo_height < bh) visual->auto_stereo_height *= 2;
 	}
 
 	visual->autostereo_mesh = new_mesh();
@@ -774,53 +1223,80 @@
 	s.y = INT2FIX(bh);
 	mesh_new_rectangle(visual->autostereo_mesh, s, NULL, 0);
 
+	if (! use_npot) {
+		u32 i;
+		Fixed max_u = INT2FIX(bw) / visual->auto_stereo_width;
+		Fixed max_v = INT2FIX(bh) / visual->auto_stereo_height;
+		for (i=0; i<visual->autostereo_mesh->v_count; i++) {
+			if (visual->autostereo_mesh->vertices[i].texcoords.x == FIX_ONE) {
+				visual->autostereo_mesh->vertices[i].texcoords.x = max_u;
+			}
+			if (visual->autostereo_mesh->vertices[i].texcoords.y == FIX_ONE) {
+				visual->autostereo_mesh->vertices[i].texcoords.y = max_v;
+			}
+		}
+	}
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual3D] AutoStereo initialized - width %d height %d\n", visual->auto_stereo_width, visual->auto_stereo_height) );
 
 	visual_3d_init_stereo_shaders(visual);
-#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 
 	return GF_OK;
 }
 
 void visual_3d_end_auto_stereo_pass(GF_VisualManager *visual)
 {
-#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	u32 i;
-	GLint loc;
+	GLint loc, loc_vertex_attrib, loc_texcoord_attrib;
 	char szTex[100];
-	Double hw, hh;
-#ifdef GPAC_USE_OGL_ES
+	Fixed hw, hh;
 	GF_Matrix mx;
-#endif
 
 
 	glFlush();
 
+	GL_CHECK_ERR
+
+#ifndef GPAC_USE_GLES2
 	glEnable(GL_TEXTURE_2D);
+#endif
 
 	glBindTexture(GL_TEXTURE_2D, visual->gl_textures[visual->current_view]);
 
+#ifndef GPAC_USE_GLES2
 	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP);
 	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP);
-
 	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
 	glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+#else
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+#endif
 
-	glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, visual->auto_stereo_width, visual->auto_stereo_height, 0);
+	glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, visual->auto_stereo_width, visual->auto_stereo_height, 0);
+	GL_CHECK_ERR
+
+#ifndef GPAC_USE_GLES2
 	glDisable(GL_TEXTURE_2D);
+#endif
 
 	glClear(GL_DEPTH_BUFFER_BIT);
+	GL_CHECK_ERR
 
 	if (visual->current_view+1<visual->nb_views) return;
-
-	hw = visual->width;
-	hh = visual->height;
+	hw = INT2FIX(visual->width);
+	hh = INT2FIX(visual->height);
 	/*main (not offscreen) visual*/
 	if (visual->compositor->visual==visual) {
-		hw = visual->compositor->output_width;
-		hh = visual->compositor->output_height;
+		hw = INT2FIX(visual->compositor->output_width);
+		hh = INT2FIX(visual->compositor->output_height);
 	}
 
 	glViewport(0, 0, (GLsizei) hw, (GLsizei) hh );
@@ -828,72 +1304,99 @@
 	hw /= 2;
 	hh /= 2;
 
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(-hw, hw, -hh, hh, -10, 100);
-
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-
-
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
-	glMatrixMode(GL_MODELVIEW);
-
 	/*use our program*/
 	glUseProgram(visual->autostereo_glsl_program);
 
+	//load projection
+	gf_mx_ortho(&mx, -hw, hw, -hh, hh, -10, 100);
+	visual_3d_load_matrix_shaders(visual->autostereo_glsl_program, mx.m, "gfProjectionMatrix");
+
+	//no need for modelview (identifty)
+
 	/*push number of views if shader uses it*/
 	loc = glGetUniformLocation(visual->autostereo_glsl_program, "gfViewCount");
 	if (loc != -1) glUniform1i(loc, visual->nb_views);
 
-	glClientActiveTexture(GL_TEXTURE0);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-	glTexCoordPointer(2, GL_FLOAT, sizeof(GF_Vertex), &visual->autostereo_mesh->vertices[0].texcoords);
-
-	/*bind all our textures*/
-	for (i=0; i<visual->nb_views; i++) {
-		sprintf(szTex, "gfView%d", i+1);
-		loc = glGetUniformLocation(visual->autostereo_glsl_program, szTex);
-		if (loc == -1) continue;
-
-		glActiveTexture(GL_TEXTURE0 + i);
-
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+	loc_texcoord_attrib = -1;
+	//setup vertex attrib
+	loc_vertex_attrib = gf_glGetAttribLocation(visual->autostereo_glsl_program, "gfVertex");
+	if (loc_vertex_attrib>=0) {
+		glVertexAttribPointer(loc_vertex_attrib, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), &visual->autostereo_mesh->vertices[0].pos);
+		glEnableVertexAttribArray(loc_vertex_attrib);
+
+		GL_CHECK_ERR
+		//setup texcoord location
+		loc_texcoord_attrib = gf_glGetAttribLocation(visual->autostereo_glsl_program, "gfTextureCoordinates");
+		if (loc_texcoord_attrib>=0) {
+			glVertexAttribPointer(loc_texcoord_attrib, 2, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), &visual->autostereo_mesh->vertices[0].texcoords);
+			glEnableVertexAttribArray(loc_texcoord_attrib);
 
-		glBindTexture(GL_TEXTURE_2D, visual->gl_textures[i]);
+			GL_CHECK_ERR
 
-		glUniform1i(loc, i);
-	}
+			/*bind all our textures*/
+			for (i=0; i<visual->nb_views; i++) {
+				sprintf(szTex, "gfView%d", i+1);
+				loc = glGetUniformLocation(visual->autostereo_glsl_program, szTex);
+				if (loc == -1) continue;
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex), &visual->autostereo_mesh->vertices[0].pos);
+				glActiveTexture(GL_TEXTURE0 + i);
 
-	glDrawElements(GL_TRIANGLES, visual->autostereo_mesh->i_count, GL_UNSIGNED_INT, visual->autostereo_mesh->indices);
+#ifndef GPAC_USE_GLES2
+				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+#endif
 
-	glDisableClientState(GL_VERTEX_ARRAY);
+				GL_CHECK_ERR
+
+				glBindTexture(GL_TEXTURE_2D, visual->gl_textures[i]);
+
+				GL_CHECK_ERR
+
+				glUniform1i(loc, i);
+
+				GL_CHECK_ERR
+			}
 
-	glClientActiveTexture(GL_TEXTURE0);
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY );
+			//draw
+#if defined(GPAC_USE_GLES2)
+			glDrawElements(GL_TRIANGLES, visual->autostereo_mesh->i_count, GL_UNSIGNED_SHORT, visual->autostereo_mesh->indices);
+#else
+			glDrawElements(GL_TRIANGLES, visual->autostereo_mesh->i_count, GL_UNSIGNED_INT, visual->autostereo_mesh->indices);
+#endif
+
+			GL_CHECK_ERR
+		}
+	}
+
+
+	if (loc_vertex_attrib>=0) glDisableVertexAttribArray(loc_vertex_attrib);
+	if (loc_texcoord_attrib>=0) glDisableVertexAttribArray(loc_texcoord_attrib);
+	GL_CHECK_ERR
 
 	glUseProgram(0);
 
+#ifndef GPAC_USE_GLES2
 	/*not sure why this is needed but it prevents a texturing bug on XP on parallels*/
 	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, 0);
+	GL_CHECK_ERR
 
+	glBindTexture(GL_TEXTURE_2D, 0);
 	glDisable(GL_TEXTURE_2D);
-#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#endif
+
+	GL_CHECK_ERR
+#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 
 }
 
 
 static void visual_3d_setup_quality(GF_VisualManager *visual)
 {
+#ifndef GPAC_USE_GLES2	//TODOk check for ES2.0
+
 	if (visual->compositor->high_speed) {
 		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
 		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
@@ -912,7 +1415,7 @@
 
 	if (visual->compositor->antiAlias == GF_ANTIALIAS_FULL) {
 		glEnable(GL_LINE_SMOOTH);
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		if (visual->compositor->poly_aa)
 			glEnable(GL_POLYGON_SMOOTH);
 		else
@@ -920,28 +1423,39 @@
 #endif
 	} else {
 		glDisable(GL_LINE_SMOOTH);
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		glDisable(GL_POLYGON_SMOOTH);
 #endif
 	}
+
+#endif
+
 }
 
 void visual_3d_setup(GF_VisualManager *visual)
 {
+
+	if (visual->gl_setup) {
+		visual->has_fog = GF_FALSE;
+		glClear(GL_DEPTH_BUFFER_BIT);
+		return;
+	}
+
 #ifndef GPAC_USE_TINYGL
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glDepthFunc(GL_LEQUAL);
 #endif
 	glEnable(GL_DEPTH_TEST);
-	glEnable(GL_CULL_FACE);
 	glFrontFace(GL_CCW);
 	glCullFace(GL_BACK);
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	glClearDepthx(FIX_ONE);
 	glLightModelx(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
 	glMaterialx(GL_FRONT_AND_BACK, GL_SHININESS, FLT2FIX(0.2f * 128) );
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+#elif defined(GPAC_USE_GLES2)
+	glClearDepthf(1.0f);
 #else
 	glClearDepth(1.0f);
 	glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
@@ -949,6 +1463,9 @@
 	glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, (float) (0.2 * 128));
 #endif
 
+
+#ifndef GPAC_USE_GLES2
+	glDisable(GL_TEXTURE_2D);
 	glShadeModel(GL_SMOOTH);
 	glGetIntegerv(GL_MAX_LIGHTS, (GLint*)&visual->max_lights);
 	if (visual->max_lights>GF_MAX_GL_LIGHTS)
@@ -960,8 +1477,6 @@
 		visual->max_clips=GF_MAX_GL_CLIPS;
 #endif
 
-	visual_3d_setup_quality(visual);
-
 	glDisable(GL_POINT_SMOOTH);
 	glDisable(GL_COLOR_MATERIAL);
 	glDisable(GL_LIGHTING);
@@ -969,23 +1484,35 @@
 	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 	glDisable(GL_FOG);
-	visual->has_fog = GF_FALSE;
 	/*Note: we cannot enable/disable normalization on the fly, because we have no clue when the GL implementation
 	will actually compute the related fragments. Since a typical world always use scaling, we always turn normalization on
 	to avoid tracking scale*/
 	glEnable(GL_NORMALIZE);
+#endif //GLES2
+
+	visual_3d_setup_quality(visual);
+
+	glDisable(GL_BLEND);
+	glDisable(GL_CULL_FACE);
+	visual->has_fog = GF_FALSE;
+	visual->max_lights=GF_MAX_GL_LIGHTS;
+	visual->max_clips=GF_MAX_GL_CLIPS;
+
+	visual->gl_setup = GF_TRUE;
 
 	glClear(GL_DEPTH_BUFFER_BIT);
 }
 
 void visual_3d_set_background_state(GF_VisualManager *visual, Bool on)
 {
+#ifndef GPAC_USE_GLES2
 	if (on) {
 		glDisable(GL_LIGHTING);
 		glDisable(GL_FOG);
 		glDisable(GL_LINE_SMOOTH);
+
 		glDisable(GL_BLEND);
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		glDisable(GL_POLYGON_SMOOTH);
 #endif
 		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
@@ -993,15 +1520,20 @@
 	} else {
 		visual_3d_setup_quality(visual);
 	}
+#endif
+
+	visual_3d_enable_depth_buffer(visual, ! on);
 }
 
 
 
 void visual_3d_enable_antialias(GF_VisualManager *visual, Bool bOn)
 {
+#ifndef GPAC_USE_GLES2
+
 	if (bOn) {
 		glEnable(GL_LINE_SMOOTH);
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		if (visual->compositor->poly_aa)
 			glEnable(GL_POLYGON_SMOOTH);
 		else
@@ -1009,10 +1541,12 @@
 #endif
 	} else {
 		glDisable(GL_LINE_SMOOTH);
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 		glDisable(GL_POLYGON_SMOOTH);
 #endif
 	}
+
+#endif
 }
 
 void visual_3d_enable_depth_buffer(GF_VisualManager *visual, Bool on)
@@ -1043,7 +1577,7 @@
 	glClear(GL_DEPTH_BUFFER_BIT);
 }
 
-static void visual_3d_draw_aabb_node(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 prim_type, GF_Plane *fplanes, u32 *p_indices, AABBNode *n)
+static void visual_3d_draw_aabb_node(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 prim_type, GF_Plane *fplanes, u32 *p_indices, AABBNode *n, void *idx_addr)
 {
 	u32 i;
 
@@ -1071,8 +1605,8 @@
 		if (cull==CULL_OUTSIDE) return;
 
 		if (cull==CULL_INTERSECTS) {
-			visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_indices, n->pos);
-			visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_indices, n->neg);
+			visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_indices, n->pos, idx_addr);
+			visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_indices, n->neg, idx_addr);
 			return;
 		}
 	}
@@ -1082,25 +1616,35 @@
 	However we must push triangles one by one since primitive order may have been swapped when
 	building the AABB tree*/
 	for (i=0; i<n->nb_idx; i++) {
-#ifdef GPAC_USE_OGL_ES
-		glDrawElements(prim_type, 3, GL_UNSIGNED_SHORT, &mesh->indices[3*n->indices[i]]);
+		u32 idx = 3*n->indices[i];
+		void *vbi_addr;
+		if (!idx_addr) vbi_addr = (void *) PTR_TO_U_CAST ( sizeof(IDX_TYPE) * idx );
+		else vbi_addr = &mesh->indices[idx];
+
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+		glDrawElements(prim_type, 3, GL_UNSIGNED_SHORT, vbi_addr);
 #else
-		glDrawElements(prim_type, 3, GL_UNSIGNED_INT, &mesh->indices[3*n->indices[i]]);
+		glDrawElements(prim_type, 3, GL_UNSIGNED_INT, vbi_addr);
 #endif
 	}
 }
 
+#ifndef GPAC_USE_GLES2
+
 static void visual_3d_matrix_load(GF_VisualManager *visual, Fixed *mat)
 {
+#if defined(GPAC_FIXED_POINT)
+	Float _mat[16];
+	u32 i;
+#endif
+
 	if (!mat) {
 		glLoadIdentity();
 		return;
 	}
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 	glLoadMatrixx(mat);
 #elif defined(GPAC_FIXED_POINT)
-	Float _mat[16];
-	u32 i;
 	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
 	glLoadMatrixf(_mat);
 #else
@@ -1108,23 +1652,9 @@
 #endif
 }
 
-static void visual_3d_matrix_add(GF_VisualManager *visual, Fixed *mat)
-{
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
-	glMultMatrixx(mat);
-#elif defined(GPAC_FIXED_POINT)
-	u32 i;
-	Float _mat[16];
-	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
-	glMultMatrixf(_mat);
-#else
-	glMultMatrixf(mat);
-#endif
-}
-
-
 static void visual_3d_update_matrices(GF_TraverseState *tr_state)
 {
+	GF_Matrix mx;
 	if (tr_state->visual->needs_projection_matrix_reload) {
 		tr_state->visual->needs_projection_matrix_reload = 0;
 		glMatrixMode(GL_PROJECTION);
@@ -1132,8 +1662,9 @@
 		glMatrixMode(GL_MODELVIEW);
 	}
 
-	visual_3d_matrix_load(tr_state->visual, tr_state->camera->modelview.m);
-	visual_3d_matrix_add(tr_state->visual, tr_state->model_matrix.m);
+	gf_mx_copy(mx, tr_state->camera->modelview.m);
+	gf_mx_add_matrix(&mx, &tr_state->model_matrix);
+	visual_3d_matrix_load(tr_state->visual, (Fixed *) &mx);
 }
 
 
@@ -1148,7 +1679,7 @@
 
 	for (i=0; i<visual->num_clips; i++) {
 		u32 idx = GL_CLIP_PLANE0 + i;
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		Fixed g[4];
 #else
 		Double g[4];
@@ -1166,7 +1697,7 @@
 			gf_mx_apply_plane(&mx, &p);
 		}
 
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 		g[0] = p.normal.x;
 		g[1] = p.normal.y;
 		g[2] = p.normal.z;
@@ -1178,7 +1709,7 @@
 		g[2] = FIX2FLT(p.normal.z);
 		g[3] = FIX2FLT(p.d);
 
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 		glClipPlanef(idx, g);
 #else
 		glClipPlane(idx, g);
@@ -1221,7 +1752,7 @@
 static void visual_3d_set_lights(GF_VisualManager *visual)
 {
 	u32 i;
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 	Fixed vals[4], exp;
 #else
 	Float vals[4], intensity, cutOffAngle, beamWidth, ambientIntensity, exp;
@@ -1230,18 +1761,24 @@
 	if (!visual->num_lights) return;
 
 	for (i=0; i<visual->num_lights; i++) {
+		GF_Matrix mx;
 		GF_LightInfo *li = &visual->lights[i];
 		GLint iLight = GL_LIGHT0 + i;
-
-		visual_3d_matrix_load(visual, visual->camera.modelview.m);
-		visual_3d_matrix_add(visual, li->light_mx.m);
+		if(li->type==3) {
+			gf_mx_init(mx);
+		} else {
+			gf_mx_copy(mx, visual->camera.modelview.m);
+			gf_mx_add_matrix(&mx, &li->light_mx);
+		}
+		visual_3d_matrix_load(visual, mx.m);
 
 		glEnable(iLight);
 
 		switch (li->type) {
 		//directionnal light
 		case 0:
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+		case 3:
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 			vals[0] = -li->direction.x;
 			vals[1] = -li->direction.y;
 			vals[2] = -li->direction.z;
@@ -1294,14 +1831,14 @@
 
 		//spot light
 		case 1:
-#ifndef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES1X
 			ambientIntensity = FIX2FLT(li->ambientIntensity);
 			intensity = FIX2FLT(li->intensity);
 			cutOffAngle = FIX2FLT(li->cutOffAngle);
 			beamWidth = FIX2FLT(li->beamWidth);
 #endif
 
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 			vals[0] = li->direction.x;
 			vals[1] = li->direction.y;
 			vals[2] = li->direction.z;
@@ -1376,7 +1913,7 @@
 
 		//point light
 		case 2:
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 			vals[0] = li->position.x;
 			vals[1] = li->position.y;
 			vals[2] = li->position.z;
@@ -1439,7 +1976,7 @@
 
 #ifndef GPAC_USE_TINYGL
 
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 	Fixed vals[4];
 	glEnable(GL_FOG);
 	if (!visual->fog_type) glFogx(GL_FOG_MODE, GL_LINEAR);
@@ -1458,7 +1995,7 @@
 	Float vals[4];
 	glEnable(GL_FOG);
 
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 	if (!visual->fog_type) glFogf(GL_FOG_MODE, GL_LINEAR);
 	else if (visual->fog_type==1) glFogf(GL_FOG_MODE, GL_EXP);
 	else if (visual->fog_type==2) glFogf(GL_FOG_MODE, GL_EXP2);
@@ -1483,12 +2020,15 @@
 
 }
 
+#endif // ! GPAC_USE_GLES2
+
 
 static void visual_3d_do_draw_mesh(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
 	u32 prim_type;
 	GF_Matrix mx;
 	u32 i, p_idx[6];
+	void *idx_addr = NULL;
 	GF_Plane fplanes[6];
 
 
@@ -1504,185 +2044,615 @@
 		break;
 	}
 
+	if (mesh->vbo_idx) {
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->vbo_idx);
+	} else {
+		idx_addr = mesh->indices;
+	}
+
+
 	/*if inside or no aabb for the mesh draw vertex array*/
 	if (tr_state->visual->compositor->disable_gl_cull || (tr_state->cull_flag==CULL_INSIDE) || !mesh->aabb_root || !mesh->aabb_root->pos)	{
-#ifdef GPAC_USE_OGL_ES
-		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_SHORT, mesh->indices);
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_SHORT, idx_addr);
 #else
-		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_INT, mesh->indices);
+		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_INT, idx_addr);
 #endif
 
-		return;
-	}
+	} else {
 
-	/*otherwise cull aabb against frustum - after some testing it appears (as usual) that there must
-	be a compromise: we're slowing down the compositor here, however the gain is really appreciable for
-	large meshes, especially terrains/elevation grids*/
+		/*otherwise cull aabb against frustum - after some testing it appears (as usual) that there must
+		 be a compromise: we're slowing down the compositor here, however the gain is really appreciable for
+		 large meshes, especially terrains/elevation grids*/
 
-	/*first get transformed frustum in local space*/
-	gf_mx_copy(mx, tr_state->model_matrix);
-	gf_mx_inverse(&mx);
-	for (i=0; i<6; i++) {
-		fplanes[i] = tr_state->camera->planes[i];
-		gf_mx_apply_plane(&mx, &fplanes[i]);
-		p_idx[i] = gf_plane_get_p_vertex_idx(&fplanes[i]);
+		/*first get transformed frustum in local space*/
+		gf_mx_copy(mx, tr_state->model_matrix);
+		gf_mx_inverse(&mx);
+		for (i=0; i<6; i++) {
+			fplanes[i] = tr_state->camera->planes[i];
+			gf_mx_apply_plane(&mx, &fplanes[i]);
+			p_idx[i] = gf_plane_get_p_vertex_idx(&fplanes[i]);
+		}
+		/*then recursively cull & draw AABB tree*/
+		visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->pos, idx_addr);
+		visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->neg, idx_addr);
 	}
-	/*then recursively cull & draw AABB tree*/
-	visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->pos);
-	visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->neg);
-}
 
-#if !defined(GPAC_ANDROID) && !defined(GPAC_IPHONE)
+	if (mesh->vbo_idx) {
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+	}
+}
 
-static GLint my_glGetUniformLocation(GF_SHADERID glsl_program, const char *uniform_name)
+static Bool visual_3d_bind_buffer(GF_Compositor *compositor, GF_Mesh *mesh, void **base_address)
 {
-	GLint loc = glGetUniformLocation(glsl_program, uniform_name);
-	if (loc<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find uniform \"%s\" in GLSL program\n", uniform_name));
+	*base_address = NULL;
+	if ((compositor->reset_graphics==2) && mesh->vbo) {
+		/*we lost OpenGL context at previous frame, recreate VBO*/
+		mesh->vbo = 0;
+		mesh->vbo_idx = 0;
 	}
-	return loc;
+	/*rebuild VBO for large ojects only (we basically filter quads out)*/
+	if (!mesh->vbo && compositor->gl_caps.vbo
+#ifndef GPAC_USE_GLES2
+	 && (mesh->v_count>4)
+#endif
+	 ) {
+		glGenBuffers(1, &mesh->vbo);
+		if (mesh->vbo) {
+			glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
+			glBufferData(GL_ARRAY_BUFFER, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+			mesh->vbo_dirty = 0;
+		} else {
+			return GF_FALSE;
+		}
+
+		glGenBuffers(1, &mesh->vbo_idx);
+		if (mesh->vbo_idx) {
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->vbo_idx);
+			glBufferData(GL_ELEMENT_ARRAY_BUFFER, mesh->i_count*sizeof(IDX_TYPE), mesh->indices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+		} else {
+			return GF_FALSE;
+		}
+	}
+
+	if (mesh->vbo) {
+		*base_address = NULL;
+		glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
+	} else {
+		*base_address = &mesh->vertices[0].pos;
+	}
+
+	if (mesh->vbo_dirty) {
+		glBufferSubData(GL_ARRAY_BUFFER, 0, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices);
+
+		if (mesh->vbo_idx) {
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->vbo_idx);
+			glBufferData(GL_ELEMENT_ARRAY_BUFFER, mesh->i_count*sizeof(IDX_TYPE), mesh->indices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
+
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+		}
+
+		mesh->vbo_dirty = 0;
+	}
+	return GF_TRUE;
 }
 
-static GLint my_glGetAttribLocation(GF_SHADERID glsl_program, const char *attrib_name)
+
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+static void visual_3d_update_matrices_shaders(GF_TraverseState *tr_state)
 {
-	GLint loc = glGetAttribLocation(glsl_program, attrib_name);
-	if (loc<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[V3D:GLSL] Cannot find attrib \"%s\" in GLSL program\n", attrib_name));
+	GF_Matrix mx;
+
+	if (tr_state->visual->needs_projection_matrix_reload) {
+		tr_state->visual->needs_projection_matrix_reload = 0;
+		visual_3d_load_matrix_shaders(tr_state->visual->glsl_program, (Fixed *) tr_state->camera->projection.m, "gfProjectionMatrix");
 	}
-	return loc;
+
+	//calculate ModelView matix (camera.view * model)
+	gf_mx_copy(mx, tr_state->camera->modelview);
+	gf_mx_add_matrix(&mx, &tr_state->model_matrix);
+	visual_3d_load_matrix_shaders(tr_state->visual->glsl_program, (Fixed *) &mx.m, "gfModelViewMatrix");
 }
 
-static void visual_3d_draw_mesh_shader_only(GF_TraverseState *tr_state, GF_Mesh *mesh, void *vertex_buffer_address)
+static void visual_3d_set_lights_shaders(GF_TraverseState *tr_state)
 {
-	GF_VisualManager *visual = tr_state->visual;
+	u32 i;
+	GF_LightInfo *li;
+	GF_Vec pt;
+	Float ambientIntensity, intensity, vals[4];
 	GLint loc;
 	GF_Matrix mx;
+	GF_VisualManager *visual = tr_state->visual;
+	char szName[100];
+
+	loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+	if (loc>=0)
+		glUniform1i(loc, visual->num_lights);
 	GL_CHECK_ERR
-	glUseProgram(visual->glsl_program);
+
+	/*
+	 * Equivalent to glLightModel(GL_LIGHTMODEL_TWO_SIDE, GL_TRUE);
+	 */
+	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightTwoSide");
+	if (loc>=0)
+		glUniform1i(loc, 1);
 	GL_CHECK_ERR
 
-	loc = my_glGetUniformLocation(visual->glsl_program, "gfModelViewMatrix");
-	if (loc<0) return;
-	gf_mx_copy(mx, tr_state->camera->modelview);
-	gf_mx_add_matrix(&mx, &tr_state->model_matrix);
-	glUniformMatrix4fv(loc, 1, GL_FALSE, mx.m);
+	li = &visual->lights[0];
+
+	pt = li->direction;
+	gf_vec_norm(&pt);
+	vals[0] = -FIX2FLT(pt.x);
+	vals[1] = -FIX2FLT(pt.y);
+	vals[2] = -FIX2FLT(pt.z);
+	vals[3] = 0;
+
+	ambientIntensity = FIX2FLT(li->ambientIntensity);
+	intensity = FIX2FLT(li->intensity);
+
+	for (i = 0; i < (int) visual->num_lights; i++) {
+		GF_Vec orig;
+		li = &visual->lights[i];
+
+		if (li->type==3) {	//we have a headlight
+			gf_mx_init(mx);
+		} else {
+			//update mx according to the light mx
+			gf_mx_copy(mx, visual->camera.modelview);
+			gf_mx_add_matrix(&mx, &li->light_mx);
+		}
+
+		sprintf(szName, "%s%d%s", "lights[", i, "].type");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);		//Uniform name lights[i].type
+		if (loc>=0) {
+			if (li->type==3) {
+				glUniform1i(loc, 0); //headlight; Set type 0-directional
+			} else {
+				glUniform1i(loc, (GLint) li->type); //Set type 0-directional 1-spot 2-point
+			}
+		}
+
+		//set for light direction (assuming origin = 0,0,0)
+		pt = li->direction;
+		orig.x = orig.y = orig.z = 0;
+		gf_mx_apply_vec(&mx, &pt);
+		gf_mx_apply_vec(&mx, &orig);
+		gf_vec_diff(pt, pt, orig);
+		gf_vec_norm(&pt);
+
+		vals[0] = -FIX2FLT(pt.x);
+		vals[1] = -FIX2FLT(pt.y);
+		vals[2] = -FIX2FLT(pt.z);
+		vals[3] = 0;
+		sprintf(szName, "%s%d%s", "lights[", i, "].direction");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0)
+			glUniform4fv(loc, 1, vals); //Set direction
+
+		if ((li->type==0) || (li->type==3) ) {
+			pt = li->direction;
+			vals[0] = -FIX2FLT(pt.x);
+			vals[1] = -FIX2FLT(pt.y);
+			vals[2] = -FIX2FLT(pt.z);
+			vals[3] = 0;
+			pt = li->position;
+		} else {	//we have a spot or point light
+			pt = li->position;
+			gf_mx_apply_vec(&mx, &pt);
+			vals[0] = FIX2FLT(pt.x);
+			vals[1] = FIX2FLT(pt.y);
+			vals[2] = FIX2FLT(pt.z);
+			vals[3] = 1.0;
+		}
+		sprintf(szName, "%s%d%s", "lights[", i, "].position");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0)
+			glUniform4fv(loc, 1, vals);
+
+		pt = li->attenuation;
+		if (li->type && !li->attenuation.x) {
+			vals[0]=1.0;
+		} else {
+			vals[0] = FIX2FLT(pt.x);
+		}
+		vals[1] = FIX2FLT(pt.y);
+		vals[2] = FIX2FLT(pt.z);
+		sprintf(szName, "%s%d%s", "lights[", i, "].attenuation");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0)
+			glUniform3fv(loc, 1, vals);
+
+		vals[0] = FIX2FLT(li->color.red);
+		vals[1] = FIX2FLT(li->color.green);
+		vals[2] = FIX2FLT(li->color.blue);
+		vals[3] = 0;
+		sprintf(szName, "%s%d%s", "lights[", i, "].color");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0)
+			glUniform4fv(loc, 1, vals);
+
+		sprintf(szName, "%s%d%s", "lights[", i, "].intensity");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0)
+			glUniform1f(loc, li->intensity);
+
+		sprintf(szName, "%s%d%s", "lights[", i, "].cutOffAngle");
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0)
+			glUniform1f(loc, li->cutOffAngle);
+
+	}
+
+
+	vals[0] = FIX2FLT(li->color.red)*intensity;
+	vals[1] = FIX2FLT(li->color.green)*intensity;
+	vals[2] = FIX2FLT(li->color.blue)*intensity;
+	vals[3] = 1;
+	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightDiffuse");
+	if (loc>=0) glUniform4fv(loc, 1, vals);
+
+	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightSpecular");
+	if (loc>=0) glUniform4fv(loc, 1, vals);
+
+	vals[0] = FIX2FLT(li->color.red)*ambientIntensity;
+	vals[1] = FIX2FLT(li->color.green)*ambientIntensity;
+	vals[2] = FIX2FLT(li->color.blue)*ambientIntensity;
+	vals[3] = 1;
+	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightAmbient");
+	if (loc>=0) glUniform4fv(loc, 1, vals);
+
+	GL_CHECK_ERR
+}
+
+static void visual_3d_set_fog_shaders(GF_VisualManager *visual)
+{
+	GLint loc;
+	if (visual->has_fog) {
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogEnabled");
+		if(loc>=0)
+			glUniform1i(loc, GL_TRUE);
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogColor");
+		if(loc>=0)
+			glUniform3fv(loc, 1, (GLfloat *) &visual->fog_color);
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogDensity");
+		if(loc>=0)
+			glUniform1f(loc, visual->fog_density );
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogType");
+		if(loc>=0)
+			glUniform1i(loc, (GLuint) visual->fog_type );
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogVisibility");
+		if(loc>=0)
+			glUniform1f(loc, visual->fog_visibility);
+	} else {
+		loc = glGetUniformLocation(visual->glsl_program, "gfFogEnabled");
+		if(loc>=0)
+			glUniform1i(loc, GL_FALSE);
+
+	}
 	GL_CHECK_ERR
+}
+
+static void visual_3d_set_clippers_shaders(GF_VisualManager *visual, GF_TraverseState *tr_state)
+{
+	Fixed vals[4];
+	char szName[100];
+	GLint loc;
+	u32 i;
+	GF_Matrix inv_mx, eye_mx;
+
+	if (!visual->num_clips) return;
+
+	gf_mx_copy(inv_mx, tr_state->model_matrix);
+	gf_mx_inverse(&inv_mx);
+
+	gf_mx_copy(eye_mx, tr_state->camera->modelview);
+	gf_mx_add_matrix(&eye_mx, &tr_state->model_matrix);
+
+	loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumClippers");
+	if (loc>=0)
+		glUniform1i(loc, visual->num_clips);
+
+	for (i = 0; i < visual->num_clips; i++) {
+		GF_Matrix mx;
+		GF_Plane p;
+
+		p = visual->clippers[i].p;
+		//compute clip plane in eye coordinates
+		if (! visual->clippers[i].is_2d_clip) {
+			gf_mx_copy(mx, inv_mx);
+			if (visual->clippers[i].mx_clipper != NULL) {
+				gf_mx_add_matrix(&mx, visual->clippers[i].mx_clipper);
+			}
+			//plane in local coordinates
+			gf_mx_apply_plane(&mx, &p);
+			//plane in eye coordinates
+			gf_mx_apply_plane(&eye_mx, &p);
+		}
+
+		sprintf(szName, "%s%d%s", "clipPlane[", i, "]");	//parse plane values
+		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		if (loc>=0) {
+			vals[0] = p.normal.x;
+			vals[1] = p.normal.y;
+			vals[2] = p.normal.z;
+			vals[3] = p.d;
+			glUniform4fv(loc, 1, vals); //Set Plane (w = distance)
+		}
+	}
+}
+
+static void visual_3d_draw_mesh_shader_only(GF_TraverseState *tr_state, GF_Mesh *mesh)
+{
+	void *vertex_buffer_address;
+	GF_VisualManager *visual = tr_state->visual;
+	GF_VisualManager *root_visual = visual->compositor->visual;
+	GLint loc, loc_vertex_array, loc_color_array, loc_normal_array, loc_textcoord_array;
+	u32 flags;
+
+	flags = root_visual->glsl_flags;
+
+	if (visual->has_material_2d) {
+		visual->num_lights = 0;
+	}
+
+	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR)) {
+		flags |= GF_GL_HAS_COLOR;
+		visual->has_material_2d = GF_FALSE;
+	}
+	else if (tr_state->mesh_num_textures && (mesh->mesh_type==MESH_TRIANGLES) && !(mesh->flags & MESH_NO_TEXTURE)) {
+		flags |= GF_GL_HAS_TEXTURE;
+	} else {
+		flags &= ~GF_GL_HAS_TEXTURE;
+		flags &= ~GF_GL_IS_YUV;
+
+	}
+
+	if (visual->num_lights) {
+		flags |= GF_GL_HAS_LIGHT;
+	} else {
+		flags &= ~GF_GL_HAS_LIGHT;
+	}
 
-	loc = my_glGetUniformLocation(visual->glsl_program, "gfProjectionMatrix");
-	if (loc<0) return;
-	glUniformMatrix4fv(loc, 1, GL_FALSE, tr_state->camera->projection.m);
+	if (visual->num_clips) {
+		flags |= GF_GL_HAS_CLIP;
+	} else {
+		flags &= ~GF_GL_HAS_CLIP;
+	}
+
+	root_visual->glsl_flags = visual->glsl_flags = flags;
+
+	//check if we are using a different program than last time, if so force matrices updates
+	if ((visual->glsl_program != root_visual->glsl_programs[visual->glsl_flags])
+	 || !root_visual->glsl_programs[visual->glsl_flags]) {
+		tr_state->visual->needs_projection_matrix_reload = GF_TRUE;
+	}
+
+	visual->glsl_program = root_visual->glsl_programs[visual->glsl_flags];
+	glUseProgram(visual->glsl_program);
 	GL_CHECK_ERR
 
-	loc = my_glGetAttribLocation(visual->glsl_program, "gfVertex");
-	if (loc<0) return;
-	glVertexAttribPointer(loc, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), vertex_buffer_address);
-	glEnableVertexAttribArray(loc);
+	if (! visual_3d_bind_buffer(visual->compositor, mesh, &vertex_buffer_address)) {
+		glUseProgram(0);
+		return;
+	}
+
+	if (visual->state_blend_on)
+		glEnable(GL_BLEND);
+
+	visual_3d_update_matrices_shaders(tr_state);
+
+	loc_color_array = loc_normal_array = loc_textcoord_array = -1;
+
+	//setup vertext array location (always true)
+	loc_vertex_array = gf_glGetAttribLocation(visual->glsl_program, "gfVertex");
+	if (loc_vertex_array<0)
+		return;
+
+	glEnableVertexAttribArray(loc_vertex_array);
 	GL_CHECK_ERR
+#if defined(GPAC_FIXED_POINT)
+	glVertexAttribPointer(loc_vertex_array, 3, GL_FIXED, GL_TRUE, sizeof(GF_Vertex), vertex_buffer_address);
+#else
+	glVertexAttribPointer(loc_vertex_array, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), vertex_buffer_address);
+#endif
 
+	//setup scissor
+	visual_3d_set_clipper_scissor(visual, tr_state);
+
+	//setup clippers
+	visual_3d_set_clippers_shaders(visual, tr_state);
+
+	/* Material2D does not have any lights, color used is "gfEmissionColor" uniform */
 	if (visual->has_material_2d) {
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+		//for YUV manually set alpha
+		if (flags & GF_GL_IS_YUV) {
+			loc = gf_glGetUniformLocation(visual->glsl_program, "alpha");
+			if(loc>=0)
+				glUniform1f(loc, FIX2FLT(visual->mat_2d.alpha));
+		}
+		//otherwise handle alpha with blend if no texture
+		else if (!tr_state->mesh_num_textures) {
+			if (visual->mat_2d.alpha < FIX_ONE) {
+				glEnable(GL_BLEND);
+			} else {
+				glDisable(GL_BLEND);
+			}
+		}
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
 		if (loc>=0)
 			glUniform4fv(loc, 1, (GLfloat *) & visual->mat_2d);
+		GL_CHECK_ERR
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
+		if (loc>=0)
+			glUniform1i(loc, 1);
+		GL_CHECK_ERR
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+	} else {
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
 		if (loc>=0)
 			glUniform1i(loc, 0);
+		GL_CHECK_ERR
+
+		//for YUV manually set alpha
+		if (flags & GF_GL_IS_YUV) {
+			loc = gf_glGetUniformLocation(visual->glsl_program, "alpha");
+			if(loc>=0)
+				glUniform1f(loc, 1.0);
+			GL_CHECK_ERR
+		}
 	}
 
-	if (visual->has_material) {
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfAmbientColor");
-		if (loc>=0)
-			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[0] );
+	/* if lighting is on, setup material */
+	if ((flags & GF_GL_HAS_LIGHT) && visual->has_material && !visual->has_material_2d) {
+		u32 i;
+		for(i =0; i<4; i++) {
+			Fixed *rgba = (Fixed *) & visual->materials[i];
+#if defined(GPAC_FIXED_POINT)
+			Float _rgba[4];
+			_rgba[0] = FIX2FLT(rgba[0]);
+			_rgba[1] = FIX2FLT(rgba[1]);
+			_rgba[2] = FIX2FLT(rgba[2]);
+			_rgba[3] = FIX2FLT(rgba[3]);
+#elif defined(GPAC_USE_GLES1X)
+			Fixed *_rgba = (Fixed *) rgba;
+#else
+			Float *_rgba = (Float *) rgba;
+#endif
+			switch (i) {
+			case 0:
+				loc = gf_glGetUniformLocation(visual->glsl_program, "gfAmbientColor");
+				break;
+			case 1:
+				loc = gf_glGetUniformLocation(visual->glsl_program, "gfDiffuseColor");
+				break;
+			case 2:
+				loc = gf_glGetUniformLocation(visual->glsl_program, "gfSpecularColor");
+				break;
+			case 3:
+				loc = gf_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+				break;
+			}
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfDiffuseColor");
+			if (loc>=0)
+				glUniform4fv(loc, 1, _rgba);
+		}
+		//TO CHECK: if this does not work as it is supposed to, try: visual->shininess * 128
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfShininess");
 		if (loc>=0)
-			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[1] );
+			glUniform1f(loc, FIX2FLT(visual->shininess));
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfSpecularColor");
-		if (loc>=0)
-			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[2] );
+		glDisable(GL_CULL_FACE);	//Enable for performance; if so, check glFrontFace()
+	}
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
-		if (loc>=0)
-			glUniform4fv(loc, 1, (GLfloat *) & visual->materials[3] );
+	//setup mesh color vertex attribute - only available for some shaders
+	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR)) {
+		loc_color_array = gf_glGetAttribLocation(visual->glsl_program, "gfMeshColor");
+		if (loc_color_array >= 0) {
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfShininess");
-		if (loc>=0)
-			glUniform1f(loc, visual->shininess );
+			//for now colors are 8bit/comp RGB(A), so used GL_UNSIGNED_BYTE and GL_TRUE for normalizing values
+			if (mesh->flags & MESH_HAS_ALPHA) {
+				glEnable(GL_BLEND);
+				tr_state->mesh_is_transparent = 1;
+				glVertexAttribPointer(loc_color_array, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_COLOR_OFFSET));
+			} else {
+				glVertexAttribPointer(loc_color_array, 3, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_COLOR_OFFSET));
+			}
+			glEnableVertexAttribArray(loc_color_array);
+		}
+		GL_CHECK_ERR
+	}
 
+	if (flags & GF_GL_HAS_LIGHT) {
+		visual_3d_set_fog_shaders(visual);
 	}
 
-	if (!visual->has_material_2d && visual->num_lights && !mesh->mesh_type) {
+	//setup mesh normal vertex attribute - only available for some shaders
+	if (!visual->has_material_2d && visual->num_lights && (mesh->mesh_type==MESH_TRIANGLES) ) {
 		GF_Matrix normal_mx;
-		GF_Vec pt;
-		GF_LightInfo *li;
-		Float ambientIntensity, intensity;
-		Float vals[4];
+		assert(flags & GF_GL_HAS_LIGHT);
 
-		gf_mx_copy(normal_mx, mx);
+		gf_mx_copy(normal_mx, tr_state->camera->modelview);
+		gf_mx_add_matrix(&normal_mx, &tr_state->model_matrix);
 		normal_mx.m[12] = normal_mx.m[13] = normal_mx.m[14] = 0;
 		gf_mx_inverse(&normal_mx);
-		normal_mx.m[12] = normal_mx.m[13] = normal_mx.m[14] = 0;
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfNormalMatrix");
-		//transpose the matrix when uploading
-		if (loc>=0)
-			glUniformMatrix4fv(loc, 1, GL_TRUE, normal_mx.m);
-		GL_CHECK_ERR
 
+		gf_mx_transpose(&normal_mx);
 
-		loc = my_glGetAttribLocation(visual->glsl_program, "gfNormal");
-		if (loc>=0) {
+		visual_3d_load_matrix_shaders(tr_state->visual->glsl_program, (Fixed *) &normal_mx.m, "gfNormalMatrix");
+
+		loc_normal_array = gf_glGetAttribLocation(visual->glsl_program, "gfNormal");
+		if (loc_normal_array>=0) {
 #ifdef MESH_USE_FIXED_NORMAL
-			glVertexAttribPointer(loc, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
+			glVertexAttribPointer(loc_normal_array, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
 #else
-			glVertexAttribPointer(loc, 3, GL_BYTE, GL_TRUE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
+			glVertexAttribPointer(loc_normal_array, 3, GL_BYTE, GL_FALSE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
 #endif
-			glEnableVertexAttribArray(loc);
+			glEnableVertexAttribArray(loc_normal_array);
 		}
 		GL_CHECK_ERR
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
 		if (loc>=0)
-			glUniform1i(loc, 1);
+			glUniform1i(loc, visual->num_lights);
+		visual_3d_set_lights_shaders(tr_state);
+		GL_CHECK_ERR
+	}
 
-		li = &visual->lights[0];
+	//setup mesh normal vertex attribute - only available for some shaders
+	if (tr_state->mesh_num_textures && (mesh->mesh_type==MESH_TRIANGLES) && !(mesh->flags & MESH_NO_TEXTURE)) {
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumTextures");
+		if (loc>=0) {
+			glUniform1i(loc, tr_state->mesh_num_textures);
+		}
+		GL_CHECK_ERR
 
-		//only one light for now
-		pt = li->direction;
-		gf_mx_copy(mx, tr_state->camera->modelview);
-		gf_mx_add_matrix(&mx, &li->light_mx);
-		gf_mx_apply_vec(&mx, &pt);
-		gf_vec_norm(&pt);
-		vals[0] = -FIX2FLT(pt.x);
-		vals[1] = -FIX2FLT(pt.y);
-		vals[2] = -FIX2FLT(pt.z);
-		vals[3] = 0;
-//		vals[0] = FIX2FLT(pt.x); vals[1] = FIX2FLT(pt.y); vals[2] = FIX2FLT(pt.z); vals[3] = 0;
+		if (visual->has_tx_matrix) {
+			//parsing texture matrix
+			loc = gf_glGetUniformLocation(visual->glsl_program, "gfTextureMatrix");
+			if (loc>=0)
+				glUniformMatrix4fv(loc, 1, GL_FALSE, visual->tx_matrix.m);
+			GL_CHECK_ERR
 
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfLightPosition");
-		if (loc>=0)
-			glUniform4fv(loc, 1, vals);
+			loc = gf_glGetUniformLocation(visual->glsl_program, "hasTextureMatrix");
+			if (loc>=0) glUniform1i(loc, 1);
+		} else {
+			loc = gf_glGetUniformLocation(visual->glsl_program, "hasTextureMatrix");
+			if (loc>=0) glUniform1i(loc, 0);
+		}
 
-		ambientIntensity = FIX2FLT(li->ambientIntensity);
-		intensity = FIX2FLT(li->intensity);
+		//parsing texture coordinates
+		loc_textcoord_array = gf_glGetAttribLocation(visual->glsl_program, "gfMultiTexCoord");
+		if (loc_textcoord_array>=0) {
+			glVertexAttribPointer(loc_textcoord_array, 2, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_TEX_OFFSET));
+			glEnableVertexAttribArray(loc_textcoord_array);
+			GL_CHECK_ERR
+		}
+	}
 
-		vals[0] = FIX2FLT(li->color.red)*intensity;
-		vals[1] = FIX2FLT(li->color.green)*intensity;
-		vals[2] = FIX2FLT(li->color.blue)*intensity;
-		vals[3] = 1;
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfLightDiffuse");
-		if (loc>=0) glUniform4fv(loc, 1, vals);
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfLightSpecular");
-		if (loc>=0) glUniform4fv(loc, 1, vals);
-
-		vals[0] = FIX2FLT(li->color.red)*ambientIntensity;
-		vals[1] = FIX2FLT(li->color.green)*ambientIntensity;
-		vals[2] = FIX2FLT(li->color.blue)*ambientIntensity;
-		vals[3] = 1;
-		loc = my_glGetUniformLocation(visual->glsl_program, "gfLightAmbiant");
-		if (loc>=0) glUniform4fv(loc, 1, vals);
+	//
+	if (mesh->mesh_type != MESH_TRIANGLES) {
+		//According to the spec we should pass a 0,0,1 Normal and disable lights. we just disable lights
+		if(flags & GF_GL_HAS_LIGHT) {
+			loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+			if (loc>=0)	glUniform1i(loc, 0);
 
+		}
+		glDisable(GL_CULL_FACE);
+
+#if !defined(GPAC_USE_TINYGL) && !defined(GL_ES_CL_PROFILE)
+		glLineWidth(1.0f);
+#endif
+
+	} else {
 		if (visual->compositor->backcull
 		 && (!tr_state->mesh_is_transparent || (visual->compositor->backcull ==GF_BACK_CULL_ALPHA) )
 		 && (mesh->flags & MESH_IS_SOLID)) {
@@ -1693,76 +2663,189 @@
 		}
 	}
 
+	GL_CHECK_ERR
+
+	//We have a Colour Matrix to be applied
+	if(!tr_state->color_mat.identity) {
+		GF_Matrix toBeParsed;	//4x4 RGBA Color Matrix
+		Fixed translateV[4];	//Vec4 holding translation property of color_mat
+		int row,col;
+
+		gf_mx_init(toBeParsed);
+
+		//Copy values from Color Matrix
+		for(row=0; row<4; row++) {
+			for(col=0; col<4; col++) {
+				toBeParsed.m[col+(row*4)]=tr_state->color_mat.m[col+(row*5)];
+			}
+			translateV[row] = tr_state->color_mat.m[4+(row*5)];
+		}
+
+		//the rest of the values form the translation vector
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfTranslationVector");
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) &translateV);
+		GL_CHECK_ERR
+
+		loc = glGetUniformLocation(visual->glsl_program, "hasColorMatrix");
+		if(loc>=0) glUniform1i(loc, 1);
+
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfColorMatrix");
+		if (loc>=0)
+			glUniformMatrix4fv(loc, 1, GL_FALSE, toBeParsed.m);
+		GL_CHECK_ERR
+	} else {
+		loc = glGetUniformLocation(visual->glsl_program, "hasColorMatrix");
+		if(loc>=0) glUniform1i(loc, 0);
+	}
+
+
+	//We have a Colour Key to be applied
+	if(tr_state->col_key) {
+
+		Float vals[3];
+		Float eightbit = 255;	//used for mapping values between 0.0 and 1.0
+
+		glEnable(GL_BLEND);		//normally we shouldn have to need this, but we do
+
+		loc = glGetUniformLocation(visual->glsl_program, "hasColorKey");
+		if(loc>=0) glUniform1i(loc, 1);
+
+		vals[0] = tr_state->col_key->r/eightbit;
+		vals[1] = tr_state->col_key->g/eightbit;
+		vals[2] = tr_state->col_key->b/eightbit;
+
+		loc = glGetUniformLocation(visual->glsl_program, "gfKeyColor");
+		if(loc>=0)glUniform3fv(loc, 1, vals);
+
+		loc = glGetUniformLocation(visual->glsl_program, "gfKeyLow");
+		if(loc>=0) glUniform1f(loc, tr_state->col_key->low/eightbit);
+
+		loc = glGetUniformLocation(visual->glsl_program, "gfKeyHigh");
+		if(loc>=0) glUniform1f(loc, tr_state->col_key->high/eightbit);
+
+		loc = glGetUniformLocation(visual->glsl_program, "gfKeyAlpha");
+		if(loc>=0) glUniform1f(loc, tr_state->col_key->alpha/eightbit);
+
+	} else {
+		loc = glGetUniformLocation(visual->glsl_program, "hasColorKey");
+		if(loc>=0) glUniform1i(loc, 0);
+	}
+
+
+
+
 	visual_3d_do_draw_mesh(tr_state, mesh);
 
 	GL_CHECK_ERR
+	//We drawn, now we Reset
+
+	if (mesh->vbo)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	if (mesh->vbo)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	if (loc_vertex_array>=0) glDisableVertexAttribArray(loc_vertex_array);
+	if (loc_color_array>=0) glDisableVertexAttribArray(loc_color_array);
+	if (loc_normal_array>=0) glDisableVertexAttribArray(loc_normal_array);
+	if (loc_textcoord_array>=0) glDisableVertexAttribArray(loc_textcoord_array);
+
+	//instead of visual_3d_reset_lights(visual);
+	if(visual->compositor->visual->glsl_flags & GF_GL_HAS_LIGHT) {
+		loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+		if (loc>=0)	glUniform1i(loc, 0);
+		GL_CHECK_ERR
+	}
+
+	if (visual->has_clipper_2d) {
+		glDisable(GL_SCISSOR_TEST);
+	}
+
+	if (flags & GF_GL_IS_YUV) {
+		loc = gf_glGetUniformLocation(visual->glsl_program, "isNV21PixelFormat");
+		if (loc>=0)
+			glUniform1i(loc, visual->yuv_pixelformat_type == GF_PIXEL_NV21 ? 1 : 0);
+		GL_CHECK_ERR
+	}
+
+	visual->has_material_2d = 0;
+	visual->glsl_flags = visual->compositor->visual->glsl_flags;
+	root_visual->glsl_flags &= ~ (GF_GL_IS_YUV | GF_GL_HAS_COLOR);
+	visual->has_material = 0;
+	visual->state_color_on = 0;
+	if (tr_state->mesh_is_transparent) glDisable(GL_BLEND);
+	tr_state->mesh_is_transparent = 0;
+	GL_CHECK_ERR
 	glUseProgram(0);
 }
 
-#endif //GPAC_ANDROID
+#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+//#endif //GPAC_USE_GLES2
+
 
 static void visual_3d_draw_mesh(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-	Bool has_col, has_tx, has_norm;
-	GF_VisualManager *visual = tr_state->visual;
+#ifndef GPAC_USE_GLES2
 	GF_Compositor *compositor = tr_state->visual->compositor;
+	GF_VisualManager *visual = tr_state->visual;
+	Bool has_col, has_tx, has_norm;
 	void *base_address = NULL;
-#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_OGL_ES)
+
+#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_GLES1X)
 	Float *color_array = NULL;
 	Float fix_scale = 1.0f;
 	fix_scale /= FIX_ONE;
 #endif
 
-	has_col = has_tx = has_norm = 0;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
+#endif
 
-	if ((compositor->reset_graphics==2) && mesh->vbo) {
-		/*we lost OpenGL context at previous frame, recreate VBO*/
-		mesh->vbo = 0;
-	}
-	/*rebuild VBO for large ojects only (we basically filter quads out)*/
-	if ((mesh->v_count>4) && !mesh->vbo && compositor->gl_caps.vbo) {
-		GL_CHECK_ERR
-		glGenBuffers(1, &mesh->vbo);
-		GL_CHECK_ERR
-		if (mesh->vbo) {
-			glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
-			GL_CHECK_ERR
-			glBufferData(GL_ARRAY_BUFFER, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices, (mesh->vbo_dynamic) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
-			GL_CHECK_ERR
-			mesh->vbo_dirty = 0;
-		}
-	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
 
-	if (mesh->vbo) {
-		base_address = NULL;
-		glBindBuffer(GL_ARRAY_BUFFER, mesh->vbo);
-		GL_CHECK_ERR
-	} else {
-		base_address = & mesh->vertices[0].pos;
-	}
+	GL_CHECK_ERR
 
-	if (mesh->vbo_dirty) {
-		glBufferSubData(GL_ARRAY_BUFFER, 0, mesh->v_count * sizeof(GF_Vertex) , mesh->vertices);
-		mesh->vbo_dirty = 0;
-	}
+#ifdef GPAC_USE_GLES2
+	visual_3d_draw_mesh_shader_only(tr_state, mesh);
+	return;
+#else
 
-#if !defined(GPAC_ANDROID) && !defined(GPAC_IPHONE)
+#if !defined(GPAC_ANDROID) && !defined(GPAC_IPHONE) && !defined(GPAC_FIXED_POINT)
 	if (visual->compositor->shader_only_mode) {
-		visual_3d_draw_mesh_shader_only(tr_state, mesh, base_address);
+		visual_3d_draw_mesh_shader_only(tr_state, mesh);
 		return;
 	}
 #endif
 
+	if (! visual_3d_bind_buffer(compositor, mesh, &base_address)) {
+#if! defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL)
+		glUseProgram(0);
+#endif
+		return;
+	}
+	has_col = has_tx = has_norm = 0;
+
 	//set lights before pushing modelview matrix
 	visual_3d_set_lights(visual);
 
 	visual_3d_update_matrices(tr_state);
 
+	/*enable states*/
 	if (visual->has_fog) visual_3d_enable_fog(visual);
 
+	if (visual->state_color_on) glEnable(GL_COLOR_MATERIAL);
+	else glDisable(GL_COLOR_MATERIAL);
+
+	if (visual->state_blend_on) glEnable(GL_BLEND);
+
+	//setup scissor
+	visual_3d_set_clipper_scissor(visual, tr_state);
+
+	if (visual->num_clips)
+		visual_3d_set_clippers(visual, tr_state);
+
 	glEnableClientState(GL_VERTEX_ARRAY);
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 	glVertexPointer(3, GL_FIXED, sizeof(GF_Vertex), base_address);
 #elif defined(GPAC_FIXED_POINT)
 	/*scale modelview matrix*/
@@ -1774,26 +2857,14 @@
 #endif
 
 
-	/*enable states*/
-
-
-	if (visual->state_color_on) glEnable(GL_COLOR_MATERIAL);
-	else glDisable(GL_COLOR_MATERIAL);
-
-	if (visual->state_blend_on) glEnable(GL_BLEND);
-
-
-	if (visual->num_clips)
-		visual_3d_set_clippers(visual, tr_state);
-
 	/*
 	*	Enable colors:
-	 if mat2d is set, use mat2d and no lighting
+	if mat2d is set, use mat2d and no lighting
 	*/
 	if (visual->has_material_2d) {
 		glDisable(GL_LIGHTING);
 
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL)
 		if (visual->compositor->visual->current_texture_glsl_program) {
 			int loc = glGetUniformLocation(visual->compositor->visual->current_texture_glsl_program, "alpha");
 			if (loc == -1) {
@@ -1813,15 +2884,17 @@
 					glDisable(GL_BLEND);
 				visual_3d_enable_antialias(visual, visual->compositor->antiAlias ? 1 : 0);
 			}
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 			glColor4x( FIX2INT(visual->mat_2d.red * 255), FIX2INT(visual->mat_2d.green * 255), FIX2INT(visual->mat_2d.blue * 255), FIX2INT(visual->mat_2d.alpha * 255));
+#elif defined(GPAC_FIXED_POINT)
+			glColor4f(FIX2FLT(visual->mat_2d.red), FIX2FLT(visual->mat_2d.green), FIX2FLT(visual->mat_2d.blue), FIX2FLT(visual->mat_2d.alpha));
 #else
 			glColor4f(visual->mat_2d.red, visual->mat_2d.green, visual->mat_2d.blue, visual->mat_2d.alpha);
 #endif
 		}
 	}
 
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL)
 	else if (visual->compositor->visual->current_texture_glsl_program) {
 		int loc = glGetUniformLocation(visual->compositor->visual->current_texture_glsl_program, "alpha");
 		if (loc == -1) {
@@ -1840,7 +2913,7 @@
 		for (i=0; i<4; i++) {
 			GLenum mode;
 			Fixed *rgba = (Fixed *) & visual->materials[i];
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 			Fixed *_rgba = (Fixed *) rgba;
 #elif defined(GPAC_FIXED_POINT)
 			Float _rgba[4];
@@ -1867,14 +2940,14 @@
 				break;
 			}
 
-#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
+#if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
 			glMaterialxv(GL_FRONT_AND_BACK, mode, _rgba);
 #else
 			glMaterialfv(GL_FRONT_AND_BACK, mode, _rgba);
 #endif
 			GL_CHECK_ERR
 		}
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		glMaterialx(GL_FRONT_AND_BACK, GL_SHININESS, visual->shininess * 128);
 #else
 		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, FIX2FLT(visual->shininess) * 128);
@@ -1885,13 +2958,13 @@
 	//otherwise setup mesh color
 	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR)) {
 		glEnable(GL_COLOR_MATERIAL);
-#if !defined (GPAC_USE_OGL_ES)
+#if !defined (GPAC_USE_GLES1X)
 		glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 #endif
 		glEnableClientState(GL_COLOR_ARRAY);
 		has_col = 1;
 
-#if defined (GPAC_USE_OGL_ES)
+#if defined (GPAC_USE_GLES1X)
 
 		if (mesh->flags & MESH_HAS_ALPHA) {
 			glEnable(GL_BLEND);
@@ -1959,7 +3032,7 @@
 #endif
 	}
 
-	if (tr_state->mesh_num_textures && !mesh->mesh_type && !(mesh->flags & MESH_NO_TEXTURE)) {
+	if (tr_state->mesh_num_textures && (mesh->mesh_type==MESH_TRIANGLES) && !(mesh->flags & MESH_NO_TEXTURE)) {
 		has_tx = 1;
 
 		glMatrixMode(GL_TEXTURE);
@@ -1971,7 +3044,7 @@
 		glMatrixMode(GL_MODELVIEW);
 
 
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 		glTexCoordPointer(2, GL_FIXED, sizeof(GF_Vertex), ((char *)base_address + MESH_TEX_OFFSET));
 		glEnableClientState(GL_TEXTURE_COORD_ARRAY );
 #elif defined(GPAC_FIXED_POINT)
@@ -2000,15 +3073,15 @@
 #endif
 	}
 
-	if (mesh->mesh_type) {
-#ifdef GPAC_USE_OGL_ES
+	if (mesh->mesh_type != MESH_TRIANGLES) {
+#ifdef GPAC_USE_GLES1X
 		glNormal3x(0, 0, FIX_ONE);
 #else
 		glNormal3f(0, 0, 1.0f);
 #endif
 		glDisable(GL_CULL_FACE);
 		glDisable(GL_LIGHTING);
-		if (mesh->mesh_type==2) glDisable(GL_LINE_SMOOTH);
+		if (mesh->mesh_type==MESH_LINESET) glDisable(GL_LINE_SMOOTH);
 		else glDisable(GL_POINT_SMOOTH);
 
 #if !defined(GPAC_USE_TINYGL) && !defined(GL_ES_CL_PROFILE)
@@ -2021,7 +3094,7 @@
 		glEnableClientState(GL_NORMAL_ARRAY );
 #ifdef MESH_USE_FIXED_NORMAL
 
-#if defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_USE_GLES1X)
 		normal_type = GL_FIXED;
 #elif defined(GPAC_FIXED_POINT)
 		normal_type = GL_INT;
@@ -2035,7 +3108,7 @@
 #endif
 		glNormalPointer(normal_type, sizeof(GF_Vertex), ((char *)base_address + MESH_NORMAL_OFFSET));
 
-		if (!mesh->mesh_type) {
+		if (mesh->mesh_type==MESH_TRIANGLES) {
 			if (compositor->backcull
 			 && (!tr_state->mesh_is_transparent || (compositor->backcull ==GF_BACK_CULL_ALPHA) )
 			 && (mesh->flags & MESH_IS_SOLID)) {
@@ -2047,7 +3120,9 @@
 		}
 	}
 
+	GL_CHECK_ERR
 	visual_3d_do_draw_mesh(tr_state, mesh);
+	GL_CHECK_ERR
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 	if (has_col) glDisableClientState(GL_COLOR_ARRAY);
@@ -2059,9 +3134,9 @@
 	if (mesh->vbo)
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_OGL_ES)
+#if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_GLES1X)
 	if (color_array) gf_free(color_array);
-	if (tr_state->mesh_num_textures && !mesh->mesh_type && !(mesh->flags & MESH_NO_TEXTURE)) {
+	if (tr_state->mesh_num_textures && (mesh->mesh_type==MESH_TRIANGLES) && !(mesh->flags & MESH_NO_TEXTURE)) {
 		glMatrixMode(GL_TEXTURE);
 		glPopMatrix();
 		glMatrixMode(GL_MODELVIEW);
@@ -2070,6 +3145,9 @@
 #endif
 
 
+	if (visual->has_clipper_2d) {
+		glDisable(GL_SCISSOR_TEST);
+	}
 	visual_3d_reset_lights(visual);
 
 	glDisable(GL_COLOR_MATERIAL);
@@ -2082,28 +3160,37 @@
 	visual->state_color_on = 0;
 	if (tr_state->mesh_is_transparent) glDisable(GL_BLEND);
 	tr_state->mesh_is_transparent = 0;
+
+	GL_CHECK_ERR
+#endif
 }
 
 static void visual_3d_set_debug_color(u32 col)
 {
-#ifdef GPAC_USE_OGL_ES
+#ifndef GPAC_USE_GLES2
+
+#ifdef GPAC_USE_GLES1X
 	glColor4x( (col ? GF_COL_R(col) : 255) , (col ? GF_COL_G(col) : 0) , (col ? GF_COL_B(col) : 255), 255);
 #else
 	glColor4f(col ? GF_COL_R(col)/255.0f : 1, col ? GF_COL_G(col)/255.0f : 0, col ? GF_COL_B(col)/255.0f : 1, 1);
 #endif
+
+
+#endif //GPAC_USE_GLES2
 }
 
 
 /*note we don't perform any culling for normal drawing...*/
 static void visual_3d_draw_normals(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-#ifndef GPAC_USE_TINYGL
+	//TODOk - allow normal drawing with GLES2 j
+#if !defined( GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 
 	GF_Vec pt, end;
 	u32 i, j;
 	Fixed scale = mesh->bounds.radius / 4;
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	GF_Vec va[2];
 	u16 indices[2];
 	glEnableClientState(GL_VERTEX_ARRAY);
@@ -2119,7 +3206,7 @@
 				MESH_GET_NORMAL(end, mesh->vertices[idx[j]]);
 				end = gf_vec_scale(end, scale);
 				gf_vec_add(end, pt, end);
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 				va[0] = pt;
 				va[1] = end;
 				indices[0] = 0;
@@ -2145,7 +3232,7 @@
 			end = gf_vec_scale(end, scale);
 			gf_vec_add(end, pt, end);
 
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 			va[0] = pt;
 			va[1] = end;
 			indices[0] = 0;
@@ -2161,7 +3248,7 @@
 			idx += 3;
 		}
 	}
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	glDisableClientState(GL_VERTEX_ARRAY);
 #endif
 
@@ -2232,11 +3319,14 @@
 void visual_3d_mesh_paint(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
 	Bool mesh_drawn = 0;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
 	if (tr_state->visual->compositor->wiremode != GF_WIREFRAME_ONLY) {
 		visual_3d_draw_mesh(tr_state, mesh);
 		mesh_drawn = 1;
 	}
 
+	//TODOk - allow normal drawing and wireframe with GLES2 j
+#if !defined(GPAC_USE_GLES2)
 	if (tr_state->visual->compositor->draw_normals) {
 		if (!mesh_drawn) {
 			visual_3d_update_matrices(tr_state);
@@ -2245,7 +3335,7 @@
 		visual_3d_draw_normals(tr_state, mesh);
 	}
 
-	if (!mesh->mesh_type && (tr_state->visual->compositor->wiremode != GF_WIREFRAME_NONE)) {
+	if ((mesh->mesh_type==MESH_TRIANGLES) && (tr_state->visual->compositor->wiremode != GF_WIREFRAME_NONE)) {
 		glDisable(GL_LIGHTING);
 		visual_3d_set_debug_color(0xFFFFFFFF);
 
@@ -2254,7 +3344,7 @@
 
 
 		glEnableClientState(GL_VERTEX_ARRAY);
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		glVertexPointer(3, GL_FIXED, sizeof(GF_Vertex), &mesh->vertices[0].pos);
 		glDrawElements(GL_LINES, mesh->i_count, GL_UNSIGNED_SHORT, mesh->indices);
 #else
@@ -2263,10 +3353,16 @@
 #endif
 		glDisableClientState(GL_VERTEX_ARRAY);
 	}
-	if (tr_state->visual->compositor->draw_bvol) visual_3d_draw_bounds(tr_state, mesh);
+
+#endif
+
+	if (tr_state->visual->compositor->draw_bvol)
+		visual_3d_draw_bounds(tr_state, mesh);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Done drawing mesh %p\n", mesh));
 }
 
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 
 
 static GLubyte hatch_horiz[] = {
@@ -2366,27 +3462,24 @@
 
 void visual_3d_mesh_hatch(GF_TraverseState *tr_state, GF_Mesh *mesh, u32 hatchStyle, SFColor hatchColor)
 {
-	if (mesh->mesh_type) return;
+	if (mesh->mesh_type != MESH_TRIANGLES) return;
 
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glVertexPointer(3, GL_FLOAT, sizeof(GF_Vertex), &mesh->vertices[0].pos);
-	if (mesh->mesh_type || (mesh->flags & MESH_IS_2D)) {
+	if (mesh->flags & MESH_IS_2D) {
 		glDisableClientState(GL_NORMAL_ARRAY);
-		if (mesh->mesh_type) glDisable(GL_LIGHTING);
 		glNormal3f(0, 0, 1.0f);
 		glDisable(GL_CULL_FACE);
 	} else {
 		glEnableClientState(GL_NORMAL_ARRAY );
 		glNormalPointer(GL_FLOAT, sizeof(GF_Vertex), &mesh->vertices[0].normal);
 
-		if (!mesh->mesh_type) {
-			/*if mesh is transparent DON'T CULL*/
-			if (!tr_state->mesh_is_transparent && (mesh->flags & MESH_IS_SOLID)) {
-				glEnable(GL_CULL_FACE);
-				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
-			} else {
-				glDisable(GL_CULL_FACE);
-			}
+		/*if mesh is transparent DON'T CULL*/
+		if (!tr_state->mesh_is_transparent && (mesh->flags & MESH_IS_SOLID)) {
+			glEnable(GL_CULL_FACE);
+			glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+		} else {
+			glDisable(GL_CULL_FACE);
 		}
 	}
 
@@ -2423,7 +3516,7 @@
 /*only used for ILS/ILS2D or IFS2D outline*/
 void visual_3d_mesh_strike(GF_TraverseState *tr_state, GF_Mesh *mesh, Fixed width, Fixed line_scale, u32 dash_style)
 {
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 	u16 style;
 #endif
 
@@ -2434,7 +3527,7 @@
 	glLineWidth( FIX2FLT(width));
 #endif
 
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 
 	switch (dash_style) {
 	case GF_DASH_STYLE_DASH:
@@ -2471,7 +3564,7 @@
 
 void visual_3d_clear(GF_VisualManager *visual, SFColor color, Fixed alpha)
 {
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 	glClearColorx(color.red, color.green, color.blue, alpha);
 #else
 	glClearColor(FIX2FLT(color.red), FIX2FLT(color.green), FIX2FLT(color.blue), FIX2FLT(alpha));
@@ -2482,9 +3575,13 @@
 
 void visual_3d_fill_rect(GF_VisualManager *visual, GF_Rect rc, SFColorRGBA color)
 {
+	//TODOk - code this for GLES2 j
+#ifdef GPAC_USE_GLES2
+#else
+
 	glDisable(GL_BLEND | GL_LIGHTING | GL_TEXTURE_2D);
 
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_GLES1X)
 	glNormal3x(0, 0, FIX_ONE);
 	if (color.alpha!=FIX_ONE) glEnable(GL_BLEND);
 	glColor4x(color.red, color.green, color.blue, color.alpha);
@@ -2531,6 +3628,7 @@
 #endif
 
 	glDisable(GL_BLEND);
+#endif
 }
 
 GF_Err compositor_3d_get_screen_buffer(GF_Compositor *compositor, GF_VideoSurface *fb, u32 depth_dump_mode)
@@ -2548,7 +3646,7 @@
 	/*depthmap-only dump*/
 	if (depth_dump_mode==1) {
 		//depth reading not supported on gles <= 1.1
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		return GF_NOT_SUPPORTED;
 #else
 		Float *depthp;
@@ -2557,7 +3655,13 @@
 		fb->pitch_x = 0;
 		fb->pitch_y = compositor->vp_width;
 
-		fb->video_buffer = (char*)gf_malloc(sizeof(char)* fb->pitch_y * fb->height);
+		if (compositor->screen_buffer_alloc_size < fb->pitch_y * fb->height) {
+			compositor->screen_buffer_alloc_size = fb->pitch_y * fb->height;
+			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+		}
+
+		fb->video_buffer = compositor->screen_buffer;
+
 		//read as float
 		depthp = (Float*)gf_malloc(sizeof(Float)* fb->pitch_y * fb->height);
 		fb->pixel_format = GF_PIXEL_GREYSCALE;
@@ -2570,8 +3674,8 @@
 		glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_DEPTH_COMPONENT, GL_FLOAT, depthp);
 
 		//linearize z buffer, from 0 (zfar) to 1 (znear)
-		zFar = compositor->visual->camera.z_far;
-		zNear = compositor->visual->camera.z_near;
+		zFar = FIX2FLT(compositor->visual->camera.z_far);
+		zNear = FIX2FLT(compositor->visual->camera.z_near);
 		for (i=0; i<fb->height*fb->width; i++) {
 			Float res = ( (2.0f * zNear) / (zFar + zNear - depthp[i] * (zFar - zNear)) ) ;
 			fb->video_buffer[i] = (u8) ( 255.0 * (1.0 - res));
@@ -2579,26 +3683,30 @@
 
 		gf_free(depthp);
 
-#endif	/*GPAC_USE_OGL_ES*/
+#endif	/*GPAC_USE_GLES1X*/
 	}
 
 	/* RGBDS or RGBD dump*/
 	else if (depth_dump_mode==2 || depth_dump_mode==3) {
-#ifdef GPAC_USE_OGL_ES
+#ifdef GPAC_USE_GLES1X
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor]: RGB+Depth format not implemented in OpenGL ES\n"));
 		return GF_NOT_SUPPORTED;
 #else
 		char *depth_data=NULL;
+		u32 size;
 		fb->pitch_x = 4;
 		fb->pitch_y = compositor->vp_width*4; /* 4 bytes for each rgbds pixel */
 
 #ifndef GPAC_USE_TINYGL
-		fb->video_buffer = (char*)gf_malloc(sizeof(char)* fb->pitch_y * fb->height);
+		size = fb->pitch_y * fb->height;
 #else
-		fb->video_buffer = (char*)gf_malloc(sizeof(char)* 2 * fb->pitch_y * fb->height);
+		size = 2 * fb->pitch_y * fb->height;
 #endif
-
-
+		if (compositor->screen_buffer_alloc_size < size) {
+			compositor->screen_buffer_alloc_size = size;
+			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+		}
+		fb->video_buffer = compositor->screen_buffer;
 
 #ifndef GPAC_USE_TINYGL
 
@@ -2639,11 +3747,18 @@
 		return GF_NOT_SUPPORTED;
 #endif
 
-#endif /*GPAC_USE_OGL_ES*/
+#endif /*GPAC_USE_GLES1X*/
 	} else { /*if (compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT))*/
+		u32 size;
 		fb->pitch_x = 4;
 		fb->pitch_y = 4*compositor->vp_width;
-		fb->video_buffer = (char*)gf_malloc(sizeof(char) * fb->pitch_y * fb->height);
+		size = fb->pitch_y * fb->height;
+		if (compositor->screen_buffer_alloc_size < size) {
+			compositor->screen_buffer_alloc_size = size;
+			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+		}
+
+		fb->video_buffer = compositor->screen_buffer;
 		fb->pixel_format = GF_PIXEL_RGBA;
 
 		glReadPixels(0, 0, fb->width, fb->height, GL_RGBA, GL_UNSIGNED_BYTE, fb->video_buffer);
@@ -2673,14 +3788,14 @@
 
 GF_Err compositor_3d_release_screen_buffer(GF_Compositor *compositor, GF_VideoSurface *framebuffer)
 {
-	gf_free(framebuffer->video_buffer);
 	framebuffer->video_buffer = 0;
 	return GF_OK;
 }
 
 GF_Err compositor_3d_get_offscreen_buffer(GF_Compositor *compositor, GF_VideoSurface *fb, u32 view_idx, u32 depth_dump_mode)
 {
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+	//TODOk - habdle offscreen buffers through frameBuffer objects, no read back j
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 	char *tmp;
 	u32 hy, i;
 	/*not implemented yet*/
@@ -2716,7 +3831,8 @@
 
 void visual_3d_point_sprite(GF_VisualManager *visual, Drawable *stack, GF_TextureHandler *txh, GF_TraverseState *tr_state)
 {
-#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+	//todo - allow point sprites for GLES2 ?
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
 	u32 w, h;
 	u32 pixel_format, stride;
 	u8 *data;
@@ -2726,6 +3842,7 @@
 	Bool in_strip;
 	Float delta = 0;
 	Bool first_pass = 2;
+	GF_Node *txtrans = NULL;
 
 	if ((visual->compositor->depth_gl_type==GF_SC_DEPTH_GL_POINTS) && visual->compositor->gl_caps.point_sprite) {
 		Float z;
@@ -2942,15 +4059,15 @@
 		}
 		stack->mesh->vbo_dirty = 1;
 	}
-	tr_state->mesh_num_textures = gf_sc_texture_enable(txh, ((M_Appearance *)tr_state->appear)->textureTransform);
+#ifndef GPAC_DISABLE_VRML
+	if (tr_state->appear) txtrans = ((M_Appearance *)tr_state->appear)->textureTransform;
+#endif
+	tr_state->mesh_num_textures = gf_sc_texture_enable(txh, txtrans);
 	visual_3d_draw_mesh(tr_state, stack->mesh);
 	visual_3d_disable_texture(tr_state);
 
-#endif //GPAC_USE_OGL_ES
+#endif //GPAC_USE_GLES1X
 
 }
 
-
-#endif	/*GPAC_DISABLE_3D*/
-
-
+#endif // GPAC_DISABLE_3D

v0.5.2.tar.gz/src/export.cpp -> v0.6.1.tar.gz/src/export.cpp Changed

@@ -47,6 +47,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sleep) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mkdir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rmdir) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dir_exists) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cleanup_dir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock_high_res) )
@@ -80,9 +81,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_temp_file_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_modification_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fwrite) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_f64_open) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_f64_seek) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_f64_tell) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fopen) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fclose) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fseek) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_ftell) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_has_input) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_get_char) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_set_echo_off) )
@@ -91,6 +93,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_compress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_decompress_payload) )
 #endif
+#pragma comment (linker, EXPORT_SYMBOL(gf_file_handles_count) )
 
 /* Memory */
 #ifdef GPAC_MEMORY_TRACKING
@@ -271,7 +274,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_utc_time_since_1970) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gettimeofday) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp_ts) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp_diff_ms) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_net_set_ntp_shift) )
+
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_utc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_parse_date) )
@@ -320,6 +326,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_module_directories) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_file_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_module_get_file_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_module_load_static) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_interface) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_interface_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_close_interface) )
@@ -616,6 +623,8 @@
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_read) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_del) )
@@ -646,8 +655,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_oci_codec_encode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_oci_codec_decode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_oci_codec_get_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_read) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sl_packetize) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sl_get_header_size) )
 #endif /*GPAC_MINIMAL_ODF*/
@@ -664,10 +671,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_file_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_moov_first) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_timed_meta_data_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_parse_box) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_xml_metadata_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_dims_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_stxt_get_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_xml_subtitle_get_description) )
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_size) )
@@ -681,7 +691,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_fragmented) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_tables) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_data_offset) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_single_moof_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_release_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_open_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_highest_track_in_scalable_segment) )
@@ -689,6 +698,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_timescale) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_original_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_creation_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_by_id) )
@@ -703,6 +713,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_description_index) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_self_contained) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_original_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_timescale) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_chunks_infos) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_handler_name) )
@@ -803,7 +814,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_data_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_omadrm_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_omadrm_media) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_dims_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_switch_group_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_switch_parameter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_next_alternate_group_id) )
@@ -816,13 +826,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_nalu_extract_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_nalu_extract_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_composition_offset_shift) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_scalable_layer) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_needs_layer_reconstruction) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_last_producer_time_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_current_tfdt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_adobe_protection_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_adobe_protection_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_group_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_tile_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_type) )
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_table) )
@@ -853,6 +865,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_creation_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_creation_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_enabled) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_rewrite_track_dependencies) )
@@ -869,6 +882,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_final_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_storage_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_force_64bit_chunk_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_storage_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_interleave_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_interleave_time) )
@@ -886,6 +900,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_append_edit_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_edit_segments) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_edit_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_edit_list_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_language) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_handler_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_user_data) )
@@ -919,6 +934,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_desc_to_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_new_generic_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_change_generic_sample_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_bitrate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_track) )
@@ -997,6 +1013,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_output_buffering) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_group_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_copy_sample_info) )
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_setup_hint_track) )
@@ -1028,6 +1045,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_flush_fragments) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_fragment_reference_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_fragment_option) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_single_moof_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_add_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_append_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_add_sai) )
@@ -1121,6 +1139,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_flag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_min_frame_dur) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_clock_drift) )
+
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_load_xlink_resource) )
@@ -1484,7 +1504,7 @@
 #endif
 #endif /*GPAC_DISABLE_BIFS*/
 
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_SVG)
+#if !defined(GPAC_DISABLE_VRML) || !defined(GPAC_DISABLE_X3D) || !defined(GPAC_DISABLE_SVG)
 
 /*scenegraph.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_tag) )
@@ -1515,7 +1535,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_graph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_scene_time) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_node_in_table_by_tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_new_subscene) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_set_scene_time_callback) )
@@ -1591,14 +1610,6 @@
 
 
 #ifdef GPAC_HAS_SPIDERMONKEY
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_get_node) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_add_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_add_named_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_remove_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_js_vrml_flush_event_out) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_has_instance) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_lock_javascript) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_try_lock_javascript) )
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_dom_pre_destroy) )
@@ -1633,6 +1644,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_copy) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_equal) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_new_to_callback) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_del_by_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_find) )
@@ -1678,6 +1690,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_get_next_available_proto_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_set_proto_loader) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_sfcolor_to_rgba) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_in_table_by_tag) )
+#ifdef GPAC_HAS_SPIDERMONKEY
+#pragma comment (linker, EXPORT_SYMBOL(gf_js_vrml_flush_event_out) )
+#endif
+
 
 #ifndef GPAC_DISABLE_X3D
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_x3d_type_by_class_name) )
@@ -1694,6 +1711,16 @@
 
 #endif //!defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_SVG)
 
+#ifdef GPAC_HAS_SPIDERMONKEY
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_get_node) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_js_add_root) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_js_add_named_root) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_js_remove_root) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_has_instance) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_lock_javascript) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_try_lock_javascript) )
+#endif
+
 
 #ifndef GPAC_DISABLE_PLAYER
 /*terminal.h exports*/
@@ -1761,6 +1788,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_remove_event_filter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_media_queue) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_current_service_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_clock) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1776,6 +1804,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_disconnect) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_register_associated_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_set_addon_layout_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_scene_select_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_setup_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_disconnect) )
@@ -1807,7 +1836,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_fps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_screen_buffer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_release_screen_buffer) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_simulation_tick) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_render_frame) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_reset_graphics) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_pick_node) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_viewpoint) )
@@ -1822,7 +1851,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_remove_audio_listener) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_focus_switch_ring) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_is_over) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_flush_next_audio) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_navigation_supported) )
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_animation_get_scenegraph) )
@@ -1863,6 +1892,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_process_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_reset_parsers) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_reset_parsers_for_program) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_es_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_set_pes_framing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_stream_name) )
@@ -1871,6 +1901,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_pes_get_framing_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_sdt_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_abort_parsing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_pause_demux) )
 
 
@@ -1900,6 +1931,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_program_set_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_enable_sdt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_program_find) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_enable_pcr_only_packets) )
 
 #endif /*GPAC_DISABLE_MPEG2TS_MUX*/
 /* M3U8 & MPD related functions */
@@ -1907,9 +1939,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_init_from_dom) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_to_mpd) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_solve_representation_xlink) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_solve_segment_list_xlink) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_delete_segment_list) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_parse_master_playlist) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_write_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_resolve_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_getter_del_session) )
 
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_setup))
@@ -1953,8 +1989,38 @@
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_segment_files) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_clean_inputs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_location) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_add_base_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_url_template) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_segment_timeline) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_single_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_single_file) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_switch_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_durations) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_rap_splitting) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_segment_marker) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_sidx) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_dynamic_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_min_buffer) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_ast_offset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_memory_fragmenting) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_initial_isobmf) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_memory_fragmenting) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_configure_isobmf_default) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_utc_ref) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_real_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_content_protection_location_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_profile_extension) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_add_input) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_process) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_next_update_time) )
+
 #endif
 
 /* dvb_mpe.h */
@@ -1974,8 +2040,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_m3u8) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_group_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_group_selected) )
@@ -1988,6 +2052,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_check_mpd_root_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_mime) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_init_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_init_keys) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_select) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_groups_set_language) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_in_last_period) )
@@ -2036,7 +2101,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_download_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_timeshift) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_timeshift_buffer_pos) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_codec_stat) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_buffer_levels) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_disable_speed_adaptation) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_override_ntp) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_has_dependent_group) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_tile_adaptation_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_srd_max_size_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_srd_info) )
 
 #endif
 
@@ -2058,23 +2130,3 @@
 #endif
 
 #pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

v0.5.2.tar.gz/src/ietf/rtcp.c -> v0.6.1.tar.gz/src/ietf/rtcp.c Changed

v0.5.2.tar.gz/src/ietf/rtp.c -> v0.6.1.tar.gz/src/ietf/rtp.c Changed

@@ -193,11 +193,11 @@
 		if (!ch->net_info.IsUnicast) {
 			if (IsSource) {
 				if (ch->net_info.destination && !gf_sk_is_multicast_address(ch->net_info.destination)) {
-					ch->net_info.IsUnicast = 1;
+					ch->net_info.IsUnicast = GF_TRUE;
 				}
 			} else {
 				if (ch->net_info.source && !gf_sk_is_multicast_address(ch->net_info.source)) {
-					ch->net_info.IsUnicast = 1;
+					ch->net_info.IsUnicast = GF_TRUE;
 				}
 			}
 		}
@@ -227,7 +227,7 @@
 			//Bind to multicast (auto-join the group).
 			//we do not bind the socket if this is a source-only channel because some servers
 			//don't like that on local loop ...
-			e = gf_sk_setup_multicast(ch->rtp, ch->net_info.source, ch->net_info.port_first, ch->net_info.TTL, 0, local_ip);
+			e = gf_sk_setup_multicast(ch->rtp, ch->net_info.source, ch->net_info.port_first, ch->net_info.TTL, GF_FALSE, local_ip);
 			if (e) return e;
 		}
 		if (UDPBufferSize) gf_sk_set_buffer_size(ch->rtp, IsSource, UDPBufferSize);
@@ -266,7 +266,7 @@
 		} else {
 			if (!ch->net_info.port_last) ch->net_info.port_last = ch->net_info.client_port_last;
 			//Bind to multicast (auto-join the group)
-			e = gf_sk_setup_multicast(ch->rtcp, ch->net_info.source, ch->net_info.port_last, ch->net_info.TTL, 0, local_ip);
+			e = gf_sk_setup_multicast(ch->rtcp, ch->net_info.source, ch->net_info.port_last, ch->net_info.TTL, GF_FALSE, local_ip);
 			if (e) return e;
 		}
 	}
@@ -438,7 +438,7 @@
 	}
 	if (ch->first_SR && !ch->SenderSSRC && rtp_hdr->SSRC) {
 		ch->SenderSSRC = rtp_hdr->SSRC;
-		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Assigning SSRC %d because none has been signaled\n", ch->SenderSSRC));
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Assigning SSRC to %d because none was specified through SDP/RTSP\n", ch->SenderSSRC));
 	}
 
 
@@ -459,6 +459,24 @@
 		ch->num_sn_loops += 1;
 	}
 
+	if (ch->last_SR_rtp_time) {
+		s32 diff_sec = ((s32) rtp_hdr->TimeStamp - (s32) ch->last_SR_rtp_time) / (s32) ch->TimeScale;
+		u32 sec = ch->last_SR_NTP_sec;
+		s64 frac = ch->last_SR_NTP_frac;
+
+		frac = (s32) rtp_hdr->TimeStamp - (s32) ch->last_SR_rtp_time - diff_sec*(s32)ch->TimeScale;
+		frac *= 0xFFFFFFFF;
+		frac /= ch->TimeScale;
+		frac += ch->last_SR_NTP_frac;
+		if (frac>0xFFFFFFFF) {
+			sec += 1;
+			frac -= 0xFFFFFFFF;
+		}
+		rtp_hdr->recomputed_ntp_ts = sec + diff_sec;
+		rtp_hdr->recomputed_ntp_ts <<= 32;
+		rtp_hdr->recomputed_ntp_ts |= frac;
+	}
+
 	ntp = gf_rtp_channel_time(ch);
 	deviance = ntp - rtp_hdr->TimeStamp;
 	delta = deviance - ch->last_deviance;
@@ -470,7 +488,7 @@
 	lost = 0;
 	LastSeq = ch->last_pck_sn;
 	CurrSeq = (u32) rtp_hdr->SequenceNumber;
-	ch->packet_loss = 0;
+	ch->packet_loss = GF_FALSE;
 	/*next sequential pck*/
 	if ( ( (LastSeq + 1) & 0xffff ) == CurrSeq ) {
 		ch->last_num_pck_rcv += 1;
@@ -491,7 +509,7 @@
 		ch->last_num_pck_expected += lost;
 		ch->last_num_pck_rcv += 1;
 		ch->last_num_pck_loss += lost;
-		ch->packet_loss = 1;
+		ch->packet_loss = GF_TRUE;
 	}
 	ch->last_pck_sn = CurrSeq;
 
@@ -551,10 +569,9 @@
 	if (!ch || !rtp_hdr
 	 || !ch->send_buffer
 	 || !pck
-	 || (rtp_hdr->CSRCCount && !rtp_hdr->CSRC)
 	 || (rtp_hdr->CSRCCount > 15)) return GF_BAD_PARAM;
 
-	if (rtp_hdr->CSRCCount) fast_send=0;
+	if (rtp_hdr->CSRCCount) fast_send = GF_FALSE;
 
 	if (12 + pck_size + 4*rtp_hdr->CSRCCount > ch->send_buffer_size) return GF_IO_ERR;

v0.5.2.tar.gz/src/ietf/rtp_depacketizer.c -> v0.6.1.tar.gz/src/ietf/rtp_depacketizer.c Changed

@@ -203,12 +203,12 @@
 		/*locate VOP start code*/
 		if (rtp->sl_hdr.accessUnitStartFlag && (rtp->flags & GF_RTP_M4V_CHECK_RAP)) {
 			u32 i;
-			Bool is_rap = 0;
+			Bool is_rap = GF_FALSE;
 			unsigned char *pay = (unsigned char *) payload + pay_start;
 			i=0;
 			while (i<au_size-4) {
 				if (!pay[i] && !pay[i+1] && (pay[i+2]==1) && (pay[i+3]==0xB6)) {
-					is_rap = ((pay[i+4] & 0xC0)==0) ? 1 : 0;
+					is_rap = ((pay[i+4] & 0xC0)==0) ? GF_TRUE : GF_FALSE;
 					break;
 				}
 				i++;
@@ -389,8 +389,8 @@
 	bs = gf_bs_new(payload, size, GF_BITSTREAM_READ);
 	/*reserved*/
 	gf_bs_read_int(bs, 5);
-	P_bit = gf_bs_read_int(bs, 1);
-	V_bit = gf_bs_read_int(bs, 1);
+	P_bit = (Bool)gf_bs_read_int(bs, 1);
+	V_bit = (Bool)gf_bs_read_int(bs, 1);
 	plen = gf_bs_read_int(bs, 6);
 	/*plen_bits = */gf_bs_read_int(bs, 3);
 
@@ -485,7 +485,7 @@
 	bs = gf_bs_new(payload, size, GF_BITSTREAM_READ);
 	while (gf_bs_available(bs)) {
 		pay_start = gf_bs_get_position(bs);
-		is_utf_16 = gf_bs_read_int(bs, 1);
+		is_utf_16 = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 4);
 		type = gf_bs_read_int(bs, 3);
 		ttu_len = gf_bs_read_u16(bs);
@@ -524,7 +524,7 @@
 			gf_bs_read_u16(bs);/*complete text sample size, ignored*/
 			txt_size = size - 10;
 
-			/*init - 3GPP/MPEG-4 spliting is IMHO stupid:
+			/*init - 3GPP/MPEG-4 splitting is IMHO stupid:
 				- nb frag & cur frags are not needed: rtp reordering insures packet are in order, and
 			!!!we assume fragments are sent in order!!!
 				- any other TTU suffices to indicate end of text string (modifiers or != RTP TS)
@@ -679,7 +679,7 @@
 	else if (nal_type==24) {
 		u32 offset = 1;
 		while (offset<size) {
-			Bool send = 1;
+			Bool send = GF_TRUE;
 			u32 nal_size = (u8) payload[offset];
 			nal_size<<=8;
 			nal_size |= (u8) payload[offset+1];
@@ -688,7 +688,7 @@
 				rtp->sl_hdr.randomAccessPointFlag = 1;
 				rtp->flags &= ~GF_RTP_AVC_WAIT_RAP;
 			}
-			if (rtp->flags & GF_RTP_AVC_WAIT_RAP) send = 0;
+			if (rtp->flags & GF_RTP_AVC_WAIT_RAP) send = GF_FALSE;
 
 			if (send) {
 				/*signal NALU size on 4 bytes*/
@@ -717,7 +717,7 @@
 		Bool is_start = payload[1] & 0x80;
 		Bool is_end = payload[1] & 0x40;
 		/*flush*/
-		if (is_start) gf_rtp_h264_flush(rtp, hdr, 1);
+		if (is_start) gf_rtp_h264_flush(rtp, hdr, GF_TRUE);
 
 		if ((payload[1] & 0x1F) == 5) {
 			rtp->flags &= ~GF_RTP_AVC_WAIT_RAP;
@@ -740,11 +740,11 @@
 			gf_bs_write_u8(rtp->inter_bs, nal_hdr);
 		}
 		gf_bs_write_data(rtp->inter_bs, payload+2, size-2);
-		if (is_end || hdr->Marker) gf_rtp_h264_flush(rtp, hdr, 0);
+		if (is_end || hdr->Marker) gf_rtp_h264_flush(rtp, hdr, GF_FALSE);
 	}
 }
 
-#ifndef GPAC_DISABLE_HEVC
+#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
 
 static void gf_rtp_hevc_flush(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, Bool missed_end)
 {
@@ -859,7 +859,7 @@
 		Bool is_start = payload[2] & 0x80;
 		Bool is_end = payload[2] & 0x40;
 		/*flush*/
-		if (is_start) gf_rtp_hevc_flush(rtp, hdr, 1);
+		if (is_start) gf_rtp_hevc_flush(rtp, hdr, GF_TRUE);
 
 		nal_type = payload[2] & 0x3F;
 		/*FIXME: strict condition for randomAccessPointFlag because of decoder's issue*/
@@ -883,11 +883,12 @@
 			gf_bs_write_data(rtp->inter_bs, nal_hdr, 2);
 		}
 		gf_bs_write_data(rtp->inter_bs, payload+3, size-3);
-		if (is_end || hdr->Marker) gf_rtp_hevc_flush(rtp, hdr, 0);
+		if (is_end || hdr->Marker) gf_rtp_hevc_flush(rtp, hdr, GF_FALSE);
 	}
 }
 #endif
 
+#ifndef GPAC_DISABLE_AV_PARSERS
 
 static void gf_rtp_parse_latm(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
 {
@@ -915,6 +916,7 @@
 		rtp->sl_hdr.compositionTimeStamp += rtp->sl_hdr.au_duration;
 	}
 }
+#endif
 
 static void gf_rtp_parse_3gpp_dims(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
 {
@@ -1013,7 +1015,7 @@
 		rtp->sl_hdr.accessUnitStartFlag = rtp->sl_hdr.accessUnitEndFlag = 1;
 		while (size) {
 			u32 offset;
-			if (!gf_ac3_parser((u8*)payload, size, &offset, &hdr, 0)) {
+			if (!gf_ac3_parser((u8*)payload, size, &offset, &hdr, GF_FALSE)) {
 				return;
 			}
 			if (offset) {
@@ -1345,7 +1347,7 @@
 
 	case GF_RTP_PAYT_MPEG12_VIDEO:
 		/*we signal RAPs*/
-		rtp->sl_map.RandomAccessIndication = 1;
+		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		rtp->sl_map.StreamType = GF_STREAM_VISUAL;
 		/*FIXME: how to differentiate MPEG1 from MPEG2 video before any frame is received??*/
 		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
@@ -1402,7 +1404,7 @@
 		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
 		gf_bs_del(bs);
 		/*we signal RAPs*/
-		rtp->sl_map.RandomAccessIndication = 1;
+		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_h263;
 	}
@@ -1505,7 +1507,7 @@
 		rtp->sl_map.StreamType = 4;
 		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_AVC;
 		/*we will signal RAPs*/
-		rtp->sl_map.RandomAccessIndication = 1;
+		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*rewrite sps and pps*/
 		i=0;
 		while ((fmtp = (GF_SDP_FMTP*)gf_list_enum(media->FMTP, &i))) {
@@ -1569,7 +1571,7 @@
 		rtp->sl_map.StreamType = 4;
 		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_HEVC;
 		/*we will signal RAPs*/
-		rtp->sl_map.RandomAccessIndication = 1;
+		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		i=0;
 		while ((fmtp = (GF_SDP_FMTP*)gf_list_enum(media->FMTP, &i))) {
 			GF_X_Attribute *att;
@@ -1643,7 +1645,7 @@
 		rtp->sl_map.StreamType = GF_STREAM_SCENE;
 		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_SCENE_DIMS;
 		/*we will signal RAPs*/
-		rtp->sl_map.RandomAccessIndication = 1;
+		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*we map DIMS CTR to AU seq num, hence 3 bits*/
 		rtp->sl_map.StreamStateIndication = 3;
 		rtp->sl_map.IndexLength = 3;
@@ -1654,7 +1656,7 @@
 	case GF_RTP_PAYT_AC3:
 		rtp->sl_map.StreamType = GF_STREAM_AUDIO;
 		rtp->sl_map.ObjectTypeIndication = 0xA5;
-		rtp->sl_map.RandomAccessIndication = 1;
+		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_ac3;
 		break;
@@ -1716,7 +1718,7 @@
 void gf_rtp_depacketizer_del(GF_RTPDepacketizer *rtp)
 {
 	if (rtp) {
-		gf_rtp_depacketizer_reset(rtp, 0);
+		gf_rtp_depacketizer_reset(rtp, GF_FALSE);
 		if (rtp->sl_map.config) gf_free(rtp->sl_map.config);
 		if (rtp->key) gf_free(rtp->key);
 		gf_free(rtp);
@@ -1727,6 +1729,7 @@
 void gf_rtp_depacketizer_process(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
 {
 	assert(rtp && rtp->depacketize);
+	rtp->sl_hdr.sender_ntp = hdr->recomputed_ntp_ts;
 	rtp->depacketize(rtp, hdr, payload, size);
 }
 
@@ -1746,7 +1749,7 @@
 	}
 	/*AUSeqNum is only signaled if streamState is used (eg for carrouselling); otherwise we ignore it*/
 	slc->AUSeqNumLength = rtp->sl_map.StreamStateIndication;
-	slc->no_dts_signaling = rtp->sl_map.DTSDeltaLength ? 0 : 1;
+	slc->no_dts_signaling = rtp->sl_map.DTSDeltaLength ? GF_FALSE : GF_TRUE;
 
 
 	/*RTP SN is on 16 bits*/

v0.5.2.tar.gz/src/ietf/rtp_packetizer.c -> v0.6.1.tar.gz/src/ietf/rtp_packetizer.c Changed

@@ -152,9 +152,9 @@
 	builder->rtp_header.PayloadType = builder->PayloadType;
 
 	/*our max config is with 1 packet only (SingleSL)*/
-	builder->first_sl_in_rtp = 1;
+	builder->first_sl_in_rtp = GF_TRUE;
 	/*no AUX data*/
-	builder->slMap.AuxiliaryDataSizeLength= 0;
+	builder->slMap.AuxiliaryDataSizeLength = 0;
 
 
 	/*just compute max aggregation size*/
@@ -305,9 +305,9 @@
 
 		/*RAP*/
 		if (builder->sl_config.useRandomAccessPointFlag && (builder->flags & GP_RTP_PCK_SIGNAL_RAP)) {
-			builder->slMap.RandomAccessIndication = 1;
+			builder->slMap.RandomAccessIndication = GF_TRUE;
 		} else {
-			builder->slMap.RandomAccessIndication = 0;
+			builder->slMap.RandomAccessIndication = GF_FALSE;
 		}
 
 		/*stream state*/
@@ -365,9 +365,9 @@
 
 	/*RAP*/
 	if (builder->sl_config.useRandomAccessPointFlag && (builder->flags & GP_RTP_PCK_SIGNAL_RAP)) {
-		builder->slMap.RandomAccessIndication = 1;
+		builder->slMap.RandomAccessIndication = GF_TRUE;
 	} else {
-		builder->slMap.RandomAccessIndication = 0;
+		builder->slMap.RandomAccessIndication = GF_FALSE;
 	}
 
 check_header:
@@ -405,9 +405,9 @@
 	 && !builder->slMap.IV_length
 	 && !builder->slMap.KI_length
 	 ) {
-		builder->has_AU_header= 0;
+		builder->has_AU_header = GF_FALSE;
 	} else {
-		builder->has_AU_header = 1;
+		builder->has_AU_header = GF_TRUE;
 	}
 }
 
@@ -416,7 +416,7 @@
 	if (!key_indicator) {
 		if (builder->key_indicator) {
 			/*force flush if no provision for keyIndicator per AU*/
-			builder->force_flush = (builder->flags & GP_RTP_PCK_KEY_IDX_PER_AU) ? 0 : 1;
+			builder->force_flush = (builder->flags & GP_RTP_PCK_KEY_IDX_PER_AU) ? GF_FALSE : GF_TRUE;
 			gf_free(builder->key_indicator);
 			builder->key_indicator = NULL;
 		}
@@ -425,7 +425,7 @@
 	 memcmp(builder->key_indicator, key_indicator, sizeof(char)*builder->slMap.KI_length)
 	 ) {
 		/*force flush if no provision for keyIndicator per AU*/
-		builder->force_flush = (builder->flags & GP_RTP_PCK_KEY_IDX_PER_AU) ? 0 : 1;
+		builder->force_flush = (builder->flags & GP_RTP_PCK_KEY_IDX_PER_AU) ? GF_FALSE : GF_TRUE;
 
 		if (!builder->key_indicator) builder->key_indicator = (char *) gf_malloc(sizeof(char)*builder->slMap.KI_length);
 		memcpy(builder->key_indicator, key_indicator, sizeof(char)*builder->slMap.KI_length);
@@ -434,7 +434,7 @@
 		builder->IV = IV;
 		if (builder->slMap.IV_delta_length && (builder->slMap.IV_delta_length < gf_get_bit_size((u32) (IV - builder->first_AU_IV) ))) {
 			builder->first_AU_IV = IV;
-			builder->force_flush = 1;
+			builder->force_flush = GF_TRUE;
 		}
 	}
 	builder->is_encrypted = is_encrypted;
@@ -456,16 +456,16 @@
 			 )
 			{
 				strcpy(szPayloadName, "enc-mpeg4-generic");
-				return 1;
+				return GF_TRUE;
 			}
 			/*mpeg4-generic*/
 			if ( (flags & GP_RTP_PCK_SIGNAL_RAP) || (flags & GP_RTP_PCK_SIGNAL_AU_IDX) || (flags & GP_RTP_PCK_SIGNAL_SIZE)
 			 || (flags & GP_RTP_PCK_SIGNAL_TS) || (flags & GP_RTP_PCK_USE_MULTI) ) {
 				strcpy(szPayloadName, "mpeg4-generic");
-				return 1;
+				return GF_TRUE;
 			} else {
 				strcpy(szPayloadName, "MP4V-ES");
-				return 1;
+				return GF_TRUE;
 			}
 		}
 		/*for all other types*/
@@ -473,75 +473,75 @@
 		else if (rtpb->slMap.StreamType==GF_STREAM_MPEGJ) strcpy(szMediaName, "application");
 		else strcpy(szMediaName, "video");
 		strcpy(szPayloadName, rtpb->slMap.IV_length ? "enc-mpeg4-generic" : "mpeg4-generic");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_MPEG12_VIDEO:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "MPV");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_MPEG12_AUDIO:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "MPA");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_H263:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H263-1998");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_AMR:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "AMR");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_AMR_WB:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "AMR-WB");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_3GPP_TEXT:
 		strcpy(szMediaName, "text");
 		strcpy(szPayloadName, "3gpp-tt");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_H264_AVC:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H264");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_QCELP:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "QCELP");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_EVRC_SMV:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, (rtpb->slMap.ObjectTypeIndication==0xA0) ? "EVRC" : "SMV");
 		/*header-free version*/
 		if (rtpb->auh_size<=1) strcat(szPayloadName, "0");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_LATM:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "MP4A-LATM");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_3GPP_DIMS:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "richmedia+xml");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_AC3:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "ac3");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_H264_SVC:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H264-SVC");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_HEVC:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H265");
-		return 1;
+		return GF_TRUE;
 	case GF_RTP_PAYT_SHVC:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H265-SHVC");
-		return 1;
+		return GF_TRUE;
 	default:
 		strcpy(szMediaName, "");
 		strcpy(szPayloadName, "");
-		return 0;
+		return GF_FALSE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -550,7 +550,7 @@
 {
 	char buffer[20000], dsiString[20000];
 	u32 i, k;
-	Bool is_first = 1;
+	Bool is_first = GF_TRUE;
 
 	if ((builder->rtp_payt!=GF_RTP_PAYT_MPEG4) && (builder->rtp_payt!=GF_RTP_PAYT_LATM) ) return GF_BAD_PARAM;

v0.5.2.tar.gz/src/ietf/rtp_pck_3gpp.c -> v0.6.1.tar.gz/src/ietf/rtp_pck_3gpp.c Changed

@@ -39,7 +39,7 @@
 	builder->pck_hdr = NULL;
 	/*overwrite last frame F bit*/
 	hdr[builder->last_au_sn] &= 0x7F;
-	builder->OnData(builder->cbk_obj, hdr, hdr_size, 1);
+	builder->OnData(builder->cbk_obj, hdr, hdr_size, GF_TRUE);
 	gf_free(hdr);
 	builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
 	builder->bytesInPacket = 0;
@@ -106,7 +106,7 @@
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, offset);
 		} else {
-			builder->OnData(builder->cbk_obj, data+offset, size, 0);
+			builder->OnData(builder->cbk_obj, data+offset, size, GF_FALSE);
 		}
 		builder->last_au_sn++;
 		builder->bytesInPacket += size;
@@ -166,13 +166,13 @@
 			builder->rtp_header.SequenceNumber += 1;
 			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
 			hdr = 0;/*no interleaving*/
-			builder->OnData(builder->cbk_obj, (char*)&hdr, 1, 0);
+			builder->OnData(builder->cbk_obj, (char*)&hdr, 1, GF_FALSE);
 			builder->bytesInPacket = 1;
 		}
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, offset);
 		} else {
-			builder->OnData(builder->cbk_obj, data+offset, size, 0);
+			builder->OnData(builder->cbk_obj, data+offset, size, GF_FALSE);
 		}
 		builder->bytesInPacket += size;
 		offset += size;
@@ -205,7 +205,7 @@
 		/*overwrite count*/
 		hdr[0] = 0;
 		hdr[1] = builder->last_au_sn-1;/*MMM + frameCount-1*/
-		builder->OnData(builder->cbk_obj, hdr, hdr_size, 1);
+		builder->OnData(builder->cbk_obj, hdr, hdr_size, GF_TRUE);
 		gf_free(hdr);
 	}
 	builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
@@ -269,7 +269,7 @@
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, offset);
 		} else {
-			builder->OnData(builder->cbk_obj, data+offset, size, 0);
+			builder->OnData(builder->cbk_obj, data+offset, size, GF_FALSE);
 		}
 		builder->last_au_sn++;
 		builder->bytesInPacket += size;
@@ -294,7 +294,7 @@
 	/*the H263 hinter doesn't perform inter-sample concatenation*/
 	if (!data) return GF_OK;
 
-	Pbit = 1;
+	Pbit = GF_TRUE;
 
 	/*skip 16 0'ed bits of start code*/
 	offset = 2;
@@ -323,17 +323,17 @@
 		gf_bs_del(bs);
 
 		/*add header*/
-		builder->OnData(builder->cbk_obj, (char*) hdr, 2, 1);
+		builder->OnData(builder->cbk_obj, (char*) hdr, 2, GF_TRUE);
 		/*add payload*/
 		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, size, offset);
 		else
-			builder->OnData(builder->cbk_obj, data + offset, size, 0);
+			builder->OnData(builder->cbk_obj, data + offset, size, GF_FALSE);
 
 		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
 
 		offset += size;
-		Pbit = 0;
+		Pbit = GF_FALSE;
 	}
 	return GF_OK;
 }
@@ -343,7 +343,7 @@
 	GF_BitStream *bs;
 	char *hdr;
 	u32 samp_size, txt_size, pay_start, hdr_size, txt_done, cur_frag, nb_frag;
-	Bool is_utf_16 = 0;
+	Bool is_utf_16 = GF_FALSE;
 
 	if (!data) {
 		/*flush packet*/
@@ -362,7 +362,7 @@
 	if (txt_size>2) {
 		/*seems 3GP only accepts BE UTF-16 (no LE, no UTF32)*/
 		if (((u8) data[2]==(u8) 0xFE) && ((u8) data[3]==(u8) 0xFF)) {
-			is_utf_16 = 1;
+			is_utf_16 = GF_TRUE;
 			pay_start = 4;
 			txt_size -= 2;
 		}
@@ -394,7 +394,7 @@
 		gf_bs_write_u16(bs, txt_size);
 		gf_bs_get_content(bs, &hdr, &hdr_size);
 		gf_bs_del(bs);
-		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, 0);
+		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, GF_FALSE);
 		builder->bytesInPacket += hdr_size;
 		gf_free(hdr);
 
@@ -402,7 +402,7 @@
 			if (builder->OnDataReference) {
 				builder->OnDataReference(builder->cbk_obj, samp_size, pay_start);
 			} else {
-				builder->OnData(builder->cbk_obj, data + pay_start, samp_size, 0);
+				builder->OnData(builder->cbk_obj, data + pay_start, samp_size, GF_FALSE);
 			}
 			builder->bytesInPacket += samp_size;
 		}
@@ -462,14 +462,14 @@
 		gf_bs_write_u16(bs, samp_size);
 		gf_bs_get_content(bs, &hdr, &hdr_size);
 		gf_bs_del(bs);
-		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, 0);
+		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, GF_FALSE);
 		builder->bytesInPacket += hdr_size;
 		gf_free(hdr);
 
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, pay_start + txt_done);
 		} else {
-			builder->OnData(builder->cbk_obj, data + pay_start + txt_done, size, 0);
+			builder->OnData(builder->cbk_obj, data + pay_start + txt_done, size, GF_FALSE);
 		}
 		builder->bytesInPacket += size;
 		cur_frag++;
@@ -516,14 +516,14 @@
 
 		gf_bs_get_content(bs, &hdr, &hdr_size);
 		gf_bs_del(bs);
-		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, 0);
+		builder->OnData(builder->cbk_obj, (char *) hdr, hdr_size, GF_FALSE);
 		builder->bytesInPacket += hdr_size;
 		gf_free(hdr);
 
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, pay_start + txt_done);
 		} else {
-			builder->OnData(builder->cbk_obj, data + pay_start + txt_done, size, 0);
+			builder->OnData(builder->cbk_obj, data + pay_start + txt_done, size, GF_FALSE);
 		}
 		builder->bytesInPacket += size;
 		cur_frag++;
@@ -571,7 +571,7 @@
 		gf_bs_skip_bytes(bs, du_size-2);
 
 		/*prepare M-bit*/
-		is_last_du = (offset+du_size==data_size) ? 1 : 0;
+		is_last_du = (offset+du_size==data_size) ? GF_TRUE : GF_FALSE;
 
 		frag_state = 0;
 		while (du_size) {
@@ -635,7 +635,7 @@
 
 				builder->rtp_header.SequenceNumber += 1;
 				builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
-				builder->OnData(builder->cbk_obj, (char *) dims_rtp_hdr, 1, 1);
+				builder->OnData(builder->cbk_obj, (char *) dims_rtp_hdr, 1, GF_TRUE);
 				builder->bytesInPacket = 1;
 			}
 
@@ -643,7 +643,7 @@
 			if (builder->OnDataReference)
 				builder->OnDataReference(builder->cbk_obj, size, offset+du_offset+size_offset);
 			else
-				builder->OnData(builder->cbk_obj, data+offset+du_offset+size_offset, size, 0);
+				builder->OnData(builder->cbk_obj, data+offset+du_offset+size_offset, size, GF_FALSE);
 
 			/*if fragmentation, force packet flush even on last packet since aggregation unit do not
 			use the same packet format*/
@@ -676,7 +676,7 @@
 
 	hdr[0] = builder->ac3_ft;
 	hdr[1] = builder->last_au_sn;
-	builder->OnData(builder->cbk_obj, hdr, 2, 1);
+	builder->OnData(builder->cbk_obj, hdr, 2, GF_TRUE);
 
 	builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
 	builder->bytesInPacket = 0;
@@ -726,7 +726,7 @@
 		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, data_size, 0);
 		else
-			builder->OnData(builder->cbk_obj, data, data_size, 0);
+			builder->OnData(builder->cbk_obj, data, data_size, GF_FALSE);
 
 		builder->bytesInPacket += data_size;
 		builder->last_au_sn++;
@@ -758,13 +758,13 @@
 
 		hdr[0] = builder->ac3_ft;
 		hdr[1] = builder->last_au_sn;
-		builder->OnData(builder->cbk_obj, hdr, 2, 1);
+		builder->OnData(builder->cbk_obj, hdr, 2, GF_TRUE);
 
 		/*add payload*/
 		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, pck_size, offset);
 		else
-			builder->OnData(builder->cbk_obj, data+offset, pck_size, 0);
+			builder->OnData(builder->cbk_obj, data+offset, pck_size, GF_FALSE);
 
 		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
 		offset += pck_size;

v0.5.2.tar.gz/src/ietf/rtp_pck_mpeg12.c -> v0.6.1.tar.gz/src/ietf/rtp_pck_mpeg12.c Changed

@@ -37,12 +37,12 @@
 	/*flush*/
 	if (builder->pck_hdr) {
 		gf_bs_get_content(builder->pck_hdr, &tmp, &tmp_size);
-		builder->OnData(builder->cbk_obj, tmp, tmp_size, 1);
+		builder->OnData(builder->cbk_obj, tmp, tmp_size, GF_TRUE);
 		gf_free(tmp);
 
 		if (gf_bs_get_size(builder->payload)) {
 			gf_bs_get_content(builder->payload, &tmp, &tmp_size);
-			builder->OnData(builder->cbk_obj, tmp, tmp_size, 0);
+			builder->OnData(builder->cbk_obj, tmp, tmp_size, GF_FALSE);
 			gf_free(tmp);
 		}
 
@@ -61,7 +61,7 @@
 	/*create new RTP Packet */
 	builder->rtp_header.SequenceNumber += 1;
 	builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
-	builder->first_sl_in_rtp = 1;
+	builder->first_sl_in_rtp = GF_TRUE;
 	builder->bytesInPacket = 0;
 }
 
@@ -72,7 +72,7 @@
 
 	/*if no data flush, if nothing start if not enough space restart*/
 	if (!data || !builder->bytesInPacket || (builder->bytesInPacket + data_size > builder->Path_MTU)) {
-		mpa12_do_flush(builder, data ? 1 : 0);
+		mpa12_do_flush(builder, data ? GF_TRUE : GF_FALSE);
 		if (!data) return GF_OK;
 	}
 
@@ -86,7 +86,7 @@
 		if (builder->first_sl_in_rtp) {
 			gf_bs_write_u16(builder->pck_hdr, 0);
 			gf_bs_write_u16(builder->pck_hdr, offset);
-			builder->first_sl_in_rtp = 0;
+			builder->first_sl_in_rtp = GF_FALSE;
 			builder->bytesInPacket = 2;
 		}
 		/*add reference*/
@@ -100,11 +100,11 @@
 		/*start new packet if fragmenting*/
 		if (data_size) {
 			offset += (u16) pck_size;
-			mpa12_do_flush(builder, 1);
+			mpa12_do_flush(builder, GF_TRUE);
 		}
 	}
 	/*if offset or no aggregation*/
-	if (offset || !(builder->flags & GP_RTP_PCK_USE_MULTI) ) mpa12_do_flush(builder, 0);
+	if (offset || !(builder->flags & GP_RTP_PCK_USE_MULTI) ) mpa12_do_flush(builder, GF_FALSE);
 
 	return GF_OK;
 }
@@ -125,7 +125,7 @@
 	if (!data) return GF_OK;
 
 	offset = 0;
-	have_seq = 0;
+	have_seq = GF_FALSE;
 
 	while (1) {
 		u32 oldoffset;
@@ -134,7 +134,7 @@
 			break;
 
 		offset += oldoffset;
-		if (startcode == MPEG12_SEQUENCE_START_CODE) have_seq = 1;
+		if (startcode == MPEG12_SEQUENCE_START_CODE) have_seq = GF_TRUE;
 		offset += 4;
 
 		if (startcode == MPEG12_PICTURE_START_CODE) break;
@@ -165,11 +165,11 @@
 
 	buffer = data;
 	prev_slice = 0;
-	start_with_slice = (gf_mv12_next_slice_start((unsigned char *)buffer, offset, data_size, &next_slice) >= 0) ? 1 : 0;
+	start_with_slice = (gf_mv12_next_slice_start((unsigned char *)buffer, offset, data_size, &next_slice) >= 0) ? GF_TRUE : GF_FALSE;
 	offset = 0;
-	slices_done = 0;
+	slices_done = GF_FALSE;
 	got_slice = start_with_slice;
-	first_slice = 1;
+	first_slice = GF_TRUE;
 
 	while (data_size > 0) {
 		Bool last_pck;
@@ -177,19 +177,19 @@
 
 		if (data_size <= max_pck_size) {
 			len_to_write = data_size;
-			last_pck = 1;
+			last_pck = GF_TRUE;
 			prev_slice = 0;
 		} else {
-			got_slice = (!first_slice && !slices_done && (next_slice <= max_pck_size)) ? 1 : 0;
-			first_slice = 0;
-			last_pck = 0;
+			got_slice = (!first_slice && !slices_done && (next_slice <= max_pck_size)) ? GF_TRUE : GF_FALSE;
+			first_slice = GF_FALSE;
+			last_pck = GF_FALSE;
 
 			while (!slices_done && (next_slice <= max_pck_size)) {
 				prev_slice = next_slice;
 				if (gf_mv12_next_slice_start((unsigned char *)buffer, next_slice + 4, data_size, &next_slice) >= 0) {
-					got_slice = 1;
+					got_slice = GF_TRUE;
 				} else {
-					slices_done = 1;
+					slices_done = GF_TRUE;
 				}
 			}
 			if (got_slice) len_to_write = prev_slice;
@@ -200,22 +200,22 @@
 
 		if (have_seq) {
 			mpv_hdr[2] |= 0x20;
-			have_seq = 0;
+			have_seq = GF_FALSE;
 		}
 		if (first_slice) mpv_hdr[2] |= 0x10;
 
 		if (got_slice || last_pck) {
 			mpv_hdr[2] |= 0x08;
-			start_with_slice = 1;
+			start_with_slice = GF_TRUE;
 		} else {
-			start_with_slice = 0;
+			start_with_slice = GF_FALSE;
 		}
 
-		builder->OnData(builder->cbk_obj, mpv_hdr, 4, 0);
+		builder->OnData(builder->cbk_obj, mpv_hdr, 4, GF_FALSE);
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, len_to_write, offset);
 		} else {
-			builder->OnData(builder->cbk_obj, data + offset, len_to_write, 0);
+			builder->OnData(builder->cbk_obj, data + offset, len_to_write, GF_FALSE);
 		}
 
 		builder->rtp_header.Marker = last_pck ? 1 : 0;

v0.5.2.tar.gz/src/ietf/rtp_pck_mpeg4.c -> v0.6.1.tar.gz/src/ietf/rtp_pck_mpeg4.c Changed

@@ -249,9 +249,9 @@
 		/*new RTP Packet*/
 		if (!builder->payload) {
 			/*first SL in RTP*/
-			builder->first_sl_in_rtp = 1;
+			builder->first_sl_in_rtp = GF_TRUE;
 
-			/*if this is the end of an AU we will set it to 0 as soon as an AU is splited*/
+			/*if this is the end of an AU we will set it to 0 as soon as an AU is splitted*/
 			builder->rtp_header.Marker = 1;
 			builder->rtp_header.PayloadType = builder->PayloadType;
 			builder->rtp_header.SequenceNumber += 1;
@@ -340,7 +340,7 @@
 		}
 
 		//first SL in RTP is done
-		builder->first_sl_in_rtp = 0;
+		builder->first_sl_in_rtp = GF_FALSE;
 
 		//store current sl
 		builder->last_au_sn = builder->sl_header.AU_sequenceNumber;
@@ -381,10 +381,10 @@
 		builder->payload = NULL;
 
 		/*notify header*/
-		builder->OnData(builder->cbk_obj, sl_buffer, sl_buffer_size, 1);
+		builder->OnData(builder->cbk_obj, sl_buffer, sl_buffer_size, GF_TRUE);
 		/*notify payload*/
 		if (payl_buffer) {
-			builder->OnData(builder->cbk_obj, payl_buffer, payl_buffer_size, 0);
+			builder->OnData(builder->cbk_obj, payl_buffer, payl_buffer_size, GF_FALSE);
 			gf_free(payl_buffer);
 		}
 		/*flush packet*/
@@ -429,7 +429,7 @@
 		builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
 		builder->rtp_header.SequenceNumber += 1;
 		builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
-		builder->avc_non_idr = 1;
+		builder->avc_non_idr = GF_TRUE;
 	}
 
 	/*check NAL type to see if disposable or not*/
@@ -442,7 +442,7 @@
 	case GF_AVC_NALU_FILLER_DATA:
 		break;
 	default:
-		builder->avc_non_idr = 0;
+		builder->avc_non_idr = GF_FALSE;
 		break;
 	}
 
@@ -451,29 +451,29 @@
 	/*pb: we don't know if next NALU from this AU will be small enough to fit in the packet, so we always
 	go for stap...*/
 	if (builder->bytesInPacket+nalu_size<builder->Path_MTU) {
-		Bool use_stap = 1;
+		Bool use_stap = GF_TRUE;
 		/*if this is the AU end and no NALU in packet, go for single mode*/
-		if (IsAUEnd && !builder->bytesInPacket) use_stap = 0;
+		if (IsAUEnd && !builder->bytesInPacket) use_stap = GF_FALSE;
 
 		if (use_stap) {
 			/*declare STAP-A NAL*/
 			if (!builder->bytesInPacket) {
 				/*copy over F and NRI from first nal in packet and assign type*/
 				stap_hdr = (nalu[0] & 0xE0) | 24;
-				builder->OnData(builder->cbk_obj, (char *) &stap_hdr, 1, 0);
+				builder->OnData(builder->cbk_obj, (char *) &stap_hdr, 1, GF_FALSE);
 				builder->bytesInPacket = 1;
 			}
 			/*add NALU size*/
 			shdr[0] = nalu_size>>8;
 			shdr[1] = nalu_size&0x00ff;
-			builder->OnData(builder->cbk_obj, (char *)shdr, 2, 0);
+			builder->OnData(builder->cbk_obj, (char *)shdr, 2, GF_FALSE);
 			builder->bytesInPacket += 2;
 		}
 		/*add data*/
 		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, nalu_size, 0);
 		else
-			builder->OnData(builder->cbk_obj, nalu, nalu_size, 0);
+			builder->OnData(builder->cbk_obj, nalu, nalu_size, GF_FALSE);
 
 		builder->bytesInPacket += nalu_size;
 
@@ -507,13 +507,13 @@
 			/*end bit*/
 			else if (size == bytesLeft) shdr[1] |= 0x40;
 
-			builder->OnData(builder->cbk_obj, (char *)shdr, 2, 0);
+			builder->OnData(builder->cbk_obj, (char *)shdr, 2, GF_FALSE);
 
 			/*add data*/
 			if (builder->OnDataReference)
 				builder->OnDataReference(builder->cbk_obj, size, offset);
 			else
-				builder->OnData(builder->cbk_obj, nalu+offset, size, 0);
+				builder->OnData(builder->cbk_obj, nalu+offset, size, GF_FALSE);
 
 			offset += size;
 			bytesLeft -= size;
@@ -551,7 +551,7 @@
 		builder->rtp_header.Marker = (do_flush==1) ? 1 : 0;
 		/*insert payload_hdr in case of AP*/
 		if (strlen(builder->hevc_payload_hdr)) {
-			builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, 1);
+			builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, GF_TRUE);
 			memset(builder->hevc_payload_hdr, 0, 2);
 		}
 		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
@@ -571,9 +571,9 @@
 	/*at this point we're sure the NALU fits in current packet OR must be splitted*/
 	/*check that we should use single NALU packet mode or aggreation packets mode*/
 	if (builder->bytesInPacket+nalu_size+4 < builder->Path_MTU) {
-		Bool use_AP = (builder->flags & GP_RTP_PCK_USE_MULTI) ? 1 : 0;
+		Bool use_AP = (builder->flags & GP_RTP_PCK_USE_MULTI) ? GF_TRUE : GF_FALSE;
 		/*if this is the AU end and no NALU in packet, go for single NALU packet mode*/
-		if (IsAUEnd && !builder->bytesInPacket) use_AP = 0;
+		if (IsAUEnd && !builder->bytesInPacket) use_AP = GF_FALSE;
 
 		if (use_AP) {
 			char nal_s[2];
@@ -606,21 +606,21 @@
 			/*add NALU size*/
 			nal_s[0] = nalu_size>>8;
 			nal_s[1] = nalu_size&0x00ff;
-			builder->OnData(builder->cbk_obj, (char *)nal_s, 2, 0);
+			builder->OnData(builder->cbk_obj, (char *)nal_s, 2, GF_FALSE);
 			builder->bytesInPacket += 2;
 		}
 		/*add data*/
 		if (builder->OnDataReference)
 			builder->OnDataReference(builder->cbk_obj, nalu_size, 0);
 		else
-			builder->OnData(builder->cbk_obj, nalu, nalu_size, 0);
+			builder->OnData(builder->cbk_obj, nalu, nalu_size, GF_FALSE);
 
 		builder->bytesInPacket += nalu_size;
 
 		if (IsAUEnd) {
 			builder->rtp_header.Marker = 1;
 			if (strlen(builder->hevc_payload_hdr)) {
-				builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, 1);
+				builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, GF_TRUE);
 				memset(builder->hevc_payload_hdr, 0, 2);
 			}
 			builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
@@ -652,7 +652,7 @@
 			payload_hdr[0] = (nalu[0] & 0x81) | (49 << 1);
 			/*copy LayerId and TID*/
 			payload_hdr[1] = nalu[1];
-			builder->OnData(builder->cbk_obj, (char *)payload_hdr, 2, 0);
+			builder->OnData(builder->cbk_obj, (char *)payload_hdr, 2, GF_FALSE);
 
 			/*declare FU header*/
 			shdr = 0;
@@ -663,13 +663,13 @@
 			/*end bit*/
 			else if (size == bytesLeft) shdr |= 0x40;
 
-			builder->OnData(builder->cbk_obj, &shdr, 1, 0);
+			builder->OnData(builder->cbk_obj, &shdr, 1, GF_FALSE);
 
 			/*add data*/
 			if (builder->OnDataReference)
 				builder->OnDataReference(builder->cbk_obj, size, offset);
 			else
-				builder->OnData(builder->cbk_obj, nalu+offset, size, 0);
+				builder->OnData(builder->cbk_obj, nalu+offset, size, GF_FALSE);
 
 			offset += size;
 			bytesLeft -= size;
@@ -721,20 +721,20 @@
 	}
 
 	data_offset = 0;
-	fragmented = 0;
+	fragmented = GF_FALSE;
 	while (data_size > 0) {
 		latm_hdr_size = (data_size / 255) + 1;
 		/*fragmenting*/
 		if (latm_hdr_size + data_size > builder->Path_MTU) {
 			assert(!builder->bytesInPacket);
-			fragmented = 1;
+			fragmented = GF_TRUE;
 			latm_hdr_size = (builder->Path_MTU / 255) + 1;
 			size = builder->Path_MTU - latm_hdr_size;
 			builder->rtp_header.Marker = 0;
 		}
 		/*last fragment or full AU*/
 		else {
-			fragmented = 0;
+			fragmented = GF_FALSE;
 			size = data_size;
 			builder->rtp_header.Marker = 1;
 		}
@@ -754,7 +754,7 @@
 		latm_hdr[latm_hdr_size-1] = size % 255;
 
 		/*add LATM header IN ORDER in case we aggregate audioMuxElements in RTP*/
-		builder->OnData(builder->cbk_obj, (char*) latm_hdr, latm_hdr_size, 0);
+		builder->OnData(builder->cbk_obj, (char*) latm_hdr, latm_hdr_size, GF_FALSE);
 		builder->bytesInPacket += latm_hdr_size;
 		gf_free(latm_hdr);
 
@@ -762,7 +762,7 @@
 		if (builder->OnDataReference) {
 			builder->OnDataReference(builder->cbk_obj, size, data_offset);
 		} else
-			builder->OnData(builder->cbk_obj, data, size, 0);
+			builder->OnData(builder->cbk_obj, data, size, GF_FALSE);
 
 		builder->bytesInPacket += size;
 
@@ -772,7 +772,7 @@
 		if (!builder->rtp_header.Marker) latm_flush(builder);
 	}
 	/*if the AU has been fragmented or we don't use RTP aggregation, flush*/
-	if (! (builder->flags & GP_RTP_PCK_USE_MULTI) ) fragmented = 1;
+	if (! (builder->flags & GP_RTP_PCK_USE_MULTI) ) fragmented = GF_TRUE;
 	if (fragmented) latm_flush(builder);
 
 	return GF_OK;

v0.5.2.tar.gz/src/ietf/rtp_streamer.c -> v0.6.1.tar.gz/src/ietf/rtp_streamer.c Changed

@@ -55,8 +55,8 @@
 
 static void rtp_stream_on_packet_done(void *cbk, GF_RTPHeader *header)
 {
-	GF_RTPStreamer *rtp = cbk;
-	GF_Err e = gf_rtp_send_packet(rtp->channel, header, rtp->buffer+12, rtp->payload_len, 1);
+	GF_RTPStreamer *rtp = (GF_RTPStreamer*)cbk;
+	GF_Err e = gf_rtp_send_packet(rtp->channel, header, rtp->buffer+12, rtp->payload_len, GF_TRUE);
 
 #ifndef GPAC_DISABLE_LOG
 	if (e) {
@@ -70,7 +70,7 @@
 
 static void rtp_stream_on_data(void *cbk, char *data, u32 data_size, Bool is_head)
 {
-	GF_RTPStreamer *rtp = cbk;
+	GF_RTPStreamer *rtp = (GF_RTPStreamer*)cbk;
 	if (!data ||!data_size) return;
 
 	if (rtp->payload_len+data_size+12 > rtp->buffer_alloc) {
@@ -96,12 +96,12 @@
 	gf_rtp_set_ports(rtp->channel, 0);
 	memset(&tr, 0, sizeof(GF_RTSPTransport));
 
-	tr.IsUnicast = gf_sk_is_multicast_address(dest) ? 0 : 1;
+	tr.IsUnicast = gf_sk_is_multicast_address(dest) ? GF_FALSE : GF_TRUE;
 	tr.Profile="RTP/AVP";
 	tr.destination = (char *)dest;
 	tr.source = "0.0.0.0";
-	tr.IsRecord = 0;
-	tr.Append = 0;
+	tr.IsRecord = GF_FALSE;
+	tr.Append = GF_FALSE;
 	tr.SSRC = rand();
 	tr.TTL = ttl;
 
@@ -120,7 +120,7 @@
 		return res;
 	}
 
-	res = gf_rtp_initialize(rtp->channel, 0, 1, path_mtu, 0, 0, (char *)ifce_addr);
+	res = gf_rtp_initialize(rtp->channel, 0, GF_TRUE, path_mtu, 0, 0, (char *)ifce_addr);
 	if (res !=0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Cannot initialize RTP sockets: %s\n", gf_error_to_string(res) ));
 		return res;
@@ -160,7 +160,7 @@
 	mpeg4mode = NULL;
 	required_rate = 0;
 	nb_ch = 0;
-	has_mpeg4_mapping = 1;
+	has_mpeg4_mapping = GF_TRUE;
 	rtp_type = 0;
 
 	/*for max compatibility with QT*/
@@ -320,7 +320,7 @@
 	case GF_STREAM_OD:
 		if (oti == GPAC_OTI_SCENE_DIMS) {
 			rtp_type = GF_RTP_PAYT_3GPP_DIMS;
-			has_mpeg4_mapping = 0;
+			has_mpeg4_mapping = GF_FALSE;
 		} else {
 			rtp_type = GF_RTP_PAYT_MPEG4;
 		}
@@ -342,20 +342,20 @@
 			required_rate = 8000;
 			rtp_type = GF_RTP_PAYT_AMR;
 			streamType = GF_STREAM_AUDIO;
-			has_mpeg4_mapping = 0;
+			has_mpeg4_mapping = GF_FALSE;
 			nb_ch = 1;
 			break;
 		case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 			required_rate = 16000;
 			rtp_type = GF_RTP_PAYT_AMR_WB;
 			streamType = GF_STREAM_AUDIO;
-			has_mpeg4_mapping = 0;
+			has_mpeg4_mapping = GF_FALSE;
 			nb_ch = 1;
 			break;
 		case GF_ISOM_SUBTYPE_AC3:
 			rtp_type = GF_RTP_PAYT_AC3;
 			streamType = GF_STREAM_AUDIO;
-			has_mpeg4_mapping = 1;
+			has_mpeg4_mapping = GF_TRUE;
 			nb_ch = 1;
 			break;
 		case GF_ISOM_SUBTYPE_AVC_H264:
@@ -478,7 +478,7 @@
 	stream->ts_scale /= timeScale;
 
 	stream->buffer_alloc = MTU+12;
-	stream->buffer = gf_malloc(sizeof(char) * stream->buffer_alloc);
+	stream->buffer = (char*)gf_malloc(sizeof(char) * stream->buffer_alloc);
 
 	return stream;
 }
@@ -491,7 +491,7 @@
 {
 	return gf_rtp_streamer_new_extended(streamType, oti, timeScale, ip_dest, port, MTU, TTL, ifce_addr, flags, dsi, dsi_len,
 
-	                                    96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+	                                    96, 0, 0, GF_FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
 }
 
@@ -631,7 +631,7 @@
 	}
 	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_HEVC) || (rtp->packetizer->rtp_payt == GF_RTP_PAYT_SHVC)) {
 #ifndef GPAC_DISABLE_HEVC
-		GF_HEVCConfig *hevcc = dsi ? gf_odf_hevc_cfg_read(dsi, dsi_len, 0) : NULL;
+		GF_HEVCConfig *hevcc = dsi ? gf_odf_hevc_cfg_read(dsi, dsi_len, GF_FALSE) : NULL;
 		if (hevcc) {
 			u32 count, i, j, b64s;
 			char b64[200];
@@ -716,11 +716,11 @@
 
 	size = (u32) strlen(sdp) + (*out_sdp_buffer ? (u32) strlen(*out_sdp_buffer) : 0) + 1;
 	if ( !*out_sdp_buffer) {
-		*out_sdp_buffer = gf_malloc(sizeof(char)*size);
+		*out_sdp_buffer = (char*)gf_malloc(sizeof(char)*size);
 		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
 		strcpy(*out_sdp_buffer, sdp);
 	} else {
-		*out_sdp_buffer = gf_realloc(*out_sdp_buffer, sizeof(char)*size);
+		*out_sdp_buffer = (char*)gf_realloc(*out_sdp_buffer, sizeof(char)*size);
 		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
 		strcat(*out_sdp_buffer, sdp);
 	}
@@ -752,11 +752,11 @@
 
 	size = (u32) strlen(sdp) + (*out_sdp_buffer ? (u32) strlen(*out_sdp_buffer) : 0) + 1;
 	if ( !*out_sdp_buffer) {
-		*out_sdp_buffer = gf_malloc(sizeof(char)*size);
+		*out_sdp_buffer = (char*)gf_malloc(sizeof(char)*size);
 		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
 		strcpy(*out_sdp_buffer, sdp);
 	} else {
-		*out_sdp_buffer = gf_realloc(*out_sdp_buffer, sizeof(char)*size);
+		*out_sdp_buffer = (char*)gf_realloc(*out_sdp_buffer, sizeof(char)*size);
 		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
 		strcat(*out_sdp_buffer, sdp);
 	}
@@ -767,8 +767,8 @@
 char *gf_rtp_streamer_format_sdp_header(char *app_name, char *ip_dest, char *session_name, char *iod64)
 {
 	u64 size;
-	char *sdp;
-	FILE *tmp = gf_temp_file_new();
+	char *sdp, *tmp_fn = NULL;
+	FILE *tmp = gf_temp_file_new(&tmp_fn);
 	if (!tmp) return NULL;
 
 	/* write SDP header*/
@@ -780,13 +780,15 @@
 
 	if (iod64) fprintf(tmp, "a=mpeg4-iod:\"data:application/mpeg4-iod;base64,%s\"\n", iod64);
 
-	gf_f64_seek(tmp, 0, SEEK_END);
-	size = gf_f64_tell(tmp);
-	gf_f64_seek(tmp, 0, SEEK_SET);
-	sdp = gf_malloc(sizeof(char) * (size_t)(size+1));
+	gf_fseek(tmp, 0, SEEK_END);
+	size = gf_ftell(tmp);
+	gf_fseek(tmp, 0, SEEK_SET);
+	sdp = (char*)gf_malloc(sizeof(char) * (size_t)(size+1));
 	size = fread(sdp, 1, (size_t)size, tmp);
 	sdp[size] = 0;
-	fclose(tmp);
+	gf_fclose(tmp);
+	gf_delete_file(tmp_fn);
+	gf_free(tmp_fn);
 	return sdp;
 }
 
@@ -812,20 +814,20 @@
 
 GF_Err gf_rtp_streamer_send_au(GF_RTPStreamer *rtp, char *data, u32 size, u64 cts, u64 dts, Bool is_rap)
 {
-	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, 1, 1, 0, 0, 0);
+	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, GF_TRUE, GF_TRUE, 0, 0, 0);
 }
 
 GF_EXPORT
 GF_Err gf_rtp_streamer_send_au_with_sn(GF_RTPStreamer *rtp, char *data, u32 size, u64 cts, u64 dts, Bool is_rap, u32 inc_au_sn)
 {
 	if (inc_au_sn) rtp->packetizer->sl_header.AU_sequenceNumber += inc_au_sn;
-	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, 1, 1, rtp->packetizer->sl_header.AU_sequenceNumber, 0, 0);
+	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, GF_TRUE, GF_TRUE, rtp->packetizer->sl_header.AU_sequenceNumber, 0, 0);
 }
 
 GF_EXPORT
 void gf_rtp_streamer_disable_auto_rtcp(GF_RTPStreamer *streamer)
 {
-	streamer->channel->no_auto_rtcp = 1;
+	streamer->channel->no_auto_rtcp = GF_TRUE;
 }
 
 GF_EXPORT

v0.5.2.tar.gz/src/ietf/rtsp_command.c -> v0.6.1.tar.gz/src/ietf/rtsp_command.c Changed

v0.5.2.tar.gz/src/ietf/rtsp_common.c -> v0.6.1.tar.gz/src/ietf/rtsp_common.c Changed

@@ -155,7 +155,7 @@
 
 	GF_SAFEALLOC(tmp, GF_RTSPTransport);
 
-	IsFirst = 1;
+	IsFirst = GF_TRUE;
 	pos = 0;
 	while (1) {
 		pos = gf_token_get(buffer, pos, " ;", buf, 100);
@@ -170,7 +170,7 @@
 		//very first param is the profile
 		if (IsFirst) {
 			tmp->Profile = gf_strdup(param_name);
-			IsFirst = 0;
+			IsFirst = GF_FALSE;
 			continue;
 		}
 
@@ -182,12 +182,12 @@
 			if (tmp->source) gf_free(tmp->source);
 			tmp->source = gf_strdup(param_val);
 		}
-		else if (!stricmp(param_name, "unicast")) tmp->IsUnicast = 1;
-		else if (!stricmp(param_name, "RECORD")) tmp->IsRecord = 1;
-		else if (!stricmp(param_name, "append")) tmp->Append = 1;
+		else if (!stricmp(param_name, "unicast")) tmp->IsUnicast = GF_TRUE;
+		else if (!stricmp(param_name, "RECORD")) tmp->IsRecord = GF_TRUE;
+		else if (!stricmp(param_name, "append")) tmp->Append = GF_TRUE;
 		else if (!stricmp(param_name, "interleaved")) {
 			u32 rID, rcID;
-			tmp->IsInterleaved = 1;
+			tmp->IsInterleaved = GF_TRUE;
 			if (sscanf(param_val, "%u-%u", &rID, &rcID) == 1) {
 				sscanf(param_val, "%u", &rID);
 				tmp->rtcpID = tmp->rtpID = (u8) rID;

v0.5.2.tar.gz/src/ietf/rtsp_response.c -> v0.6.1.tar.gz/src/ietf/rtsp_response.c Changed

v0.5.2.tar.gz/src/ietf/rtsp_session.c -> v0.6.1.tar.gz/src/ietf/rtsp_session.c Changed

@@ -39,7 +39,8 @@
 
 	strcpy(Server, "");
 	strcpy(Service, "");
-	*Port = *useTCP =0;
+	*Port = 0;
+	*useTCP = GF_FALSE;
 
 	if (!strchr(sURL, ':')) return GF_BAD_PARAM;
 
@@ -67,7 +68,7 @@
 	retest = strstr(test, "/");
 	if (!retest) return GF_URL_ERROR;
 
-	if (!stricmp(schema, "rtsp")) *useTCP = 1;
+	if (!stricmp(schema, "rtsp")) *useTCP = GF_TRUE;
 
 	//check for port
 	retest = strrchr(test, ':');
@@ -86,12 +87,12 @@
 		*Port = atoi(text);
 	}
 	//get the server name
-	is_ipv6 = 0;
+	is_ipv6 = GF_FALSE;
 	len = (u32) strlen(test);
 	i=0;
 	while (i<len) {
-		if (test[i]=='[') is_ipv6 = 1;
-		else if (test[i]==']') is_ipv6 = 0;
+		if (test[i]=='[') is_ipv6 = GF_TRUE;
+		else if (test[i]==']') is_ipv6 = GF_FALSE;
 		if ( (test[i] == '/') || (!is_ipv6 && (test[i] == ':')) ) break;
 		text[i] = test[i];
 		i += 1;
@@ -131,14 +132,14 @@
 	//HTTP tunnel
 	if (sess->Port == 80) {
 		sess->ConnectionType = GF_SOCK_TYPE_TCP;
-		sess->HasTunnel = 1;
+		sess->HasTunnel = GF_TRUE;
 	}
 
 	sess->Server = gf_strdup(server);
 	sess->Service = gf_strdup(service);
 	sess->mx = gf_mx_new("RTSPSession");
 	sess->TCPChannels = gf_list_new();
-	gf_rtsp_session_reset(sess, 0);
+	gf_rtsp_session_reset(sess, GF_FALSE);
 	return sess;
 }
 
@@ -206,7 +207,7 @@
 {
 	if (!sess) return;
 
-	gf_rtsp_session_reset(sess, 0);
+	gf_rtsp_session_reset(sess, GF_FALSE);
 
 	if (sess->connection) gf_sk_del(sess->connection);
 	if (sess->http) gf_sk_del(sess->http);
@@ -306,7 +307,7 @@
 	e = gf_sk_connect(sess->connection, sess->Server, sess->Port, sess->MobileIP);
 	if (e) return e;
 
-	if (sess->SockBufferSize) gf_sk_set_buffer_size(sess->connection, 0, sess->SockBufferSize);
+	if (sess->SockBufferSize) gf_sk_set_buffer_size(sess->connection, GF_FALSE, sess->SockBufferSize);
 
 	if (!sess->http && sess->HasTunnel) {
 		e = gf_rtsp_http_tunnel_start(sess, "toto is the king of RTSP");
@@ -383,12 +384,12 @@
 		InterID = buffer[1];
 		paySize = ((buffer[2] << 8) & 0xFF00) | (buffer[3] & 0xFF);
 		/*this may be NULL (data fetched after a teardown) - resync and return*/
-		ch = GetTCPChannel(sess, InterID, InterID, 0);
+		ch = GetTCPChannel(sess, InterID, InterID, GF_FALSE);
 
 		/*then check wether this is a full packet or a split*/
 		if (paySize <= Size-4) {
 			if (ch) {
-				IsRTCP = (ch->rtcpID == InterID);
+				IsRTCP = (ch->rtcpID == InterID) ? GF_TRUE : GF_FALSE;
 				sess->RTSP_SignalData(sess, ch->ch_ptr, buffer+4, paySize, IsRTCP);
 			}
 			sess->CurrentPos += paySize+4;
@@ -397,9 +398,9 @@
 			/*missed end of pck ?*/
 			if (sess->payloadSize) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP over RTSP] Missed end of packet (%d bytes) in stream %d\n", sess->payloadSize - sess->pck_start, sess->InterID));
-				ch = GetTCPChannel(sess, sess->InterID, sess->InterID, 0);
+				ch = GetTCPChannel(sess, sess->InterID, sess->InterID, GF_FALSE);
 				if (ch) {
-					IsRTCP = (ch->rtcpID == sess->InterID);
+					IsRTCP = (ch->rtcpID == sess->InterID) ? GF_TRUE : GF_FALSE;
 					sess->RTSP_SignalData(sess, ch->ch_ptr, sess->rtsp_pck_buf, sess->payloadSize, IsRTCP);
 				}
 			}
@@ -417,14 +418,14 @@
 	}
 	/*end of packet*/
 	else if (sess->payloadSize - sess->pck_start <= Size) {
-//		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP over RTSP] Missed begining of packet (%d bytes) in stream %d\n", Size, sess->InterID));
+//		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP over RTSP] Missed beginning of packet (%d bytes) in stream %d\n", Size, sess->InterID));
 
 		res = sess->payloadSize - sess->pck_start;
 		memcpy(sess->rtsp_pck_buf + sess->pck_start, buffer, res);
 		//flush - same as above, don't complain if channel not found
-		ch = GetTCPChannel(sess, sess->InterID, sess->InterID, 0);
+		ch = GetTCPChannel(sess, sess->InterID, sess->InterID, GF_FALSE);
 		if (ch) {
-			IsRTCP = (ch->rtcpID == sess->InterID);
+			IsRTCP = (ch->rtcpID == sess->InterID) ? GF_TRUE : GF_FALSE;
 			sess->RTSP_SignalData(sess, ch->ch_ptr, sess->rtsp_pck_buf, sess->payloadSize, IsRTCP);
 		}
 		sess->payloadSize = 0;
@@ -435,7 +436,7 @@
 	}
 	/*middle of packet*/
 	else {
-//		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP over RTSP] Missed begining of RTP packet in stream %d\n", sess->InterID));
+//		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP over RTSP] Missed beginning of RTP packet in stream %d\n", sess->InterID));
 		memcpy(sess->rtsp_pck_buf + sess->pck_start, buffer, Size);
 		sess->pck_start += Size;
 		sess->CurrentPos += Size;
@@ -496,7 +497,7 @@
 	GF_TCPChan *ptr;
 
 	gf_mx_p(sess->mx);
-	ptr = GetTCPChannel(sess, LowInterID, LowInterID, 1);
+	ptr = GetTCPChannel(sess, LowInterID, LowInterID, GF_TRUE);
 	if (ptr) gf_free(ptr);
 	gf_mx_v(sess->mx);
 	return gf_list_count(sess->TCPChannels);
@@ -511,7 +512,7 @@
 
 	gf_mx_p(sess->mx);
 	//do NOT register twice
-	ptr = GetTCPChannel(sess, LowInterID, HighInterID, 0);
+	ptr = GetTCPChannel(sess, LowInterID, HighInterID, GF_FALSE);
 	if (!ptr) {
 		ptr = (GF_TCPChan *)gf_malloc(sizeof(GF_TCPChan));
 		ptr->ch_ptr = the_ch;
@@ -558,7 +559,7 @@
 }
 
 
-static Bool HTTP_RandInit = 1;
+static Bool HTTP_RandInit = GF_TRUE;
 
 #define HTTP_WAIT_SEC		30
 
@@ -570,8 +571,8 @@
 	u32 i, num, temp;
 
 	if (HTTP_RandInit) {
-		gf_rand_init(0);
-		HTTP_RandInit = 0;
+		gf_rand_init(GF_FALSE);
+		HTTP_RandInit = GF_FALSE;
 	}
 	if (!sess->CookieRadLen) {
 		strcpy(sess->HTTP_Cookie, "MPEG4M4");
@@ -671,12 +672,12 @@
 		gf_sk_del(new_conn);
 		return NULL;
 	}
-	e = gf_sk_set_block_mode(new_conn, 1);
+	e = gf_sk_set_block_mode(new_conn, GF_TRUE);
 	if (e) {
 		gf_sk_del(new_conn);
 		return NULL;
 	}
-	e = gf_sk_server_mode(new_conn, 1);
+	e = gf_sk_server_mode(new_conn, GF_TRUE);
 	if (e) {
 		gf_sk_del(new_conn);
 		return NULL;
@@ -732,7 +733,7 @@
 
 	if (!SessionID_RandInit) {
 		SessionID_RandInit = 1;
-		gf_rand_init(0);
+		gf_rand_init(GF_FALSE);
 	}
 	one = gf_rand();
 	res = one;

v0.5.2.tar.gz/src/ietf/sdp.c -> v0.6.1.tar.gz/src/ietf/sdp.c Changed

@@ -435,9 +435,9 @@
 	i=0;
 	while ((map = (GF_RTPMap*)gf_list_enum(media->RTPMaps, &i))) {
 		sprintf(buf, "%d", map->PayloadType);
-		if (!strcmp(payt, buf)) return 1;
+		if (!strcmp(payt, buf)) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 //translate h || m || d in sec. Fractions are not allowed with this writing
@@ -761,19 +761,19 @@
 		if (e) return e;
 		//multiple addresses are only for media desc
 		if (sdp->c_connection->add_count >= 2) return GF_REMOTE_SERVICE_ERROR;
-		HasGlobalConnection = 1;
+		HasGlobalConnection = GF_TRUE;
 	} else {
-		HasGlobalConnection = 0;
+		HasGlobalConnection = GF_FALSE;
 	}
 
 	//then check all media
 	i=0;
 	while ((media = (GF_SDPMedia*)gf_list_enum(sdp->media_desc, &i))) {
-		HasSeveralPorts = 0;
+		HasSeveralPorts = GF_FALSE;
 
 		//m= : force non-null port, profile and fmt_list
 		if (/*!media->PortNumber || */ !media->Profile) return GF_REMOTE_SERVICE_ERROR;
-		if (media->NumPorts) HasSeveralPorts = 1;
+		if (media->NumPorts) HasSeveralPorts = GF_TRUE;
 
 		//no connections specified - THIS IS AN ERROR IN SDP BUT NOT IN ALL RTSP SESSIONS...
 //		if (!HasGlobalConnection && !gf_list_count(media->Connections)) return GF_REMOTE_SERVICE_ERROR;

v0.5.2.tar.gz/src/isomedia/avc_ext.c -> v0.6.1.tar.gz/src/isomedia/avc_ext.c Changed

@@ -36,7 +36,7 @@
 Bool gf_isom_is_nalu_based_entry(GF_MediaBox *mdia, GF_SampleEntryBox *_entry)
 {
 	GF_MPEGVisualSampleEntryBox *entry;
-	if (mdia->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return 0;
+	if (mdia->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return GF_FALSE;
 	switch (_entry->type) {
 	case GF_4CC('a','v','c','1'):
 	case GF_4CC('a','v','c','2'):
@@ -54,14 +54,14 @@
 	case GF_4CC('s','h','c','1'):
 	case GF_4CC('m','h','v','1'):
 	case GF_4CC('m','h','c','1'):
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 	entry = (GF_MPEGVisualSampleEntryBox*)_entry;
-	if (!entry) return 0;
-	if (entry->avc_config || entry->svc_config || entry->hevc_config || entry->shvc_config) return 1;
-	return 0;
+	if (!entry) return GF_FALSE;
+	if (entry->avc_config || entry->svc_config || entry->hevc_config || entry->shvc_config) return GF_TRUE;
+	return GF_FALSE;
 }
 
 
@@ -69,7 +69,7 @@
 {
 	u32 i, count = gf_list_count(nalus);
 	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *sl = gf_list_get(nalus, i);
+		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(nalus, i);
 		if (rewrite_start_codes) gf_bs_write_u32(bs, 1);
 		else gf_bs_write_int(bs, sl->size, 8*nal_unit_size_field);
 		gf_bs_write_data(bs, sl->data, sl->size);
@@ -127,7 +127,7 @@
 		if (sample_offset < -sample_offset)
 			sample_offset = 0;
 
-		e = Media_GetSample(ref_trak->Media, sampleNumber + sample_offset, &ref_samp, &di, 0, NULL);
+		e = Media_GetSample(ref_trak->Media, sampleNumber + sample_offset, &ref_samp, &di, GF_FALSE, NULL);
 		if (e) return e;
 
 		if (rewrite_start_codes) {
@@ -235,6 +235,8 @@
 	if (!nalu_size_field) return RAP_NO;
 
 	bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
+	if (!bs) return RAP_NO;
+
 	while (gf_bs_available(bs)) {
 		u8 nal_type;
 		u32 size = gf_bs_read_int(bs, 8*nalu_size_field);
@@ -290,7 +292,7 @@
 				gf_bs_del(bs);
 				return RAP_NO;
 			}
-			gf_bs_skip_bytes(bs, size - 2);
+			gf_bs_skip_bytes(bs, size - 1);
 		}
 	}
 	gf_bs_del(bs);
@@ -304,14 +306,14 @@
 		if (entry->hevc_config) {
 			count = gf_list_count(entry->hevc_config->config->param_array);
 			for (i=0; i<count; i++) {
-				GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
+				GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(entry->hevc_config->config->param_array, i);
 				rewrite_nalus_list(ar->nalus, ps_bs, rewrite_start_codes, nal_unit_size_field);
 			}
 		}
 		if (entry->shvc_config) {
 			count = gf_list_count(entry->shvc_config->config->param_array);
 			for (i=0; i<count; i++) {
-				GF_HEVCParamArray *ar = gf_list_get(entry->shvc_config->config->param_array, i);
+				GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(entry->shvc_config->config->param_array, i);
 				rewrite_nalus_list(ar->nalus, ps_bs, rewrite_start_codes, nal_unit_size_field);
 			}
 		}
@@ -336,15 +338,15 @@
 	Bool is_hevc = GF_FALSE;
 	//if only one sync given in the sample sync table, insert sps/pps/vps before cra/bla in hevc
 //	Bool check_cra_bla = (mdia->information->sampleTable->SyncSample && mdia->information->sampleTable->SyncSample->nb_entries>1) ? 0 : 1;
-	Bool check_cra_bla = 1;
-	Bool insert_nalu_delim = 1;
+	Bool check_cra_bla = GF_TRUE;
+	Bool insert_nalu_delim = GF_TRUE;
 	GF_Err e = GF_OK;
 	GF_ISOSample *ref_samp;
 	GF_BitStream *src_bs, *ref_bs, *dst_bs, *ps_bs;
 	u32 nal_size, max_size, nal_unit_size_field, extractor_mode;
 	Bool rewrite_ps, rewrite_start_codes, insert_vdrd_code;
 	s8 nal_type;
-	u32 nal_hdr;
+	u32 nal_hdr, sabt_ref, i, track_num;
 	u32 temporal_id = 0;
 	char *buffer;
 	GF_ISOFile *file = mdia->mediaTrack->moov->mov;
@@ -354,7 +356,33 @@
 	src_bs = ref_bs = dst_bs = ps_bs = NULL;
 	ref_samp = NULL;
 	buffer = NULL;
-	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? 1 : 0;
+	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? GF_TRUE : GF_FALSE;
+
+	rewrite_start_codes = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG) ? GF_TRUE : GF_FALSE;
+	insert_vdrd_code = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_VDRD_FLAG) ? GF_TRUE : GF_FALSE;
+	if (!entry->svc_config && !entry->shvc_config) insert_vdrd_code = GF_FALSE;
+	extractor_mode = mdia->mediaTrack->extractor_mode&0x0000FFFF;
+
+	if (extractor_mode != GF_ISOM_NALU_EXTRACT_INSPECT) {
+		//aggregate all sabt samples with the same DTS
+		track_num = 1 + gf_list_find(mdia->mediaTrack->moov->trackList, mdia->mediaTrack);
+		sabt_ref = gf_isom_get_reference_count(mdia->mediaTrack->moov->mov, track_num, GF_ISOM_REF_SABT);
+		if ((s32) sabt_ref != -1) {
+			for (i=0; i<sabt_ref; i++) {
+				GF_ISOSample *tile_samp;
+				u32 ref_track, di;
+				gf_isom_get_reference(mdia->mediaTrack->moov->mov, track_num, GF_ISOM_REF_SABT, i+1, &ref_track);
+				tile_samp = gf_isom_get_sample(mdia->mediaTrack->moov->mov, ref_track, sampleNumber + mdia->mediaTrack->sample_count_at_seg_start, &di);
+				if (tile_samp && tile_samp ->data) {
+					sample->data = gf_realloc(sample->data, sample->dataLength+tile_samp->dataLength);
+					memcpy(sample->data + sample->dataLength, tile_samp->data, tile_samp->dataLength);
+					sample->dataLength += tile_samp->dataLength;
+				}
+				if (tile_samp) gf_isom_sample_del(&tile_samp);
+			}
+		}
+	}
+
 
 	if (sample->IsRAP < SAP_TYPE_2) {
 		if (mdia->information->sampleTable->no_sync_found || (!sample->IsRAP && check_cra_bla) ) {
@@ -362,19 +390,14 @@
 		}
 	}
 	if (!sample->IsRAP)
-		rewrite_ps = 0;
-
-	rewrite_start_codes = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG) ? 1 : 0;
-	insert_vdrd_code = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_VDRD_FLAG) ? 1 : 0;
-	if (!entry->svc_config && !entry->shvc_config) insert_vdrd_code = 0;
-	extractor_mode = mdia->mediaTrack->extractor_mode&0x0000FFFF;
+		rewrite_ps = GF_FALSE;
 
 	if (extractor_mode != GF_ISOM_NALU_EXTRACT_LAYER_ONLY)
-		insert_vdrd_code = 0;
+		insert_vdrd_code = GF_FALSE;
 
 	//this is a compatible HEVC, don't insert VDRD, insert NALU delim
 	if (entry->shvc_config && entry->hevc_config)
-		insert_vdrd_code = 0;
+		insert_vdrd_code = GF_FALSE;
 
 	if (extractor_mode == GF_ISOM_NALU_EXTRACT_INSPECT) {
 		if (!rewrite_ps && !rewrite_start_codes)
@@ -411,6 +434,7 @@
 	dst_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	ps_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	src_bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
+	if (!src_bs && sample->data) return GF_ISOM_INVALID_FILE;
 	max_size = 4096;
 
 	/*rewrite start code with NALU delim*/
@@ -456,7 +480,7 @@
 					GF_TrackBox *a_track = GetTrackbyID(mdia->mediaTrack->moov, scal->trackIDs[i]);
 					GF_MPEGVisualSampleEntryBox *an_entry = NULL;
 					if (a_track && a_track->Media && a_track->Media->information && a_track->Media->information->sampleTable && a_track->Media->information->sampleTable->SampleDescription)
-						an_entry = gf_list_get(a_track->Media->information->sampleTable->SampleDescription->other_boxes, 0);
+						an_entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(a_track->Media->information->sampleTable->SampleDescription->other_boxes, 0);
 
 					if (an_entry)
 						nalu_merge_ps(ps_bs, rewrite_start_codes, nal_unit_size_field, an_entry, is_hevc);
@@ -471,7 +495,7 @@
 			if (!rewrite_start_codes && !entry->shvc_config && !scal) {
 				if (ps_bs) {
 					u8 nal_type = (sample->data[nal_unit_size_field] & 0x7E) >> 1;
-					//temp fix - if we detect xPS in the begining of the sample do NOT copy the ps bitstream
+					//temp fix - if we detect xPS in the beginning of the sample do NOT copy the ps bitstream
 					//this is not correct since we are not sure whether they are the same xPS or not, but it crashes openHEVC ...
 					switch (nal_type) {
 #ifndef GPAC_DISABLE_HEVC
@@ -519,6 +543,10 @@
 
 	while (gf_bs_available(src_bs)) {
 		nal_size = gf_bs_read_int(src_bs, 8*nal_unit_size_field);
+		if (gf_bs_get_position(src_bs) + nal_size > sample->dataLength) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("Sample %u (size %u) rewrite: corrupted NAL Unit (size %u)\n", sampleNumber, sample->dataLength, nal_size));
+			goto exit;
+		}
 		if (nal_size>max_size) {
 			buffer = (char*) gf_realloc(buffer, sizeof(char)*nal_size);
 			max_size = nal_size;
@@ -690,6 +718,7 @@
 		p1 = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
 		p2 = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
 		p2->size = p1->size;
+		p2->id = p1->id;
 		p2->data = (char *)gf_malloc(sizeof(char)*p1->size);
 		memcpy(p2->data, p1->data, sizeof(char)*p1->size);
 		gf_list_add(cfg_new->sequenceParameterSets, p2);
@@ -700,6 +729,7 @@
 		p1 = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, i);
 		p2 = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
 		p2->size = p1->size;
+		p2->id = p1->id;
 		p2->data = (char*)gf_malloc(sizeof(char)*p1->size);
 		memcpy(p2->data, p1->data, sizeof(char)*p1->size);
 		gf_list_add(cfg_new->pictureParameterSets, p2);
@@ -712,6 +742,7 @@
 			p1 = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSetExtensions, i);
 			p2 = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
 			p2->size = p1->size;
+			p2->id = p1->id;
 			p2->data = (char*)gf_malloc(sizeof(char)*p1->size);
 			memcpy(p2->data, p1->data, sizeof(char)*p1->size);
 			gf_list_add(cfg_new->sequenceParameterSetExtensions, p2);
@@ -744,9 +775,9 @@
 	for (i=0; i<count; i++) {
 		GF_HEVCParamArray *ar_h = NULL;
 		u32 count2 = dst_cfg->param_array ? gf_list_count(dst_cfg->param_array) : 0;
-		GF_HEVCParamArray *ar = gf_list_get(cfg->param_array, i);
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
 		for (j=0; j<count2; j++) {
-			ar_h = gf_list_get(dst_cfg->param_array, j);
+			ar_h = (GF_HEVCParamArray*)gf_list_get(dst_cfg->param_array, j);
 			if (ar_h->type==ar->type) {
 				break;
 			}
@@ -798,7 +829,7 @@
 		GF_TrackBox *a_track = GetTrackbyID(mdia->mediaTrack->moov, scal->trackIDs[i]);
 		GF_MPEGVisualSampleEntryBox *an_entry = NULL;
 		if (a_track && a_track->Media && a_track->Media->information && a_track->Media->information->sampleTable && a_track->Media->information->sampleTable->SampleDescription)
-			an_entry = gf_list_get(a_track->Media->information->sampleTable->SampleDescription->other_boxes, 0);
+			an_entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(a_track->Media->information->sampleTable->SampleDescription->other_boxes, 0);
 
 		if (!an_entry) continue;
 
@@ -815,12 +846,14 @@
 			merge_hevc_config(hevc_cfg, an_entry->hevc_config->config, GF_TRUE);
 	}
 
-	if (hevc_cfg) hevc_cfg->is_shvc = 0;
+	if (hevc_cfg) hevc_cfg->is_shvc = GF_FALSE;
 }
 
 void AVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *avc, GF_MediaBox *mdia)
 {
 	GF_AVCConfig *avcc, *svcc;
+	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)avc, GF_FALSE);
+
 	if (avc->emul_esd) gf_odf_desc_del((GF_Descriptor *)avc->emul_esd);
 	avc->emul_esd = gf_odf_desc_esd_new(2);
 	avc->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
@@ -830,10 +863,11 @@
 		avc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SVC;
 	else
 		avc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
-	if (avc->bitrate) {
-		avc->emul_esd->decoderConfig->bufferSizeDB = avc->bitrate->bufferSizeDB;
-		avc->emul_esd->decoderConfig->avgBitrate = avc->bitrate->avgBitrate;
-		avc->emul_esd->decoderConfig->maxBitrate = avc->bitrate->maxBitrate;
+
+	if (btrt) {
+		avc->emul_esd->decoderConfig->bufferSizeDB = btrt->bufferSizeDB;
+		avc->emul_esd->decoderConfig->avgBitrate = btrt->avgBitrate;
+		avc->emul_esd->decoderConfig->maxBitrate = btrt->maxBitrate;
 	}
 	if (avc->descr) {
 		u32 i=0;
@@ -875,6 +909,8 @@
 
 void HEVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *hevc, GF_MediaBox *mdia)
 {
+	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)hevc, GF_FALSE);
+
 	if (hevc->emul_esd) gf_odf_desc_del((GF_Descriptor *)hevc->emul_esd);
 	hevc->emul_esd = gf_odf_desc_esd_new(2);
 	hevc->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
@@ -882,10 +918,10 @@
 	if (hevc->shvc_config && !hevc->hevc_config)
 		hevc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SHVC;
 
-	if (hevc->bitrate) {
-		hevc->emul_esd->decoderConfig->bufferSizeDB = hevc->bitrate->bufferSizeDB;
-		hevc->emul_esd->decoderConfig->avgBitrate = hevc->bitrate->avgBitrate;
-		hevc->emul_esd->decoderConfig->maxBitrate = hevc->bitrate->maxBitrate;
+	if (btrt) {
+		hevc->emul_esd->decoderConfig->bufferSizeDB = btrt->bufferSizeDB;
+		hevc->emul_esd->decoderConfig->avgBitrate = btrt->avgBitrate;
+		hevc->emul_esd->decoderConfig->maxBitrate = btrt->maxBitrate;
 	}
 	if (hevc->descr) {
 		u32 i=0;
@@ -923,12 +959,13 @@
 
 GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd)
 {
-	if (!avc->bitrate) avc->bitrate = (GF_MPEG4BitRateBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_BTRT);
+	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)avc, GF_TRUE);
+
 	if (avc->descr) gf_isom_box_del((GF_Box *) avc->descr);
 	avc->descr = NULL;
-	avc->bitrate->avgBitrate = esd->decoderConfig->avgBitrate;
-	avc->bitrate->maxBitrate = esd->decoderConfig->maxBitrate;
-	avc->bitrate->bufferSizeDB = esd->decoderConfig->bufferSizeDB;
+	btrt->avgBitrate = esd->decoderConfig->avgBitrate;
+	btrt->maxBitrate = esd->decoderConfig->maxBitrate;
+	btrt->bufferSizeDB = esd->decoderConfig->bufferSizeDB;
 
 	if (gf_list_count(esd->IPIDataSet)
 	 || gf_list_count(esd->IPMPDescriptorPointers)
@@ -976,7 +1013,7 @@
 		if (!avc->hevc_config) avc->hevc_config = (GF_HEVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
 		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 			if (avc->hevc_config->config) gf_odf_hevc_cfg_del(avc->hevc_config->config);
-			avc->hevc_config->config = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+			avc->hevc_config->config = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
 		}
 	}
 	else if (!avc->svc_config && (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC)) {
@@ -1097,14 +1134,14 @@
 		}
 
 		while (gf_list_count(entry->avc_config->config->sequenceParameterSets)) {
-			GF_AVCConfigSlot *sl = gf_list_get(entry->avc_config->config->sequenceParameterSets, 0);
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(entry->avc_config->config->sequenceParameterSets, 0);
 			gf_list_rem(entry->avc_config->config->sequenceParameterSets, 0);
 			if (sl->data) gf_free(sl->data);
 			gf_free(sl);
 		}
 
 		while (gf_list_count(entry->avc_config->config->pictureParameterSets)) {
-			GF_AVCConfigSlot *sl = gf_list_get(entry->avc_config->config->pictureParameterSets, 0);
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(entry->avc_config->config->pictureParameterSets, 0);
 			gf_list_rem(entry->avc_config->config->pictureParameterSets, 0);
 			if (sl->data) gf_free(sl->data);
 			gf_free(sl);
@@ -1324,9 +1361,9 @@
 		} else if (operand_type != GF_ISOM_HVCC_SET_TILE) {
 			operand_type=GF_ISOM_HVCC_SET_INBAND;
 		}
-		array_incomplete = 0;
+		array_incomplete = (operand_type==GF_ISOM_HVCC_SET_INBAND) ? 1 : 0;
 		for (i=0; i<gf_list_count(entry->hevc_config->config->param_array); i++) {
-			GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
+			GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(entry->hevc_config->config->param_array, i);
 
 			/*we want to force hev1*/
 			if (operand_type==GF_ISOM_HVCC_SET_INBAND)
@@ -1336,7 +1373,7 @@
 				array_incomplete = 1;
 
 				while (gf_list_count(ar->nalus)) {
-					GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
+					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, 0);
 					gf_list_rem(ar->nalus, 0);
 					if (sl->data) gf_free(sl->data);
 					gf_free(sl);
@@ -1405,7 +1442,7 @@
 
 GF_Err gf_isom_shvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_additional)
 {
-	if (cfg) cfg->is_shvc = 1;
+	if (cfg) cfg->is_shvc = GF_TRUE;
 	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_additional ? GF_ISOM_HVCC_SET_SHVC : GF_ISOM_HVCC_SET_SHVC_REM_HEVC);
 }
 
@@ -1545,12 +1582,12 @@
 
 void btrt_del(GF_Box *s)
 {
-	GF_MPEG4BitRateBox *ptr = (GF_MPEG4BitRateBox *)s;
+	GF_BitRateBox *ptr = (GF_BitRateBox *)s;
 	if (ptr) gf_free(ptr);
 }
 GF_Err btrt_Read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_MPEG4BitRateBox *ptr = (GF_MPEG4BitRateBox *)s;
+	GF_BitRateBox *ptr = (GF_BitRateBox *)s;
 	ptr->bufferSizeDB = gf_bs_read_u32(bs);
 	ptr->maxBitrate = gf_bs_read_u32(bs);
 	ptr->avgBitrate = gf_bs_read_u32(bs);
@@ -1558,9 +1595,9 @@
 }
 GF_Box *btrt_New()
 {
-	GF_MPEG4BitRateBox *tmp = (GF_MPEG4BitRateBox *) gf_malloc(sizeof(GF_MPEG4BitRateBox));
+	GF_BitRateBox *tmp = (GF_BitRateBox *) gf_malloc(sizeof(GF_BitRateBox));
 	if (tmp == NULL) return NULL;
-	memset(tmp, 0, sizeof(GF_MPEG4BitRateBox));
+	memset(tmp, 0, sizeof(GF_BitRateBox));
 	tmp->type = GF_ISOM_BOX_TYPE_BTRT;
 	return (GF_Box *)tmp;
 }
@@ -1569,7 +1606,7 @@
 GF_Err btrt_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	GF_MPEG4BitRateBox *ptr = (GF_MPEG4BitRateBox *) s;
+	GF_BitRateBox *ptr = (GF_BitRateBox *) s;
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
@@ -1581,7 +1618,7 @@
 GF_Err btrt_Size(GF_Box *s)
 {
 	GF_Err e;
-	GF_MPEG4BitRateBox *ptr = (GF_MPEG4BitRateBox *)s;
+	GF_BitRateBox *ptr = (GF_BitRateBox *)s;
 	e = gf_isom_box_get_size(s);
 	ptr->size += 12;
 	return e;
@@ -1715,7 +1752,7 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 				AVCState avc;
 				s32 idx, vui_flag_pos;
-				GF_AVCConfigSlot *sl = gf_list_get(ptr->config->sequenceParameterSets, 0);
+				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(ptr->config->sequenceParameterSets, 0);
 				idx = gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, (u32 *) &vui_flag_pos);
 				if (idx>=0) {
 					ptr->config->chroma_format = avc.sps[idx].chroma_format;
@@ -1889,7 +1926,7 @@
 	if (ptr->config) gf_odf_hevc_cfg_del(ptr->config);
 
 	pos = gf_bs_get_position(bs);
-	ptr->config = gf_odf_hevc_cfg_read_bs(bs, (s->type == GF_ISOM_BOX_TYPE_HVCC) ? 0 : 1);
+	ptr->config = gf_odf_hevc_cfg_read_bs(bs, (s->type == GF_ISOM_BOX_TYPE_HVCC) ? GF_FALSE : GF_TRUE);
 	pos = gf_bs_get_position(bs) - pos ;
 	if (pos < ptr->size)
 		ptr->size -= (u32) pos;
@@ -1935,7 +1972,7 @@
 
 	count = gf_list_count(ptr->config->param_array);
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = gf_list_get(ptr->config->param_array, i);
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(ptr->config->param_array, i);
 		ptr->size += 3;
 		subcount = gf_list_count(ar->nalus);
 		for (j=0; j<subcount; j++) {

v0.5.2.tar.gz/src/isomedia/box_code_3gpp.c -> v0.6.1.tar.gz/src/isomedia/box_code_3gpp.c Changed

@@ -264,7 +264,14 @@
 	u32 i;
 	GF_FontTableBox *ptr = (GF_FontTableBox *)s;
 	ptr->entry_count = gf_bs_read_u16(bs);
+	ptr->size -= 2;
+	if (ptr->size<ptr->entry_count*3) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Corrupted ftap box, skipping\n"));
+		ptr->entry_count = 0;
+		return GF_OK;
+	}
 	ptr->fonts = (GF_FontRecord *) gf_malloc(sizeof(GF_FontRecord)*ptr->entry_count);
+	memset(ptr->fonts, 0, sizeof(GF_FontRecord)*ptr->entry_count);
 	for (i=0; i<ptr->entry_count; i++) {
 		u32 len;
 		ptr->fonts[i].fontID = gf_bs_read_u16(bs);
@@ -406,16 +413,23 @@
 	gpp_read_style(bs, &ptr->default_style);
 	ptr->size -= 18 + GPP_BOX_SIZE + GPP_STYLE_SIZE;
 
-	while (ptr->size) {
+	while (ptr->size>=8) {
 		e = gf_isom_parse_box(&a, bs);
 		if (e) return e;
-		if (ptr->size<a->size) return GF_ISOM_INVALID_FILE;
+		if (ptr->size<a->size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" larger than remaining bytes in tx3g - ignoring box\n", gf_4cc_to_str(a->type)));
+			ptr->size = 0;
+			gf_isom_box_del(a);
+			return GF_OK;
+		}
+
 		ptr->size -= a->size;
 		if (a->type==GF_ISOM_BOX_TYPE_FTAB) {
 			if (ptr->font_table) gf_isom_box_del((GF_Box *) ptr->font_table);
 			ptr->font_table = (GF_FontTableBox *)a;
 		} else {
-			gf_isom_box_del(a);
+			e = gf_isom_box_add_default(s, a);
+			if (e) return e;
 		}
 	}
 	return GF_OK;
@@ -447,8 +461,34 @@
 
 	pSize = gf_bs_read_u8(bs); /*a Pascal string begins with its size: get textName size*/
 	ptr->size -= 1;
-	if (ptr->size < pSize)
-		return GF_ISOM_INVALID_FILE;
+	if (ptr->size < pSize) {
+		u32 s = pSize;
+		size_t i = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] text box doesn't use a Pascal string: trying to decode anyway.\n"));
+		ptr->textName = (char*)gf_malloc((u32) ptr->size + 1 + 1);
+		do {
+			char c = (char)s;
+			if (c == '\0') {
+				break;
+			} else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+				ptr->textName[i] = c;
+			} else {
+				gf_free(ptr->textName);
+				ptr->textName = NULL;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] text box doesn't use a Pascal string and contains non-chars. Abort.\n"));
+				return GF_ISOM_INVALID_FILE;
+			}
+			i++;
+			if (!ptr->size)
+				break;
+			ptr->size--;
+			s = gf_bs_read_u8(bs);
+		} while (s);
+
+		ptr->textName[i] = '\0';				/*Font name*/
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] text box doesn't use a Pascal string: \"%s\" detected.\n", ptr->textName));
+		return GF_OK;
+	}
 	if (pSize) {
 		ptr->textName = (char*) gf_malloc(pSize+1 * sizeof(char));
 		if (gf_bs_read_data(bs, ptr->textName, pSize) != pSize) {
@@ -530,7 +570,8 @@
 	gf_bs_write_u8(bs, ptr->reserved2);				/*Reserved*/
 	gf_bs_write_u16(bs, ptr->reserved3);			/*Reserved*/
 	gf_bs_write_data(bs, ptr->foreground_color, 6);	/*Foreground color*/
-	if (ptr->textName && (pSize=(u32) strlen(ptr->textName))) {
+	//pSize assignment below is not a mistake
+	if (ptr->textName && (pSize = (u16) strlen(ptr->textName))) {
 		gf_bs_write_u8(bs, pSize);					/*a Pascal string begins with its size*/
 		gf_bs_write_data(bs, ptr->textName, pSize);	/*Font name*/
 	} else {
@@ -602,7 +643,7 @@
 	u32 i;
 	GF_TextStyleBox*ptr = (GF_TextStyleBox*)s;
 	e = gf_isom_box_write_header(s, bs);
-	assert(e == GF_OK);
+	if (e) return e;
 
 	gf_bs_write_u16(bs, ptr->entry_count);
 	for (i=0; i<ptr->entry_count; i++) gpp_write_style(bs, &ptr->styles[i]);
@@ -1212,7 +1253,6 @@
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 
 	if (p->config) gf_isom_box_del((GF_Box *)p->config);
-	if (p->bitrate ) gf_isom_box_del((GF_Box *)p->bitrate);
 	if (p->scripts) gf_isom_box_del((GF_Box *)p->scripts);
 	gf_free(p);
 }
@@ -1229,10 +1269,6 @@
 		if (ptr->scripts) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->scripts = (GF_DIMSScriptTypesBox*)a;
 		break;
-	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->bitrate = (GF_MPEG4BitRateBox*)a;
-		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
 		break;
@@ -1266,10 +1302,6 @@
 		e = gf_isom_box_write((GF_Box *)p->scripts, bs);
 		if (e) return e;
 	}
-	if (p->bitrate) {
-		e = gf_isom_box_write((GF_Box *)p->bitrate, bs);
-		if (e) return e;
-	}
 	return gf_isom_box_array_write(s, p->protections, bs);
 }
 
@@ -1285,11 +1317,6 @@
 		if (e) return e;
 		p->size += p->config->size;
 	}
-	if (p->bitrate) {
-		e = gf_isom_box_size((GF_Box *) p->bitrate);
-		if (e) return e;
-		p->size += p->bitrate->size;
-	}
 	if (p->scripts) {
 		e = gf_isom_box_size((GF_Box *) p->scripts);
 		if (e) return e;

v0.5.2.tar.gz/src/isomedia/box_code_base.c -> v0.6.1.tar.gz/src/isomedia/box_code_base.c Changed

@@ -711,16 +711,20 @@
 {
 	u32 bytesToRead;
 	GF_UnknownBox *ptr = (GF_UnknownBox *)s;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Ignoring %s box, not supported\n", gf_4cc_to_str(ptr->type) ));
 	if (ptr->size > 0xFFFFFFFF) return GF_ISOM_INVALID_FILE;
 	bytesToRead = (u32) (ptr->size);
 
-	if (bytesToRead) {
-		ptr->data = (char*)gf_malloc(bytesToRead);
-		if (ptr->data == NULL ) return GF_OUT_OF_MEM;
-		ptr->dataSize = bytesToRead;
-		gf_bs_read_data(bs, ptr->data, ptr->dataSize);
+	if (!bytesToRead) return GF_OK;
+	if (bytesToRead>1000000) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Unknown box %s (0x%08X) with payload larger than 1 MBytes, ignoring\n", gf_4cc_to_str(ptr->type), ptr->type ));
+		gf_bs_skip_bytes(bs, ptr->dataSize);
+		return GF_OK;
 	}
+
+	ptr->data = (char*)gf_malloc(bytesToRead);
+	if (ptr->data == NULL ) return GF_OUT_OF_MEM;
+	ptr->dataSize = bytesToRead;
+	gf_bs_read_data(bs, ptr->data, ptr->dataSize);
 	return GF_OK;
 }
 
@@ -741,7 +745,8 @@
 
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
-	if (ptr->data) {
+
+	if (ptr->dataSize && ptr->data) {
 		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
 	}
 	return GF_OK;
@@ -753,7 +758,10 @@
 	GF_UnknownBox *ptr = (GF_UnknownBox *)s;
 	e = gf_isom_box_get_size(s);
 	if (e) return e;
-	ptr->size += ptr->dataSize;
+
+	if (ptr->dataSize && ptr->data) {
+		ptr->size += ptr->dataSize;
+	}
 	return GF_OK;
 }
 
@@ -846,7 +854,15 @@
 
 GF_Err dinf_Read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_read_box_list(s, bs, dinf_AddBox);
+	GF_Err e = gf_isom_read_box_list(s, bs, dinf_AddBox);
+	if (e) {
+		return e;
+	}
+	if (!((GF_DataInformationBox *)s)->dref) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Missing dref box in dinf\n"));
+		((GF_DataInformationBox *)s)->dref = (GF_DataReferenceBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
+	}
+	return GF_OK;
 }
 
 GF_Box *dinf_New()
@@ -1502,6 +1518,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+
 GF_Err gnra_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
@@ -1514,7 +1531,9 @@
 	ptr->type = GF_ISOM_BOX_TYPE_GNRA;
 
 	gf_isom_audio_sample_entry_write((GF_AudioSampleEntryBox *)ptr, bs);
-	gf_bs_write_data(bs, ptr->data, ptr->data_size);
+	if (ptr->data) {
+		gf_bs_write_data(bs, ptr->data, ptr->data_size);
+	}
 	return GF_OK;
 }
 
@@ -2795,6 +2814,8 @@
 		ptr->timeScale = 90000;
 	}
 
+	ptr->original_duration = ptr->duration;
+
 	//our padding bit
 	gf_bs_read_int(bs, 1);
 	//the spec is unclear here, just says "the value 0 is interpreted as undetermined"
@@ -3498,8 +3519,8 @@
 				GF_Err e;
 				GF_BitStream *bs = gf_bs_new(wave->data+offset, wave->dataSize-offset, GF_BITSTREAM_READ);
 				e = gf_isom_parse_box(&a, bs);
-				assert(e == GF_OK);
 				gf_bs_del(bs);
+				if (e) return e;
 				ptr->esd = (GF_ESDBox *)a;
 			}
 			gf_isom_box_del(a);
@@ -3687,7 +3708,6 @@
 	if (ptr->svc_config) gf_isom_box_del((GF_Box *) ptr->svc_config);
 	if (ptr->hevc_config) gf_isom_box_del((GF_Box *) ptr->hevc_config);
 	if (ptr->shvc_config) gf_isom_box_del((GF_Box *) ptr->shvc_config);
-	if (ptr->bitrate) gf_isom_box_del((GF_Box *) ptr->bitrate);
 	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
 	if (ptr->ipod_ext) gf_isom_box_del((GF_Box *)ptr->ipod_ext);
 	/*for publishing*/
@@ -3726,10 +3746,6 @@
 		if (ptr->shvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->shvc_config = (GF_HEVCConfigurationBox *)a;
 		break;
-	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->bitrate = (GF_MPEG4BitRateBox *)a;
-		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
 		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
@@ -3814,10 +3830,6 @@
 			e = gf_isom_box_write((GF_Box *) ptr->ipod_ext, bs);
 			if (e) return e;
 		}
-		if (ptr->bitrate) {
-			e = gf_isom_box_write((GF_Box *) ptr->bitrate, bs);
-			if (e) return e;
-		}
 		if (ptr->descr)	{
 			e = gf_isom_box_write((GF_Box *) ptr->descr, bs);
 			if (e) return e;
@@ -3885,11 +3897,6 @@
 			if (e) return e;
 			ptr->size += ptr->ipod_ext->size;
 		}
-		if (ptr->bitrate) {
-			e = gf_isom_box_size((GF_Box *) ptr->bitrate);
-			if (e) return e;
-			ptr->size += ptr->bitrate->size;
-		}
 		if (ptr->descr) {
 			e = gf_isom_box_size((GF_Box *) ptr->descr);
 			if (e) return e;
@@ -4109,6 +4116,7 @@
 	ptr->selectionDuration = gf_bs_read_u32(bs);
 	ptr->currentTime = gf_bs_read_u32(bs);
 	ptr->nextTrackID = gf_bs_read_u32(bs);
+	ptr->original_duration = ptr->duration;
 	return GF_OK;
 }
 
@@ -4688,6 +4696,9 @@
 	if (!ptr->SyncSample)
 		ptr->no_sync_found = 1;
 
+	ptr->nb_sgpd_in_stbl = gf_list_count(ptr->sampleGroupsDescription);
+	ptr->nb_other_boxes_in_stbl = gf_list_count(ptr->other_boxes);
+
 	return GF_OK;
 }
 
@@ -5771,6 +5782,9 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] more than one sample at the end of the track with sample_delta=0 - forbidden ! Fixing to 1\n" ));
 				ptr->entries[i].sampleDelta = 1;
 			}
+		} else if ((s32) ptr->entries[i].sampleDelta < 0) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] stts entry %d has negative duration %d - forbidden ! Fixing to 1, sync may get lost (consider reimport raw media)\n", i, (s32) ptr->entries[i].sampleDelta ));
+			ptr->entries[i].sampleDelta = 1;
 		}
 	}
 	//remove the last sample delta.
@@ -6197,10 +6211,11 @@
 			a->size = s;
 		}
 		if (ptr->size<a->size) {
-			gf_isom_box_del(a);
-			return GF_ISOM_INVALID_FILE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is larger than container box\n", gf_4cc_to_str(a->type)));
+			ptr->size = 0;
+		} else {
+			ptr->size -= a->size;
 		}
-		ptr->size -= a->size;
 		e = traf_AddBox((GF_Box*)ptr, a);
 		if (e) return e;
 	}
@@ -6356,12 +6371,14 @@
 static void gf_isom_check_sample_desc(GF_TrackBox *trak)
 {
 	GF_BitStream *bs;
-	GF_GenericVisualSampleEntryBox *genv;
-	GF_GenericAudioSampleEntryBox *gena;
-	GF_GenericSampleEntryBox *genm;
 	GF_UnknownBox *a;
 	u32 i;
 
+	if (!trak->Media || !trak->Media->information) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no media box !\n" ));
+		return;
+	}
+
 	if (!trak->Media->information->sampleTable->SampleDescription) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample description box !\n" ));
 		trak->Media->information->sampleTable->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSD);
@@ -6413,66 +6430,128 @@
 		default:
 			break;
 		}
+		if (!a->data || (a->dataSize<8) ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Sample description %s does not have at least 8 bytes!\n", gf_4cc_to_str(a->type) ));
+			continue;
+		}
+
 		/*only process visual or audio*/
 		switch (trak->Media->handler->handlerType) {
 		case GF_ISOM_MEDIA_VISUAL:
+		{
+			GF_GenericVisualSampleEntryBox *genv;
 			/*remove entry*/
 			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
 			genv = (GF_GenericVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRV);
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
-			genv->size = a->size;
+			genv->size = a->size-8;
 			gf_isom_video_sample_entry_read((GF_VisualSampleEntryBox *) genv, bs);
-			genv->data_size = (u32) gf_bs_available(bs);
-			if (genv->data_size) {
-				genv->data = (char*)gf_malloc(sizeof(char) * genv->data_size);
-				gf_bs_read_data(bs, genv->data, genv->data_size);
+
+			if (gf_bs_available(bs)) {
+				u64 pos = gf_bs_get_position(bs);
+				//try to parse as boxes
+				GF_Err e = gf_isom_read_box_list((GF_Box *) genv, bs, mp4v_AddBox);
+				if (e) {
+					gf_bs_seek(bs, pos);
+					genv->data_size = (u32) gf_bs_available(bs);
+					if (genv->data_size) {
+						genv->data = a->data;
+						a->data = NULL;
+						memmove(genv->data, genv->data + pos, genv->data_size);
+					}
+				} else {
+					genv->data_size = 0;
+				}
 			}
 			gf_bs_del(bs);
-			genv->size = a->size;
+			if (!genv->data_size && genv->data) {
+				gf_free(genv->data);
+				genv->data = NULL;
+			}
+
+			genv->size = 0;
 			genv->EntryType = a->type;
 			gf_isom_box_del((GF_Box *)a);
 			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genv, i-1);
-			break;
+		}
+		break;
 		case GF_ISOM_MEDIA_AUDIO:
+		{
+			GF_GenericAudioSampleEntryBox *gena;
 			/*remove entry*/
 			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
 			gena = (GF_GenericAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRA);
-			gena->size = a->size;
+			gena->size = a->size-8;
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
 			gf_isom_audio_sample_entry_read((GF_AudioSampleEntryBox *) gena, bs);
-			gena->data_size = (u32) gf_bs_available(bs);
-			if (gena->data_size) {
-				gena->data = (char*)gf_malloc(sizeof(char) * gena->data_size);
-				gf_bs_read_data(bs, gena->data, gena->data_size);
+
+			if (gf_bs_available(bs)) {
+				u64 pos = gf_bs_get_position(bs);
+				//try to parse as boxes
+				GF_Err e = gf_isom_read_box_list((GF_Box *) gena, bs, mp4a_AddBox);
+				if (e) {
+					gf_bs_seek(bs, pos);
+					gena->data_size = (u32) gf_bs_available(bs);
+					if (gena->data_size) {
+						gena->data = a->data;
+						a->data = NULL;
+						memmove(gena->data, gena->data + pos, gena->data_size);
+					}
+				} else {
+					gena->data_size = 0;
+				}
 			}
 			gf_bs_del(bs);
-			gena->size = a->size;
+			if (!gena->data_size && gena->data) {
+				gf_free(gena->data);
+				gena->data = NULL;
+			}
+			gena->size = 0;
 			gena->EntryType = a->type;
 			gf_isom_box_del((GF_Box *)a);
 			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, gena, i-1);
-			break;
+		}
+		break;
 
 		default:
+		{
+			GF_GenericSampleEntryBox *genm;
 			/*remove entry*/
-			if (a->data && a->size) {
-				gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
-				genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
-				genm->size = a->size;
-				bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
-				gf_bs_read_data(bs, genm->reserved, 6);
-				genm->dataReferenceIndex = gf_bs_read_u16(bs);
-				genm->data_size = (u32) gf_bs_available(bs);
-				if (genm->data_size) {
-					genm->data = (char*)gf_malloc(sizeof(char) * genm->data_size);
-					gf_bs_read_data(bs, genm->data, genm->data_size);
+			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
+			genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
+			genm->size = a->size-8;
+			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
+			gf_bs_read_data(bs, genm->reserved, 6);
+			genm->dataReferenceIndex = gf_bs_read_u16(bs);
+
+			if (gf_bs_available(bs)) {
+				u64 pos = gf_bs_get_position(bs);
+				//try to parse as boxes
+				GF_Err e = gf_isom_read_box_list((GF_Box *) genm, bs, mp4s_AddBox);
+				if (e) {
+					gf_bs_seek(bs, pos);
+					genm->data_size = (u32) gf_bs_available(bs);
+					if (genm->data_size) {
+						genm->data = a->data;
+						a->data = NULL;
+						memmove(genm->data, genm->data + pos, genm->data_size);
+					}
+				} else {
+					genm->data_size = 0;
 				}
-				gf_bs_del(bs);
-				genm->size = a->size;
-				genm->EntryType = a->type;
-				gf_isom_box_del((GF_Box *)a);
-				gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
 			}
-			break;
+			gf_bs_del(bs);
+			if (!genm->data_size && genm->data) {
+				gf_free(genm->data);
+				genm->data = NULL;
+			}
+			genm->size = 0;
+
+			genm->EntryType = a->type;
+			gf_isom_box_del((GF_Box *)a);
+			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
+		}
+		break;
 		}
 
 	}
@@ -7532,9 +7611,10 @@
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 
 	if (ptr->content_encoding) gf_free(ptr->content_encoding);
-	if (ptr->mime_type_or_namespace) gf_free(ptr->mime_type_or_namespace);
+	if (ptr->xml_namespace) gf_free(ptr->xml_namespace);
 	if (ptr->xml_schema_loc) gf_free(ptr->xml_schema_loc);
-	if (ptr->bitrate) gf_isom_box_del((GF_Box *) ptr->bitrate);
+	if (ptr->mime_type) gf_free(ptr->mime_type);
+	if (ptr->config) gf_isom_box_del((GF_Box *)ptr->config);
 	gf_free(ptr);
 }
 
@@ -7546,9 +7626,10 @@
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
 		break;
-	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->bitrate = (GF_MPEG4BitRateBox *)a;
+	case GF_ISOM_BOX_TYPE_TXTC:
+		//we allow the config box on metx
+		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->config = (GF_TextConfigBox *)a;
 		break;
 	default:
 		return gf_isom_box_add_default(s, a);
@@ -7577,7 +7658,13 @@
 			break;
 		i++;
 	}
-	if (i) ptr->content_encoding = gf_strdup(str);
+	if (i) {
+		if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
+			ptr->xml_namespace = gf_strdup(str);
+		} else {
+			ptr->content_encoding = gf_strdup(str);
+		}
+	}
 
 	i=0;
 	while (size) {
@@ -7587,9 +7674,15 @@
 			break;
 		i++;
 	}
-	if (i) ptr->mime_type_or_namespace = gf_strdup(str);
+	if ((ptr->type==GF_ISOM_BOX_TYPE_METX) || (ptr->type==GF_ISOM_BOX_TYPE_STPP)) {
+		if (i) {
+			if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
+				ptr->xml_schema_loc = gf_strdup(str);
+			} else {
+				ptr->xml_namespace = gf_strdup(str);
+			}
+		}
 
-	if (ptr->type==GF_ISOM_BOX_TYPE_METX) {
 		i=0;
 		while (size) {
 			str[i] = gf_bs_read_u8(bs);
@@ -7598,7 +7691,17 @@
 				break;
 			i++;
 		}
-		if (i) ptr->xml_schema_loc = gf_strdup(str);
+		if (i) {
+			if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
+				ptr->mime_type = gf_strdup(str);
+			} else {
+				ptr->xml_schema_loc = gf_strdup(str);
+			}
+		}
+	}
+	//mett, sbtt, stxt, stpp
+	else {
+		if (i) ptr->mime_type = gf_strdup(str);
 	}
 	ptr->size = size;
 	gf_free(str);
@@ -7617,24 +7720,41 @@
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
 
-	if (ptr->content_encoding)
-		gf_bs_write_data(bs, ptr->content_encoding, (u32) strlen(ptr->content_encoding));
-	gf_bs_write_u8(bs, 0);
+	if (ptr->type!=GF_ISOM_BOX_TYPE_STPP) {
+		if (ptr->content_encoding)
+			gf_bs_write_data(bs, ptr->content_encoding, (u32) strlen(ptr->content_encoding));
+		gf_bs_write_u8(bs, 0);
+	}
 
-	if (ptr->mime_type_or_namespace)
-		gf_bs_write_data(bs, ptr->mime_type_or_namespace, (u32) strlen(ptr->mime_type_or_namespace));
-	gf_bs_write_u8(bs, 0);
+	if ((ptr->type==GF_ISOM_BOX_TYPE_METX) || (ptr->type==GF_ISOM_BOX_TYPE_STPP)) {
+		if (ptr->xml_namespace)
+			gf_bs_write_data(bs, ptr->xml_namespace, (u32) strlen(ptr->xml_namespace));
+
+		gf_bs_write_u8(bs, 0);
 
-	if (ptr->type == GF_ISOM_BOX_TYPE_METX) {
 		if (ptr->xml_schema_loc)
 			gf_bs_write_data(bs, ptr->xml_schema_loc, (u32) strlen(ptr->xml_schema_loc));
 		gf_bs_write_u8(bs, 0);
+
+		if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
+			if (ptr->mime_type)
+				gf_bs_write_data(bs, ptr->mime_type, (u32) strlen(ptr->mime_type));
+
+			gf_bs_write_u8(bs, 0);
+		}
 	}
+	//mett, sbtt, stxt
+	else {
+		if (ptr->mime_type)
+			gf_bs_write_data(bs, ptr->mime_type, (u32) strlen(ptr->mime_type));
 
-	if (ptr->bitrate) {
-		e = gf_isom_box_write((GF_Box *)ptr->bitrate, bs);
-		if (e) return e;
+		gf_bs_write_u8(bs, 0);
+
+		if (ptr->config) {
+			gf_isom_box_write((GF_Box *)ptr->config, bs);
+		}
 	}
+
 	return gf_isom_box_array_write(s, ptr->protections, bs);
 }
 
@@ -7645,82 +7765,77 @@
 	if (e) return e;
 	ptr->size += 8;
 
-	if (ptr->content_encoding)
-		ptr->size += strlen(ptr->content_encoding);
-	ptr->size++;
-	if (ptr->mime_type_or_namespace)
-		ptr->size += strlen(ptr->mime_type_or_namespace);
-	ptr->size++;
-	if (ptr->type == GF_ISOM_BOX_TYPE_METX) {
+	if (ptr->type!=GF_ISOM_BOX_TYPE_STPP) {
+		if (ptr->content_encoding)
+			ptr->size += strlen(ptr->content_encoding);
+		ptr->size++;
+	}
+
+	if ((ptr->type==GF_ISOM_BOX_TYPE_METX) || (ptr->type==GF_ISOM_BOX_TYPE_STPP)) {
+
+		if (ptr->xml_namespace)
+			ptr->size += strlen(ptr->xml_namespace);
+		ptr->size++;
+
 		if (ptr->xml_schema_loc)
 			ptr->size += strlen(ptr->xml_schema_loc);
 		ptr->size++;
+
+		if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
+			if (ptr->mime_type)
+				ptr->size += strlen(ptr->mime_type);
+			ptr->size++;
+		}
+
 	}
+	//mett, sbtt, stxt
+	else {
+		if (ptr->mime_type)
+			ptr->size += strlen(ptr->mime_type);
+		ptr->size++;
 
-	if (ptr->bitrate) {
-		e = gf_isom_box_size((GF_Box *)ptr->bitrate);
-		if (e) return e;
-		ptr->size += ptr->bitrate->size;
+		if (ptr->config) {
+			e = gf_isom_box_size((GF_Box *)ptr->config);
+			if (e) return e;
+			ptr->size += ptr->config->size;
+		}
 	}
+
 	return gf_isom_box_array_size(s, ptr->protections);
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+
 /* SimpleTextSampleEntry */
-GF_Box *stxt_New()
+GF_Box *txtc_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_SimpleTextSampleEntryBox, GF_ISOM_BOX_TYPE_STXT);
-	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	ISOM_DECL_BOX_ALLOC(GF_TextConfigBox, GF_ISOM_BOX_TYPE_TXTC);
+	gf_isom_full_box_init((GF_Box *)tmp);
 	return (GF_Box *)tmp;
 }
 
 
-void stxt_del(GF_Box *s)
+void txtc_del(GF_Box *s)
 {
-	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)s;
+	GF_TextConfigBox *ptr = (GF_TextConfigBox*)s;
 	if (ptr == NULL) return;
-	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 
-	if (ptr->content_encoding) gf_free(ptr->content_encoding);
-	if (ptr->mime_type) gf_free(ptr->mime_type);
-	if (ptr->bitrate) gf_isom_box_del((GF_Box *)ptr->bitrate);
-	if (ptr->config) gf_isom_box_del((GF_Box *)ptr->config);
+	if (ptr->config) gf_free(ptr->config);
 	gf_free(ptr);
 }
 
-
-GF_Err stxt_AddBox(GF_Box *s, GF_Box *a)
-{
-	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
-	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_STTC:
-		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->config = (GF_StringBox *)a;
-		break;
-	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->bitrate = (GF_MPEG4BitRateBox *)a;
-		break;
-	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(ptr->protections, a);
-		break;
-	default:
-		return gf_isom_box_add_default(s, a);
-	}
-	return GF_OK;
-}
-
-GF_Err stxt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err txtc_Read(GF_Box *s, GF_BitStream *bs)
 {
+	GF_Err e;
 	u32 size, i;
 	char *str;
-	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)s;
+	GF_TextConfigBox *ptr = (GF_TextConfigBox*)s;
 
-	gf_bs_read_data(bs, ptr->reserved, 6);
-	ptr->dataReferenceIndex = gf_bs_read_u16(bs);
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
 
-	size = (u32) ptr->size - 8;
+	size = (u32) ptr->size;
 	str = (char *)gf_malloc(sizeof(char)*size);
 
 	i=0;
@@ -7732,78 +7847,35 @@
 			break;
 		i++;
 	}
-	if (i) ptr->content_encoding = gf_strdup(str);
-
-	i=0;
-	while (size) {
-		str[i] = gf_bs_read_u8(bs);
-		size--;
-		if (!str[i])
-			break;
-		i++;
-	}
-	if (i) ptr->mime_type = gf_strdup(str);
+	if (i) ptr->config = gf_strdup(str);
 
-	ptr->size = size;
-	gf_free(str);
-	return gf_isom_read_box_list(s, bs, stxt_AddBox);
+	return GF_OK;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stxt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err txtc_Write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
-	GF_Err e = gf_isom_box_write_header(s, bs);
+	GF_TextConfigBox *ptr = (GF_TextConfigBox *)s;
+	GF_Err e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 
-	gf_bs_write_data(bs, ptr->reserved, 6);
-	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
-
-	if (ptr->content_encoding)
-		gf_bs_write_data(bs, ptr->content_encoding, (u32) strlen(ptr->content_encoding));
+	if (ptr->config)
+		gf_bs_write_data(bs, ptr->config, (u32) strlen(ptr->config));
 	gf_bs_write_u8(bs, 0);
-
-	if (ptr->mime_type)
-		gf_bs_write_data(bs, ptr->mime_type, (u32) strlen(ptr->mime_type));
-	gf_bs_write_u8(bs, 0);
-
-	if (ptr->bitrate) {
-		e = gf_isom_box_write((GF_Box *)ptr->bitrate, bs);
-		if (e) return e;
-	}
-	if (ptr->config) {
-		e = gf_isom_box_write((GF_Box *)ptr->config, bs);
-		if (e) return e;
-	}
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+	return GF_OK;
 }
 
-GF_Err stxt_Size(GF_Box *s)
+GF_Err txtc_Size(GF_Box *s)
 {
-	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
-	GF_Err e = gf_isom_box_get_size(s);
+	GF_TextConfigBox *ptr = (GF_TextConfigBox *)s;
+	GF_Err e = gf_isom_full_box_get_size(s);
 	if (e) return e;
-	ptr->size += 8;
-
-	if (ptr->content_encoding)
-		ptr->size += strlen(ptr->content_encoding);
-	ptr->size++;
-	if (ptr->mime_type)
-		ptr->size += strlen(ptr->mime_type);
+	if (ptr->config)
+		ptr->size += strlen(ptr->config);
 	ptr->size++;
-	if (ptr->bitrate) {
-		e = gf_isom_box_size((GF_Box *)ptr->bitrate);
-		if (e) return e;
-		ptr->size += ptr->bitrate->size;
-	}
-	if (ptr->config) {
-		e = gf_isom_box_size((GF_Box *)ptr->config);
-		if (e) return e;
-		ptr->size += ptr->config->size;
-	}
-	return gf_isom_box_array_size(s, ptr->protections);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -8047,7 +8119,6 @@
 
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
 	if (ptr->lsr_config) gf_isom_box_del((GF_Box *) ptr->lsr_config);
-	if (ptr->bitrate) gf_isom_box_del((GF_Box *) ptr->bitrate);
 	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
 	gf_free(ptr);
 }
@@ -8060,10 +8131,6 @@
 		if (ptr->lsr_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->lsr_config = (GF_LASERConfigurationBox *)a;
 		break;
-	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->bitrate = (GF_MPEG4BitRateBox *)a;
-		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
 		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
@@ -8111,10 +8178,6 @@
 		e = gf_isom_box_write((GF_Box *)ptr->descr, bs);
 		if (e) return e;
 	}
-	if (ptr->bitrate) {
-		e = gf_isom_box_write((GF_Box *)ptr->bitrate, bs);
-		if (e) return e;
-	}
 	return e;
 }
 
@@ -8130,15 +8193,10 @@
 		if (e) return e;
 		ptr->size += ptr->lsr_config->size;
 	}
-	if (ptr->bitrate) {
-		e = gf_isom_box_size((GF_Box *)ptr->bitrate);
-		if (e) return e;
-		ptr->size += ptr->bitrate->size;
-	}
 	if (ptr->descr) {
-		e = gf_isom_box_size((GF_Box *)ptr->bitrate);
+		e = gf_isom_box_size((GF_Box *)ptr->descr);
 		if (e) return e;
-		ptr->size += ptr->bitrate->size;
+		ptr->size += ptr->descr->size;
 	}
 	return GF_OK;
 }

v0.5.2.tar.gz/src/isomedia/box_code_drm.c -> v0.6.1.tar.gz/src/isomedia/box_code_drm.c Changed

@@ -197,7 +197,7 @@
 	GF_SchemeTypeBox *ptr = (GF_SchemeTypeBox *) s;
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_full_box_write(s, bs);
-	assert(e == GF_OK);
+	if (e) return e;
 	gf_bs_write_u32(bs, ptr->scheme_type);
 	gf_bs_write_u32(bs, ptr->scheme_version);
 	if (ptr->flags & 0x000001) gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI)+1);
@@ -349,9 +349,9 @@
 		ptr->size += ptr->adkm->size;
 	}
 	if (ptr->piff_tenc) {
-		e = gf_isom_box_size((GF_Box *) ptr->tenc);
+		e = gf_isom_box_size((GF_Box *) ptr->piff_tenc);
 		if (e) return e;
-		ptr->size += ptr->tenc->size;
+		ptr->size += ptr->piff_tenc->size;
 	}
 	return GF_OK;
 }
@@ -549,9 +549,9 @@
 	gf_bs_write_u8(bs, ptr->PaddingScheme);
 	gf_bs_write_u64(bs, ptr->PlaintextLength);
 
-	cid_len = ptr->ContentID ? (u32) strlen(ptr->ContentID) : 0;
+	cid_len = ptr->ContentID ? (u16) strlen(ptr->ContentID) : 0;
 	gf_bs_write_u16(bs, cid_len);
-	ri_len = ptr->RightsIssuerURL ? (u32) strlen(ptr->RightsIssuerURL) : 0;
+	ri_len = ptr->RightsIssuerURL ? (u16) strlen(ptr->RightsIssuerURL) : 0;
 	gf_bs_write_u16(bs, ri_len);
 	gf_bs_write_u16(bs, ptr->TextualHeadersLen);
 
@@ -629,7 +629,7 @@
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gid_len = ptr->GroupID ? (u32) strlen(ptr->GroupID) : 0;
+	gid_len = ptr->GroupID ? (u16) strlen(ptr->GroupID) : 0;
 	gf_bs_write_u16(bs, gid_len);
 	gf_bs_write_u8(bs, ptr->GKEncryptionMethod);
 	gf_bs_write_u16(bs, ptr->GKLength);
@@ -1143,15 +1143,18 @@
 
 	pos = gf_bs_get_position(bs);
 	if (pos>0xFFFFFFFFULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] \"senc\" offset larger than 32-bits , cannot store.\n"));
-		return GF_NOT_SUPPORTED;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] \"senc\" offset larger than 32-bits , \"saio\" box version must be 1 .\n"));
 	}
 	e = gf_bs_seek(bs, ptr->cenc_saio->offset_first_offset_field);
 	if (e) return e;
+	//force using version 1 for saio box i.e offset has 64 bits
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (ptr->traf) {
-		gf_bs_write_u32(bs, (u32) ( pos - ptr->traf->moof_start_in_bs) );
-	} else {
-		gf_bs_write_u32(bs, (u32) pos);
+		gf_bs_write_u64(bs, pos - ptr->traf->moof_start_in_bs );
+	} else
+#endif
+	{
+		gf_bs_write_u64(bs, pos);
 	}
 	return gf_bs_seek(bs, pos);
 }
@@ -1312,12 +1315,18 @@
 	if (!ptr->samp_aux_info) ptr->samp_aux_info = gf_list_new();
 	for (i=0; i<count; i++) {
 		u32 is_encrypted;
+		u32 samp_count;
 		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
 		memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
 
-		e = gf_isom_get_sample_cenc_info_ex(trak, traf, (trak ? trak->sample_count_at_seg_start : 0 )+ i+1, &is_encrypted, &sai->IV_size, NULL);
+		samp_count = i+1;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+		if (trak) samp_count += trak->sample_count_at_seg_start;
+#endif
+
+		e = gf_isom_get_sample_cenc_info_ex(trak, traf, samp_count, &is_encrypted, &sai->IV_size, NULL);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", trak->sample_count_at_seg_start + i+1, gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", samp_count, gf_error_to_string(e) ));
 			return e;
 		}
 		if (is_encrypted) {

v0.5.2.tar.gz/src/isomedia/box_code_meta.c -> v0.6.1.tar.gz/src/isomedia/box_code_meta.c Changed

@@ -31,6 +31,7 @@
 {
 	ISOM_DECL_BOX_ALLOC(GF_MetaBox, GF_ISOM_BOX_TYPE_META);
 	gf_isom_full_box_init((GF_Box *)tmp);
+	tmp->other_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
@@ -45,6 +46,7 @@
 	if (ptr->protections) gf_isom_box_del((GF_Box *)ptr->protections);
 	if (ptr->item_infos) gf_isom_box_del((GF_Box *)ptr->item_infos);
 	if (ptr->IPMP_control) gf_isom_box_del((GF_Box *)ptr->IPMP_control);
+	if (ptr->item_props) gf_isom_box_del((GF_Box *)ptr->item_props);
 	gf_free(ptr);
 }
 
@@ -76,6 +78,10 @@
 		if (ptr->item_infos) return GF_ISOM_INVALID_FILE;
 		ptr->item_infos = (GF_ItemInfoBox*)a;
 		break;
+	case GF_ISOM_BOX_TYPE_IPRP:
+		if (ptr->item_props) return GF_ISOM_INVALID_FILE;
+		ptr->item_props = (GF_ItemPropertiesBox*)a;
+		break;
 	//case ???: ptr->IPMP_control = (???*)a; break;
 	case GF_ISOM_BOX_TYPE_XML:
 	case GF_ISOM_BOX_TYPE_BXML:
@@ -134,6 +140,10 @@
 		e = gf_isom_box_write((GF_Box *) ptr->IPMP_control, bs);
 		if (e) return e;
 	}
+	if (ptr->item_props) {
+		e = gf_isom_box_write((GF_Box *) ptr->item_props, bs);
+		if (e) return e;
+	}
 	return GF_OK;
 }
 
@@ -179,6 +189,11 @@
 		if (e) return e;
 		ptr->size += ptr->IPMP_control->size;
 	}
+	if (ptr->item_props) {
+		e = gf_isom_box_size((GF_Box *) ptr->item_props);
+		if (e) return e;
+		ptr->size += ptr->item_props->size;
+	}
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -454,7 +469,7 @@
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_full_box_get_size(s);
 	if (e) return e;
-	ptr->size += 16;
+	ptr->size += 2;
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -614,14 +629,20 @@
 	if (ptr->item_name) {
 		len = (u32) strlen(ptr->item_name)+1;
 		gf_bs_write_data(bs, ptr->item_name, len);
+	} else {
+		gf_bs_write_byte(bs, 0, 1);
 	}
 	if (ptr->content_type) {
 		len = (u32) strlen(ptr->content_type)+1;
 		gf_bs_write_data(bs, ptr->content_type, len);
+	} else {
+		gf_bs_write_byte(bs, 0, 1);
 	}
 	if (ptr->content_encoding) {
 		len = (u32) strlen(ptr->content_encoding)+1;
 		gf_bs_write_data(bs, ptr->content_encoding, len);
+	} else {
+		gf_bs_write_byte(bs, 0, 1);
 	}
 	return GF_OK;
 }
@@ -635,8 +656,11 @@
 	if (e) return e;
 	ptr->size += 4;
 	if (ptr->item_name) ptr->size += strlen(ptr->item_name)+1;
+	else ptr->size += 1;
 	if (ptr->content_type) ptr->size += strlen(ptr->content_type)+1;
+	else ptr->size += 1;
 	if (ptr->content_encoding) ptr->size += strlen(ptr->content_encoding)+1;
+	else ptr->size += 1;
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/

v0.5.2.tar.gz/src/isomedia/box_dump.c -> v0.6.1.tar.gz/src/isomedia/box_dump.c Changed

@@ -26,6 +26,7 @@
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/utf.h>
 #include <gpac/network.h>
+#include <gpac/color.h>
 #include <time.h>
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
@@ -64,6 +65,34 @@
 	}
 }
 
+static void DumpDataString(FILE *trace, char *data, u32 dataLength)
+{
+	u32 i;
+	for (i=0; i<dataLength; i++) {
+		switch ((unsigned char) data[i]) {
+		case '\'':
+			fprintf(trace, "&apos;");
+			break;
+		case '\"':
+			fprintf(trace, "&quot;");
+			break;
+		case '&':
+			fprintf(trace, "&amp;");
+			break;
+		case '>':
+			fprintf(trace, "&gt;");
+			break;
+		case '<':
+			fprintf(trace, "&lt;");
+			break;
+		default:
+			fprintf(trace, "%c", (u8) data[i]);
+			break;
+		}
+	}
+}
+
+
 GF_Err DumpBox(GF_Box *a, FILE * trace)
 {
 	if (a->size > 0xFFFFFFFF) {
@@ -507,9 +536,11 @@
 		}
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_STXT:
-		return stxt_dump(a, trace);
+		return metx_dump(a, trace);
+
+	case GF_ISOM_BOX_TYPE_TXTC:
+		return txtc_dump(a, trace);
 
-	case GF_ISOM_BOX_TYPE_STTC:
 	case GF_ISOM_BOX_TYPE_VTTC:
 	case GF_ISOM_BOX_TYPE_CTIM:
 	case GF_ISOM_BOX_TYPE_IDEN:
@@ -525,7 +556,7 @@
 		return wvtt_dump(a, trace);
 
 	case GF_ISOM_BOX_TYPE_STPP:
-		return stpp_dump(a, trace);
+		return metx_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_SBTT:
 		return metx_dump(a, trace);
 #endif
@@ -546,6 +577,24 @@
 	case GF_ISOM_BOX_TYPE_FLXS:
 		return flxs_dump(a, trace);
 
+	/* Image File Format */
+	case GF_ISOM_BOX_TYPE_ISPE:
+		return ispe_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_COLR:
+		return colr_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_PIXI:
+		return pixi_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_RLOC:
+		return rloc_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_IROT:
+		return irot_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_IPCO:
+		return ipco_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_IPRP:
+		return iprp_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_IPMA:
+		return ipma_dump(a, trace);
+
 	default:
 		return defa_dump(a, trace);
 	}
@@ -1012,7 +1061,7 @@
 
 	if (p->descriptor) {
 #ifndef GPAC_DISABLE_OD_DUMP
-		gf_odf_dump_desc(p->descriptor, trace, 1, 1);
+		gf_odf_dump_desc(p->descriptor, trace, 1, GF_TRUE);
 #else
 		fprintf(trace, "\n");
 #endif
@@ -1092,7 +1141,6 @@
 		if (p->avc_config) gf_box_dump(p->avc_config, trace);
 		if (p->ipod_ext) gf_box_dump(p->ipod_ext, trace);
 		if (p->descr) gf_box_dump(p->descr, trace);
-		if (p->bitrate) gf_box_dump(p->bitrate, trace);
 		if (p->svc_config) gf_box_dump(p->svc_config, trace);
 		if (p->shvc_config) gf_box_dump(p->shvc_config, trace);
 	}
@@ -1525,7 +1573,7 @@
 
 	if (p->desc) {
 #ifndef GPAC_DISABLE_OD_DUMP
-		gf_odf_dump_desc(p->desc, trace, 1, 1);
+		gf_odf_dump_desc(p->desc, trace, 1, GF_TRUE);
 #else
 		fprintf(trace, "\n");
 #endif
@@ -1885,7 +1933,7 @@
 	count = gf_list_count(p->config->param_array);
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
-		GF_HEVCParamArray *ar = gf_list_get(p->config->param_array, i);
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(p->config->param_array, i);
 		fprintf(trace, "<ParameterSetArray nalu_type=\"%d\" complete_set=\"%d\">\n", ar->type, ar->array_completeness);
 		nalucount = gf_list_count(ar->nalus);
 		for (j=0; j<nalucount; j++) {
@@ -1915,7 +1963,7 @@
 	i=0;
 	while ((desc = (GF_Descriptor *)gf_list_enum(p->descriptors, &i))) {
 #ifndef GPAC_DISABLE_OD_DUMP
-		gf_odf_dump_desc(desc, trace, 1, 1);
+		gf_odf_dump_desc(desc, trace, 1, GF_TRUE);
 #else
 		fprintf(trace, "\n");
 #endif
@@ -1927,10 +1975,10 @@
 
 GF_Err btrt_dump(GF_Box *a, FILE * trace)
 {
-	GF_MPEG4BitRateBox *p = (GF_MPEG4BitRateBox*)a;
-	fprintf(trace, "<MPEG4BitRateBox BufferSizeDB=\"%d\" avgBitRate=\"%d\" maxBitRate=\"%d\">\n", p->bufferSizeDB, p->avgBitrate, p->maxBitrate);
+	GF_BitRateBox *p = (GF_BitRateBox*)a;
+	fprintf(trace, "<BitRateBox BufferSizeDB=\"%d\" avgBitRate=\"%d\" maxBitRate=\"%d\">\n", p->bufferSizeDB, p->avgBitrate, p->maxBitrate);
 	DumpBox(a, trace);
-	gf_box_dump_done("MPEG4BitRateBox", a, trace);
+	gf_box_dump_done("BitRateBox", a, trace);
 	return GF_OK;
 }
 
@@ -2113,6 +2161,7 @@
 	if (p->protections) gf_box_dump(p->protections, trace);
 	if (p->item_infos) gf_box_dump(p->item_infos, trace);
 	if (p->IPMP_control) gf_box_dump(p->IPMP_control, trace);
+	if (p->item_props) gf_box_dump(p->item_props, trace);
 	gf_box_dump_done("MetaBox", a, trace);
 	return GF_OK;
 }
@@ -2952,13 +3001,13 @@
 			fprintf(dump, " verticalText=\"%s\"", (txt->displayFlags & GF_TXT_VERTICAL) ? "yes" : "no");
 			fprintf(dump, " fillTextRegion=\"%s\"", (txt->displayFlags & GF_TXT_FILL_REGION) ? "yes" : "no");
 			fprintf(dump, " continuousKaraoke=\"%s\"", (txt->displayFlags & GF_TXT_KARAOKE) ? "yes" : "no");
-			has_scroll = 0;
+			has_scroll = GF_FALSE;
 			if (txt->displayFlags & GF_TXT_SCROLL_IN) {
-				has_scroll = 1;
+				has_scroll = GF_TRUE;
 				if (txt->displayFlags & GF_TXT_SCROLL_OUT) fprintf(dump, " scroll=\"InOut\"");
 				else fprintf(dump, " scroll=\"In\"");
 			} else if (txt->displayFlags & GF_TXT_SCROLL_OUT) {
-				has_scroll = 1;
+				has_scroll = GF_TRUE;
 				fprintf(dump, " scroll=\"Out\"");
 			} else {
 				fprintf(dump, " scroll=\"None\"");
@@ -3048,7 +3097,7 @@
 		GF_ISOSample *s = gf_isom_get_sample(the_file, track, i+1, &di);
 		if (!s) continue;
 
-		fprintf(dump, "<TextSample sampleTime=\"%s\"", ttd_format_time(s->DTS, trak->Media->mediaHeader->timeScale, szDur, 0));
+		fprintf(dump, "<TextSample sampleTime=\"%s\"", ttd_format_time(s->DTS, trak->Media->mediaHeader->timeScale, szDur, GF_FALSE));
 		if (nb_descs>1) fprintf(dump, " sampleDescriptionIndex=\"%d\"", di);
 
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
@@ -3203,7 +3252,7 @@
 		gf_set_progress("TTXT Extract", i, count);
 	}
 	if (last_DTS < trak->Media->mediaHeader->duration) {
-		fprintf(dump, "<TextSample sampleTime=\"%s\" text=\"\" />\n", ttd_format_time(trak->Media->mediaHeader->duration, trak->Media->mediaHeader->timeScale, szDur, 0));
+		fprintf(dump, "<TextSample sampleTime=\"%s\" text=\"\" />\n", ttd_format_time(trak->Media->mediaHeader->duration, trak->Media->mediaHeader->timeScale, szDur, GF_FALSE));
 	}
 
 	fprintf(dump, "</TextStream>\n");
@@ -3255,9 +3304,9 @@
 		}
 		cur_frame++;
 		fprintf(dump, "%d\n", cur_frame);
-		ttd_format_time(start, ts, szDur, 1);
+		ttd_format_time(start, ts, szDur, GF_TRUE);
 		fprintf(dump, "%s --> ", szDur);
-		ttd_format_time(end, ts, szDur, 1);
+		ttd_format_time(end, ts, szDur, GF_TRUE);
 		fprintf(dump, "%s\n", szDur);
 
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
@@ -3269,7 +3318,7 @@
 		if (!txt->len) {
 			fprintf(dump, "\n");
 		} else {
-			u32 styles, char_num, new_styles;
+			u32 styles, char_num, new_styles, color, new_color;
 			u16 utf16Line[10000];
 
 			/*UTF16*/
@@ -3287,17 +3336,21 @@
 			char_num = 0;
 			styles = 0;
 			new_styles = txtd->default_style.style_flags;
+			color = new_color = txtd->default_style.text_color;
+
 			for (j=0; j<len; j++) {
 				Bool is_new_line;
 
 				if (txt->styles) {
 					new_styles = txtd->default_style.style_flags;
+					new_color = txtd->default_style.text_color;
 					for (k=0; k<txt->styles->entry_count; k++) {
 						if (txt->styles->styles[k].startCharOffset>char_num) continue;
 						if (txt->styles->styles[k].endCharOffset<char_num+1) continue;
 
 						if (txt->styles->styles[k].style_flags & (GF_TXT_STYLE_ITALIC | GF_TXT_STYLE_BOLD | GF_TXT_STYLE_UNDERLINED)) {
 							new_styles = txt->styles->styles[k].style_flags;
+							new_color = txt->styles->styles[k].text_color;
 							break;
 						}
 					}
@@ -3307,19 +3360,27 @@
 					if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "");
 					if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "");
 
-					if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "");
-					if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "");
 					if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "");
+					if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "");
+					if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "");
 
 					styles = new_styles;
 				}
+				if (new_color != color) {
+					if (new_color ==txtd->default_style.text_color) {
+						fprintf(dump, "");
+					} else {
+						fprintf(dump, "", gf_color_get_name(new_color) );
+					}
+					color = new_color;
+				}
 
 				/*not sure if styles must be reseted at line breaks in srt...*/
-				is_new_line = 0;
+				is_new_line = GF_FALSE;
 				if ((utf16Line[j]=='\n') || (utf16Line[j]=='\r') ) {
 					if ((utf16Line[j]=='\r') && (utf16Line[j+1]=='\n')) j++;
 					fprintf(dump, "\n");
-					is_new_line = 1;
+					is_new_line = GF_TRUE;
 				}
 
 				if (!is_new_line) {
@@ -3338,15 +3399,16 @@
 			}
 			new_styles = 0;
 			if (new_styles != styles) {
-				if ((new_styles & GF_TXT_STYLE_BOLD) && !(styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "");
-				if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "");
-				if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "");
-
-				if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "");
-				if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "");
-				if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "");
+				if (styles & GF_TXT_STYLE_UNDERLINED) fprintf(dump, "");
+				if (styles & GF_TXT_STYLE_ITALIC) fprintf(dump, "");
+				if (styles & GF_TXT_STYLE_BOLD) fprintf(dump, "");
+
+				styles = 0;
+			}
 
-				styles = new_styles;
+			if (color != txtd->default_style.text_color) {
+				fprintf(dump, "");
+				color = txtd->default_style.text_color;
 			}
 			fprintf(dump, "\n");
 		}
@@ -3379,7 +3441,7 @@
 
 	strcpy(nhmlFileName, the_file->fileName);
 	strcat(nhmlFileName, ".nhml");
-	nhmlFile = gf_f64_open(nhmlFileName, "wt");
+	nhmlFile = gf_fopen(nhmlFileName, "wt");
 	fprintf(nhmlFile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 	fprintf(nhmlFile, "<NHNTStream streamType=\"3\" objectTypeIndication=\"10\" timeScale=\"%d\" baseMediaFile=\"file.svg\" inRootOD=\"yes\">\n", trak->Media->mediaHeader->timeScale);
 	fprintf(nhmlFile, "<NHNTSample isRAP=\"yes\" DTS=\"0\" xmlFrom=\"doc.start\" xmlTo=\"text_1.start\"/>\n");
@@ -3438,7 +3500,7 @@
 	fprintf(dump, "</svg>\n");
 
 	fprintf(nhmlFile, "</NHNTStream>\n");
-	fclose(nhmlFile);
+	gf_fclose(nhmlFile);
 
 	if (count) gf_set_progress("SRT Extract", i, count);
 	return GF_OK;
@@ -3621,7 +3683,7 @@
 {
 	GF_BitStream *bs;
 	u32 val;
-	Bool no_dump = 0;
+	Bool no_dump = GF_FALSE;
 	char *name = "Unknown";
 	GF_ListItemBox *itune = (GF_ListItemBox *)a;
 	switch (itune->type) {
@@ -3682,11 +3744,11 @@
 		break;
 	case GF_ISOM_BOX_TYPE_COVR:
 		name = "CoverArt";
-		no_dump = 1;
+		no_dump = GF_TRUE;
 		break;
 	case GF_ISOM_BOX_TYPE_iTunesSpecificInfo:
 		name = "iTunesSpecific";
-		no_dump = 1;
+		no_dump = GF_TRUE;
 		break;
 	case GF_ISOM_BOX_TYPE_0xA9GRP:
 		name = "Group";
@@ -3723,19 +3785,19 @@
 			break;
 		default:
 			if (strcmp(name, "Unknown") && itune->data->data) {
+				fprintf(trace, " value=\"");
 				if (itune->data && itune->data->data[0]) {
-					fprintf(trace, " value=\"%s\" ", itune->data->data);
+					DumpDataString(trace, itune->data->data, itune->data->dataSize);
 				} else {
-					fprintf(trace, " value=\"");
 					DumpData(trace, itune->data->data, itune->data->dataSize);
-					fprintf(trace, "\" ");
 				}
+				fprintf(trace, "\" ");
 			}
 			break;
 		}
 	}
 	fprintf(trace, ">\n");
-	if (itune->data)
+	if (strcmp(name, "Unknown") && itune->data)
 		gf_full_box_dump((GF_Box *)itune->data, trace);
 	DumpBox(a, trace);
 	gf_box_dump_done(NULL, a, trace);
@@ -3864,7 +3926,7 @@
 	DumpBox(a, trace);
 
 	i=0;
-	while ( (tag = gf_list_enum(ptr->other_boxes, &i))) {
+	while ( (tag = (GF_Box*)gf_list_enum(ptr->other_boxes, &i))) {
 		e = apple_tag_dump(tag, trace);
 		if(e) return e;
 	}
@@ -3995,20 +4057,51 @@
 GF_Err metx_dump(GF_Box *a, FILE * trace)
 {
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox*)a;
-	const char *name = (ptr->type==GF_ISOM_BOX_TYPE_METX) ? "XMLMetaDataSampleEntryBox" : "TextMetaDataSampleEntryBox";
+	const char *name;
+	switch (ptr->type) {
+	case GF_ISOM_BOX_TYPE_METX:
+		name = "XMLMetaDataSampleEntryBox";
+		break;
+	case GF_ISOM_BOX_TYPE_METT:
+		name = "TextMetaDataSampleEntryBox";
+		break;
+	case GF_ISOM_BOX_TYPE_SBTT:
+		name = "SubtitleSampleEntryBox";
+		break;
+	case GF_ISOM_BOX_TYPE_STXT:
+		name = "SimpleTextSampleEntryBox";
+		break;
+	case GF_ISOM_BOX_TYPE_STPP:
+		name = "XMLSubtitleSampleEntryBox";
+		break;
+	default:
+		name = "UnknownTextSampleEntryBox";
+		break;
+	}
 
 	fprintf(trace, "<%s ", name);
+
 	if (ptr->type==GF_ISOM_BOX_TYPE_METX) {
-		fprintf(trace, "namespace=\"%s\" ", ptr->mime_type_or_namespace);
+		fprintf(trace, "namespace=\"%s\" ", ptr->xml_namespace);
 		if (ptr->xml_schema_loc) fprintf(trace, "schema_location=\"%s\" ", ptr->xml_schema_loc);
-	} else {
-		fprintf(trace, "mime_type=\"%s\" ", ptr->mime_type_or_namespace);
+		if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
+
+	} else if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
+		fprintf(trace, "namespace=\"%s\" ", ptr->xml_namespace);
+		if (ptr->xml_schema_loc) fprintf(trace, "schema_location=\"%s\" ", ptr->xml_schema_loc);
+		if (ptr->mime_type) fprintf(trace, "auxiliary_mime_types=\"%s\" ", ptr->mime_type);
+	}
+	//mett, sbtt, stxt
+	else {
+		fprintf(trace, "mime_type=\"%s\" ", ptr->mime_type);
+		if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
 	}
-	if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
 
-	if (ptr->bitrate) gf_box_dump(ptr->bitrate, trace);
+	if ((ptr->type!=GF_ISOM_BOX_TYPE_METX) && (ptr->type!=GF_ISOM_BOX_TYPE_STPP) ) {
+		if (ptr->config) gf_box_dump(ptr->config, trace);
+	}
 	gf_box_array_dump(ptr->protections, trace);
 
 	gf_box_dump_done(NULL, a, trace);
@@ -4016,19 +4109,15 @@
 	return GF_OK;
 }
 
-GF_Err stxt_dump(GF_Box *a, FILE * trace)
+GF_Err txtc_dump(GF_Box *a, FILE * trace)
 {
-	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)a;
-	const char *name = "SimpleTextSampleEntryBox";
+	GF_TextConfigBox *ptr = (GF_TextConfigBox*)a;
+	const char *name = "TextConfigBox";
 
-	fprintf(trace, "<%s ", name);
-	fprintf(trace, "mime_type=\"%s\" ", ptr->mime_type);
-	if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
-	fprintf(trace, ">\n");
+	fprintf(trace, "<%s>", name);
 	DumpBox(a, trace);
 
-	if (ptr->bitrate) gf_box_dump(ptr->bitrate, trace);
-	if (ptr->config) gf_box_dump(ptr->config, trace);
+	if (ptr->config) fprintf(trace, "%s", ptr->config);
 
 	gf_box_dump_done(NULL, a, trace);
 	fprintf(trace, "</%s>\n", name);
@@ -4043,7 +4132,6 @@
 	DumpBox(a, trace);
 	if (p->config) gf_box_dump(p->config, trace);
 	if (p->scripts) gf_box_dump(p->scripts, trace);
-	if (p->bitrate) gf_box_dump(p->bitrate, trace);
 	gf_box_array_dump(p->protections, trace);
 	gf_box_dump_done("DIMSSampleEntryBox", a, trace);
 	return GF_OK;
@@ -4132,7 +4220,6 @@
 	fprintf(trace, "<LASeRSampleEntryBox DataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
 	DumpBox(a, trace);
 	if (p->lsr_config) gf_box_dump(p->lsr_config, trace);
-	if (p->bitrate) gf_box_dump(p->bitrate, trace);
 	if (p->descr) gf_box_dump(p->descr, trace);
 	gf_box_dump_done("LASeRSampleEntryBox", a, trace);
 	return GF_OK;
@@ -4504,11 +4591,14 @@
 
 GF_Err prft_dump(GF_Box *a, FILE * trace)
 {
+	Double fracs;
 	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox *) a;
-
 	time_t secs = (ptr->ntp >> 32) - GF_NTP_SEC_1900_TO_1970;
 	struct tm t = *gmtime(&secs);
-	fprintf(trace, "<ProducerReferenceTimeBox referenceTrackID=\"%d\" timestamp=\""LLU"\" NTP_frac=\"%d\" UTCClock=\"%d-%02d-%02dT%02d:%02d:%02dZ\">\n", ptr->refTrackID, ptr->timestamp, (u32) (ptr->ntp&0xFFFFFFFFULL), 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, (u32) t.tm_sec);
+	fracs = (Double) (ptr->ntp & 0xFFFFFFFFULL);
+	fracs /= 0xFFFFFFFF;
+	fracs *= 1000;
+	fprintf(trace, "<ProducerReferenceTimeBox referenceTrackID=\"%d\" timestamp=\""LLU"\" NTP=\""LLU"\" UTC=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\">\n", ptr->refTrackID, ptr->timestamp, ptr->ntp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, (u32) t.tm_sec, (u32) fracs);
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
 	gf_box_dump_done("ProducerReferenceTimeBox", a, trace);
@@ -4600,4 +4690,108 @@
 	return GF_OK;
 }
 
+/* Image File Format dump */
+GF_Err ispe_dump(GF_Box *a, FILE * trace)
+{
+	GF_ImageSpatialExtentsPropertyBox *ptr = (GF_ImageSpatialExtentsPropertyBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<ImageSpatialExtentsPropertyBox image_width=\"%d\" image_height=\"%d\">\n", ptr->image_width, ptr->image_height);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("ImageSpatialExtentsPropertyBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err colr_dump(GF_Box *a, FILE * trace)
+{
+	GF_ColourInformationBox *ptr = (GF_ColourInformationBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<ColourInformationBox colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\" full_range_flag=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients, ptr->full_range_flag);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("ColourInformationBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err pixi_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_PixelInformationPropertyBox *ptr = (GF_PixelInformationPropertyBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<PixelInformationPropertyBox num_channels=\"%d\" bits_per_channel=\"", ptr->num_channels);
+	for (i = 0; i < ptr->num_channels; i++) {
+		if (i != 0) fprintf(trace, ", ");
+		fprintf(trace, "%d", ptr->bits_per_channel[i]);
+	}
+	fprintf(trace, "\">\n");
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("PixelInformationPropertyBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err rloc_dump(GF_Box *a, FILE * trace)
+{
+	GF_RelativeLocationPropertyBox *ptr = (GF_RelativeLocationPropertyBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<RelativeLocationPropertyBox horizontal_offset=\"%d\" vertical_offset=\"%d\">\n", ptr->horizontal_offset, ptr->vertical_offset);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("RelativeLocationPropertyBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err irot_dump(GF_Box *a, FILE * trace)
+{
+	GF_ImageRotationBox *ptr = (GF_ImageRotationBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<ImageRotationBox angle=\"%d\">\n", (ptr->angle*90));
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("ImageRotationBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err ipco_dump(GF_Box *a, FILE * trace)
+{
+	fprintf(trace, "<ItemPropertyContainerBox>\n");
+	DumpBox(a, trace);
+	gf_box_dump_done("ItemPropertyContainerBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err iprp_dump(GF_Box *a, FILE * trace)
+{
+	GF_ItemPropertiesBox *ptr = (GF_ItemPropertiesBox *)a;
+	fprintf(trace, "<ItemPropertiesBox>\n");
+	DumpBox(a, trace);
+	if (ptr->property_container) gf_box_dump(ptr->property_container, trace);
+	gf_box_dump_done("ItemPropertiesBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err ipma_dump(GF_Box *a, FILE * trace)
+{
+	u32 i, j;
+	GF_ItemPropertyAssociationBox *ptr = (GF_ItemPropertyAssociationBox *)a;
+	u32 entry_count = gf_list_count(ptr->entries);
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<ItemPropertyAssociationBox entry_count=\"%d\">\n", entry_count);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	for (i = 0; i < entry_count; i++) {
+		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ptr->entries, i);
+		u32 association_count = gf_list_count(entry->essential);
+		fprintf(trace, "<AssociationEntry item_ID=\"%d\" association_count=\"%d\">\n", entry->item_id, association_count);
+		for (j = 0; j < association_count; j++) {
+			Bool *ess = (Bool *)gf_list_get(entry->essential, j);
+			u32 *prop_index = (u32 *)gf_list_get(entry->property_index, j);
+			fprintf(trace, "<Property index=\"%d\" essential=\"%d\"/>\n", *prop_index, *ess);
+		}
+		fprintf(trace, "</AssociationEntry>\n");
+	}
+	gf_box_dump_done("ItemPropertyAssociationBox", a, trace);
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM_DUMP*/

v0.5.2.tar.gz/src/isomedia/box_funcs.c -> v0.6.1.tar.gz/src/isomedia/box_funcs.c Changed

@@ -41,7 +41,7 @@
 		return GF_ISOM_INCOMPLETE_FILE;
 	}
 	start = gf_bs_get_position(bs);
-	ret = gf_isom_parse_box(outBox, bs);
+	ret = gf_isom_parse_box_ex(outBox, bs, 0, GF_TRUE);
 	if (ret == GF_ISOM_INCOMPLETE_FILE) {
 		*bytesExpected = (*outBox)->size;
 		GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box %s\n", gf_4cc_to_str( (*outBox)->type) ));
@@ -75,7 +75,7 @@
 }
 
 
-GF_Err gf_isom_parse_box_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type)
+GF_Err gf_isom_parse_box_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box)
 {
 	u32 type, uuid_type, hdr_size;
 	u64 size, start, end;
@@ -96,25 +96,18 @@
 		size = 4;
 		type = GF_ISOM_BOX_TYPE_VOID;
 	} else {
-		/*now here's a bad thing: some files use size 0 for void atoms, some for "till end of file" indictaion..*/
+		type = gf_bs_read_u32(bs);
+		hdr_size += 4;
+		/*no size means till end of file - EXCEPT FOR some old QuickTime boxes...*/
+		if (type == GF_ISOM_BOX_TYPE_TOTL)
+			size = 12;
 		if (!size) {
-			type = gf_bs_peek_bits(bs, 32, 0);
-			if (!isalnum((type>>24)&0xFF) || !isalnum((type>>16)&0xFF) || !isalnum((type>>8)&0xFF) || !isalnum(type&0xFF)) {
-				size = 4;
-				type = GF_ISOM_BOX_TYPE_VOID;
-			} else {
-				goto proceed_box;
-			}
-		} else {
-proceed_box:
-			type = gf_bs_read_u32(bs);
-			hdr_size += 4;
-			/*no size means till end of file - EXCEPT FOR some old QuickTime boxes...*/
-			if (type == GF_ISOM_BOX_TYPE_TOTL)
-				size = 12;
-			if (!size) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Warning Read Box type %s size 0 reading till the end of file\n", gf_4cc_to_str(type)));
+			if (is_root_box) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Warning Read Box type %s (0x%08X) size 0 reading till the end of file\n", gf_4cc_to_str(type), type));
 				size = gf_bs_available(bs) + 8;
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Warning Read Box type %s (0x%08X) size 0 - patching to size=8 ...\n", gf_4cc_to_str(type), type));
+				size = 8;
 			}
 		}
 	}
@@ -197,7 +190,7 @@
 GF_EXPORT
 GF_Err gf_isom_parse_box(GF_Box **outBox, GF_BitStream *bs)
 {
-	return gf_isom_parse_box_ex(outBox, bs, 0);
+	return gf_isom_parse_box_ex(outBox, bs, 0, GF_FALSE);
 }
 
 GF_Err gf_isom_full_box_read(GF_Box *ptr, GF_BitStream *bs)
@@ -239,17 +232,17 @@
 	GF_Box *a = NULL;
 
 	while (parent->size) {
-		e = gf_isom_parse_box_ex(&a, bs, parent_type);
+		e = gf_isom_parse_box_ex(&a, bs, parent_type, GF_FALSE);
 		if (e) {
 			if (a) gf_isom_box_del(a);
 			return e;
 		}
 		if (parent->size < a->size) {
-			if (a) gf_isom_box_del(a);
-			return GF_OK;
-			//return GF_ISOM_INVALID_FILE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is larger than container box\n", gf_4cc_to_str(a->type)));
+			parent->size = 0;
+		} else {
+			parent->size -= a->size;
 		}
-		parent->size -= a->size;
 		e = add_box(parent, a);
 		if (e) {
 			gf_isom_box_del(a);
@@ -833,9 +826,9 @@
 
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_STXT:
-		return stxt_New();
-	case GF_ISOM_BOX_TYPE_STTC:
-		return boxstring_New(GF_ISOM_BOX_TYPE_STTC);
+		return metx_New(GF_ISOM_BOX_TYPE_STXT);
+	case GF_ISOM_BOX_TYPE_TXTC:
+		return txtc_New();
 
 	case GF_ISOM_BOX_TYPE_VTCU:
 		return vtcu_New();
@@ -857,7 +850,7 @@
 		return wvtt_New();
 
 	case GF_ISOM_BOX_TYPE_STPP:
-		return stpp_New();
+		return metx_New(GF_ISOM_BOX_TYPE_STPP);
 	case GF_ISOM_BOX_TYPE_SBTT:
 		return metx_New(GF_ISOM_BOX_TYPE_SBTT);
 #endif //GPAC_DISABLE_TTXT
@@ -877,6 +870,24 @@
 	case GF_ISOM_BOX_TYPE_ADAF:
 		return adaf_New();
 
+	/* Image File Format */
+	case GF_ISOM_BOX_TYPE_ISPE:
+		return ispe_New();
+	case GF_ISOM_BOX_TYPE_COLR:
+		return colr_New();
+	case GF_ISOM_BOX_TYPE_PIXI:
+		return pixi_New();
+	case GF_ISOM_BOX_TYPE_RLOC:
+		return rloc_New();
+	case GF_ISOM_BOX_TYPE_IROT:
+		return irot_New();
+	case GF_ISOM_BOX_TYPE_IPCO:
+		return ipco_New();
+	case GF_ISOM_BOX_TYPE_IPRP:
+		return iprp_New();
+	case GF_ISOM_BOX_TYPE_IPMA:
+		return ipma_New();
+
 	default:
 		a = defa_New();
 		if (a) a->type = boxType;
@@ -1490,10 +1501,10 @@
 
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_STXT:
-		stxt_del(a);
+		metx_del(a);
 		return;
-	case GF_ISOM_BOX_TYPE_STTC:
-		boxstring_del(a);
+	case GF_ISOM_BOX_TYPE_TXTC:
+		txtc_del(a);
 		return;
 
 	case GF_ISOM_BOX_TYPE_VTCU:
@@ -1515,7 +1526,7 @@
 		return;
 
 	case GF_ISOM_BOX_TYPE_STPP:
-		stpp_del(a);
+		metx_del(a);
 		return;
 	case GF_ISOM_BOX_TYPE_SBTT:
 		metx_del(a);
@@ -1545,6 +1556,32 @@
 		adaf_del(a);
 		return;
 
+	/* Image File Format */
+	case GF_ISOM_BOX_TYPE_ISPE:
+		ispe_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_COLR:
+		colr_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_PIXI:
+		pixi_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_RLOC:
+		rloc_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IROT:
+		irot_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IPCO:
+		ipco_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IPRP:
+		iprp_del(a);
+		return;
+	case GF_ISOM_BOX_TYPE_IPMA:
+		ipma_del(a);
+		return;
+
 	default:
 		defa_del(a);
 		return;
@@ -1968,9 +2005,9 @@
 
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_STXT:
-		return stxt_Read(a, bs);
-	case GF_ISOM_BOX_TYPE_STTC:
-		return boxstring_Read(a, bs);
+		return metx_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_TXTC:
+		return txtc_Read(a, bs);
 
 	case GF_ISOM_BOX_TYPE_VTCU:
 		return vtcu_Read(a, bs);
@@ -1987,7 +2024,7 @@
 		return wvtt_Read(a, bs);
 
 	case GF_ISOM_BOX_TYPE_STPP:
-		return stpp_Read(a, bs);
+		return metx_Read(a, bs);
 	case GF_ISOM_BOX_TYPE_SBTT:
 		return metx_Read(a, bs);
 
@@ -2008,6 +2045,24 @@
 	case GF_ISOM_BOX_TYPE_ADAF:
 		return adaf_Read(a, bs);
 
+	/* Image File Format */
+	case GF_ISOM_BOX_TYPE_ISPE:
+		return ispe_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_COLR:
+		return colr_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PIXI:
+		return pixi_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_RLOC:
+		return rloc_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IROT:
+		return irot_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IPCO:
+		return ipco_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IPRP:
+		return iprp_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IPMA:
+		return ipma_Read(a, bs);
+
 	default:
 		return defa_Read(a, bs);
 	}
@@ -2436,9 +2491,9 @@
 
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_STXT:
-		return stxt_Write(a, bs);
-	case GF_ISOM_BOX_TYPE_STTC:
-		return boxstring_Write(a, bs);
+		return metx_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_TXTC:
+		return txtc_Write(a, bs);
 
 	case GF_ISOM_BOX_TYPE_VTCU:
 		return vtcu_Write(a, bs);
@@ -2455,7 +2510,7 @@
 		return wvtt_Write(a, bs);
 
 	case GF_ISOM_BOX_TYPE_STPP:
-		return stpp_Write(a, bs);
+		return metx_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_SBTT:
 		return metx_Write(a, bs);
 #endif//GPAC_DISABLE_TTXT
@@ -2475,6 +2530,24 @@
 	case GF_ISOM_BOX_TYPE_ADAF:
 		return adaf_Write(a, bs);
 
+	/* Image File Format */
+	case GF_ISOM_BOX_TYPE_ISPE:
+		return ispe_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_COLR:
+		return colr_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PIXI:
+		return pixi_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_RLOC:
+		return rloc_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IROT:
+		return irot_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IPCO:
+		return ipco_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IPRP:
+		return iprp_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IPMA:
+		return ipma_Write(a, bs);
+
 	default:
 		return defa_Write(a, bs);
 	}
@@ -2909,9 +2982,9 @@
 
 #ifndef GPAC_DISABLE_TTXT
 	case GF_ISOM_BOX_TYPE_STXT:
-		return stxt_Size(a);
-	case GF_ISOM_BOX_TYPE_STTC:
-		return boxstring_Size(a);
+		return metx_Size(a);
+	case GF_ISOM_BOX_TYPE_TXTC:
+		return txtc_Size(a);
 
 	case GF_ISOM_BOX_TYPE_VTCU:
 		return vtcu_Size(a);
@@ -2928,7 +3001,7 @@
 		return wvtt_Size(a);
 
 	case GF_ISOM_BOX_TYPE_STPP:
-		return stpp_Size(a);
+		return metx_Size(a);
 	case GF_ISOM_BOX_TYPE_SBTT:
 		return metx_Size(a);
 #endif // GPAC_DISABLE_TTXT
@@ -2948,6 +3021,24 @@
 	case GF_ISOM_BOX_TYPE_ADAF:
 		return adaf_Size(a);
 
+	/* Image File Format */
+	case GF_ISOM_BOX_TYPE_ISPE:
+		return ispe_Size(a);
+	case GF_ISOM_BOX_TYPE_COLR:
+		return colr_Size(a);
+	case GF_ISOM_BOX_TYPE_PIXI:
+		return pixi_Size(a);
+	case GF_ISOM_BOX_TYPE_RLOC:
+		return rloc_Size(a);
+	case GF_ISOM_BOX_TYPE_IROT:
+		return irot_Size(a);
+	case GF_ISOM_BOX_TYPE_IPCO:
+		return ipco_Size(a);
+	case GF_ISOM_BOX_TYPE_IPRP:
+		return iprp_Size(a);
+	case GF_ISOM_BOX_TYPE_IPMA:
+		return ipma_Size(a);
+
 	default:
 		return defa_Size(a);
 	}

v0.5.2.tar.gz/src/isomedia/data_map.c -> v0.6.1.tar.gz/src/isomedia/data_map.c Changed

@@ -28,11 +28,6 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
-#if !defined(NODEJS_FS_WATCH_PATCH) && defined(WIN32)
-#define NODEJS_FS_WATCH_PATCH
-#endif
-
-
 static u32 default_write_buffering_size = 0;
 
 GF_EXPORT
@@ -50,7 +45,6 @@
 #endif
 }
 
-
 void gf_isom_datamap_del(GF_DataMap *ptr)
 {
 	if (!ptr) return;
@@ -70,7 +64,6 @@
 	default:
 		break;
 	}
-
 }
 
 //Close a data entry
@@ -106,11 +99,11 @@
 #ifndef _WIN32_WCE
 	FILE *stream;
 	s64 size;
-	stream = gf_f64_open(path, "rb");
+	stream = gf_fopen(path, "rb");
 	if (!stream) return 0;
-	gf_f64_seek(stream, 0, SEEK_END);
-	size = gf_f64_tell(stream);
-	fclose(stream);
+	gf_fseek(stream, 0, SEEK_END);
+	size = gf_ftell(stream);
+	gf_fclose(stream);
 	if (size == -1L) return 0;
 	if (size > 0xFFFFFFFF) return 1;
 #endif
@@ -295,13 +288,6 @@
 	if (map->type==GF_ISOM_DATA_FILE) {
 		GF_FileDataMap *fdm = (GF_FileDataMap *)map;
 		gf_bs_flush(fdm->bs);
-#ifdef NODEJS_FS_WATCH_PATCH
-		if (fdm->stream && fdm->szName) {
-			fclose(fdm->stream);
-			fdm->stream = gf_f64_open(fdm->szName, "a+b");
-			gf_bs_reassign(fdm->bs, fdm->stream);
-		}
-#endif
 	}
 }
 
@@ -338,14 +324,15 @@
 
 GF_DataMap *gf_isom_fdm_new_temp(const char *sPath)
 {
-	GF_FileDataMap *tmp = (GF_FileDataMap *) gf_malloc(sizeof(GF_FileDataMap));
+	GF_FileDataMap *tmp;
+	GF_SAFEALLOC(tmp, GF_FileDataMap);
 	if (!tmp) return NULL;
-	memset(tmp, 0, sizeof(GF_FileDataMap));
+
 	tmp->type = GF_ISOM_DATA_FILE;
 	tmp->mode = GF_ISOM_DATA_MAP_WRITE;
 
 	if (!sPath) {
-		tmp->stream = gf_temp_file_new();
+		tmp->stream = gf_temp_file_new(&tmp->temp_file);
 	} else {
 		char szPath[GF_MAX_PATH];
 		if ((sPath[strlen(sPath)-1] != '\\') && (sPath[strlen(sPath)-1] != '/')) {
@@ -353,7 +340,7 @@
 		} else {
 			sprintf(szPath, "%s%p_isotmp", sPath, (void*) tmp);
 		}
-		tmp->stream = gf_f64_open(szPath, "w+b");
+		tmp->stream = gf_fopen(szPath, "w+b");
 		tmp->temp_file = gf_strdup(szPath);
 	}
 	if (!tmp->stream) {
@@ -363,7 +350,7 @@
 	}
 	tmp->bs = gf_bs_from_file(tmp->stream, GF_BITSTREAM_WRITE);
 	if (!tmp->bs) {
-		fclose(tmp->stream);
+		gf_fclose(tmp->stream);
 		gf_free(tmp);
 		return NULL;
 	}
@@ -382,18 +369,18 @@
 GF_DataMap *gf_isom_fdm_new(const char *sPath, u8 mode)
 {
 	u8 bs_mode;
-
-	GF_FileDataMap *tmp = (GF_FileDataMap *) gf_malloc(sizeof(GF_FileDataMap));
+	GF_FileDataMap *tmp;
+	GF_SAFEALLOC(tmp, GF_FileDataMap);
 	if (!tmp) return NULL;
-	memset(tmp, 0, sizeof(GF_FileDataMap));
+
 	tmp->type = GF_ISOM_DATA_FILE;
 	tmp->mode = mode;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	//open a temp file
 	if (!strcmp(sPath, "mp4_tmp_edit")) {
-		//create  a temp file (that only occurs in EDIT/WRITE mode)
-		tmp->stream = gf_temp_file_new();
+		//create a temp file (that only occurs in EDIT/WRITE mode)
+		tmp->stream = gf_temp_file_new(&tmp->temp_file);
 		bs_mode = GF_BITSTREAM_READ;
 	}
 #endif
@@ -412,7 +399,7 @@
 
 	switch (mode) {
 	case GF_ISOM_DATA_MAP_READ:
-		if (!tmp->stream) tmp->stream = gf_f64_open(sPath, "rb");
+		if (!tmp->stream) tmp->stream = gf_fopen(sPath, "rb");
 		bs_mode = GF_BITSTREAM_READ;
 		break;
 	///we open the file in READ/WRITE mode, in case
@@ -422,8 +409,8 @@
 			tmp->is_stdout = 1;
 		}
 
-		if (!tmp->stream) tmp->stream = gf_f64_open(sPath, "w+b");
-		if (!tmp->stream) tmp->stream = gf_f64_open(sPath, "wb");
+		if (!tmp->stream) tmp->stream = gf_fopen(sPath, "w+b");
+		if (!tmp->stream) tmp->stream = gf_fopen(sPath, "wb");
 		bs_mode = GF_BITSTREAM_WRITE;
 		break;
 	///we open the file in CAT mode, in case
@@ -433,8 +420,8 @@
 			tmp->is_stdout = 1;
 		}
 
-		if (!tmp->stream) tmp->stream = gf_f64_open(sPath, "a+b");
-		if (tmp->stream) gf_f64_seek(tmp->stream, 0, SEEK_END);
+		if (!tmp->stream) tmp->stream = gf_fopen(sPath, "a+b");
+		if (tmp->stream) gf_fseek(tmp->stream, 0, SEEK_END);
 		bs_mode = GF_BITSTREAM_WRITE;
 		break;
 	default:
@@ -447,7 +434,7 @@
 	}
 	tmp->bs = gf_bs_from_file(tmp->stream, bs_mode);
 	if (!tmp->bs) {
-		fclose(tmp->stream);
+		gf_fclose(tmp->stream);
 		gf_free(tmp);
 		return NULL;
 	}
@@ -462,7 +449,7 @@
 	if (!ptr || (ptr->type != GF_ISOM_DATA_FILE)) return;
 	if (ptr->bs) gf_bs_del(ptr->bs);
 	if (ptr->stream && !ptr->is_stdout)
-		fclose(ptr->stream);
+		gf_fclose(ptr->stream);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	if (ptr->temp_file) {
@@ -482,11 +469,11 @@
 	//can we seek till that point ???
 	if (fileOffset > gf_bs_get_size(ptr->bs)) return 0;
 
-	//ouch, we are not at the previous location, do a seek
-	if (ptr->curPos != fileOffset) {
+	if (gf_bs_get_position(ptr->bs) != fileOffset) {
+		//we are not at the previous location, do a seek
 		if (gf_bs_seek(ptr->bs, fileOffset) != GF_OK) return 0;
-		ptr->curPos = fileOffset;
 	}
+	ptr->curPos = fileOffset;
 
 	//read our data.
 	bytesRead = gf_bs_read_data(ptr->bs, buffer, bufferLength);
@@ -564,7 +551,6 @@
 {
 	GF_FileMappingDataMap *tmp;
 	HANDLE fileH, fileMapH;
-	DWORD err;
 #ifdef _WIN32_WCE
 	unsigned short sWPath[MAX_PATH];
 #endif
@@ -572,9 +558,9 @@
 	//only in read only
 	if (mode != GF_ISOM_DATA_MAP_READ) return NULL;
 
-	tmp = (GF_FileMappingDataMap *) gf_malloc(sizeof(GF_FileMappingDataMap));
+	GF_SAFEALLOC(tmp, GF_FileMappingDataMap);
 	if (!tmp) return NULL;
-	memset(tmp, 0, sizeof(GF_FileMappingDataMap));
+
 	tmp->type = GF_ISOM_DATA_FILE_MAPPING;
 	tmp->mode = mode;
 	tmp->name = gf_strdup(sPath);
@@ -616,7 +602,6 @@
 		CloseHandle(fileH);
 		gf_free(tmp->name);
 		gf_free(tmp);
-		err = GetLastError();
 		return NULL;
 	}
 
@@ -650,11 +635,8 @@
 
 u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset)
 {
-	u32 size;
-
 	//can we seek till that point ???
 	if (fileOffset > ptr->file_size) return 0;
-	size = (u32) fileOffset;
 
 	//we do only read operations, so trivial
 	memcpy(buffer, ptr->byte_map + fileOffset, bufferLength);

v0.5.2.tar.gz/src/isomedia/drm_sample.c -> v0.6.1.tar.gz/src/isomedia/drm_sample.c Changed

@@ -130,7 +130,7 @@
 	if (!sea) return NULL;
 
 	i = 0;
-	while ((sinf = gf_list_enum(sea->protections, &i))) {
+	while ((sinf = (GF_ProtectionInfoBox*)gf_list_enum(sea->protections, &i))) {
 		if (sinf->original_format && sinf->scheme_type && sinf->info) {
 			if (!scheme_type || (sinf->scheme_type->scheme_type == scheme_type)) {
 				if (out_sea)
@@ -170,7 +170,7 @@
 			return gf_isom_ismacryp_sample_from_data(samp->data, samp->dataLength, fmt->selective_encryption, fmt->key_indicator_length, fmt->IV_length);
 		}
 		/*OMA default: no selective encryption, one key, 128 bit IV*/
-		return gf_isom_ismacryp_sample_from_data(samp->data, samp->dataLength, 0, 0, 128);
+		return gf_isom_ismacryp_sample_from_data(samp->data, samp->dataLength, GF_FALSE, 0, 128);
 	}
 	return NULL;
 }
@@ -200,16 +200,16 @@
 	GF_ProtectionInfoBox *sinf;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak) return GF_FALSE;
 
 	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ISMACRYP_SCHEME, NULL);
-	if (!sinf) return 0;
+	if (!sinf) return GF_FALSE;
 
 	/*non-encrypted or non-ISMA*/
 	if (!sinf->info || !sinf->info->ikms || !sinf->info->isfm )
-		return 0;
+		return GF_FALSE;
 
-	return 1;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -219,16 +219,16 @@
 	GF_ProtectionInfoBox *sinf;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak) return GF_FALSE;
 
 	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_OMADRM_SCHEME, NULL);
-	if (!sinf) return 0;
+	if (!sinf) return GF_FALSE;
 
 	/*non-encrypted or non-OMA*/
 	if (!sinf->info || !sinf->info->okms || !sinf->info->okms->hdr)
-		return 0;
+		return GF_FALSE;
 
-	return 1;
+	return GF_TRUE;
 }
 
 /*retrieves ISMACryp info for the given track & SDI*/
@@ -242,7 +242,7 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ISMACRYP_SCHEME, NULL);
-	if (!sinf) return 0;
+	if (!sinf) return GF_OK;
 
 	if (outOriginalFormat) {
 		*outOriginalFormat = sinf->original_format->data_format;
@@ -262,7 +262,7 @@
 		if (outIVLength) *outIVLength = sinf->info->isfm->IV_length;
 		if (outKeyIndicationLength) *outKeyIndicationLength = sinf->info->isfm->key_indicator_length;
 	} else {
-		if (outSelectiveEncryption) *outSelectiveEncryption = 0;
+		if (outSelectiveEncryption) *outSelectiveEncryption = GF_FALSE;
 		if (outIVLength) *outIVLength = 0;
 		if (outKeyIndicationLength) *outKeyIndicationLength = 0;
 	}
@@ -283,7 +283,7 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_OMADRM_SCHEME, NULL);
-	if (!sinf) return 0;
+	if (!sinf) return GF_OK;
 
 	if (!sinf->info || !sinf->info->okms || !sinf->info->okms->hdr) return GF_NON_COMPLIANT_BITSTREAM;
 
@@ -307,7 +307,7 @@
 		if (outIVLength) *outIVLength = sinf->info->okms->fmt->IV_length;
 		if (outKeyIndicationLength) *outKeyIndicationLength = sinf->info->okms->fmt->key_indicator_length;
 	} else {
-		if (outSelectiveEncryption) *outSelectiveEncryption = 0;
+		if (outSelectiveEncryption) *outSelectiveEncryption = GF_FALSE;
 		if (outIVLength) *outIVLength = 0;
 		if (outKeyIndicationLength) *outKeyIndicationLength = 0;
 	}
@@ -361,7 +361,7 @@
 
 	sea = NULL;
 	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ISMACRYP_SCHEME, &sea);
-	if (!sinf) return 0;
+	if (!sinf) return GF_OK;
 
 	if (scheme_uri) {
 		gf_free(sinf->scheme_type->URI);
@@ -511,7 +511,7 @@
 	if (contentID) sinf->info->okms->hdr->ContentID = gf_strdup(contentID);
 	if (kms_URI) sinf->info->okms->hdr->RightsIssuerURL = gf_strdup(kms_URI);
 	if (textual_headers) {
-		sinf->info->okms->hdr->TextualHeaders = gf_malloc(sizeof(char)*textual_headers_len);
+		sinf->info->okms->hdr->TextualHeaders = (char*)gf_malloc(sizeof(char)*textual_headers_len);
 		memcpy(sinf->info->okms->hdr->TextualHeaders, textual_headers, sizeof(char)*textual_headers_len);
 		sinf->info->okms->hdr->TextualHeadersLen = textual_headers_len;
 	}
@@ -532,7 +532,7 @@
 	Media_GetSampleDesc(trak->Media, sampleDescriptionIndex, &sea, NULL);
 	if (!sea) return GF_BAD_PARAM;
 
-	sinf = gf_list_get(sea->protections, 0);
+	sinf = (GF_ProtectionInfoBox*)gf_list_get(sea->protections, 0);
 	if (outOriginalFormat && sinf->original_format) {
 		*outOriginalFormat = sinf->original_format->data_format;
 	}
@@ -680,7 +680,7 @@
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(stbl->sai_offsets, i);
 		if (saio->aux_info_type != GF_4CC('c', 'e', 'n', 'c'))
 			continue;
-		saiz_del((GF_Box *)saio);
+		saio_del((GF_Box *)saio);
 		gf_list_rem(stbl->sai_offsets, i);
 		i--;
 	}
@@ -872,7 +872,7 @@
 	return GF_NOT_SUPPORTED;
 }
 
-
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 len)
 {
 	u32 i;
@@ -887,6 +887,8 @@
 	}
 	if (!senc->cenc_saio) {
 		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
+		//force using version 1 for saio box, it could be redundant when we use 64 bits for offset
+		senc->cenc_saio->version = 1;
 		senc->cenc_saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
 		senc->cenc_saio->aux_info_type_parameter = 0;
 		senc->cenc_saio->entry_count = 1;
@@ -900,7 +902,7 @@
 		senc->cenc_saiz->sample_count ++;
 		senc->cenc_saiz->default_sample_info_size = len;
 	} else {
-		senc->cenc_saiz->sample_info_size = gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
+		senc->cenc_saiz->sample_info_size = (u8*)gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
 
 		if (senc->cenc_saiz->default_sample_info_size) {
 			for (i=0; i<senc->cenc_saiz->sample_count; i++)
@@ -912,7 +914,7 @@
 	}
 }
 
-void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u32 offset, u32 len)
+void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u64 offset, u32 len)
 {
 	u32 i;
 	if (!senc->cenc_saiz) {
@@ -924,6 +926,8 @@
 	}
 	if (!senc->cenc_saio) {
 		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
+		//force using version 1 for saio box, it could be redundant when we use 64 bits for offset
+		senc->cenc_saio->version = 1;
 		senc->cenc_saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
 		senc->cenc_saio->aux_info_type_parameter = 0;
 		if (stbl)
@@ -934,7 +938,7 @@
 		senc->cenc_saiz->sample_count ++;
 		senc->cenc_saiz->default_sample_info_size = len;
 	} else {
-		senc->cenc_saiz->sample_info_size = gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
+		senc->cenc_saiz->sample_info_size = (u8*)gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
 
 		if (senc->cenc_saiz->default_sample_info_size) {
 			for (i=0; i<senc->cenc_saiz->sample_count; i++)
@@ -946,15 +950,16 @@
 	}
 
 	if (!senc->cenc_saio->entry_count) {
-		senc->cenc_saio->offsets = (u32 *)gf_malloc(sizeof(u32));
-		senc->cenc_saio->offsets[0] = offset;
+		senc->cenc_saio->offsets_large = (u64 *)gf_malloc(sizeof(u64));
+		senc->cenc_saio->offsets_large[0] = offset;
 		senc->cenc_saio->entry_count ++;
 	} else {
-		senc->cenc_saio->offsets = gf_realloc(senc->cenc_saio->offsets, sizeof(u32)*(senc->cenc_saio->entry_count+1));
-		senc->cenc_saio->offsets[senc->cenc_saio->entry_count] = offset;
+		senc->cenc_saio->offsets_large = (u64*)gf_realloc(senc->cenc_saio->offsets_large, sizeof(u64)*(senc->cenc_saio->entry_count+1));
+		senc->cenc_saio->offsets_large[senc->cenc_saio->entry_count] = offset;
 		senc->cenc_saio->entry_count++;
 	}
 }
+#endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 
 GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len)
 {
@@ -997,13 +1002,14 @@
 	}
 
 	gf_list_add(senc->samp_aux_info, sai);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	gf_isom_cenc_set_saiz_saio(senc, stbl, NULL, len);
+#endif
 
 	return GF_OK;
 }
 
 
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_EXPORT
 void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp)
 {
@@ -1012,22 +1018,28 @@
 	gf_free(samp);
 }
 
-Bool gf_isom_cenc_has_saiz_saio(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf)
+Bool gf_isom_cenc_has_saiz_saio_full(GF_SampleTableBox *stbl, void *_traf)
 {
 	u32 i;
 	GF_List *sai_sizes, *sai_offsets;
 	Bool has_saiz, has_saio;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_TrackFragmentBox *traf=(GF_TrackFragmentBox *)_traf;
+#endif
 	has_saiz = has_saio = GF_FALSE;
 
 	if (stbl) {
 		sai_sizes = stbl->sai_sizes;
 		sai_offsets = stbl->sai_offsets;
 	}
-	else if (traf) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	else if (_traf) {
 		sai_sizes = traf->sai_sizes;
 		sai_offsets = traf->sai_offsets;
 	}
-	else return GF_FALSE;
+#endif
+	else
+		return GF_FALSE;
 
 	for (i = 0; i < gf_list_count(sai_sizes); i++) {
 		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(sai_sizes, i);
@@ -1036,9 +1048,11 @@
 			break;
 		}
 	}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	//assume CENC if we find a senc box - hack for some ultraviolet files :(
 	if (!has_saiz && traf && (traf->sample_encryption || traf->piff_sample_encryption) )
 		has_saiz = GF_TRUE;
+#endif
 
 	for (i = 0; i < gf_list_count(sai_offsets); i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(sai_offsets, i);
@@ -1048,30 +1062,46 @@
 		}
 	}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	//assume CENC if we find a senc box - hack for some ultraviolet files :(
 	if (!has_saio && traf && (traf->sample_encryption || traf->piff_sample_encryption) )
 		has_saio = GF_TRUE;
+#endif
 
 	return (has_saiz && has_saio);
 }
 
+Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl)
+{
+	return gf_isom_cenc_has_saiz_saio_full(stbl, NULL);
+}
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf)
+{
+	return gf_isom_cenc_has_saiz_saio_full(NULL, traf);
+}
+#endif
+
+
 static GF_Err gf_isom_cenc_get_sai_by_saiz_saio(GF_MediaBox *mdia, u32 sampleNumber, u8 IV_size, GF_CENCSampleAuxInfo **sai)
 {
 	GF_BitStream *bs;
-	u32 offset, prev_sai_size, size, i, j, nb_saio;
-	u64 cur_position;
+	u32 prev_sai_size, size, i, j, nb_saio;
+	u64 cur_position, offset;
 	GF_Err e = GF_OK;
 	char *buffer;
 
-	nb_saio = size = offset = prev_sai_size = 0;
+	nb_saio = size = prev_sai_size = 0;
+	offset = 0;
 
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_offsets); i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(mdia->information->sampleTable->sai_offsets, i);
 		if (saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
 			if (saio->entry_count == 1)
-				offset = saio->offsets[0];
+				offset = saio->version ? saio->offsets_large[0] : saio->offsets[0];
 			else
-				offset = saio->offsets[sampleNumber-1];
+				offset = saio->version ? saio->offsets_large[sampleNumber-1]: saio->offsets[sampleNumber-1];
 			nb_saio = saio->entry_count;
 			break;
 		}
@@ -1144,6 +1174,10 @@
 
 	if (!sai) return GF_OK; /*we need only container_type*/
 
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
+
 	if (*sai) {
 		gf_isom_cenc_samp_aux_info_del(*sai);
 		*sai = NULL;
@@ -1156,7 +1190,7 @@
 	}
 
 	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
-	if (gf_isom_cenc_has_saiz_saio(stbl, NULL)) {
+	if (gf_isom_cenc_has_saiz_saio_track(stbl)) {
 		return gf_isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, IV_size, sai);
 	}
 
@@ -1178,7 +1212,7 @@
 	if (a_box) {
 		memmove((*sai)->IV, a_sai->IV, 16);
 		(*sai)->subsample_count = a_sai->subsample_count;
-		(*sai)->subsamples = gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
+		(*sai)->subsamples = (GF_CENCSubSampleEntry*)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
 		memmove((*sai)->subsamples, a_sai->subsamples, sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
 	}
 
@@ -1303,8 +1337,6 @@
 	return GF_OK;
 }
 
-#endif //	GPAC_DISABLE_ISOM_FRAGMENTS
-
 
 void gf_isom_ipmpx_remove_tool_list(GF_ISOFile *the_file)
 {

v0.5.2.tar.gz/src/isomedia/hint_track.c -> v0.6.1.tar.gz/src/isomedia/hint_track.c Changed

@@ -29,13 +29,13 @@
 
 Bool IsHintTrack(GF_TrackBox *trak)
 {
-	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_HINT) return 0;
+	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_HINT) return GF_FALSE;
 	//QT doesn't specify any InfoHeader on HintTracks
 	if (trak->Media->information->InfoHeader
 	        && trak->Media->information->InfoHeader->type != GF_ISOM_BOX_TYPE_HMHD)
-		return 0;
+		return GF_FALSE;
 
-	return 1;
+	return GF_TRUE;
 }
 
 u32 GetHintFormat(GF_TrackBox *trak)
@@ -50,9 +50,9 @@
 
 Bool CheckHintFormat(GF_TrackBox *trak, u32 HintType)
 {
-	if (!IsHintTrack(trak)) return 0;
-	if (GetHintFormat(trak) != HintType) return 0;
-	return 1;
+	if (!IsHintTrack(trak)) return GF_FALSE;
+	if (GetHintFormat(trak) != HintType) return GF_FALSE;
+	return GF_TRUE;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -751,7 +751,7 @@
 	strcat(buf, text);
 	strcat(buf, "\r\n");
 	gf_free(sdp->sdpText);
-	ReorderSDP(buf, 0);
+	ReorderSDP(buf, GF_FALSE);
 	sdp->sdpText = buf;
 	return GF_OK;
 }
@@ -841,7 +841,7 @@
 	strcat(buf, text);
 	strcat(buf, "\r\n");
 	gf_free(rtp->sdpText);
-	ReorderSDP(buf, 1);
+	ReorderSDP(buf, GF_TRUE);
 	rtp->sdpText = buf;
 	return GF_OK;
 }
@@ -952,7 +952,7 @@
 	hinf = (GF_HintInfoBox *)gf_list_get(map->other_boxes, 0);
 	count = 0;
 	i = 0;
-	while ((payt = gf_list_enum(hinf->other_boxes, &i))) {
+	while ((payt = (GF_PAYTBox*)gf_list_enum(hinf->other_boxes, &i))) {
 		if (payt->type == GF_ISOM_BOX_TYPE_PAYT) count++;
 	}
 	return count;
@@ -978,7 +978,7 @@
 	hinf = (GF_HintInfoBox *)gf_list_get(map->other_boxes, 0);
 	count = 0;
 	i = 0;
-	while ((payt = gf_list_enum(hinf->other_boxes, &i))) {
+	while ((payt = (GF_PAYTBox*)gf_list_enum(hinf->other_boxes, &i))) {
 		if (payt->type == GF_ISOM_BOX_TYPE_PAYT) {
 			count++;
 			if (count == index) {

v0.6.1.tar.gz/src/isomedia/iff.c Added

@@ -0,0 +1,581 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ * This file is part of GPAC / ISO Media File Format sub-project
+ *
+ * GPAC 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, or (at your option)
+ * any later version.
+ *
+ * GPAC 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 this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/internal/isomedia_dev.h>
+#include <gpac/constants.h>
+
+#ifndef GPAC_DISABLE_ISOM
+
+GF_Box *ispe_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ImageSpatialExtentsPropertyBox, GF_ISOM_BOX_TYPE_ISPE);
+	return (GF_Box *)tmp;
+}
+
+void ispe_del(GF_Box *a)
+{
+	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox *)a;
+	gf_free(p);
+}
+
+GF_Err ispe_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox *)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	if (p->version == 0 && p->flags == 0) {
+		p->image_width = gf_bs_read_u32(bs);
+		p->image_height = gf_bs_read_u32(bs);
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("version and flags for ispe box not supported" ));
+		gf_bs_skip_bytes(bs, p->size);
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err ispe_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox*)s;
+
+	p->version = 0;
+	p->flags = 0;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, p->image_width);
+	gf_bs_write_u32(bs, p->image_height);
+	return GF_OK;
+}
+
+GF_Err ispe_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox*)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	if (p->version == 0 && p->flags == 0) {
+		p->size += 8;
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("version and flags for ispe box not supported" ));
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *colr_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ColourInformationBox, GF_ISOM_BOX_TYPE_COLR);
+	return (GF_Box *)tmp;
+}
+
+void colr_del(GF_Box *a)
+{
+	GF_ColourInformationBox *p = (GF_ColourInformationBox *)a;
+	if (p->opaque) gf_free(p->opaque);
+	gf_free(p);
+}
+
+GF_Err colr_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ColourInformationBox *p = (GF_ColourInformationBox *)s;
+
+	p->colour_type = gf_bs_read_u32(bs);
+	p->size -= 4;
+	if (p->colour_type == GF_4CC('n','c','l','x')) {
+		p->colour_primaries = gf_bs_read_u16(bs);
+		p->transfer_characteristics = gf_bs_read_u16(bs);
+		p->matrix_coefficients = gf_bs_read_u16(bs);
+		p->full_range_flag = (gf_bs_read_u8(bs) & 0x80 ? GF_TRUE : GF_FALSE);
+	} else {
+		p->opaque = gf_malloc(sizeof(u8)* (u32) p->size);
+		p->opaque_size = (u32) p->size;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ICC colour profile not supported \n" ));
+		gf_bs_read_data(bs, (char *) p->opaque, p->opaque_size);
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err colr_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ColourInformationBox *p = (GF_ColourInformationBox*)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	if (p->colour_type != GF_4CC('n','c','l','x')) {
+		gf_bs_write_u32(bs, p->colour_type);
+		gf_bs_write_data(bs, (char *)p->opaque, p->opaque_size);
+	} else {
+		gf_bs_write_u32(bs, p->colour_type);
+		gf_bs_write_u16(bs, p->colour_primaries);
+		gf_bs_write_u16(bs, p->transfer_characteristics);
+		gf_bs_write_u16(bs, p->matrix_coefficients);
+		gf_bs_write_u8(bs, (p->full_range_flag == GF_TRUE ? 0x80 : 0));
+	}
+	return GF_OK;
+}
+
+GF_Err colr_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_ColourInformationBox *p = (GF_ColourInformationBox*)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	if (p->colour_type != GF_4CC('n','c','l','x')) {
+		p->size += 4 + p->opaque_size;
+	} else {
+		p->size += 11;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *pixi_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_PixelInformationPropertyBox, GF_ISOM_BOX_TYPE_PIXI);
+	return (GF_Box *)tmp;
+}
+
+void pixi_del(GF_Box *a)
+{
+	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox *)a;
+	if (p->bits_per_channel) gf_free(p->bits_per_channel);
+	gf_free(p);
+}
+
+GF_Err pixi_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_Err e;
+	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox *)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	if (p->version == 0 && p->flags == 0) {
+		p->num_channels = gf_bs_read_u8(bs);
+		p->bits_per_channel = (u8 *)gf_malloc(p->num_channels);
+		for (i = 0; i < p->num_channels; i++) {
+			p->bits_per_channel[i] = gf_bs_read_u8(bs);
+		}
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("version and flags for pixi box not supported" ));
+		gf_bs_skip_bytes(bs, p->size);
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err pixi_Write(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_Err e;
+	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox*)s;
+
+	p->version = 0;
+	p->flags = 0;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, p->num_channels);
+	for (i = 0; i < p->num_channels; i++) {
+		gf_bs_write_u8(bs, p->bits_per_channel[i]);
+	}
+	return GF_OK;
+}
+
+GF_Err pixi_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox*)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	if (p->version == 0 && p->flags == 0) {
+		p->size += 1 + p->num_channels;
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("version and flags for pixi box not supported" ));
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *rloc_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_RelativeLocationPropertyBox, GF_ISOM_BOX_TYPE_RLOC);
+	return (GF_Box *)tmp;
+}
+
+void rloc_del(GF_Box *a)
+{
+	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox *)a;
+	gf_free(p);
+}
+
+GF_Err rloc_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox *)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	if (p->version == 0 && p->flags == 0) {
+		p->horizontal_offset = gf_bs_read_u32(bs);
+		p->vertical_offset = gf_bs_read_u32(bs);
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("version and flags for rloc box not supported" ));
+		gf_bs_skip_bytes(bs, p->size);
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err rloc_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox*)s;
+
+	p->version = 0;
+	p->flags = 0;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, p->horizontal_offset);
+	gf_bs_write_u32(bs, p->vertical_offset);
+	return GF_OK;
+}
+
+GF_Err rloc_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox*)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	if (p->version == 0 && p->flags == 0) {
+		p->size += 8;
+		return GF_OK;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("version and flags for rloc box not supported" ));
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *irot_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ImageRotationBox, GF_ISOM_BOX_TYPE_IROT);
+	return (GF_Box *)tmp;
+}
+
+void irot_del(GF_Box *a)
+{
+	GF_ImageRotationBox *p = (GF_ImageRotationBox *)a;
+	gf_free(p);
+}
+
+GF_Err irot_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ImageRotationBox *p = (GF_ImageRotationBox *)s;
+	p->angle = gf_bs_read_u8(bs) & 0x3;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err irot_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ImageRotationBox *p = (GF_ImageRotationBox*)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, p->angle);
+	return GF_OK;
+}
+
+GF_Err irot_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_ImageRotationBox *p = (GF_ImageRotationBox*)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	p->size += 1;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *ipco_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ItemPropertyContainerBox, GF_ISOM_BOX_TYPE_IPCO);
+	tmp->other_boxes = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+void ipco_del(GF_Box *s)
+{
+	GF_ItemPropertyContainerBox *p = (GF_ItemPropertyContainerBox *)s;
+	gf_free(p);
+}
+
+GF_Err ipco_Read(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_read_box_list(s, bs, gf_isom_box_add_default);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err ipco_Write(GF_Box *s, GF_BitStream *bs)
+{
+	if (!s) return GF_BAD_PARAM;
+	return gf_isom_box_write_header(s, bs);
+}
+
+GF_Err ipco_Size(GF_Box *s)
+{
+	return gf_isom_box_get_size(s);
+}
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *iprp_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ItemPropertiesBox, GF_ISOM_BOX_TYPE_IPRP);
+	tmp->other_boxes = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+void iprp_del(GF_Box *s)
+{
+	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
+	if (p->property_container) gf_isom_box_del((GF_Box *)p->property_container);
+	gf_free(p);
+}
+
+static GF_Err iprp_AddBox(GF_Box *s, GF_Box *a)
+{
+	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_IPCO:
+		if (p->property_container) {
+			return GF_ISOM_INVALID_FILE;
+		}
+		p->property_container = (GF_ItemPropertyContainerBox*)a;
+		break;
+	default:
+		return gf_isom_box_add_default(s, a);
+	}
+	return GF_OK;
+}
+
+GF_Err iprp_Read(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_read_box_list(s, bs, iprp_AddBox);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err iprp_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	if (p->property_container) {
+		e = gf_isom_box_write((GF_Box *) p->property_container, bs);
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+GF_Err iprp_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	if (p->property_container) {
+		e = gf_isom_box_size((GF_Box *) p->property_container);
+		if (e) return e;
+		p->size += p->property_container->size;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_Box *ipma_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ItemPropertyAssociationBox, GF_ISOM_BOX_TYPE_IPMA);
+	tmp->entries = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+void ipma_del(GF_Box *a)
+{
+	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox *)a;
+	if (p->entries) {
+		u32 i, j;
+		u32 count, count2;
+		count = gf_list_count(p->entries);
+
+		for (i = 0; i < count; i++) {
+			GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(p->entries, i);
+			if (entry) {
+				count2 = gf_list_count(entry->essential);
+				for (j = 0; j < count2; j++) {
+					Bool *essential = (Bool *)gf_list_get(entry->essential, j);
+					Bool *prop_index = (Bool *)gf_list_get(entry->property_index, j);
+					gf_free(essential);
+					gf_free(prop_index);
+				}
+				gf_list_del(entry->essential);
+				gf_list_del(entry->property_index);
+				gf_free(entry);
+			}
+		}
+		gf_list_del(p->entries);
+	}
+	gf_free(p);
+}
+
+GF_Err ipma_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i, j;
+	GF_Err e;
+	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox *)s;
+	u32 entry_count, association_count;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	entry_count = gf_bs_read_u32(bs);
+	for (i = 0; i < entry_count; i++) {
+		GF_ItemPropertyAssociationEntry *entry;
+		GF_SAFEALLOC(entry, GF_ItemPropertyAssociationEntry);
+		entry->essential = gf_list_new();
+		entry->property_index = gf_list_new();
+		gf_list_add(p->entries, entry);
+		if (p->version == 0) {
+			entry->item_id = gf_bs_read_u16(bs);
+		} else {
+			entry->item_id = gf_bs_read_u32(bs);
+		}
+		association_count = gf_bs_read_u8(bs);
+		for (j = 0; j < association_count; j++) {
+			Bool *ess = (Bool *)gf_malloc(sizeof(Bool));
+			u32 *prop_index = (u32 *)gf_malloc(sizeof(u32));
+			if (p->flags & 1) {
+				u16 tmp = gf_bs_read_u16(bs);
+				*ess = (tmp >> 15 ? GF_TRUE: GF_FALSE);
+				*prop_index = (tmp & 0x7FFF);
+			} else {
+				u8 tmp = gf_bs_read_u8(bs);
+				*ess = (tmp >> 7 ? GF_TRUE: GF_FALSE);
+				*prop_index = (tmp & 0x7F);
+			}
+			gf_list_add(entry->essential, ess);
+			gf_list_add(entry->property_index, prop_index);
+		}
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err ipma_Write(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i, j;
+	GF_Err e;
+	u32 entry_count, association_count;
+	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox*)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	entry_count = gf_list_count(p->entries);
+	gf_bs_write_u32(bs, entry_count);
+	for (i = 0; i < entry_count; i++) {
+		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(p->entries, i);
+		if (p->version == 0) {
+			gf_bs_write_u16(bs, entry->item_id);
+		} else {
+			gf_bs_write_u32(bs, entry->item_id);
+		}
+		association_count = gf_list_count(entry->essential);
+		gf_bs_write_u8(bs, association_count);
+		for (j = 0; j < association_count; j++) {
+			Bool *ess = (Bool *)gf_list_get(entry->essential, j);
+			u32 *prop_index = (u32 *)gf_list_get(entry->property_index, j);
+			if (p->flags & 1) {
+				gf_bs_write_u16(bs, *ess << 15 | *prop_index);
+			} else {
+				gf_bs_write_u8(bs, *ess << 7 | *prop_index);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err ipma_Size(GF_Box *s)
+{
+	u32 i;
+	GF_Err e;
+	u32 entry_count, association_count;
+	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox*)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	entry_count = gf_list_count(p->entries);
+	p->size += 4;
+	if (p->version == 0) {
+		p->size += entry_count * 2;
+	} else {
+		p->size += entry_count * 4;
+	}
+	p->size += entry_count;
+	for (i = 0; i < entry_count; i++) {
+		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(p->entries, i);
+		association_count = gf_list_count(entry->essential);
+		if (p->flags & 1) {
+			p->size += association_count * 2;
+		} else {
+			p->size += association_count;
+		}
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+#endif /*GPAC_DISABLE_ISOM*/

v0.5.2.tar.gz/src/isomedia/isom_intern.c -> v0.6.1.tar.gz/src/isomedia/isom_intern.c Changed

@@ -277,6 +277,9 @@
 			break;
 
 		case GF_ISOM_BOX_TYPE_MOOF:
+			if (!mov->moov) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Movie fragment but no moov (yet) - possibly broken parsing!\n"));
+			}
 			if (mov->single_moof_mode) {
 				mov->single_moof_state++;
 				if (mov->single_moof_state > 1) {
@@ -338,6 +341,7 @@
 		break;
 
 		case GF_ISOM_BOX_TYPE_PRFT:
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			if (!(mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
 				//keep the last one read
 				if (mov->last_producer_ref_time)
@@ -346,9 +350,9 @@
 					mov->last_producer_ref_time = (GF_ProducerReferenceTimeBox *)a;
 				break;
 			}
+#endif
 		//fallthrough
 
-
 		default:
 			totSize += a->size;
 			e = gf_list_add(mov->TopBoxes, a);
@@ -611,7 +615,7 @@
 	//no segment yet...
 	*SegmentStartTime = -1;
 	*MediaOffset = -1;
-	if (!trak->moov->mvhd->timeScale || !trak->Media->mediaHeader->timeScale) {
+	if (!trak->moov->mvhd->timeScale || !trak->Media->mediaHeader->timeScale || !stbl->SampleSize) {
 		return GF_ISOM_INVALID_FILE;
 	}

v0.5.2.tar.gz/src/isomedia/isom_read.c -> v0.6.1.tar.gz/src/isomedia/isom_read.c Changed

@@ -105,7 +105,7 @@
 			type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
 	} else {
 		unsigned char data[4];
-		FILE *f = gf_f64_open(fileName, "rb");
+		FILE *f = gf_fopen(fileName, "rb");
 		if (!f) return 0;
 		type = 0;
 		if (fread(data, 1, 4, f) == 4) {
@@ -113,7 +113,7 @@
 				type = GF_4CC(data[0], data[1], data[2], data[3]);
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 	}
 	switch (type) {
 	case GF_ISOM_BOX_TYPE_FTYP:
@@ -178,7 +178,7 @@
 		gf_bs_truncate(movie->movieFileMap->bs);
 		gf_bs_seek(movie->movieFileMap->bs, start_range);
 	}
-	e = gf_isom_parse_movie_boxes(movie, BytesMissing, 1);
+	e = gf_isom_parse_movie_boxes(movie, BytesMissing, GF_TRUE);
 	if (e == GF_ISOM_INCOMPLETE_FILE) {
 		//if we have a moov, we're fine
 		if (movie->moov) {
@@ -243,7 +243,6 @@
 	e = GF_OK;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-
 	//write our movie to the file
 	if (movie->openMode != GF_ISOM_OPEN_READ) {
 		gf_isom_get_duration(movie);
@@ -256,16 +255,16 @@
 #endif
 			e = WriteToFile(movie);
 	}
-
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (movie->moov) {
 		u32 i;
 
 		for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-			GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+			GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 			/*delete any pending dataHandler of scalable enhancements*/
-			if (trak->Media->information->scalableDataHandler && (trak->Media->information->scalableDataHandler != movie->movieFileMap))
+			if (trak->Media && trak->Media->information && trak->Media->information->scalableDataHandler && (trak->Media->information->scalableDataHandler != movie->movieFileMap))
 				gf_isom_datamap_del(trak->Media->information->scalableDataHandler);
 		}
 	}
@@ -280,8 +279,8 @@
 GF_EXPORT
 Bool gf_isom_has_root_od(GF_ISOFile *movie)
 {
-	if (!movie || !movie->moov || !movie->moov->iods || !movie->moov->iods->descriptor) return 0;
-	return 1;
+	if (!movie || !movie->moov || !movie->moov->iods || !movie->moov->iods->descriptor) return GF_FALSE;
+	return GF_TRUE;
 }
 
 //this funct is used for exchange files, where the iods contains an OD
@@ -445,8 +444,8 @@
 GF_EXPORT
 Bool gf_isom_has_movie(GF_ISOFile *file)
 {
-	if (file && file->moov) return 1;
-	return 0;
+	if (file && file->moov) return GF_TRUE;
+	return GF_FALSE;
 }
 
 #ifndef GPAC_DISABLE_ISOM
@@ -457,18 +456,18 @@
 	u32 i;
 	GF_Box *a;
 	i = 0;
-	while (NULL != (a = gf_list_enum(file->TopBoxes, &i))) {
+	while (NULL != (a = (GF_Box*)gf_list_enum(file->TopBoxes, &i))) {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (a->type == GF_ISOM_BOX_TYPE_STYP) {
 			GF_SegmentTypeBox *styp = (GF_SegmentTypeBox *)a;
 			*brand = styp->majorBrand;
 			*version = styp->minorVersion;
-			return 1;
+			return GF_TRUE;
 		}
 #endif
 	}
 #endif
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -478,7 +477,7 @@
 	if (file) {
 		u32 i, count = 0;
 		for (i=0; i<gf_list_count(file->TopBoxes); i++) {
-			GF_Box *a = gf_list_get(file->TopBoxes, i);
+			GF_Box *a = (GF_Box*)gf_list_get(file->TopBoxes, i);
 			if (a->type==GF_ISOM_BOX_TYPE_MOOF) count++;
 		}
 		return count;
@@ -487,11 +486,12 @@
 	return 0;
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 static GF_MovieFragmentBox *gf_isom_get_moof(GF_ISOFile *file, u32 moof_index)
 {
 	u32 i;
 	for (i=0; i<gf_list_count(file->TopBoxes); i++) {
-		GF_Box *a = gf_list_get(file->TopBoxes, i);
+		GF_Box *a = (GF_Box*)gf_list_get(file->TopBoxes, i);
 		if (a->type==GF_ISOM_BOX_TYPE_MOOF) {
 			moof_index--;
 			if (!moof_index) return (GF_MovieFragmentBox *) a;
@@ -499,6 +499,7 @@
 	}
 	return NULL;
 }
+#endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 
 GF_EXPORT
 u32 gf_isom_segment_get_track_fragment_count(GF_ISOFile *file, u32 moof_index)
@@ -522,7 +523,7 @@
 	if (!file) return 0;
 	gf_list_count(file->TopBoxes);
 	moof = gf_isom_get_moof(file, moof_index);
-	traf = moof ? gf_list_get(moof->TrackList, traf_index-1) : NULL;
+	traf = moof ? (GF_TrackFragmentBox*)gf_list_get(moof->TrackList, traf_index-1) : NULL;
 	if (!traf) return 0;
 	if (decode_time) {
 		*decode_time = traf->tfdt ? traf->tfdt->baseMediaDecodeTime : 0;
@@ -546,34 +547,24 @@
 GF_EXPORT
 u64 gf_isom_get_duration(GF_ISOFile *movie)
 {
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	u32 i;
-	u64 maxDur;
-	GF_TrackBox *trak;
-#endif
-
 	if (!movie || !movie->moov) return 0;
 
 	//if file was open in Write or Edit mode, recompute the duration
 	//the duration of a movie is the MaxDuration of all the tracks...
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-
-	if (movie->openMode != GF_ISOM_OPEN_READ) {
-		maxDur = 0;
-		i=0;
-		while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
-			if( (movie->LastError = SetTrackDuration(trak))	) return 0;
-			if (trak->Header->duration > maxDur)
-				maxDur = trak->Header->duration;
-		}
-		movie->moov->mvhd->duration = maxDur;
-	}
-
+	gf_isom_update_duration(movie);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 	return movie->moov->mvhd->duration;
 }
+//return the duration of the movie, 0 if error
+GF_EXPORT
+u64 gf_isom_get_original_duration(GF_ISOFile *movie)
+{
+	if (!movie || !movie->moov) return 0;
+	return movie->moov->mvhd->original_duration;
+}
 
 //return the creation info of the movie
 GF_EXPORT
@@ -823,7 +814,7 @@
 }
 
 //Return referenceIndex if the given track has a reference to the given TreckID of a given ReferenceType
-//return -1 if error
+//return 0 if error
 GF_EXPORT
 u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID)
 {
@@ -856,7 +847,7 @@
 	if (!trak || !MediaTime) return GF_BAD_PARAM;;
 
 	SegmentStartTime = 0;
-	return GetMediaTime(trak, 0, movieTime, MediaTime, &SegmentStartTime, &mediaOffset, &useEdit, NULL);
+	return GetMediaTime(trak, GF_FALSE, movieTime, MediaTime, &SegmentStartTime, &mediaOffset, &useEdit, NULL);
 }
 
 
@@ -915,7 +906,7 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return NULL;
 	//get the ESD (possibly emulated)
-	Media_GetESD(trak->Media, StreamDescriptionIndex, &esd, 0);
+	Media_GetESD(trak->Media, StreamDescriptionIndex, &esd, GF_FALSE);
 	if (!esd) return NULL;
 	decInfo = (GF_Descriptor *) esd->decoderConfig;
 	esd->decoderConfig = NULL;
@@ -946,6 +937,18 @@
 	return trak->Media->mediaHeader->duration;
 }
 
+//get the media duration (without edit)
+//return 0 if bad param
+GF_EXPORT
+u64 gf_isom_get_media_original_duration(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return 0;
+
+	return trak->Media->mediaHeader->original_duration;
+}
+
 //Get the timeScale of the media. All samples DTS/CTS are expressed in this timeScale
 GF_EXPORT
 u32 gf_isom_get_media_timescale(GF_ISOFile *the_file, u32 trackNumber)
@@ -1074,7 +1077,7 @@
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
-	return trak->Media->handler->handlerType;
+	return (trak->Media && trak->Media->handler) ? trak->Media->handler->handlerType : 0;
 }
 
 Bool IsMP4Description(u32 entryType)
@@ -1086,9 +1089,9 @@
 	case GF_ISOM_BOX_TYPE_ENCA:
 	case GF_ISOM_BOX_TYPE_ENCV:
 	case GF_ISOM_BOX_TYPE_ENCS:
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -1098,9 +1101,9 @@
 	case GF_ISOM_BOX_TYPE_ENCA:
 	case GF_ISOM_BOX_TYPE_ENCV:
 	case GF_ISOM_BOX_TYPE_ENCS:
-		return 1;
+		return GF_TRUE;
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 }
 
@@ -1122,7 +1125,7 @@
 	GF_TrackBox *trak;
 	GF_Box *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !DescriptionIndex) return 0;
+	if (!trak || !DescriptionIndex || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable) return 0;
 	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return 0;
 
@@ -1269,19 +1272,19 @@
 Bool gf_isom_has_sync_shadows(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
-	if (!trak->Media->information->sampleTable->ShadowSync) return 0;
-	if (gf_list_count(trak->Media->information->sampleTable->ShadowSync->entries) ) return 1;
-	return 0;
+	if (!trak) return GF_FALSE;
+	if (!trak->Media->information->sampleTable->ShadowSync) return GF_FALSE;
+	if (gf_list_count(trak->Media->information->sampleTable->ShadowSync->entries) ) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
 Bool gf_isom_has_sample_dependency(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
-	if (!trak->Media->information->sampleTable->SampleDep) return 0;
-	return 1;
+	if (!trak) return GF_FALSE;
+	if (!trak->Media->information->sampleTable->SampleDep) return GF_FALSE;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -1316,11 +1319,12 @@
 	if (!samp) return NULL;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if (sampleNumber<=trak->sample_count_at_seg_start) return NULL;
+	if (sampleNumber<=trak->sample_count_at_seg_start)
+		return NULL;
 	sampleNumber -= trak->sample_count_at_seg_start;
 #endif
 
-	e = Media_GetSample(trak->Media, sampleNumber, &samp, &descIndex, 0, NULL);
+	e = Media_GetSample(trak->Media, sampleNumber, &samp, &descIndex, GF_FALSE, NULL);
 	if (e) {
 		gf_isom_set_last_error(the_file, e);
 		gf_isom_sample_del(&samp);
@@ -1400,7 +1404,7 @@
 #endif
 	samp = gf_isom_sample_new();
 	if (!samp) return NULL;
-	e = Media_GetSample(trak->Media, sampleNumber, &samp, sampleDescriptionIndex, 1, data_offset);
+	e = Media_GetSample(trak->Media, sampleNumber, &samp, sampleDescriptionIndex, GF_TRUE, data_offset);
 	if (e) {
 		gf_isom_set_last_error(the_file, e);
 		gf_isom_sample_del(&samp);
@@ -1436,7 +1440,7 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak) return GF_FALSE;
 	return Media_IsSelfContained(trak->Media, sampleDescriptionIndex);
 }
 
@@ -1585,11 +1589,16 @@
 		}
 	}
 
-	e = Media_GetSample(trak->Media, sampleNumber, sample, StreamDescriptionIndex, 0, NULL);
+	e = Media_GetSample(trak->Media, sampleNumber, sample, StreamDescriptionIndex, GF_FALSE, NULL);
 	if (e) {
 		gf_isom_sample_del(sample);
 		return e;
 	}
+	if (! (*sample)->IsRAP) {
+		Bool has_roll, is_rap;
+		e = gf_isom_get_sample_rap_roll_info(the_file, trackNumber, sampleNumber, &is_rap, &has_roll, NULL);
+		if (is_rap) (*sample)->IsRAP = SAP_TYPE_3;
+	}
 	//optionally get the sample number
 	if (SampleNum) {
 		*SampleNum = sampleNumber;
@@ -1656,7 +1665,7 @@
 	*StreamDescriptionIndex = 0;
 	nextMediaTime = 0;
 
-	e = GetMediaTime(trak, (SearchMode==GF_ISOM_SEARCH_SYNC_FORWARD) ? 1 : 0, movieTime, &mediaTime, &segStartTime, &mediaOffset, &useEdit, &nextMediaTime);
+	e = GetMediaTime(trak, (SearchMode==GF_ISOM_SEARCH_SYNC_FORWARD) ? GF_TRUE : GF_FALSE, movieTime, &mediaTime, &segStartTime, &mediaOffset, &useEdit, &nextMediaTime);
 	if (e) return e;
 
 	/*here we check if we were playing or not and return no sample in normal search modes*/
@@ -1696,9 +1705,11 @@
 	e = gf_isom_get_sample_for_media_time(the_file, trackNumber, mediaTime, StreamDescriptionIndex, SearchMode, sample, &sampNum);
 	if (e) {
 		if (e==GF_EOS) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			//movie is fragmented and samples not yet received, return EOS
 			if (the_file->moov->mvex && !trak->Media->information->sampleTable->SampleSize->sampleCount)
 				return e;
+#endif
 
 			if (nextMediaTime)
 				return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber);
@@ -1759,17 +1770,17 @@
 	GF_TrackBox *trak;
 	u32 count;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak) return GF_FALSE;
 	*mediaOffset = 0;
-	if (!trak->editBox || !trak->editBox->editList) return 0;
+	if (!trak->editBox || !trak->editBox->editList) return GF_FALSE;
 
 	count = gf_list_count(trak->editBox->editList->entryList);
-	ent = gf_list_get(trak->editBox->editList->entryList, 0);
-	if (!ent) return 1;
+	ent = (GF_EdtsEntry*)gf_list_get(trak->editBox->editList->entryList, 0);
+	if (!ent) return GF_TRUE;
 	/*mediaRate>0, the track playback shall start at media time>0 -> mediaOffset is < 0 */
 	if ((count==1) && (ent->mediaRate==1)) {
 		*mediaOffset = - ent->mediaTime;
-		return 0;
+		return GF_FALSE;
 	} else if (count==2) {
 		/*mediaRate==-1, the track playback shall be empty for segmentDuration -> mediaOffset is > 0 */
 		if ((ent->mediaRate==-1) || (ent->mediaTime==-1)) {
@@ -1778,10 +1789,10 @@
 			time *= trak->Media->mediaHeader->timeScale;
 
 			*mediaOffset = (s64) time;
-			return 0;
+			return GF_FALSE;
 		}
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -1917,10 +1928,10 @@
 	GF_TrackBox *trak;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak) return GF_FALSE;
 
-	if (trak->Media->information->sampleTable->PaddingBits) return 1;
-	return 0;
+	if (trak->Media->information->sampleTable->PaddingBits) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -1951,14 +1962,14 @@
 
 	if (trackNumber) {
 		trak = gf_isom_get_track_from_file(movie, trackNumber);
-		if (!trak) return 0;
+		if (!trak) return GF_OK;
 		udta = trak->udta;
 	} else {
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_BAD_PARAM;
 	if (udta_idx>gf_list_count(udta->recordList)) return GF_BAD_PARAM;
-	map = gf_list_get(udta->recordList, udta_idx - 1);
+	map = (GF_UserDataMap*)gf_list_get(udta->recordList, udta_idx - 1);
 	if (UserDataType) *UserDataType = map->boxType;
 	if (UUID) memcpy(*UUID, map->uuid, 16);
 	return GF_OK;
@@ -2048,14 +2059,22 @@
 	//serialize all boxes
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	i=0;
-	while ( (ptr = gf_list_enum(map->other_boxes, &i))) {
+	while ( (ptr = (GF_UnknownBox*)gf_list_enum(map->other_boxes, &i))) {
 		u32 s = ptr->dataSize+8;
 		if (ptr->type==GF_ISOM_BOX_TYPE_UUID) s += 16;
 
 		gf_bs_write_u32(bs, s);
 		gf_bs_write_u32(bs, ptr->type);
 		if (ptr->type==GF_ISOM_BOX_TYPE_UUID) gf_bs_write_data(bs, (char *) map->uuid, 16);
-		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
+		if (ptr->data) {
+			gf_bs_write_data(bs, ptr->data, ptr->dataSize);
+		} else if (ptr->other_boxes) {
+#ifndef GPAC_DISABLE_ISOM_WRITE
+			gf_isom_box_array_write((GF_Box *)ptr, ptr->other_boxes, bs);
+#else
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ISOBMF: udta is a box-list - cannot export in read-only version of libisom in GPAC\n" ));
+#endif
+		}
 	}
 	gf_bs_get_content(bs, userData, userDataSize);
 	gf_bs_del(bs);
@@ -2270,11 +2289,11 @@
 GF_EXPORT
 GF_Err gf_isom_refresh_fragmented(GF_ISOFile *movie, u64 *MissingBytes, const char *new_location)
 {
-	u32 i;
-	u64 prevsize, size;
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	return GF_NOT_SUPPORTED;
 #else
+	u64 prevsize, size;
+	u32 i;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
 	if (movie->openMode != GF_ISOM_OPEN_READ) return GF_BAD_PARAM;
 
@@ -2314,11 +2333,13 @@
 #endif
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 GF_EXPORT
 void gf_isom_set_single_moof_mode(GF_ISOFile *movie, Bool mode)
 {
 	movie->single_moof_mode = mode;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_isom_reset_data_offset(GF_ISOFile *movie, u64 *top_box_start)
@@ -2346,7 +2367,9 @@
 GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count)
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	u32 i;
+	u32 i, j;
+	GF_Box *a;
+
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(movie->moov->trackList, i);
@@ -2375,6 +2398,29 @@
 		RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 		RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
 
+		gf_isom_box_array_del(stbl->sai_offsets);
+		stbl->sai_offsets = NULL;
+
+		gf_isom_box_array_del(stbl->sai_sizes);
+		stbl->sai_sizes = NULL;
+
+		gf_isom_box_array_del(stbl->sampleGroups);
+		stbl->sampleGroups = NULL;
+
+		j = stbl->nb_sgpd_in_stbl;
+		while ((a = (GF_Box *)gf_list_enum(stbl->sampleGroupsDescription, &j))) {
+			gf_isom_box_del(a);
+			j--;
+			gf_list_rem(stbl->sampleGroupsDescription, j);
+		}
+
+		j = stbl->nb_other_boxes_in_stbl;
+		while ((a = (GF_Box *)gf_list_enum(stbl->other_boxes, &j))) {
+			gf_isom_box_del(a);
+			j--;
+			gf_list_rem(stbl->other_boxes, j);
+		}
+
 		if (reset_sample_count) {
 			trak->Media->information->sampleTable->SampleSize->sampleCount = 0;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -2397,17 +2443,20 @@
 	Bool has_scalable;
 	GF_Box *a;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
-	has_scalable = gf_isom_has_scalable_layer(movie);
+	has_scalable = gf_isom_needs_layer_reconstruction(movie);
 	base_track_sample_count = 0;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
-		trak->first_traf_merged = 0;
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
+		trak->first_traf_merged = GF_FALSE;
 		if (trak->Media->information->dataHandler == movie->movieFileMap) {
 			trak->Media->information->dataHandler = NULL;
 		}
 		if (trak->Media->information->scalableDataHandler == movie->movieFileMap) {
 			trak->Media->information->scalableDataHandler = NULL;
 		} else {
+			if (trak->Media->information->scalableDataHandler==trak->Media->information->dataHandler)
+				trak->Media->information->dataHandler = NULL;
+
 			gf_isom_datamap_del(trak->Media->information->scalableDataHandler);
 			trak->Media->information->scalableDataHandler = NULL;
 		}
@@ -2427,9 +2476,12 @@
 					gf_isom_get_reference(movie, i+1, GF_ISOM_REF_BASE, 1, &on_track);
 
 					base = gf_isom_get_track_from_file(movie, on_track);
-					if (!base) scalable = GF_FALSE;
-
-					base_track_sample_count = base->Media->information->sampleTable->SampleSize->sampleCount;
+					if (!base) {
+						scalable = GF_FALSE;
+						base_track_sample_count=0;
+					} else {
+						base_track_sample_count = base->Media->information->sampleTable->SampleSize->sampleCount;
+					}
 				}
 			}
 
@@ -2454,6 +2506,29 @@
 			RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 			RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
 
+			gf_isom_box_array_del(stbl->sai_offsets);
+			stbl->sai_offsets = NULL;
+
+			gf_isom_box_array_del(stbl->sai_sizes);
+			stbl->sai_sizes = NULL;
+
+			gf_isom_box_array_del(stbl->sampleGroups);
+			stbl->sampleGroups = NULL;
+
+			j = stbl->nb_sgpd_in_stbl;
+			while ((a = (GF_Box *)gf_list_enum(stbl->sampleGroupsDescription, &j))) {
+				gf_isom_box_del(a);
+				j--;
+				gf_list_rem(stbl->sampleGroupsDescription, j);
+			}
+
+
+			j = stbl->nb_other_boxes_in_stbl;
+			while ((a = (GF_Box *)gf_list_enum(stbl->other_boxes, &j))) {
+				gf_isom_box_del(a);
+				j--;
+				gf_list_rem(stbl->other_boxes, j);
+			}
 		}
 
 
@@ -2482,9 +2557,9 @@
 	u64 MissingBytes;
 	GF_Err e;
 	u32 i;
-	Bool segment_map_assigned = 0;
-	Bool is_scalable_segment = (flags & GF_ISOM_SEGMENT_SCALABLE_FLAG) ? 1 : 0;
-	Bool no_order_check = (flags & GF_ISOM_SEGMENT_NO_ORDER_FLAG) ? 1: 0;
+	Bool segment_map_assigned = GF_FALSE;
+	Bool is_scalable_segment = (flags & GF_ISOM_SEGMENT_SCALABLE_FLAG) ? GF_TRUE : GF_FALSE;
+	Bool no_order_check = (flags & GF_ISOM_SEGMENT_NO_ORDER_FLAG) ? GF_TRUE: GF_FALSE;
 	GF_DataMap *tmp = NULL;
 	GF_DataMap *orig_file_map = NULL;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
@@ -2500,7 +2575,7 @@
 		movie->movieFileMap = tmp;
 	} else {
 		if (movie->movieFileMap)
-			gf_isom_release_segment(movie, 0);
+			gf_isom_release_segment(movie, GF_FALSE);
 
 		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &movie->movieFileMap);
 		if (e) return e;
@@ -2515,7 +2590,7 @@
 	}
 
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 
 		if (!is_scalable_segment) {
 			/*reset data handler to new segment*/
@@ -2523,27 +2598,27 @@
 				trak->Media->information->dataHandler = movie->movieFileMap;
 			}
 		} else {
-			trak->present_in_scalable_segment = 0;
+			trak->present_in_scalable_segment = GF_FALSE;
 		}
 	}
 	if (no_order_check) movie->NextMoofNumber = 0;
 
 
 	//ok parse root boxes
-	e = gf_isom_parse_movie_boxes(movie, &MissingBytes, 1);
+	e = gf_isom_parse_movie_boxes(movie, &MissingBytes, GF_TRUE);
 
 	if (!is_scalable_segment)
 		return e;
 
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 		if (trak->present_in_scalable_segment) {
 			/*store the temp dataHandler into scalableDataHandler so that it will not be destroyed
 			if we append another representation - destruction of this data handler is done in release_segment*/
 			trak->Media->information->scalableDataHandler = tmp;
 			if (!segment_map_assigned) {
 				trak->Media->information->scalableDataHandler = tmp;
-				segment_map_assigned = 1;
+				segment_map_assigned = GF_TRUE;
 			}
 			//and update the regular dataHandler for the Media_GetSample function
 			trak->Media->information->dataHandler = tmp;
@@ -2567,7 +2642,7 @@
 	track_id = 0;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		s32 ref;
-		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 		if (! trak->present_in_scalable_segment) continue;
 
 		ref = gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_SCAL);
@@ -2606,7 +2681,7 @@
 	GF_TrackBox *trak;
 	GF_GenericSampleDescription *udesc;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !StreamDescriptionIndex) return NULL;
+	if (!trak || !StreamDescriptionIndex || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable) return 0;
 
 	entry = (GF_GenericVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
 	//no entry or MPEG entry:
@@ -2773,19 +2848,21 @@
 GF_Err gf_isom_get_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *hSpacing, u32 *vSpacing)
 {
 	GF_TrackBox *trak;
-	GF_SampleEntryBox *entry;
+	GF_VisualSampleEntryBox *entry;
 	GF_SampleDescriptionBox *stsd;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
+	if (!trak || !hSpacing || !vSpacing) return GF_BAD_PARAM;
+	*hSpacing = 1;
+	*vSpacing = 1;
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
 	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) return movie->LastError = GF_BAD_PARAM;
 
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_VisualSampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
-	if (entry == NULL) return GF_BAD_PARAM;
+	if (entry == NULL) return GF_OK;
 
 	//valid for MPEG visual, JPG and 3GPP H263
 	switch (entry->type) {
@@ -2805,11 +2882,13 @@
 	case GF_ISOM_BOX_TYPE_SHC1:
 	case GF_ISOM_BOX_TYPE_SHV1:
 	case GF_ISOM_BOX_TYPE_HVT1:
-		*hSpacing = ((GF_VisualSampleEntryBox*)entry)->pasp ? ((GF_VisualSampleEntryBox*)entry)->pasp->hSpacing : 0;
-		*vSpacing = ((GF_VisualSampleEntryBox*)entry)->pasp ? ((GF_VisualSampleEntryBox*)entry)->pasp->vSpacing : 0;
+		if (entry->pasp) {
+			*hSpacing = entry->pasp->hSpacing;
+			*vSpacing = entry->pasp->vSpacing;
+		}
 		return GF_OK;
 	default:
-		return GF_BAD_PARAM;
+		return GF_OK;
 	}
 }
 
@@ -2906,7 +2985,7 @@
 	u32 count, i, nb_any, nb_a, nb_v, nb_scene, nb_od, nb_text;
 	nb_a = nb_v = nb_any = nb_scene = nb_od = nb_text = 0;
 
-	if (!file->moov) return 0;
+	if (!file->moov) return GF_FALSE;
 	count = gf_isom_get_track_count(file);
 	for (i=0; i<count; i++) {
 		u32 mtype = gf_isom_get_media_type(file, i+1);
@@ -2936,15 +3015,15 @@
 			break;
 		}
 	}
-	if (nb_any) return 0;
-	if ((nb_scene<=1) && (nb_od<=1) && (nb_a<=1) && (nb_v<=1) && (nb_text<=1) ) return 1;
-	return 0;
+	if (nb_any) return GF_FALSE;
+	if ((nb_scene<=1) && (nb_od<=1) && (nb_a<=1) && (nb_v<=1) && (nb_text<=1) ) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
 Bool gf_isom_is_JPEG2000(GF_ISOFile *mov)
 {
-	return (mov && mov->is_jp2) ? 1 : 0;
+	return (mov && mov->is_jp2) ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
@@ -3134,7 +3213,7 @@
 	if (tag==GF_ISOM_ITUNE_PROBE) return GF_OK;
 
 	i=0;
-	while ( (info=gf_list_enum(ilst->other_boxes, &i))) {
+	while ( (info=(GF_ListItemBox*)gf_list_enum(ilst->other_boxes, &i))) {
 		if (info->type==tag) break;
 		/*special cases*/
 		if ((tag==GF_ISOM_ITUNE_GENRE) && (info->type==(u32) GF_ISOM_BOX_TYPE_0xA9GEN)) break;
@@ -3173,7 +3252,7 @@
 	if (!trak->udta) return GF_OK;
 
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
-	if (!map) return 0;
+	if (!map) return GF_OK;
 	*nb_groups = gf_list_count(map->other_boxes);
 	return GF_OK;
 }
@@ -3190,34 +3269,12 @@
 
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 	if (!map) return NULL;
-	tsel = gf_list_get(map->other_boxes, group_index-1);
+	tsel = (GF_TrackSelectionBox*)gf_list_get(map->other_boxes, group_index-1);
 	*switchGroupID = tsel->switchGroup;
 	*criteriaListSize = tsel->attributeListCount;
 	return (const u32 *) tsel->attributeList;
 }
 
-
-GF_EXPORT
-GF_Err gf_isom_get_timed_meta_data_info(GF_ISOFile *file, u32 track, u32 sampleDescription, Bool *is_xml, const char **mime_or_namespace, const char **content_encoding, const char **schema_loc)
-{
-	GF_TrackBox *trak;
-	GF_MetaDataSampleEntryBox *ptr;
-	trak = gf_isom_get_track_from_file(file, track);
-	if (!trak || !sampleDescription) return GF_BAD_PARAM;
-	ptr = (GF_MetaDataSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescription-1);
-	if (!ptr) return GF_BAD_PARAM;
-
-	if (ptr->type==GF_ISOM_BOX_TYPE_METX) {
-		if (is_xml) *is_xml = 1;
-		if (schema_loc) *schema_loc = ptr->xml_schema_loc;
-	} else {
-		if (schema_loc) *schema_loc = NULL;
-	}
-	if (mime_or_namespace) *mime_or_namespace = ptr->mime_type_or_namespace;
-	if (content_encoding) *content_encoding = ptr->content_encoding;
-	return GF_OK;
-}
-
 GF_EXPORT
 u32 gf_isom_get_next_alternate_group_id(GF_ISOFile *movie)
 {
@@ -3247,11 +3304,11 @@
 	if (!size || !priority || !discardable) return GF_BAD_PARAM;
 
 	if (!subSampleNumber || (subSampleNumber>count)) return GF_BAD_PARAM;
-	entry = gf_list_get(sub_sample->SubSamples, subSampleNumber-1);
+	entry = (GF_SubSampleEntry*)gf_list_get(sub_sample->SubSamples, subSampleNumber-1);
 	*size = entry->subsample_size;
 	*priority = entry->subsample_priority;
 	*reserved = entry->reserved;
-	*discardable = entry->discardable ? 1 : 0;
+	*discardable = entry->discardable ? GF_TRUE : GF_FALSE;
 	return GF_OK;
 }
 
@@ -3294,7 +3351,7 @@
 	*rvc_predefined = entry->rvcc->predefined_rvc_config;
 	if (entry->rvcc->rvc_meta_idx) {
 		if (!data || !size) return GF_OK;
-		return gf_isom_extract_meta_item_mem(movie, 0, track, entry->rvcc->rvc_meta_idx, data, size, mime);
+		return gf_isom_extract_meta_item_mem(movie, GF_FALSE, track, entry->rvcc->rvc_meta_idx, data, size, mime);
 	}
 	return GF_OK;
 }
@@ -3304,11 +3361,11 @@
 {
 	u32 i;
 	for (i=0; i<gf_list_count(movie->TopBoxes); i++) {
-		GF_Box *b = gf_list_get(movie->TopBoxes, i);
-		if (b->type == GF_ISOM_BOX_TYPE_MOOV) return 1;
-		if (b->type == GF_ISOM_BOX_TYPE_MDAT) return 0;
+		GF_Box *b = (GF_Box*)gf_list_get(movie->TopBoxes, i);
+		if (b->type == GF_ISOM_BOX_TYPE_MOOV) return GF_TRUE;
+		if (b->type == GF_ISOM_BOX_TYPE_MDAT) return GF_FALSE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -3317,7 +3374,7 @@
 	u32 i;
 	if (!movie) return;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 		trak->Media->information->sampleTable->SampleSize->sampleCount = 0;
 #ifdef GPAC_DISABLE_ISOM_FRAGMENTS
 	}
@@ -3336,8 +3393,8 @@
 	GF_TrackBox *trak;
 	u32 i, count;
 
-	if (is_rap) *is_rap = 0;
-	if (has_roll) *has_roll = 0;
+	if (is_rap) *is_rap = GF_FALSE;
+	if (has_roll) *has_roll = GF_FALSE;
 	if (roll_distance) *roll_distance = 0;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -3347,18 +3404,18 @@
 	if (!sample_number) {
 		count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
 		for (i=0; i<count; i++) {
-			GF_SampleGroupDescriptionBox *sgdesc = gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
+			GF_SampleGroupDescriptionBox *sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
 			switch (sgdesc->grouping_type) {
 			case GF_4CC('r','a','p',' '):
-				if (is_rap) *is_rap = 1;
+				if (is_rap) *is_rap = GF_TRUE;
 				break;
 			case GF_4CC('r','o','l','l'):
-				if (has_roll) *has_roll = 1;
+				if (has_roll) *has_roll = GF_TRUE;
 				if (roll_distance) {
 					s32 max_roll = 0;
 					u32 j;
 					for (j=0; j<gf_list_count(sgdesc->group_descriptions); j++) {
-						GF_RollRecoveryEntry *roll_entry = gf_list_get(sgdesc->group_descriptions, j);
+						GF_RollRecoveryEntry *roll_entry = (GF_RollRecoveryEntry*)gf_list_get(sgdesc->group_descriptions, j);
 						if (max_roll < roll_entry->roll_distance)
 							max_roll = roll_entry->roll_distance;
 					}
@@ -3378,7 +3435,7 @@
 		u32 first_sample_in_entry, last_sample_in_entry;
 		first_sample_in_entry = 1;
 		group_desc_index = 0;
-		sg = gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
+		sg = (GF_SampleGroupBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
 		for (j=0; j<sg->entry_count; j++) {
 			last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
 			if ((sample_number<first_sample_in_entry) || (sample_number>last_sample_in_entry)) {
@@ -3394,7 +3451,7 @@
 
 		sgdesc = NULL;
 		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription); j++) {
-			sgdesc = gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, j);
+			sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, j);
 			if (sgdesc->grouping_type==sg->grouping_type) break;
 			sgdesc = NULL;
 		}
@@ -3403,10 +3460,10 @@
 
 		switch (sgdesc->grouping_type) {
 		case GF_4CC('r','a','p',' '):
-			if (is_rap) *is_rap = (group_desc_index-1) ? 1 : 0;
+			if (is_rap) *is_rap = GF_TRUE;
 			break;
 		case GF_4CC('r','o','l','l'):
-			if (has_roll) *has_roll = 1;
+			if (has_roll) *has_roll = GF_TRUE;
 			if (roll_distance) {
 				GF_RollRecoveryEntry *roll_entry = (GF_RollRecoveryEntry *) gf_list_get(sgdesc->group_descriptions, group_desc_index - 1);
 				if (roll_entry) *roll_distance = roll_entry->roll_distance;
@@ -3417,48 +3474,54 @@
 	return GF_OK;
 }
 
-GF_EXPORT
-Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const char **data, u32 *size)
+GF_DefaultSampleGroupDescriptionEntry * gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp)
 {
-
-	GF_TrackBox *trak;
 	u32 i, count;
 
-	if (default_index) *default_index = 0;
-	if (size) *size = 0;
-	if (data) *data = NULL;
-
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !sample_description_index) return 0;
-	if (!trak->Media->information->sampleTable->sampleGroupsDescription) return 0;
+	if (!trak || !sample_description_index) return NULL;
+	if (!trak->Media->information->sampleTable->sampleGroupsDescription) return NULL;
 
 	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
 	for (i=0; i<count; i++) {
-		GF_DefaultSampleGroupDescriptionEntry *entry;
-		GF_SampleGroupDescriptionBox *sgdesc = gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
-		if (sgdesc->grouping_type != grouping_type)
-			continue;
+		GF_SampleGroupDescriptionBox *sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
+		if (sgdesc->grouping_type != grouping_type) continue;
 
 		if (sgdesc->default_description_index && !sample_description_index) sample_description_index = sgdesc->default_description_index;
-		if (default_index) *default_index = sgdesc->default_description_index ;
 
-		if (!sample_description_index) return 0;
+		if (default_index) *default_index = sgdesc->default_description_index ;
+		if (out_sgdp) *out_sgdp = sgdesc;
 
-		switch (grouping_type) {
-		case GF_4CC('r','a','p',' '):
-		case GF_4CC('r','o','l','l'):
-		case GF_4CC( 's', 'e', 'i', 'g' ):
-			return 1;
-		default:
-			entry = gf_list_get(sgdesc->group_descriptions, sample_description_index-1);
-			if (entry && data) *data = (char *) entry->data;
-			if (entry && size) *size = entry->length;
-			return 1;
-		}
+		if (!sample_description_index) return NULL;
+		return (GF_DefaultSampleGroupDescriptionEntry*)gf_list_get(sgdesc->group_descriptions, sample_description_index-1);
 	}
-	return 0;
+	return NULL;
 }
 
+GF_EXPORT
+Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const char **data, u32 *size)
+{
+	GF_DefaultSampleGroupDescriptionEntry *sg_entry;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+
+	if (default_index) *default_index = 0;
+	if (size) *size = 0;
+	if (data) *data = NULL;
+
+	sg_entry = gf_isom_get_sample_group_info_entry(the_file, trak, grouping_type, sample_description_index, default_index, NULL);
+	if (!sg_entry) return GF_FALSE;
+
+	switch (grouping_type) {
+	case GF_4CC('r','a','p',' '):
+	case GF_4CC('r','o','l','l'):
+	case GF_4CC( 's', 'e', 'i', 'g' ):
+		return GF_TRUE;
+	default:
+		if (sg_entry && data) *data = (char *) sg_entry->data;
+		if (sg_entry && size) *size = sg_entry->length;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 //return the duration of the movie+fragments if known, 0 if error
@@ -3477,7 +3540,7 @@
 	u32 i=0;
 	u32 nb_frags = 0;
 	GF_Box *b;
-	while ((b=gf_list_enum(movie->TopBoxes, &i))) {
+	while ((b=(GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
 		if (segments_only) {
 			if (b->type==GF_ISOM_BOX_TYPE_SIDX)
 				nb_frags++;
@@ -3500,21 +3563,23 @@
 
 	*nb_samples = 0;
 	*duration = 0;
-	while ((moof=gf_list_enum(movie->TopBoxes, &i))) {
+	while ((moof=(GF_MovieFragmentBox*)gf_list_enum(movie->TopBoxes, &i))) {
 		if (moof->type==GF_ISOM_BOX_TYPE_MOOF) {
 			u32 j=0;
-			while ((traf=gf_list_enum( moof->TrackList, &j))) {
+			while ((traf=(GF_TrackFragmentBox*)gf_list_enum( moof->TrackList, &j))) {
 				if (traf->tfhd->trackID != trackID)
 					continue;
 
-				def_duration = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DUR) ? traf->tfhd->def_sample_duration : traf->trex->def_sample_duration;
+				def_duration = 0;
+				if (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DUR) def_duration = traf->tfhd->def_sample_duration;
+				else if (traf->trex) def_duration = traf->trex->def_sample_duration;
 
 				for (k=0; k<gf_list_count(traf->TrackRuns); k++) {
-					GF_TrackFragmentRunBox *trun = gf_list_get(traf->TrackRuns, k);
+					GF_TrackFragmentRunBox *trun = (GF_TrackFragmentRunBox*)gf_list_get(traf->TrackRuns, k);
 					*nb_samples += gf_list_count(trun->entries);
 
 					for (l=0; l<gf_list_count(trun->entries); l++) {
-						GF_TrunEntry *ent = gf_list_get(trun->entries, l);
+						GF_TrunEntry *ent = (GF_TrunEntry*)gf_list_get(trun->entries, l);
 
 						samp_dur = def_duration;
 						if (trun->flags & GF_ISOM_TRUN_DURATION) samp_dur = ent->Duration;
@@ -3540,9 +3605,9 @@
 
 	/*get base*/
 	dpnd = NULL;
-	trak->has_base_layer = 0;
+	trak->has_base_layer = GF_FALSE;
 	Track_FindRef(trak, GF_ISOM_REF_SCAL, &dpnd);
-	if (dpnd) trak->has_base_layer = 1;
+	if (dpnd) trak->has_base_layer = GF_TRUE;
 	return GF_OK;
 }
 
@@ -3564,7 +3629,7 @@
 }
 
 GF_EXPORT
-Bool gf_isom_has_scalable_layer(GF_ISOFile *file)
+Bool gf_isom_needs_layer_reconstruction(GF_ISOFile *file)
 {
 	u32 count, i;
 	if (!file)
@@ -3574,6 +3639,9 @@
 		if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_SCAL) > 0) {
 			return GF_TRUE;
 		}
+		if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_SABT) > 0) {
+			return GF_TRUE;
+		}
 	}
 	return GF_FALSE;
 }
@@ -3660,7 +3728,7 @@
 	if (trak->Media->information->sampleTable->sampleGroups) {
 		count = gf_list_count(trak->Media->information->sampleTable->sampleGroups);
 		for (i=0; i<count; i++) {
-			sample_group = gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
+			sample_group = (GF_SampleGroupBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
 			if (sample_group->grouping_type == GF_4CC( 's', 'e', 'i', 'g' ))
 				break;
 			sample_group = NULL;
@@ -3679,11 +3747,12 @@
 			}
 		}
 	}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (!group_desc_index && traf && traf->sampleGroups) {
 		count = gf_list_count(traf->sampleGroups);
 		for (i=0; i<count; i++) {
 			group_desc_index = 0;
-			sample_group = gf_list_get(traf->sampleGroups, i);
+			sample_group = (GF_SampleGroupBox*)gf_list_get(traf->sampleGroups, i);
 			if (sample_group->grouping_type == GF_4CC( 's', 'e', 'i', 'g' ))
 				break;
 			sample_group = NULL;
@@ -3702,6 +3771,7 @@
 			}
 		}
 	}
+#endif
 	/*no sampleGroup info associated*/
 	if (!group_desc_index) return GF_OK;
 
@@ -3709,17 +3779,19 @@
 
 	if (group_desc_index<=0x10000) {
 		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription); j++) {
-			sgdesc = gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, j);
+			sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, j);
 			if (sgdesc->grouping_type==sample_group->grouping_type) break;
 			sgdesc = NULL;
 		}
 	} else if (traf) {
 		group_desc_index -= 0x10000;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		for (j=0; j<gf_list_count(traf->sampleGroupsDescription); j++) {
-			sgdesc = gf_list_get(traf->sampleGroupsDescription, j);
+			sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(traf->sampleGroupsDescription, j);
 			if (sgdesc->grouping_type==sample_group->grouping_type) break;
 			sgdesc = NULL;
 		}
+#endif
 	}
 	/*no sampleGroup description found for this group (invalid file)*/
 	if (!sgdesc) return GF_ISOM_INVALID_FILE;
@@ -3782,7 +3854,7 @@
 	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
 	*id = gf_bs_read_u16(bs);
 	*independent = gf_bs_read_int(bs, 2);
-	*full_frame = gf_bs_read_int(bs, 1);
+	*full_frame = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 5);
 	*x = *full_frame ? 0 : gf_bs_read_u16(bs);
 	*y = *full_frame ? 0 : gf_bs_read_u16(bs);
@@ -3799,10 +3871,9 @@
 	u32 size;
 
 	if (!gf_isom_get_sample_group_info(file, trackNumber, sample_description_index, GF_4CC('t','r','i','f'), default_sample_group_index, &data, &size))
-		return 0;
+		return GF_FALSE;
 	gf_isom_parse_trif_info(data, size, id, independent, full_frame, x, y, w, h);
-	return 1;
+	return GF_TRUE;
 }
 
 #endif /*GPAC_DISABLE_ISOM*/
-

v0.5.2.tar.gz/src/isomedia/isom_store.c -> v0.6.1.tar.gz/src/isomedia/isom_store.c Changed

@@ -199,8 +199,6 @@
 	u32 i, j, k, l, last;
 	TrackWriter *writer;
 	GF_StscEntry *ent;
-	GF_ChunkOffsetBox *stco;
-	GF_ChunkLargeOffsetBox *co64;
 
 	if (file->meta) ShiftMetaOffset(file->meta, offset);
 	if (file->moov && file->moov->meta) ShiftMetaOffset(file->moov->meta, offset);
@@ -216,39 +214,46 @@
 
 			//OK, get the chunk(s) number(s) and "shift" its (their) offset(s).
 			if (writer->stco->type == GF_ISOM_BOX_TYPE_STCO) {
-				stco = (GF_ChunkOffsetBox *) writer->stco;
+				GF_ChunkLargeOffsetBox *new_stco64 = NULL;
+				GF_ChunkOffsetBox *stco = (GF_ChunkOffsetBox *) writer->stco;
+
 				//be carefull for the last entry, nextChunk is set to 0 in edit mode...
 				last = ent->nextChunk ? ent->nextChunk : stco->nb_entries + 1;
 				for (k = ent->firstChunk; k < last; k++) {
 
-					if (stco->offsets[k-1] + offset > 0xFFFFFFFF) {
-						//too bad, rewrite the table....
-						co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
-						if (!co64) return GF_OUT_OF_MEM;
-						co64->nb_entries = stco->nb_entries;
-						co64->offsets = (u64*)gf_malloc(co64->nb_entries * sizeof(u64));
-						if (!co64) {
-							gf_isom_box_del((GF_Box *)co64);
-							return GF_OUT_OF_MEM;
-						}
-						//duplicate the table
-						for (l = 0; l < co64->nb_entries; l++) {
-							co64->offsets[l] = (u64) stco->offsets[l];
-							if (l + 1 == k) co64->offsets[l] += offset;
+					//we need to rewrite the table: only allocate co64 if not done previously and convert all offsets
+					//to co64. Then (whether co64 was created or not) adjust the offset
+					//Do not reassign table until we are done with the current sampleToChunk processing
+					//since we have a test on stco->offsets[k-1], we need to keep stco untouched
+					if (new_stco64 || file->force_co64 || (stco->offsets[k-1] + offset > 0xFFFFFFFF)) {
+						if (!new_stco64) {
+							new_stco64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
+							if (!new_stco64) return GF_OUT_OF_MEM;
+							new_stco64->nb_entries = stco->nb_entries;
+							new_stco64->offsets = (u64 *) gf_malloc(new_stco64->nb_entries * sizeof(u64));
+							if (!new_stco64->offsets) return GF_OUT_OF_MEM;
+							//copy over the stco table
+							for (l = 0; l < new_stco64->nb_entries; l++) {
+								new_stco64->offsets[l] = (u64) stco->offsets[l];
+							}
 						}
-						//and replace our box
-						gf_isom_box_del(writer->stco);
-						writer->stco = (GF_Box *)co64;
+						new_stco64->offsets[k-1] += offset;
 					} else {
 						stco->offsets[k-1] += (u32) offset;
 					}
 				}
+				if (new_stco64) {
+					//done with this sampleToChunk entry, replace the box if we moved to co64
+					gf_isom_box_del(writer->stco);
+					writer->stco = (GF_Box *)new_stco64;
+					new_stco64 = NULL;
+				}
 			} else {
-				co64 = (GF_ChunkLargeOffsetBox *) writer->stco;
+				GF_ChunkLargeOffsetBox *stco64 = (GF_ChunkLargeOffsetBox *) writer->stco;
 				//be carefull for the last entry ...
-				last = ent->nextChunk ? ent->nextChunk : co64->nb_entries + 1;
+				last = ent->nextChunk ? ent->nextChunk : stco64->nb_entries + 1;
 				for (k = ent->firstChunk; k < last; k++) {
-					co64->offsets[k-1] += offset;
+					stco64->offsets[k-1] += offset;
 				}
 			}
 		}
@@ -418,11 +423,11 @@
 				FILE *src=NULL;
 
 				if (!iinf->data_len) {
-					src = gf_f64_open(iinf->full_path, "rb");
+					src = gf_fopen(iinf->full_path, "rb");
 					if (!src) continue;
-					gf_f64_seek(src, 0, SEEK_END);
-					it_size = gf_f64_tell(src);
-					gf_f64_seek(src, 0, SEEK_SET);
+					gf_fseek(src, 0, SEEK_END);
+					it_size = gf_ftell(src);
+					gf_fseek(src, 0, SEEK_SET);
 				} else {
 					it_size = iinf->data_len;
 				}
@@ -452,7 +457,7 @@
 						gf_bs_write_data(bs, iinf->full_path, iinf->data_len);
 					}
 				}
-				if (src) fclose(src);
+				if (src) gf_fclose(src);
 			}
 			else if (gf_list_count(iloc->extent_entries)) {
 				u32 j;
@@ -774,7 +779,7 @@
 		e = gf_isom_box_write((GF_Box *)movie->pdin, bs);
 		if (e) goto exit;
 	}
-	//What we will do is first emulate the write from the begining...
+	//What we will do is first emulate the write from the beginning...
 	//note: this will set the size of the mdat
 	e = DoWrite(mw, writers, bs, 1, gf_bs_get_position(bs));
 	if (e) goto exit;
@@ -787,9 +792,6 @@
 	//get the size and see if it has changed (eg, we moved to 64 bit offsets)
 	finalSize = GetMoovAndMetaSize(movie, writers);
 	if (firstSize != finalSize) {
-		//we need to remove our offsets
-		ResetWriters(writers);
-		//finalOffset = (finalSize > 0xFFFFFFFF ? finalSize + 8 : finalSize) + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
 		finalOffset = finalSize + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
 		//OK, now we're sure about the final size.
 		//we don't need to re-emulate, as the only thing that changed is the offset
@@ -1209,8 +1211,6 @@
 	//get the size and see if it has changed (eg, we moved to 64 bit offsets)
 	finalSize = GetMoovAndMetaSize(movie, writers);
 	if (firstSize != finalSize) {
-		//we need to remove our offsets
-		ResetWriters(writers);
 		finalOffset = finalSize;
 		if (movie->mdat->dataSize) finalOffset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
 		//OK, now we're sure about the final size -> shift the offsets
@@ -1290,13 +1290,13 @@
 			is_stdout = 1;
 
 		//OK, we need a new bitstream
-		stream = is_stdout ? stdout : gf_f64_open(movie->finalName, "w+b");
+		stream = is_stdout ? stdout : gf_fopen(movie->finalName, "w+b");
 		if (!stream)
 			return GF_IO_ERR;
 		bs = gf_bs_from_file(stream, GF_BITSTREAM_WRITE);
 		if (!bs) {
 			if (!is_stdout)
-				fclose(stream);
+				gf_fclose(stream);
 			return GF_OUT_OF_MEM;
 		}
 
@@ -1322,7 +1322,7 @@
 
 		gf_bs_del(bs);
 		if (!is_stdout)
-			fclose(stream);
+			gf_fclose(stream);
 	}
 	if (mw.buffer) gf_free(mw.buffer);
 	if (mw.nb_done<mw.total_samples) {

v0.5.2.tar.gz/src/isomedia/isom_write.c -> v0.6.1.tar.gz/src/isomedia/isom_write.c Changed

@@ -25,6 +25,9 @@
 
 #include <gpac/internal/isomedia_dev.h>
 
+#include <gpac/iso639.h>
+
+
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)
 
 GF_Err CanAccessMovie(GF_ISOFile *movie, u32 Mode)
@@ -43,7 +46,9 @@
 	GF_Err e = GF_OK;
 	if (!trak->is_unpacked) {
 		e = stbl_UnpackOffsets(trak->Media->information->sampleTable);
-		trak->is_unpacked = 1;
+		if (e) return e;
+		e = stbl_unpackCTS(trak->Media->information->sampleTable);
+		trak->is_unpacked = GF_TRUE;
 	}
 	return e;
 }
@@ -240,13 +245,34 @@
 {
 	GF_Err e;
 	GF_TrackBox *trak;
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
+
+	// Old language-storage processing
+	// if the new code is on 3 chars, we use it
+	// otherwise, we find the associated 3 chars code and use it
 	if (strlen(code) == 3) {
 		memcpy(trak->Media->mediaHeader->packedLanguage, code, sizeof(char)*3);
 	} else {
+		s32 lang_idx;
+		const char *code_3cc;
+		lang_idx = gf_lang_find(code);
+		if (lang_idx == -1) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("The given code is not a valid one: %s, using 'und' as 3-letter code\n", code));
+			code_3cc = "und";
+		} else {
+			code_3cc = gf_lang_get_3cc(lang_idx);
+		}
+		memcpy(trak->Media->mediaHeader->packedLanguage, code_3cc, sizeof(char)*3);
+	}
+
+	// New language-storage processing
+	// change the code in the extended language box (if any)
+	// otherwise add an extended language box only if the given code is not 3 chars
+	{
 		u32 i, count;
 		GF_ExtendedLanguageBox *elng;
 		elng = NULL;
@@ -258,17 +284,19 @@
 				break;
 			}
 		}
-		if (!elng) {
+		if (!elng && (strlen(code) != 3)) {
 			elng = (GF_ExtendedLanguageBox *)elng_New();
 			if (!count) {
 				trak->Media->other_boxes = gf_list_new();
 			}
 			gf_list_add(trak->Media->other_boxes, elng);
 		}
-		if (elng->extended_language) {
-			gf_free(elng->extended_language);
+		if (elng) {
+			if (elng->extended_language) {
+				gf_free(elng->extended_language);
+			}
+			elng->extended_language = gf_strdup(code);
 		}
-		elng->extended_language = gf_strdup(code);
 	}
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
@@ -366,7 +394,7 @@
 	movie->moov->mvhd->duration = (u64) (s64) ((s64) movie->moov->mvhd->duration * ts_scale);
 
 	i=0;
-	while ((trak = gf_list_enum(movie->moov->trackList, &i))) {
+	while ((trak = (GF_TrackBox*)gf_list_enum(movie->moov->trackList, &i))) {
 		trak->Header->duration = (u64) (s64) ((s64) trak->Header->duration * ts_scale);
 		if (trak->editBox && trak->editBox->editList) {
 			u32 j, count = gf_list_count(trak->editBox->editList->entryList);
@@ -715,7 +743,7 @@
 	u32 descIndex;
 	u32 sampleNum, prevSampleNum;
 	GF_DataEntryURLBox *Dentry;
-	Bool offset_times = 0;
+	Bool offset_times = GF_FALSE;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -737,7 +765,7 @@
 	prev = gf_isom_get_sample_info(movie, trackNumber, sampleNum, &descIndex, NULL);
 	if (!prev) return gf_isom_last_error(movie);
 	/*for conformance*/
-	if (sample->DTS==prev->DTS) offset_times = 1;
+	if (sample->DTS==prev->DTS) offset_times = GF_TRUE;
 	gf_isom_sample_del(&prev);
 
 	e = Media_GetSampleDesc(trak->Media, descIndex, &entry, &dataRefIndex);
@@ -837,7 +865,7 @@
 
 //Add sample reference to a track. The SampleOffset is the offset of the data in the referenced file
 //you must have created a StreamDescription with URL or URN specifying your referenced file
-//the data offset specifies the begining of the chunk
+//the data offset specifies the beginning of the chunk
 //Use streamDescriptionIndex to specify the desired stream (if several)
 GF_EXPORT
 GF_Err gf_isom_add_sample_reference(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample, u64 dataOffset)
@@ -927,7 +955,7 @@
 
 		if (stts->nb_entries==stts->alloc_size) {
 			stts->alloc_size++;
-			stts->entries = gf_realloc(stts->entries, sizeof(GF_SttsEntry)*stts->alloc_size);
+			stts->entries = (GF_SttsEntry*)gf_realloc(stts->entries, sizeof(GF_SttsEntry)*stts->alloc_size);
 			if (!stts->entries) return GF_OUT_OF_MEM;
 		}
 		stts->entries[stts->nb_entries].sampleCount = 1;
@@ -1065,6 +1093,12 @@
 	e = stbl_RemovePaddingBits(trak->Media->information->sampleTable, sampleNumber);
 	if (e) return e;
 
+	e = stbl_RemoveSubSample(trak->Media->information->sampleTable, sampleNumber);
+	if (e) return e;
+
+	e = stbl_RemoveSampleGroup(trak->Media->information->sampleTable, sampleNumber);
+	if (e) return e;
+
 	return SetTrackDuration(trak);
 }
 
@@ -1110,7 +1144,7 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	/*GETS NATIVE DESCRIPTOR ONLY*/
-	e = Media_GetESD(trak->Media, StreamDescriptionIndex, &esd, 1);
+	e = Media_GetESD(trak->Media, StreamDescriptionIndex, &esd, GF_TRUE);
 	if (e) return e;
 
 	//duplicate the desc
@@ -1353,6 +1387,8 @@
 
 	switch (entry->type) {
 	case GF_ISOM_BOX_TYPE_MP4A:
+	case GF_ISOM_BOX_TYPE_AC3:
+	case GF_ISOM_BOX_TYPE_EC3:
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 	case GF_ISOM_SUBTYPE_3GP_EVRC:
@@ -1390,6 +1426,12 @@
 	}
 }
 
+GF_EXPORT
+void gf_isom_force_64bit_chunk_offset(GF_ISOFile *file, Bool set_on)
+{
+	file->force_co64 = set_on;
+}
+
 
 //update or insert a new edit segment in the track time line. Edits are used to modify
 //the media normal timing. EditTime and EditDuration are expressed in Movie TimeScale
@@ -1670,7 +1712,7 @@
 				e = gf_isom_remove_sample(movie, i, k+1);
 				if (e) return e;
 			} else {
-				e = gf_isom_update_sample(movie, i, k+1, samp, 1);
+				e = gf_isom_update_sample(movie, i, k+1, samp, GF_TRUE);
 				if (e) return e;
 			}
 			//and don't forget to delete the sample
@@ -2623,23 +2665,30 @@
 		orig_file->moov->trackList = tracks;
 		iods = (GF_Box*)orig_file->moov->iods;
 		orig_file->moov->iods = NULL;
-		gf_isom_clone_box((GF_Box *)orig_file->moov, (GF_Box **)&dest_file->moov);
+		e = gf_isom_clone_box((GF_Box *)orig_file->moov, (GF_Box **)&dest_file->moov);
+		if (e) {
+			gf_list_del(tracks);
+			orig_file->moov->trackList = old_tracks;
+			return e;
+		}
 		orig_file->moov->trackList = old_tracks;
 		gf_list_del(tracks);
 		orig_file->moov->iods = (GF_ObjectDescriptorBox*)iods;
 		gf_list_add(dest_file->TopBoxes, dest_file->moov);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (dest_file->moov->mvex) {
 			gf_isom_box_del((GF_Box *)dest_file->moov->mvex);
 			dest_file->moov->mvex = NULL;
 		}
+#endif
 
 		if (clone_tracks) {
 			for (i=0; i<gf_list_count(orig_file->moov->trackList); i++) {
-				GF_TrackBox *trak = gf_list_get( orig_file->moov->trackList, i);
+				GF_TrackBox *trak = (GF_TrackBox*)gf_list_get( orig_file->moov->trackList, i);
 				if (!trak) continue;
 				if (keep_hint_tracks || (trak->Media->handler->handlerType != GF_ISOM_MEDIA_HINT)) {
-					e = gf_isom_clone_track(orig_file, i+1, dest_file, 1, &dstTrack);
+					e = gf_isom_clone_track(orig_file, i+1, dest_file, GF_TRUE, &dstTrack);
 					if (e) return e;
 				}
 			}
@@ -2972,8 +3021,8 @@
 		gena->revision = udesc->revision;
 		gena->bitspersample = udesc->bits_per_sample ? udesc->bits_per_sample : 16;
 		gena->channel_count = udesc->nb_channels ? udesc->nb_channels : 2;
-		gena->samplerate_hi = udesc->samplerate>>16;
-		gena->samplerate_lo = udesc->samplerate & 0xFF;
+		gena->samplerate_hi = udesc->samplerate;
+		gena->samplerate_lo = 0;
 
 		if (udesc->extension_buf && udesc->extension_buf_size) {
 			gena->data = (char*)gf_malloc(sizeof(char) * udesc->extension_buf_size);
@@ -3064,8 +3113,8 @@
 		gena->revision = udesc->revision;
 		gena->bitspersample = udesc->bits_per_sample ? udesc->bits_per_sample : 16;
 		gena->channel_count = udesc->nb_channels ? udesc->nb_channels : 2;
-		gena->samplerate_hi = udesc->samplerate>>16;
-		gena->samplerate_lo = udesc->samplerate & 0xFF;
+		gena->samplerate_hi = udesc->samplerate;
+		gena->samplerate_lo = 0;
 		if (gena->data) gf_free(gena->data);
 		gena->data = NULL;
 		gena->data_size = 0;
@@ -3405,7 +3454,7 @@
 	bin128 binID;
 	if (movie == NULL) return GF_BAD_PARAM;
 
-	found_cfg = 0;
+	found_cfg = GF_FALSE;
 	/*restore movie*/
 	count = gf_isom_get_user_data_count(movie, 0, GF_4CC('G','P','A','C'), binID);
 	for (i=0; i<count; i++) {
@@ -3423,7 +3472,7 @@
 		movie->interleavingTime = gf_bs_read_u32(bs);
 		gf_bs_del(bs);
 		gf_free(data);
-		found_cfg = 1;
+		found_cfg = GF_TRUE;
 		break;
 	}
 
@@ -3453,7 +3502,7 @@
 			}
 			gf_bs_del(bs);
 			gf_free(data);
-			found_cfg = 1;
+			found_cfg = GF_TRUE;
 			break;
 		}
 	}
@@ -3473,6 +3522,12 @@
 	scale /= trak->Media->mediaHeader->timeScale;
 	trak->Media->mediaHeader->timeScale = newTS;
 	if (!force_rescale) {
+		u32 i, k, idx;
+		GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
+		u64 cur_dts;
+		u64*DTSs = NULL;
+		s64*CTSs = NULL;
+
 		if (trak->editBox) {
 			GF_EdtsEntry *ent;
 			u32 i=0;
@@ -3480,19 +3535,86 @@
 				ent->mediaTime = (u32) (scale*ent->mediaTime);
 			}
 		}
-		if (trak->Media->information->sampleTable) {
-			u32 i;
-			GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
-			if (stbl->TimeToSample) {
-				for (i=0; i<stbl->TimeToSample->nb_entries; i++) {
-					stbl->TimeToSample->entries[i].sampleDelta = (u32) (scale * stbl->TimeToSample->entries[i].sampleDelta);
+		if (! stbl || !stbl->TimeToSample) {
+			return SetTrackDuration(trak);
+		}
+
+		idx = 0;
+		cur_dts = 0;
+		//unpack the DTSs
+		DTSs = (u64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
+		CTSs = NULL;
+
+		if (!DTSs) return GF_OUT_OF_MEM;
+		if (stbl->CompositionOffset) {
+			CTSs = (s64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
+		}
+
+		for (i=0; i<stbl->TimeToSample->nb_entries; i++) {
+			for (k=0; k<stbl->TimeToSample->entries[i].sampleCount; k++) {
+				cur_dts += stbl->TimeToSample->entries[i].sampleDelta;
+				DTSs[idx] = (u64) (cur_dts * scale);
+
+				if (stbl->CompositionOffset) {
+					s32 cts_o;
+					stbl_GetSampleCTS(stbl->CompositionOffset, idx+1, &cts_o);
+					CTSs[idx] = (s64) ( ((s64) cur_dts + cts_o) * scale);
 				}
+				idx++;
 			}
-			if (stbl->CompositionOffset) {
-				for (i=0; i<stbl->CompositionOffset->nb_entries; i++) {
-					stbl->CompositionOffset->entries[i].decodingOffset = (u32) (scale * stbl->CompositionOffset->entries[i].decodingOffset);
+		}
+		//repack DTS
+		if (stbl->SampleSize->sampleCount) {
+			stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
+			memset(stbl->TimeToSample->entries, 0, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
+			stbl->TimeToSample->nb_entries = 1;
+			stbl->TimeToSample->entries[0].sampleDelta = (u32) DTSs[0];
+			stbl->TimeToSample->entries[0].sampleCount = 1;
+			idx=0;
+			for (i=1; i< stbl->SampleSize->sampleCount - 1; i++) {
+				if (DTSs[i+1] - DTSs[i] == stbl->TimeToSample->entries[idx].sampleDelta) {
+					stbl->TimeToSample->entries[idx].sampleCount++;
+				} else {
+					idx++;
+					stbl->TimeToSample->entries[idx].sampleDelta = (u32) ( DTSs[i+1] - DTSs[i] );
+					stbl->TimeToSample->entries[idx].sampleCount=1;
 				}
 			}
+			stbl->TimeToSample->nb_entries = idx+1;
+			stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->TimeToSample->nb_entries);
+		}
+
+		if (CTSs && stbl->SampleSize->sampleCount>0) {
+			//repack CTS
+			stbl->CompositionOffset->entries = gf_realloc(stbl->CompositionOffset->entries, sizeof(GF_DttsEntry)*stbl->SampleSize->sampleCount);
+			memset(stbl->CompositionOffset->entries, 0, sizeof(GF_DttsEntry)*stbl->SampleSize->sampleCount);
+			stbl->CompositionOffset->nb_entries = 1;
+			stbl->CompositionOffset->entries[0].decodingOffset = (s32) (CTSs[0] - DTSs[0]);
+			stbl->CompositionOffset->entries[0].sampleCount = 1;
+			idx=0;
+			for (i=1; i< stbl->SampleSize->sampleCount; i++) {
+				s32 cts_o = (s32) (CTSs[i] - DTSs[i]);
+				if (cts_o == stbl->CompositionOffset->entries[idx].decodingOffset) {
+					stbl->CompositionOffset->entries[idx].sampleCount++;
+				} else {
+					idx++;
+					stbl->CompositionOffset->entries[idx].decodingOffset = cts_o;
+					stbl->CompositionOffset->entries[idx].sampleCount=1;
+				}
+			}
+			stbl->CompositionOffset->nb_entries = idx+1;
+			stbl->CompositionOffset->entries = gf_realloc(stbl->CompositionOffset->entries, sizeof(GF_DttsEntry)*stbl->CompositionOffset->nb_entries);
+
+			gf_free(CTSs);
+		}
+		gf_free(DTSs);
+
+		if (stbl->CompositionToDecode) {
+			stbl->CompositionToDecode->compositionEndTime = (s32) (stbl->CompositionToDecode->compositionEndTime * scale);
+			stbl->CompositionToDecode->compositionStartTime = (s32)(stbl->CompositionToDecode->compositionStartTime * scale);
+			stbl->CompositionToDecode->compositionToDTSShift = (s32)(stbl->CompositionToDecode->compositionToDTSShift * scale);
+			stbl->CompositionToDecode->greatestDecodeToDisplayDelta = (s32)(stbl->CompositionToDecode->greatestDecodeToDisplayDelta * scale);
+			stbl->CompositionToDecode->leastDecodeToDisplayDelta = (s32)(stbl->CompositionToDecode->leastDecodeToDisplayDelta * scale);
 		}
 	}
 	return SetTrackDuration(trak);
@@ -3513,17 +3635,17 @@
 
 	/*get orig sample desc and clone it*/
 	trak1 = gf_isom_get_track_from_file(f1, tk1);
-	if (!trak1 || !trak1->Media) return 0;
+	if (!trak1 || !trak1->Media) return GF_FALSE;
 	trak2 = gf_isom_get_track_from_file(f2, tk2);
-	if (!trak2 || !trak2->Media) return 0;
+	if (!trak2 || !trak2->Media) return GF_FALSE;
 
-	if (trak1->Media->handler->handlerType != trak2->Media->handler->handlerType) return 0;
+	if (trak1->Media->handler->handlerType != trak2->Media->handler->handlerType) return GF_FALSE;
 	count = gf_list_count(trak1->Media->information->sampleTable->SampleDescription->other_boxes);
 	if (count != gf_list_count(trak2->Media->information->sampleTable->SampleDescription->other_boxes)) {
-		if (!sdesc_index1 && !sdesc_index2) return 0;
+		if (!sdesc_index1 && !sdesc_index2) return GF_FALSE;
 	}
 
-	need_memcmp = 1;
+	need_memcmp = GF_TRUE;
 	for (i=0; i<count; i++) {
 		GF_Box *ent1 = (GF_Box *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->other_boxes, i);
 		GF_Box *ent2 = (GF_Box *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->other_boxes, i);
@@ -3531,8 +3653,8 @@
 		if (sdesc_index1) ent1 = (GF_Box *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->other_boxes, sdesc_index1 - 1);
 		if (sdesc_index2) ent2 = (GF_Box *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->other_boxes, sdesc_index2 - 1);
 
-		if (!ent1 || !ent2) return 0;
-		if (ent1->type != ent2->type) return 0;
+		if (!ent1 || !ent2) return GF_FALSE;
+		if (ent1->type != ent2->type) return GF_FALSE;
 
 		switch (ent1->type) {
 		/*for MPEG-4 streams, only compare decSpecInfo (bitrate may not be the same but that's not an issue)*/
@@ -3542,19 +3664,19 @@
 		case GF_ISOM_BOX_TYPE_ENCA:
 		case GF_ISOM_BOX_TYPE_ENCV:
 		case GF_ISOM_BOX_TYPE_ENCS:
-			Media_GetESD(trak1->Media, sdesc_index1 ? sdesc_index1 : i+1, &esd1, 1);
-			Media_GetESD(trak2->Media, sdesc_index2 ? sdesc_index2 : i+1, &esd2, 1);
+			Media_GetESD(trak1->Media, sdesc_index1 ? sdesc_index1 : i+1, &esd1, GF_TRUE);
+			Media_GetESD(trak2->Media, sdesc_index2 ? sdesc_index2 : i+1, &esd2, GF_TRUE);
 			if (!esd1 || !esd2) continue;
-			need_memcmp = 0;
-			if (esd1->decoderConfig->streamType != esd2->decoderConfig->streamType) return 0;
-			if (esd1->decoderConfig->objectTypeIndication != esd2->decoderConfig->objectTypeIndication) return 0;
-			if (!esd1->decoderConfig->decoderSpecificInfo && esd2->decoderConfig->decoderSpecificInfo) return 0;
-			if (esd1->decoderConfig->decoderSpecificInfo && !esd2->decoderConfig->decoderSpecificInfo) return 0;
+			need_memcmp = GF_FALSE;
+			if (esd1->decoderConfig->streamType != esd2->decoderConfig->streamType) return GF_FALSE;
+			if (esd1->decoderConfig->objectTypeIndication != esd2->decoderConfig->objectTypeIndication) return GF_FALSE;
+			if (!esd1->decoderConfig->decoderSpecificInfo && esd2->decoderConfig->decoderSpecificInfo) return GF_FALSE;
+			if (esd1->decoderConfig->decoderSpecificInfo && !esd2->decoderConfig->decoderSpecificInfo) return GF_FALSE;
 			if (!esd1->decoderConfig->decoderSpecificInfo || !esd2->decoderConfig->decoderSpecificInfo) continue;
-			if (memcmp(esd1->decoderConfig->decoderSpecificInfo->data, esd2->decoderConfig->decoderSpecificInfo->data, sizeof(char)*esd1->decoderConfig->decoderSpecificInfo->dataLength)!=0) return 0;
+			if (memcmp(esd1->decoderConfig->decoderSpecificInfo->data, esd2->decoderConfig->decoderSpecificInfo->data, sizeof(char)*esd1->decoderConfig->decoderSpecificInfo->dataLength)!=0) return GF_FALSE;
 			break;
 		case GF_ISOM_BOX_TYPE_HVT1:
-			return 1;
+			return GF_TRUE;
 		case GF_ISOM_BOX_TYPE_AVC1:
 		case GF_ISOM_BOX_TYPE_AVC2:
 		case GF_ISOM_BOX_TYPE_AVC3:
@@ -3599,9 +3721,9 @@
 			gf_bs_get_content(bs, &data2, &data2_size);
 			gf_bs_del(bs);
 
-			ret = 0;
+			ret = GF_FALSE;
 			if (data1_size == data2_size) {
-				ret = (memcmp(data1, data2, sizeof(char)*data1_size)==0) ? 1 : 0;
+				ret = (memcmp(data1, data2, sizeof(char)*data1_size)==0) ? GF_TRUE : GF_FALSE;
 			}
 			gf_free(data1);
 			gf_free(data2);
@@ -3617,9 +3739,9 @@
 			 && (lsr1->lsr_config->hdr_size==lsr2->lsr_config->hdr_size)
 			 && !memcmp(lsr1->lsr_config->hdr, lsr2->lsr_config->hdr, lsr2->lsr_config->hdr_size)
 			 ) {
-				return 1;
+				return GF_TRUE;
 			}
-			return 0;
+			return GF_FALSE;
 		}
 		break;
 		case GF_ISOM_BOX_TYPE_WVTT:
@@ -3628,45 +3750,45 @@
 			GF_WebVTTSampleEntryBox *wvtt2 = (GF_WebVTTSampleEntryBox *)ent2;
 			if (wvtt1->config && wvtt2->config &&
 			 (wvtt1->config->string && wvtt1->config->string && !strcmp(wvtt1->config->string, wvtt2->config->string))) {
-				return 1;
+				return GF_TRUE;
 			}
-			return 0;
+			return GF_FALSE;
 		}
 		break;
 		case GF_ISOM_BOX_TYPE_STPP:
 		{
-			GF_XMLSubtitleSampleEntryBox *stpp1 = (GF_XMLSubtitleSampleEntryBox *)ent1;
-			GF_XMLSubtitleSampleEntryBox *stpp2 = (GF_XMLSubtitleSampleEntryBox *)ent2;
-			if (stpp1->xmlnamespace && stpp2->xmlnamespace && !strcmp(stpp1->xmlnamespace, stpp2->xmlnamespace)) {
-				return 1;
+			GF_MetaDataSampleEntryBox *stpp1 = (GF_MetaDataSampleEntryBox *)ent1;
+			GF_MetaDataSampleEntryBox *stpp2 = (GF_MetaDataSampleEntryBox *)ent2;
+			if (stpp1->xml_namespace && stpp2->xml_namespace && !strcmp(stpp1->xml_namespace, stpp2->xml_namespace)) {
+				return GF_TRUE;
 			}
-			return 0;
+			return GF_FALSE;
 		}
 		break;
 		case GF_ISOM_BOX_TYPE_SBTT:
 		{
-			return 0;
+			return GF_FALSE;
 		}
 		break;
 		case GF_ISOM_BOX_TYPE_STXT:
 		{
-			GF_SimpleTextSampleEntryBox *stxt1 = (GF_SimpleTextSampleEntryBox *)ent1;
-			GF_SimpleTextSampleEntryBox *stxt2 = (GF_SimpleTextSampleEntryBox *)ent2;
+			GF_MetaDataSampleEntryBox *stxt1 = (GF_MetaDataSampleEntryBox *)ent1;
+			GF_MetaDataSampleEntryBox *stxt2 = (GF_MetaDataSampleEntryBox *)ent2;
 			if (stxt1->mime_type && stxt2->mime_type &&
 			 ( (!stxt1->config && !stxt2->config) ||
-			 (stxt1->config && stxt2->config && stxt1->config->string && stxt2->config->string &&
-			 !strcmp(stxt1->config->string, stxt2->config->string)))) {
-				return 1;
+			 (stxt1->config && stxt2->config && stxt1->config->config && stxt2->config->config &&
+			 !strcmp(stxt1->config->config, stxt2->config->config)))) {
+				return GF_TRUE;
 			}
-			return 0;
+			return GF_FALSE;
 		}
 		break;
 		}
 
 		if (sdesc_index1 && sdesc_index2) break;
 	}
-	if (!need_memcmp) return 1;
-	ret = 0;
+	if (!need_memcmp) return GF_TRUE;
+	ret = GF_FALSE;
 
 	data1 = data2 = NULL;
 
@@ -3685,7 +3807,7 @@
 	gf_bs_del(bs);
 
 	if (data1_size == data2_size) {
-		ret = (memcmp(data1, data2, sizeof(char)*data1_size)==0) ? 1 : 0;
+		ret = (memcmp(data1, data2, sizeof(char)*data1_size)==0) ? GF_TRUE : GF_FALSE;
 	}
 	gf_free(data1);
 	gf_free(data2);
@@ -3714,8 +3836,8 @@
 	i=0;
 	while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
 		e = gf_isom_box_size(a);
-		assert (e == GF_OK);
-		mdat_size += a->size;
+		if (e == GF_OK)
+			mdat_size += a->size;
 	}
 	return mdat_size;
 }
@@ -3915,7 +4037,7 @@
 {
 	GF_Err e;
 	if (gf_isom_get_mode(file) < GF_ISOM_OPEN_EDIT) return GF_BAD_PARAM;
-	e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_INTERLEAVED);
+	e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_DRIFT_INTERLEAVED);
 	if (e) return e;
 	return gf_isom_set_interleave_time(file, (u32) (TimeInSec * gf_isom_get_timescale(file)));
 }
@@ -3934,27 +4056,27 @@
 
 	if (!strnicmp(nameUTF8, "file://", 7)) {
 		u8 BOM[4];
-		FILE *f = gf_f64_open(nameUTF8+7, "rb");
+		FILE *f = gf_fopen(nameUTF8+7, "rb");
 		u64 size;
 		if (!f) return GF_URL_ERROR;
-		gf_f64_seek(f, 0, SEEK_END);
-		size = gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
+		gf_fseek(f, 0, SEEK_END);
+		size = gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
 		if (3!=fread(BOM, sizeof(char), 3, f)) {
-			fclose(f);
+			gf_fclose(f);
 			return GF_CORRUPTED_DATA;
 		}
 		/*skip BOM if any*/
 		if ((BOM[0]==0xEF) && (BOM[1]==0xBB) && (BOM[2]==0xBF)) size -= 3;
 		else if ((BOM[0]==0xEF) || (BOM[0]==0xFF)) {
-			fclose(f);
+			gf_fclose(f);
 			return GF_BAD_PARAM;
 		}
-		else gf_f64_seek(f, 0, SEEK_SET);
+		else gf_fseek(f, 0, SEEK_SET);
 		trak->Media->handler->nameUTF8 = (char*)gf_malloc(sizeof(char)*(size_t)(size+1));
 		size = fread(trak->Media->handler->nameUTF8, sizeof(char), (size_t)size, f);
 		trak->Media->handler->nameUTF8[size] = 0;
-		fclose(f);
+		gf_fclose(f);
 	} else {
 		u32 i, j, len;
 		char szOrig[1024], szLine[1024];
@@ -4169,7 +4291,7 @@
 	}
 	/*remove tag*/
 	i = 0;
-	while ((info = gf_list_enum(ilst->other_boxes, &i))) {
+	while ((info = (GF_ListItemBox*)gf_list_enum(ilst->other_boxes, &i))) {
 		if (info->type==btype) {
 			gf_list_rem(ilst->other_boxes, i-1);
 			gf_isom_box_del((GF_Box *) info);
@@ -4237,7 +4359,7 @@
 			gf_list_del_item(meta->other_boxes, ilst);
 			gf_isom_box_del((GF_Box *) ilst);
 		}
-		return GF_OK;	
+		return GF_OK;
 	}
 
 	return gf_list_add(ilst->other_boxes, info);
@@ -4294,7 +4416,7 @@
 				if (map) {
 					count = gf_list_count(map->other_boxes);
 					for (j=0; j<count; j++) {
-						tsel = gf_list_get(map->other_boxes, j);
+						tsel = (GF_TrackSelectionBox*)gf_list_get(map->other_boxes, j);
 
 						if (*switchGroupID) {
 							if (tsel->switchGroup==next_switch_group_id) {
@@ -4329,7 +4451,7 @@
 		if (map) {
 			u32 j, count = gf_list_count(map->other_boxes);
 			for (j=0; j<count; j++) {
-				tsel = gf_list_get(map->other_boxes, j);
+				tsel = (GF_TrackSelectionBox*)gf_list_get(map->other_boxes, j);
 				if (tsel->switchGroup == *switchGroupID) break;
 				tsel = NULL;
 			}
@@ -4343,7 +4465,7 @@
 		tsel->switchGroup = *switchGroupID;
 		tsel->attributeListCount = criteriaListCount;
 		if (tsel->attributeList) gf_free(tsel->attributeList);
-		tsel->attributeList = gf_malloc(sizeof(u32)*criteriaListCount);
+		tsel->attributeList = (u32*)gf_malloc(sizeof(u32)*criteriaListCount);
 		memcpy(tsel->attributeList, criteriaList, sizeof(u32)*criteriaListCount);
 	}
 	return GF_OK;
@@ -4401,46 +4523,6 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_timed_meta_data_config_new(GF_ISOFile *movie, u32 trackNumber, Bool is_xml, char *mime_or_namespace, char *content_encoding, char *schema_loc, char *URLname, char *URNname, u32 *outDescriptionIndex)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-	u32 dataRefIndex;
-	GF_MetaDataSampleEntryBox *metad;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media || !mime_or_namespace)
-		return GF_BAD_PARAM;
-
-	if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_META)
-		return GF_BAD_PARAM;
-
-	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-	if (e) return e;
-	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-		if (e) return e;
-	}
-	if (!movie->keep_utc)
-		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	metad = (GF_MetaDataSampleEntryBox*) gf_isom_box_new(is_xml ? GF_ISOM_BOX_TYPE_METX : GF_ISOM_BOX_TYPE_METT);
-	if (!metad) return GF_OUT_OF_MEM;
-
-	metad->dataReferenceIndex = dataRefIndex;
-	metad->mime_type_or_namespace = gf_strdup(mime_or_namespace);
-	if (content_encoding) metad->content_encoding = gf_strdup(content_encoding);
-	if (schema_loc) metad->xml_schema_loc = gf_strdup(schema_loc);
-
-	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, metad);
-	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-	return e;
-}
-
 
 GF_Err gf_isom_add_subsample(GF_ISOFile *movie, u32 track, u32 sampleNumber, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable)
 {
@@ -4503,7 +4585,7 @@
 	}
 
 	if (entry->rvcc && entry->rvcc->rvc_meta_idx) {
-		gf_isom_remove_meta_item(movie, 0, track, entry->rvcc->rvc_meta_idx);
+		gf_isom_remove_meta_item(movie, GF_FALSE, track, entry->rvcc->rvc_meta_idx);
 		entry->rvcc->rvc_meta_idx = 0;
 	}
 
@@ -4512,12 +4594,12 @@
 	}
 	entry->rvcc->predefined_rvc_config = rvc_predefined;
 	if (!rvc_predefined) {
-		e = gf_isom_set_meta_type(movie, 0, track, GF_4CC('r','v','c','i'));
+		e = gf_isom_set_meta_type(movie, GF_FALSE, track, GF_4CC('r','v','c','i'));
 		if (e) return e;
 		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_ISO2, 1);
-		e = gf_isom_add_meta_item_memory(movie, 0, track, "rvcconfig.xml", 0, mime, NULL, data, size);
+		e = gf_isom_add_meta_item_memory(movie, GF_FALSE, track, "rvcconfig.xml", 0, mime, NULL, data, size);
 		if (e) return e;
-		entry->rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, 0, track);
+		entry->rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, GF_FALSE, track);
 	}
 	return GF_OK;
 }
@@ -4531,7 +4613,7 @@
 
 	count = gf_list_count(sampleGroups);
 	for (i=0; i<count; i++) {
-		sgroup = gf_list_get(sampleGroups, i);
+		sgroup = (GF_SampleGroupBox*)gf_list_get(sampleGroups, i);
 		if (sgroup->grouping_type==grouping_type) break;
 		sgroup = NULL;
 	}
@@ -4553,7 +4635,7 @@
 	if (!sgroup->entry_count) {
 		u32 idx = 0;
 		sgroup->entry_count = (sample_number>1) ? 2 : 1;
-		sgroup->sample_entries = gf_malloc(sizeof(GF_SampleGroupEntry) * sgroup->entry_count );
+		sgroup->sample_entries = (GF_SampleGroupEntry*)gf_malloc(sizeof(GF_SampleGroupEntry) * sgroup->entry_count );
 		if (sample_number>1) {
 			sgroup->sample_entries[0].sample_count = sample_number-1;
 			sgroup->sample_entries[0].group_description_index = 0;
@@ -4577,7 +4659,7 @@
 	/*last entry was an empty desc (no group associated), just add the number of samples missing until new one, then add new one*/
 	if (! sgroup->sample_entries[sgroup->entry_count-1].group_description_index) {
 		sgroup->sample_entries[sgroup->entry_count-1].sample_count += sample_number - 1 - last_sample_in_entry;
-		sgroup->sample_entries = gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 1) );
+		sgroup->sample_entries = (GF_SampleGroupEntry*)gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 1) );
 		sgroup->sample_entries[sgroup->entry_count].sample_count = 1;
 		sgroup->sample_entries[sgroup->entry_count].group_description_index = sampleGroupDescriptionIndex;
 		sgroup->entry_count++;
@@ -4585,14 +4667,14 @@
 	}
 	/*we are adding a sample with no desc, add entry at the end*/
 	if (!sampleGroupDescriptionIndex || (sample_number - 1 - last_sample_in_entry==0) ) {
-		sgroup->sample_entries = gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 1) );
+		sgroup->sample_entries = (GF_SampleGroupEntry*)gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 1) );
 		sgroup->sample_entries[sgroup->entry_count].sample_count = 1;
 		sgroup->sample_entries[sgroup->entry_count].group_description_index = sampleGroupDescriptionIndex;
 		sgroup->entry_count++;
 		return GF_OK;
 	}
 	/*need to insert two entries ...*/
-	sgroup->sample_entries = gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 2) );
+	sgroup->sample_entries = (GF_SampleGroupEntry*)gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 2) );
 
 	sgroup->sample_entries[sgroup->entry_count].sample_count = sample_number - 1 - last_sample_in_entry;
 	sgroup->sample_entries[sgroup->entry_count].group_description_index = 0;
@@ -4603,18 +4685,24 @@
 	return GF_OK;
 }
 
-
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 grouping_type)
+#else
+static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, void *traf, u32 grouping_type)
+#endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 {
 	GF_List *groupList;
 	GF_SampleGroupDescriptionBox *sgdesc=NULL;
 	u32 count, i;
 	/*look in stbl or traf for sample sampleGroupsDescription*/
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (traf) {
 		if (!traf->sampleGroupsDescription)
 			traf->sampleGroupsDescription = gf_list_new();
 		groupList = traf->sampleGroupsDescription;
-	} else {
+	} else
+#endif
+	{
 		if (!stbl->sampleGroupsDescription)
 			stbl->sampleGroupsDescription = gf_list_new();
 		groupList = stbl->sampleGroupsDescription;
@@ -4622,7 +4710,7 @@
 
 	count = gf_list_count(groupList);
 	for (i=0; i<count; i++) {
-		sgdesc = gf_list_get(groupList, i);
+		sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(groupList, i);
 		if (sgdesc->grouping_type==grouping_type) break;
 		sgdesc = NULL;
 	}
@@ -4634,7 +4722,11 @@
 	return sgdesc;
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 static GF_Err gf_isom_set_sample_group_info_ex(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 sample_number, u32 grouping_type, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+#else
+static GF_Err gf_isom_set_sample_group_info_ex(GF_SampleTableBox *stbl, void *traf, u32 sample_number, u32 grouping_type, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+#endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 {
 	GF_List *groupList;
 	void *entry;
@@ -4661,12 +4753,15 @@
 	entry_idx = 1 + gf_list_find(sgdesc->group_descriptions, entry);
 
 	/*look in stbl or traf for sample sampleGroups*/
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (traf) {
 		if (!traf->sampleGroups)
 			traf->sampleGroups = gf_list_new();
 		groupList = traf->sampleGroups;
 		entry_idx |= 0x10000;
-	} else {
+	} else
+#endif
+	{
 		if (!stbl->sampleGroups)
 			stbl->sampleGroups = gf_list_new();
 		groupList = stbl->sampleGroups;
@@ -4712,7 +4807,7 @@
 
 	GF_SAFEALLOC(entry, GF_DefaultSampleGroupDescriptionEntry);
 	if (!entry) return GF_OUT_OF_MEM;
-	entry->data = gf_malloc(sizeof(char) * data_size);
+	entry->data = (u8*)gf_malloc(sizeof(char) * data_size);
 	if (!entry->data) {
 		gf_free(entry);
 		return GF_OUT_OF_MEM;
@@ -4767,8 +4862,8 @@
 Bool sg_rap_compare_entry(void *udta, void *entry)
 {
 	u32 *num_leading_samples = (u32 *) udta;
-	if (*num_leading_samples == ((GF_VisualRandomAccessEntry *)entry)->num_leading_samples) return 1;
-	return 0;
+	if (*num_leading_samples == ((GF_VisualRandomAccessEntry *)entry)->num_leading_samples) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_Err gf_isom_set_sample_rap_group(GF_ISOFile *movie, u32 track, u32 sample_number, u32 num_leading_samples)
@@ -4790,8 +4885,8 @@
 Bool sg_roll_compare_entry(void *udta, void *entry)
 {
 	s16 *roll_distance = (s16 *) udta;
-	if (*roll_distance == ((GF_RollRecoveryEntry *)entry)->roll_distance) return 1;
-	return 0;
+	if (*roll_distance == ((GF_RollRecoveryEntry *)entry)->roll_distance) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_Err gf_isom_set_sample_roll_group(GF_ISOFile *movie, u32 track, u32 sample_number, s16 roll_distance)
@@ -4824,10 +4919,11 @@
 	IV_size = gf_bs_read_u8(bs);
 	gf_bs_read_data(bs, (char *)KID, 16);
 	gf_bs_del(bs);
-	if ((isEncrypted == seig->IsEncrypted) && (IV_size == seig->IV_size) && (!strncmp((const char *)KID, (const char *)seig->KID, 16))) return 1;
-	return 0;
+	if ((isEncrypted == seig->IsEncrypted) && (IV_size == seig->IV_size) && (!strncmp((const char *)KID, (const char *)seig->KID, 16))) return GF_TRUE;
+	return GF_FALSE;
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf)
 {
 	if (sgpd_in_traf) {
@@ -4883,6 +4979,7 @@
 
 	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, sampleGroupDescriptionIndex);
 }
+#endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 
 /*sample encryption information group can be in stbl or traf*/
 GF_EXPORT
@@ -5019,10 +5116,49 @@
 	return GF_OK;
 }
 
+Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type)
+{
+	Bool res = GF_FALSE;
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	GF_BitStream *bs1, *bs2;
+	char *buf1, *buf2;
+	u32 len1, len2;
+
+	if (!ptr1 || !ptr2)
+		return GF_FALSE;
+
+	bs1 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (grouping_type) {
+		sgpd_write_entry(grouping_type, ptr1, bs1);
+	} else {
+		sgpd_Write((GF_Box *)ptr1, bs1);
+	}
+	gf_bs_get_content(bs1, &buf1, &len1);
+	gf_bs_del(bs1);
+
+	bs2 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (grouping_type) {
+		sgpd_write_entry(grouping_type, ptr2, bs2);
+	} else {
+		sgpd_Write((GF_Box *)ptr2, bs2);
+	}
+	gf_bs_get_content(bs2, &buf2, &len2);
+	gf_bs_del(bs2);
+
+
+	if ((len1==len2) && !memcmp(buf1, buf2, len1))
+		res = GF_TRUE;
+
+	gf_free(buf1);
+	gf_free(buf2);
+#endif
+	return res;
+}
 
+GF_EXPORT
 GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber)
 {
-	u32 i, count;
+	u32 i, count, dst_sample_num;
 	GF_SubSampleInfoEntry *sub_sample;
 	GF_Err e;
 	GF_TrackBox *src_trak, *dst_trak;
@@ -5033,6 +5169,8 @@
 	dst_trak = gf_isom_get_track_from_file(dst, dst_track);
 	if (!dst_trak) return GF_BAD_PARAM;
 
+	dst_sample_num = dst_trak->Media->information->sampleTable->SampleSize->sampleCount;
+
 	/*modify depends flags*/
 	if (src_trak->Media->information->sampleTable->SampleDep) {
 		u32 isLeading, dependsOn, dependedOn, redundant;
@@ -5057,8 +5195,8 @@
 
 		count = gf_list_count(sub_sample->SubSamples);
 		for (i=0; i<count; i++) {
-			GF_SubSampleEntry *entry = gf_list_get(sub_sample->SubSamples, i);
-			e = gf_isom_add_subsample_info(dst_trak->Media->information->sampleTable->SubSamples, sampleNumber, entry->subsample_size, entry->subsample_priority, entry->reserved, entry->discardable);
+			GF_SubSampleEntry *entry = (GF_SubSampleEntry*)gf_list_get(sub_sample->SubSamples, i);
+			e = gf_isom_add_subsample_info(dst_trak->Media->information->sampleTable->SubSamples, dst_sample_num, entry->subsample_size, entry->subsample_priority, entry->reserved, entry->discardable);
 			if (e) return e;
 		}
 	}
@@ -5068,11 +5206,11 @@
 		count = gf_list_count(src_trak->Media->information->sampleTable->sampleGroups);
 		for (i=0; i<count; i++) {
 			GF_SampleGroupBox *sg;
-			u32 j;
-			u32 first_sample_in_entry, last_sample_in_entry;
+			u32 j, k, default_index;
+			u32 first_sample_in_entry, last_sample_in_entry, group_desc_index_src, group_desc_index_dst;
 			first_sample_in_entry = 1;
 
-			sg = gf_list_get(src_trak->Media->information->sampleTable->sampleGroups, i);
+			sg = (GF_SampleGroupBox*)gf_list_get(src_trak->Media->information->sampleTable->sampleGroups, i);
 			for (j=0; j<sg->entry_count; j++) {
 				last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
 				if ((sampleNumber<first_sample_in_entry) || (sampleNumber>last_sample_in_entry)) {
@@ -5083,10 +5221,55 @@
 				if (!dst_trak->Media->information->sampleTable->sampleGroups)
 					dst_trak->Media->information->sampleTable->sampleGroups = gf_list_new();
 
+				group_desc_index_src = group_desc_index_dst = sg->sample_entries[j].group_description_index;
+
+				if (group_desc_index_src) {
+					GF_SampleGroupDescriptionBox *sgd_src, *sgd_dst;
+					GF_DefaultSampleGroupDescriptionEntry *sgde_src, *sgde_dst;
+
+					group_desc_index_dst = 0;
+					//check that the sample group description exists !!
+					sgde_src = gf_isom_get_sample_group_info_entry(src, src_trak, sg->grouping_type, sg->sample_entries[j].group_description_index, &default_index, &sgd_src);
+
+					if (!sgde_src) break;
+
+					if (!dst_trak->Media->information->sampleTable->sampleGroupsDescription)
+						dst_trak->Media->information->sampleTable->sampleGroupsDescription = gf_list_new();
+
+					sgd_dst = NULL;
+					for (k=0; k< gf_list_count(dst_trak->Media->information->sampleTable->sampleGroupsDescription); k++) {
+						sgd_dst = gf_list_get(dst_trak->Media->information->sampleTable->sampleGroupsDescription, k);
+						if (sgd_dst->grouping_type==sgd_src->grouping_type) break;
+						sgd_dst = NULL;
+					}
+					if (!sgd_dst) {
+						gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &sgd_dst);
+						gf_list_add(dst_trak->Media->information->sampleTable->sampleGroupsDescription, sgd_dst);
+					}
+
+					//find the same entry
+					for (k=0; k<gf_list_count(sgd_dst->group_descriptions); k++) {
+						sgde_dst = gf_list_get(sgd_dst->group_descriptions, i);
+						if (gf_isom_is_identical_sgpd(sgde_src, sgde_dst, sgd_src->grouping_type)) {
+							group_desc_index_dst = k+1;
+							break;
+						}
+					}
+					if (!group_desc_index_dst) {
+						GF_SampleGroupDescriptionBox *cloned=NULL;
+						gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &cloned);
+						sgde_dst = gf_list_get(cloned->group_descriptions, group_desc_index_dst);
+						gf_list_rem(cloned->group_descriptions, group_desc_index_dst);
+						gf_isom_box_del( (GF_Box *) cloned);
+						gf_list_add(sgd_dst->group_descriptions, sgde_dst);
+						group_desc_index_dst = gf_list_count(sgd_dst->group_descriptions);
+					}
+				}
+
+
 				/*found our sample, add it to trak->sampleGroups*/
-				e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, sampleNumber, sg->grouping_type, sg->sample_entries[j].group_description_index);
+				e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, dst_sample_num, sg->grouping_type, group_desc_index_dst);
 				if (e) return e;
-
 				break;
 			}
 		}
@@ -5111,7 +5294,7 @@
 		GF_Tx3gSampleEntryBox *txt;
 		if (desc_index && (i+1 != desc_index)) continue;
 
-		txt = gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		txt = (GF_Tx3gSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
 		if (txt->type != GF_ISOM_BOX_TYPE_TX3G) continue;
 
 		switch (op_type) {
@@ -5127,9 +5310,111 @@
 		}
 	}
 	return GF_OK;
-	
+
+}
+
+
+GF_EXPORT
+GF_Err gf_isom_update_duration(GF_ISOFile *movie)
+{
+	u32 i;
+	u64 maxDur;
+	GF_TrackBox *trak;
+
+	if (!movie || !movie->moov) return GF_BAD_PARAM;
+
+	//if file was open in Write or Edit mode, recompute the duration
+	//the duration of a movie is the MaxDuration of all the tracks...
+
+	maxDur = 0;
+	i=0;
+	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
+		if( (movie->LastError = SetTrackDuration(trak))	) return movie->LastError;
+		if (trak->Header->duration > maxDur)
+			maxDur = trak->Header->duration;
+	}
+	movie->moov->mvhd->duration = maxDur;
+
+	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_update_edit_list_duration(GF_ISOFile *file, u32 track)
+{
+	u32 i;
+	u64 trackDuration;
+	GF_EdtsEntry *ent;
+	GF_EditListBox *elst;
+	GF_Err e;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+
+
+	//the total duration is the media duration: adjust it in case...
+	e = Media_SetDuration(trak);
+	if (e) return e;
+
+	//assert the timeScales are non-NULL
+	if (!trak->moov->mvhd->timeScale || !trak->Media->mediaHeader->timeScale) return GF_ISOM_INVALID_FILE;
+	trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
+
+	//if we have an edit list, the duration is the sum of all the editList
+	//entries' duration (always expressed in MovieTimeScale)
+	if (trak->editBox && trak->editBox->editList) {
+		u64 editListDuration = 0;
+		elst = trak->editBox->editList;
+		i=0;
+		while ((ent = (GF_EdtsEntry*)gf_list_enum(elst->entryList, &i))) {
+			if (ent->segmentDuration > trackDuration)
+				ent->segmentDuration = trackDuration;
+			if ((ent->mediaTime>=0) && ((u64) ent->mediaTime>=trak->Media->mediaHeader->duration)) {
+				ent->mediaTime = trak->Media->mediaHeader->duration;
+			}
+			editListDuration += ent->segmentDuration;
+		}
+		trackDuration = editListDuration;
+	}
+	if (!trackDuration) {
+		trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
+	}
+	trak->Header->duration = trackDuration;
+
+	return GF_OK;
+
+}
+
+
+GF_EXPORT
+GF_Err gf_isom_clone_pssh(GF_ISOFile *output, GF_ISOFile *input, Bool in_moof) {
+	GF_Box *a;
+	u32 i;
+	i = 0;
+
+	while ((a = (GF_Box *)gf_list_enum(input->moov->other_boxes, &i))) {
+		if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
+			GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)pssh_New();
+			memmove(pssh->SystemID, ((GF_ProtectionSystemHeaderBox *)a)->SystemID, 16);
+			pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
+			pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+			memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+			pssh->private_data_size = ((GF_ProtectionSystemHeaderBox *)a)->private_data_size;
+			pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
+			memmove(pssh->private_data, ((GF_ProtectionSystemHeaderBox *)a)->private_data, pssh->private_data_size);
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+			gf_isom_box_add_default(in_moof ? (GF_Box*)output->moof : (GF_Box*)output->moov, (GF_Box*)pssh);
+#else
+			gf_isom_box_add_default((GF_Box*)output->moov, (GF_Box*)pssh);
+#endif
+		}
+	}
+	return GF_OK;
+}
 
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

v0.5.2.tar.gz/src/isomedia/media.c -> v0.6.1.tar.gz/src/isomedia/media.c Changed

@@ -249,7 +249,7 @@
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_SIMPLE_TEXT_MP4;
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		gf_bs_write_u32(bs, entry->type);
-		boxstring_Write((GF_Box *)((GF_SimpleTextSampleEntryBox*)entry)->config, bs);
+		boxstring_Write((GF_Box *)((GF_MetaDataSampleEntryBox*)entry)->config, bs);
 		gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_bs_del(bs);
 	}
@@ -348,7 +348,6 @@
 	u8 isEdited;
 	GF_SampleEntryBox *entry;
 
-
 	if (!mdia || !mdia->information->sampleTable) return GF_BAD_PARAM;
 	if (!mdia->information->sampleTable->SampleSize)
 		return GF_ISOM_INVALID_FILE;
@@ -450,7 +449,7 @@
 		e = Media_RewriteODFrame(mdia, *samp);
 		if (e) return e;
 	}
-	/*FIXME: we don NOT rewrite sample if we have a encrypted track*/
+	/*FIXME: we do NOT rewrite sample if we have a encrypted track*/
 	else if (gf_isom_is_nalu_based_entry(mdia, entry) &&
 	 !gf_isom_is_track_encrypted(mdia->mediaTrack->moov->mov, gf_isom_get_tracknum_from_id(mdia->mediaTrack->moov, mdia->mediaTrack->Header->trackID))
 	 ) {
@@ -604,15 +603,16 @@
 //Get the total media duration based on the TimeToSample table
 GF_Err Media_SetDuration(GF_TrackBox *trak)
 {
+	GF_Err e;
 	GF_ESD *esd;
 	u64 DTS;
 	GF_SttsEntry *ent;
 	u32 nbSamp;
 
-	if (!trak->Media->information->sampleTable->SampleSize)
-		return GF_BAD_PARAM;
-	else
-		nbSamp = trak->Media->information->sampleTable->SampleSize->sampleCount;
+	if (!trak->Media->information->sampleTable->SampleSize || !trak->Media->information->sampleTable->TimeToSample)
+		return GF_ISOM_INVALID_FILE;
+
+	nbSamp = trak->Media->information->sampleTable->SampleSize->sampleCount;
 
 	//we need to check how many samples we have.
 	// == 1 -> last sample duration == default duration
@@ -633,13 +633,23 @@
 	default:
 		//we assume a constant frame rate for the media and assume the last sample
 		//will be hold the same time as the prev one
-		stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, nbSamp, &DTS);
-		ent = &trak->Media->information->sampleTable->TimeToSample->entries[trak->Media->information->sampleTable->TimeToSample->nb_entries-1];
+		e = stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, nbSamp, &DTS);
+		if (e < 0) {
+			return e;
+		}
+		if (trak->Media->information->sampleTable->TimeToSample->nb_entries > 0) {
+			ent = &trak->Media->information->sampleTable->TimeToSample->entries[trak->Media->information->sampleTable->TimeToSample->nb_entries-1];
+		} else {
+			ent = NULL;
+		}
 		trak->Media->mediaHeader->duration = DTS;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		trak->Media->mediaHeader->duration += trak->dts_at_seg_start;
+#endif
+
 
 #if 1
-		trak->Media->mediaHeader->duration += ent->sampleDelta;
+		if (ent) trak->Media->mediaHeader->duration += ent->sampleDelta;
 #else
 		if (!ent) {
 			u64 DTSprev;

v0.5.2.tar.gz/src/isomedia/meta.c -> v0.6.1.tar.gz/src/isomedia/meta.c Changed

@@ -84,10 +84,10 @@
 	}
 	if (!xml || !xml->xml || !xml->xml_length) return GF_BAD_PARAM;
 
-	didfile = gf_f64_open(outName, "wb");
+	didfile = gf_fopen(outName, "wb");
 	if (!didfile) return GF_IO_ERR;
 	gf_fwrite(xml->xml, xml->xml_length, 1, didfile);
-	fclose(didfile);
+	gf_fclose(didfile);
 
 	if (is_binary) *is_binary = (xml->type==GF_ISOM_BOX_TYPE_BXML) ? 1 : 0;
 	return GF_OK;
@@ -254,12 +254,12 @@
 		item_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	} else if (dump_file_name) {
 		strcpy(szPath, dump_file_name);
-		resource = gf_f64_open(szPath, "wb");
+		resource = gf_fopen(szPath, "wb");
 		item_bs = gf_bs_from_file(resource, GF_BITSTREAM_WRITE);
 	} else {
 		if (item_name) strcpy(szPath, item_name);
 		else sprintf(szPath, "item_id%02d", item_id);
-		resource = gf_f64_open(szPath, "wb");
+		resource = gf_fopen(szPath, "wb");
 		item_bs = gf_bs_from_file(resource, GF_BITSTREAM_WRITE);
 	}
 
@@ -281,7 +281,7 @@
 		gf_bs_get_content(item_bs, out_data, out_size);
 	}
 	if (resource) {
-		fclose(resource);
+		gf_fclose(resource);
 	}
 	gf_bs_del(item_bs);
 	return GF_OK;
@@ -412,12 +412,12 @@
 
 
 	/*assume 32bit max size = 4Go should be sufficient for a DID!!*/
-	xmlfile = gf_f64_open(XMLFileName, "rb");
+	xmlfile = gf_fopen(XMLFileName, "rb");
 	if (!xmlfile) return GF_URL_ERROR;
-	gf_f64_seek(xmlfile, 0, SEEK_END);
-	assert(gf_f64_tell(xmlfile) < 1<<31);
-	xml->xml_length = (u32) gf_f64_tell(xmlfile);
-	gf_f64_seek(xmlfile, 0, SEEK_SET);
+	gf_fseek(xmlfile, 0, SEEK_END);
+	assert(gf_ftell(xmlfile) < 1<<31);
+	xml->xml_length = (u32) gf_ftell(xmlfile);
+	gf_fseek(xmlfile, 0, SEEK_SET);
 	xml->xml = (char*)gf_malloc(sizeof(unsigned char)*xml->xml_length);
 	xml->xml_length = (u32) fread(xml->xml, 1, sizeof(unsigned char)*xml->xml_length, xmlfile);
 	if (ferror(xmlfile)) {
@@ -425,7 +425,7 @@
 		xml->xml = NULL;
 		return GF_BAD_PARAM;
 	}
-	fclose(xmlfile);
+	gf_fclose(xmlfile);
 	return GF_OK;
 }
 
@@ -457,7 +457,158 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_add_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN, char *data, u32 data_len)
+static s32 meta_find_prop(GF_ItemPropertyContainerBox *boxes, GF_ImageItemProperties *prop) {
+	u32 i;
+	u32 count;
+	count = gf_list_count(boxes->other_boxes);
+	for (i = 0; i < count; i++) {
+		GF_Box *b = (GF_Box *)gf_list_get(boxes->other_boxes, i);
+		switch(b->type) {
+		case GF_ISOM_BOX_TYPE_ISPE:
+		{
+			GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)b;
+			if ((prop->width || prop->height) && ispe->image_width == prop->width && ispe->image_height == prop->height) {
+				return i;
+			}
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_RLOC:
+		{
+			GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)b;
+			if ((prop->hOffset || prop->vOffset) && rloc->horizontal_offset == prop->hOffset && rloc->vertical_offset == prop->vOffset) {
+				return i;
+			}
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_PASP:
+		{
+			GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)b;
+			if ((prop->hOffset || prop->vOffset) && pasp->hSpacing == prop->hSpacing && pasp->vSpacing == prop->vSpacing) {
+				return i;
+			}
+		}
+		break;
+		case GF_ISOM_BOX_TYPE_IROT:
+		{
+			GF_ImageRotationBox *irot = (GF_ImageRotationBox *)b;
+			if (prop->angle && irot->angle*90 == prop->angle) {
+				return i;
+			}
+		}
+		break;
+		}
+	}
+	return -1;
+}
+
+static void meta_add_item_property_association(GF_ItemPropertyAssociationBox *ipma, u32 item_ID, u32 prop_index, Bool essential) {
+	u32 i, count;
+	GF_ItemPropertyAssociationEntry *found_entry = NULL;
+	Bool *ess = (Bool *)gf_malloc(sizeof(Bool));
+	u32 *index = (u32 *)gf_malloc(sizeof(u32));
+
+	*ess = essential;
+	*index = prop_index;
+	count = gf_list_count(ipma->entries);
+	for (i = 0; i < count; i++) {
+		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
+		if (entry->item_id == item_ID) {
+			found_entry = entry;
+			break;
+		}
+	}
+	if (!found_entry) {
+		GF_SAFEALLOC(found_entry, GF_ItemPropertyAssociationEntry);
+		gf_list_add(ipma->entries, found_entry);
+		found_entry->item_id = item_ID;
+		found_entry->essential = gf_list_new();
+		found_entry->property_index= gf_list_new();
+	}
+	gf_list_add(found_entry->essential, ess);
+	gf_list_add(found_entry->property_index, index);
+}
+
+static void meta_process_image_properties(GF_MetaBox *meta, u32 item_ID, GF_ImageItemProperties *image_props) {
+	GF_ImageItemProperties searchprop;
+	GF_ItemPropertyAssociationBox *ipma;
+	GF_ItemPropertyContainerBox *ipco;
+	s32 prop_index;
+	memset(&searchprop, 0, sizeof(GF_ImageItemProperties));
+
+	if (!meta->item_props) {
+		meta->item_props = (GF_ItemPropertiesBox *)iprp_New();
+		meta->item_props->property_container = (GF_ItemPropertyContainerBox *)ipco_New();
+		ipco = meta->item_props->property_container;
+		ipma = (GF_ItemPropertyAssociationBox *)ipma_New();
+		gf_list_add(meta->item_props->other_boxes, ipma);
+	} else {
+		ipma = (GF_ItemPropertyAssociationBox *)gf_list_get(meta->item_props->other_boxes, 0);
+		ipco = meta->item_props->property_container;
+	}
+	if (image_props->width || image_props->height) {
+		searchprop.width = image_props->width;
+		searchprop.height = image_props->height;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)ispe_New();
+			ispe->image_width = image_props->width;
+			ispe->image_height = image_props->height;
+			gf_list_add(ipco->other_boxes, ispe);
+			prop_index = gf_list_count(ipco->other_boxes) - 1;
+		}
+		meta_add_item_property_association(ipma, item_ID, prop_index, GF_FALSE);
+		searchprop.width = 0;
+		searchprop.height = 0;
+	}
+	if (image_props->hOffset || image_props->vOffset) {
+		searchprop.hOffset = image_props->hOffset;
+		searchprop.vOffset = image_props->vOffset;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)rloc_New();
+			rloc->horizontal_offset = image_props->hOffset;
+			rloc->vertical_offset = image_props->vOffset;
+			gf_list_add(ipco->other_boxes, rloc);
+			prop_index = gf_list_count(ipco->other_boxes) - 1;
+		}
+		meta_add_item_property_association(ipma, item_ID, prop_index, GF_FALSE);
+		searchprop.hOffset = 0;
+		searchprop.vOffset = 0;
+	}
+	if (image_props->hSpacing || image_props->vSpacing) {
+		searchprop.hSpacing = image_props->hSpacing;
+		searchprop.vSpacing = image_props->vSpacing;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)pasp_New();
+			pasp->hSpacing = image_props->hSpacing;
+			pasp->vSpacing = image_props->vSpacing;
+			gf_list_add(ipco->other_boxes, pasp);
+			prop_index = gf_list_count(ipco->other_boxes) - 1;
+		}
+		meta_add_item_property_association(ipma, item_ID, prop_index, GF_FALSE);
+		searchprop.hSpacing = 0;
+		searchprop.vSpacing = 0;
+	}
+	if (image_props->angle) {
+		searchprop.angle = image_props->angle;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_ImageRotationBox *irot = (GF_ImageRotationBox *)irot_New();
+			irot->angle = image_props->angle/90;
+			gf_list_add(ipco->other_boxes, irot);
+			prop_index = gf_list_count(ipco->other_boxes) - 1;
+		}
+		meta_add_item_property_association(ipma, item_ID, prop_index, GF_FALSE);
+		searchprop.angle = 0;
+	}
+}
+
+GF_Err gf_isom_add_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path,
+ const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding,
+ GF_ImageItemProperties *image_props,
+ const char *URL, const char *URN,
+ char *data, u32 data_len)
 {
 	GF_Err e;
 	GF_ItemLocationEntry *location_entry;
@@ -479,9 +630,9 @@
 
 	/*check file exists */
 	if (!URN && !URL && !self_reference && !data) {
-		FILE *src = gf_f64_open(resource_path, "rb");
+		FILE *src = gf_fopen(resource_path, "rb");
 		if (!src) return GF_URL_ERROR;
-		fclose(src);
+		gf_fclose(src);
 	}
 
 	if (meta->item_infos) {
@@ -540,16 +691,16 @@
 	/*Creation an ItemLocation Box if it does not exist*/
 	if (!meta->item_locations) meta->item_locations = (GF_ItemLocationBox *)iloc_New();
 	gf_list_add(meta->item_locations->location_entries, location_entry);
-	if (item_id) {
-		location_entry->item_ID = item_id;
-	} else {
-		location_entry->item_ID = lastItemID;
-	}
+	location_entry->item_ID = infe->item_ID;
 
 	if (!meta->item_infos) meta->item_infos = (GF_ItemInfoBox *) iinf_New();
 	e = gf_list_add(meta->item_infos->item_infos, infe);
 	if (e) return e;
 
+	if (image_props) {
+		meta_process_image_properties(meta, infe->item_ID, image_props);
+	}
+
 	/*0: the current file*/
 	location_entry->data_reference_index = 0;
 	if (self_reference) {
@@ -596,13 +747,13 @@
 			if (entry->extent_length>0xFFFFFFFF) meta->item_locations->length_size = 8;
 			else if (entry->extent_length && !meta->item_locations->length_size) meta->item_locations->length_size = 4;
 		} else if (resource_path) {
-			src = gf_f64_open(resource_path, "rb");
+			src = gf_fopen(resource_path, "rb");
 			if (src) {
 				char cache_data[4096];
 				u64 remain;
-				gf_f64_seek(src, 0, SEEK_END);
-				entry->extent_length = gf_f64_tell(src);
-				gf_f64_seek(src, 0, SEEK_SET);
+				gf_fseek(src, 0, SEEK_END);
+				entry->extent_length = gf_ftell(src);
+				gf_fseek(src, 0, SEEK_SET);
 
 				remain = entry->extent_length;
 				while (remain) {
@@ -612,7 +763,7 @@
 					gf_bs_write_data(file->editFileMap->bs, cache_data, (u32) read);
 					remain -= (u32) read;
 				}
-				fclose(src);
+				gf_fclose(src);
 
 				/*update length size*/
 				if (entry->extent_length>0xFFFFFFFF) meta->item_locations->length_size = 8;
@@ -623,7 +774,7 @@
 	/*store full path for info*/
 	else if (!location_entry->data_reference_index) {
 		if (data) {
-			infe->full_path = gf_malloc(sizeof(char) * data_len);
+			infe->full_path = (char *)gf_malloc(sizeof(char) * data_len);
 			memcpy(infe->full_path, data, sizeof(char) * data_len);
 			infe->data_len = data_len;
 		} else {
@@ -635,14 +786,16 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN)
+GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id,
+ const char *mime_type, const char *content_encoding, const char *URL, const char *URN,
+ GF_ImageItemProperties *image_props)
 {
-	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, item_id, mime_type, content_encoding, URL, URN, NULL, 0);
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, item_id, mime_type, content_encoding, image_props, URL, URN, NULL, 0);
 }
 
 GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, char *data, u32 data_len)
 {
-	return gf_isom_add_meta_item_extended(file, root_meta, track_num, 0, NULL, item_name, item_id, mime_type, content_encoding, NULL, NULL, data, data_len);
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, GF_FALSE, NULL, item_name, item_id, mime_type, content_encoding, NULL, NULL, NULL, data, data_len);
 }
 
 GF_EXPORT

v0.5.2.tar.gz/src/isomedia/movie_fragments.c -> v0.6.1.tar.gz/src/isomedia/movie_fragments.c Changed

@@ -84,15 +84,15 @@
 {
 	GF_Err e;
 	u32 i;
-	Bool store_file = 1;
+	Bool store_file = GF_TRUE;
 	GF_TrackExtendsBox *trex;
 	if (!movie || !movie->moov) return GF_BAD_PARAM;
 
 	if (movie->openMode==GF_ISOM_OPEN_CAT_FRAGMENTS) {
 		/*from now on we are in write mode*/
 		movie->openMode = GF_ISOM_OPEN_WRITE;
-		store_file = 0;
-		movie->append_segment = 1;
+		store_file = GF_FALSE;
+		movie->append_segment = GF_TRUE;
 	} else {
 		movie->NextMoofNumber = 1;
 	}
@@ -166,11 +166,11 @@
 		//dependancies
 	}
 
-	//ok we are fine - note the data map is created at the begining
+	//ok we are fine - note the data map is created at the beginning
 	if (i) movie->FragmentsFlags |= GF_ISOM_FRAG_WRITE_READY;
 
 	if (media_segment_type) {
-		movie->use_segments = 1;
+		movie->use_segments = GF_TRUE;
 		movie->moof_list = gf_list_new();
 	}
 
@@ -219,6 +219,10 @@
 	trex->def_sample_duration = DefaultSampleDuration;
 	trex->def_sample_size = DefaultSampleSize;
 	trex->def_sample_flags = GF_ISOM_FORMAT_FRAG_FLAGS(DefaultSamplePadding, DefaultSampleIsSync, DefaultDegradationPriority);
+	//if sample is sync by default, set sample_depends_on flags to 2 (does not depend on other samples)
+	if (DefaultSampleIsSync) {
+		trex->def_sample_flags |= (2<<24);
+	}
 
 	return GF_OK;
 }
@@ -403,11 +407,11 @@
 	u32 i, j;
 	GF_TrackFragmentBox *traf;
 	i=0;
-	while ((traf = gf_list_enum(movie->moof->TrackList, &i))) {
+	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
 		/*remove base data*/
 		traf->tfhd->base_data_offset = 0;
 		j=0;
-		while ((trun = gf_list_enum(traf->TrackRuns, &j))) {
+		while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &j))) {
 			if (j==1) {
 				trun->data_offset += offset;
 			} else {
@@ -420,7 +424,12 @@
 
 u32 UpdateRuns(GF_ISOFile *movie, GF_TrackFragmentBox *traf)
 {
-	u32 sampleCount, i, j, RunSize, UseDefaultSize, RunDur, UseDefaultDur, RunFlags, NeedFlags, UseDefaultFlag, UseCTS, count;
+	u32 sampleCount, i, j, RunSize, RunDur, RunFlags, NeedFlags, UseCTS, count;
+	/* enum:
+	 0 - use values per sample in the trun box
+	 1 - use default values from track fragment header
+	 2 - use default values from track extends header */
+	u32 UseDefaultSize, UseDefaultDur, UseDefaultFlag;
 	GF_TrackFragmentRunBox *trun;
 	GF_TrunEntry *ent, *first_ent;
 
@@ -522,30 +531,40 @@
 
 		//flag checking
 		if (!NeedFlags) {
+			// all samples flags are the same after the 2nd entry
 			if (RunFlags == traf->trex->def_sample_flags) {
-				if (!UseDefaultFlag) UseDefaultFlag = 2;
-				else if (UseDefaultFlag==1) NeedFlags = 1;
+				/* this run can use trex flags */
+				if (!UseDefaultFlag) {
+					/* if all previous runs used explicit flags per sample, we can still use trex flags for this run */
+					UseDefaultFlag = 2;
+				} else if (UseDefaultFlag==1) {
+					/* otherwise if one of the previous runs did use tfhd flags,
+					we have no choice but to explicitly use flags per sample for this run */
+					NeedFlags = GF_TRUE;
+				}
 			} else if (RunFlags == traf->tfhd->def_sample_flags) {
-				if (!UseDefaultFlag) UseDefaultFlag = 1;
-				else if(UseDefaultFlag==2) NeedFlags = 1;
+				/* this run can use tfhd flags */
+				if (!UseDefaultFlag) {
+					/* if all previous runs used explicit flags per sample, we can still use tfhd flags for this run */
+					UseDefaultFlag = 1;
+				} else if(UseDefaultFlag==2) {
+					/* otherwise if one of the previous runs did use trex flags,
+					we have no choice but to explicitly use flags per sample for this run */
+					NeedFlags = GF_TRUE;
+				}
+			} else {
+				/* the flags for the 2nd and following entries are different from trex and tfhd default values
+				 (possible case: 2 samples in trun, and first sample was used to set default flags) */
+				NeedFlags = GF_TRUE;
 			}
 		}
 		if (NeedFlags) {
 			//one flags entry per sample only
 			trun->flags |= GF_ISOM_TRUN_FLAGS;
 		} else {
-			//indicated in global setup
-			if (first_ent->flags == traf->trex->def_sample_flags) {
-				if (!UseDefaultFlag) UseDefaultFlag = 2;
-				else if (UseDefaultFlag==1) trun->flags |= GF_ISOM_TRUN_FIRST_FLAG;
-			}
-			//indicated in local setup
-			else if (first_ent->flags == traf->tfhd->def_sample_flags) {
-				if (!UseDefaultFlag) UseDefaultFlag = 1;
-				else if (UseDefaultFlag==2) trun->flags |= GF_ISOM_TRUN_FIRST_FLAG;
-			}
-			//explicit store
-			else {
+			/* this run can use default flags for the 2nd and following entries,
+			 we just need to check if the first entry flags need to be singled out*/
+			if (first_ent->flags != RunFlags) {
 				trun->flags |= GF_ISOM_TRUN_FIRST_FLAG;
 			}
 		}
@@ -560,7 +579,7 @@
 		sampleCount += trun->sample_count;
 	}
 
-	//last update TRAF flags
+	//after all runs in the traf are processed, update TRAF flags
 	if (UseDefaultSize==1) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_SIZE;
 	if (UseDefaultDur==1) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_DUR;
 	if (UseDefaultFlag==1) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_FLAGS;
@@ -573,7 +592,7 @@
 static u32 moof_get_sap_info(GF_MovieFragmentBox *moof, u32 refTrackID, u32 *sap_delta, Bool *starts_with_sap)
 {
 	u32 i, j, count, delta, earliest_cts, sap_type, sap_sample_num, cur_sample;
-	Bool first = 1;
+	Bool first = GF_TRUE;
 	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf=NULL;
 	GF_TrackFragmentRunBox *trun;
@@ -581,7 +600,7 @@
 	*sap_delta = 0;
 	*starts_with_sap = GF_FALSE;
 	for (i=0; i<gf_list_count(moof->TrackList); i++) {
-		traf = gf_list_get(moof->TrackList, i);
+		traf = (GF_TrackFragmentBox*)gf_list_get(moof->TrackList, i);
 		if (traf->tfhd->trackID==refTrackID) break;
 		traf=NULL;
 	}
@@ -597,7 +616,7 @@
 		GF_SampleGroupBox *sg;
 		u32 j, first_sample;
 		Bool rap_type = GF_FALSE;
-		sg = gf_list_get(traf->sampleGroups, i);
+		sg = (GF_SampleGroupBox*)gf_list_get(traf->sampleGroups, i);
 
 		switch (sg->grouping_type) {
 		case GF_4CC('r','a','p',' '):
@@ -631,10 +650,10 @@
 	cur_sample = 1;
 	delta = 0;
 	i=0;
-	while ((trun = gf_list_enum(traf->TrackRuns, &i))) {
+	while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
 		if (trun->flags & GF_ISOM_TRUN_FIRST_FLAG) {
 			if (GF_ISOM_GET_FRAG_SYNC(trun->flags)) {
-				ent = gf_list_get(trun->entries, 0);
+				ent = (GF_TrunEntry*)gf_list_get(trun->entries, 0);
 				if (!delta) earliest_cts = ent->CTS_Offset;
 				*sap_delta = delta + ent->CTS_Offset - ent->CTS_Offset;
 				*starts_with_sap = first;
@@ -643,7 +662,7 @@
 			}
 		}
 		j=0;
-		while ((ent = gf_list_enum(trun->entries, &j))) {
+		while ((ent = (GF_TrunEntry*)gf_list_enum(trun->entries, &j))) {
 			if (!delta) earliest_cts = ent->CTS_Offset;
 
 			if (GF_ISOM_GET_FRAG_SYNC(ent->flags)) {
@@ -658,7 +677,7 @@
 				return sap_type;
 			}
 			delta += ent->Duration;
-			first = 0;
+			first = GF_FALSE;
 			cur_sample++;
 		}
 	}
@@ -673,7 +692,7 @@
 	GF_TrackFragmentBox *traf = NULL;
 	GF_TrackFragmentRunBox *trun;
 	for (i=0; i<gf_list_count(moof->TrackList); i++) {
-		traf = gf_list_get(moof->TrackList, i);
+		traf = (GF_TrackFragmentBox*)gf_list_get(moof->TrackList, i);
 		if (traf->tfhd->trackID==refTrackID) break;
 		traf=NULL;
 	}
@@ -681,9 +700,9 @@
 
 	duration = 0;
 	i=0;
-	while ((trun = gf_list_enum(traf->TrackRuns, &i))) {
+	while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
 		j=0;
-		while ((ent = gf_list_enum(trun->entries, &j))) {
+		while ((ent = (GF_TrunEntry*)gf_list_enum(trun->entries, &j))) {
 			if (ent->flags & GF_ISOM_TRAF_SAMPLE_DUR)
 				duration += ent->Duration;
 			else
@@ -693,25 +712,26 @@
 	return duration;
 }
 
-static u32 moof_get_earliest_cts(GF_MovieFragmentBox *moof, u32 refTrackID)
+static u64 moof_get_earliest_cts(GF_MovieFragmentBox *moof, u32 refTrackID)
 {
-	u32 i, j, cts, duration;
+	u32 i, j;
+	u64 cts, duration;
 	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf=NULL;
 	GF_TrackFragmentRunBox *trun;
 	for (i=0; i<gf_list_count(moof->TrackList); i++) {
-		traf = gf_list_get(moof->TrackList, i);
+		traf = (GF_TrackFragmentBox*)gf_list_get(moof->TrackList, i);
 		if (traf->tfhd->trackID==refTrackID) break;
 		traf=NULL;
 	}
 	if (!traf) return 0;
 
 	duration = 0;
-	cts = 0xFFFFFFFF;
+	cts = LLU_CAST (-1);
 	i=0;
-	while ((trun = gf_list_enum(traf->TrackRuns, &i))) {
+	while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
 		j=0;
-		while ((ent = gf_list_enum(trun->entries, &j))) {
+		while ((ent = (GF_TrunEntry*)gf_list_enum(trun->entries, &j))) {
 			if (duration + ent->CTS_Offset < cts)
 				cts = duration + ent->CTS_Offset;
 			duration += ent->Duration;
@@ -733,7 +753,7 @@
 	if (!movie->moof) return GF_OK;
 
 	bs = movie->editFileMap->bs;
-	if (!movie->moof_first) load_mdat_only = 0;
+	if (!movie->moof_first) load_mdat_only = GF_FALSE;
 	mdat_size = 0;
 	//1 - flush all caches
 	i=0;
@@ -776,7 +796,7 @@
 			/*write mdat size*/
 			gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
 
-			movie->moof->mdat = gf_malloc(sizeof(char) * movie->moof->mdat_size);
+			movie->moof->mdat = (char*)gf_malloc(sizeof(char) * movie->moof->mdat_size);
 			if (!movie->moof->mdat) return GF_OUT_OF_MEM;
 
 			gf_bs_seek(bs, offset);
@@ -836,7 +856,7 @@
 	buffer = NULL;
 	/*rewind bitstream and load mdat in memory */
 	if (movie->moof_first && !movie->moof->mdat) {
-		buffer = gf_malloc(sizeof(char)*mdat_size);
+		buffer = (char*)gf_malloc(sizeof(char)*mdat_size);
 		gf_bs_seek(bs, movie->moof->fragment_offset);
 		gf_bs_read_data(bs, buffer, mdat_size);
 		/*back to mdat start and erase with moov*/
@@ -884,7 +904,7 @@
 
 	pos = gf_bs_get_position(bs);
 	i=0;
-	while ((traf = gf_list_enum(movie->moof->TrackList, &i))) {
+	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
 		traf->moof_start_in_bs = pos;
 	}
 
@@ -940,7 +960,7 @@
 	/*for now we only store one ref per subsegment and don't support daisy-chaining*/
 	movie->root_sidx->nb_refs = nb_segs;
 
-	movie->root_sidx->refs = gf_malloc(sizeof(GF_SIDXReference) * movie->root_sidx->nb_refs);
+	movie->root_sidx->refs = (GF_SIDXReference*)gf_malloc(sizeof(GF_SIDXReference) * movie->root_sidx->nb_refs);
 	memset(movie->root_sidx->refs, 0, sizeof(GF_SIDXReference) * movie->root_sidx->nb_refs);
 
 	movie->root_sidx_index = 0;
@@ -983,7 +1003,7 @@
 		e = gf_isom_box_write((GF_Box *) movie->brand, movie->editFileMap->bs);
 		if (e) return e;
 
-		movie->styp_written = 1;
+		movie->styp_written = GF_TRUE;
 	}
 	return GF_OK;
 }
@@ -999,7 +1019,7 @@
 
 	/*flush our fragment (store in mem)*/
 	if (movie->moof) {
-		e = StoreFragment(movie, 1, 0, NULL);
+		e = StoreFragment(movie, GF_TRUE, 0, NULL);
 		if (e) return e;
 	}
 
@@ -1020,13 +1040,13 @@
 		s32 offset_diff;
 		u32 moof_size;
 
-		movie->moof = gf_list_get(movie->moof_list, 0);
+		movie->moof = (GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0);
 		gf_list_rem(movie->moof_list, 0);
 
 		offset_diff = (s32) (gf_bs_get_position(movie->editFileMap->bs) - movie->moof->fragment_offset);
 		movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
 
-		e = StoreFragment(movie, 0, offset_diff, &moof_size);
+		e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size);
 
 		gf_isom_box_del((GF_Box *) movie->moof);
 		movie->moof = NULL;
@@ -1082,7 +1102,7 @@
 	GF_List *daisy_sidx = NULL;
 	u64 sidx_start, sidx_end;
 	Bool first_frag_in_subseg;
-	Bool no_sidx = 0;
+	Bool no_sidx = GF_FALSE;
 	u32 count, idx, cur_dur, sidx_dur, sidx_idx, idx_offset, frag_count;
 	u64 last_top_box_pos, root_prev_offset, local_sidx_start, local_sidx_end, prev_earliest_cts;
 	GF_TrackBox *trak = NULL;
@@ -1110,7 +1130,7 @@
 
 	/*store fragment*/
 	if (movie->moof) {
-		e = StoreFragment(movie, 1, 0, NULL);
+		e = StoreFragment(movie, GF_TRUE, 0, NULL);
 		if (e) return e;
 	}
 	/*restore final bitstream*/
@@ -1147,7 +1167,9 @@
 	if (subsegments_per_sidx < 0) {
 		referenceTrackID = 0;
 		subsegments_per_sidx = 0;
-		no_sidx = 1;
+	}
+	if (!subsegments_per_sidx && !referenceTrackID) {
+		no_sidx = GF_TRUE;
 	}
 
 	e = gf_isom_write_styp(movie, last_segment);
@@ -1164,9 +1186,9 @@
 
 	/*prepare SIDX: we write a blank SIDX box with the right number of entries, and will rewrite it later on*/
 	if (referenceTrackID) {
-		Bool is_root_sidx=0;
+		Bool is_root_sidx = GF_FALSE;
 
-		prev_earliest_cts = get_presentation_time( ref_track_decode_time + moof_get_earliest_cts(gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
+		prev_earliest_cts = get_presentation_time( ref_track_decode_time + moof_get_earliest_cts((GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
 
 		if (movie->root_sidx) {
 			sidx = movie->root_sidx;
@@ -1187,7 +1209,7 @@
 			frags_per_subseg = count;
 			frags_per_subsidx = count;
 			subseg_per_sidx = 1;
-			daisy_chain_sidx = 0;
+			daisy_chain_sidx = GF_FALSE;
 
 			idx_offset = movie->root_sidx_index;
 			sidx_end = gf_bs_get_position(movie->editFileMap->bs);
@@ -1210,7 +1232,7 @@
 				subseg_per_sidx = count;
 
 				sidx->nb_refs = nb_subsegs;
-				daisy_chain_sidx = 0;
+				daisy_chain_sidx = GF_FALSE;
 			}
 			/*daisy-chain SIDX: each SIDX describes a subsegment made of frags_per_subseg fragments plus next */
 			else if (daisy_chain_sidx) {
@@ -1239,10 +1261,10 @@
 				if (subseg_per_sidx * frags_per_subseg < frags_per_subsidx) subseg_per_sidx++;
 
 				sidx->nb_refs = nb_subsegs;
-				is_root_sidx = 1;
+				is_root_sidx = GF_TRUE;
 			}
 
-			sidx->refs = gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
+			sidx->refs = (GF_SIDXReference*)gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
 			memset(sidx->refs, 0, sizeof(GF_SIDXReference)*sidx->nb_refs);
 
 			/*remember start of sidx*/
@@ -1280,13 +1302,13 @@
 	/*cumulated segments duration since start of the sidx */
 	frag_count = frags_per_subsidx;
 	cur_dur = 0;
-	first_frag_in_subseg = 1;
+	first_frag_in_subseg = GF_TRUE;
 	e = GF_OK;
 	while (gf_list_count(movie->moof_list)) {
 		s32 offset_diff;
 		u32 moof_size;
 
-		movie->moof = gf_list_get(movie->moof_list, 0);
+		movie->moof = (GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0);
 		gf_list_rem(movie->moof_list, 0);
 
 		/*hierarchical or daisy-chain SIDXs*/
@@ -1311,11 +1333,11 @@
 			if (daisy_chain_sidx && (nb_subsegs>1)) {
 				sidx->nb_refs += 1;
 			}
-			sidx->refs = gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
+			sidx->refs = (GF_SIDXReference*)gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
 			memset(sidx->refs, 0, sizeof(GF_SIDXReference)*sidx->nb_refs);
 
 			if (root_sidx)
-				root_sidx->refs[sidx_idx].reference_type = 1;
+				root_sidx->refs[sidx_idx].reference_type = GF_TRUE;
 
 			/*remember start of sidx*/
 			local_sidx_start = gf_bs_get_position(movie->editFileMap->bs);
@@ -1344,7 +1366,7 @@
 		movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
 
 		if (!e) {
-			e = StoreFragment(movie, 0, offset_diff, &moof_size);
+			e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size);
 
 
 			if (sidx) {
@@ -1359,12 +1381,12 @@
 						if (root_sidx) root_sidx->refs[sidx_idx].subsegment_duration += subseg_dur;
 					}
 					prev_earliest_cts = first_cts;
-					first_frag_in_subseg = 0;
+					first_frag_in_subseg = GF_FALSE;
 				}
 
 
 				/*we refer to next moof*/
-				sidx->refs[cur_index].reference_type = 0;
+				sidx->refs[cur_index].reference_type = GF_FALSE;
 				if (!sidx->refs[cur_index].SAP_type) {
 					sidx->refs[cur_index].SAP_type = moof_get_sap_info(movie->moof, referenceTrackID, & sidx->refs[cur_index].SAP_delta_time, & sidx->refs[cur_index].starts_with_SAP);
 					if (sidx->refs[cur_index].SAP_type) {
@@ -1388,7 +1410,7 @@
 
 				if (count==frags_per_subseg) {
 					count = 0;
-					first_frag_in_subseg = 1;
+					first_frag_in_subseg = GF_TRUE;
 					idx++;
 				}
 
@@ -1398,7 +1420,7 @@
 					u64 next_cts;
 					/*update last ref duration*/
 					if (gf_list_count(movie->moof_list)) {
-						next_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur + moof_get_earliest_cts(gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
+						next_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur + moof_get_earliest_cts((GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
 					} else {
 						next_cts = get_presentation_time( ref_track_next_cts, ts_shift);
 					}
@@ -1423,7 +1445,7 @@
 						gf_isom_box_del((GF_Box*)sidx);
 						sidx = NULL;
 					} else if (daisy_chain_sidx) {
-						SIDXEntry *entry = gf_list_last(daisy_sidx);
+						SIDXEntry *entry = (SIDXEntry*)gf_list_last(daisy_sidx);
 						entry->end_offset = gf_bs_get_position(movie->editFileMap->bs);
 						nb_subsegs--;
 						sidx = NULL;
@@ -1469,8 +1491,8 @@
 		u64 last_entry_end_offset = 0;
 		u32 count = gf_list_count(daisy_sidx);
 		for (i=count; i>1; i--) {
-			SIDXEntry *entry = gf_list_get(daisy_sidx, i-2);
-			SIDXEntry *next_entry = gf_list_get(daisy_sidx, i-1);
+			SIDXEntry *entry = (SIDXEntry*)gf_list_get(daisy_sidx, i-2);
+			SIDXEntry *next_entry = (SIDXEntry*)gf_list_get(daisy_sidx, i-1);
 
 			if (!last_entry_end_offset) {
 				last_entry_end_offset = next_entry->end_offset;
@@ -1480,7 +1502,7 @@
 			/*copy over SAP info for last item (which points to next item !)*/
 			entry->sidx->refs[entry->sidx->nb_refs-1] = next_entry->sidx->refs[0];
 			/*and rewrite reference type, size and dur*/
-			entry->sidx->refs[entry->sidx->nb_refs-1].reference_type = 1;
+			entry->sidx->refs[entry->sidx->nb_refs-1].reference_type = GF_TRUE;
 			entry->sidx->refs[entry->sidx->nb_refs-1].reference_size = (u32) (last_entry_end_offset - next_entry->start_offset);
 			entry->sidx->refs[entry->sidx->nb_refs-1].subsegment_duration = 0;
 			for (j=0; j<next_entry->sidx->nb_refs; j++) {
@@ -1489,7 +1511,7 @@
 			sidx_rewrite(entry->sidx, movie->editFileMap->bs, entry->start_offset);
 		}
 		while (gf_list_count(daisy_sidx)) {
-			SIDXEntry *entry = gf_list_last(daisy_sidx);
+			SIDXEntry *entry = (SIDXEntry*)gf_list_last(daisy_sidx);
 			gf_isom_box_del((GF_Box*)entry->sidx);
 			gf_free(entry);
 			gf_list_rem_last(daisy_sidx);
@@ -1526,9 +1548,9 @@
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie)
 {
 	if (movie->use_segments) {
-		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, 0, 1, 0, NULL, NULL);
+		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, GF_FALSE, 1, 0, NULL, NULL);
 	} else {
-		return StoreFragment(movie, 0, 0, NULL);
+		return StoreFragment(movie, GF_FALSE, 0, NULL);
 	}
 }
 
@@ -1544,20 +1566,20 @@
 		return GF_BAD_PARAM;
 
 	movie->segment_bs = NULL;
-	movie->append_segment = 0;
+	movie->append_segment = GF_FALSE;
 	/*update segment file*/
 	if (SegName) {
 		gf_isom_datamap_del(movie->editFileMap);
 		e = gf_isom_datamap_new(SegName, NULL, GF_ISOM_DATA_MAP_WRITE, & movie->editFileMap);
 		movie->segment_start = 0;
-		movie->styp_written = 0;
+		movie->styp_written = GF_FALSE;
 		if (e) return e;
 	} else {
 		assert(gf_list_count(movie->moof_list) == 0);
 		movie->segment_start = gf_bs_get_position(movie->editFileMap->bs);
 		/*if movieFileMap is not null, we are concatenating segments to the original movie, force a copy*/
 		if (movie->movieFileMap)
-			movie->append_segment = 1;
+			movie->append_segment = GF_TRUE;
 	}
 
 	/*create a memory bitstream for all file IO until final flush*/
@@ -1595,12 +1617,12 @@
 		return GF_BAD_PARAM;
 
 	/*always force cached mode when writing movie segments*/
-	if (movie->use_segments) moof_first = 1;
+	if (movie->use_segments) moof_first = GF_TRUE;
 	movie->moof_first = moof_first;
 
 	//store existing fragment
 	if (movie->moof) {
-		e = StoreFragment(movie, movie->use_segments ? 1 : 0, 0, NULL);
+		e = StoreFragment(movie, movie->use_segments ? GF_TRUE : GF_FALSE, 0, NULL);
 		if (e) return e;
 	}
 
@@ -1634,29 +1656,6 @@
 	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_isom_clone_pssh(GF_ISOFile *output, GF_ISOFile *input, Bool in_moof) {
-	GF_Box *a;
-	u32 i;
-	i = 0;
-
-	while ((a = (GF_Box *)gf_list_enum(input->moov->other_boxes, &i))) {
-		if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
-			GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)pssh_New();
-			memmove(pssh->SystemID, ((GF_ProtectionSystemHeaderBox *)a)->SystemID, 16);
-			pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
-			pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
-			memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
-			pssh->private_data_size = ((GF_ProtectionSystemHeaderBox *)a)->private_data_size;
-			pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
-			memmove(pssh->private_data, ((GF_ProtectionSystemHeaderBox *)a)->private_data, pssh->private_data_size);
-
-			gf_isom_box_add_default(in_moof ? (GF_Box*)output->moof : (GF_Box*)output->moov, (GF_Box*)pssh);
-		}
-	}
-	return GF_OK;
-}
-
 u32 GetRunSize(GF_TrackFragmentRunBox *trun)
 {
 	u32 i, size;
@@ -1787,18 +1786,20 @@
 	}
 
 	//finally write the data
-	if (!traf->DataCache) {
-		if (!gf_bs_write_data(movie->editFileMap->bs, sample->data, sample->dataLength)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Could not add a sample with a size if %u bytes (no DataCache)\n", sample->dataLength));
-			return GF_OUT_OF_MEM;
-		}
-	} else if (trun->cache) {
-		if (!gf_bs_write_data(trun->cache, sample->data, sample->dataLength)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Could not add a sample with a size if %u bytes (with cache)\n", sample->dataLength));
-			return GF_OUT_OF_MEM;
+	if (sample->dataLength) {
+		if (!traf->DataCache) {
+			if (!gf_bs_write_data(movie->editFileMap->bs, sample->data, sample->dataLength)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Could not add a sample with a size of %u bytes (no DataCache)\n", sample->dataLength));
+				return GF_OUT_OF_MEM;
+			}
+		} else if (trun->cache) {
+			if (!gf_bs_write_data(trun->cache, sample->data, sample->dataLength)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Could not add a sample with a size of %u bytes (with cache)\n", sample->dataLength));
+				return GF_OUT_OF_MEM;
+			}
+		} else {
+			return GF_BAD_PARAM;
 		}
-	} else {
-		return GF_BAD_PARAM;
 	}
 	if (od_sample) gf_isom_sample_del(&od_sample);
 	return GF_OK;
@@ -1861,7 +1862,6 @@
 		if (sai->subsample_count) senc->flags = 0x00000002;
 
 		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IsEncrypted ? IV_size+2+6*sai->subsample_count : 0);
-
 	}
 
 	return GF_OK;
@@ -1919,7 +1919,7 @@
 	last_sample = 0;
 	count = gf_list_count(traf->TrackRuns);
 	for (i=0; i<count; i++) {
-		GF_TrackFragmentRunBox *trun = gf_list_get(traf->TrackRuns, i);
+		GF_TrackFragmentRunBox *trun = (GF_TrackFragmentRunBox*)gf_list_get(traf->TrackRuns, i);
 		last_sample += trun->sample_count;
 	}
 
@@ -1974,7 +1974,7 @@
 		last_sample = 0;
 		count = gf_list_count(traf->TrackRuns);
 		for (i=0; i<count; i++) {
-			GF_TrackFragmentRunBox *trun = gf_list_get(traf->TrackRuns, i);
+			GF_TrackFragmentRunBox *trun = (GF_TrackFragmentRunBox*)gf_list_get(traf->TrackRuns, i);
 			last_sample += trun->sample_count;
 		}
 
@@ -1987,7 +1987,7 @@
 
 		count = gf_list_count(sub_sample->SubSamples);
 		for (i=0; i<count; i++) {
-			GF_SubSampleEntry *entry = gf_list_get(sub_sample->SubSamples, i);
+			GF_SubSampleEntry *entry = (GF_SubSampleEntry*)gf_list_get(sub_sample->SubSamples, i);
 			e = gf_isom_add_subsample_info(traf->subs, last_sample, entry->subsample_size, entry->subsample_priority, entry->reserved, entry->discardable);
 			if (e) return e;
 		}
@@ -2001,7 +2001,7 @@
 			u32 first_sample_in_entry, last_sample_in_entry;
 			first_sample_in_entry = 1;
 
-			sg = gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
+			sg = (GF_SampleGroupBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
 			for (j=0; j<sg->entry_count; j++) {
 				last_sample_in_entry = first_sample_in_entry + sg->sample_entries[j].sample_count - 1;
 				if ((sampleNumber<first_sample_in_entry) || (sampleNumber>last_sample_in_entry)) {
@@ -2112,7 +2112,7 @@
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber)
+GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
 {
 	return GF_NOT_SUPPORTED;
 }

v0.5.2.tar.gz/src/isomedia/sample_descs.c -> v0.6.1.tar.gz/src/isomedia/sample_descs.c Changed

@@ -228,29 +228,6 @@
 	return res;
 }
 
-GF_EXPORT
-GF_Err gf_isom_stxt_info_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char **mime, char **config)
-{
-	GF_TrackBox *trak;
-	GF_SimpleTextSampleEntryBox *entry;
-	*mime = NULL;
-	*config = NULL;
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !StreamDescriptionIndex) return GF_BAD_PARAM;
-
-	entry = (GF_SimpleTextSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
-	if (!entry || (entry->type!=GF_ISOM_BOX_TYPE_STXT)) return GF_BAD_PARAM;
-
-	if (entry->config) {
-		*config = entry->config->string;
-	}
-	if (entry->mime_type) {
-		*mime = entry->mime_type;
-	}
-	return GF_OK;
-}
-
-
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_EXPORT
@@ -554,16 +531,15 @@
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-
-
 GF_Err LSR_UpdateESD(GF_LASeRSampleEntryBox *lsr, GF_ESD *esd)
 {
-	if (!lsr->bitrate) lsr->bitrate = (GF_MPEG4BitRateBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_BTRT);
+	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)lsr, GF_TRUE);
+
 	if (lsr->descr) gf_isom_box_del((GF_Box *) lsr->descr);
 	lsr->descr = NULL;
-	lsr->bitrate->avgBitrate = esd->decoderConfig->avgBitrate;
-	lsr->bitrate->maxBitrate = esd->decoderConfig->maxBitrate;
-	lsr->bitrate->bufferSizeDB = esd->decoderConfig->bufferSizeDB;
+	btrt->avgBitrate = esd->decoderConfig->avgBitrate;
+	btrt->maxBitrate = esd->decoderConfig->maxBitrate;
+	btrt->bufferSizeDB = esd->decoderConfig->bufferSizeDB;
 
 	if (gf_list_count(esd->IPIDataSet)
 	        || gf_list_count(esd->IPMPDescriptorPointers)
@@ -617,5 +593,506 @@
 	return GF_OK;
 }
 
+/* MetadataSampleEntry */
+GF_EXPORT
+GF_Err gf_isom_get_xml_metadata_description(GF_ISOFile *file, u32 track, u32 sampleDescription,
+        const char **_namespace, const char **schema_loc, const char **content_encoding)
+{
+	GF_TrackBox *trak;
+	GF_MetaDataSampleEntryBox *ptr;
+	*_namespace = NULL;
+	*content_encoding = NULL;
+	*schema_loc = NULL;
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak || !sampleDescription) return GF_BAD_PARAM;
+	ptr = (GF_MetaDataSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescription-1);
+	if (!ptr) return GF_BAD_PARAM;
+
+	if (schema_loc) *schema_loc = ptr->xml_schema_loc;
+	if (_namespace) *_namespace = ptr->xml_namespace;
+	if (content_encoding) *content_encoding = ptr->content_encoding;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gf_isom_new_xml_metadata_description(GF_ISOFile *movie, u32 trackNumber,
+        const char *_namespace, const char *schema_loc, const char *content_encoding,
+        u32 *outDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_MetaDataSampleEntryBox *metad;
+	char *URLname = NULL;
+	char *URNname = NULL;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !_namespace)
+		return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+	case GF_ISOM_MEDIA_META:
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	metad = (GF_MetaDataSampleEntryBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_METX);
+	if (!metad) return GF_OUT_OF_MEM;
+
+	metad->dataReferenceIndex = dataRefIndex;
+	metad->xml_namespace = gf_strdup(_namespace);
+	if (content_encoding) metad->content_encoding = gf_strdup(content_encoding);
+	if (schema_loc) metad->xml_schema_loc = gf_strdup(schema_loc);
+
+	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, metad);
+	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
+}
+
+GF_Err gf_isom_update_xml_metadata_description(GF_ISOFile *movie, u32 trackNumber,
+        const char *schema_loc, const char *encoding,
+        u32 DescriptionIndex)
+{
+	/* TODO */
+	return GF_NOT_SUPPORTED;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+/* XMLSubtitleSampleEntry */
+GF_EXPORT
+GF_Err gf_isom_xml_subtitle_get_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex,
+        const char **xmlnamespace, const char **xml_schema_loc, const char **mimes)
+{
+	GF_TrackBox *trak;
+	GF_MetaDataSampleEntryBox *entry;
+	*xmlnamespace = NULL;
+	*xml_schema_loc = NULL;
+	*mimes = NULL;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !StreamDescriptionIndex) return GF_BAD_PARAM;
+
+	entry = (GF_MetaDataSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
+	if (!entry ||
+	        (entry->type!=GF_ISOM_BOX_TYPE_STPP)) {
+		return GF_BAD_PARAM;
+	}
+
+	if (entry->mime_type) {
+		*mimes = entry->mime_type;
+	}
+	if (entry->xml_schema_loc) {
+		*xml_schema_loc = entry->xml_schema_loc;
+	}
+	*xmlnamespace = entry->xml_namespace;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile  *movie, u32 trackNumber,
+        const char *xmlnamespace, const char *xml_schema_loc, const char *mimes,
+        u32 *outDescriptionIndex)
+{
+	GF_TrackBox                 *trak;
+	GF_Err                      e;
+	u32                         dataRefIndex;
+	GF_MetaDataSampleEntryBox *stpp;
+	char *URLname = NULL;
+	char *URNname = NULL;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+	case GF_ISOM_MEDIA_META:
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	if (!xmlnamespace) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("XML (Subtitle, Metadata or Text) SampleEntry: namespace is mandatory. Abort.\n"));
+		return GF_BAD_PARAM;
+	}
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	stpp = (GF_MetaDataSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STPP);
+	stpp->dataReferenceIndex = dataRefIndex;
+	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, stpp);
+	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+
+	stpp->xml_namespace = gf_strdup(xmlnamespace);
+	if (xml_schema_loc) stpp->xml_schema_loc = gf_strdup(xml_schema_loc); //optional
+	if (mimes) stpp->mime_type = gf_strdup(mimes); //optional
+	return e;
+}
+
+GF_Err gf_isom_update_xml_subtitle_description(GF_ISOFile *movie, u32 trackNumber,
+        u32 descriptionIndex, GF_GenericSubtitleSampleDescriptor *desc)
+{
+	GF_TrackBox *trak;
+	GF_Err      e;
+
+	if (!descriptionIndex || !desc) return GF_BAD_PARAM;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	return e;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+/* SimpleTextSampleEntry: also used for MetadataTextSampleEntry and SubtitleTextSampleEntry */
+GF_EXPORT
+GF_Err gf_isom_stxt_get_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex,
+                                    const char **mime, const char **encoding, const char **config)
+{
+	GF_TrackBox *trak;
+	GF_MetaDataSampleEntryBox *entry;
+	*mime = NULL;
+	*config = NULL;
+	*encoding = NULL;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !StreamDescriptionIndex) return GF_BAD_PARAM;
+
+	entry = (GF_MetaDataSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
+	if (!entry ||
+	        ((entry->type!=GF_ISOM_BOX_TYPE_STXT) &&
+	         (entry->type!=GF_ISOM_BOX_TYPE_METT) &&
+	         (entry->type!=GF_ISOM_BOX_TYPE_SBTT))) {
+		return GF_BAD_PARAM;
+	}
+
+	if (entry->config) {
+		*config = entry->config->config;
+	}
+	if (entry->mime_type) {
+		*mime = entry->mime_type;
+	}
+	if (entry->content_encoding) {
+		*encoding = entry->content_encoding;
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err gf_isom_new_stxt_description(GF_ISOFile *movie, u32 trackNumber, u32 type,
+                                    const char *mime, const char *encoding, const char * config,
+                                    u32 *outDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_MetaDataSampleEntryBox *sample_entry;
+	char *URLname = NULL;
+	char *URNname = NULL;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+	case GF_ISOM_MEDIA_META:
+	case GF_ISOM_MEDIA_SCENE:
+	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+	switch (type) {
+	case GF_ISOM_SUBTYPE_SBTT:
+	case GF_ISOM_SUBTYPE_STXT:
+	case GF_ISOM_SUBTYPE_METT:
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("SampleEntry shall be either Metadata, Subtitle or SimpleText. Abort.\n"));
+		return GF_BAD_PARAM;
+	}
+
+	if (!mime) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Text (Metadata, Subtitle or SimpleText) SampleEntry: mime is mandatory. Using text/plain.\n"));
+		mime = "text/plain";
+	}
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	sample_entry = (GF_MetaDataSampleEntryBox *) gf_isom_box_new(type);
+	sample_entry->dataReferenceIndex = dataRefIndex;
+	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, sample_entry);
+	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+
+	sample_entry->mime_type = gf_strdup(mime);
+	if (encoding) sample_entry->content_encoding = gf_strdup(encoding);
+	if (config) {
+		sample_entry->config = (GF_TextConfigBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TXTC);
+		sample_entry->config->config = gf_strdup(config);
+	}
+	return e;
+}
+
+
+GF_Err gf_isom_update_stxt_description(GF_ISOFile *movie, u32 trackNumber,
+                                       const char *encoding, const char *config,
+                                       u32 DescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	GF_MetaDataSampleEntryBox *sample_entry;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return GF_BAD_PARAM;
+
+	sample_entry = (GF_MetaDataSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
+	if (!sample_entry) return GF_BAD_PARAM;
+	if (sample_entry->type != GF_ISOM_BOX_TYPE_METT &&
+	        sample_entry->type != GF_ISOM_BOX_TYPE_SBTT &&
+	        sample_entry->type != GF_ISOM_BOX_TYPE_STXT) {
+		return GF_BAD_PARAM;
+	}
+
+	if (!sample_entry->config)
+		sample_entry->config = (GF_TextConfigBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TXTC);
+
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	if (sample_entry->config->config) {
+		gf_free(sample_entry->config->config);
+	}
+	sample_entry->config->config = gf_strdup(config);
+
+	if (sample_entry->content_encoding) {
+		gf_free(sample_entry->content_encoding);
+	}
+	if (encoding) {
+		sample_entry->content_encoding = gf_strdup(encoding);
+	}
+	return e;
+}
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+GF_WebVTTSampleEntryBox *gf_webvtt_isom_get_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex)
+{
+	GF_WebVTTSampleEntryBox *wvtt;
+	GF_TrackBox *trak;
+
+	if (!descriptionIndex) return NULL;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return NULL;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+		break;
+	default:
+		return NULL;
+	}
+
+	wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+	if (!wvtt) return NULL;
+	switch (wvtt->type) {
+	case GF_ISOM_BOX_TYPE_WVTT:
+		break;
+	default:
+		return NULL;
+	}
+	return wvtt;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config)
+{
+	GF_Err e;
+	GF_WebVTTSampleEntryBox *wvtt;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return GF_BAD_PARAM;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+	if (!wvtt) return GF_BAD_PARAM;
+	switch (wvtt->type) {
+	case GF_ISOM_BOX_TYPE_WVTT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+	if (wvtt) {
+		if (!movie->keep_utc)
+			trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+		wvtt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_VTTC, config);
+	} else {
+		e = GF_BAD_PARAM;
+	}
+	return e;
+}
+
+GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_WebVTTSampleEntryBox *wvtt;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	wvtt = (GF_WebVTTSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_WVTT);
+	wvtt->dataReferenceIndex = dataRefIndex;
+	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, wvtt);
+	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
+}
+
+GF_BitRateBox *gf_isom_sample_entry_get_bitrate(GF_SampleEntryBox *ent, Bool create)
+{
+	u32 i=0;
+	GF_BitRateBox *a;
+	while ((a = (GF_BitRateBox *)gf_list_enum(ent->other_boxes, &i))) {
+		if (a->type==GF_ISOM_BOX_TYPE_BTRT) return a;
+	}
+	if (!create) return NULL;
+	a = (GF_BitRateBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_BTRT);
+	if (!ent->other_boxes) ent->other_boxes = gf_list_new();
+	gf_list_add(ent->other_boxes, a);
+	return a;
+}
+
+GF_EXPORT
+GF_Err gf_isom_update_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, u32 average_bitrate, u32 max_bitrate, u32 decode_buffer_size)
+{
+	GF_BitRateBox *a;
+	GF_Err e;
+	GF_SampleEntryBox *ent;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return GF_BAD_PARAM;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !sampleDescriptionIndex || !trak->Media) return GF_BAD_PARAM;
+
+	ent = (GF_SampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescriptionIndex - 1);
+	if (!ent) return GF_BAD_PARAM;
+
+	a = gf_isom_sample_entry_get_bitrate(ent, max_bitrate ? GF_TRUE : GF_FALSE);
+	if (!max_bitrate) {
+		if (a) {
+			gf_list_del_item(ent->other_boxes, a);
+			gf_isom_box_del((GF_Box *) a);
+
+			if (!gf_list_count(ent->other_boxes)) {
+				gf_list_del(ent->other_boxes);
+				ent->other_boxes = NULL;
+			}
+		}
+		return GF_OK;
+	}
+
+	a->avgBitrate = average_bitrate;
+	a->maxBitrate = max_bitrate;
+	a->bufferSizeDB = decode_buffer_size;
+	return GF_OK;
+}
+
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #endif /*GPAC_DISABLE_ISOM*/

v0.5.2.tar.gz/src/isomedia/stbl_read.c -> v0.6.1.tar.gz/src/isomedia/stbl_read.c Changed

@@ -37,6 +37,7 @@
 	(*sampleNumber) = 0;
 	(*prevSampleNumber) = 0;
 
+	if (!stbl->TimeToSample) return GF_ISOM_INVALID_FILE;
 	if (!stbl->CompositionOffset) useCTS = 0;
 	/*FIXME: CTS is ALWAYS disabled for now to make sure samples are fetched in
 	decoding order. */
@@ -68,7 +69,7 @@
 				curDTS -= ent->sampleDelta * ent->sampleCount;
 				i --;
 			} else if (!i) {
-				//begining of the table, no choice
+				//beginning of the table, no choice
 				curDTS = stbl->TimeToSample->r_CurrentDTS = 0;
 				curSampNum = stbl->TimeToSample->r_FirstSampleInEntry = 1;
 				stbl->TimeToSample->r_currentEntryIndex = 0;
@@ -212,7 +213,10 @@
 //	if (SampleNumber >= stts->r_FirstSampleInEntry + ent->sampleCount) return GF_BAD_PARAM;
 
 	//no ent, this is really weird. Let's assume the DTS is then what is written in the table
-	if (!ent || (i == count)) (*DTS) = stts->r_CurrentDTS;
+	if (!ent || (i == count)) {
+		(*DTS) = stts->r_CurrentDTS;
+		if (duration) *duration = ent ? ent->sampleDelta : 0;
+	}
 	return GF_OK;
 
 found:
@@ -345,6 +349,7 @@
 			if (first_rap_in_entry > SampleNumber) {
 				break;
 			}
+			first_sample_in_entry += sg->sample_entries[j].sample_count;
 		}
 	}
 	return GF_OK;
@@ -392,7 +397,7 @@
 	(*chunkNumber) = (*descIndex) = 0;
 	(*isEdited) = 0;
 	if (!stbl || !sampleNumber) return GF_BAD_PARAM;
-	if (!stbl->ChunkOffset) return GF_ISOM_INVALID_FILE;
+	if (!stbl->ChunkOffset || !stbl->SampleToChunk) return GF_ISOM_INVALID_FILE;
 
 	if (stbl->SampleToChunk->nb_entries == stbl->SampleSize->sampleCount) {
 		ent = &stbl->SampleToChunk->entries[sampleNumber-1];

v0.5.2.tar.gz/src/isomedia/stbl_write.c -> v0.6.1.tar.gz/src/isomedia/stbl_write.c Changed

@@ -243,7 +243,7 @@
 		}
 	}
 
-	/*we will at most add 2 new entries (spliting of an existing one)*/
+	/*we will at most add 2 new entries (splitting of an existing one)*/
 	if (ctts->nb_entries+2>=ctts->alloc_size) {
 		ctts->alloc_size += 2;
 		ctts->entries = gf_realloc(ctts->entries, sizeof(GF_DttsEntry)*ctts->alloc_size);
@@ -301,7 +301,7 @@
 	u32 i, j, remain, count;
 	GF_CompositionOffsetBox *ctts;
 	ctts = stbl->CompositionOffset;
-	if (ctts->unpack_mode) return GF_OK;
+	if (!ctts || ctts->unpack_mode) return GF_OK;
 	ctts->unpack_mode = 1;
 
 	packed = ctts->entries;
@@ -508,8 +508,8 @@
 	sdtp = stbl->SampleDep;
 
 	flags = 0;
- flags |= isLeading << 6;
- flags |= dependsOn << 4;
+	flags |= isLeading << 6;
+	flags |= dependsOn << 4;
 	flags |= dependedOn << 2;
 	flags |= redundant;
 
@@ -917,7 +917,7 @@
 	}
 	//reset write the cache to the end
 	stts->w_currentSampleNum = stbl->SampleSize->sampleCount - 1;
-	//reset read the cache to the begining
+	//reset read the cache to the beginning
 	stts->r_FirstSampleInEntry = stts->r_currentEntryIndex = 0;
 	stts->r_CurrentDTS = 0;
 	return GF_OK;
@@ -1175,6 +1175,70 @@
 	return GF_OK;
 }
 
+GF_Err stbl_RemoveSubSample(GF_SampleTableBox *stbl, u32 SampleNumber)
+{
+	u32 i, count, prev_sample, delta;
+
+	if (!stbl->SubSamples) return GF_OK;
+	if (! stbl->SubSamples->Samples) return GF_OK;
+
+	prev_sample = 0;
+	count = gf_list_count(stbl->SubSamples->Samples);
+	for (i=0; i<count; i++) {
+		GF_SubSampleInfoEntry *e = gf_list_get(stbl->SubSamples->Samples, i);
+		prev_sample += e->sample_delta;
+		if (prev_sample==SampleNumber) {
+			gf_list_rem(stbl->SubSamples->Samples, i);
+			while (gf_list_count(e->SubSamples)) {
+				GF_SubSampleEntry *pSubSamp = (GF_SubSampleEntry*) gf_list_get(e->SubSamples, 0);
+				gf_free(pSubSamp);
+				gf_list_rem(e->SubSamples, 0);
+			}
+			gf_list_del(e->SubSamples);
+			gf_free(e);
+			i--;
+			count--;
+			delta=1;
+			continue;
+		}
+		e->sample_delta+=delta;
+	}
+	return GF_OK;
+}
+
+
+GF_Err stbl_RemoveSampleGroup(GF_SampleTableBox *stbl, u32 SampleNumber)
+{
+	u32 i, k, count, prev_sample;
+
+	if (!stbl->sampleGroups) return GF_OK;
+
+	count = gf_list_count(stbl->sampleGroups);
+	prev_sample = 0;
+	for (i=0; i<count; i++) {
+		GF_SampleGroupBox *e = gf_list_get(stbl->sampleGroups, i);
+		for (k=0; k<e->entry_count; k++) {
+			if ((SampleNumber>prev_sample) && (SampleNumber <= prev_sample + e->sample_entries[k].sample_count) ) {
+				e->sample_entries[k].sample_count--;
+				if (!e->sample_entries[k].sample_count) {
+					memcpy(&e->sample_entries[k], &e->sample_entries[k+1], sizeof(GF_SampleGroupEntry) * (e->entry_count-k-1));
+					e->entry_count--;
+				}
+				break;
+			}
+		}
+		if (!e->entry_count) {
+			gf_list_rem(stbl->sampleGroups, i);
+			i--;
+			count--;
+			gf_isom_box_del((GF_Box *) e);
+		}
+	}
+	return GF_OK;
+}
+
+
+
 
 GF_Err stbl_AddSampleFragment(GF_SampleTableBox *stbl, u32 sampleNumber, u16 size)
 {
@@ -1326,7 +1390,7 @@
 	if (!stbl->SampleSize->sizes || (stbl->SampleSize->sampleCount==stbl->SampleSize->alloc_size)) {
 		Bool init_table = (stbl->SampleSize->sizes==NULL) ? 1 : 0;
 		ALLOC_INC(stbl->SampleSize->alloc_size);
-		if (stbl->SampleSize->sampleCount>stbl->SampleSize->alloc_size)
+		if (stbl->SampleSize->sampleCount >= stbl->SampleSize->alloc_size)
 			stbl->SampleSize->alloc_size = stbl->SampleSize->sampleCount+1;
 
 		stbl->SampleSize->sizes = (u32 *)gf_realloc(stbl->SampleSize->sizes, sizeof(u32)*stbl->SampleSize->alloc_size);
@@ -1379,7 +1443,7 @@
 	//large offsets
 	else {
 		co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
-		off_64 = (u64*)gf_malloc(sizeof(u32)*(co64->nb_entries+1));
+		off_64 = (u64*)gf_malloc(sizeof(u64)*(co64->nb_entries+1));
 		if (!off_64) return;
 		for (i=0; i<co64->nb_entries; i++) off_64[i] = co64->offsets[i];
 		off_64[i] = offset;

v0.5.2.tar.gz/src/isomedia/track.c -> v0.6.1.tar.gz/src/isomedia/track.c Changed

@@ -254,7 +254,11 @@
 	// a little optimization here: if all our samples are sync,
 	//set the RAPOnly to true... for external users...
 	if (! stbl->SyncSample) {
-		if (moov->mvex && (esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
+		if (
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		 moov->mvex &&
+#endif
+		 (esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
 			esd->slConfig->hasRandomAccessUnitsOnlyFlag = 0;
 			esd->slConfig->useRandomAccessPointFlag = 1;
 			stbl->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
@@ -398,45 +402,6 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type)
-{
-	Bool res = GF_FALSE;
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	GF_BitStream *bs1, *bs2;
-	char *buf1, *buf2;
-	u32 len1, len2;
-
-	if (!ptr1 || !ptr2)
-		return GF_FALSE;
-
-	bs1 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (grouping_type) {
-		sgpd_write_entry(grouping_type, ptr1, bs1);
-	} else {
-		sgpd_Write((GF_Box *)ptr1, bs1);
-	}
-	gf_bs_get_content(bs1, &buf1, &len1);
-	gf_bs_del(bs1);
-
-	bs2 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (grouping_type) {
-		sgpd_write_entry(grouping_type, ptr2, bs2);
-	} else {
-		sgpd_Write((GF_Box *)ptr2, bs2);
-	}
-	gf_bs_get_content(bs2, &buf2, &len2);
-	gf_bs_del(bs2);
-
-
-	if ((len1==len2) && !memcmp(buf1, buf2, len1))
-		res = GF_TRUE;
-
-	gf_free(buf1);
-	gf_free(buf2);
-#endif
-	return res;
-}
-
 GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, Bool is_first_merge)
 {
 	u32 i, j, chunk_size;
@@ -705,7 +670,7 @@
 		}
 
 		/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
-		if (gf_isom_cenc_has_saiz_saio(NULL, traf)) {
+		if (gf_isom_cenc_has_saiz_saio_traf(traf)) {
 			//GF_BitStream *bs;
 			u32 size, nb_saio;
 			u64 offset;
@@ -720,7 +685,7 @@
 				saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(traf->sai_offsets, i);
 				/*if we have only 1 sai_offsets, assume that its type is cenc*/
 				if ((saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) || (gf_list_count(traf->sai_offsets) == 1)) {
-					offset = saio->offsets[0] + moof_offset;
+					offset = (saio->version ? saio->offsets_large[0] : saio->offsets[0]) + moof_offset;
 					nb_saio = saio->entry_count;
 					break;
 				}
@@ -735,7 +700,7 @@
 			if (saiz) {
 				for (i = 0; i < saiz->sample_count; i++) {
 					if (nb_saio != 1)
-						offset = saio->offsets[i] + moof_offset;
+						offset = (saio->version ? saio->offsets_large[i] : saio->offsets[i]) + moof_offset;
 					size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[i];
 
 					/*cur_position = gf_bs_get_position(trak->moov->mov->movieFileMap->bs);
@@ -758,7 +723,7 @@
 					}
 					gf_list_add(senc->samp_aux_info, sai);
 					if (sai->subsample_count) senc->flags = 0x00000002;*/
-					gf_isom_cenc_merge_saiz_saio(senc, trak->Media->information->sampleTable, (u32)offset, size);
+					gf_isom_cenc_merge_saiz_saio(senc, trak->Media->information->sampleTable, offset, size);
 					if (nb_saio == 1)
 						offset += size;
 				}
@@ -1155,13 +1120,20 @@
 			entry = (GF_MPEGSampleEntryBox*) entry_v;
 			break;
 		case GF_ISOM_MEDIA_AUDIO:
-			entry_a = (GF_MPEGAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MP4A);
-			entry_a->samplerate_hi = trak->Media->mediaHeader->timeScale;
-			if (!entry_a) return GF_OUT_OF_MEM;
-			entry_a->esd = (GF_ESDBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_ESDS);
-			entry_a->esd->desc = esd;
-			//type cast possible now
-			entry = (GF_MPEGSampleEntryBox*) entry_a;
+			if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_AUDIO_AC3) {
+				GF_AC3SampleEntryBox *ac3 = (GF_AC3SampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AC3);
+				if (!ac3) return GF_OUT_OF_MEM;
+				ac3->info = (GF_AC3ConfigBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DAC3);
+				entry = (GF_MPEGSampleEntryBox*) ac3;
+			} else {
+				entry_a = (GF_MPEGAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MP4A);
+				entry_a->samplerate_hi = trak->Media->mediaHeader->timeScale;
+				if (!entry_a) return GF_OUT_OF_MEM;
+				entry_a->esd = (GF_ESDBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_ESDS);
+				entry_a->esd->desc = esd;
+				//type cast possible now
+				entry = (GF_MPEGSampleEntryBox*) entry_a;
+			}
 			break;
 		default:
 			if ((esd->decoderConfig->streamType==0x03) && (esd->decoderConfig->objectTypeIndication==0x09)) {

v0.5.2.tar.gz/src/isomedia/ttml.c -> v0.6.1.tar.gz/src/isomedia/ttml.c Changed

@@ -31,253 +31,6 @@
 
 #ifndef GPAC_DISABLE_TTML
 
-GF_Box *stpp_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_XMLSubtitleSampleEntryBox, GF_ISOM_BOX_TYPE_STPP);
-	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
-	return (GF_Box *)tmp;
-}
-
-void stpp_del(GF_Box *s)
-{
-	GF_XMLSubtitleSampleEntryBox *stpp= (GF_XMLSubtitleSampleEntryBox *)s;
-	if (stpp == NULL) return;
-	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
-	btrt_del((GF_Box*)stpp->bitrate);
-	if (stpp->xmlnamespace) gf_free(stpp->xmlnamespace);
-	if (stpp->schema_location) gf_free(stpp->schema_location);
-	if (stpp->auxiliary_mime_types) gf_free(stpp->auxiliary_mime_types);
-	gf_free(s);
-}
-
-static GF_Err stpp_Add(GF_Box *s, GF_Box *a)
-{
-	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-	switch(a->type) {
-	case GF_ISOM_BOX_TYPE_BTRT:
-		if (stpp->bitrate) ERROR_ON_DUPLICATED_BOX(a, s)
-			stpp->bitrate = (GF_MPEG4BitRateBox *)a;
-		break;
-	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(stpp->protections, a);
-		break;
-	default:
-		return gf_isom_box_add_default(s, a);
-	}
-	return GF_OK;
-}
-
-GF_Err stpp_Read(GF_Box *s, GF_BitStream *bs)
-{
-	u32 size, i;
-	char *str;
-	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-	gf_bs_read_data(bs, stpp->reserved, 6);
-	stpp->dataReferenceIndex = gf_bs_read_u16(bs);
-
-	size = (u32) stpp->size - 8;
-	str = (char *)gf_malloc(sizeof(char)*size);
-
-	i=0;
-	while (size) {
-		str[i] = gf_bs_read_u8(bs);
-		size--;
-		if (!str[i])
-			break;
-		i++;
-	}
-	if (i) stpp->xmlnamespace = gf_strdup(str);
-
-	i=0;
-	while (size) {
-		str[i] = gf_bs_read_u8(bs);
-		size--;
-		if (!str[i])
-			break;
-		i++;
-	}
-	if (i) stpp->schema_location = gf_strdup(str);
-
-	i=0;
-	while (size) {
-		str[i] = gf_bs_read_u8(bs);
-		size--;
-		if (!str[i])
-			break;
-		i++;
-	}
-	if (i) stpp->auxiliary_mime_types = gf_strdup(str);
-
-	stpp->size = size;
-	gf_free(str);
-	return gf_isom_read_box_list(s, bs, stpp_Add);
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err stpp_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-	e = gf_isom_box_write_header(s, bs);
-	gf_bs_write_data(bs, stpp->reserved, 6);
-	gf_bs_write_u16(bs, stpp->dataReferenceIndex);
-
-	gf_bs_write_data(bs, stpp->xmlnamespace, (u32) strlen(stpp->xmlnamespace));
-	gf_bs_write_u8(bs, 0);
-
-	if (stpp->schema_location)
-		gf_bs_write_data(bs, stpp->schema_location, (u32) strlen(stpp->schema_location));
-	gf_bs_write_u8(bs, 0);
-
-	if (stpp->auxiliary_mime_types)
-		gf_bs_write_data(bs, stpp->auxiliary_mime_types, (u32) strlen(stpp->auxiliary_mime_types));
-	gf_bs_write_u8(bs, 0);
-
-	e = gf_isom_box_write((GF_Box *)stpp->bitrate, bs);
-	if (e) return e;
-
-	return gf_isom_box_array_write(s, stpp->protections, bs);
-}
-
-GF_Err stpp_Size(GF_Box *s)
-{
-	GF_Err e;
-	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)s;
-	e = gf_isom_box_get_size(s);
-	if (e) return e;
-	s->size += 8; // reserved and dataReferenceIndex
-
-	stpp->size += strlen(stpp->xmlnamespace);
-	stpp->size++;
-
-	if (stpp->schema_location)
-		stpp->size += strlen(stpp->schema_location);
-	stpp->size++;
-
-	if (stpp->auxiliary_mime_types)
-		stpp->size += strlen(stpp->auxiliary_mime_types);
-	stpp->size++;
-
-	e = gf_isom_box_size((GF_Box *)stpp->bitrate);
-	if (e) return e;
-	stpp->size += stpp->bitrate->size;
-
-	return gf_isom_box_array_size(s, stpp->protections);
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-#ifndef GPAC_DISABLE_ISOM_DUMP
-GF_Err DumpBox(GF_Box *a, FILE * trace);
-void gf_box_dump_done(char *name, GF_Box *ptr, FILE *trace);
-
-GF_Err stpp_dump(GF_Box *a, FILE * trace)
-{
-	GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)a;
-	const char *name = "XMLSubtitleSampleEntryBox";
-
-	fprintf(trace, "<%s ", name);
-	fprintf(trace, "namespace=\"%s\" ", stpp->xmlnamespace);
-	if (stpp->schema_location) fprintf(trace, "schema_location=\"%s\" ", stpp->schema_location);
-	if (stpp->auxiliary_mime_types) fprintf(trace, "auxiliary_mime_types=\"%s\" ", stpp->auxiliary_mime_types);
-	fprintf(trace, ">\n");
-	DumpBox(a, trace);
-
-	gf_box_dump(stpp->bitrate, trace);
-
-	gf_box_dump_done(NULL, a, trace);
-	fprintf(trace, "</%s>\n", name);
-	return GF_OK;
-}
-
-#endif /* GPAC_DISABLE_ISOM_DUMP */
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err gf_isom_update_xml_subtitle_description( GF_ISOFile *movie,
- u32 trackNumber,
- u32 descriptionIndex,
- GF_GenericSubtitleSampleDescriptor *desc)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-
-	if (!descriptionIndex || !desc) return GF_BAD_PARAM;
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_MPEG_SUBT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	if (!movie->keep_utc)
-		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	return e;
-}
-
-GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile *movie,
- u32 trackNumber,
- char *xmlnamespace,
- char *xml_schema_loc,
- char *mimes,
- u32 *outDescriptionIndex)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-	u32 dataRefIndex;
-	GF_XMLSubtitleSampleEntryBox *stpp;
-	char *URLname = NULL;
-	char *URNname = NULL;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_MPEG_SUBT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	if (!xmlnamespace) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("XML Subtitle SampleEntry: namespace is mandatory. Abort.\n"));
-		return GF_BAD_PARAM;
-	}
-
-	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-	if (e) return e;
-	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-		if (e) return e;
-	}
-	if (!movie->keep_utc)
-		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	stpp = (GF_XMLSubtitleSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STPP);
-	stpp->dataReferenceIndex = dataRefIndex;
-	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, stpp);
-	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-
-	stpp->bitrate = (GF_MPEG4BitRateBox *)btrt_New();
-	stpp->xmlnamespace = gf_strdup(xmlnamespace);
-	if (xml_schema_loc) stpp->schema_location = gf_strdup(xml_schema_loc); //optional
-	if (mimes) stpp->auxiliary_mime_types = gf_strdup(mimes); //optional
-	return e;
-}
-
-#endif
-
 /* blindly adds text to a sample following 3GPP Timed Text style */
 GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len)
 {

v0.5.2.tar.gz/src/isomedia/tx3g.c -> v0.6.1.tar.gz/src/isomedia/tx3g.c Changed

v0.5.2.tar.gz/src/laser/lsr_dec.c -> v0.6.1.tar.gz/src/laser/lsr_dec.c Changed

@@ -184,7 +184,7 @@
 
 	codec->bs = gf_bs_new(data, data_len, GF_BITSTREAM_READ);
 	gf_bs_set_eos_callback(codec->bs, lsr_end_of_stream, codec);
-	codec->memory_dec = 0;
+	codec->memory_dec = GF_FALSE;
 	e = lsr_decode_laser_unit(codec, NULL);
 	gf_bs_del(codec->bs);
 	codec->bs = NULL;
@@ -210,7 +210,7 @@
 
 	codec->bs = gf_bs_new(data, data_len, GF_BITSTREAM_READ);
 	gf_bs_set_eos_callback(codec->bs, lsr_end_of_stream, codec);
-	codec->memory_dec = 1;
+	codec->memory_dec = GF_TRUE;
 	e = lsr_decode_laser_unit(codec, com_list);
 	gf_bs_del(codec->bs);
 	codec->bs = NULL;
@@ -680,7 +680,7 @@
 	GF_LSR_READ_INT(lsr, val, 1, name);
 	if (val) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, GF_TRUE, GF_FALSE, &info);
 		lsr_read_byte_align_string(lsr, info.far_ptr, name);
 	}
 }
@@ -729,22 +729,22 @@
 		GF_Node *listener = (GF_Node *)gf_list_get(lsr->defered_listeners, i);
 
 		par = NULL;
-		if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_observer, 0, 0, &info) == GF_OK) {
+		if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_observer, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 			observer = (XMLRI*)info.far_ptr;
 			if (observer->type == XMLRI_ELEMENTID) {
 				if (!observer->target) continue;
-				else par = observer->target;
+				else par = (GF_Node*)observer->target;
 			}
 		}
-		if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, 0, 0, &info) == GF_OK) {
+		if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 			if (((XMLRI*)info.far_ptr)->type == XMLRI_ELEMENTID) {
 				if (!((XMLRI*)info.far_ptr)->target) continue;
-				else if (!par) par = ((XMLRI*)info.far_ptr)->target;
+				else if (!par) par = (GF_Node*)((XMLRI*)info.far_ptr)->target;
 			}
 		}
 		/*FIXME - double check with XML events*/
 		if (!par && !observer) {
-			if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, 0, 0, &info) == GF_OK) {
+			if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 				XMLEV_Event *ev = (XMLEV_Event *)info.far_ptr;
 				/*all non-UI get attched to root*/
 				if (ev && (ev->type>GF_EVENT_MOUSEWHEEL)) {
@@ -889,14 +889,14 @@
 	att = base->attributes;
 	while (att) {
 		Bool is_fill, is_stroke;
-		is_fill = is_stroke = 0;
+		is_fill = is_stroke = GF_FALSE;
 		switch (att->tag) {
 		/*for all properties*/
 		case TAG_SVG_ATT_fill:
-			is_fill = 1;
+			is_fill = GF_TRUE;
 			break;
 		case TAG_SVG_ATT_stroke:
-			is_stroke = 1;
+			is_stroke = GF_TRUE;
 			break;
 		case TAG_SVG_ATT_audio_level:
 		case TAG_SVG_ATT_color:
@@ -972,12 +972,12 @@
 			continue;
 		}
 		/*clone field*/
-		e = gf_node_get_attribute_by_tag((GF_Node*)elt, att->tag, 1, 0, &f_clone);
+		e = gf_node_get_attribute_by_tag((GF_Node*)elt, att->tag, GF_TRUE, GF_FALSE, &f_clone);
 		if (e) goto err_exit;
 		f_base.fieldIndex = att->tag;
 		f_base.fieldType = att->data_type;
 		f_base.far_ptr = att->data;
-		e = gf_svg_attributes_copy(&f_clone, &f_base, 0);
+		e = gf_svg_attributes_copy(&f_clone, &f_base, GF_FALSE);
 		if (e) goto err_exit;
 
 		if (is_fill && reset_fill) {
@@ -1250,7 +1250,7 @@
 		if (!val) return;
 	}
 	if (!times) {
-		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, GF_TRUE, GF_FALSE, &info);
 		times = (SMIL_Times*)info.far_ptr;
 	}
 
@@ -1285,7 +1285,7 @@
 		if (!val) return;
 	}
 	if (!smil) {
-		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, GF_TRUE, GF_FALSE, &info);
 		if (lsr->last_error) return;
 		smil = (SMIL_Duration *)info.far_ptr;
 	}
@@ -1307,7 +1307,7 @@
 }
 static void lsr_read_duration(GF_LASeRCodec *lsr, GF_Node *n)
 {
-	lsr_read_duration_ex(lsr, n, TAG_SVG_ATT_dur, NULL, "dur", 1);
+	lsr_read_duration_ex(lsr, n, TAG_SVG_ATT_dur, NULL, "dur", GF_TRUE);
 }
 /*TODO Add decent error checking...*/
 static void lsr_read_rare_full(GF_LASeRCodec *lsr, GF_Node *n)
@@ -1335,23 +1335,23 @@
 						GF_LSR_READ_INT(lsr, extID, 3, "attributeRARE");
 						switch (extID) {
 						case 0:
-							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncMaster, 1, 0, &info);
+							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncMaster, GF_TRUE, GF_FALSE, &info);
 							GF_LSR_READ_INT(lsr, *(SVG_Boolean *)info.far_ptr, 1, "syncMaster");
 							break;
 						case 1:
-							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_focusHighlight, 1, 0, &info);
+							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_focusHighlight, GF_TRUE, GF_FALSE, &info);
 							GF_LSR_READ_INT(lsr, *(SVG_FocusHighlight *)info.far_ptr, 2, "focusHighlight");
 							break;
 						case 2:
-							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_initialVisibility, 1, 0, &info);
+							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_initialVisibility, GF_TRUE, GF_FALSE, &info);
 							GF_LSR_READ_INT(lsr, *(SVG_InitialVisibility *)info.far_ptr, 2, "initialVisibility");
 							break;
 						case 3:
-							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_fullscreen, 1, 0, &info);
+							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_fullscreen, GF_TRUE, GF_FALSE, &info);
 							GF_LSR_READ_INT(lsr, *(SVG_Boolean *)info.far_ptr, 1, "fullscreen");
 							break;
 						case 4:
-							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_requiredFonts, 1, 0, &info);
+							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_requiredFonts, GF_TRUE, GF_FALSE, &info);
 							lsr_read_byte_align_string(lsr, info.far_ptr, "requiredFonts");
 							break;
 						}
@@ -1368,7 +1368,7 @@
 		if (field_tag==-1) {
 			return;
 		}
-		lsr->last_error = gf_node_get_attribute_by_tag(n, field_tag, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, field_tag, GF_TRUE, GF_FALSE, &info);
 		if (!info.far_ptr) lsr->last_error = GF_NOT_SUPPORTED;
 		if (lsr->last_error) return;
 
@@ -1482,10 +1482,10 @@
 			GF_LSR_READ_INT(lsr, *(SVG_Visibility*)info.far_ptr, 2, "visibility");
 			break;
 		case TAG_SVG_ATT_requiredExtensions:
-			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredExtensions", 1);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredExtensions", GF_TRUE);
 			break;
 		case TAG_SVG_ATT_requiredFormats:
-			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredFormats", 0);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredFormats", GF_FALSE);
 			break;
 		case TAG_SVG_ATT_requiredFeatures:
 		{
@@ -1497,7 +1497,7 @@
 		}
 		break;
 		case TAG_SVG_ATT_systemLanguage:
-			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "systemLanguage", 0);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "systemLanguage", GF_FALSE);
 			break;
 		case TAG_XML_ATT_base:
 			lsr_read_byte_align_string(lsr, &((XMLRI*)info.far_ptr)->string, "xml:base");
@@ -1622,7 +1622,7 @@
 	GF_LSR_READ_INT(lsr, has_fill, 1, "fill");
 	if (has_fill) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_fill, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_fill, GF_TRUE, GF_FALSE, &info);
 		lsr_read_paint(lsr, info.far_ptr, "fill");
 	}
 }
@@ -1633,7 +1633,7 @@
 	GF_LSR_READ_INT(lsr, has_stroke, 1, "has_stroke");
 	if (has_stroke) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_stroke, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_stroke, GF_TRUE, GF_FALSE, &info);
 		lsr_read_paint(lsr, info.far_ptr, "stroke");
 	}
 }
@@ -1643,7 +1643,7 @@
 	GF_LSR_READ_INT(lsr, has_href, 1, "has_href");
 	if (has_href) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
 		lsr_read_any_uri(lsr, info.far_ptr, "href");
 	}
 }
@@ -1654,7 +1654,7 @@
 	GF_LSR_READ_INT(lsr, v, 1, "has_accumulate");
 	if (v) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_accumulate, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_accumulate, GF_TRUE, GF_FALSE, &info);
 		GF_LSR_READ_INT(lsr, *(SMIL_Accumulate*)info.far_ptr, 1, "accumulate");
 	}
 }
@@ -1664,7 +1664,7 @@
 	GF_LSR_READ_INT(lsr, v, 1, "has_additive");
 	if (v) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_additive, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_additive, GF_TRUE, GF_FALSE, &info);
 		GF_LSR_READ_INT(lsr, *(SMIL_Additive*)info.far_ptr, 1, "additive");
 	}
 }
@@ -1675,7 +1675,7 @@
 	GF_LSR_READ_INT(lsr, v, 1, "has_calcMode");
 	if (v) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_calcMode, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_calcMode, GF_TRUE, GF_FALSE, &info);
 		GF_LSR_READ_INT(lsr, *(SMIL_CalcMode*)info.far_ptr, 2, "calcMode");
 	}
 }
@@ -1695,7 +1695,7 @@
 		return;
 	} else {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_attributeName, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_attributeName, GF_TRUE, GF_FALSE, &info);
 		GF_LSR_READ_INT(lsr, val, 8, "attributeType");
 
 		/*translate type to attribute tag*/
@@ -1704,7 +1704,7 @@
 }
 static void lsr_read_attribute_name(GF_LASeRCodec *lsr, GF_Node *n)
 {
-	lsr_read_attribute_name_ex(lsr, n, 1);
+	lsr_read_attribute_name_ex(lsr, n, GF_TRUE);
 }
 
 static void lsr_translate_anim_value(SMIL_AnimateValue *val, u32 coded_type)
@@ -1899,7 +1899,7 @@
 				} else {
 					t->element = gf_sg_find_node_by_name(lsr->sg, t->element_id);
 				}
-				if (!t->element) return 0;
+				if (!t->element) return GF_FALSE;
 				gf_free(t->element_id);
 				t->element_id = NULL;
 			}
@@ -1912,7 +1912,7 @@
 			}
 		}
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 static Bool lsr_setup_smil_anim(GF_LASeRCodec *lsr, SVG_Element *anim, SVG_Element *anim_parent)
@@ -1927,32 +1927,32 @@
 
 	/*setup smil events*/
 	not_res = 0;
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_begin, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_begin, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if (!lsr_init_smil_times(lsr, anim, *(GF_List**)info.far_ptr, anim_parent)) not_res++;
 	}
 
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_end, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_end, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if (!lsr_init_smil_times(lsr, anim, *(GF_List**)info.far_ptr, anim_parent)) not_res++;
 	}
 
 
 	/*get xlink*/
 	xlink = NULL;
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_XLINK_ATT_href, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		xlink = info.far_ptr;
 	}
 
 	/*setup target node*/
 	if (!xlink || !xlink->target) {
 		/*target not received*/
-		if (xlink && (xlink->type == XMLRI_ELEMENTID)) return 0;
+		if (xlink && (xlink->type == XMLRI_ELEMENTID)) return GF_FALSE;
 
 		if (!xlink) {
 			/*target is parent, initialize xlink (needed by anim module)*/
-			if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_XLINK_ATT_href, 1, 0, &info)==GF_OK) {
+			if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 				xlink = info.far_ptr;
 			} else {
-				return 0;
+				return GF_FALSE;
 			}
 		}
 
@@ -1963,23 +1963,23 @@
 	} else {
 		target = (GF_Node *)xlink->target;
 	}
-	if (!target || not_res) return 0;
+	if (!target || not_res) return GF_FALSE;
 
-	is_animateTransform = is_animateMotion = 0;
-	if (anim->sgprivate->tag==TAG_SVG_animateMotion) is_animateMotion = 1;
+	is_animateTransform = is_animateMotion = GF_FALSE;
+	if (anim->sgprivate->tag==TAG_SVG_animateMotion) is_animateMotion = GF_TRUE;
 	else if (anim->sgprivate->tag==TAG_SVG_animateTransform) {
-		is_animateTransform = 1;
+		is_animateTransform = GF_TRUE;
 	}
 	if (is_animateMotion) goto translate_vals;
 
 	/*for all except animateMotion, get attributeName*/
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_attributeName, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		name = info.far_ptr;
 	}
-	if (!name) return 0;
+	if (!name) return GF_FALSE;
 
 	if (!name->field_ptr) {
-		if (gf_node_get_attribute_by_tag((GF_Node *)target, name->type, 1, 0, &info)!=GF_OK) return 0;
+		if (gf_node_get_attribute_by_tag((GF_Node *)target, name->type, GF_TRUE, GF_FALSE, &info)!=GF_OK) return GF_FALSE;
 		name->field_ptr = info.far_ptr;
 		name->type = info.fieldType;
 		name->tag = info.fieldIndex;
@@ -1991,7 +1991,7 @@
 translate_vals:
 
 	/*and setup anim values*/
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_from, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_from, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if (is_animateTransform) {
 			name->type = ((SMIL_AnimateValue*)info.far_ptr)->type;
 		} else {
@@ -2001,7 +2001,7 @@
 			lsr_translate_anim_value(value, coded_type);
 		}
 	}
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_by, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_by, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if (is_animateTransform) {
 			name->type = ((SMIL_AnimateValue*)info.far_ptr)->type;
 		} else {
@@ -2011,7 +2011,7 @@
 			lsr_translate_anim_value(value, coded_type);
 		}
 	}
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_to, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_to, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if (is_animateTransform) {
 			name->type = ((SMIL_AnimateValue*)info.far_ptr)->type;
 		} else {
@@ -2021,7 +2021,7 @@
 			lsr_translate_anim_value(value, coded_type);
 		}
 	}
-	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_values, 0, 0, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_values, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		if (is_animateTransform) {
 			name->type = ((SMIL_AnimateValues*)info.far_ptr)->type;
 		} else {
@@ -2032,7 +2032,7 @@
 		}
 	}
 
-	return 1;
+	return GF_TRUE;
 }
 
 static void lsr_read_anim_fill(GF_LASeRCodec *lsr, GF_Node *n)
@@ -2042,7 +2042,7 @@
 	GF_LSR_READ_INT(lsr, val, 1, "has_smil_fill");
 	if (val) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_smil_fill, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_smil_fill, GF_TRUE, 0, &info);
 		/*enumeration freeze{0} remove{1}*/
 		GF_LSR_READ_INT(lsr, val, 1, "smil_fill");
 		*(SMIL_Fill*)info.far_ptr = val ? SMIL_FILL_REMOVE : SMIL_FILL_FREEZE;
@@ -2054,7 +2054,7 @@
 	GF_LSR_READ_INT(lsr, val, 1, "has_repeatCount");
 	if (val) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_repeatCount, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_repeatCount, GF_TRUE, 0, &info);
 		GF_LSR_READ_INT(lsr, val, 1, "repeatCount");
 		if (val) ((SMIL_RepeatCount*)info.far_ptr)->type = SMIL_REPEATCOUNT_INDEFINITE;
 		else {
@@ -2069,7 +2069,7 @@
 	GF_LSR_READ_INT(lsr, flag, 1, "has_repeatDur");
 	if (flag) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_repeatDur, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_repeatDur, GF_TRUE, 0, &info);
 		GF_LSR_READ_INT(lsr, flag, 1, "choice");
 
 		if (flag) {
@@ -2087,7 +2087,7 @@
 	GF_LSR_READ_INT(lsr, val, 1, "has_restart");
 	if (val) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_restart, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_restart, GF_TRUE, 0, &info);
 		/*enumeration always{0} never{1} whenNotActive{2}*/
 		GF_LSR_READ_INT(lsr, *(SMIL_Restart*)info.far_ptr, 2, "restart");
 	}
@@ -2413,7 +2413,7 @@
 	GF_LSR_READ_INT(lsr, val, 1, name);
 	if (val) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, GF_TRUE, 0, &info);
 
 		GF_LSR_READ_INT(lsr, coded_type, 4, "type");
 		((SMIL_AnimateValue*)info.far_ptr)->value = lsr_read_an_anim_value(lsr, coded_type, name);
@@ -2435,7 +2435,7 @@
 	GF_LSR_READ_INT(lsr, flag, 1, "values");
 	if (!flag) return;
 
-	lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_values, 1, 0, &info);
+	lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_values, GF_TRUE, 0, &info);
 	values = (SMIL_AnimateValues *)info.far_ptr;
 
 	GF_LSR_READ_INT(lsr, coded_type, 4, "type");
@@ -2477,7 +2477,7 @@
 	GF_LSR_READ_INT(lsr, count, 1, name);
 	if (!count) return;
 
-	lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, 1, 0, &info);
+	lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, GF_TRUE, 0, &info);
 
 	count = lsr_read_vluimsbf5(lsr, "name");
 	for (i=0; i<count; i++) {
@@ -2493,7 +2493,7 @@
 
 	if (!coords) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, tag, GF_TRUE, 0, &info);
 		coords = (SVG_Coordinates*)info.far_ptr;
 	} else {
 		while (gf_list_count(*coords)) {
@@ -2573,13 +2573,13 @@
 
 	if (!path) {
 		GF_FieldInfo info;
-		gf_node_get_attribute_by_tag(n, tag, 1, 0, &info);
-		path = info.far_ptr;
+		gf_node_get_attribute_by_tag(n, tag, GF_TRUE, 0, &info);
+		path = (SVG_PathData*)info.far_ptr;
 	} else {
 		gf_path_reset(path);
 	}
 	/*first MoveTo is skipped in LASeR*/
-	pt = gf_list_get(pts, 0);
+	pt = (GF_Point2D*)gf_list_get(pts, 0);
 	if (!pt) {
 		gf_list_del(pts);
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] Empty path found.\n"));
@@ -2599,22 +2599,22 @@
 		case LSR_PATH_COM_H:
 		case LSR_PATH_COM_V:
 		case LSR_PATH_COM_L:
-			pt = gf_list_get(pts, cur_pt);
+			pt = (GF_Point2D*)gf_list_get(pts, cur_pt);
 			if (!pt) goto err_exit;
 			gf_path_add_line_to_vec(path, pt);
 			cur_pt++;
 			break;
 		case LSR_PATH_COM_m:
 		case LSR_PATH_COM_M:
-			pt = gf_list_get(pts, cur_pt);
+			pt = (GF_Point2D*)gf_list_get(pts, cur_pt);
 			if (!pt) goto err_exit;
 			gf_path_add_move_to_vec(path, pt);
 			cur_pt++;
 			break;
 		case LSR_PATH_COM_q:
 		case LSR_PATH_COM_Q:
-			ct1 = gf_list_get(pts, cur_pt);
-			end = gf_list_get(pts, cur_pt+1);
+			ct1 = (GF_Point2D*)gf_list_get(pts, cur_pt);
+			end = (GF_Point2D*)gf_list_get(pts, cur_pt+1);
 			if (!ct1 || !end) goto err_exit;
 			gf_path_add_quadratic_to_vec(path, ct1, end);
 			orig = *end;
@@ -2622,9 +2622,9 @@
 			break;
 		case LSR_PATH_COM_c:
 		case LSR_PATH_COM_C:
-			ct1 = gf_list_get(pts, cur_pt);
-			ct2 = gf_list_get(pts, cur_pt+1);
-			end = gf_list_get(pts, cur_pt+2);
+			ct1 = (GF_Point2D*)gf_list_get(pts, cur_pt);
+			ct2 = (GF_Point2D*)gf_list_get(pts, cur_pt+1);
+			end = (GF_Point2D*)gf_list_get(pts, cur_pt+2);
 			if (!ct1 || !ct2 || !end) goto err_exit;
 			gf_path_add_cubic_to_vec(path, ct1, ct2, end);
 			cur_pt+=3;
@@ -2635,8 +2635,8 @@
 		case LSR_PATH_COM_S:
 			ct_orig.x = 2*orig.x - ct_orig.x;
 			ct_orig.y = 2*orig.y - ct_orig.y;
-			ct2 = gf_list_get(pts, cur_pt);
-			end = gf_list_get(pts, cur_pt+1);
+			ct2 = (GF_Point2D*)gf_list_get(pts, cur_pt);
+			end = (GF_Point2D*)gf_list_get(pts, cur_pt+1);
 			if (!ct2 || !end) goto err_exit;
 			gf_path_add_cubic_to_vec(path, &ct_orig, ct2, end);
 			ct_orig = *ct2;
@@ -2665,7 +2665,7 @@
 
 exit:
 	while (gf_list_count(pts)) {
-		end = gf_list_get(pts, 0);
+		end = (GF_Point2D*)gf_list_get(pts, 0);
 		gf_list_rem(pts, 0);
 		gf_free(end);
 	}
@@ -2731,7 +2731,7 @@
 	GF_LSR_READ_INT(lsr, flag, 1, "rotate");
 	if (flag) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_rotate, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_rotate, GF_TRUE, 0, &info);
 		GF_LSR_READ_INT(lsr, flag, 1, "choice");
 
 		if (flag) {
@@ -2750,7 +2750,7 @@
 	if (flag) {
 		GF_FieldInfo info;
 		GF_LSR_READ_INT(lsr, flag, 2, "syncBehavior");
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncBehavior, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncBehavior, GF_TRUE, 0, &info);
 		*(SMIL_SyncBehavior*)info.far_ptr = flag + 1;
 	}
 }
@@ -2761,7 +2761,7 @@
 	if (flag) {
 		GF_FieldInfo info;
 		GF_LSR_READ_INT(lsr, flag, 1, "syncTolerance");
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncTolerance, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncTolerance, GF_TRUE, 0, &info);
 		if (flag) ((SMIL_SyncTolerance *)info.far_ptr)->type = SMIL_SYNCTOLERANCE_DEFAULT;
 		else {
 			u32 v = lsr_read_vluimsbf5(lsr, "value");
@@ -2776,7 +2776,7 @@
 	GF_LSR_READ_INT(lsr, flag, 1, "syncReference");
 	if (flag) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncReference, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncReference, GF_TRUE, 0, &info);
 		lsr_read_any_uri(lsr, info.far_ptr, "syncReference");
 	}
 }
@@ -2804,7 +2804,7 @@
 		GF_LSR_READ_INT(lsr, flag, 1, name);
 		if (!flag) return;
 	}
-	lsr->last_error = gf_node_get_attribute_by_tag(n, tag, 1, 0, &info);
+	lsr->last_error = gf_node_get_attribute_by_tag(n, tag, GF_TRUE, 0, &info);
 
 	((SVG_Number*)info.far_ptr)->type = SVG_NUMBER_VALUE;
 	GF_LSR_READ_INT(lsr, flag, lsr->coord_bits, name);
@@ -2824,7 +2824,7 @@
 		return;
 	}
 
-	lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, 1, 0, &info);
+	lsr->last_error = gf_node_get_attribute_by_tag(elt, tag, GF_TRUE, 0, &info);
 
 	for (i=0; i<count; i++) {
 		u32 res;
@@ -2842,7 +2842,7 @@
 	u32 flag;
 	GF_LSR_READ_INT(lsr, flag, 1, "transformBehavior");
 	if (flag) {
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_transformBehavior, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_transformBehavior, GF_TRUE, 0, &info);
 		GF_LSR_READ_INT(lsr, *(SVG_TransformBehavior*)info.far_ptr, 4, "transformBehavior");
 	}
 }
@@ -2853,7 +2853,7 @@
 	GF_LSR_READ_INT(lsr, flag, 1, "hasType");
 	if (flag) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_type, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_type, GF_TRUE, 0, &info);
 		lsr_read_byte_align_string(lsr, info.far_ptr, "type");
 	}
 }
@@ -2863,7 +2863,7 @@
 	GF_LSR_READ_INT(lsr, flag, 1, "hasType");
 	if (flag) {
 		GF_FieldInfo info;
-		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_type, 1, 0, &info);
+		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_type, GF_TRUE, 0, &info);
 		GF_LSR_READ_INT(lsr, flag, 1, "choice");
 		if (flag) {
 			GF_LSR_READ_INT(lsr, flag, 1, "script");
@@ -5616,7 +5616,9 @@
 			lsr_read_byte_align_string(lsr, NULL, "globalName");
 		}
 		pos = gf_bs_get_bit_offset(lsr->bs) - pos;
-		assert(len>=pos);
+		if (len<pos)
+			return GF_NON_COMPLIANT_BITSTREAM;
+
 		GF_LSR_READ_INT(lsr, flag, pos, "remainingData");
 	}

v0.5.2.tar.gz/src/laser/lsr_enc.c -> v0.6.1.tar.gz/src/laser/lsr_enc.c Changed

@@ -186,7 +186,7 @@
 		codec->res_factor = INT2FIX(1 << (-codec->info->cfg.resolution));
 
 	codec->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	e = lsr_write_laser_unit(codec, NULL, 0);
+	e = lsr_write_laser_unit(codec, NULL, GF_FALSE);
 	if (e == GF_OK) gf_bs_get_content(codec->bs, out_data, out_data_length);
 	gf_bs_del(codec->bs);
 	codec->bs = NULL;
@@ -399,14 +399,14 @@
 
 static void lsr_write_any_uri(GF_LASeRCodec *lsr, XMLRI *iri, const char *name)
 {
-	Bool is_iri = 0;
+	Bool is_iri = GF_FALSE;
 
 	if (iri->type==XMLRI_STRING) {
-		is_iri = 1;
+		is_iri = GF_TRUE;
 		if (iri->string[0]=='#') {
 			iri->target = (SVG_Element*)gf_sg_find_node_by_name(lsr->sg, iri->string+1);
 			if (iri->target) {
-				is_iri = 0;
+				is_iri = GF_FALSE;
 				iri->type = XMLRI_ELEMENTID;
 			}
 		}
@@ -924,7 +924,7 @@
 {
 	SMIL_Time *v;
 	u32 r_count, i, count;
-	Bool indef = 0;
+	Bool indef = GF_FALSE;
 
 	count = l ? gf_list_count(*l) : 0;
 
@@ -932,7 +932,7 @@
 	for (i=0; i<count; i++) {
 		v = (SMIL_Time*)gf_list_get(*l, i);
 		if (v->type==GF_SMIL_TIME_INDEFINITE) {
-			indef = 1;
+			indef = GF_TRUE;
 			break;
 		}
 		else if (v->type!=GF_SMIL_TIME_EVENT_RESOLVED) r_count++;
@@ -990,29 +990,29 @@
 	SVGAllAttributes base_atts;
 	GF_FieldInfo info, base_info;
 
-	if (same_stroke) *same_stroke = 0;
-	if (same_fill) *same_fill = 0;
+	if (same_stroke) *same_stroke = GF_FALSE;
+	if (same_fill) *same_fill = GF_FALSE;
 
-	if (!base) return 0;
+	if (!base) return GF_FALSE;
 
 	gf_svg_flatten_attributes(base, &base_atts);
-	if (atts->externalResourcesRequired != base_atts.externalResourcesRequired) return 0;
+	if (atts->externalResourcesRequired != base_atts.externalResourcesRequired) return GF_FALSE;
 
 	info.fieldType = base_info.fieldType = SVG_Paint_datatype;
 	info.far_ptr = atts->stroke;
 	base_info.far_ptr = base_atts.stroke;
 	/*check stroke color*/
 	if (!gf_svg_attributes_equal(&info, &base_info)) {
-		if (!no_stroke_check) return 0;
+		if (!no_stroke_check) return GF_FALSE;
 	} else {
-		if (same_stroke) *same_stroke = 1;
+		if (same_stroke) *same_stroke = GF_TRUE;
 	}
 	if (same_fill) {
 		info.fieldType = base_info.fieldType = SVG_Paint_datatype;
 		info.far_ptr = atts->fill;
 		base_info.far_ptr = base_atts.fill;
 		/*check stroke color*/
-		*same_fill = gf_svg_attributes_equal(&info, &base_info) ? 1 : 0;
+		*same_fill = gf_svg_attributes_equal(&info, &base_info) ? GF_TRUE : GF_FALSE;
 	}
 
 	switch (gf_node_get_tag((GF_Node*) base)) {
@@ -1021,43 +1021,43 @@
 		info.fieldType = base_info.fieldType = SVG_Number_datatype;
 		info.far_ptr = atts->pathLength;
 		base_info.far_ptr = base_atts.pathLength;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 		break;
 	/*check rx and ry for rect*/
 	case TAG_SVG_rect:
 		info.fieldType = base_info.fieldType = SVG_Length_datatype;
 		info.far_ptr = atts->rx;
 		base_info.far_ptr = base_atts.rx;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 
 		info.fieldType = base_info.fieldType = SVG_Length_datatype;
 		info.far_ptr = atts->ry;
 		base_info.far_ptr = base_atts.ry;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 		break;
 	/*check x and y for use*/
 	case TAG_SVG_use:
 		info.fieldType = base_info.fieldType = SVG_Coordinate_datatype;
 		info.far_ptr = atts->x;
 		base_info.far_ptr = base_atts.x;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 
 		info.fieldType = base_info.fieldType = SVG_Coordinate_datatype;
 		info.far_ptr = atts->y;
 		base_info.far_ptr = base_atts.y;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 		break;
 	/*check editable and rotate for text*/
 	case TAG_SVG_text:
 		info.fieldType = base_info.fieldType = SVG_Boolean_datatype;
 		info.far_ptr = atts->editable;
 		base_info.far_ptr = base_atts.editable;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 
 		info.fieldType = base_info.fieldType = SVG_Numbers_datatype;
 		info.far_ptr = atts->text_rotate;
 		base_info.far_ptr = base_atts.text_rotate;
-		if (!gf_svg_attributes_equal(&info, &base_info)) return 0;
+		if (!gf_svg_attributes_equal(&info, &base_info)) return GF_FALSE;
 		break;
 	}
 
@@ -1092,7 +1092,7 @@
 		}
 		/*RARE extension*/
 		if (field_rare==49) {
-			Bool is_string = 0;
+			Bool is_string = GF_FALSE;
 			u32 size, cur_bits;
 			u32 len = 2+3;
 			switch (att->tag) {
@@ -1109,7 +1109,7 @@
 					len++;
 					cur_bits++;
 				}
-				is_string = 1;
+				is_string = GF_TRUE;
 				break;
 			default:
 				len +=2;
@@ -1255,10 +1255,10 @@
 			GF_LSR_WRITE_INT(lsr, *(SVG_PointerEvents*)att->data, 2, "visibility");
 			break;
 		case TAG_SVG_ATT_requiredExtensions:
-			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredExtensions", 1);
+			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredExtensions", GF_TRUE);
 			break;
 		case TAG_SVG_ATT_requiredFormats:
-			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredFormats", 0);
+			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredFormats", GF_FALSE);
 			break;
 		case TAG_SVG_ATT_requiredFeatures:
 		{
@@ -1418,7 +1418,7 @@
 		break;
 
 		case TAG_SVG_ATT_systemLanguage:
-			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "systemLanguage", 0);
+			lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "systemLanguage", GF_FALSE);
 			break;
 		case TAG_XML_ATT_base:
 			lsr_write_byte_align_string(lsr, ((XMLRI*)att->data)->string, "xml:base");
@@ -1505,13 +1505,13 @@
 			GF_LSR_WRITE_INT(lsr, 0, 3, "xlink:show");
 			break;
 		case TAG_SVG_ATT_end:
-			lsr_write_smil_times(lsr, (GF_List **)att->data, "end", 0);
+			lsr_write_smil_times(lsr, (GF_List **)att->data, "end", GF_FALSE);
 			break;
 		case TAG_SVG_ATT_min:
-			lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "min", 0);
+			lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "min", GF_FALSE);
 			break;
 		case TAG_SVG_ATT_max:
-			lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "max", 0);
+			lsr_write_duration_ex(lsr, (SMIL_Duration*)att->data, "max", GF_FALSE);
 			break;
 		case TAG_SVG_ATT_transform:
 			lsr_write_matrix(lsr, (SVG_Transform*)att->data);
@@ -1543,16 +1543,16 @@
 }
 static void lsr_write_href(GF_LASeRCodec *lsr, XMLRI *iri)
 {
-	Bool has_href = iri ? 1 : 0;
+	Bool has_href = iri ? GF_TRUE : GF_FALSE;
 	if (iri) {
 		if (iri->type==XMLRI_ELEMENTID) {
 			if (!iri->target && iri->string) iri->target = (SVG_Element *)gf_sg_find_node_by_name(lsr->sg, iri->string+1);
-			if (!iri->target || !gf_node_get_id((GF_Node *)iri->target)) has_href = 0;
+			if (!iri->target || !gf_node_get_id((GF_Node *)iri->target)) has_href = GF_FALSE;
 		}
 		else if (iri->type==XMLRI_STREAMID) {
-			if (!iri->lsr_stream_id) has_href = 0;
+			if (!iri->lsr_stream_id) has_href = GF_FALSE;
 		}
-		else if (!iri->string) has_href = 0;
+		else if (!iri->string) has_href = GF_FALSE;
 	}
 
 	GF_LSR_WRITE_INT(lsr, has_href, 1, "has_href");
@@ -1893,11 +1893,11 @@
 	break;
 	case 9: // point
 		if (svg_type==SVG_Motion_datatype) {
-			lsr_write_coordinate(lsr, ((GF_Matrix2D*)val)->m[2], 0, "valX");
-			lsr_write_coordinate(lsr, ((GF_Matrix2D*)val)->m[5], 0, "valY");
+			lsr_write_coordinate(lsr, ((GF_Matrix2D*)val)->m[2], GF_FALSE, "valX");
+			lsr_write_coordinate(lsr, ((GF_Matrix2D*)val)->m[5], GF_FALSE, "valY");
 		} else {
-			lsr_write_coordinate(lsr, ((SVG_Point *)val)->x, 0, "valX");
-			lsr_write_coordinate(lsr, ((SVG_Point *)val)->y, 0, "valY");
+			lsr_write_coordinate(lsr, ((SVG_Point *)val)->x, GF_FALSE, "valX");
+			lsr_write_coordinate(lsr, ((SVG_Point *)val)->y, GF_FALSE, "valY");
 		}
 		break;
 	default:
@@ -2352,8 +2352,8 @@
 	GF_LSR_WRITE_INT(lsr, (atts.target!=NULL) ? 1 : 0, 1, "hasTarget");
 	if (atts.target) lsr_write_byte_align_string(lsr, *(SVG_String*)atts.target, "target");
 	lsr_write_href(lsr, atts.xlink_href);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_animate(GF_LASeRCodec *lsr, SVG_Element *elt, SVG_Element *parent)
@@ -2374,7 +2374,7 @@
 	lsr_write_fraction_12(lsr, atts.keyTimes, "keyTimes");
 	lsr_write_anim_values(lsr, atts.values, "values");
 	lsr_write_attribute_type(lsr, &atts);
-	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
+	lsr_write_smil_times(lsr, atts.begin, "begin", GF_TRUE);
 	lsr_write_duration(lsr, atts.dur, "dur");
 	lsr_write_anim_fill(lsr, atts.smil_fill);
 	lsr_write_anim_repeat(lsr, atts.repeatCount);
@@ -2384,8 +2384,8 @@
 	lsr_write_href_anim(lsr, atts.xlink_href, parent);
 	GF_LSR_WRITE_INT(lsr, (atts.lsr_enabled && *atts.lsr_enabled) ? 1 : 0, 1, "enabled");
 
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 
@@ -2405,7 +2405,7 @@
 	lsr_write_fraction_12(lsr, atts.keyTimes, "keyTimes");
 	lsr_write_anim_values(lsr, atts.values, "values");
 	lsr_write_attribute_type(lsr, &atts);
-	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
+	lsr_write_smil_times(lsr, atts.begin, "begin", GF_TRUE);
 	lsr_write_duration(lsr, atts.dur, "dur");
 	lsr_write_anim_fill(lsr, atts.smil_fill);
 	lsr_write_anim_repeat(lsr, atts.repeatCount);
@@ -2424,8 +2424,8 @@
 
 	lsr_write_href_anim(lsr, atts.xlink_href, parent);
 	GF_LSR_WRITE_INT(lsr, (atts.lsr_enabled && *atts.lsr_enabled) ? 1 : 0, 1, "enabled");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_animateTransform(GF_LASeRCodec *lsr, SVG_Element *elt, SVG_Element *parent)
@@ -2468,7 +2468,7 @@
 	lsr_write_fraction_12(lsr, atts.keyTimes, "keyTimes");
 	lsr_write_anim_values(lsr, atts.values, "values");
 	lsr_write_attribute_type(lsr, &atts);
-	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
+	lsr_write_smil_times(lsr, atts.begin, "begin", GF_TRUE);
 	lsr_write_duration(lsr, atts.dur, "dur");
 	lsr_write_anim_fill(lsr, atts.smil_fill);
 	lsr_write_anim_repeat(lsr, atts.repeatCount);
@@ -2478,8 +2478,8 @@
 
 	lsr_write_href_anim(lsr, atts.xlink_href, parent);
 	GF_LSR_WRITE_INT(lsr, (atts.lsr_enabled && *atts.lsr_enabled) ? 1 : 0, 1, "enabled");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_audio(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -2489,7 +2489,7 @@
 
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
-	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
+	lsr_write_smil_times(lsr, atts.begin, "begin", GF_TRUE);
 	lsr_write_duration(lsr, atts.dur, "dur");
 	GF_LSR_WRITE_INT(lsr, atts.externalResourcesRequired ? *atts.externalResourcesRequired : 0, 1, "externalResourcesRequired");
 	lsr_write_anim_repeat(lsr, atts.repeatCount);
@@ -2505,8 +2505,8 @@
 	GF_LSR_WRITE_INT(lsr, atts.syncReference ? 1 : 0, 1, "hasSyncReference");
 	if (atts.syncReference) lsr_write_any_uri(lsr, atts.syncReference, "syncReference");
 
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_circle(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2517,11 +2517,11 @@
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
-	lsr_write_coordinate_ptr(lsr, atts.cx, 1, "cx");
-	lsr_write_coordinate_ptr(lsr, atts.cy, 1, "cy");
-	lsr_write_coordinate_ptr(lsr, atts.r, 0, "r");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_coordinate_ptr(lsr, atts.cx, GF_TRUE, "cx");
+	lsr_write_coordinate_ptr(lsr, atts.cy, GF_TRUE, "cy");
+	lsr_write_coordinate_ptr(lsr, atts.r, GF_FALSE, "r");
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_conditional(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2534,9 +2534,9 @@
 	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
 	GF_LSR_WRITE_INT(lsr, (atts.lsr_enabled && *atts.lsr_enabled) ? 1 : 0, 1, "enabled");
-	lsr_write_any_attribute(lsr, elt, 1);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
 	up = elt->children ? (GF_DOMUpdates*)elt->children->node : NULL;
-	lsr_write_command_list(lsr, up ? up->updates : NULL, elt, 0);
+	lsr_write_command_list(lsr, up ? up->updates : NULL, elt, GF_FALSE);
 	lsr_write_private_attributes(lsr, elt);
 }
 
@@ -2547,19 +2547,19 @@
 
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
-	lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-	lsr_write_coordinate_ptr(lsr, atts.x, 1, "y");
+	lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+	lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "y");
 	lsr_write_href(lsr, atts.xlink_href);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_data(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_defs(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -2571,8 +2571,8 @@
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_ellipse(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2583,12 +2583,12 @@
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
-	lsr_write_coordinate_ptr(lsr, atts.cx, 1, "cx");
-	lsr_write_coordinate_ptr(lsr, atts.cy, 1, "cy");
-	lsr_write_coordinate_ptr(lsr, atts.rx, 0, "rx");
-	lsr_write_coordinate_ptr(lsr, atts.ry, 0, "ry");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_coordinate_ptr(lsr, atts.cx, GF_TRUE, "cx");
+	lsr_write_coordinate_ptr(lsr, atts.cy, GF_TRUE, "cy");
+	lsr_write_coordinate_ptr(lsr, atts.rx, GF_FALSE, "rx");
+	lsr_write_coordinate_ptr(lsr, atts.ry, GF_FALSE, "ry");
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_foreignObject(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2600,12 +2600,12 @@
 	lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired&&*atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
-	lsr_write_coordinate_ptr(lsr, atts.height, 0, "height");
-	lsr_write_coordinate_ptr(lsr, atts.width, 0, "width");
-	lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-	lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
+	lsr_write_coordinate_ptr(lsr, atts.height, GF_FALSE, "height");
+	lsr_write_coordinate_ptr(lsr, atts.width, GF_FALSE, "width");
+	lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+	lsr_write_coordinate_ptr(lsr, atts.y, GF_TRUE, "y");
 
-	lsr_write_any_attribute(lsr, elt, 1);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
 	/*	TODO
 		bit(1) opt_group;
 		if(opt_group) {
@@ -2621,20 +2621,20 @@
 
 static void lsr_write_g(GF_LASeRCodec *lsr, SVG_Element *elt, Bool ommit_tag)
 {
-	Bool is_same = 0;
+	Bool is_same = GF_FALSE;
 	Bool same_fill;
 	SVGAllAttributes atts;
 	gf_svg_flatten_attributes(elt, &atts);
 
 
 	if (!ommit_tag
-	 && lsr_elt_has_same_base(lsr, &atts, lsr->prev_g, &same_fill, NULL, 0)
+	 && lsr_elt_has_same_base(lsr, &atts, lsr->prev_g, &same_fill, NULL, GF_FALSE)
 	 && same_fill
 	 ) {
 		/*samegType*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_sameg, 6, "ch4");
 		lsr_write_id(lsr, (GF_Node *) elt);
-		is_same = 1;
+		is_same = GF_TRUE;
 	} else {
 		/*gType*/
 		if (!ommit_tag) GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_g, 6, "ch4");
@@ -2644,7 +2644,7 @@
 		lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 		lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
 		GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_g = elt;
 	}
 	lsr_write_group_content(lsr, elt, is_same);
@@ -2657,7 +2657,7 @@
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
-	lsr_write_coordinate_ptr(lsr, atts.height, 1, "height");
+	lsr_write_coordinate_ptr(lsr, atts.height, GF_TRUE, "height");
 
 	if (atts.opacity && (atts.opacity->type == SVG_NUMBER_VALUE)) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, "opacity");
@@ -2668,28 +2668,28 @@
 	lsr_write_preserve_aspect_ratio(lsr, atts.preserveAspectRatio);
 
 	lsr_write_content_type(lsr, atts.xlink_type, "type");
-	lsr_write_coordinate_ptr(lsr, atts.width, 1, "width");
-	lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-	lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
+	lsr_write_coordinate_ptr(lsr, atts.width, GF_TRUE, "width");
+	lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+	lsr_write_coordinate_ptr(lsr, atts.y, GF_TRUE, "y");
 	lsr_write_href(lsr, atts.xlink_href);
 	lsr_write_transform_behavior(lsr, atts.transformBehavior);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_line(GF_LASeRCodec *lsr, SVG_Element *elt, Bool ommit_tag)
 {
 	Bool same_fill;
-	Bool is_same = 0;
+	Bool is_same = GF_FALSE;
 	SVGAllAttributes atts;
 	gf_svg_flatten_attributes(elt, &atts);
 
-	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_line, &same_fill, NULL, 0)
+	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_line, &same_fill, NULL, GF_FALSE)
 	 && same_fill
 	 ) {
 		/*samelineType*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_sameline, 6, "ch4");
 		lsr_write_id(lsr, (GF_Node *) elt);
-		is_same = 1;
+		is_same = GF_TRUE;
 	} else {
 		/*lineType*/
 		if (!ommit_tag) GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_line, 6, "ch4");
@@ -2700,12 +2700,12 @@
 		lsr_write_stroke(lsr, elt, &atts);
 	}
 
-	lsr_write_coordinate_ptr(lsr, atts.x1, 1, "x1");
-	lsr_write_coordinate_ptr(lsr, atts.x2, 0, "x2");
-	lsr_write_coordinate_ptr(lsr, atts.y1, 1, "y1");
-	lsr_write_coordinate_ptr(lsr, atts.y2, 0, "y2");
+	lsr_write_coordinate_ptr(lsr, atts.x1, GF_TRUE, "x1");
+	lsr_write_coordinate_ptr(lsr, atts.x2, GF_FALSE, "x2");
+	lsr_write_coordinate_ptr(lsr, atts.y1, GF_TRUE, "y1");
+	lsr_write_coordinate_ptr(lsr, atts.y2, GF_FALSE, "y2");
 	if (!is_same) {
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_line = elt;
 	}
 	lsr_write_group_content(lsr, elt, is_same);
@@ -2720,12 +2720,12 @@
 	lsr_write_fill(lsr, elt, &atts);
 	lsr_write_stroke(lsr, elt, &atts);
 	lsr_write_gradient_units(lsr, atts.gradientUnits);
-	lsr_write_coordinate_ptr(lsr, atts.x1, 1, "x1");
-	lsr_write_coordinate_ptr(lsr, atts.x2, 1, "x2");
-	lsr_write_coordinate_ptr(lsr, atts.y1, 1, "y1");
-	lsr_write_coordinate_ptr(lsr, atts.y2, 1, "y2");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_coordinate_ptr(lsr, atts.x1, GF_TRUE, "x1");
+	lsr_write_coordinate_ptr(lsr, atts.x2, GF_TRUE, "x2");
+	lsr_write_coordinate_ptr(lsr, atts.y1, GF_TRUE, "y1");
+	lsr_write_coordinate_ptr(lsr, atts.y2, GF_TRUE, "y2");
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_mpath(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2735,18 +2735,18 @@
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_href(lsr, atts.xlink_href);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_path(GF_LASeRCodec *lsr, SVG_Element *elt, Bool ommit_tag)
 {
 	Bool same_fill;
-	Bool is_same = 0;
+	Bool is_same = GF_FALSE;
 	SVGAllAttributes atts;
 	gf_svg_flatten_attributes(elt, &atts);
 
-	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_path, &same_fill, NULL, 0) ) {
-		is_same = 1;
+	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_path, &same_fill, NULL, GF_FALSE) ) {
+		is_same = GF_TRUE;
 		if (!same_fill) {
 			/*samepathfillType*/
 			GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_samepathfill, 6, "ch4");
@@ -2773,7 +2773,7 @@
 		} else {
 			GF_LSR_WRITE_INT(lsr, 0, 1, "hasPathLength");
 		}
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_path = elt;
 	}
 	lsr_write_group_content(lsr, elt, is_same);
@@ -2786,7 +2786,7 @@
 	SVGAllAttributes atts;
 	gf_svg_flatten_attributes(elt, &atts);
 
-	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_polygon, &same_fill, &same_stroke, 1)
+	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_polygon, &same_fill, &same_stroke, GF_TRUE)
 	 ) {
 		if (same_fill && same_stroke) same_type = 1;
 		else if (same_fill) same_type = 3;
@@ -2815,7 +2815,7 @@
 		lsr_write_fill(lsr, elt, &atts);
 		lsr_write_stroke(lsr, elt, &atts);
 		lsr_write_point_sequence(lsr, atts.points, "points");
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_polygon = elt;
 	}
 	lsr_write_group_content(lsr, elt, same_type);
@@ -2829,12 +2829,12 @@
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_fill(lsr, elt, &atts);
 	lsr_write_stroke(lsr, elt, &atts);
-	lsr_write_coordinate_ptr(lsr, atts.cx, 1, "cx");
-	lsr_write_coordinate_ptr(lsr, atts.cy, 1, "cy");
+	lsr_write_coordinate_ptr(lsr, atts.cx, GF_TRUE, "cx");
+	lsr_write_coordinate_ptr(lsr, atts.cy, GF_TRUE, "cy");
 	lsr_write_gradient_units(lsr, atts.gradientUnits);
-	lsr_write_coordinate_ptr(lsr, atts.r, 1, "r");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_coordinate_ptr(lsr, atts.r, GF_TRUE, "r");
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_rect(GF_LASeRCodec *lsr, SVG_Element *elt, Bool ommit_tag)
 {
@@ -2843,7 +2843,7 @@
 	SVGAllAttributes atts;
 	gf_svg_flatten_attributes(elt, &atts);
 
-	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_rect, &same_fill, NULL, 0)
+	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_rect, &same_fill, NULL, GF_FALSE)
 	 ) {
 		if (!same_fill) {
 			same_type = 2;
@@ -2856,10 +2856,10 @@
 		}
 		lsr_write_id(lsr, (GF_Node *) elt);
 		if (same_type==2) lsr_write_fill(lsr, elt, &atts);
-		lsr_write_coordinate_ptr(lsr, atts.height, 0, "height");
-		lsr_write_coordinate_ptr(lsr, atts.width, 0, "width");
-		lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-		lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
+		lsr_write_coordinate_ptr(lsr, atts.height, GF_FALSE, "height");
+		lsr_write_coordinate_ptr(lsr, atts.width, GF_FALSE, "width");
+		lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+		lsr_write_coordinate_ptr(lsr, atts.y, GF_TRUE, "y");
 	} else {
 		/*rectType*/
 		if (!ommit_tag) GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_rect, 6, "ch4");
@@ -2867,13 +2867,13 @@
 		lsr_write_rare(lsr, (GF_Node *) elt);
 		lsr_write_fill(lsr, elt, &atts);
 		lsr_write_stroke(lsr, elt, &atts);
-		lsr_write_coordinate_ptr(lsr, atts.height, 0, "height");
-		lsr_write_coordinate_ptr(lsr, atts.rx, 1, "rx");
-		lsr_write_coordinate_ptr(lsr, atts.ry, 1, "ry");
-		lsr_write_coordinate_ptr(lsr, atts.width, 0, "width");
-		lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-		lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_coordinate_ptr(lsr, atts.height, GF_FALSE, "height");
+		lsr_write_coordinate_ptr(lsr, atts.rx, GF_TRUE, "rx");
+		lsr_write_coordinate_ptr(lsr, atts.ry, GF_TRUE, "ry");
+		lsr_write_coordinate_ptr(lsr, atts.width, GF_FALSE, "width");
+		lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+		lsr_write_coordinate_ptr(lsr, atts.y, GF_TRUE, "y");
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_rect = elt;
 	}
 	lsr_write_group_content(lsr, elt, same_type);
@@ -2891,13 +2891,13 @@
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
 	if (atts.size) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, "size");
-		lsr_write_coordinate(lsr, atts.size->width, 0, "width");
-		lsr_write_coordinate(lsr, atts.size->height, 0, "height");
+		lsr_write_coordinate(lsr, atts.size->width, GF_FALSE, "width");
+		lsr_write_coordinate(lsr, atts.size->height, GF_FALSE, "height");
 	} else {
 		GF_LSR_WRITE_INT(lsr, 0, 1, "size");
 	}
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_script(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2909,8 +2909,8 @@
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
 	lsr_write_script_type(lsr, atts.xlink_type);
 	lsr_write_href(lsr, atts.xlink_href);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_selector(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -2933,8 +2933,8 @@
 			GF_LSR_WRITE_INT(lsr, atts.choice->type, 1, "type");
 		}
 	}
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_set(GF_LASeRCodec *lsr, SVG_Element *elt, SVG_Element *parent)
@@ -2946,7 +2946,7 @@
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_animatable(lsr, atts.attributeName, atts.xlink_href, "attributeName");
 	lsr_write_attribute_type(lsr, &atts);
-	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
+	lsr_write_smil_times(lsr, atts.begin, "begin", GF_TRUE);
 	lsr_write_duration(lsr, atts.dur, "dur");
 	lsr_write_anim_fill(lsr, atts.smil_fill);
 	lsr_write_anim_repeat(lsr, atts.repeatCount);
@@ -2955,8 +2955,8 @@
 	lsr_write_anim_value(lsr, atts.to, "to");
 	lsr_write_href_anim(lsr, atts.xlink_href, parent);
 	GF_LSR_WRITE_INT(lsr, (atts.lsr_enabled && *atts.lsr_enabled) ? 1 : 0, 1, "enabled");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_simpleLayout(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -2970,15 +2970,15 @@
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
 	if (atts.delta) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, "delta");
-		lsr_write_coordinate(lsr, atts.delta->width, 0, "width");
-		lsr_write_coordinate(lsr, atts.delta->height, 0, "height");
+		lsr_write_coordinate(lsr, atts.delta->width, GF_FALSE, "width");
+		lsr_write_coordinate(lsr, atts.delta->height, GF_FALSE, "height");
 	} else {
 		GF_LSR_WRITE_INT(lsr, 0, 1, "delta");
 	}
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
 
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_stop(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -2991,8 +2991,8 @@
 	lsr_write_fill(lsr, elt, &atts);
 	lsr_write_stroke(lsr, elt, &atts);
 	lsr_write_fixed_16_8(lsr, atts.offset ? atts.offset->value : 0, "offset");
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 static void lsr_write_svg(GF_LASeRCodec *lsr, SVG_Element *elt)
 {
@@ -3061,8 +3061,8 @@
 	if (atts.zoomAndPan) {
 		GF_LSR_WRITE_INT(lsr, (*atts.zoomAndPan==SVG_ZOOMANDPAN_MAGNIFY) ? 1 : 0, 1, "zoomAndPan");
 	}
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_switch(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -3075,7 +3075,7 @@
 	lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
-	lsr_write_any_attribute(lsr, elt, 1);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
 	lsr_write_group_content(lsr, elt, 0);
 }
 
@@ -3112,7 +3112,7 @@
 		lsr_write_float_list(lsr, atts.text_rotate, "rotate");
 		lsr_write_coord_list(lsr, atts.text_x, "x");
 		lsr_write_coord_list(lsr, atts.text_y, "y");
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_text = elt;
 	}
 	lsr_write_group_content(lsr, elt, same_type);
@@ -3127,20 +3127,20 @@
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	lsr_write_fill(lsr, (SVG_Element*)elt, &atts);
 	lsr_write_stroke(lsr, (SVG_Element*)elt, &atts);
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_use(GF_LASeRCodec *lsr, SVG_Element *elt, Bool ommit_tag)
 {
 	SVGAllAttributes atts;
-	Bool is_same = 0;
+	Bool is_same = GF_FALSE;
 	gf_svg_flatten_attributes(elt, &atts);
 
-	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_use, NULL, NULL, 0)
+	if (!ommit_tag && lsr_elt_has_same_base(lsr, &atts, lsr->prev_use, NULL, NULL, GF_FALSE)
 	 /*TODO check overflow*/
 	 ) {
-		is_same = 1;
+		is_same = GF_TRUE;
 		/*sameuseType*/
 		GF_LSR_WRITE_INT(lsr, LSR_SCENE_CONTENT_MODEL_sameuse, 6, "ch4");
 		lsr_write_id(lsr, (GF_Node *) elt);
@@ -3158,10 +3158,10 @@
 		/*one value only??*/
 		if (atts.overflow) GF_LSR_WRITE_INT(lsr, 0, 2, "overflow");
 
-		lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-		lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
+		lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+		lsr_write_coordinate_ptr(lsr, atts.y, GF_TRUE, "y");
 		lsr_write_href(lsr, atts.xlink_href);
-		lsr_write_any_attribute(lsr, elt, 1);
+		lsr_write_any_attribute(lsr, elt, GF_TRUE);
 		lsr->prev_use = elt;
 	}
 	lsr_write_group_content(lsr, elt, is_same);
@@ -3181,10 +3181,10 @@
 
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
-	lsr_write_smil_times(lsr, atts.begin, "begin", 1);
+	lsr_write_smil_times(lsr, atts.begin, "begin", GF_TRUE);
 	lsr_write_duration(lsr, atts.dur, "dur");
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
-	lsr_write_coordinate_ptr(lsr, atts.height, 1, "height");
+	lsr_write_coordinate_ptr(lsr, atts.height, GF_TRUE, "height");
 
 	GF_LSR_WRITE_INT(lsr, atts.overlay ? 1 : 0, 1, "hasOverlay");
 	if (atts.overlay) {
@@ -3200,9 +3200,9 @@
 	lsr_write_sync_tolerance(lsr, atts.syncTolerance, "syncBehavior");
 	lsr_write_transform_behavior(lsr, atts.transformBehavior);
 	lsr_write_content_type(lsr, atts.xlink_type, "type");
-	lsr_write_coordinate_ptr(lsr, atts.width, 1, "width");
-	lsr_write_coordinate_ptr(lsr, atts.x, 1, "x");
-	lsr_write_coordinate_ptr(lsr, atts.y, 1, "y");
+	lsr_write_coordinate_ptr(lsr, atts.width, GF_TRUE, "width");
+	lsr_write_coordinate_ptr(lsr, atts.x, GF_TRUE, "x");
+	lsr_write_coordinate_ptr(lsr, atts.y, GF_TRUE, "y");
 	lsr_write_href(lsr, atts.xlink_href);
 
 	lsr_write_clip_time(lsr, atts.clipBegin, "clipBegin");
@@ -3214,8 +3214,8 @@
 	GF_LSR_WRITE_INT(lsr, atts.syncReference ? 1 : 0, 1, "hasSyncReference");
 	if (atts.syncReference) lsr_write_any_uri(lsr, atts.syncReference, "syncReference");
 
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_listener(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -3264,8 +3264,8 @@
 	}
 	GF_LSR_WRITE_INT(lsr, (atts.lsr_enabled && *atts.lsr_enabled) ? 1 : 0, 1, "enabled");
 
-	lsr_write_any_attribute(lsr, elt, 1);
-	lsr_write_group_content(lsr, elt, 0);
+	lsr_write_any_attribute(lsr, elt, GF_TRUE);
+	lsr_write_group_content(lsr, elt, GF_FALSE);
 }
 
 static void lsr_write_scene_content_model(GF_LASeRCodec *lsr, SVG_Element *parent, void *node)
@@ -3646,32 +3646,32 @@
 		switch (fieldType) {
 		case SVG_Points_datatype:/*points*/
 		{
-			GF_Point2D *pt = gf_list_get(*(GF_List **)val, 0);
-			lsr_write_coordinate(lsr, pt->x, 0, "x");
-			lsr_write_coordinate(lsr, pt->y, 0, "y");
+			GF_Point2D *pt = (GF_Point2D*)gf_list_get(*(GF_List **)val, 0);
+			lsr_write_coordinate(lsr, pt->x, GF_FALSE, "x");
+			lsr_write_coordinate(lsr, pt->y, GF_FALSE, "y");
 		}
 		break;
 		case SMIL_Times_datatype:/*smil_times*/
 		{
-			SMIL_Time *st = gf_list_get(*(GF_List **)val, 0);
+			SMIL_Time *st = (SMIL_Time*)gf_list_get(*(GF_List **)val, 0);
 			lsr_write_smil_time(lsr, st);
 		}
 		break;
 		case SMIL_KeyPoints_datatype:/*0to1*/
 		{
-			Fixed *f = gf_list_get(*(GF_List **)val, 0);
+			Fixed *f = (Fixed*)gf_list_get(*(GF_List **)val, 0);
 			lsr_write_fixed_clamp(lsr, *f, "v");
 		}
 		break;
 		case SMIL_KeySplines_datatype:/*float*/
 		{
-			Fixed *f = gf_list_get(*(GF_List **)val, 0);
+			Fixed *f = (Fixed*)gf_list_get(*(GF_List **)val, 0);
 			lsr_write_fixed_16_8(lsr, *f, "v");
 		}
 		break;
 		case SMIL_KeyTimes_datatype:/*keyTime*/
 		{
-			Fixed *v = gf_list_get(*(GF_List **)val, 0);
+			Fixed *v = (Fixed*)gf_list_get(*(GF_List **)val, 0);
 			Fixed f = *v;
 			if ((f==0) || (f==FIX_ONE)) {
 				GF_LSR_WRITE_INT(lsr, 1, 1, "hasShort");
@@ -3708,8 +3708,8 @@
 			break;
 		case LASeR_Size_datatype:
 		case SVG_Transform_Translate_datatype:
-			lsr_write_coordinate(lsr, ((SVG_Point *)val)->x, 0, "translation_x");
-			lsr_write_coordinate(lsr, ((SVG_Point *)val)->y, 0, "translation_y");
+			lsr_write_coordinate(lsr, ((SVG_Point *)val)->x, GF_FALSE, "translation_x");
+			lsr_write_coordinate(lsr, ((SVG_Point *)val)->y, GF_FALSE, "translation_y");
 			break;
 		case SVG_Transform_Rotate_datatype:
 			GF_LSR_WRITE_INT(lsr, 0, 1, "isDefaultValue");
@@ -3742,7 +3742,7 @@
 				if (elt->sgprivate->tag==TAG_SVG_svg) {
 					lsr_write_value_with_units(lsr, n, "val");
 				} else {
-					lsr_write_coordinate(lsr, n->value, 0, "val");
+					lsr_write_coordinate(lsr, n->value, GF_FALSE, "val");
 				}
 				break;
 			default:
@@ -3772,7 +3772,7 @@
 			break;
 		case SVG_Coordinate_datatype:
 			n = (SVG_Number*)val;
-			lsr_write_coordinate(lsr, n->value, 0, "val");
+			lsr_write_coordinate(lsr, n->value, GF_FALSE, "val");
 			break;
 		case SVG_Coordinates_datatype:
 			GF_LSR_WRITE_INT(lsr, 0, 1, "isInherit");
@@ -3810,8 +3810,8 @@
 			lsr_write_byte_align_string(lsr, val ? *(DOM_String *)val : (char *)"", "val");
 			break;
 		case SVG_Motion_datatype:
-			lsr_write_coordinate(lsr, ((GF_Matrix2D *)val)->m[2], 0, "pointValueX");
-			lsr_write_coordinate(lsr, ((GF_Matrix2D *)val)->m[5], 0, "pointValueY");
+			lsr_write_coordinate(lsr, ((GF_Matrix2D *)val)->m[2], GF_FALSE, "pointValueX");
+			lsr_write_coordinate(lsr, ((GF_Matrix2D *)val)->m[5], GF_FALSE, "pointValueY");
 			break;
 		case SVG_Points_datatype:
 			lsr_write_point_sequence(lsr, (GF_List **)val, "val");
@@ -3881,7 +3881,7 @@
 {
 	GF_CommandField *field;
 	u8 type = 0;
-	Bool is_text_node = 0;
+	Bool is_text_node = GF_FALSE;
 	u32 field_type, tr_type = 0;
 	if (com->tag==GF_SG_LSR_REPLACE) type = LSR_UPDATE_REPLACE;
 	else if (com->tag==GF_SG_LSR_ADD) type = LSR_UPDATE_ADD;
@@ -3908,7 +3908,7 @@
 		GF_LSR_WRITE_INT(lsr, 1, 1, "has_attributeName");
 		GF_LSR_WRITE_INT(lsr, 0, 1, "choice");
 		GF_LSR_WRITE_INT(lsr, LSR_UPDATE_TYPE_TEXT_CONTENT, 8, "attributeName");
-		is_text_node = 1;
+		is_text_node = GF_TRUE;
 	} else {
 		GF_LSR_WRITE_INT(lsr, 0, 1, "has_attributeName");
 	}
@@ -3937,15 +3937,15 @@
 	lsr_write_codec_IDREF_Node(lsr, com->node, "ref");
 	if (field && !field->new_node && !field->node_list && !com->fromNodeID) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, "has_value");
-		lsr_write_update_value(lsr, (SVG_Element *)com->node, field_type, field->fieldIndex, tr_type, field->field_ptr, (field->pos>=0) ? 1 : 0);
+		lsr_write_update_value(lsr, (SVG_Element *)com->node, field_type, field->fieldIndex, tr_type, field->field_ptr, (field->pos>=0) ? GF_TRUE : GF_FALSE);
 	} else if (is_text_node) {
 		GF_DOMText *t = (GF_DOMText *)field->new_node;
 		GF_LSR_WRITE_INT(lsr, 1, 1, "has_value");
-		lsr_write_update_value(lsr, (SVG_Element *)com->node, DOM_String_datatype, field->fieldIndex, 0, &t->textContent, (field->pos>=0) ? 1 : 0);
+		lsr_write_update_value(lsr, (SVG_Element *)com->node, DOM_String_datatype, field->fieldIndex, 0, &t->textContent, (field->pos>=0) ? GF_TRUE : GF_FALSE);
 	} else {
 		GF_LSR_WRITE_INT(lsr, 0, 1, "has_value");
 	}
-	lsr_write_any_attribute(lsr, NULL, 1);
+	lsr_write_any_attribute(lsr, NULL, GF_TRUE);
 	/*if not add*/
 	if (type!=LSR_UPDATE_ADD) {
 		if (field && field->node_list && !com->fromNodeID) {

v0.5.2.tar.gz/src/mcrypt/g_crypt.c -> v0.6.1.tar.gz/src/mcrypt/g_crypt.c Changed

v0.5.2.tar.gz/src/media_tools/av_parsers.c -> v0.6.1.tar.gz/src/media_tools/av_parsers.c Changed

@@ -36,7 +36,7 @@
 	u32 w, h;
 } std_par[ ] =
 {
-	{ 4, 3}, {3, 2}, {16, 9}, {5, 3}, {5, 4}, {8, 5},
+	{ 4, 3}, {3, 2}, {16, 9}, {5, 3}, {5, 4}, {8, 5}, {2, 1},
 	{0, 0},
 };
 
@@ -88,8 +88,6 @@
 		return "Simple Scalable Profile @ Level 1";
 	case 0x12:
 		return "Simple Scalable Profile @ Level 2";
-	case 0x15:
-		return "AVC/H264 Profile";
 	case 0x21:
 		return "Core Profile @ Level 1";
 	case 0x22:
@@ -116,6 +114,8 @@
 		return "Basic Animated Texture Profile @ Level 1";
 	case 0x72:
 		return "Basic Animated Texture Profile @ Level 2";
+	case 0x7F:
+		return "AVC/H264 Profile";
 	case 0x81:
 		return "Hybrid Profile @ Level 1";
 	case 0x82:
@@ -618,7 +618,7 @@
 	*size = 0;
 	firstObj = 1;
 	hasVOP = 0;
-	*is_coded = 0;
+	*is_coded = GF_FALSE;
 	m4v->current_object_type = (u32) -1;
 	*frame_type = 0;
 
@@ -1062,6 +1062,46 @@
 		return "High Efficiency AAC Profile @ Level 4";
 	case 0x2F:
 		return "High Efficiency AAC Profile @ Level 5";
+	case 0x30:
+		return "High Efficiency AAC v2 Profile @ Level 2";
+	case 0x31:
+		return "High Efficiency AAC v2 Profile @ Level 3";
+	case 0x32:
+		return "High Efficiency AAC v2 Profile @ Level 4";
+	case 0x33:
+		return "High Efficiency AAC v2 Profile @ Level 5";
+	case 0x34:
+		return "Low Delay AAC Profile";
+	case 0x35:
+		return "Baseline MPEG Surround Profile @ Level 1";
+	case 0x36:
+		return "Baseline MPEG Surround Profile @ Level 2";
+	case 0x37:
+		return "Baseline MPEG Surround Profile @ Level 3";
+	case 0x38:
+		return "Baseline MPEG Surround Profile @ Level 4";
+	case 0x39:
+		return "Baseline MPEG Surround Profile @ Level 5";
+	case 0x3A:
+		return "Baseline MPEG Surround Profile @ Level 6";
+
+	case 0x50:
+		return "AAC Profile @ Level 6";
+	case 0x51:
+		return "AAC Profile @ Level 7";
+	case 0x52:
+		return "High Efficiency AAC Profile @ Level 6";
+	case 0x53:
+		return "High Efficiency AAC Profile @ Level 7";
+	case 0x54:
+		return "High Efficiency AAC v2 Profile @ Level 6";
+	case 0x55:
+		return "High Efficiency AAC v2 Profile @ Level 7";
+	case 0x56:
+		return "Extended High Efficiency AAC Profile @ Level 6";
+	case 0x57:
+		return "Extended High Efficiency AAC Profile @ Level 7";
+
 	case 0xFE:
 		return "Not part of MPEG-4 audio profiles";
 	case 0xFF:
@@ -1078,12 +1118,23 @@
 {
 	switch (cfg->base_object_type) {
 	case 2: /*AAC LC*/
-		if (cfg->nb_chan<=2) return (cfg->base_sr<=24000) ? 0x28 : 0x29; /*LC@L1 or LC@L2*/
-		return (cfg->base_sr<=48000) ? 0x2A : 0x2B; /*LC@L4 or LC@L5*/
+		if (cfg->nb_chan<=2)
+			return (cfg->base_sr<=24000) ? 0x28 : 0x29; /*LC@L1 or LC@L2*/
+		if (cfg->nb_chan<=5)
+			return (cfg->base_sr<=48000) ? 0x2A : 0x2B; /*LC@L4 or LC@L5*/
+		return (cfg->base_sr<=48000) ? 0x50 : 0x51; /*LC@L4 or LC@L5*/
 	case 5: /*HE-AAC - SBR*/
-	case 29: /*HE-AAC - SBR+PS*/
-		if (cfg->nb_chan<=2) return (cfg->base_sr<=24000) ? 0x2C : 0x2D; /*HE@L2 or HE@L3*/
-		return (cfg->base_sr<=48000) ? 0x2E : 0x2F; /*HE@L4 or HE@L5*/
+		if (cfg->nb_chan<=2)
+			return (cfg->base_sr<=24000) ? 0x2C : 0x2D; /*HE@L2 or HE@L3*/
+		if (cfg->nb_chan<=5)
+			return (cfg->base_sr<=48000) ? 0x2E : 0x2F; /*HE@L4 or HE@L5*/
+		return (cfg->base_sr<=48000) ? 0x52 : 0x53; /*HE@L6 or HE@L7*/
+	case 29: /*HE-AACv2 - SBR+PS*/
+		if (cfg->nb_chan<=2)
+			return (cfg->base_sr<=24000) ? 0x30 : 0x31; /*HE-AACv2@L2 or HE-AACv2@L3*/
+		if (cfg->nb_chan<=5)
+			return (cfg->base_sr<=48000) ? 0x32 : 0x33; /*HE-AACv2@L4 or HE-AACv2@L5*/
+		return (cfg->base_sr<=48000) ? 0x54 : 0x55; /*HE-AACv2@L6 or HE-AACv2@L7*/
 	/*default to HQ*/
 	default:
 		if (cfg->nb_chan<=2) return (cfg->base_sr<24000) ? 0x0E : 0x0F; /*HQ@L1 or HQ@L2*/
@@ -1096,6 +1147,7 @@
 GF_EXPORT
 GF_Err gf_m4a_parse_config(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg, Bool size_known)
 {
+	u32 channel_configuration = 0;
 	memset(cfg, 0, sizeof(GF_M4ADecSpecInfo));
 	cfg->base_object_type = gf_bs_read_int(bs, 5);
 	/*extended object type*/
@@ -1108,13 +1160,11 @@
 	} else {
 		cfg->base_sr = GF_M4ASampleRates[cfg->base_sr_index];
 	}
-	{
-		u32 nb_chan = gf_bs_read_int(bs, 4);
-		if (nb_chan == 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[M4A config] invalid value 0, setting default 2 instead.\n"));
-			nb_chan = 2;
-		}
-		cfg->nb_chan = GF_M4ANumChannels[nb_chan-1];
+
+	channel_configuration = gf_bs_read_int(bs, 4);
+
+	if (channel_configuration) {
+		cfg->nb_chan = GF_M4ANumChannels[channel_configuration-1];
 	}
 
 	if (cfg->base_object_type==5 || cfg->base_object_type==29) {
@@ -1154,8 +1204,62 @@
 		if (gf_bs_read_int(bs, 1))
 			/*delay = */gf_bs_read_int(bs, 14);
 		ext_flag = gf_bs_read_int(bs, 1);
-		if (!cfg->nb_chan) {
+
+		if (! channel_configuration) {
+			u32 i;
+			cfg->program_config_element_present = 1;
+			cfg->element_instance_tag = gf_bs_read_int(bs, 4);
+			cfg->object_type = gf_bs_read_int(bs, 2);
+			cfg->sampling_frequency_index = gf_bs_read_int(bs, 4);
+			cfg->num_front_channel_elements = gf_bs_read_int(bs, 4);
+			cfg->num_side_channel_elements = gf_bs_read_int(bs, 4);
+			cfg->num_back_channel_elements = gf_bs_read_int(bs, 4);
+			cfg->num_lfe_channel_elements = gf_bs_read_int(bs, 2);
+			cfg->num_assoc_data_elements = gf_bs_read_int(bs, 3);
+			cfg->num_valid_cc_elements = gf_bs_read_int(bs, 4);
+			cfg-> mono_mixdown_present = (Bool) gf_bs_read_int(bs, 1);
+			if (cfg->mono_mixdown_present) {
+				cfg->mono_mixdown_element_number = gf_bs_read_int(bs, 4);
+			}
+			cfg->stereo_mixdown_present = gf_bs_read_int(bs, 1);
+			if (cfg->stereo_mixdown_present) {
+				cfg->stereo_mixdown_element_number = gf_bs_read_int(bs, 4);
+			}
+			cfg->matrix_mixdown_idx_present = gf_bs_read_int(bs, 1);
+			if (cfg->matrix_mixdown_idx_present) {
+				cfg->matrix_mixdown_idx = gf_bs_read_int(bs, 2);
+				cfg->pseudo_surround_enable = gf_bs_read_int(bs, 1);
+			}
+			for (i = 0; i < cfg->num_front_channel_elements; i++) {
+				cfg->front_element_is_cpe[i] = gf_bs_read_int(bs, 1);
+				cfg->front_element_tag_select[i] = gf_bs_read_int(bs, 4);
+			}
+			for (i = 0; i < cfg->num_side_channel_elements; i++) {
+				cfg->side_element_is_cpe[i] = gf_bs_read_int(bs, 1);
+				cfg->side_element_tag_select[i] = gf_bs_read_int(bs, 4);
+			}
+			for (i = 0; i < cfg->num_back_channel_elements; i++) {
+				cfg->back_element_is_cpe[i] = gf_bs_read_int(bs, 1);
+				cfg->back_element_tag_select[i] = gf_bs_read_int(bs, 4);
+			}
+			for (i = 0; i < cfg->num_lfe_channel_elements; i++) {
+				cfg->lfe_element_tag_select[i] = gf_bs_read_int(bs, 4);
+			}
+			for ( i = 0; i < cfg->num_assoc_data_elements; i++) {
+				cfg->assoc_data_element_tag_select[i] = gf_bs_read_int(bs, 4);
+			}
+
+			for (i = 0; i < cfg->num_valid_cc_elements; i++) {
+				cfg->cc_element_is_ind_sw[i] = gf_bs_read_int(bs, 1);
+				cfg->valid_cc_element_tag_select[i] = gf_bs_read_int(bs, 4);
+			}
+			gf_bs_align(bs);
+			cfg->comment_field_bytes = gf_bs_read_int(bs, 8);
+			gf_bs_read_data(bs, (char *) cfg->comments, cfg->comment_field_bytes);
+
+			cfg->nb_chan = cfg->num_front_channel_elements + cfg->num_back_channel_elements + cfg->num_side_channel_elements + cfg->num_lfe_channel_elements;
 		}
+
 		if ((cfg->base_object_type == 6) || (cfg->base_object_type == 20)) {
 			gf_bs_read_int(bs, 3);
 		}
@@ -1292,8 +1396,9 @@
 	if (cfg->base_sr_index == 0x0F) {
 		gf_bs_write_int(bs, cfg->base_sr, 24);
 	}
-	if (cfg->nb_chan == 8) {
-		gf_bs_write_int(bs, 7, 4);
+
+	if (cfg->program_config_element_present) {
+		gf_bs_write_int(bs, 0, 4);
 	} else {
 		gf_bs_write_int(bs, gf_m4a_get_channel_cfg( cfg->nb_chan) , 4);
 	}
@@ -1332,6 +1437,59 @@
 		gf_bs_write_int(bs, 0, 1);
 		/*ext flag*/
 		gf_bs_write_int(bs, 0, 1);
+
+		if (cfg->program_config_element_present) {
+			u32 i;
+			gf_bs_write_int(bs, cfg->element_instance_tag, 4);
+			gf_bs_write_int(bs, cfg->object_type, 2);
+			gf_bs_write_int(bs, cfg->sampling_frequency_index, 4);
+			gf_bs_write_int(bs, cfg->num_front_channel_elements, 4);
+			gf_bs_write_int(bs, cfg->num_side_channel_elements, 4);
+			gf_bs_write_int(bs, cfg->num_back_channel_elements, 4);
+			gf_bs_write_int(bs, cfg->num_lfe_channel_elements, 2);
+			gf_bs_write_int(bs, cfg->num_assoc_data_elements, 3);
+			gf_bs_write_int(bs, cfg->num_valid_cc_elements, 4);
+			gf_bs_write_int(bs, cfg-> mono_mixdown_present, 1);
+			if (cfg->mono_mixdown_present) {
+				gf_bs_write_int(bs, cfg->mono_mixdown_element_number, 4);
+			}
+			gf_bs_write_int(bs, cfg->stereo_mixdown_present, 1);
+			if (cfg->stereo_mixdown_present) {
+				gf_bs_write_int(bs, cfg->stereo_mixdown_element_number, 4);
+			}
+			gf_bs_write_int(bs, cfg->matrix_mixdown_idx_present, 1);
+			if (cfg->matrix_mixdown_idx_present) {
+				gf_bs_write_int(bs, cfg->matrix_mixdown_idx, 2);
+				gf_bs_write_int(bs, cfg->pseudo_surround_enable, 1);
+			}
+			for (i = 0; i < cfg->num_front_channel_elements; i++) {
+				gf_bs_write_int(bs, cfg->front_element_is_cpe[i], 1);
+				gf_bs_write_int(bs, cfg->front_element_tag_select[i], 4);
+			}
+			for (i = 0; i < cfg->num_side_channel_elements; i++) {
+				gf_bs_write_int(bs, cfg->side_element_is_cpe[i], 1);
+				gf_bs_write_int(bs, cfg->side_element_tag_select[i], 4);
+			}
+			for (i = 0; i < cfg->num_back_channel_elements; i++) {
+				gf_bs_write_int(bs, cfg->back_element_is_cpe[i], 1);
+				gf_bs_write_int(bs, cfg->back_element_tag_select[i], 4);
+			}
+			for (i = 0; i < cfg->num_lfe_channel_elements; i++) {
+				gf_bs_write_int(bs, cfg->lfe_element_tag_select[i], 4);
+			}
+			for ( i = 0; i < cfg->num_assoc_data_elements; i++) {
+				gf_bs_write_int(bs, cfg->assoc_data_element_tag_select[i], 4);
+			}
+
+			for (i = 0; i < cfg->num_valid_cc_elements; i++) {
+				gf_bs_write_int(bs, cfg->cc_element_is_ind_sw[i], 1);
+				gf_bs_write_int(bs, cfg->valid_cc_element_tag_select[i], 4);
+			}
+			gf_bs_align(bs);
+			gf_bs_write_int(bs, cfg->comment_field_bytes, 8);
+			gf_bs_write_data(bs, (char *) cfg->comments, cfg->comment_field_bytes);
+		}
+
 		if ((cfg->base_object_type == 6) || (cfg->base_object_type == 20)) {
 			gf_bs_write_int(bs, 0, 3);
 		}
@@ -1928,6 +2086,8 @@
 			/*emulation code found*/
 			num_zero = 0;
 			emulation_bytes_count++;
+			if (!buffer[i])
+				num_zero = 1;
 		} else {
 			if (!buffer[i])
 				num_zero++;
@@ -2056,6 +2216,7 @@
 	u32 ChromaArrayType = 0;
 	s32 mb_width, mb_height, sps_id = -1;
 	u32 profile_idc, level_idc, pcomp, i, chroma_format_idc, cl, cr, ct, cb, luma_bd, chroma_bd;
+	u8 separate_colour_plane_flag;
 	GF_BitStream *bs;
 	char *sps_data_without_emulation_bytes = NULL;
 	u32 sps_data_without_emulation_bytes_size = 0;
@@ -2111,7 +2272,7 @@
 		chroma_format_idc = bs_get_ue(bs);
 		ChromaArrayType = chroma_format_idc;
 		if (chroma_format_idc == 3) {
-			u8 separate_colour_plane_flag = gf_bs_read_int(bs, 1);
+			separate_colour_plane_flag = gf_bs_read_int(bs, 1);
 			/*
 			Depending on the value of separate_colour_plane_flag, the value of the variable ChromaArrayType is assigned as follows.
 			\96	If separate_colour_plane_flag is equal to 0, ChromaArrayType is set equal to chroma_format_idc.
@@ -2179,13 +2340,32 @@
 	gf_bs_read_int(bs, 1); /*direct_8x8_inference_flag*/
 	cl = cr = ct = cb = 0;
 	if (gf_bs_read_int(bs, 1)) { /*crop*/
+		int CropUnitX, CropUnitY, SubWidthC = -1, SubHeightC = -1;
+
+		if (chroma_format_idc == 1) {
+			SubWidthC = 2, SubHeightC = 2;
+		} else if (chroma_format_idc == 2) {
+			SubWidthC = 2, SubHeightC = 1;
+		} else if ((chroma_format_idc == 3) && (separate_colour_plane_flag == 0)) {
+			SubWidthC = 1, SubHeightC = 1;
+		}
+
+		if (ChromaArrayType == 0) {
+			assert(SubWidthC==-1);
+			CropUnitX = 1;
+			CropUnitY = 2-sps->frame_mbs_only_flag;
+		} else {
+			CropUnitX = SubWidthC;
+			CropUnitY = SubHeightC * (2-sps->frame_mbs_only_flag);
+		}
+
 		cl = bs_get_ue(bs); /*crop_left*/
 		cr = bs_get_ue(bs); /*crop_right*/
 		ct = bs_get_ue(bs); /*crop_top*/
 		cb = bs_get_ue(bs); /*crop_bottom*/
 
-		sps->width = 16*mb_width - 2*(cl + cr);
-		sps->height -= (2-sps->frame_mbs_only_flag)*2*(ct + cb);
+		sps->width = 16*mb_width - CropUnitX * (cl + cr);
+		sps->height -= (2-sps->frame_mbs_only_flag) * CropUnitY * (ct + cb);
 	}
 
 	if (vui_flag_pos) {
@@ -2883,7 +3063,15 @@
 		psize += gf_bs_read_int(bs, 8);
 
 		start = gf_bs_get_position(bs);
+
 		do_copy = 1;
+
+		if (start+psize >= nal_size) {
+			if (written == 1) written = 0;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] SEI user message type %d size error (%d but %d remain), skiping %sSEI message\n", ptype, psize, nal_size-start, written ? "end of " : ""));
+			break;
+		}
+
 		switch (ptype) {
 		/*remove SEI messages forbidden in MP4*/
 		case 3: /*filler data*/
@@ -2895,7 +3083,6 @@
 		case 5: /*user unregistered */
 		{
 			char prev;
-			assert(start+psize+1 < nal_size+1);
 			prev = sei_without_emulation_bytes[start+psize+1];
 			sei_without_emulation_bytes[start+psize+1] = 0;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[avc-h264] SEI user message %s\n", sei_without_emulation_bytes+start+16));
@@ -3094,7 +3281,7 @@
 		gf_bs_get_content(mod, (char **) &no_emulation_buf, &flag);
 		emulation_bytes = avc_emulation_bytes_add_count(no_emulation_buf, flag);
 		if (flag+emulation_bytes+1>slc->size)
-			slc->data = (char*)gf_realloc(slc->data, flag+emulation_bytes);
+			slc->data = (char*)gf_realloc(slc->data, flag+emulation_bytes+1);
 		slc->size = avc_add_emulation_bytes(no_emulation_buf, slc->data+1, flag)+1;
 
 		gf_bs_del(mod);
@@ -3295,6 +3482,7 @@
 	if (RapPicFlag) {
 		/*Bool no_output_of_prior_pics_flag = */gf_bs_read_int(bs, 1);
 	}
+
 	pps_id = bs_get_ue(bs);
 	if (pps_id>=64) return -1;
 
@@ -3696,8 +3884,9 @@
 	vps->profile_level_tier_idx[0] = 0;
 	for (i=1; i<NumOutputLayerSets; i++) {
 		u32 nb_bits;
+		//don't warn untiol we fix the entire syntax to last version of the spec
 		if( i > vps->num_layer_sets - 1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] VPS Extensions: not supported number of layers\n"));
+//			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[HEVC] VPS Extensions: not supported number of layers\n"));
 		}
 		nb_bits = 1;
 		while ((u32) (1 << nb_bits) < num_profile_tier_level) {
@@ -4211,6 +4400,10 @@
 	*nal_unit_type = n_state.nal_unit_type = gf_bs_read_int(bs, 6);
 	*layer_id = gf_bs_read_int(bs, 6);
 	*temporal_id = n_state.temporal_id = gf_bs_read_int(bs, 3);
+	if (! (*temporal_id))
+		return -1;
+
+	*temporal_id -= 1;
 
 	ret = 0;
 	switch (n_state.nal_unit_type) {
@@ -4537,7 +4730,10 @@
 	pos = gf_bs_get_position(bs);
 
 	syncword = gf_bs_read_u16(bs);
-	assert (syncword == 0x0B77);
+	if (syncword != 0x0B77) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AC3] Wrong sync word detected (0x%X - expecting 0x0B77).\n", syncword));
+		return GF_FALSE;
+	}
 	gf_bs_read_u16(bs); //crc1
 	fscod = gf_bs_read_int(bs, 2);
 	frmsizecod = gf_bs_read_int(bs, 6);
@@ -4609,7 +4805,11 @@
 
 block:
 	syncword = gf_bs_read_u16(bs);
-	assert(syncword == 0x0B77);
+	if (syncword != 0x0B77) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[E-AC3] Wrong sync word detected (0x%X - expecting 0x0B77).\n", syncword));
+		return GF_FALSE;
+	}
+
 	gf_bs_read_int(bs, 2); //strmtyp
 	substreamid = gf_bs_read_int(bs, 3);
 	framesize += gf_bs_read_int(bs, 11);

v0.5.2.tar.gz/src/media_tools/avilib.c -> v0.6.1.tar.gz/src/media_tools/avilib.c Changed

@@ -197,7 +197,7 @@
 	 avi_write(AVI->fdes,(char *)data,length) != length ||
 	 avi_write(AVI->fdes,&p,length&1) != (length&1)) // if len is uneven, write a pad byte
 	{
-		gf_f64_seek(AVI->fdes,AVI->pos,SEEK_SET);
+		gf_fseek(AVI->fdes,AVI->pos,SEEK_SET);
 		AVI_errno = AVI_ERR_WRITE;
 		return -1;
 	}
@@ -628,7 +628,7 @@
 	}
 	memset((void *)AVI,0,sizeof(avi_t));
 
-	AVI->fdes = gf_f64_open(filename, "w+b");
+	AVI->fdes = gf_fopen(filename, "w+b");
 	if (!AVI->fdes )
 	{
 		AVI_errno = AVI_ERR_OPEN;
@@ -643,7 +643,7 @@
 	i = avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES);
 	if (i != HEADERBYTES)
 	{
-		fclose(AVI->fdes);
+		gf_fclose(AVI->fdes);
 		AVI_errno = AVI_ERR_WRITE;
 		gf_free(AVI);
 		return 0;
@@ -971,9 +971,9 @@
 	/* Output the header, truncate the file to the number of bytes
 	 actually written, report an error if someting goes wrong */
 
-	if ( (gf_f64_seek(AVI->fdes, 0, SEEK_SET) ==(u64)-1) ||
+	if ( (gf_fseek(AVI->fdes, 0, SEEK_SET) ==(u64)-1) ||
 	 avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES)!=HEADERBYTES ||
-	 (gf_f64_seek(AVI->fdes,AVI->pos,SEEK_SET)==(u64)-1)
+	 (gf_fseek(AVI->fdes,AVI->pos,SEEK_SET)==(u64)-1)
 	 ) {
 		AVI_errno = AVI_ERR_CLOSE;
 		return -1;
@@ -1501,7 +1501,7 @@
 	/* Output the header, truncate the file to the number of bytes
 	 actually written, report an error if someting goes wrong */
 
-	if ( (gf_f64_seek(AVI->fdes,0,SEEK_SET)==(u64)-1) ||
+	if ( (gf_fseek(AVI->fdes,0,SEEK_SET)==(u64)-1) ||
 	 avi_write(AVI->fdes,(char *)AVI_header,HEADERBYTES)!=HEADERBYTES
 //		|| ftruncate(AVI->fdes,AVI->pos)<0
 	 )
@@ -1519,13 +1519,13 @@
 
 		for (k=1; k<AVI->video_superindex->nEntriesInUse; k++) {
 			// the len of the RIFF Chunk
-			gf_f64_seek(AVI->fdes, AVI->video_superindex->stdindex[k]->qwBaseOffset+4, SEEK_SET);
+			gf_fseek(AVI->fdes, AVI->video_superindex->stdindex[k]->qwBaseOffset+4, SEEK_SET);
 			len = (u32) (AVI->video_superindex->stdindex[k+1]->qwBaseOffset - AVI->video_superindex->stdindex[k]->qwBaseOffset - 8);
 			long2str((unsigned char *)f, len);
 			avi_write(AVI->fdes, f, 4);
 
 			// len of the LIST/movi chunk
-			gf_f64_seek(AVI->fdes, 8, SEEK_CUR);
+			gf_fseek(AVI->fdes, 8, SEEK_CUR);
 			len -= 12;
 			long2str((unsigned char *)f, len);
 			avi_write(AVI->fdes, f, 4);
@@ -1669,11 +1669,11 @@
 	AVI->track[AVI->aptr].audio_bytes += bytes;
 
 	//update chunk header
-	gf_f64_seek(AVI->fdes, pos+4, SEEK_SET);
+	gf_fseek(AVI->fdes, pos+4, SEEK_SET);
 	long2str(c, length+bytes);
 	avi_write(AVI->fdes, (char *)c, 4);
 
-	gf_f64_seek(AVI->fdes, pos+8+length, SEEK_SET);
+	gf_fseek(AVI->fdes, pos+8+length, SEEK_SET);
 
 	i=PAD_EVEN(length + bytes);
 
@@ -1747,7 +1747,7 @@
 
 	/* Even if there happened an error, we first clean up */
 
-	fclose(AVI->fdes);
+	gf_fclose(AVI->fdes);
 	if(AVI->idx) gf_free(AVI->idx);
 	if(AVI->video_index) gf_free(AVI->video_index);
 	if(AVI->video_superindex) {
@@ -1767,8 +1767,18 @@
 	{
 		if(AVI->track[j].audio_index) gf_free(AVI->track[j].audio_index);
 		if(AVI->track[j].audio_superindex) {
-			if(AVI->track[j].audio_superindex->aIndex) gf_free(AVI->track[j].audio_superindex->aIndex);
-			gf_free(AVI->track[j].audio_superindex);
+			avisuperindex_chunk *asi = AVI->track[j].audio_superindex;
+			if (asi->aIndex) gf_free(asi->aIndex);
+
+			if (asi->stdindex) {
+				for (j=0; j < NR_IXNN_CHUNKS; j++) {
+					if (asi->stdindex[j]->aIndex)
+						gf_free(asi->stdindex[j]->aIndex);
+					gf_free(asi->stdindex[j]);
+				}
+				gf_free(asi->stdindex);
+			}
+			gf_free(asi);
 		}
 	}
 
@@ -1811,7 +1821,7 @@
 
 	/* Open the file */
 
-	AVI->fdes = gf_f64_open(filename,"rb");
+	AVI->fdes = gf_fopen(filename,"rb");
 	if(!AVI->fdes )
 	{
 		AVI_errno = AVI_ERR_OPEN;
@@ -1900,7 +1910,7 @@
 	while(1)
 	{
 		if( avi_read(AVI->fdes,data,8) != 8 ) break; /* We assume it's EOF */
-		newpos = gf_f64_tell(AVI->fdes);
+		newpos = gf_ftell(AVI->fdes);
 		if(oldpos==newpos) {
 			/* This is a broken AVI stream... */
 			return -1;
@@ -1922,16 +1932,16 @@
 
 				// offset of header
 
-				header_offset = gf_f64_tell(AVI->fdes);
+				header_offset = gf_ftell(AVI->fdes);
 
 				if( avi_read(AVI->fdes,(char *)hdrl_data, (u32) n) != n ) ERR_EXIT(AVI_ERR_READ)
 				}
 			else if(strnicmp(data,"movi",4) == 0)
 			{
-				AVI->movi_start = gf_f64_tell(AVI->fdes);
-				if (gf_f64_seek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
+				AVI->movi_start = gf_ftell(AVI->fdes);
+				if (gf_fseek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
 			}
-			else if (gf_f64_seek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
+			else if (gf_fseek(AVI->fdes,n,SEEK_CUR)==(u64)-1) break;
 		}
 		else if(strnicmp(data,"idx1",4) == 0)
 		{
@@ -1948,7 +1958,7 @@
 				}
 		}
 		else
-			gf_f64_seek(AVI->fdes,n,SEEK_CUR);
+			gf_fseek(AVI->fdes,n,SEEK_CUR);
 	}
 
 	if(!hdrl_data ) ERR_EXIT(AVI_ERR_NO_HDRL)
@@ -2087,14 +2097,14 @@
 								 gf_realloc(wfe, sizeof(alWAVEFORMATEX) +
 								 str2ushort((unsigned char *)&wfe->cb_size));
 								if (nwfe != 0) {
-									s64 lpos = gf_f64_tell(AVI->fdes);
-									gf_f64_seek(AVI->fdes, header_offset + i + sizeof(alWAVEFORMATEX),
-									 SEEK_SET);
+									s64 lpos = gf_ftell(AVI->fdes);
+									gf_fseek(AVI->fdes, header_offset + i + sizeof(alWAVEFORMATEX),
+									 SEEK_SET);
 									wfe = (alWAVEFORMATEX *)nwfe;
 									nwfe = &nwfe[sizeof(alWAVEFORMATEX)];
 									avi_read(AVI->fdes, nwfe,
 									 str2ushort((unsigned char *)&wfe->cb_size));
-									gf_f64_seek(AVI->fdes, lpos, SEEK_SET);
+									gf_fseek(AVI->fdes, lpos, SEEK_SET);
 								}
 							}
 							AVI->wave_format_ex[AVI->aptr] = wfe;
@@ -2287,7 +2297,7 @@
 		}
 	}
 
-	gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
+	gf_fseek(AVI->fdes,AVI->movi_start,SEEK_SET);
 
 	if(!getIndex) return(0);
 
@@ -2310,7 +2320,7 @@
 			pos = str2ulong(AVI->idx[i]+ 8);
 		len = str2ulong(AVI->idx[i]+12);
 
-		gf_f64_seek(AVI->fdes,pos,SEEK_SET);
+		gf_fseek(AVI->fdes,pos,SEEK_SET);
 		if(avi_read(AVI->fdes,data,8)!=8) ERR_EXIT(AVI_ERR_READ)
 			if( strnicmp(data,(char *)AVI->idx[i],4)==0 && str2ulong((unsigned char *)data+4)==len )
 			{
@@ -2318,7 +2328,7 @@
 			}
 			else
 			{
-				gf_f64_seek(AVI->fdes,pos+AVI->movi_start-4,SEEK_SET);
+				gf_fseek(AVI->fdes,pos+AVI->movi_start-4,SEEK_SET);
 				if(avi_read(AVI->fdes,data,8)!=8) ERR_EXIT(AVI_ERR_READ)
 					if( strnicmp(data,(char *)AVI->idx[i],4)==0 && str2ulong((unsigned char *)data+4)==len )
 					{
@@ -2333,7 +2343,7 @@
 	{
 		/* we must search through the file to get the index */
 
-		gf_f64_seek(AVI->fdes, AVI->movi_start, SEEK_SET);
+		gf_fseek(AVI->fdes, AVI->movi_start, SEEK_SET);
 
 		AVI->n_idx = 0;
 
@@ -2346,7 +2356,7 @@
 
 			if(strnicmp(data,"LIST",4)==0)
 			{
-				gf_f64_seek(AVI->fdes,4,SEEK_CUR);
+				gf_fseek(AVI->fdes,4,SEEK_CUR);
 				continue;
 			}
 
@@ -2357,11 +2367,11 @@
 			 || ( (data[2]=='w' || data[2]=='W') &&
 			 (data[3]=='b' || data[3]=='B') ) )
 			{
-				u64 __pos = gf_f64_tell(AVI->fdes) - 8;
+				u64 __pos = gf_ftell(AVI->fdes) - 8;
 				avi_add_index_entry(AVI,(unsigned char *)data,0,__pos,n);
 			}
 
-			gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
+			gf_fseek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
 		}
 		idx_type = 1;
 	}
@@ -2396,7 +2406,7 @@
 			// read from file
 			chunk_start = en = (char*) gf_malloc ((u32) (AVI->video_superindex->aIndex[j].dwSize+hdrl_len) );
 
-			if (gf_f64_seek(AVI->fdes, AVI->video_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
+			if (gf_fseek(AVI->fdes, AVI->video_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
 				gf_free(chunk_start);
 				continue;
 			}
@@ -2474,7 +2484,7 @@
 				// read from file
 				chunk_start = en = (char*)gf_malloc ((u32) (AVI->track[audtr].audio_superindex->aIndex[j].dwSize+hdrl_len));
 
-				if (gf_f64_seek(AVI->fdes, AVI->track[audtr].audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
+				if (gf_fseek(AVI->fdes, AVI->track[audtr].audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (u64)-1) {
 					gf_free(chunk_start);
 					continue;
 				}
@@ -2533,7 +2543,7 @@
 
 multiple_riff:
 
-		gf_f64_seek(AVI->fdes, AVI->movi_start, SEEK_SET);
+		gf_fseek(AVI->fdes, AVI->movi_start, SEEK_SET);
 
 		AVI->n_idx = 0;
 
@@ -2594,7 +2604,7 @@
 			 (data[3]=='b' || data[3]=='B' || data[3]=='c' || data[3]=='C') ) {
 
 				AVI->video_index[nvi].key = 0x0;
-				AVI->video_index[nvi].pos = gf_f64_tell(AVI->fdes);
+				AVI->video_index[nvi].pos = gf_ftell(AVI->fdes);
 				AVI->video_index[nvi].len = (u32) n;
 
 				/*
@@ -2602,7 +2612,7 @@
 				 nvi, AVI->video_index[nvi].pos, AVI->video_index[nvi].len, (long)AVI->video_index[nvi].key));
 				 */
 				nvi++;
-				gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
+				gf_fseek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
 			}
 
 			//AUDIO
@@ -2612,16 +2622,16 @@
 			 (data[3]=='b' || data[3]=='B') ) {
 
 
-				AVI->track[j].audio_index[nai[j]].pos = gf_f64_tell(AVI->fdes);
+				AVI->track[j].audio_index[nai[j]].pos = gf_ftell(AVI->fdes);
 				AVI->track[j].audio_index[nai[j]].len = (u32) n;
 				AVI->track[j].audio_index[nai[j]].tot = tot[j];
 				tot[j] += AVI->track[j].audio_index[nai[j]].len;
 				nai[j]++;
 
-				gf_f64_seek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
+				gf_fseek(AVI->fdes,PAD_EVEN(n),SEEK_CUR);
 			}
 			else {
-				gf_f64_seek(AVI->fdes,-4,SEEK_CUR);
+				gf_fseek(AVI->fdes,-4,SEEK_CUR);
 			}
 
 		}
@@ -2713,7 +2723,7 @@
 
 	/* Reposition the file */
 
-	gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
+	gf_fseek(AVI->fdes,AVI->movi_start,SEEK_SET);
 	AVI->video_pos = 0;
 
 	return(0);
@@ -2834,7 +2844,7 @@
 		return -1;
 	}
 
-	gf_f64_seek(AVI->fdes,AVI->movi_start,SEEK_SET);
+	gf_fseek(AVI->fdes,AVI->movi_start,SEEK_SET);
 	AVI->video_pos = 0;
 	return 0;
 }
@@ -2890,7 +2900,7 @@
 		return n;
 	}
 
-	gf_f64_seek(AVI->fdes, AVI->video_index[AVI->video_pos].pos, SEEK_SET);
+	gf_fseek(AVI->fdes, AVI->video_index[AVI->video_pos].pos, SEEK_SET);
 
 	if (avi_read(AVI->fdes,vidbuf,n) != (u32) n)
 	{
@@ -3013,7 +3023,7 @@
 		else
 			todo = left;
 		pos = AVI->track[AVI->aptr].audio_index[AVI->track[AVI->aptr].audio_posc].pos + AVI->track[AVI->aptr].audio_posb;
-		gf_f64_seek(AVI->fdes, pos, SEEK_SET);
+		gf_fseek(AVI->fdes, pos, SEEK_SET);
 		if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo)
 		{
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[avilib] XXX pos = %"LLD", ret = %"LLD", todo = %ld\n", pos, ret, todo));
@@ -3062,7 +3072,7 @@
 
 		if(strnicmp(data,"LIST",4) == 0)
 		{
-			gf_f64_seek(AVI->fdes,4,SEEK_CUR);
+			gf_fseek(AVI->fdes,4,SEEK_CUR);
 			continue;
 		}
 
@@ -3074,7 +3084,7 @@
 			AVI->video_pos++;
 			if(n>max_vidbuf)
 			{
-				gf_f64_seek(AVI->fdes,n,SEEK_CUR);
+				gf_fseek(AVI->fdes,n,SEEK_CUR);
 				return -1;
 			}
 			if(avi_read(AVI->fdes,vidbuf, (u32) n) != n ) return 0;
@@ -3085,14 +3095,14 @@
 			*len = (u32) n;
 			if(n>max_audbuf)
 			{
-				gf_f64_seek(AVI->fdes,n,SEEK_CUR);
+				gf_fseek(AVI->fdes,n,SEEK_CUR);
 				return -2;
 			}
 			if(avi_read(AVI->fdes,audbuf, (u32) n) != n ) return 0;
 			return 2;
 			break;
 		}
-		else if(gf_f64_seek(AVI->fdes,n,SEEK_CUR) == (u64) -1) return 0;
+		else if(gf_fseek(AVI->fdes,n,SEEK_CUR) == (u64) -1) return 0;
 	}
 }

v0.5.2.tar.gz/src/media_tools/dash_client.c -> v0.6.1.tar.gz/src/media_tools/dash_client.c Changed

@@ -30,6 +30,7 @@
 #include <gpac/internal/m3u8.h>
 #include <gpac/internal/isomedia_dev.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #ifdef _WIN32_WCE
 #include <winbase.h>
@@ -73,9 +74,12 @@
 	u32 max_cache_duration, max_width, max_height;
 	u8 max_bit_per_pixel;
 	u32 auto_switch_count;
-	Bool keep_files, disable_switching, allow_local_mpd_update, enable_buffering, estimate_utc_drift;
+	Bool keep_files, disable_switching, allow_local_mpd_update, enable_buffering, estimate_utc_drift, ntp_forced;
 	Bool is_m3u8;
 
+	//set when MPD downloading fails. Will resetup DASH live once MPD is sync again
+	Bool in_error;
+
 	u64 mpd_fetch_time;
 	GF_DASHInitialSelectionMode first_select_mode;
 
@@ -131,9 +135,16 @@
 
 	u32 min_timeout_between_404, segment_lost_after_ms;
 
+	//in ms
 	u32 time_in_tsb, prev_time_in_tsb;
 	u32 tsb_exceeded;
 	s32 debug_group_index;
+	Bool disable_speed_adaptation;
+
+	u32 tile_rate_decrease;
+	GF_DASHTileAdaptationMode tile_adapt_mode;
+
+	GF_List *SRDs;
 };
 
 static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group, Double seek_to, Bool is_dynamic);
@@ -148,6 +159,9 @@
 	u32 representation_index;
 	Bool loop_detected;
 	u32 duration;
+	char *key_url;
+	bin128 key_IV;
+	Bool has_dep_following;
 } segment_cache_entry;
 
 typedef enum
@@ -181,7 +195,7 @@
 	u32 time_shift_buffer_depth;
 
 	Bool bitstream_switching, dont_delete_first_segment;
-
+	GF_DASH_Group *depend_on_group;
 	Bool done;
 	//if set, will redownload the last segment partially downloaded
 	Bool force_switch_bandwidth;
@@ -213,7 +227,7 @@
 	segment_cache_entry *cached;
 
 	GF_DASHFileIOSession segment_download;
-	//0: not set, 1: abort because group has been stoped - 2: abort because bandwidth was too low
+	//0: not set, 1: abort because group has been stopped - 2: abort because bandwidth was too low
 	u32 download_abort_type;
 	/*usually 0-0 (no range) but can be non-zero when playing local MPD/DASH sessions*/
 	u64 bs_switching_init_segment_url_start_range, bs_switching_init_segment_url_end_range;
@@ -221,6 +235,11 @@
 
 	u32 nb_segments_done;
 	u32 last_segment_time;
+	u32 nb_segments_since_switch;
+
+	//stats of last downloaded segment
+	u32 total_size, bytes_per_sec;
+
 
 	Bool segment_must_be_streamed;
 	Bool broken_timing;
@@ -237,7 +256,7 @@
 	u32 time_at_first_failure;
 	Bool prev_segment_ok, segment_in_valid_range;
 	//this is the number of 404
-	u32 nb_consecutive_fail;
+	u32 nb_consecutive_segments_lost;
 	u64 retry_after_utc;
 	/*set when switching segment, indicates the current downloaded segment duration*/
 	u64 current_downloaded_segment_duration;
@@ -256,8 +275,39 @@
 	void *udta;
 
 	Bool has_pending_enhancement;
+
+	/*Codec statistics*/
+	u32 avg_dec_time, max_dec_time, irap_avg_dec_time, irap_max_dec_time;
+	Bool codec_reset;
+	Bool decode_only_rap;
+	/*display statistics*/
+	u32 display_width, display_height;
+	/*buffer status*/
+	u32 buffer_min_ms, buffer_max_ms, buffer_occupancy_ms;
+	u32 buffer_occupancy_at_last_seg;
+
+
+	u32 m3u8_start_media_seq;
+
+	GF_List *groups_depending_on;
+	u32 current_dep_idx;
+
+	u32 target_new_rep;
+
+	u32 srd_x, srd_y, srd_w, srd_h, srd_row_idx, srd_col_idx;
+	struct _dash_srd_desc *srd_desc;
+};
+
+struct _dash_srd_desc
+{
+	u32 srd_nb_rows, srd_nb_cols;
+	u32 id, width, height;
 };
 
+void drm_decrypt(unsigned char * data, unsigned long dataSize, const char * decryptMethod, const char * keyfileURL, const unsigned char * keyIV);
+
+
+
 static const char *gf_dash_get_mime_type(GF_MPD_SubRepresentation *subrep, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set)
 {
 	if (subrep && subrep->mime_type) return subrep->mime_type;
@@ -276,7 +326,7 @@
 			group->dash->dash_io->on_dash_event(group->dash->dash_io, GF_DASH_EVENT_BUFFER_DONE, -1, GF_OK);
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Session buffering done\n"));
 		}
-		group->buffering = 0;
+		group->buffering = GF_FALSE;
 	}
 }
 
@@ -289,7 +339,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Starting session buffering\n"));
 		}
 		group->dash->nb_buffering++;
-		group->buffering = 1;
+		group->buffering = GF_TRUE;
 	}
 }
 
@@ -375,13 +425,13 @@
 		if (rtype) {
 			Bool handled = GF_FALSE;
 			if (!strcmp(rtype, "MPD")) {
-				handled = 1;
+				handled = GF_TRUE;
 			}
 			gf_free(rtype);
 			return handled;
 		}
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -407,15 +457,18 @@
 
 	/*if no AST, do not use NTP sync */
 	if (! group->dash->mpd->availabilityStartTime) {
-		group->broken_timing = 1;
+		group->broken_timing = GF_TRUE;
 		return;
 	}
 
 	if (!fetch_time) {
-		u32 diff = gf_sys_clock() - group->dash->last_update_time;
-		fetch_time = group->dash->mpd_fetch_time + diff;
+		//when we initialize the timeline without an explicit fetch time, use our local clock - this allows for better precision
+		//when trying to locate the live edge
+		fetch_time = gf_net_get_utc();
 	}
-	if (group->dash->estimate_utc_drift && !group->dash->utc_drift_estimate && group->dash->mpd_dnload && group->dash->dash_io->get_header_value) {
+
+
+	if (!group->dash->ntp_forced && group->dash->estimate_utc_drift && !group->dash->utc_drift_estimate && group->dash->mpd_dnload && group->dash->dash_io->get_header_value) {
 		const char *val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Server-UTC");
 		if (val) {
 			u64 utc;
@@ -434,8 +487,11 @@
 		}
 	}
 
+	availabilityStartTime = 0;
+	if ((s64) mpd->availabilityStartTime + group->dash->utc_shift > (s64) - group->dash->utc_drift_estimate) {
+		availabilityStartTime = mpd->availabilityStartTime + group->dash->utc_shift + group->dash->utc_drift_estimate;
+	}
 
-	availabilityStartTime = mpd->availabilityStartTime + group->dash->utc_shift + group->dash->utc_drift_estimate;
 
 #ifdef FORCE_DESYNC
 	availabilityStartTime -= FORCE_DESYNC;
@@ -458,7 +514,7 @@
 			if (t1 == t2) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Slight drift in UTC clock at time %d-%02d-%02dT%02d:%02d:%02dZ: diff AST - now %d ms\n", 1900+t1->tm_year, t1->tm_mon+1, t1->tm_mday, t1->tm_hour, t1->tm_min, t1->tm_sec, (s32) (availabilityStartTime - current_time) ));
 				current_time = 0;
-				broken_timing = 0;
+				broken_timing = GF_FALSE;
 			}
 			else if (t1 && t2) {
 				t1->tm_year = t2->tm_year;
@@ -477,7 +533,7 @@
 					availabilityStartTime = current_time;
 				} else {
 					current_time = 0;
-					group->broken_timing = 1;
+					group->broken_timing = GF_TRUE;
 					return;
 				}
 			}
@@ -517,12 +573,16 @@
 
 			if (current_time < shift) current_time = 0;
 			else current_time -= shift;
-		} else if (group->dash->user_buffer_ms) {
+		}
+		//commented for now, this increase the delay to the live ...
+#if 0
+		else if (group->dash->user_buffer_ms) {
 			shift = MIN(group->dash->user_buffer_ms, mpd->time_shift_buffer_depth);
 
 			if (current_time < shift) current_time = 0;
 			else current_time -= shift;
 		}
+#endif
 	}
 	group->dash->time_in_tsb = group->dash->prev_time_in_tsb = 0;
 
@@ -606,7 +666,7 @@
 					group->nb_segments_in_rep = count;
 					group->start_playback_range = (segtime)*1.0/timescale;
 					group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
-					group->broken_timing = 1;
+					group->broken_timing = GF_TRUE;
 					return;
 				}
 			}
@@ -614,7 +674,7 @@
 			repeat = 1+ent->repeat_count;
 			while (repeat) {
 				if ((current_time_rescale >= segtime) && (current_time_rescale < segtime + ent->duration)) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found segment %d for current time "LLU" is in SegmentTimeline ["LLU"-"LLU"] (timecale %d - current index %d)\n", seg_idx, current_time_rescale, start_segtime, segtime + ent->duration, timescale, group->download_segment_index));
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found segment %d for current time "LLU" is in SegmentTimeline ["LLU"-"LLU"] (timecale %d - current index %d - startNumber %d)\n", seg_idx, current_time_rescale, start_segtime, segtime + ent->duration, timescale, group->download_segment_index, start_number));
 
 					group->download_segment_index = seg_idx;
 					group->nb_segments_in_rep = seg_idx + count - i;
@@ -632,11 +692,20 @@
 				seg_idx++;
 			}
 		}
-		//NOT FOUND !!
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is NOT in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time_rescale, start_segtime, segtime));
-		group->download_segment_index = 0;
-		group->nb_segments_in_rep = 10;
-		group->broken_timing = 1;
+
+		if (current_time_rescale >= segtime) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is greater than last SegmentTimeline end "LLU" - defaulting to last entry in SegmentTimeline\n", current_time_rescale, segtime));
+			group->download_segment_index = seg_idx-1;
+			group->nb_segments_in_rep = 10;
+			group->start_playback_range = (current_time)/1000.0;
+			group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
+		} else {
+			//NOT FOUND !!
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is NOT in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time_rescale, start_segtime, segtime));
+			group->download_segment_index = 0;
+			group->nb_segments_in_rep = 10;
+			group->broken_timing = GF_TRUE;
+		}
 		return;
 	}
 
@@ -647,10 +716,30 @@
 		nb_seg /= group->segment_duration;
 		shift = (u32) nb_seg;
 
-		//when is the next segment available ? if less than 1/3 of a second till now start with next one
-		if (1000 * ( (1+shift /*next segment*/+ 1/*+seg duration for availability time*/) * group->segment_duration - ast_offset /*get exact AST time*/) - current_time < 330) {
-			group->start_playback_range = 0;
-			shift++;
+		//not time shifting, we are at the live edge, we must stick to start of segment otherwise we won't have enough data to play until next segment is ready
+
+		if (!group->dash->initial_time_shift_value) {
+			Double ms_in_seg;
+			group->start_playback_range = shift * group->segment_duration;
+
+			ms_in_seg = (Double) current_time/1000.0;
+			ms_in_seg -= group->start_playback_range;
+
+			//if low latency, try to adjust
+			if (ast_offset) {
+				Double ast_diff;
+				if (ast_offset>group->segment_duration) ast_offset = group->segment_duration;
+				ast_diff = group->segment_duration - ast_offset;
+
+				//we assume that in low latency mode, chunks are made available every (group->segment_duration - ast_offset)
+				//we need to seek such that the remaining time R satisfies now + R = NextSegAST
+				//hence S(n) + ms_in_seg + R = S(n+1) + Aoffset
+				//which gives us R = S(n+1) + Aoffset - S(n) - ms_in_seg = D + Aoffset - ms_in_seg
+				//seek = D - R = D - (D + Aoffset - ms_in_seg) = ms_in_seg - Ao
+				if (ms_in_seg > ast_diff) {
+					group->start_playback_range += ms_in_seg - ast_diff;
+				}
+			}
 		} else {
 			group->start_playback_range = (Double) current_time / 1000.0;
 		}
@@ -660,8 +749,9 @@
 			group->start_number_at_last_ast = start_number;
 
 			group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AST at init "LLD"\n", group->ast_at_init));
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] At current time "LLD" ms: Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%g sec offset in segment %g sec\n", current_time, start_number, shift, group->segment_duration, group->start_playback_range ? group->start_playback_range - shift*group->segment_duration : 0));
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] At current time "LLD" ms: Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%f - %.03f seconds in segment\n", current_time, start_number, shift, group->segment_duration, group->start_playback_range ? group->start_playback_range - shift*group->segment_duration : 0));
 		} else {
 			group->download_segment_index += start_number;
 			if (group->download_segment_index > group->start_number_at_last_ast) {
@@ -683,7 +773,7 @@
 		if (group->nb_segments_in_rep && (group->download_segment_index + nb_segs_in_update > group->nb_segments_in_rep)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Not enough segments (%d needed vs %d indicated) to reach period endTime indicated in MPD - ignoring MPD duration\n", nb_segs_in_update, group->nb_segments_in_rep - group->download_segment_index ));
 			group->nb_segments_in_rep = shift + nb_segs_in_update;
-			group->dash->ignore_mpd_duration = 1;
+			group->dash->ignore_mpd_duration = GF_TRUE;
 		}
 		group->prev_segment_ok = GF_TRUE;
 	} else {
@@ -706,7 +796,7 @@
 		return GF_FALSE;
 	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++) {
 		if ( !stricmp(mime, GF_DASH_MPD_MIME_TYPES[i]))
-			return 1;
+			return GF_TRUE;
 	}
 	return GF_FALSE;
 }
@@ -720,15 +810,15 @@
 static Bool gf_dash_is_m3u8_mime(const char *url, const char * mime) {
 	u32 i;
 	if (!url || !mime)
-		return 0;
+		return GF_FALSE;
 	if (strstr(url, ".mpd") || strstr(url, ".MPD"))
-		return 0;
+		return GF_FALSE;
 
 	for (i = 0 ; GF_DASH_M3U8_MIME_TYPES[i] ; i++) {
 		if ( !stricmp(mime, GF_DASH_M3U8_MIME_TYPES[i]))
-			return 1;
+			return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -739,6 +829,7 @@
 	u32 download_rate, set_idx, time_since_start, done, tot_size, time_until_end;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return GF_BAD_PARAM;
+	if (group->depend_on_group) return GF_BAD_PARAM;
 	if (group->dash->disable_switching) return GF_OK;
 
 	if (group->buffering)
@@ -796,7 +887,7 @@
 	group->dash->dash_io->abort(group->dash->dash_io, group->segment_download);
 
 	//in live we just abort current download and go to next. In onDemand, we may want to rebuffer
-	default_switch_mode = (group->dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? 0 : 1;
+	default_switch_mode = (group->dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_FALSE : GF_TRUE;
 
 	//if we have time to download from another rep ?
 	if (group->current_downloaded_segment_duration <= time_since_start) {
@@ -818,7 +909,7 @@
 			//don't force bandwidth switch, we won't have time to redownload the segment.
 			group->force_switch_bandwidth = default_switch_mode;
 		} else {
-			group->force_switch_bandwidth = 1;
+			group->force_switch_bandwidth = GF_TRUE;
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Attempting to re-download at target rate %d\n", target_rate));
 		}
 		//cap max bitrate for next rate adaptation pass
@@ -834,14 +925,16 @@
 * Parameters are identical to the ones of gf_service_download_new.
 * \see gf_service_download_new()
 */
-GF_Err gf_dash_download_resource(GF_DASHFileIO *dash_io, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, u32 persistent_mode, GF_DASH_Group *group)
+GF_Err gf_dash_download_resource(GF_DashClient *dash, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, u32 persistent_mode, GF_DASH_Group *group)
 {
 	s32 group_idx = -1;
 	Bool had_sess = GF_FALSE;
 	Bool retry = GF_TRUE;
 	GF_Err e;
+	GF_DASHFileIO *dash_io = dash->dash_io;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
+	gf_mx_p(dash->dl_mutex);
 
 	if (group) {
 		group_idx = gf_list_find(group->dash->groups, group);
@@ -851,36 +944,40 @@
 		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url, group_idx);
 		if (!(*sess)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... OUT of memory ?\n", url));
+			gf_mx_v(dash->dl_mutex);
 			return GF_OUT_OF_MEM;
 		}
 	} else {
-		had_sess = 1;
+		had_sess = GF_TRUE;
 		if (persistent_mode!=2) {
 			e = dash_io->setup_from_url(dash_io, *sess, url, group_idx);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup session for url %s: %s\n", url, gf_error_to_string(e) ));
+				gf_mx_v(dash->dl_mutex);
 				return e;
 			}
 		}
 	}
 	if (group) {
-		group->is_downloading = 1;
+		group->is_downloading = GF_TRUE;
 		group->download_start_time = gf_sys_clock();
 	}
 
 retry:
 
 	if (end_range) {
-		e = dash_io->set_range(dash_io, *sess, start_range, end_range, (persistent_mode==2) ? 0 : 1);
+		e = dash_io->set_range(dash_io, *sess, start_range, end_range, (persistent_mode==2) ? GF_FALSE : GF_TRUE);
 		if (e) {
 			if (had_sess) {
 				dash_io->del(dash_io, *sess);
 				*sess = NULL;
-				return gf_dash_download_resource(dash_io, sess, url, start_range, end_range, persistent_mode ? 1 : 0, group);
+				gf_mx_v(dash->dl_mutex);
+				return gf_dash_download_resource(dash, sess, url, start_range, end_range, persistent_mode ? 1 : 0, group);
 			}
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot setup byte-range download for %s: %s\n", url, gf_error_to_string(e) ));
 			if (group)
-				group->is_downloading = 0;
+				group->is_downloading = GF_FALSE;
+			gf_mx_v(dash->dl_mutex);
 			return e;
 		}
 	}
@@ -916,42 +1013,53 @@
 		if (group) {
 			if (dash_io->get_cache_name(dash_io, group->segment_download) == NULL) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s cannot be cached on disk, will use direct streaming\n", url));
-				group->segment_must_be_streamed = 1;
+				group->segment_must_be_streamed = GF_TRUE;
 				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
-				group->is_downloading = 1;
+				group->is_downloading = GF_TRUE;
+				gf_mx_v(dash->dl_mutex);
 				return GF_OK;
 			}
-			group->segment_must_be_streamed = 0;
+			group->segment_must_be_streamed = GF_FALSE;
 		}
 
+		//release dl_mutex while downloading segment
+		gf_mx_v(dash->dl_mutex);
 		/*we can download the file*/
 		e = dash_io->run(dash_io, *sess);
+	} else {
+		gf_mx_v(dash->dl_mutex);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At "LLU" error %s - released dl_mutex\n", gf_net_get_utc(), gf_error_to_string(e)));
 	}
+	gf_mx_p(dash->dl_mutex);
 	if (group && group->download_abort_type) {
-		group->is_downloading = 0;
+		group->is_downloading = GF_FALSE;
+		gf_mx_v(dash->dl_mutex);
 		return GF_IP_CONNECTION_CLOSED;
 	}
 	switch (e) {
 	case GF_IP_CONNECTION_FAILURE:
 	case GF_IP_NETWORK_FAILURE:
-	{
-		dash_io->del(dash_io, *sess);
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] failed to download, retrying once with %s...\n", url));
-		*sess = dash_io->create(dash_io, 0, url, group_idx);
-		if (! (*sess)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... OUT of memory ?\n", url));
-			if (group)
-				group->is_downloading = 0;
-			return GF_OUT_OF_MEM;
-		}
+		if (!dash->in_error || group) {
+			dash_io->del(dash_io, *sess);
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] failed to download, retrying once with %s...\n", url));
+			*sess = dash_io->create(dash_io, 0, url, group_idx);
+			if (! (*sess)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... OUT of memory ?\n", url));
+				if (group)
+					group->is_downloading = GF_FALSE;
+				gf_mx_v(dash->dl_mutex);
+				return GF_OUT_OF_MEM;
+			}
 
-		if (retry) {
-			retry = 0;
-			goto retry;
+			if (retry) {
+				retry = GF_FALSE;
+				goto retry;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] two consecutive failures, aborting the download %s.\n", url));
+		} else if (dash->in_error) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Download still in error for %s.\n", url));
 		}
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] two consecutive failures, aborting the download %s.\n", url));
 		break;
-	}
 	case GF_OK:
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Download %s complete at UTC "LLU" ms\n", url, gf_net_get_utc() ));
 		break;
@@ -960,7 +1068,8 @@
 		break;
 	}
 	if (group)
-		group->is_downloading = 0;
+		group->is_downloading = GF_FALSE;
+	gf_mx_v(dash->dl_mutex);
 	return e;
 }
 
@@ -987,22 +1096,23 @@
 			*nb_segments += 1 + ent->repeat_count;
 			if (ent->start_time) {
 				start_time = ent->start_time;
-				dur = (1 + ent->repeat_count) * ent->duration;
+				dur = (1 + ent->repeat_count);
 			} else {
-				dur += (1 + ent->repeat_count) * ent->duration;
+				dur += (1 + ent->repeat_count);
 			}
+			dur	*= ent->duration;
 		} else {
 			u32 nb_seg = 0;
 			if (i+1<count) {
 				GF_MPD_SegmentTimelineEntry *ent2 = gf_list_get(timeline->entries, i+1);
 				if (ent2->start_time>0) {
 					nb_seg = (u32) ( (ent2->start_time - start_time - dur) / ent->duration);
-					dur += nb_seg * ent->duration;
+					dur += ((u64)nb_seg) * ent->duration;
 				}
 			}
 			if (!nb_seg) {
 				nb_seg = (u32) ( (period_duration - start_time) / ent->duration );
-				dur += nb_seg * ent->duration;
+				dur += ((u64)nb_seg) * ent->duration;
 			}
 			*nb_segments += nb_seg;
 		}
@@ -1064,21 +1174,21 @@
 		return;
 	}
 
-	single_segment = 1;
+	single_segment = GF_TRUE;
 	if (period->segment_template) {
-		single_segment = 0;
+		single_segment = GF_FALSE;
 		if (period->segment_template->duration) duration = period->segment_template->duration;
 		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
 		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
 	}
 	if (set->segment_template) {
-		single_segment = 0;
+		single_segment = GF_FALSE;
 		if (set->segment_template->duration) duration = set->segment_template->duration;
 		if (set->segment_template->timescale) timescale = set->segment_template->timescale;
 		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
 	}
 	if (rep->segment_template) {
-		single_segment = 0;
+		single_segment = GF_FALSE;
 		if (rep->segment_template->duration) duration = rep->segment_template->duration;
 		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
 		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
@@ -1241,8 +1351,9 @@
 
 static Double gf_dash_get_segment_start_time(GF_DASH_Group *group, Double *segment_duration)
 {
-	u64 start, dur;
-	u32 scale;
+	u64 start = 0;
+	u64 dur = 0;
+	u32 scale = 1000;
 
 	start = gf_dash_get_segment_start_time_with_timescale(group, &dur, &scale);
 	if (segment_duration) {
@@ -1356,22 +1467,21 @@
 	}
 	//end of list in regular case: segment was the last one of the previous list and no changes happend
 	if (start_timescale==timescale) {
-		if (start_time == start ) return count;
+		if (start_time == start ) return idx;
 	} else {
-		if (start_time*start_timescale == start * timescale) return count;
+		if (start_time*start_timescale == start * timescale) return idx;
 	}
 
 	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: could not find previous segment start in current timeline ! seeking to end of timeline\n"));
-	return count;
+	return idx;
 }
 
 
 static GF_Err gf_dash_merge_segment_timeline(GF_DASH_Group *group, GF_DashClient *dash, GF_MPD_SegmentList *old_list, GF_MPD_SegmentTemplate *old_template, GF_MPD_SegmentList *new_list, GF_MPD_SegmentTemplate *new_template, Double min_start_time)
 {
 	GF_MPD_SegmentTimeline *old_timeline, *new_timeline;
-	u32 i, idx, prev_count, timescale;
-	u64 start_time;
-	GF_MPD_SegmentTimelineEntry *first_new_entry;
+	u32 i, idx, timescale, nb_new_segs;
+	GF_MPD_SegmentTimelineEntry *ent;
 
 	old_timeline = new_timeline = NULL;
 	if (old_list && old_list->segment_timeline) {
@@ -1393,9 +1503,6 @@
 	}
 	if (!old_timeline && !new_timeline) return GF_OK;
 
-	prev_count = gf_list_count(old_timeline->entries);
-
-
 	if (group) {
 		group->current_start_time = gf_dash_get_segment_start_time_with_timescale(group, NULL, &group->current_timescale);
 	} else {
@@ -1405,57 +1512,38 @@
 		}
 	}
 
-
-	first_new_entry = gf_list_get(new_timeline->entries, 0);
-	idx = 0;
-	start_time=0;
-	while (1) {
-		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(old_timeline->entries, 0);
-		if (!ent) break;
-		if (ent->start_time)
-			start_time = ent->start_time;
-		/*if starttime is equal or greater than first entry in new timeline, we're done*/
-		if (start_time >= first_new_entry->start_time)
-			break;
-
-		/*if entry overlaps first entry in new timeline, remove segments*/
-		while (start_time + ent->duration * (1 + ent->repeat_count) > first_new_entry->start_time) {
-			ent->repeat_count--;
-		}
-		/*we will insert the first entry in the new timeline, make sure we have a start*/
-		if (!idx && !ent->start_time)
-			ent->start_time = start_time;
-
-		start_time += ent->duration * (1 + ent->repeat_count);
-
-		gf_list_insert(new_timeline->entries, ent, idx);
-		idx ++;
-		gf_list_rem(old_timeline->entries, 0);
+	nb_new_segs = 0;
+	idx=0;
+	while ((ent = gf_list_enum(new_timeline->entries, &idx))) {
+		nb_new_segs += 1 + ent->repeat_count;
 	}
 
 	if (group) {
-		group->nb_segments_in_rep = gf_list_count(new_timeline->entries);
-		group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, group->current_start_time, group->current_timescale, timescale);
+		u32 prev_idx = group->download_segment_index;
+		group->nb_segments_in_rep = nb_new_segs;
+		group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, group->current_start_time, group->current_timescale, timescale ? timescale : group->current_timescale);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated SegmentTimeline: New segment number %d - old %d - start time "LLD"\n", group->download_segment_index , prev_idx, group->current_start_time));
 	} else {
 		u32 i;
 		for (i=0; i<gf_list_count(dash->groups); i++) {
 			GF_DASH_Group *a_group = gf_list_get(dash->groups, i);
-			a_group->nb_segments_in_rep = gf_list_count(new_timeline->entries);
-			a_group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, a_group->current_start_time, a_group->current_timescale, timescale);
+			u32 prev_idx = a_group->download_segment_index;
+			a_group->nb_segments_in_rep = nb_new_segs;
+			a_group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, a_group->current_start_time, a_group->current_timescale, timescale ? timescale : a_group->current_timescale);
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated SegmentTimeline: New segment number %d - old %d - start time "LLD"\n", a_group->download_segment_index , prev_idx, a_group->current_start_time));
 		}
 	}
 
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated SegmentTimeline: %d entries (%d previously)\n", gf_list_count(new_timeline->entries), prev_count));
-#if 0
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dumping new merged timeline: \n"));
-	start_time=0;
-	for (idx=0; idx<gf_list_count(new_timeline->entries); idx++) {
-		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(new_timeline->entries, idx);
-		if (!idx) start_time = ent->start_time;
-		assert(!ent->start_time || (ent->start_time >=start_time));
-		start_time += ent->duration*(1+ent->repeat_count);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("\tt="LLU" d=%d r=%d\n", ent->start_time, ent->duration, ent->repeat_count));
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG) ) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] New SegmentTimeline: \n"));
+		for (idx=0; idx<gf_list_count(new_timeline->entries); idx++) {
+			GF_MPD_SegmentTimelineEntry *ent = gf_list_get(new_timeline->entries, idx);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("\tt="LLU" d=%d r=%d\n", ent->start_time, ent->duration, ent->repeat_count));
+		}
 	}
 #endif
 
@@ -1522,9 +1610,96 @@
 	return nb_removed;
 }
 
+static void gf_dash_solve_representation_xlink(GF_DashClient *dash, GF_MPD_Representation *rep)
+{
+	u32 count, i;
+	GF_Err e;
+	Bool is_local=GF_FALSE;
+	const char *local_url;
+	char *url;
+	GF_DOMParser *parser;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resolving Representation SegmentList XLINK %s\n", rep->segment_list->xlink_href));
+
+	//SPEC: If this value is present, the element containing the xlink:href attribute and all @xlink attributes included in the element containing @xlink:href shall be removed at the time when the resolution is due.
+	if (!strcmp(rep->segment_list->xlink_href, "urn:mpeg:dash:resolve-to-zero:2013")) {
+		gf_mpd_delete_segment_list(rep->segment_list);
+		rep->segment_list = NULL;
+		return;
+	}
+
+	//xlink relative to our MPD base URL
+	url = gf_url_concatenate(dash->base_url, rep->segment_list->xlink_href);
+
+	if (!strstr(url, "://") || !strnicmp(url, "file://", 7) ) {
+		local_url = url;
+		is_local=GF_TRUE;
+		e = GF_OK;
+	} else {
+		/*use non-persistent connection for MPD*/
+		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), url ? url : rep->segment_list->xlink_href, 0, 0, 0, NULL);
+		gf_free(url);
+	}
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot download Representation SegmentList XLINK %s: error %s\n", rep->segment_list->xlink_href, gf_error_to_string(e)));
+		gf_free(rep->segment_list->xlink_href);
+		rep->segment_list->xlink_href = NULL;
+		return;
+	}
+
+	if (!is_local) {
+		/*in case the session has been restarted, local_url may have been destroyed - get it back*/
+		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
+	}
+
+	parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(parser, local_url, NULL, NULL);
+	if (is_local) gf_free(url);
+
+	if (e != GF_OK) {
+		gf_xml_dom_del(parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot parse Representation SegmentList XLINK: error in XML parsing %s\n", gf_error_to_string(e)));
+		gf_free(rep->segment_list->xlink_href);
+		rep->segment_list->xlink_href = NULL;
+		return;
+	}
+
+	count = gf_xml_dom_get_root_nodes_count(parser);
+	if (count > 1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] XLINK %s has more than one segment list - ignoring it\n", rep->segment_list->xlink_href));
+		gf_mpd_delete_segment_list(rep->segment_list);
+		rep->segment_list = NULL;
+		return;
+	}
+	for (i=0; i<count; i++) {
+		GF_XMLNode *root = gf_xml_dom_get_root_idx(parser, i);
+		if (!strcmp(root->name, "SegmentList")) {
+			GF_MPD_SegmentList *new_seg_list = gf_mpd_solve_segment_list_xlink(dash->mpd, root);
+			//forbiden
+			if (new_seg_list && new_seg_list->xlink_href) {
+				if (new_seg_list->xlink_actuate_on_load) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] XLINK %s references to remote element entities that contain another @xlink:href attribute with xlink:actuate set to onLoad - forbiden\n", rep->segment_list->xlink_href));
+					gf_mpd_delete_segment_list(new_seg_list);
+					new_seg_list = NULL;
+				} else {
+					new_seg_list->consecutive_xlink_count = rep->segment_list->consecutive_xlink_count + 1;
+				}
+			}
+			//replace current segment list by the one from remote element entity (located by xlink:href)
+			gf_mpd_delete_segment_list(rep->segment_list);
+			rep->segment_list = new_seg_list;
+		}
+		else
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] XML node %s is not a representation segmentlist - ignoring it\n", root->name));
+	}
+}
+
+
 static GF_Err gf_dash_update_manifest(GF_DashClient *dash)
 {
 	GF_Err e;
+	Bool force_timeline_setup = GF_FALSE;
 	u32 group_idx, rep_idx, i, j;
 	u64 fetch_time=0;
 	GF_DOMParser *mpd_parser;
@@ -1534,16 +1709,16 @@
 	char mime[128];
 	char * purl;
 	Double timeline_start_time;
-	GF_MPD *new_mpd;
+	GF_MPD *new_mpd=NULL;
 	Bool fetch_only = GF_FALSE;
 
 	if (!dash->mpd_dnload) {
 		local_url = purl = NULL;
 		if (!gf_list_count(dash->mpd->locations)) {
-			FILE *t = fopen(dash->base_url, "rt");
+			FILE *t = gf_fopen(dash->base_url, "rt");
 			if (t) {
 				local_url = dash->base_url;
-				fclose(t);
+				gf_fclose(t);
 			}
 			if (!local_url) {
 				/*we will no longer attempt to update the MPD ...*/
@@ -1564,11 +1739,10 @@
 		}
 	} else {
 		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
-		if (!local_url) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: wrong cache file %s\n", local_url));
-			return GF_IO_ERR;
+		if (local_url) {
+			gf_delete_file(local_url);
 		}
-		gf_delete_file(local_url);
+		//use the redirected url
 		purl = gf_strdup( dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload) );
 	}
 
@@ -1582,18 +1756,26 @@
 		}
 	}
 
+	gf_mx_p(dash->dl_mutex);
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updating Playlist %s...\n", purl ? purl : local_url));
 	if (purl) {
 		const char *mime_type;
 		/*use non-persistent connection for MPD*/
-		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
+		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
 		if (e!=GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
+			if (!dash->in_error) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
+				dash->in_error = GF_TRUE;
+			}
 			gf_free(purl);
+			//try to refetch MPD every second
+			dash->last_update_time+=1000;
 			return e;
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist %s updated with success\n", purl));
 		}
+
 		mime_type = dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload) ;
 		strcpy(mime, mime_type ? mime_type : "");
 		strlwr(mime);
@@ -1603,63 +1785,93 @@
 
 		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
 		if (gf_dash_is_m3u8_mime(purl, mime) || strstr(purl, ".m3u8")) {
-			gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+			new_mpd = gf_mpd_new();
+			e = gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, new_mpd, GF_FALSE);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
+				gf_mpd_del(new_mpd);
+				gf_mx_v(dash->dl_mutex);
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
 		} else if (!gf_dash_is_dash_mime(mime)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] mime '%s' should be m3u8 or mpd\n", mime));
 		}
 
 		gf_free(purl);
+
+		purl = (char *) dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload) ;
+
+		/*if relocated, reassign MPD base URL*/
+		if (strcmp(purl, dash->base_url)) {
+			gf_free(dash->base_url);
+			dash->base_url = gf_strdup(purl);
+		}
+
 		purl = NULL;
 	}
+
 	fetch_time = dash_get_fetch_time(dash);
 
-	if (!gf_dash_check_mpd_root_type(local_url)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: MPD file type is not correct %s\n", local_url));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
+	// parse the mpd file for filling the GF_MPD structure. Note: for m3u8, MPD has been fetched aobve
+	if (!new_mpd) {
+		if (!gf_dash_check_mpd_root_type(local_url)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: MPD file type is not correct %s\n", local_url));
+			gf_mx_v(dash->dl_mutex);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 
-	if (gf_sha1_file( local_url, signature)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] : cannot SHA1 file %s\n", local_url));
-		return GF_IO_ERR;
-	}
+		if (gf_sha1_file( local_url, signature)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] : cannot SHA1 file %s\n", local_url));
+			gf_mx_v(dash->dl_mutex);
+			return GF_IO_ERR;
+		}
 
-	if (! memcmp( signature, dash->lastMPDSignature, GF_SHA1_DIGEST_SIZE)) {
+		if (!dash->in_error && ! memcmp( signature, dash->lastMPDSignature, GF_SHA1_DIGEST_SIZE)) {
 
-		dash->reload_count++;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] MPD file did not change for %d consecutive reloads\n", dash->reload_count));
-		/*if the MPD did not change, we should refresh "soon" but cannot wait a full refresh cycle in case of
-		low latencies as we could miss a segment*/
+			dash->reload_count++;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] MPD file did not change for %d consecutive reloads\n", dash->reload_count));
+			/*if the MPD did not change, we should refresh "soon" but cannot wait a full refresh cycle in case of
+			low latencies as we could miss a segment*/
 
-		if (dash->is_m3u8) {
-			dash->last_update_time += dash->mpd->minimum_update_period/2;
-		} else {
-			dash->last_update_time = gf_sys_clock();
-		}
-		dash->mpd_fetch_time = fetch_time;
-		return GF_OK;
-	}
+			if (dash->is_m3u8) {
+				dash->last_update_time += dash->mpd->minimum_update_period/2;
+			} else {
+				dash->last_update_time = gf_sys_clock();
+			}
 
-	dash->reload_count = 0;
-	memcpy(dash->lastMPDSignature, signature, GF_SHA1_DIGEST_SIZE);
+			dash->mpd_fetch_time = fetch_time;
+			gf_mx_v(dash->dl_mutex);
+			return GF_OK;
+		}
 
-	/* It means we have to reparse the file ... */
-	/* parse the MPD */
-	mpd_parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
-	if (e != GF_OK) {
+		force_timeline_setup = dash->in_error;
+		dash->in_error = GF_FALSE;
+		dash->reload_count = 0;
+		memcpy(dash->lastMPDSignature, signature, GF_SHA1_DIGEST_SIZE);
+
+		/* It means we have to reparse the file ... */
+		/* parse the MPD */
+		mpd_parser = gf_xml_dom_new();
+		e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
+		if (e != GF_OK) {
+			gf_xml_dom_del(mpd_parser);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in XML parsing %s\n", gf_error_to_string(e)));
+			gf_mx_v(dash->dl_mutex);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		new_mpd = gf_mpd_new();
+		e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
 		gf_xml_dom_del(mpd_parser);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in XML parsing %s\n", gf_error_to_string(e)));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	new_mpd = gf_mpd_new();
-	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
-	gf_xml_dom_del(mpd_parser);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
-		gf_mpd_del(new_mpd);
-		return GF_NON_COMPLIANT_BITSTREAM;
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
+			gf_mpd_del(new_mpd);
+			gf_mx_v(dash->dl_mutex);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 	}
 
+	assert(new_mpd);
+
 	/*TODO - check periods are the same !!*/
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
 	if (fetch_only && !period) goto exit;
@@ -1668,12 +1880,14 @@
 	if (!new_period) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing period\n"));
 		gf_mpd_del(new_mpd);
+		gf_mx_v(dash->dl_mutex);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
 	if (gf_list_count(period->adaptation_sets) != gf_list_count(new_period->adaptation_sets)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing AdaptationSet\n"));
 		gf_mpd_del(new_mpd);
+		gf_mx_v(dash->dl_mutex);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
@@ -1702,6 +1916,7 @@
 	e = gf_dash_merge_segment_timeline(NULL, dash, period->segment_list, period->segment_template, new_period->segment_list, new_period->segment_template, timeline_start_time);
 	if (e) {
 		gf_mpd_del(new_mpd);
+		gf_mx_v(dash->dl_mutex);
 		return e;
 	}
 
@@ -1721,6 +1936,7 @@
 		if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
 			gf_mpd_del(new_mpd);
+			gf_mx_v(dash->dl_mutex);
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
@@ -1734,6 +1950,7 @@
 				if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment base as previous version\n"));
 					gf_mpd_del(new_mpd);
+					gf_mx_v(dash->dl_mutex);
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
 				/*what else should we check ??*/
@@ -1742,31 +1959,65 @@
 			}
 
 			else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
-				u32 start;
 				if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment template as previous version\n"));
 					gf_mpd_del(new_mpd);
+					gf_mx_v(dash->dl_mutex);
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
-				start = 0;
-				/*override new startNum with old one - otherwise we would need to get rid of the entries before the start number in the MPD ...*/
-				if (period->segment_template && (period->segment_template->start_number != (u32) -1) ) start = period->segment_template->start_number;
-				if (set->segment_template && (set->segment_template->start_number != (u32) -1) ) start = set->segment_template->start_number;
-				if (rep->segment_template && (rep->segment_template->start_number != (u32) -1) ) start = rep->segment_template->start_number;
-
-				if (new_period->segment_template && (new_period->segment_template->start_number != (u32) -1) ) new_period->segment_template->start_number = start;
-				if (new_set->segment_template && (new_set->segment_template->start_number != (u32) -1) ) new_set->segment_template->start_number = start;
-				if (new_rep->segment_template && (new_rep->segment_template->start_number != (u32) -1) ) new_rep->segment_template->start_number = start;
+				//if no segment timeline, adjust current idx of the group if start number changes (not needed if SegmentTimeline, otherwise, we will look for the index with the same starttime in the timeline)
+				if ((period->segment_template && period->segment_template->segment_timeline)
+				 || (set->segment_template && set->segment_template->segment_timeline)
+				 || (rep->segment_template && rep->segment_template->segment_timeline)
+				 ) {
+				} else {
+					s32 sn_diff = 0;
 
+					if (period->segment_template && (period->segment_template->start_number != (u32) -1) ) sn_diff = period->segment_template->start_number;
+					else if (set->segment_template && (set->segment_template->start_number != (u32) -1) ) sn_diff = set->segment_template->start_number;
+					else if (rep->segment_template && (rep->segment_template->start_number != (u32) -1) ) sn_diff = rep->segment_template->start_number;
+
+					if (new_period->segment_template && (new_period->segment_template->start_number != (u32) -1) ) sn_diff -= (s32) new_period->segment_template->start_number;
+					else if (new_set->segment_template && (new_set->segment_template->start_number != (u32) -1) ) sn_diff -= (s32) new_set->segment_template->start_number;
+					else if (new_rep->segment_template && (new_rep->segment_template->start_number != (u32) -1) ) sn_diff -= (s32) new_rep->segment_template->start_number;
+
+					if (sn_diff != 0) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] startNumber change for SegmentTemplate without SegmentTimeline - adjusting current segment index by %d\n", sn_diff));
+						group->download_segment_index += sn_diff;
+					}
+				}
 				/*OK, this rep is fine*/
 			}
 			else {
 				/*we're using segment list*/
 				assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
 
+				//if we have a xlink_href in segment_list, solve it
+				while (new_rep->segment_list->xlink_href && (group->active_rep_index==rep_idx)) {
+					if (new_rep->segment_list->consecutive_xlink_count) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Resolving a XLINK pointed from another XLINK (%d consecutive XLINK in segment list)\n", new_rep->segment_list->consecutive_xlink_count));
+					}
+					if (dash->is_m3u8) {
+						Bool is_static = GF_FALSE;
+						u32 dur = 0;
+						gf_m3u8_solve_representation_xlink(new_rep, &group->dash->getter, &is_static, &dur);
+						if (is_static) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[m3u8] MPD type changed from dynamic to static\n"));
+							group->dash->mpd->type = GF_MPD_TYPE_STATIC;
+							group->dash->mpd->media_presentation_duration = dur;
+							group->dash->mpd->minimum_update_period = 0;
+							group->period->duration = dur;
+						}
+					}
+					else
+						gf_dash_solve_representation_xlink(group->dash, new_rep);
+				}
+
+
 				if (!new_rep->segment_list && !new_set->segment_list && !new_period->segment_list) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment list as previous version\n"));
 					gf_mpd_del(new_mpd);
+					gf_mx_v(dash->dl_mutex);
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
 				/*get the segment list*/
@@ -1818,6 +2069,7 @@
 			e = gf_dash_merge_segment_timeline(group, NULL, rep->segment_list, rep->segment_template, new_rep->segment_list, new_rep->segment_template, timeline_start_time);
 			if (e) {
 				gf_mpd_del(new_mpd);
+				gf_mx_v(dash->dl_mutex);
 				return e;
 			}
 
@@ -1838,6 +2090,7 @@
 		e = gf_dash_merge_segment_timeline(group, NULL, set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
 		if (e) {
 			gf_mpd_del(new_mpd);
+			gf_mx_v(dash->dl_mutex);
 			return e;
 		}
 
@@ -1858,7 +2111,12 @@
 			}
 		}
 
-		if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
+		if (force_timeline_setup) {
+			group->timeline_setup = 0;
+			group->start_number_at_last_ast = 0;
+			gf_dash_group_timeline_setup(new_mpd, group, fetch_time);
+		}
+		else if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
 			s64 diff = new_mpd->availabilityStartTime;
 			diff -= dash->mpd->availabilityStartTime;
 			if (diff < 0) diff = -diff;
@@ -1912,9 +2170,11 @@
 	dash->mpd = new_mpd;
 	dash->last_update_time = gf_sys_clock();
 	dash->mpd_fetch_time = fetch_time;
+	gf_mx_v(dash->dl_mutex);
 	return GF_OK;
 }
 
+
 static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep)
 {
 #ifndef GPAC_DISABLE_LOG
@@ -1927,6 +2187,7 @@
 	GF_MPD_Period *period;
 	u32 nb_segs;
 	u32 i = gf_list_find(group->adaptation_set->representations, rep);
+	u32 prev_active_rep_index = group->active_rep_index;
 	u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
 	assert((s32) i >= 0);
 
@@ -1948,6 +2209,55 @@
 		}
 	}
 
+	while (rep->segment_list && rep->segment_list->xlink_href) {
+		if (rep->segment_list->consecutive_xlink_count) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Resolving a XLINK pointed from another XLINK (%d consecutive XLINK in segment list)\n", rep->segment_list->consecutive_xlink_count));
+		}
+		if (group->dash->is_m3u8) {
+			Bool is_static = GF_FALSE;
+			u32 dur = 0;
+			gf_m3u8_solve_representation_xlink(rep, &group->dash->getter, &is_static, &dur);
+			//we only know this is a static or dynamic MPD after parsing the first subplaylist
+			//if this is static, we need to update infos in mpd and period
+			if (is_static) {
+				group->dash->mpd->type = GF_MPD_TYPE_STATIC;
+				group->dash->mpd->media_presentation_duration = dur;
+				group->dash->mpd->minimum_update_period = 0;
+				group->period->duration = dur;
+			}
+		}
+		else
+			gf_dash_solve_representation_xlink(group->dash, rep);
+	}
+
+	if (group->dash->is_m3u8) {
+		//here we change to another representation: we need to remove all URLs from segment list and adjust the download segment index for this group
+		if (group->dash->dash_state == GF_DASH_STATE_RUNNING) {
+			u32 next_media_seq;
+			GF_MPD_Representation *prev_active_rep = (GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, prev_active_rep_index);
+			if (group->dash->mpd->type == GF_MPD_TYPE_DYNAMIC) {
+				while (gf_list_count(prev_active_rep->segment_list->segment_URLs)) {
+					gf_list_rem(prev_active_rep->segment_list->segment_URLs, 0);
+				}
+			}
+
+			next_media_seq = group->m3u8_start_media_seq + group->download_segment_index;
+			if (rep->m3u8_media_seq_min > next_media_seq) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] There are something wrong: next media segment %d vs min media segment in segment list %d - some segments missing\n", next_media_seq, rep->m3u8_media_seq_min));
+				group->download_segment_index = -1;
+			} else if (rep->m3u8_media_seq_max < next_media_seq) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Too late: next media segment %d vs max media segment in segment list %d - force updating mpd\n", next_media_seq, rep->m3u8_media_seq_max));
+				group->dash->force_mpd_update = GF_TRUE;
+				group->download_segment_index = -1;
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] next media segment %d found in segment list (min %d - max %d) - adjusting download segment index\n", next_media_seq, rep->m3u8_media_seq_min, rep->m3u8_media_seq_max));
+				group->download_segment_index = next_media_seq - rep->m3u8_media_seq_min;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] after switching download segment index should be %d\n", group->download_segment_index));
+		}
+		group->m3u8_start_media_seq = rep->m3u8_media_seq_min;
+	}
+
 	set = group->adaptation_set;
 	period = group->period;
 
@@ -1960,11 +2270,12 @@
 	GET_REP_ATTR(samplerate);
 	GET_REP_ATTR(framerate);
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Switched to representation bandwidth %d kbps\n", rep->bandwidth/1024));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d switched to representation bandwidth %d kbps\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth/1024));
 	if (group->max_bitrate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tmax download bandwidth: %d kbps\n", group->max_bitrate/1024));
 	if (width&&height) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tWidth %d Height %d", width, height));
-		if (framerate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, (" framerate %d/%d", framerate->num, framerate->den));
+		if (framerate && !framerate->den) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, (" framerate %d", framerate->num));
+		if (framerate && framerate->den) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, (" framerate %d/%d", framerate->num, framerate->den));
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
 	} else if (samplerate) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tsamplerate %d\n", samplerate));
@@ -2045,7 +2356,7 @@
 }
 
 
-static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
+static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *out_key_iv)
 {
 	GF_Err e;
 	GF_MPD_AdaptationSet *set = group->adaptation_set;
@@ -2060,14 +2371,247 @@
 
 	gf_dash_resolve_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
 	*segment_duration = (resolve_type==GF_MPD_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
-
-	e = gf_mpd_resolve_url(mpd, rep, set, period, mpd_url, resolve_type, item_index, group->nb_segments_purged, out_url, out_range_start, out_range_end, segment_duration, is_in_base_url);
+	e = gf_mpd_resolve_url(mpd, rep, set, period, mpd_url, resolve_type, item_index, group->nb_segments_purged, out_url, out_range_start, out_range_end, segment_duration, is_in_base_url, out_key_url, out_key_iv);
 	if (e == GF_NON_COMPLIANT_BITSTREAM) {
 		group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
 	}
+
 	return e;
 }
 
+/* Estimate the maximum speed that we can play, using our statistic. If it is below the max_playout_rate in MPD, return max_playout_rate*/
+static Double gf_dash_get_max_available_speed(GF_DashClient *dash, GF_DASH_Group *group, GF_MPD_Representation *rep)
+{
+	Double max_available_speed = 0;
+	Double max_dl_speed, max_decoding_speed;
+	u32 framerate;
+	u32 bytes_per_sec = group->bytes_per_sec;
+	max_dl_speed = 8.0*bytes_per_sec / rep->bandwidth;
+	//if framerate is not in MPD, suppose that it is 25 fps
+	framerate = rep->framerate ? rep->framerate->num : 25;
+	if (group->decode_only_rap)
+		max_decoding_speed = group->irap_max_dec_time ? 1000000.0 / group->irap_max_dec_time : 0;
+	else
+		max_decoding_speed = group->avg_dec_time ? 1000000.0 / (group->max_dec_time + group->avg_dec_time*(framerate - 1)) : 0;
+	max_available_speed = max_decoding_speed > max_dl_speed ? max_dl_speed : max_decoding_speed;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation %s max playout rate: in MPD %f - calculated by stat: %f\n", rep->id, rep->max_playout_rate, max_available_speed));
+	return max_available_speed/2; // for testing and debug
+}
+
+static void dash_store_stats(GF_DashClient *dash, GF_DASH_Group *group, GF_DASHFileIOSession segment_download)
+{
+	group->total_size = dash->dash_io->get_total_size(dash->dash_io, segment_download);
+	group->bytes_per_sec = dash->dash_io->get_bytes_per_sec(dash->dash_io, segment_download);
+	group->last_segment_time = gf_sys_clock();
+	group->nb_segments_since_switch ++;
+
+#ifndef GPAC_DISABLE_LOG
+	if (group->total_size && group->bytes_per_sec && group->current_downloaded_segment_duration) {
+		Double bitrate, time;
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+		bitrate = 8*group->total_size;
+		bitrate /= group->current_downloaded_segment_duration;
+		time = group->total_size;
+		time /= group->bytes_per_sec;
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d download stats: %d bytes in %g seconds - duration %g sec - Bandwidth (kbps): indicated %d - computed %d - download %d\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), group->total_size, time, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, 8*group->bytes_per_sec/1000));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d download stats: %d bytes at %d bytes per seconds\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), group->total_size, group->bytes_per_sec));
+	}
+#endif
+}
+
+static void dash_do_rate_adaptation(GF_DashClient *dash, GF_DASH_Group *group)
+{
+	Double speed;
+	u32 k, dl_rate;
+	Bool go_up_bitrate = GF_FALSE;
+	u32 nb_inter_rep = 0;
+	GF_MPD_Representation *rep, *new_rep;
+	Double max_available_speed;
+	Bool force_below_resolution = GF_FALSE;
+	GF_DASH_Group *base_group = group;
+	Bool do_switch = GF_TRUE;
+
+	if (dash->auto_switch_count) return;
+	if (group->dash->disable_switching) return;
+
+	//nothing downloaded for this group, no rate adaptation to be done
+	if (!group->total_size || !group->bytes_per_sec) {
+		return;
+	}
+
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+
+	while (base_group->depend_on_group) {
+		base_group = base_group->depend_on_group;
+	}
+
+	//adjust the download rate according to the playback speed
+	speed = dash->speed;
+	if (speed<0) speed = -speed;
+	dl_rate = (u32) (8*group->bytes_per_sec / speed);
+
+	if (rep->bandwidth < dl_rate) {
+		go_up_bitrate = 1;
+	}
+	if (dl_rate < group->min_representation_bitrate)
+		dl_rate = group->min_representation_bitrate;
+
+	group->buffer_max_ms = group->buffer_occupancy_ms = 0;
+	group->codec_reset = 0;
+
+	/*query codec and buffer statistics*/
+	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CODEC_STAT_QUERY, gf_list_find(group->dash->groups, group), GF_OK);
+	if (rep->playback.waiting_codec_reset && group->codec_reset) rep->playback.waiting_codec_reset = GF_FALSE;
+
+	/*check whether we can play with this speed; if not force to switch to the below resolution*/
+	if (!rep->playback.waiting_codec_reset) {
+		max_available_speed = gf_dash_get_max_available_speed(dash, base_group, rep);
+		if (max_available_speed && (speed > max_available_speed))
+			force_below_resolution = GF_TRUE;
+	}
+
+	/*buffer-based control: if we are below half of the buffer don't try to go up and limit rate to less than our current rep bandwidth*/
+	if (group->buffer_max_ms) {
+		u32 buf_high_threshold, buf_low_threshold;
+		s32 occ;
+
+		if (group->current_downloaded_segment_duration && (group->buffer_max_ms > group->current_downloaded_segment_duration))
+			buf_high_threshold = group->buffer_max_ms - (u32) group->current_downloaded_segment_duration;
+		else
+			buf_high_threshold = 2*group->buffer_max_ms/3;
+
+		buf_low_threshold = (group->current_downloaded_segment_duration && (group->buffer_min_ms>10)) ? group->buffer_min_ms : (u32) group->current_downloaded_segment_duration;
+		if (buf_low_threshold > group->buffer_max_ms) buf_low_threshold = 1*group->buffer_max_ms/3;
+
+		//compute how much we managed to refill (current state minus previous state)
+		occ = (s32) group->buffer_occupancy_ms;
+		occ -= (s32) group->buffer_occupancy_at_last_seg;
+		//if above max buffer force occ>0 since a segment may still be pending and not dispatched (buffer regulation)
+		if (group->buffer_occupancy_ms>group->buffer_max_ms) occ=1;
+
+		//switch down if current buffer falls below min threshold
+		if ( (s32) group->buffer_occupancy_ms < (s32) buf_low_threshold) {
+			if (!group->buffer_occupancy_ms) dl_rate = group->min_representation_bitrate;
+			else dl_rate = (rep->bandwidth>10) ? rep->bandwidth - 10 : 1;
+			go_up_bitrate = 0;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - running low, switching down, target rate %d\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ, dl_rate));
+		}
+		//switch up if above max threshold and buffer refill is fast enough
+		else if ((occ>0) && (group->buffer_occupancy_ms > buf_high_threshold)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - running high, will try to switch up, target rate %d\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ, dl_rate));
+			go_up_bitrate = 1;
+		}
+		//don't do anything in the middle or if refill not fast enough
+		else {
+			do_switch = GF_FALSE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d bitrate %d bps buffer max %d current %d refill since last %d - steady\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, group->buffer_max_ms, group->buffer_occupancy_ms, occ));
+		}
+	}
+
+	/*find best bandwidth that fits our bitrate and playing speed*/
+	new_rep = NULL;
+
+	if (do_switch) {
+		for (k=0; k<gf_list_count(group->adaptation_set->representations) && do_switch; k++) {
+			GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Repesentation %s prev max available speed: %f \n", arep->id, arep->playback.prev_max_available_speed));
+			if (arep->playback.disabled) continue;
+			if (arep->playback.prev_max_available_speed && (speed > arep->playback.prev_max_available_speed))
+				continue;
+
+			if (dl_rate >= arep->bandwidth) {
+				if (force_below_resolution && !dash->disable_speed_adaptation) {
+					if (!k) GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Speed adaptation\n"));
+					/*try to switch to highest quality below the current one*/
+					if ((arep->quality_ranking < rep->quality_ranking) || (arep->width < rep->width) || (arep->height < rep->height)) {
+						if (!new_rep)
+							new_rep = arep;
+						else if ((arep->quality_ranking > new_rep->quality_ranking) || (arep->width > new_rep->width) || (arep->height > new_rep->height))
+							new_rep = arep;
+					}
+					rep->playback.prev_max_available_speed = max_available_speed;
+					go_up_bitrate = GF_FALSE;
+				} else {
+					if (!k) GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Bitrate adaptation\n"));
+					if (!new_rep) new_rep = arep;
+					else if (go_up_bitrate) {
+#if 0
+						/*try to switch to highest bitrate below available download rate*/
+						if (arep->bandwidth > new_rep->bandwidth) {
+							if (new_rep->bandwidth > rep->bandwidth) {
+								nb_inter_rep ++;
+							}
+							new_rep = arep;
+						} else if (arep->bandwidth > rep->bandwidth) {
+							nb_inter_rep ++;
+						}
+#else
+						/*try to switch to lowest bitrate above our current rep*/
+						if (new_rep->bandwidth<=rep->bandwidth) {
+							new_rep = arep;
+						} else if ( (arep->bandwidth < new_rep->bandwidth) && (arep->bandwidth > rep->bandwidth)) {
+							new_rep = arep;
+						}
+#endif
+					} else {
+						/*try to switch to highest bitrate below available download rate*/
+						if (arep->bandwidth > new_rep->bandwidth) {
+							new_rep = arep;
+						}
+					}
+				}
+			}
+		}
+
+		if (!new_rep || (new_rep==rep)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d no rep found better matching requested bandwidth %d - not switching !\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), dl_rate));
+			do_switch=GF_FALSE;
+		}
+	}
+
+	if (do_switch) {
+		//if we're switching to the next upper bitrate (no intermediate bitrates), do not immediately switch
+		//but for a given number of segments - this avoids fluctuation in the quality
+		if (go_up_bitrate && ! nb_inter_rep) {
+			new_rep->playback.probe_switch_count++;
+			if (new_rep->playback.probe_switch_count > dash->probe_times_before_switch) {
+				new_rep->playback.probe_switch_count = 0;
+			} else {
+				do_switch = 0;
+			}
+		}
+	}
+
+	if (do_switch) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d switching after playing %d segments from current rep\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), group->nb_segments_since_switch));
+		group->nb_segments_since_switch = 0;
+
+		if (force_below_resolution) {
+			new_rep->playback.waiting_codec_reset = GF_TRUE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d switching representation from bandwidth %d bps to %d bps at UTC "LLU" ms (playback speed %f)\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), rep->bandwidth, new_rep->bandwidth, gf_net_get_utc(), dash->speed ));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d switching representation %s from bandwidth %d bps to %d bps at UTC "LLU" ms (download rate %d)\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), go_up_bitrate ? "up" : "down", rep->bandwidth, new_rep->bandwidth, gf_net_get_utc(), dl_rate));
+		}
+
+		gf_dash_set_group_representation(group, new_rep);
+	}
+
+	group->buffer_occupancy_at_last_seg = group->buffer_occupancy_ms;
+
+	for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+		GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
+		if (new_rep==arep) continue;
+		arep->playback.probe_switch_count = 0;
+	}
+
+	if (force_below_resolution && !new_rep) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Speed %f is too fast to play - speed down \n", dash->speed));
+		/*FIXME: should do something here*/
+	}
+}
+
 static GF_Err gf_dash_download_init_segment(GF_DashClient *dash, GF_DASH_Group *group)
 {
 	GF_Err e;
@@ -2075,8 +2619,13 @@
 	char *init_segment_local_url;
 	GF_MPD_Representation *rep;
 	u64 start_range, end_range;
+	char mime[128];
+	const char *mime_type;
 	/* This variable is 0 if there is a initURL, the index of first segment downloaded otherwise */
 	u32 nb_segment_read = 0;
+	char *key_url=NULL;
+	bin128 key_iv;
+
 	if (!dash || !group)
 		return GF_BAD_PARAM;
 	gf_mx_p(dash->dl_mutex);
@@ -2090,17 +2639,22 @@
 	}
 	start_range = end_range = 0;
 
-	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv);
 	if (e) {
 		gf_mx_v(dash->dl_mutex);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
 		return e;
 	}
 
+	if (!base_init_url && rep->dependency_id) {
+		gf_mx_v(dash->dl_mutex);
+		return GF_OK;
+	}
+
 	/*no error and no init segment, go for media segment - this is needed for TS so that the set of media streams can be
 	declared to the player */
 	if (!base_init_url) {
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv);
 		if (e) {
 			gf_mx_v(dash->dl_mutex);
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media URL: %s\n", gf_error_to_string(e) ));
@@ -2117,6 +2671,10 @@
 		group->cached[0].url = gf_strdup(base_init_url);
 		group->cached[0].representation_index = group->active_rep_index;
 		group->prev_active_rep_index = group->active_rep_index;
+		if (key_url) {
+			group->cached[0].key_url = key_url;
+			memcpy(group->cached[0].key_IV, key_iv, sizeof(bin128));
+		}
 
 		group->nb_cached_segments = 1;
 		/*do not erase local files*/
@@ -2143,12 +2701,12 @@
 			u32 k;
 			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
 				char *a_base_init_url = NULL;
-				u64 a_start, a_end, a_dur;
+				u64 a_start = 0, a_end = 0, a_dur = 0;
 				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
 				if (a_rep==rep) continue;
 				if (a_rep->playback.disabled) continue;
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV);
 				if (!e && a_base_init_url) {
 					a_rep->playback.cached_init_segment_url = a_base_init_url;
 					a_rep->playback.init_start_range = a_start;
@@ -2168,10 +2726,11 @@
 	group->max_bitrate = 0;
 	group->min_bitrate = (u32)-1;
 	/*use persistent connection for segment downloads*/
-	e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), base_init_url, start_range, end_range, 1, group);
+	e = gf_dash_download_resource(dash, &(group->segment_download), base_init_url, start_range, end_range, 1, group);
 
 	if ((e==GF_OK) && group->force_switch_bandwidth && !dash->auto_switch_count) {
 		gf_free(base_init_url);
+		if (key_url) gf_free(key_url);
 		gf_dash_switch_group_representation(dash, group);
 		gf_mx_v(dash->dl_mutex);
 		return gf_dash_download_init_segment(dash, group);
@@ -2182,7 +2741,8 @@
 		/* It is possible that the first segment has been deleted while we made the first request...
 		 * so we try with the next segment on some M3U8 servers */
 		gf_free(base_init_url);
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+		if (key_url) gf_free(key_url);
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv);
 		if (e != GF_OK) {
 			gf_mx_v(dash->dl_mutex);
 			return e;
@@ -2190,7 +2750,7 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Download of first segment failed... retrying with second one : %s\n", base_init_url));
 		nb_segment_read = 2;
 		/*use persistent connection for segment downloads*/
-		e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), base_init_url, 0, 0, 1, group);
+		e = gf_dash_download_resource(dash, &(group->segment_download), base_init_url, 0, 0, 1, group);
 	} /* end of 404 */
 
 
@@ -2198,6 +2758,7 @@
 		group->download_abort_type = 0;
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", base_init_url));
 		gf_free(base_init_url);
+		if (key_url) gf_free(key_url);
 		return GF_OK;
 	}
 
@@ -2205,134 +2766,145 @@
 		dash->mpd_stop_request = 1;
 		gf_mx_v(dash->dl_mutex);
 		gf_free(base_init_url);
+		if (key_url) gf_free(key_url);
 		return e;
-	} else {
-		char mime[128];
-		const char *mime_type;
-		if (!group->nb_segments_in_rep) {
-			if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation, aborting\n"));
-				gf_free(base_init_url);
-				gf_mx_v(dash->dl_mutex);
-				return GF_BAD_PARAM;
-			}
-		} else if (group->nb_segments_in_rep < group->max_cached_segments) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resizing to %u max_cached_segments elements instead of %u.\n", group->nb_segments_in_rep, group->max_cached_segments));
-			/* OK, we have a problem, it may ends download */
-			group->max_cached_segments = group->nb_segments_in_rep;
-		}
-
-		/* Mime-Type check */
-		mime_type = dash->dash_io->get_mime(dash->dash_io, group->segment_download) ;
-		strcpy(mime, mime_type ? mime_type : "");
-		strlwr(mime);
-
-		if (dash->mimeTypeForM3U8Segments)
-			gf_free(dash->mimeTypeForM3U8Segments);
-		dash->mimeTypeForM3U8Segments = gf_strdup( mime );
-		mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-
-		if (!rep->mime_type) {
-			rep->mime_type = gf_strdup( mime_type ? mime_type : mime );
-			mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-		}
+	}
 
-		if (stricmp(mime, mime_type)) {
-			Bool valid = GF_FALSE;
-			char *stype1, *stype2;
-			stype1 = strchr(mime_type, '/');
-			stype2 = strchr(mime, '/');
-			if (stype1 && stype2 && !strcmp(stype1, stype2)) valid = 1;
-
-			if (!valid && 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Mime '%s' is not correct for '%s', it should be '%s'\n", mime, base_init_url, mime_type));
-				dash->mpd_stop_request = 0;
-				gf_mx_v(dash->dl_mutex);
-				gf_free(base_init_url);
-				base_init_url = NULL;
-				return GF_BAD_PARAM;
-			}
-		}
 
-		if (group->segment_must_be_streamed ) {
-			init_segment_local_url = (char *) dash->dash_io->get_url(dash->dash_io, group->segment_download);
-			e = GF_OK;
-		} else {
-			init_segment_local_url = (char *) dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
+	if (!group->nb_segments_in_rep) {
+		if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation, aborting\n"));
+			gf_free(base_init_url);
+			gf_mx_v(dash->dl_mutex);
+			if (key_url) gf_free(key_url);
+			return GF_BAD_PARAM;
 		}
+	} else if (!group->groups_depending_on && (group->nb_segments_in_rep < group->max_cached_segments)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resizing to %u max_cached_segments elements instead of %u.\n", group->nb_segments_in_rep, group->max_cached_segments));
+		/* OK, we have a problem, it may ends download */
+		group->max_cached_segments = group->nb_segments_in_rep;
+	}
+
+	/* Mime-Type check */
+	mime_type = dash->dash_io->get_mime(dash->dash_io, group->segment_download) ;
+	strcpy(mime, mime_type ? mime_type : "");
+	strlwr(mime);
+
+	if (dash->mimeTypeForM3U8Segments)
+		gf_free(dash->mimeTypeForM3U8Segments);
+	dash->mimeTypeForM3U8Segments = gf_strdup( mime );
+	mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
 
-		if ((e!=GF_OK) || !init_segment_local_url) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error with initialization segment: download result:%s, cache file: %s\n", gf_error_to_string(e), init_segment_local_url ? init_segment_local_url : "UNKNOWN"));
-			dash->mpd_stop_request = 1;
+	if (!rep->mime_type) {
+		rep->mime_type = gf_strdup( mime_type ? mime_type : mime );
+		mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
+	}
+	//disable mime type check
+#if 0
+	if (stricmp(mime, mime_type)) {
+		Bool valid = GF_FALSE;
+		char *stype1, *stype2;
+		stype1 = strchr(mime_type, '/');
+		stype2 = strchr(mime, '/');
+		if (stype1 && stype2 && !strcmp(stype1, stype2)) valid = 1;
+
+		if (!valid) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Mime '%s' is not correct for '%s', it should be '%s'\n", mime, base_init_url, mime_type));
+			dash->mpd_stop_request = 0;
 			gf_mx_v(dash->dl_mutex);
 			gf_free(base_init_url);
+			if (key_url) gf_free(key_url);
 			return GF_BAD_PARAM;
 		}
+	}
+#endif
 
-		assert(!group->nb_cached_segments);
-		group->cached[0].cache = gf_strdup(init_segment_local_url);
-		group->cached[0].url = gf_strdup( dash->dash_io->get_url(dash->dash_io, group->segment_download) );
-		group->cached[0].representation_index = group->active_rep_index;
-		group->cached[0].duration = (u32) group->current_downloaded_segment_duration;
-
-		if (group->bitstream_switching) {
-			group->bs_switching_init_segment_url = gf_strdup(init_segment_local_url);
-			group->bs_switching_init_segment_url_start_range = 0;
-			group->bs_switching_init_segment_url_end_range = 0;
-		} else {
-			rep->playback.cached_init_segment_url = gf_strdup(init_segment_local_url);
-			rep->playback.init_start_range = 0;
-			rep->playback.init_end_range = 0;
-		}
-
-		group->nb_cached_segments = 1;
-		group->download_segment_index += nb_segment_read;
-		gf_dash_update_buffering(group, dash);
+	if (group->segment_must_be_streamed ) {
+		init_segment_local_url = (char *) dash->dash_io->get_url(dash->dash_io, group->segment_download);
+		e = GF_OK;
+	} else {
+		init_segment_local_url = (char *) dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
+	}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adding initialization segment %s to cache: %s\n", init_segment_local_url, group->cached[0].url ));
+	if ((e!=GF_OK) || !init_segment_local_url) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error with initialization segment: download result:%s, cache file: %s\n", gf_error_to_string(e), init_segment_local_url ? init_segment_local_url : "UNKNOWN"));
+		dash->mpd_stop_request = 1;
 		gf_mx_v(dash->dl_mutex);
 		gf_free(base_init_url);
+		if (key_url) gf_free(key_url);
+		return GF_BAD_PARAM;
+	}
 
-		/*finally download all init segments if any*/
-		if (!group->bitstream_switching) {
-			u32 k;
-			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-				char *a_base_init_url = NULL;
-				u64 a_start, a_end, a_dur;
-				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
-				if (a_rep==rep) continue;
-				if (a_rep->playback.disabled) continue;
+	assert(!group->nb_cached_segments);
+	group->cached[0].cache = gf_strdup(init_segment_local_url);
+	group->cached[0].url = gf_strdup( dash->dash_io->get_url(dash->dash_io, group->segment_download) );
+	group->cached[0].representation_index = group->active_rep_index;
+	group->cached[0].duration = (u32) group->current_downloaded_segment_duration;
+
+	if (group->bitstream_switching) {
+		group->bs_switching_init_segment_url = gf_strdup(init_segment_local_url);
+		group->bs_switching_init_segment_url_start_range = 0;
+		group->bs_switching_init_segment_url_end_range = 0;
+	} else {
+		rep->playback.cached_init_segment_url = gf_strdup(init_segment_local_url);
+		rep->playback.init_start_range = 0;
+		rep->playback.init_end_range = 0;
+	}
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
-				if (!e && a_base_init_url) {
-					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), a_base_init_url, a_start, a_end, 1, group);
+	group->nb_cached_segments = 1;
+	group->download_segment_index += nb_segment_read;
+	gf_dash_update_buffering(group, dash);
 
-					if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
-						group->download_abort_type = 0;
-						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", a_base_init_url));
-						gf_free(a_base_init_url);
-						return GF_OK;
-					}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adding initialization segment %s to cache: %s\n", init_segment_local_url, group->cached[0].url ));
+	gf_mx_v(dash->dl_mutex);
+	gf_free(base_init_url);
+
+	/*download all init segments if any*/
+	if (!group->bitstream_switching) {
+		u32 k;
+		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+			char *a_base_init_url = NULL;
+			u64 a_start, a_end, a_dur;
+			GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
+			if (a_rep==rep) continue;
+			if (a_rep->playback.disabled) continue;
+
+			e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL, &a_rep->playback.key_url, &a_rep->playback.key_IV);
+			if (!e && a_base_init_url) {
+				e = gf_dash_download_resource(dash, &(group->segment_download), a_base_init_url, a_start, a_end, 1, group);
+
+				if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
+					group->download_abort_type = 0;
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading init segment (seek ?)%s \n", a_base_init_url));
 
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retrieve initialization segment %s for representation: %s - discarding representation\n", a_base_init_url, gf_error_to_string(e) ));
-						a_rep->playback.disabled = 1;
-					} else {
-						a_rep->playback.cached_init_segment_url = gf_strdup( dash->dash_io->get_cache_name(dash->dash_io, group->segment_download) );
-						a_rep->playback.init_start_range = 0;
-						a_rep->playback.init_end_range = 0;
-					}
 					gf_free(a_base_init_url);
-				} else if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
-					a_rep->playback.disabled = 1;
+					return GF_OK;
 				}
 
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retrieve initialization segment %s for representation: %s - discarding representation\n", a_base_init_url, gf_error_to_string(e) ));
+					a_rep->playback.disabled = 1;
+				} else {
+					a_rep->playback.cached_init_segment_url = gf_strdup( dash->dash_io->get_cache_name(dash->dash_io, group->segment_download) );
+					a_rep->playback.init_start_range = 0;
+					a_rep->playback.init_end_range = 0;
+				}
+				gf_free(a_base_init_url);
+			} else if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
+				a_rep->playback.disabled = 1;
 			}
+
 		}
+	}
 
-		return GF_OK;
+	/*if this was not an init segment, perform rate adaptation*/
+	if (nb_segment_read) {
+		dash_store_stats(dash, group, group->segment_download);
+		dash_do_rate_adaptation(dash, group);
 	}
+
+	return GF_OK;
 }
 
 static void gf_dash_skip_disabled_representation(GF_DASH_Group *group, GF_MPD_Representation *rep, Bool for_autoswitch)
@@ -2361,6 +2933,15 @@
 	gf_dash_set_group_representation(group, rep);
 }
 
+
+static void gf_dash_group_reset_cache_entry(segment_cache_entry *cached)
+{
+	gf_free(cached->cache);
+	gf_free(cached->url);
+	if (cached->key_url) gf_free(cached->key_url);
+	memset(cached, 0, sizeof(segment_cache_entry));
+}
+
 static void gf_dash_group_reset(GF_DashClient *dash, GF_DASH_Group *group)
 {
 	if (group->buffering) {
@@ -2382,8 +2963,7 @@
 		if (!dash->keep_files && !group->local_files)
 			gf_delete_file(group->cached[group->nb_cached_segments].cache);
 
-		gf_free(group->cached[group->nb_cached_segments].cache);
-		gf_free(group->cached[group->nb_cached_segments].url);
+		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 	}
 	group->timeline_setup = 0;
 }
@@ -2399,6 +2979,7 @@
 
 		gf_dash_group_reset(dash, group);
 
+		gf_list_del(group->groups_depending_on);
 		gf_free(group->cached);
 		if (group->service_mime)
 			gf_free(group->service_mime);
@@ -2406,6 +2987,14 @@
 	}
 	gf_list_del(dash->groups);
 	dash->groups = NULL;
+
+	while (gf_list_count(dash->groups)) {
+		struct _dash_srd_desc *srd = gf_list_last(dash->SRDs);
+		gf_list_rem_last(dash->groups);
+		gf_free(srd);
+	}
+	gf_list_del(dash->SRDs);
+	dash->SRDs = NULL;
 }
 
 static u32 gf_dash_get_start_number(GF_DASH_Group *group, GF_MPD_Representation *rep)
@@ -2421,6 +3010,56 @@
 	return 0;
 }
 
+static GF_MPD_Representation *gf_dash_find_rep(GF_DashClient *dash, const char *dependency_id, GF_DASH_Group **rep_group)
+{
+	u32 i, j, nb_groups, nb_reps;
+	GF_MPD_Representation *rep;
+
+	if (rep_group) *rep_group = NULL;
+
+	if (!dependency_id) return NULL;
+
+	nb_groups = gf_list_count(dash->groups);
+	for (i=0; i<nb_groups; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		nb_reps = gf_list_count(group->adaptation_set->representations);
+		for (j=0; j<nb_reps; j++) {
+			rep = gf_list_get(group->adaptation_set->representations, j);
+			if (rep->id && !strcmp(rep->id, dependency_id)) {
+				if (rep_group) *rep_group = group;
+				return rep;
+			}
+		}
+	}
+	return NULL;
+}
+
+static
+s32 gf_dash_group_get_dependency_group(GF_DashClient *dash, u32 idx)
+{
+	GF_MPD_Representation *rep;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return idx;
+
+	rep = gf_list_get(group->adaptation_set->representations, 0);
+
+	while (rep && rep->dependency_id) {
+		char *sep = strchr(rep->dependency_id, ' ');
+		if (sep) sep[0] = 0;
+		rep = gf_dash_find_rep(dash, rep->dependency_id, &group);
+		if (sep) sep[0] = ' ';
+	}
+	return gf_list_find(dash->groups, group);
+}
+
+GF_EXPORT
+Bool gf_dash_group_has_dependent_group(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return GF_FALSE;
+	return group->depend_on_group ? GF_TRUE : GF_FALSE;
+}
+
 /* create groups (implementation of adaptations set) */
 GF_Err gf_dash_setup_groups(GF_DashClient *dash)
 {
@@ -2465,7 +3104,7 @@
 		group->adaptation_set = set;
 		group->period = period;
 
-		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? 1 : 0;
+		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? GF_TRUE : GF_FALSE;
 
 		seg_dur = 0;
 		nb_dependant_rep = 0;
@@ -2477,6 +3116,11 @@
 			gf_dash_get_segment_duration(rep, set, period, dash->mpd, &nb_seg, &dur);
 			if (dur>seg_dur) seg_dur = dur;
 
+			if (group->bitstream_switching && (set->segment_base || period->segment_base || rep->segment_base) ) {
+				group->bitstream_switching = GF_FALSE;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] bitstreamSwitching set for onDemand content - ignoring flag\n"));
+			}
+
 			if (dash->dash_io->dash_codec_supported) {
 				Bool res = dash->dash_io->dash_codec_supported(dash->dash_io, rep->codecs, rep->width, rep->height, (rep->scan_type==GF_MPD_SCANTYPE_INTERLACED) ? 1 : 0, rep->framerate ? rep->framerate->num : 0, rep->framerate ? rep->framerate->den : 0, rep->samplerate);
 				if (!res) {
@@ -2598,12 +3242,14 @@
 
 			group->max_buffer_segments = group->max_cached_segments;
 
+#if 0
 			/*unless we are in low latency modes*/
 			if (dash->max_cache_duration>1000) {
 				/*we need one more entry in cache for segment being currently played*/
 				if (group->max_cached_segments<3)
 					group->max_cached_segments ++;
 			}
+#endif
 			group->max_cached_segments *= (nb_dependant_rep+1);
 			group->max_buffer_segments *= (nb_dependant_rep+1);
 		}
@@ -2624,6 +3270,42 @@
 			return e;
 		}
 	}
+
+
+	count = gf_list_count(dash->groups);
+	for (i=0; i<count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		u32 j = gf_dash_group_get_dependency_group(dash, i);
+		if (i != j) {
+			GF_DASH_Group *base_group = gf_list_get(dash->groups, j);
+			assert(base_group);
+			group->depend_on_group = base_group;
+			if (!base_group->groups_depending_on) {
+				base_group->groups_depending_on = gf_list_new();
+			}
+			gf_list_add(base_group->groups_depending_on, group);
+		}
+	}
+
+	for (i=0; i<count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		if (group->groups_depending_on) {
+			u32 nb_dep_groups = gf_list_count(group->groups_depending_on);
+			//all dependent groups will be stored in the base group
+			group->max_cached_segments *= (1+nb_dep_groups);
+			group->max_buffer_segments *= (1+nb_dep_groups);
+			group->cached = gf_realloc(group->cached, sizeof(segment_cache_entry)*group->max_cached_segments);
+			memset(group->cached, 0, sizeof(segment_cache_entry)*group->max_cached_segments);
+
+			for (j=0; j<nb_dep_groups; j++) {
+				GF_DASH_Group *dep_group = gf_list_get(group->groups_depending_on, j);
+				gf_free(dep_group->cached);
+				dep_group->cached = NULL;
+				dep_group->max_cached_segments = 0;
+			}
+		}
+	}
+
 	return GF_OK;
 }
 
@@ -2699,7 +3381,7 @@
 		}
 		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
 	} else {
-		FILE *f = gf_f64_open(cache_name, "rb");
+		FILE *f = gf_fopen(cache_name, "rb");
 		if (!f) return GF_IO_ERR;
 		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
 	}
@@ -2723,7 +3405,7 @@
 		break;
 	}
 	gf_bs_del(bs);
-	if (f) fclose(f);
+	if (f) gf_fclose(f);
 	return e;
 }
 
@@ -2738,14 +3420,14 @@
 		}
 		if (offset+8 > size)
 			return GF_IO_ERR;
-		mem_address+=offset;
+		mem_address += offset;
 		*box_size = GF_4CC(mem_address[0], mem_address[1], mem_address[2], mem_address[3]);
 		*box_type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
 	} else {
 		unsigned char data[4];
-		FILE *f = gf_f64_open(cache_name, "rb");
+		FILE *f = gf_fopen(cache_name, "rb");
 		if (!f) return GF_IO_ERR;
-		if (gf_f64_seek(f, offset, SEEK_SET))
+		if (gf_fseek(f, offset, SEEK_SET))
 			return GF_IO_ERR;
 		if (fread(data, 1, 4, f) == 4) {
 			*box_size = GF_4CC(data[0], data[1], data[2], data[3]);
@@ -2753,7 +3435,7 @@
 				*box_type = GF_4CC(data[0], data[1], data[2], data[3]);
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 	}
 	return GF_OK;
 }
@@ -2772,7 +3454,7 @@
 	/*OK we are in single-file mode, download all required indexes & co*/
 	for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
 		char *sidx_file = NULL;
-		u64 duration, index_start_range, index_end_range, init_start_range, init_end_range;
+		u64 duration, index_start_range = 0, index_end_range = 0, init_start_range, init_end_range;
 		Bool index_in_base, init_in_base;
 		Bool init_needs_byte_range = GF_FALSE;
 		Bool has_seen_sidx = GF_FALSE;
@@ -2780,10 +3462,10 @@
 		rep = gf_list_get(group->adaptation_set->representations, i);
 
 		index_in_base = init_in_base = GF_FALSE;
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base);
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base, NULL, NULL);
 		if (e) goto exit;
 
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base);
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base, NULL, NULL);
 		if (e) goto exit;
 
 
@@ -2795,6 +3477,7 @@
 				if (init_in_base) {
 					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
 					rep->segment_list->initialization_segment->sourceURL = gf_strdup(init_url);
+					rep->segment_list->initialization_segment->is_resolved = GF_TRUE;
 					/*we don't want to load the entire movie */
 					init_needs_byte_range = 1;
 				}
@@ -2805,41 +3488,51 @@
 			/*we need to download the init segement, at least partially*/
 			else {
 				u32 offset = 0;
-				u32 box_type=0;
-				u32 box_size=0;
+				u32 box_type = 0;
+				u32 box_size = 0;
 				const char *cache_name;
 
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloading init segment and SIDX for representation %s\n", init_url));
 
 				/*download first 8 bytes and check if we do have a box starting there*/
-				e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, 7, 1, group);
+				e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, 7, 1, group);
 				if (e) goto exit;
 				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
 				e = dash_load_box_type(cache_name, offset, &box_type, &box_size);
-				offset=8;
+				offset = 8;
 				while (box_type) {
-					/*we got the moov , stop here */
+					/*we got the moov, stop here */
 					if (!index_in_base && (box_type==GF_4CC('m','o','o','v'))) {
-						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-8, 2, group);
+						e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, offset+box_size-9, 2, group);
 						break;
 					} else {
-						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-1, 2, group);
+						const u32 offset_ori = offset;
+						e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, offset+box_size-1, 2, group);
 						offset += box_size;
 						/*we need to refresh the cache name because of our memory astorage thing ...*/
 						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
 						e = dash_load_box_type(cache_name, offset-8, &box_type, &box_size);
+						if (e == GF_IO_ERR) {
+							/*if the socket was closed then gf_dash_download_resource() with gmem:// was reset - retry*/
+							e = dash_load_box_type(cache_name, offset-offset_ori-8, &box_type, &box_size);
+							if (box_type == GF_4CC('s','i','d','x')) {
+								offset -= 8;
+								/*FIXME sidx found, reload the full resource*/
+								GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] have to re-downloading init and SIDX for rep %s\n", init_url));
+								e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, 0, offset+box_size-1, 2, group);
+								break;
+							}
+						}
 
-						if (box_type==GF_4CC('s','i','d','x'))
+						if (box_type == GF_4CC('s','i','d','x'))
 							has_seen_sidx = 1;
 						else if (has_seen_sidx)
 							break;
-
-
 					}
 				}
-				if (e<0) goto exit;
+				if (e < 0) goto exit;
 
-				if (box_type==0) {
+				if (box_type == 0) {
 					e = GF_ISOM_INVALID_FILE;
 					goto exit;
 				}
@@ -2864,12 +3557,13 @@
 
 						sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
 						rep->segment_list->initialization_segment->sourceURL = gf_strdup(szName);
+						rep->segment_list->initialization_segment->is_resolved = GF_TRUE;
 					} else {
-						FILE *t = fopen(cache_name, "rb");
+						FILE *t = gf_fopen(cache_name, "rb");
 						if (t) {
 							u32 res;
 							fseek(t, 0, SEEK_END);
-							rep->playback.init_segment_size = ftell(t);
+							rep->playback.init_segment_size = (u32) gf_ftell(t);
 							fseek(t, 0, SEEK_SET);
 
 							rep->playback.init_segment_data = gf_malloc(sizeof(char) * rep->playback.init_segment_size);
@@ -2879,6 +3573,7 @@
 							} else {
 								sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
 								rep->segment_list->initialization_segment->sourceURL = gf_strdup(szName);
+								rep->segment_list->initialization_segment->is_resolved = GF_TRUE;
 							}
 						}
 					}
@@ -2895,7 +3590,7 @@
 		}
 		/*we have index url, download it*/
 		if (! index_in_base) {
-			e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), index_url, index_start_range, index_end_range, 1, group);
+			e = gf_dash_download_resource(group->dash, &(group->segment_download), index_url, index_start_range, index_end_range, 1, group);
 			if (e) goto exit;
 			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
 		}
@@ -2934,7 +3629,9 @@
 {
 	u32 count, i;
 	GF_Err e;
+	Bool is_local=GF_FALSE;
 	const char *local_url;
+	char *url;
 	GF_DOMParser *parser;
 	GF_MPD *new_mpd;
 	GF_MPD_Period *period;
@@ -2957,22 +3654,38 @@
 		return;
 	}
 
-	/*use non-persistent connection for MPD*/
-	e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), period->xlink_href, 0, 0, 0, NULL);
+	//xlink relative to our MPD base URL
+	url = gf_url_concatenate(dash->base_url, period->xlink_href);
+
+	if (!strstr(url, "://") || !strnicmp(url, "file://", 7) ) {
+		local_url = url;
+		is_local=GF_TRUE;
+		e = GF_OK;
+	} else {
+		/*use non-persistent connection for MPD*/
+		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), url ? url : period->xlink_href, 0, 0, 0, NULL);
+
+		gf_free(url);
+	}
+
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot download xlink periods: error %s\n", gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot download xlink from periods %s: error %s\n", period->xlink_href, gf_error_to_string(e)));
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
 		gf_mx_v(dash->dl_mutex);
 		return;
 	}
 
-	/*in case the session has been restarted, local_url may have been destroyed - get it back*/
-	local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
+	if (!is_local) {
+		/*in case the session has been restarted, local_url may have been destroyed - get it back*/
+		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
+	}
 
 	/* parse the MPD */
 	parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(parser, local_url, NULL, NULL);
+	if (is_local) gf_free(url);
+
 	if (e != GF_OK) {
 		gf_xml_dom_del(parser);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot parse xlink periods: error in XML parsing %s\n", gf_error_to_string(e)));
@@ -3024,10 +3737,92 @@
 
 }
 
+static u32 gf_dash_get_tiles_quality_rank(GF_DashClient *dash, GF_DASH_Group *tile_group)
+{
+	s32 res, res2;
+	struct _dash_srd_desc *srd = tile_group->srd_desc;
+	//no SRD is max quality for now
+	if (!srd) return 0;
+
+	switch (dash->tile_adapt_mode) {
+	case GF_DASH_ADAPT_TILE_NONE:
+		return 0;
+	case GF_DASH_ADAPT_TILE_ROWS:
+		return tile_group->srd_row_idx;
+	case GF_DASH_ADAPT_TILE_ROWS_REVERSE:
+		return srd->srd_nb_rows - 1 - tile_group->srd_row_idx;
+	case GF_DASH_ADAPT_TILE_ROWS_MIDDLE:
+		res = srd->srd_nb_rows/2;
+		res -= tile_group->srd_row_idx;
+		return ABS(res);
+	case GF_DASH_ADAPT_TILE_COLUMNS:
+		return tile_group->srd_col_idx;
+	case GF_DASH_ADAPT_TILE_COLUMNS_REVERSE:
+		return srd->srd_nb_cols - 1 - tile_group->srd_col_idx;
+	case GF_DASH_ADAPT_TILE_COLUMNS_MIDDLE:
+		res = srd->srd_nb_cols/2;
+		res -= tile_group->srd_col_idx;
+		return ABS(res);
+	case GF_DASH_ADAPT_TILE_CENTER:
+		res = srd->srd_nb_rows/2 - tile_group->srd_row_idx;
+		res2 = srd->srd_nb_cols/2 - tile_group->srd_col_idx;
+		return MAX( ABS(res), ABS(res2) );
+	case GF_DASH_ADAPT_TILE_EDGES:
+		res = srd->srd_nb_rows/2 - tile_group->srd_row_idx;
+		res = srd->srd_nb_rows/2 - ABS(res);
+		res2 = srd->srd_nb_cols/2 - tile_group->srd_col_idx;
+		res2 = srd->srd_nb_cols/2 - ABS(res2);
+		return MIN( res, res2 );
+	}
+	return 0;
+}
+
+//used upon startup of the session only
+static void gf_dash_set_tiles_quality(GF_DashClient *dash, struct _dash_srd_desc *srd)
+{
+	u32 i, count;
+	Bool tiles_use_lowest = (dash->first_select_mode==GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES) ? GF_TRUE : GF_FALSE;
+
+	count = gf_list_count(dash->groups);
+	for (i=0; i<count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		u32 lower_quality;
+		if (group->srd_desc != srd) continue;
+
+		lower_quality = gf_dash_get_tiles_quality_rank(dash, group);
+		if (!lower_quality) continue;
+
+		if (tiles_use_lowest && (group->active_rep_index >= lower_quality)) {
+			lower_quality = group->active_rep_index - lower_quality;
+		} else {
+			lower_quality = 0;
+		}
+		gf_dash_set_group_representation(group,
+		 gf_list_get(group->adaptation_set->representations, lower_quality) );
+	}
+}
+
+static struct _dash_srd_desc *gf_dash_get_srd_desc(GF_DashClient *dash, u32 srd_id, Bool do_create)
+{
+	u32 i, count;
+	struct _dash_srd_desc *srd;
+	count = dash->SRDs ? gf_list_count(dash->SRDs) : 0;
+	for (i=0; i<count; i++) {
+		struct _dash_srd_desc *srd = gf_list_get(dash->SRDs, i);
+		if (srd->id==srd_id) return srd;
+	}
+	if (!do_create) return NULL;
+	GF_SAFEALLOC(srd, struct _dash_srd_desc);
+	srd->id = srd_id;
+	if (!dash->SRDs) dash->SRDs = gf_list_new();
+	gf_list_add(dash->SRDs, srd);
+	return srd;
+}
+
 static GF_Err gf_dash_setup_period(GF_DashClient *dash)
 {
 	GF_MPD_Period *period;
-	u32 rep_i, group_i, j, nb_groups_ok;
+	u32 rep_i, as_i, group_i, j, nb_groups_ok;
 	u32 retry = 10;
 
 	//solve xlink - if
@@ -3043,15 +3838,33 @@
 		return GF_NOT_SUPPORTED;
 	}
 
+	/*we are not able to process webm dash (youtube)*/
+	j = gf_list_count(period->adaptation_sets);
+	for (as_i=0; as_i<j; as_i++) {
+		GF_MPD_AdaptationSet *set = (GF_MPD_AdaptationSet*)gf_list_get(period->adaptation_sets, as_i);
+		if (set->mime_type && strstr(set->mime_type, "webm")) {
+			u32 k;
+			for (k=0; k<gf_list_count(set->representations); ++k) {
+				GF_MPD_Representation *rep = (GF_MPD_Representation*)gf_list_get(set->representations, k);
+				rep->playback.disabled = GF_TRUE;
+			}
+		}
+	}
+
 	/*setup all groups*/
 	gf_dash_setup_groups(dash);
 
+	if (dash->debug_group_index>=0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Debuging adaptation set #%d in period, ignoring other ones!\n\n", dash->debug_group_index + 1));
+	}
+
 	nb_groups_ok = 0;
 	for (group_i=0; group_i<gf_list_count(dash->groups); group_i++) {
 		GF_MPD_Representation *rep_sel;
 		u32 active_rep, nb_rep;
 		const char *mime_type;
 		u32 nb_rep_ok = 0;
+		Bool group_has_video = GF_FALSE;
 		Bool disabled = GF_FALSE;
 		Bool cp_supported = GF_FALSE;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
@@ -3074,10 +3887,22 @@
 
 		for (j=0; j<gf_list_count(group->adaptation_set->essential_properties); j++) {
 			GF_MPD_Descriptor *mpd_desc = gf_list_get(group->adaptation_set->essential_properties, j);
-			//we don't know any defined scheme for now
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with unrecognized EssentialProperty %s - ignoring because not supported\n", mpd_desc->scheme_id_uri));
-			disabled = 1;
-			break;
+			if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:srd:2014")) {
+				u32 id, w, h, res;
+				res = sscanf(mpd_desc->value, "%d,%d,%d,%d,%d,%d,%d", &id, &group->srd_x, &group->srd_y, &group->srd_w, &group->srd_h, &w, &h);
+				if (res != 7) {
+					res = sscanf(mpd_desc->value, "%d,%d,%d,%d,%d", &id, &group->srd_x, &group->srd_y, &group->srd_w, &group->srd_h);
+				}
+				if (res) {
+					group->srd_desc = gf_dash_get_srd_desc(dash, id, GF_TRUE);
+				}
+
+			} else {
+				//we don't know any defined scheme for now
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with unrecognized EssentialProperty %s - ignoring because not supported\n", mpd_desc->scheme_id_uri));
+				disabled = 1;
+				break;
+			}
 		}
 		if (disabled) {
 			continue;
@@ -3100,17 +3925,62 @@
 			continue;
 		}
 
+		for (j=0; j<gf_list_count(group->adaptation_set->supplemental_properties); j++) {
+			GF_MPD_Descriptor *mpd_desc = gf_list_get(group->adaptation_set->supplemental_properties, j);
+			if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:srd:2014")) {
+				u32 id, w, h, res;
+				res = sscanf(mpd_desc->value, "%d,%d,%d,%d,%d,%d,%d", &id, &group->srd_x, &group->srd_y, &group->srd_w, &group->srd_h, &w, &h);
+				if (res != 7) {
+					res = sscanf(mpd_desc->value, "%d,%d,%d,%d,%d", &id, &group->srd_x, &group->srd_y, &group->srd_w, &group->srd_h);
+				}
+				if (res) {
+					group->srd_desc = gf_dash_get_srd_desc(dash, id, GF_TRUE);
+				}
+			}
+		}
 
 		/*translate from single-indexed file to SegmentList*/
 		gf_dash_setup_single_index_mode(group);
 
 		/* Select the appropriate representation in the given period */
+		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
+			if (rep->width && rep->height) group_has_video = GF_TRUE;
+		}
+
+		//sort by bandwidth and quality
+		for (rep_i = 1; rep_i < nb_rep; rep_i++) {
+			Bool swap=GF_FALSE;
+			GF_MPD_Representation *r2 = gf_list_get(group->adaptation_set->representations, rep_i);
+			GF_MPD_Representation *r1 = gf_list_get(group->adaptation_set->representations, rep_i-1);
+			if (r1->bandwidth > r2->bandwidth) {
+				swap=GF_TRUE;
+			} else if ((r1->bandwidth == r2->bandwidth) && (r1->quality_ranking<r2->quality_ranking)) {
+				swap=GF_TRUE;
+			}
+			if (swap) {
+				gf_list_rem(group->adaptation_set->representations, rep_i);
+				gf_list_insert(group->adaptation_set->representations, r2, rep_i-1);
+				rep_i=0;
+			}
+		}
+
 		group->min_representation_bitrate = (u32) -1;
 		active_rep = 0;
 		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
 			rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
 
+			if (group_has_video && !rep->width && !rep->height) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Adaptation %s: non-video in a video group - disabling it\n", rep->id));
+				rep->playback.disabled = 1;
+				continue;
+			}
+
+			if (group_has_video && !rep_sel->width && !rep_sel->height && rep->width && rep->height) {
+				rep_sel = rep;
+			}
+
 			if (rep->bandwidth < group->min_representation_bitrate) {
 				group->min_representation_bitrate = rep->bandwidth;
 			}
@@ -3129,7 +3999,7 @@
 						//rep->playback.disabled = 1;
 						//continue;
 					}
-					if (rep->segment_list && rep->segment_list->xlink_href) {
+					if (!dash->is_m3u8 && rep->segment_list && rep->segment_list->xlink_href) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation SegmentList uses xlink:href to %s - disabling because not supported\n", rep->segment_list->xlink_href));
 						rep->playback.disabled = 1;
 						continue;
@@ -3144,8 +4014,10 @@
 					break;
 				}/*fallthrough if quality is not indicated*/
 			case GF_DASH_SELECT_BANDWIDTH_LOWEST:
-				if (rep->bandwidth < rep_sel->bandwidth) {
-					active_rep = rep_i;
+				if ((rep->width&&rep->height) || !group_has_video) {
+					if (rep->bandwidth < rep_sel->bandwidth) {
+						active_rep = rep_i;
+					}
 				}
 				break;
 			case GF_DASH_SELECT_QUALITY_HIGHEST:
@@ -3206,6 +4078,74 @@
 	}
 	dash->start_range_period = 0;
 
+	//setup SRDs
+	for (as_i = 0; as_i<gf_list_count(dash->SRDs); as_i++) {
+		u32 cols[10], rows[10];
+		struct _dash_srd_desc *srd = gf_list_get(dash->SRDs, as_i);
+
+		srd->srd_nb_rows = srd->srd_nb_cols = 0;
+
+		//sort SRDs
+		for (j=1; j < gf_list_count(dash->groups); j++) {
+			GF_DASH_Group *dg2 = gf_list_get(dash->groups, j);
+			GF_DASH_Group *dg1 = gf_list_get(dash->groups, j-1);
+			u32 dg1_weight = dg1->srd_y << 16 | dg1->srd_x;
+			u32 dg2_weight = dg2->srd_y << 16 | dg2->srd_x;
+
+			if (dg1->srd_desc != srd) continue;
+			if (dg2->srd_desc != srd) continue;
+
+			if (dg1_weight > dg2_weight) {
+				gf_list_rem(dash->groups, j);
+				gf_list_insert(dash->groups, dg2, j-1);
+				j=0;
+			}
+		}
+
+		//groups are now sorted for this srd, locate col/row positions
+		for (group_i=0; group_i<gf_list_count(dash->groups); group_i++) {
+			u32 k;
+			Bool found = GF_FALSE;
+			GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
+			if (group->srd_desc != srd) continue;
+
+			for (k=0; k<srd->srd_nb_cols; k++) {
+				if (cols[k]==group->srd_x) {
+					found=GF_TRUE;
+					break;
+				}
+			}
+			if (!found) {
+				cols[srd->srd_nb_cols] = group->srd_x;
+				group->srd_col_idx = srd->srd_nb_cols;
+				srd->srd_nb_cols++;
+
+				srd->width += group->adaptation_set->max_width;
+
+			} else {
+				group->srd_col_idx = k;
+			}
+
+			found = GF_FALSE;
+			for (k=0; k<srd->srd_nb_rows; k++) {
+				if (rows[k]==group->srd_y) {
+					found=GF_TRUE;
+					break;
+				}
+			}
+			if (!found) {
+				rows[srd->srd_nb_rows] = group->srd_y;
+				group->srd_row_idx = srd->srd_nb_rows;
+				srd->srd_nb_rows++;
+				srd->height += group->adaptation_set->max_height;
+			} else {
+				group->srd_row_idx = k;
+			}
+
+		}
+		gf_dash_set_tiles_quality(dash, srd);
+	}
+
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
 
 	if (period->segment_base) {
@@ -3227,154 +4167,646 @@
 	return 0;
 }
 
-static void dash_do_rate_adaptation(GF_DashClient *dash, GF_DASH_Group *group, GF_MPD_Representation *rep)
+
+static void gf_dash_group_check_time(GF_DASH_Group *group)
 {
-	Double bitrate, time, speed;
-	u32 k, dl_rate;
-	Bool go_up = GF_FALSE;
-	u32 nb_inter_rep = 0;
-	GF_MPD_Representation *new_rep;
-	u32 total_size, bytes_per_sec;
+	s64 check_time;
+	u32 nb_dropped;
 
-	if (group->dash->disable_switching) return;
+	if (group->dash->is_m3u8) return;
+	if (! group->timeline_setup) return;
 
-	total_size = dash->dash_io->get_total_size(dash->dash_io, group->segment_download);
-	bytes_per_sec = dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download);
-	group->last_segment_time = gf_sys_clock();
+	check_time = (s64) gf_net_get_utc();
+	nb_dropped = 0;
 
-	if (/*(!group->buffering || !group->min_bandwidth_selected) && */ total_size && bytes_per_sec && group->current_downloaded_segment_duration) {
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %s %d bytes at %d bytes per seconds - skipping rate adaptation\n", dash->dash_io->get_url(dash->dash_io, group->segment_download), total_size, bytes_per_sec));
+	while (1) {
+		u32 seg_dur_ms;
+		u64 seg_ast = gf_dash_get_segment_availability_start_time(group->dash->mpd, group, group->download_segment_index, &seg_dur_ms);
+
+		s64 now = check_time + (s64) seg_dur_ms;
+		if (now <= (s64) seg_ast) {
+			group->dash->tsb_exceeded = (u32) -1;
+			return;
+		}
+
+		now -= (s64) seg_ast;
+		if (now <= (s64) seg_dur_ms) {
+			group->dash->tsb_exceeded = (u32) -1;
+			return;
+		}
+		if (((s32) group->time_shift_buffer_depth > 0) && (now > group->time_shift_buffer_depth)) {
+			group->download_segment_index ++;
+			nb_dropped ++;
+			group->dash->time_in_tsb = 0;
+			continue;
+		}
+
+		if (nb_dropped > group->dash->tsb_exceeded) {
+			group->dash->tsb_exceeded = nb_dropped;
+		}
+
+		now -= group->dash->user_buffer_ms;
+		if (now<0) return;
+
+		if (now>group->dash->time_in_tsb)
+			group->dash->time_in_tsb = (u32) now;
 		return;
 	}
+}
 
-	bitrate = 8*total_size;
-	bitrate /= group->current_downloaded_segment_duration;
-	time = total_size;
-	time /= bytes_per_sec;
+typedef enum
+{
+	GF_DASH_DownloadCancel,
+	GF_DASH_DownloadRestart,
+	GF_DASH_DownloadSuccess,
+} DownloadGroupStatus;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %s %d bytes in %g seconds - duration %g sec - Bandwidth (kbps): indicated %d - computed %d - download %d\n", dash->dash_io->get_url(dash->dash_io, group->segment_download), total_size, time, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, 8*bytes_per_sec/1000));
+static DownloadGroupStatus dash_download_group_download(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group, Bool has_dep_following)
+{
+	//commented out as we end up doing too many requets
+	GF_Err e;
+	GF_MPD_Representation *rep;
+	u32 group_count;
+	u32 min_wait = 0;
+	char *new_base_seg_url;
+	char *key_url=NULL;
+	bin128 key_iv;
+	u64 start_range, end_range;
+	Bool use_byterange;
+	u32 representation_index;
+	u32 clock_time;
+	Bool empty_file = GF_FALSE;
+	const char *local_file_name = NULL;
+	const char *resource_name = NULL;
 
-	//adjust the download rate according to the playback speed
-	speed = dash->speed;
-	if (speed<0) speed = -speed;
-	dl_rate = (u32) (8*bytes_per_sec / speed);
+	if (group->done) return GF_DASH_DownloadSuccess;
 
-	if (rep->bandwidth < dl_rate) {
-		go_up = 1;
+	if (group->selection != GF_DASH_GROUP_SELECTED) return GF_DASH_DownloadSuccess;
+
+	if (base_group->nb_cached_segments>=base_group->max_cached_segments) {
+//		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Cache is full for this group - skipping\n", gf_sys_clock() ));
+		return GF_DASH_DownloadCancel;
 	}
-	if (dl_rate < group->min_representation_bitrate)
-		dl_rate = group->min_representation_bitrate;
 
-	/*find best bandwidth that fits our bitrate*/
-	new_rep = NULL;
+	/*remember the active rep index, since group->active_rep_index may change because of bandwidth control algorithm*/
+	representation_index = group->active_rep_index;
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 
-	for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-		GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
-		if (arep->playback.disabled) continue;
+	/* if the index of the segment to be downloaded is greater or equal to the last segment (as seen in the playlist),
+	 we need to check if a new playlist is ready */
+	if (group->nb_segments_in_rep && (group->download_segment_index >= (s32) group->nb_segments_in_rep)) {
+		u32 timer = gf_sys_clock() - dash->last_update_time;
+		Bool update_playlist = 0;
+
+		/* this period is done*/
+		if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
+		}
+		/* update of the playlist, only if indicated */
+		else if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
+			update_playlist = 1;
+		}
+		/* if media_presentation_duration is 0 and we are in live, force a refresh (not in the spec but safety check*/
+		else if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->mpd->media_presentation_duration) {
+			if (group->segment_duration && (timer > group->segment_duration*1000))
+				update_playlist = 1;
+		}
+		if (update_playlist) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in current playlist downloaded, checking updates after %u ms\n", timer));
+			e = gf_dash_update_manifest(dash);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
+			}
+			group_count = gf_list_count(dash->groups);
+			rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+		} else {
+			gf_sleep(1);
+		}
+		/* Now that the playlist is up to date, we can check again */
+		if (group->download_segment_index >= (s32) group->nb_segments_in_rep) {
+			/* if there is a specified update period, we redo the whole process */
+			if (dash->mpd->minimum_update_period || dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
+
+				if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in period (dynamic mode) - group is done\n"));
+					group->done = 1;
+					return GF_DASH_DownloadCancel;
+				}
+				else if (! group->maybe_end_of_stream) {
+					u32 now = gf_sys_clock();
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of segment list reached (%d segments but idx is %d), waiting for next MPD update\n", group->nb_segments_in_rep, group->download_segment_index));
+					if (group->nb_cached_segments) {
+						if (dash->is_m3u8 && (group->nb_cached_segments <= 1)) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] There is only %d segment in cache, force MPD update\n", group->nb_cached_segments));
+							dash->force_mpd_update = GF_TRUE;
+						}
+						return GF_DASH_DownloadCancel;
+					}
 
-		if (dl_rate >= arep->bandwidth) {
-			if (!new_rep) new_rep = arep;
-			else if (go_up) {
-				/*try to switch to highest bitrate below available download rate*/
-				if (arep->bandwidth > new_rep->bandwidth) {
-					if (new_rep->bandwidth > rep->bandwidth) {
-						nb_inter_rep ++;
+					if (!group->time_at_first_reload_required) {
+						group->time_at_first_reload_required = now;
+						return GF_DASH_DownloadCancel;
 					}
-					new_rep = arep;
-				} else if (arep->bandwidth > rep->bandwidth) {
-					nb_inter_rep ++;
+					if (now - group->time_at_first_reload_required < group->cache_duration)
+						return GF_DASH_DownloadCancel;
+					if (dash->mpd->minimum_update_period && (now - group->time_at_first_reload_required < dash->mpd->minimum_update_period))
+						return GF_DASH_DownloadCancel;
+
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment list has not been updated for more than %d ms - assuming end of period\n", now - group->time_at_first_reload_required));
+					group->done = 1;
+					return GF_DASH_DownloadCancel;
 				}
 			} else {
-				/*try to switch to highest bitrate below available download rate*/
-				if (arep->bandwidth > new_rep->bandwidth) {
-					new_rep = arep;
+				/* if not, we are really at the end of the playlist, we can quit */
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of period reached for group\n"));
+				group->done = 1;
+				return GF_DASH_DownloadCancel;
+			}
+		}
+	}
+	group->time_at_first_reload_required = 0;
+	gf_mx_p(dash->dl_mutex);
+
+	if (group->force_switch_bandwidth && !dash->auto_switch_count) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Forcing representation switch, retesting group"));
+		gf_dash_switch_group_representation(dash, group);
+		gf_mx_v(dash->dl_mutex);
+		/*restart*/
+		return GF_DASH_DownloadRestart;
+	}
+
+	/*check availablity start time of segment in Live !!*/
+	if (!group->broken_timing && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
+		s32 to_wait = 0;
+		u32 seg_dur_ms=0;
+#ifndef GPAC_DISABLE_LOG
+		u32 start_number = gf_dash_get_start_number(group, rep);
+#endif
+		s64 segment_ast = (s64) gf_dash_get_segment_availability_start_time(dash->mpd, group, group->download_segment_index, &seg_dur_ms);
+		s64 now = (s64) gf_net_get_utc();
+
+
+		if (group->retry_after_utc > (u64) now) {
+			min_wait = (u32) (group->retry_after_utc - (u64) now);
+			gf_mx_v(dash->dl_mutex);
+			return GF_DASH_DownloadCancel;
+		}
+
+		clock_time = gf_sys_clock();
+		to_wait = (s32) (segment_ast - now);
+
+		/*if segment AST is greater than now, it is not yet available - we would need an estimate on how long the request takes to be sent to the server in order to be more reactive ...*/
+		if (to_wait > 1) {
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) is not yet available on server - requesting later in %d ms\n", 1+gf_list_find(dash->groups, group), gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init)/1000.0, to_wait));
+			if (group->last_segment_time) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
+			}
+			gf_mx_v(dash->dl_mutex);
+			if (!min_wait || ((u32) to_wait < min_wait))
+				min_wait = to_wait;
+
+			return GF_DASH_DownloadCancel;
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) should now be available on server since %d ms - requesting it\n", 1+gf_list_find(dash->groups, group), gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init)/1000.0, -to_wait));
+
+			if (group->last_segment_time) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
+			}
+#if 0
+			/*check if we are in the segment availability end time*/
+			if (now < segment_ast + seg_dur_ms + group->time_shift_buffer_depth )
+				in_segment_avail_time = 1;
+#endif
+		}
+	}
+	min_wait = 0;
+
+
+	/* At this stage, there are some segments left to be downloaded */
+	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv);
+	gf_mx_v(dash->dl_mutex);
+	if (e) {
+		/*do something!!*/
+		return GF_DASH_DownloadCancel;
+	}
+	use_byterange = (start_range || end_range) ? 1 : 0;
+
+	if (use_byterange) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading new segment: %s (range: "LLD"-"LLD")\n", new_base_seg_url, start_range, end_range));
+	}
+
+	/*local file*/
+	if (!strstr(new_base_seg_url, "://") || (!strnicmp(new_base_seg_url, "file://", 7) || !strnicmp(new_base_seg_url, "gmem://", 7)) ) {
+		resource_name = local_file_name = (char *) new_base_seg_url;
+		e = GF_OK;
+		/*do not erase local files*/
+		group->local_files = 1;
+		gf_dash_buffer_off(group);
+		if (group->force_switch_bandwidth && !dash->auto_switch_count) {
+			gf_dash_switch_group_representation(dash, group);
+			/*restart*/
+			return GF_DASH_DownloadRestart;
+		}
+	} else {
+		base_group->max_bitrate = 0;
+		base_group->min_bitrate = (u32)-1;
+
+		/*use persistent connection for segment downloads*/
+		//gf_mx_p(dash->dl_mutex);
+		if (use_byterange) {
+			e = gf_dash_download_resource(dash, &(base_group->segment_download), new_base_seg_url, start_range, end_range, 1, base_group);
+		} else {
+			e = gf_dash_download_resource(dash, &(base_group->segment_download), new_base_seg_url, 0, 0, 1, base_group);
+		}
+		//gf_mx_v(dash->dl_mutex);
+
+		if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
+			base_group->download_abort_type = 0;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading segment (seek ?)%s \n", new_base_seg_url));
+			gf_free(new_base_seg_url);
+			gf_free(key_url);
+			new_base_seg_url = NULL;
+			key_url = NULL;
+			return GF_DASH_DownloadSuccess;
+		}
+
+
+		/*TODO decide what is the best, fetch from another representation or ignore ...*/
+		if (e != GF_OK) {
+			clock_time = gf_sys_clock();
+			min_wait = dash->min_timeout_between_404;
+			group->retry_after_utc = min_wait + gf_net_get_utc();
+
+			if (group->maybe_end_of_stream) {
+				if (group->maybe_end_of_stream==2) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't get segment %s (error %s) and end of period was guessed during last update - stopping playback\n", new_base_seg_url, gf_error_to_string(e)));
+					group->maybe_end_of_stream = 0;
+					group->done = 1;
+				}
+				group->maybe_end_of_stream++;
+			} else if (group->segment_in_valid_range) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - segment was lost at server/proxy side\n", new_base_seg_url, gf_error_to_string(e)));
+				if (dash->speed >= 0) {
+					group->download_segment_index++;
+				} else if (group->download_segment_index) {
+					group->download_segment_index--;
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
+					group->done = 1;
+				}
+				group->segment_in_valid_range=0;
+			} else if (group->prev_segment_ok && !group->time_at_first_failure) {
+				if (!group->loop_detected) {
+					group->time_at_first_failure = clock_time;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration));
+				}
+			}
+			//if previous segment download was OK, we are likely asking too early - retry for the complete duration in case one segment was lost - we add 100ms safety
+			else if (group->prev_segment_ok && (clock_time - group->time_at_first_failure <= group->current_downloaded_segment_duration + dash->segment_lost_after_ms )) {
+			} else {
+				if (group->prev_segment_ok) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - waited %d ms but segment still not available, checking next one ...\n", new_base_seg_url, gf_error_to_string(e), clock_time - group->time_at_first_failure));
+					group->time_at_first_failure = 0;
+					group->prev_segment_ok = GF_FALSE;
+				}
+#if 1
+				group->nb_consecutive_segments_lost ++;
+				//we are lost ....
+				if (group->nb_consecutive_segments_lost == 20) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many consecutive segments not found, sync or signal has been lost - entering end of stream detection mode\n"));
+					min_wait = 1000;
+					group->maybe_end_of_stream = 1;
+				} else
+#endif
+				{
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s\n", new_base_seg_url, gf_error_to_string(e)));
+					if (dash->speed >= 0) {
+						group->download_segment_index++;
+					} else if (group->download_segment_index) {
+						group->download_segment_index--;
+					} else {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
+						group->done = 1;
+					}
 				}
 			}
+			gf_free(new_base_seg_url);
+			gf_free(key_url);
+			new_base_seg_url = NULL;
+			key_url = NULL;
+			return GF_DASH_DownloadCancel;
+		}
+
+		group->prev_segment_ok = GF_TRUE;
+		if (group->time_at_first_failure) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule too early ?\n", new_base_seg_url));
+			group->time_at_first_failure = 0;
+		}
+		group->nb_consecutive_segments_lost = 0;
+
+		if ((e==GF_OK) && group->force_switch_bandwidth) {
+			if (!dash->auto_switch_count) {
+				gf_dash_switch_group_representation(dash, group);
+				gf_free(new_base_seg_url);
+				new_base_seg_url = NULL;
+				gf_free(key_url);
+				key_url = NULL;
+				/*restart*/
+				return GF_DASH_DownloadRestart;
+			}
+			if (rep->playback.disabled) {
+				gf_dash_skip_disabled_representation(group, rep, GF_FALSE);
+				gf_free(new_base_seg_url);
+				new_base_seg_url = NULL;
+				gf_free(key_url);
+				key_url = NULL;
+				/*restart*/
+				return GF_DASH_DownloadRestart;
+			}
 		}
+		group->segment_must_be_streamed = base_group->segment_must_be_streamed;
+
+		if (group->segment_must_be_streamed)
+			local_file_name = dash->dash_io->get_url(dash->dash_io, base_group->segment_download);
+		else
+			local_file_name = dash->dash_io->get_cache_name(dash->dash_io, base_group->segment_download);
+
+		if (dash->dash_io->get_total_size(dash->dash_io, base_group->segment_download)==0) {
+			empty_file = GF_TRUE;
+		}
+		resource_name = dash->dash_io->get_url(dash->dash_io, base_group->segment_download);
+
+		dash_store_stats(dash, group, base_group->segment_download);
 	}
 
-	if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
-		Bool do_switch = GF_TRUE;
-		//if we're switching to the next upper bitrate (no intermediate bitrates), do not immediately switch
-		//but for a given number of segments - this avoids fluctuation in the quality
-		if (go_up && ! nb_inter_rep) {
-			new_rep->playback.probe_switch_count++;
-			if (new_rep->playback.probe_switch_count > dash->probe_times_before_switch) {
-				new_rep->playback.probe_switch_count = 0;
+	if (local_file_name && (e == GF_OK || group->segment_must_be_streamed )) {
+		gf_mx_p(dash->dl_mutex);
+
+		assert(base_group->nb_cached_segments<base_group->max_cached_segments);
+		assert(local_file_name);
+
+		if (!empty_file) {
+			segment_cache_entry *cache_entry = &base_group->cached[base_group->nb_cached_segments];
+
+			cache_entry->cache = gf_strdup(local_file_name);
+			cache_entry->url = gf_strdup( resource_name );
+			cache_entry->start_range = 0;
+			cache_entry->end_range = 0;
+			cache_entry->representation_index = representation_index;
+			cache_entry->duration = (u32) group->current_downloaded_segment_duration;
+			cache_entry->loop_detected = group->loop_detected;
+			cache_entry->has_dep_following = has_dep_following;
+			if (key_url) {
+				cache_entry->key_url = key_url;
+				memcpy(cache_entry->key_IV, key_iv, sizeof(bin128));
+				key_url = NULL;
+			}
+
+			group->loop_detected = GF_FALSE;
+
+			if (group->local_files && use_byterange) {
+				cache_entry->start_range = start_range;
+				cache_entry->end_range = end_range;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", base_group->nb_cached_segments+1, base_group->max_cached_segments, cache_entry->url));
+
+			base_group->nb_cached_segments++;
+			gf_dash_update_buffering(group, dash);
+		}
+
+		/* download enhancement representation of this segment*/
+		if ((representation_index != group->force_max_rep_index) && rep->enhancement_rep_index_plus_one) {
+			group->active_rep_index = rep->enhancement_rep_index_plus_one - 1;
+			group->has_pending_enhancement = GF_TRUE;
+		}
+		/* if we have downloaded all enhancement representations of this segment, restart from base representation and increase dowloaded segment index by 1*/
+		else {
+			if (group->base_rep_index_plus_one) group->active_rep_index = group->base_rep_index_plus_one - 1;
+			if (dash->speed >= 0) {
+				group->download_segment_index++;
+			} else if (group->download_segment_index) {
+				group->download_segment_index--;
 			} else {
-				do_switch = 0;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
+				group->done = 1;
 			}
+			group->has_pending_enhancement = GF_FALSE;
 		}
-		if (do_switch) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n\n[DASH] Download rate %d - switching representation %s from bandwidth %d bps to %d bps at UTC "LLU" ms\n\n", dl_rate, go_up ? "up" : "down", rep->bandwidth, new_rep->bandwidth, gf_net_get_utc() ));
-			gf_dash_set_group_representation(group, new_rep);
+		if (dash->auto_switch_count) {
+			group->nb_segments_done++;
+			if (group->nb_segments_done==dash->auto_switch_count) {
+				group->nb_segments_done=0;
+				gf_dash_skip_disabled_representation(group, rep, GF_TRUE);
+			}
 		}
 
-		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-			GF_MPD_Representation *arep = gf_list_get(group->adaptation_set->representations, k);
-			if (new_rep==arep) continue;
-			arep->playback.probe_switch_count = 0;
+		//do not notify segments if there is a pending period switch - since these are decided by the user, we don't
+		//want to notify old segments
+		if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following)
+			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, base_group), GF_OK);
+
+		gf_mx_v(dash->dl_mutex);
+
+	}
+	gf_free(new_base_seg_url);
+	new_base_seg_url = NULL;
+	if (key_url) {
+		gf_free(key_url);
+		key_url = NULL;
+	}
+	return GF_DASH_DownloadSuccess;
+}
+
+
+static DownloadGroupStatus dash_download_group(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group, Bool has_dep_following)
+{
+	DownloadGroupStatus res;
+
+	if (!group->current_dep_idx) {
+		res = dash_download_group_download(dash, group, base_group, has_dep_following);
+		if (res==GF_DASH_DownloadRestart) return res;
+		if (res==GF_DASH_DownloadCancel) return res;
+		group->current_dep_idx = 1;
+	}
+
+	if (group->groups_depending_on) {
+		u32 i, count = gf_list_count(group->groups_depending_on);
+		i = group->current_dep_idx - 1;
+		for (; i<count; i++) {
+
+			GF_DASH_Group *dep_group = gf_list_get(group->groups_depending_on, i);
+			if ((i+1==count) && !dep_group->groups_depending_on)
+				has_dep_following = GF_FALSE;
+
+			res = dash_download_group(dash, dep_group, base_group, has_dep_following);
+			if (res==GF_DASH_DownloadRestart) {
+				i--;
+				continue;
+			}
+			group->current_dep_idx = i + 1;
+			if (res==GF_DASH_DownloadCancel)
+				return GF_DASH_DownloadCancel;
 		}
 	}
+	group->current_dep_idx = 0;
+	return GF_DASH_DownloadSuccess;
 }
 
-static void gf_dash_group_check_time(GF_DASH_Group *group)
+//tile based adaptation
+static void dash_global_rate_adaptation(GF_DashClient *dash)
 {
-	s64 check_time;
-	u32 nb_droped;
-	
-	if (group->dash->is_m3u8) return;
-	
-	check_time = (s64) gf_net_get_utc();
-	nb_droped = 0;
+	u32 quality_rank;
+	u32 min_bandwidth = 0;
+	u32 max_bandwidth = 0;
+	Bool force_rep_idx = GF_FALSE;
+	GF_MPD_Representation *rep;
+	u32 total_rate, bandwidths[20], groups_per_quality[20], max_level;
+	u32 q_idx, nb_qualities = 0;
+	u32 i, count = gf_list_count(dash->groups);
+
+	//initialize min/max bandwidth
+	max_bandwidth = 0;
+	min_bandwidth = 0;
+	max_level = 0;
+	total_rate = (u32) -1;
+	nb_qualities = 1;
+
+	//get max qualities due to SRD descriptions
+	//for now, consider all non-SRDs group to run in max quality
+	for (i=0; i<gf_list_count(dash->SRDs); i++) {
+		struct _dash_srd_desc *srd = gf_list_get(dash->SRDs, i);
+		u32 nb_q = MAX(srd->srd_nb_cols, srd->srd_nb_rows);
+		if (nb_q > nb_qualities) nb_qualities = nb_q;
+	}
 
-	while (1) {
-		u32 seg_dur_ms;
-		u64 seg_ast = gf_dash_get_segment_availability_start_time(group->dash->mpd, group, group->download_segment_index, &seg_dur_ms);
+	//estimate bitrate
+	for (i=0; i<count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+		if (!group->bytes_per_sec) continue;
 
-		s64 now = check_time + (s64) seg_dur_ms;
-		if (now <= (s64) seg_ast) {
-			group->dash->tsb_exceeded = (u32) -1;
-			return;
+		//keep min rate to perform rate adaptation
+		if (total_rate > group->bytes_per_sec)
+			total_rate = group->bytes_per_sec;
+	}
+	if (total_rate == (u32) -1)
+		total_rate = 0;
+
+	for (q_idx=0; q_idx<nb_qualities; q_idx++) {
+		bandwidths[q_idx] = 0;
+		groups_per_quality[q_idx] = 0;
+
+		for (i=0; i<count; i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+
+			quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
+			if (quality_rank >= nb_qualities) quality_rank = nb_qualities-1;
+			if (quality_rank != q_idx) continue;
+
+			group->target_new_rep = 0;
+			rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
+			bandwidths[q_idx] += rep->bandwidth;
+			groups_per_quality[q_idx] ++;
+			if (max_level < 1 + quality_rank) max_level = 1+quality_rank;
 		}
+		min_bandwidth += bandwidths[q_idx];
+	}
 
-		now -= (s64) seg_ast;
-		if (now <= (s64) seg_dur_ms) {
-			group->dash->tsb_exceeded = (u32) -1;
-			return;
+	/*no per-quality adaptation, we may have oscillations*/
+	if (!dash->tile_rate_decrease) {
+	}
+	/*automatic rate alloc*/
+	else if (dash->tile_rate_decrease==100) {
+		//for each quality level (starting from highest priority), increase the bitrate if possible
+		for (q_idx=0; q_idx < max_level; q_idx++) {
+			while (1) {
+				u32 nb_rep_increased = 0;
+
+				for (i=0; i<count; i++) {
+					u32 diff;
+					GF_DASH_Group *group = gf_list_get(dash->groups, i);
+					if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+
+					quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
+					if (quality_rank != q_idx) continue;
+
+					if (group->target_new_rep + 1 == gf_list_count(group->adaptation_set->representations))
+						continue;
+
+					rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
+					diff = rep->bandwidth;
+					rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep+1);
+					diff = rep->bandwidth - diff;
+
+					if (min_bandwidth + diff < 8*total_rate) {
+						min_bandwidth += diff;
+						bandwidths[q_idx] += diff;
+						group->target_new_rep++;
+						nb_rep_increased ++;
+					}
+				}
+				//no more adjustement possible for this quality level
+				if (! nb_rep_increased)
+					break;
+			}
 		}
-		if (((s32) group->time_shift_buffer_depth > 0) && (now > group->time_shift_buffer_depth)) {
-			group->download_segment_index ++;
-			nb_droped ++;
-			group->dash->time_in_tsb = 0;
-			continue;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Rate Adaptation - download rate %d kbps - %d quality levels (cumulated representations rate %d kbps)\n", 8*total_rate/1000, max_level, min_bandwidth/1000));
+		for (q_idx=0; q_idx<max_level; q_idx++) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH]\tLevel #%d - %d Adaptation Sets for a total %d kbps allocated\n", q_idx+1, groups_per_quality[q_idx], bandwidths[q_idx]/1000 ));
 		}
 
-		if (nb_droped > group->dash->tsb_exceeded) {
-			group->dash->tsb_exceeded = nb_droped;
+		force_rep_idx = GF_TRUE;
+	}
+	/*for each quality level get tile_rate_decrease% of the available bandwidth*/
+	else {
+		u32 rate = bandwidths[0] = total_rate * dash->tile_rate_decrease / 100;
+		for (i=1; i<max_level; i++) {
+			u32 remain = total_rate - rate;
+			if (i+1==max_level) {
+				bandwidths[i] = remain;
+			} else {
+				bandwidths[i] = remain * dash->tile_rate_decrease/100;
+				rate += bandwidths[i];
+			}
 		}
 
-		now -= group->dash->user_buffer_ms;
-		if (now<0) return;
-		now /= 1000;
-		if (now>group->dash->time_in_tsb)
-			group->dash->time_in_tsb = (u32) now;
-		return;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Rate Adaptation - download rate %d kbps - %d quality levels (cumulated rate %d kbps)\n", 8*total_rate/1000, max_level, 8*min_bandwidth/1000));
+		for (q_idx=0; q_idx<max_level; q_idx++) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH]\tLevel #%d - %d Adaptation Sets for a total %d kbps allocated\n", q_idx+1, groups_per_quality[q_idx], 8*bandwidths[q_idx]/1000 ));
+		}
 	}
-}
 
+	//bandiwtdh sharing done, perform rate adaptation with this new numbers
+	for (i=0; i<count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+
+		if (force_rep_idx) {
+			rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
+			//add 100 bytes/sec to make sure we select the target one
+			group->bytes_per_sec = 100 + rep->bandwidth / 8;
+		}
+		//decrease by quality level
+		else if (dash->tile_rate_decrease) {
+			quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
+			assert(groups_per_quality[quality_rank]);
+			group->bytes_per_sec = bandwidths[quality_rank] / groups_per_quality[quality_rank];
+		}
+		dash_do_rate_adaptation(dash, group);
+		group->bytes_per_sec = 0;
+	}
+}
 
 static u32 dash_main_thread_proc(void *par)
 {
 	GF_Err e;
 	GF_DashClient *dash = (GF_DashClient*) par;
-	GF_MPD_Representation *rep;
 	u32 i, group_count, ret = 0;
 	Bool go_on = GF_TRUE;
 	u32 min_wait = 0;
 	Bool first_period_in_mpd = GF_TRUE;
-	char *new_base_seg_url;
+
 	assert(dash);
 	if (!dash->mpd) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Incorrect state, no dash->mpd for URL=%s, already stopped ?\n", dash->base_url));
@@ -3413,7 +4845,6 @@
 		e = gf_dash_download_init_segment(dash, group);
 		if (e) break;
 	}
-	dash->mpd_stop_request=0;
 	first_period_in_mpd = 0;
 
 	/*if error signal to the user*/
@@ -3449,8 +4880,6 @@
 
 	min_wait = 0;
 	while (go_on) {
-		const char *local_file_name = NULL;
-		const char *resource_name = NULL;
 
 		/*wait until next segment is needed*/
 		while (!dash->mpd_stop_request) {
@@ -3461,11 +4890,15 @@
 				u32 diff = gf_sys_clock();
 				dash->force_mpd_update = 0;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Time to update the playlist (%u ms elapsed since last refresh and min reload rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
+				//gf_mx_p(dash->dl_mutex);
 				e = gf_dash_update_manifest(dash);
+				//gf_mx_v(dash->dl_mutex);
 				group_count = gf_list_count(dash->groups);
 				diff = gf_sys_clock() - diff;
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
+					if (!dash->in_error) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
+					}
 				} else {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", diff));
 				}
@@ -3486,7 +4919,7 @@
 				dash->time_in_tsb = 0;
 				for (i=0; i<group_count; i++) {
 					GF_DASH_Group *group = gf_list_get(dash->groups, i);
-					if ((group->selection != GF_DASH_GROUP_SELECTED) || group->done) continue;
+					if ((group->selection != GF_DASH_GROUP_SELECTED) || group->done || group->depend_on_group) continue;
 					all_groups_done = 0;
 					if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
 						gf_dash_group_check_time(group);
@@ -3550,368 +4983,25 @@
 
 		/*for each selected groups*/
 		for (i=0; i<group_count; i++) {
-			//commented out as we end up doing too many requets
-#if 0
-			Bool in_segment_avail_time = GF_FALSE;
-#endif
-			u64 start_range, end_range;
-			Bool use_byterange;
-			u32 representation_index;
-			u32 clock_time;
-			Bool empty_file = GF_FALSE;
+			DownloadGroupStatus res;
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-
+			Bool has_dep_following = group->groups_depending_on ? GF_TRUE : GF_FALSE;
 			if (group->selection != GF_DASH_GROUP_SELECTED) {
 				if (group->nb_cached_segments) {
 					gf_dash_group_reset(dash, group);
 				}
 				continue;
 			}
-			if (group->done) continue;
-
-			if (group->nb_cached_segments>=group->max_cached_segments) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Cache is full for this group - skipping\n", gf_sys_clock() ));
-				continue;
-			}
-
-			/*remember the active rep index, since group->active_rep_index may change because of bandwidth control algorithm*/
-			representation_index = group->active_rep_index;
-			rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 
-			/* if the index of the segment to be downloaded is greater or equal to the last segment (as seen in the playlist),
-			we need to check if a new playlist is ready */
-			if (group->nb_segments_in_rep && (group->download_segment_index >= (s32) group->nb_segments_in_rep)) {
-				u32 timer = gf_sys_clock() - dash->last_update_time;
-				Bool update_playlist = 0;
+			if (group->depend_on_group) continue;
 
-				/* this period is done*/
-				if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
-				}
-				/* update of the playlist, only if indicated */
-				else if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
-					update_playlist = 1;
-				}
-				/* if media_presentation_duration is 0 and we are in live, force a refresh (not in the spec but safety check*/
-				else if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->mpd->media_presentation_duration) {
-					if (group->segment_duration && (timer > group->segment_duration*1000))
-						update_playlist = 1;
-				}
-				if (update_playlist) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in current playlist downloaded, checking updates after %u ms\n", timer));
-					e = gf_dash_update_manifest(dash);
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
-					}
-					group_count = gf_list_count(dash->groups);
-					rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-				} else {
-					gf_sleep(1);
-				}
-				/* Now that the playlist is up to date, we can check again */
-				if (group->download_segment_index >= (s32) group->nb_segments_in_rep) {
-					/* if there is a specified update period, we redo the whole process */
-					if (dash->mpd->minimum_update_period || dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
-
-						if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in period (dynamic mode) - group is done\n"));
-							group->done = 1;
-							break;
-						}
-						else if (! group->maybe_end_of_stream) {
-							u32 now = gf_sys_clock();
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of segment list reached (%d segments but idx is %d), waiting for next MPD update\n", group->nb_segments_in_rep, group->download_segment_index));
-							if (group->nb_cached_segments)
-								continue;
-
-							if (!group->time_at_first_reload_required) {
-								group->time_at_first_reload_required = now;
-								continue;
-							}
-							if (now - group->time_at_first_reload_required < group->cache_duration)
-								continue;
-							if (dash->mpd->minimum_update_period && (now - group->time_at_first_reload_required < dash->mpd->minimum_update_period))
-								continue;
-
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment list has not been updated for more than %d ms - assuming end of period\n", now - group->time_at_first_reload_required));
-							group->done = 1;
-							break;
-						}
-					} else {
-						/* if not, we are really at the end of the playlist, we can quit */
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of period reached for group\n"));
-						group->done = 1;
-						break;
-					}
-				}
-			}
-			group->time_at_first_reload_required = 0;
-			gf_mx_p(dash->dl_mutex);
-
-			if (group->force_switch_bandwidth && !dash->auto_switch_count) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Forcing representation switch, retesting group"));
-				gf_dash_switch_group_representation(dash, group);
-				/*restart*/
+			res = dash_download_group(dash, group, group, has_dep_following);
+			if (res==GF_DASH_DownloadRestart) {
 				i--;
-				gf_mx_v(dash->dl_mutex);
 				continue;
 			}
-
-			/*check availablity start time of segment in Live !!*/
-			if (!group->broken_timing && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
-				s32 to_wait = 0;
-				u32 seg_dur_ms=0;
-#ifndef GPAC_DISABLE_LOG
-				u32 start_number = gf_dash_get_start_number(group, rep);
-#endif
-				s64 segment_ast = (s64) gf_dash_get_segment_availability_start_time(dash->mpd, group, group->download_segment_index, &seg_dur_ms);
-				s64 now = (s64) gf_net_get_utc();
-
-
-				if (group->retry_after_utc > (u64) now) {
-					min_wait = (u32) (group->retry_after_utc - (u64) now);
-					gf_mx_v(dash->dl_mutex);
-					continue;
-				}
-
-				clock_time = gf_sys_clock();
-				to_wait = (s32) (segment_ast - now);
-
-				/*if segment AST is greater than now, it is not yet available - we would need an estimate on how long the request takes to be sent to the server in order to be more reactive ...*/
-				if (to_wait > 1) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) is not yet available on server - requesting later in %d ms\n", i+1, gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init)/1000.0, to_wait));
-					if (group->last_segment_time) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
-					}
-					gf_mx_v(dash->dl_mutex);
-					if (!min_wait || ((u32) to_wait < min_wait))
-						min_wait = to_wait;
-					continue;
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) should now be available on server since %d ms - requesting it\n", i+1, gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init)/1000.0, -to_wait));
-
-					if (group->last_segment_time) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
-					}
-#if 0
-					/*check if we are in the segment availability end time*/
-					if (now < segment_ast + seg_dur_ms + group->time_shift_buffer_depth )
-						in_segment_avail_time = 1;
-#endif
-				}
-			}
-			min_wait = 0;
-
-
-			/* At this stage, there are some segments left to be downloaded */
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
-			gf_mx_v(dash->dl_mutex);
-			if (e) {
-				/*do something!!*/
-				break;
-			}
-			use_byterange = (start_range || end_range) ? 1 : 0;
-
-			if (use_byterange) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading new segment: %s (range: "LLD"-"LLD")\n", new_base_seg_url, start_range, end_range));
-			}
-
-			/*local file*/
-			if (!strstr(new_base_seg_url, "://") || (!strnicmp(new_base_seg_url, "file://", 7) || !strnicmp(new_base_seg_url, "gmem://", 7)) ) {
-				resource_name = local_file_name = (char *) new_base_seg_url;
-				e = GF_OK;
-				/*do not erase local files*/
-				group->local_files = 1;
-				gf_dash_buffer_off(group);
-				if (group->force_switch_bandwidth && !dash->auto_switch_count) {
-					gf_dash_switch_group_representation(dash, group);
-					/*restart*/
-					i--;
-					continue;
-				}
-			} else {
-				group->max_bitrate = 0;
-				group->min_bitrate = (u32)-1;
-
-				/*use persistent connection for segment downloads*/
-				if (use_byterange) {
-					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, start_range, end_range, 1, group);
-				} else {
-					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, 0, 0, 1, group);
-				}
-
-				if ((e==GF_IP_CONNECTION_CLOSED) && group->download_abort_type) {
-					group->download_abort_type = 0;
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Aborted while downloading segment (seek ?)%s \n", new_base_seg_url));
-					gf_free(new_base_seg_url);
-					new_base_seg_url = NULL;
-					continue;
-				}
-
-
-				/*TODO decide what is the best, fetch from another representation or ignore ...*/
-				if (e != GF_OK) {
-					clock_time = gf_sys_clock();
-					min_wait = dash->min_timeout_between_404;
-					group->retry_after_utc = min_wait + gf_net_get_utc();
-
-					if (group->maybe_end_of_stream) {
-						if (group->maybe_end_of_stream==2) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't get segment %s (error %s) and end of period was guessed during last update - stoping playback\n", new_base_seg_url, gf_error_to_string(e)));
-							group->maybe_end_of_stream = 0;
-							group->done = 1;
-						}
-						group->maybe_end_of_stream++;
-					} else if (group->segment_in_valid_range) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - segment was lost at server/proxy side\n", new_base_seg_url, gf_error_to_string(e)));
-						if (dash->speed >= 0) {
-							group->download_segment_index++;
-						} else if (group->download_segment_index) {
-							group->download_segment_index--;
-						} else {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
-							group->done = 1;
-						}
-						group->segment_in_valid_range=0;
-					} else if (group->prev_segment_ok && !group->time_at_first_failure) {
-						if (!group->loop_detected) {
-							group->time_at_first_failure = clock_time;
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration));
-						}
-					}
-					//if previous segment download was OK, we are likely asking too early - retry for the complete duration in case one segment was lost - we add 100ms safety
-					else if (group->prev_segment_ok && (clock_time - group->time_at_first_failure <= group->current_downloaded_segment_duration + dash->segment_lost_after_ms )) {
-					} else {
-						if (group->prev_segment_ok) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - waited %d ms but segment still not available, checking next one ...\n", new_base_seg_url, gf_error_to_string(e), clock_time - group->time_at_first_failure));
-							group->time_at_first_failure = 0;
-							group->prev_segment_ok = GF_FALSE;
-						}
-#if 1
-						group->nb_consecutive_fail ++;
-						//we are lost ....
-						if (group->nb_consecutive_fail == 20) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many consecutive segments not found, sync or signal has been lost - entering end of stream detection mode\n"));
-							min_wait = 1000;
-							group->maybe_end_of_stream = 1;
-						} else
-#endif
-						{
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s\n", new_base_seg_url, gf_error_to_string(e)));
-							if (dash->speed >= 0) {
-								group->download_segment_index++;
-							} else if (group->download_segment_index) {
-								group->download_segment_index--;
-							} else {
-								GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
-								group->done = 1;
-							}
-						}
-					}
-					gf_free(new_base_seg_url);
-					new_base_seg_url = NULL;
-					continue;
-				}
-
-				group->prev_segment_ok = GF_TRUE;
-				if (group->time_at_first_failure) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule too early ?\n", new_base_seg_url));
-					group->time_at_first_failure = 0;
-					group->nb_consecutive_fail = 0;
-				}
-
-				if ((e==GF_OK) && group->force_switch_bandwidth) {
-					if (!dash->auto_switch_count) {
-						gf_dash_switch_group_representation(dash, group);
-						/*restart*/
-						i--;
-						gf_free(new_base_seg_url);
-						new_base_seg_url = NULL;
-						continue;
-					}
-					if (rep->playback.disabled) {
-						gf_dash_skip_disabled_representation(group, rep, GF_FALSE);
-						/*restart*/
-						i--;
-						gf_free(new_base_seg_url);
-						new_base_seg_url = NULL;
-						continue;
-					}
-				}
-
-				if (group->segment_must_be_streamed) local_file_name = dash->dash_io->get_url(dash->dash_io, group->segment_download);
-				else local_file_name = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
-
-				if (dash->dash_io->get_total_size(dash->dash_io, group->segment_download)==0) {
-					empty_file = GF_TRUE;
-				}
-				resource_name = dash->dash_io->get_url(dash->dash_io, group->segment_download);
-
-				if (!dash->auto_switch_count)
-					dash_do_rate_adaptation(dash, group, rep);
-			}
-
-			if (local_file_name && (e == GF_OK || group->segment_must_be_streamed )) {
-				gf_mx_p(dash->dl_mutex);
-
-				assert(group->nb_cached_segments<group->max_cached_segments);
-				assert(local_file_name);
-				if (!empty_file) {
-
-					group->cached[group->nb_cached_segments].cache = gf_strdup(local_file_name);
-					group->cached[group->nb_cached_segments].url = gf_strdup( resource_name );
-					group->cached[group->nb_cached_segments].start_range = 0;
-					group->cached[group->nb_cached_segments].end_range = 0;
-					group->cached[group->nb_cached_segments].representation_index = representation_index;
-					group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
-					group->cached[group->nb_cached_segments].loop_detected = group->loop_detected;
-					group->loop_detected = GF_FALSE;
-
-					if (group->local_files && use_byterange) {
-						group->cached[group->nb_cached_segments].start_range = start_range;
-						group->cached[group->nb_cached_segments].end_range = end_range;
-					}
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", group->nb_cached_segments+1, group->max_cached_segments, group->cached[group->nb_cached_segments].url));
-					group->nb_cached_segments++;
-					gf_dash_update_buffering(group, dash);
-				}
-
-				/* download enhancement representation of this segment*/
-				if ((representation_index != group->force_max_rep_index) && rep->enhancement_rep_index_plus_one) {
-					group->active_rep_index = rep->enhancement_rep_index_plus_one - 1;
-					group->has_pending_enhancement = GF_TRUE;
-				}
-				/* if we have downloaded all enhancement representations of this segment, restart from base representation and increase dowloaded segment index by 1*/
-				else {
-					if (group->base_rep_index_plus_one) group->active_rep_index = group->base_rep_index_plus_one - 1;
-					if (dash->speed >= 0) {
-						group->download_segment_index++;
-					} else if (group->download_segment_index) {
-						group->download_segment_index--;
-					} else {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
-						group->done = 1;
-					}
-					group->has_pending_enhancement = GF_FALSE;
-				}
-				if (dash->auto_switch_count) {
-					group->nb_segments_done++;
-					if (group->nb_segments_done==dash->auto_switch_count) {
-						group->nb_segments_done=0;
-						gf_dash_skip_disabled_representation(group, rep, GF_TRUE);
-					}
-				}
-
-				//do not notify segments if there is a pending period switch - since these are decided by the user, we don't
-				//want to notify old segments
-				if (!dash->request_period_switch && !group->has_pending_enhancement)
-					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, group), GF_OK);
-
-				gf_mx_v(dash->dl_mutex);
-
-			}
-			gf_free(new_base_seg_url);
-			new_base_seg_url = NULL;
 		}
+		dash_global_rate_adaptation(dash);
 	}
 
 exit:
@@ -3958,6 +5048,7 @@
 {
 	u32 i;
 	assert(dash);
+	gf_mx_p(dash->dl_mutex);
 	if (dash->groups) {
 		for (i=0; i<gf_list_count(dash->groups); i++) {
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
@@ -3970,7 +5061,7 @@
 		}
 	}
 	/* stop the download thread */
-	gf_mx_p(dash->dl_mutex);
+	dash->mpd_stop_request = GF_TRUE;
 	if (dash->dash_state != GF_DASH_STATE_STOPPED) {
 		dash->mpd_stop_request = 1;
 		gf_mx_v(dash->dl_mutex);
@@ -3978,7 +5069,7 @@
 			/* waiting for the download thread to stop */
 			gf_sleep(16);
 			gf_mx_p(dash->dl_mutex);
-			if (dash->dash_state != GF_DASH_STATE_RUNNING) {
+			if (dash->dash_state == GF_DASH_STATE_STOPPED) {
 				/* it's stopped we can continue */
 				gf_mx_v(dash->dl_mutex);
 				break;
@@ -3988,6 +5079,7 @@
 	} else {
 		gf_mx_v(dash->dl_mutex);
 	}
+	dash->mpd_stop_request = GF_TRUE;
 }
 
 
@@ -4082,10 +5174,10 @@
 		group->force_segment_switch = 1;
 		group->download_segment_index = segment_idx;
 	} else {
-		group->timeline_setup = 0;
 		group->start_number_at_last_ast = 0;
 		/*remember to adjust time in timeline steup*/
 		group->start_playback_range = seek_to;
+		group->timeline_setup = 0;
 	}
 
 
@@ -4110,9 +5202,7 @@
 		if (!dash->keep_files && !group->local_files && !group->segment_must_be_streamed)
 			gf_delete_file(group->cached[group->nb_cached_segments].cache);
 
-		gf_free(group->cached[group->nb_cached_segments].cache);
-		gf_free(group->cached[group->nb_cached_segments].url);
-		memset(&group->cached[group->nb_cached_segments], 0, sizeof(segment_cache_entry));
+		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 	}
 	group->done = 0;
 }
@@ -4144,10 +5234,28 @@
 static GF_Err http_ifce_get(GF_FileDownload *getter, char *url)
 {
 	GF_Err e;
+	GF_DASHFileIOSession *sess;
 	GF_DashClient *dash = (GF_DashClient*) getter->udta;
-	GF_DASHFileIOSession *sess = dash->dash_io->create(dash->dash_io, 0, url, -1);
-	if (!sess) return GF_IO_ERR;
-	getter->session = sess;
+	if (!getter->session) {
+		sess = dash->dash_io->create(dash->dash_io, 1, url, -1);
+		if (!sess) return GF_IO_ERR;
+		getter->session = sess;
+	}
+	else {
+		u32 group_idx = -1, i;
+		for (i = 0; i < gf_list_count(dash->groups); i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+			group_idx = i;
+			break;
+		}
+		e = dash->dash_io->setup_from_url(dash->dash_io, getter->session, url, group_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup session for url %s: %s\n", url, gf_error_to_string(e) ));
+			return e;
+		}
+		sess = (GF_DASHFileIOSession *)getter->session;
+	}
 	e = dash->dash_io->init(dash->dash_io, sess);
 	if (e) {
 		dash->dash_io->del(dash->dash_io, sess);
@@ -4214,7 +5322,7 @@
 	} else if (strstr(manifest_url, "://")) {
 		const char *reloc_url, *mtype;
 		char mime[128];
-		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), manifest_url, 0, 0, 1, NULL);
+		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), manifest_url, 0, 0, 1, NULL);
 		if (e!=GF_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD downloading problem %s for %s\n", gf_error_to_string(e), manifest_url));
 			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
@@ -4258,24 +5366,34 @@
 	}
 
 	if (is_local) {
-		FILE *f = fopen(local_url, "rt");
+		FILE *f = gf_fopen(local_url, "rt");
 		if (!f) {
 			sep_cgi = strrchr(local_url, '?');
 			if (sep_cgi) sep_cgi[0] = 0;
 			sep_frag = strrchr(local_url, '#');
 			if (sep_frag) sep_frag[0] = 0;
 
-			f = fopen(local_url, "rt");
+			f = gf_fopen(local_url, "rt");
 			if (!f) {
 				if (sep_cgi) sep_cgi[0] = '?';
 				if (sep_frag) sep_frag[0] = '#';
 				return GF_URL_ERROR;
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 	}
 	dash->mpd_fetch_time = dash_get_fetch_time(dash);
 
+	if (dash->mpd)
+		gf_mpd_del(dash->mpd);
+
+	dash->mpd = gf_mpd_new();
+	if (!dash->mpd) {
+		e = GF_OUT_OF_MEM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD creation problem %s\n", gf_error_to_string(e)));
+		goto exit;
+	}
+
 	if (dash->is_m3u8) {
 		if (is_local) {
 			char *sep;
@@ -4284,46 +5402,49 @@
 			if (sep) sep[0]=0;
 			strcat(local_path, ".mpd");
 
-			gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+			e = gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE);
 			local_url = local_path;
 		} else {
-			gf_m3u8_to_mpd(local_url, manifest_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+			const char *redirected_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
+			if (!redirected_url) redirected_url=manifest_url;
+
+			e = gf_m3u8_to_mpd(local_url, redirected_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE);
+		}
+	} else {
+		if (!gf_dash_check_mpd_root_type(local_url)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: wrong file type %s\n", local_url));
+			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+			dash->mpd_dnload = NULL;
+			return GF_URL_ERROR;
 		}
-	}
 
-	if (!gf_dash_check_mpd_root_type(local_url)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: wrong file type %s\n", local_url));
-		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-		dash->mpd_dnload = NULL;
-		return GF_URL_ERROR;
-	}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] parsing MPD %s\n", local_url));
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] parsing MPD %s\n", local_url));
+		/* parse the MPD */
+		mpd_parser = gf_xml_dom_new();
+		e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
 
-	/* parse the MPD */
-	mpd_parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
+		if (sep_cgi) sep_cgi[0] = '?';
+		if (sep_frag) sep_frag[0] = '#';
 
-	if (sep_cgi) sep_cgi[0] = '?';
-	if (sep_frag) sep_frag[0] = '#';
+		if (e != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD parsing problem %s\n", gf_xml_dom_get_error(mpd_parser) ));
+			gf_xml_dom_del(mpd_parser);
+			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+			dash->mpd_dnload = NULL;
+			return GF_URL_ERROR;
+		}
+		if (dash->mpd)
+			gf_mpd_del(dash->mpd);
 
-	if (e != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD parsing problem %s\n", gf_xml_dom_get_error(mpd_parser) ));
+		dash->mpd = gf_mpd_new();
+		if (!dash->mpd) {
+			e = GF_OUT_OF_MEM;
+		} else {
+			e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
+		}
 		gf_xml_dom_del(mpd_parser);
-		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-		dash->mpd_dnload = NULL;
-		return GF_URL_ERROR;
 	}
-	if (dash->mpd)
-		gf_mpd_del(dash->mpd);
-
-	dash->mpd = gf_mpd_new();
-	if (!dash->mpd) {
-		e = GF_OUT_OF_MEM;
-	} else {
-		e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
-	}
-	gf_xml_dom_del(mpd_parser);
 
 	if (e != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD creation problem %s\n", gf_error_to_string(e)));
@@ -4347,6 +5468,7 @@
 		goto exit;
 	}
 
+	dash->mpd_stop_request = 0;
 	e = gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
 
 	return e;
@@ -4371,6 +5493,7 @@
 		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
 		dash->mpd_dnload = NULL;
 	}
+	gf_mpd_getter_del_session(&dash->getter);
 	if (dash->mpd)
 		gf_mpd_del(dash->mpd);
 	dash->mpd = NULL;
@@ -4388,6 +5511,7 @@
 	GF_SAFEALLOC(dash, GF_DashClient);
 	dash->dash_io = dash_io;
 	dash->speed = 1.0;
+
 	//wait one segment to validate we have enough bandwidth
 	dash->probe_times_before_switch = 1;
 	dash->dash_thread = gf_th_new("MPD Segment Downloader Thread");
@@ -4406,6 +5530,7 @@
 	dash->min_timeout_between_404 = 500;
 	dash->segment_lost_after_ms = 100;
 	dash->debug_group_index = -1;
+	dash->tile_rate_decrease = 100;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Client created\n"));
 	return dash;
@@ -4569,16 +5694,12 @@
 						group->nb_cached_segments--;
 						gf_dash_update_buffering(group, dash);
 						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[group->nb_cached_segments].url));
-						gf_free(group->cached[group->nb_cached_segments].url);
-						group->cached[group->nb_cached_segments].url = NULL;
+
 						if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
 							gf_delete_file( group->cached[group->nb_cached_segments].cache );
-							gf_free(group->cached[group->nb_cached_segments].cache);
-							group->cached[group->nb_cached_segments].cache = NULL;
 						}
-						group->cached[group->nb_cached_segments].representation_index = 0;
-						group->cached[group->nb_cached_segments].start_range = 0;
-						group->cached[group->nb_cached_segments].end_range = 0;
+						gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
+
 						group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
 						if (group->download_segment_index>1)
 							group->download_segment_index--;
@@ -4605,16 +5726,15 @@
 							group->nb_cached_segments--;
 							gf_dash_update_buffering(group, dash);
 							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[group->nb_cached_segments].url));
-							gf_free(group->cached[group->nb_cached_segments].url);
-							group->cached[group->nb_cached_segments].url = NULL;
+
 							if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
 								gf_delete_file( group->cached[group->nb_cached_segments].cache );
-								gf_free(group->cached[group->nb_cached_segments].cache);
-								group->cached[group->nb_cached_segments].cache = NULL;
 							}
-							group->cached[group->nb_cached_segments].representation_index = 0;
-							group->cached[group->nb_cached_segments].start_range = 0;
+
+							gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
+
 							group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
+
 							if (decrease_download_segment_index && group->download_segment_index>1)
 								group->download_segment_index--;
 						}
@@ -4642,6 +5762,9 @@
 			/*resize max cached segment*/
 			group->max_cached_segments = nb_cached_seg_per_rep * gf_dash_group_count_rep_needed(group);
 
+			if (group->srd_desc)
+				gf_dash_set_tiles_quality(dash, group->srd_desc);
+
 			gf_mx_v(dash->dl_mutex);
 		}
 	}
@@ -4693,6 +5816,8 @@
 	return gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
 }
 
+
+
 GF_EXPORT
 const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range)
 {
@@ -4700,21 +5825,54 @@
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return NULL;
 
+	/*solve dependencies if any*/
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+
+	while (rep && rep->dependency_id) {
+		char *sep = strchr(rep->dependency_id, ' ');
+		if (sep) sep[0] = 0;
+		rep = gf_dash_find_rep(dash, rep->dependency_id, &group);
+		if (sep) sep[0] = ' ';
+	}
+
 	if (group->bs_switching_init_segment_url) {
 		if (start_range) *start_range = group->bs_switching_init_segment_url_start_range;
 		if (end_range) *end_range = group->bs_switching_init_segment_url_end_range;
 		return group->bs_switching_init_segment_url;
 	}
 
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	//no rep found or no init for the rep, check all reps
+	//this may happen when the adaptation rate algo changed the rep between the init (TS) and the next segment
+	if (!rep || !rep->playback.cached_init_segment_url) {
+		u32 i, count;
+		count = gf_list_count(group->adaptation_set->representations);
+		for (i=0; i<count; i++) {
+			rep = gf_list_get(group->adaptation_set->representations, i);
+			if (rep->playback.cached_init_segment_url) break;
+			rep = NULL;
+		}
+	}
 	if (!rep) return NULL;
-
 	if (start_range) *start_range = rep->playback.init_start_range;
 	if (end_range) *end_range = rep->playback.init_end_range;
 	return rep->playback.cached_init_segment_url;
 }
 
 GF_EXPORT
+const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 idx, bin128 *key_IV)
+{
+	GF_MPD_Representation *rep;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return NULL;
+
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (!rep) return NULL;
+
+	if (key_IV) memcpy(*key_IV, rep->playback.key_IV, sizeof(bin128));
+	return rep->playback.key_url;
+}
+
+GF_EXPORT
 void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select)
 {
 	Bool needs_resetup = GF_FALSE;
@@ -4852,9 +6010,47 @@
 GF_EXPORT
 void gf_dash_set_speed(GF_DashClient *dash, Double speed)
 {
-	if (dash) dash->speed = speed ? speed : 1.0;
+	u32 i;
+	if (!dash) return;
+	for (i=0; i<gf_list_count(dash->groups); i++) {
+		GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, i);
+		GF_MPD_Representation *active_rep;
+		Double max_available_speed;
+		if (!group || (group->selection != GF_DASH_GROUP_SELECTED)) continue;
+		active_rep = (GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+		if (speed < 0)
+			group->decode_only_rap = GF_TRUE;
+
+		max_available_speed = gf_dash_get_max_available_speed(dash, group, active_rep);
+
+		/*verify if this representation support this speed*/
+		if (!max_available_speed || (ABS(speed) <= max_available_speed)) {
+			//nothing to do
+		} else {
+			/*if the representation does not support this speed, search for another which support it*/
+			u32 switch_to_rep_idx = 0;
+			u32 bandwidth = 0, quality = 0, k;
+			GF_MPD_Representation *rep;
+			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+				rep = gf_list_get(group->adaptation_set->representations, k);
+				if ((ABS(speed) <= rep->max_playout_rate) && ((rep->quality_ranking > quality) || (rep->bandwidth > bandwidth))) {
+					bandwidth = rep->bandwidth;
+					quality = rep->quality_ranking;
+					switch_to_rep_idx = k+1;
+				}
+			}
+			if (switch_to_rep_idx) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Switching representation for adapting playing speed\n"));
+				group->force_switch_bandwidth = 1;
+				group->force_representation_idx_plus_one = switch_to_rep_idx;
+			}
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing at %f speed \n", speed));
+		dash->speed = speed;
+	}
 }
 
+
 GF_EXPORT
 u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx)
 {
@@ -4869,7 +6065,12 @@
 	u32 res = 0;
 	GF_DASH_Group *group;
 
-	gf_mx_p(dash->dl_mutex);
+	//gf_mx_p(dash->dl_mutex);
+	if (!gf_mx_try_lock(dash->dl_mutex)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] get_num_segments_ready: could not lock dl_mutex\n"));
+		*group_is_done = 0;
+		return 0;
+	}
 	group = gf_list_get(dash->groups, idx);
 
 	*group_is_done = 0;
@@ -4891,6 +6092,7 @@
 void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group;
+	Bool delete_next;
 
 	gf_mx_p(dash->dl_mutex);
 	group = gf_list_get(dash->groups, idx);
@@ -4900,9 +6102,11 @@
 		gf_mx_v(dash->dl_mutex);
 		return;
 	}
+	delete_next = group->cached[0].has_dep_following ? GF_TRUE : GF_FALSE;
+
 	if (group->cached[0].cache) {
 		if (group->urlToDeleteNext) {
-			if (!group->local_files && !dash->keep_files)
+			if (!group->local_files && !dash->keep_files && strncmp(group->urlToDeleteNext, "gmem://", 7) )
 				dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
 
 			gf_free(group->urlToDeleteNext);
@@ -4921,18 +6125,17 @@
 		//remember the representation index of the last segment
 		group->prev_active_rep_index = group->cached[0].representation_index;
 
-		gf_free(group->cached[0].cache);
-		gf_free(group->cached[0].url);
-		group->cached[0].url = NULL;
-		group->cached[0].cache = NULL;
-		group->cached[0].representation_index = 0;
-		group->cached[0].duration = 0;
-
+		gf_dash_group_reset_cache_entry(&group->cached[0]);
 	}
+
 	memmove(&group->cached[0], &group->cached[1], sizeof(segment_cache_entry)*(group->nb_cached_segments-1));
 	memset(&(group->cached[group->nb_cached_segments-1]), 0, sizeof(segment_cache_entry));
 	group->nb_cached_segments--;
 
+	if (delete_next) {
+		goto discard_segment;
+	}
+
 	/*if we have dependency representations, we need also discard them*/
 	if (group->base_rep_index_plus_one) {
 		if (group->cached[0].cache && (group->cached[0].representation_index != group->base_rep_index_plus_one-1))
@@ -4971,10 +6174,11 @@
 }
 
 GF_EXPORT
-GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, u32 dependent_representation_index, const char **url, u64 *start_range, u64 *end_range, s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, const char **original_url, Bool *has_next_segment)
+GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, u32 dependent_representation_index, const char **url, u64 *start_range, u64 *end_range, s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, const char **original_url, Bool *has_next_segment, const char **key_url, bin128 *key_IV)
 {
 	GF_DASH_Group *group;
 	u32 index;
+	Bool has_dep_following;
 	*url = NULL;
 	if (switching_url) *switching_url = NULL;
 	if (start_range) *start_range = 0;
@@ -4989,22 +6193,31 @@
 	group = gf_list_get(dash->groups, idx);
 	if (!group->nb_cached_segments) {
 		gf_mx_v(dash->dl_mutex);
-		return GF_BAD_PARAM;
+		return GF_BUFFER_TOO_SMALL;
 	}
 
 	/*check the dependent rep is in the cache and does not target next segment (next in time)*/
+	has_dep_following = group->cached[0].has_dep_following;
 	index = 0;
 	while (dependent_representation_index) {
-		Bool valid = GF_TRUE;
-		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
+		GF_Err err = GF_OK;
 
-		if (!rep->enhancement_rep_index_plus_one) valid = GF_FALSE;
-		if (index+1 >= group->nb_cached_segments) valid = GF_FALSE;
-		if (rep->enhancement_rep_index_plus_one != group->cached[index+1].representation_index + 1) valid = GF_FALSE;
+		if (has_dep_following) {
+			if (index+1 >= group->nb_cached_segments)
+				err = GF_BUFFER_TOO_SMALL;
+			else if (! group->cached[index].has_dep_following)
+				err = GF_BAD_PARAM;
+		} else {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
+
+			if (index+1 >= group->nb_cached_segments) err = GF_BUFFER_TOO_SMALL;
+			else if (!rep->enhancement_rep_index_plus_one) err = GF_BAD_PARAM;
+			else if (rep->enhancement_rep_index_plus_one != group->cached[index+1].representation_index + 1) err = GF_BAD_PARAM;
+		}
 
-		if (valid == GF_FALSE) {
+		if (err) {
 			gf_mx_v(dash->dl_mutex);
-			return GF_BAD_PARAM;
+			return err;
 		}
 		index ++;
 		dependent_representation_index--;
@@ -5017,6 +6230,8 @@
 	if (end_range)
 		*end_range = group->cached[index].end_range;
 	if (original_url) *original_url = group->cached[index].url;
+	if (key_url) *key_url = group->cached[index].key_url;
+	if (key_IV) memcpy((*key_IV), group->cached[index].key_IV, sizeof(bin128));
 
 	if (!group->base_rep_index_plus_one && (group->cached[index].representation_index != group->prev_active_rep_index)) {
 		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
@@ -5031,14 +6246,17 @@
 	}
 	group->force_segment_switch = 0;
 
-	if (group->cached[index+1].cache) {
+	if (group->cached[index].has_dep_following) {
+		if (has_next_segment) *has_next_segment = GF_TRUE;
+	} else if (group->cached[index+1].cache) {
 		GF_MPD_Representation *rep;
 
 		rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
-		if (rep->enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) {
+		if (rep && rep->enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) {
 			if (has_next_segment) *has_next_segment = GF_TRUE;
 		}
 	}
+
 	gf_mx_v(dash->dl_mutex);
 	return GF_OK;
 }
@@ -5053,7 +6271,11 @@
 	if (original_url) *original_url = NULL;
 	if (switching_index) *switching_index = -1;
 
-	gf_mx_p(dash->dl_mutex);
+	//gf_mx_p(dash->dl_mutex);
+	if (!gf_mx_try_lock(dash->dl_mutex)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] current_download_segment_location: could not lock dl_mutex\n"));
+		return GF_OK;
+	}
 	group = gf_list_get(dash->groups, idx);
 	if (!group) {
 		gf_mx_v(dash->dl_mutex);
@@ -5097,7 +6319,7 @@
 	if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
 		u64 now, availabilityStartTime;
 		availabilityStartTime = dash->mpd->availabilityStartTime + dash->utc_shift;
-		if (dash->estimate_utc_drift) availabilityStartTime += dash->utc_drift_estimate;
+		availabilityStartTime += dash->utc_drift_estimate;
 
 		now = dash->mpd_fetch_time + (gf_sys_clock() - dash->last_update_time) - availabilityStartTime;
 
@@ -5153,6 +6375,17 @@
 }
 
 GF_EXPORT
+Bool gf_dash_group_get_srd_max_size_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group || !group->srd_desc || !max_width || !max_height) return GF_FALSE;
+
+	*max_width = group->srd_desc->width;
+	*max_height = group->srd_desc->height;
+	return GF_TRUE;
+}
+
+GF_EXPORT
 GF_Err gf_dash_set_min_timeout_between_404(GF_DashClient *dash, u32 min_timeout_between_404)
 {
 	if (!dash) return GF_BAD_PARAM;
@@ -5233,7 +6466,7 @@
 		for (j=0; j<gf_list_count(group->adaptation_set->representations); j++) {
 			GF_Err e;
 			rep = gf_list_get(group->adaptation_set->representations, j);
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL);
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL, NULL, NULL);
 			if (e)
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media template URL: %s\n", gf_error_to_string(e)));
 
@@ -5369,7 +6602,7 @@
 				//we are too late resync...
 			}
 
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Sync to live was lost - reloading MPD\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Sync to live was lost - reloading MPD (loop detected %d)\n", loop_detected));
 			for (i=0; i< gf_list_count(dash->groups); i++) {
 				group = gf_list_get(dash->groups, i);
 				//force reinit of timeline for this group
@@ -5639,10 +6872,80 @@
 }
 
 GF_EXPORT
-u32 gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash)
+Double gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash)
 {
-	return dash ? dash->prev_time_in_tsb : 0;
+	return dash ? dash->prev_time_in_tsb / 1000.0 : 0.0;
+}
+
+GF_EXPORT
+void gf_dash_set_codec_stat(GF_DashClient *dash, u32 idx, u32 avg_dec_time, u32 max_dec_time, u32 irap_avg_dec_time, u32 irap_max_dec_time, Bool codec_reset, Bool decode_only_rap)
+{
+	GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, idx);
+	if (!group) return;
+	group->avg_dec_time = avg_dec_time;
+	group->max_dec_time = max_dec_time;
+	group->irap_avg_dec_time = irap_avg_dec_time;
+	group->irap_max_dec_time = irap_max_dec_time;
+	group->codec_reset = codec_reset;
+	group->decode_only_rap = decode_only_rap;
+}
+
+GF_EXPORT
+void gf_dash_set_buffer_levels(GF_DashClient *dash, u32 idx, u32 buffer_min_ms, u32 buffer_max_ms, u32 buffer_occupancy_ms)
+{
+	GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, idx);
+	if (!group) return;
+	group->buffer_min_ms = buffer_min_ms;
+	group->buffer_max_ms = buffer_max_ms;
+	group->buffer_occupancy_ms = buffer_occupancy_ms;
 }
 
-#endif //GPAC_DISABLE_DASH_CLIENT
 
+GF_EXPORT
+void gf_dash_disable_speed_adaptation(GF_DashClient *dash, Bool disable)
+{
+	dash->disable_speed_adaptation = disable;
+}
+
+GF_EXPORT
+void gf_dash_override_ntp(GF_DashClient *dash, u64 server_ntp)
+{
+	if (server_ntp) {
+		dash->utc_drift_estimate = gf_net_get_ntp_diff_ms(server_ntp);
+		dash->ntp_forced = 1;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Overwriting local NTP "LLU" to given one "LLU"\n", gf_net_get_ntp_ts(), server_ntp));
+	} else {
+		dash->utc_drift_estimate = 0;
+		dash->ntp_forced = 0;
+	}
+}
+
+GF_EXPORT
+void gf_dash_set_tile_adaptation_mode(GF_DashClient *dash, GF_DASHTileAdaptationMode mode, u32 tile_rate_decrease)
+{
+	u32 i;
+	dash->tile_adapt_mode = mode;
+	dash->tile_rate_decrease = (tile_rate_decrease<100) ? tile_rate_decrease : 100;
+	for (i=0; i<gf_list_count(dash->groups); i++) {
+		GF_DASH_Group *group = (GF_DASH_Group *)gf_list_get(dash->groups, i);
+		if (group->srd_desc) gf_dash_set_tiles_quality(dash, group->srd_desc);
+	}
+}
+
+GF_EXPORT
+Bool gf_dash_group_get_srd_info(GF_DashClient *dash, u32 idx, u32 *srd_id, u32 *srd_x, u32 *srd_y, u32 *srd_w, u32 *srd_h, u32 *srd_width, u32 *srd_height)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group || !group->srd_w) return GF_FALSE;
+	if (srd_id) (*srd_id) = 0;
+	if (srd_x) (*srd_x) = group->srd_x;
+	if (srd_y) (*srd_y) = group->srd_y;
+	if (srd_w) (*srd_w) = group->srd_w;
+	if (srd_h) (*srd_h) = group->srd_h;
+	if (srd_width) (*srd_width) = 0;
+	if (srd_height) (*srd_height) = 0;
+
+	return GF_TRUE;
+}
+
+#endif //GPAC_DISABLE_DASH_CLIENT

v0.5.2.tar.gz/src/media_tools/dash_segmenter.c -> v0.6.1.tar.gz/src/media_tools/dash_segmenter.c Changed

@@ -41,6 +41,7 @@
 #define GPAC_DISABLE_MPEG2TS
 #endif
 
+//#define GENERATE_VIRTUAL_REP_SRD
 
 typedef struct _dash_segment_input GF_DashSegInput;
 
@@ -58,51 +59,90 @@
 	char *lang;
 };
 
-typedef struct
+struct __gf_dash_segmenter
 {
+	char *mpd_name;
+	GF_DashSegInput *inputs;
+	u32 nb_inputs;
+	GF_DashProfile profile;
+	char *title;
+	char *location;
+	char *source;
+	char *copyright;
+	char *moreInfoURL;
+	//has to be freed
+	char **base_urls;
+	u32 nb_base_urls;
+
+	u32 use_url_template;
+	Bool use_segment_timeline;
+	Bool single_segment;
+	Bool single_file;
+	GF_DashSwitchingMode bitstream_switching_mode;
+	Bool segments_start_with_rap;
+
 	Double segment_duration;
-	Double subduration;
+	Bool segment_duration_strict;
 	Double fragment_duration;
+	//has to be freed
+	char *seg_rad_name;
+	const char *seg_ext;
+	u32 segment_marker_4cc;
+	Bool enable_sidx;
+	u32 subsegs_per_sidx;
+	Bool daisy_chain_sidx;
 
+	Bool fragments_start_with_rap;
+	char *tmpdir;
+	GF_DashDynamicMode dash_mode;
+	Double mpd_update_time;
+	s32 time_shift_depth;
+	Double min_buffer;
+	s32 ast_offset_ms;
 	u32 dash_scale;
+	Bool fragments_in_memory;
+	u32 initial_moof_sn;
+	u64 initial_tfdt;
+	Bool no_fragments_defaults;
+	Bool pssh_moof;
+	Bool samplegroups_in_traf;
+	Bool single_traf_per_moof;
+	Double mpd_live_duration;
+	Bool insert_utc;
+	Bool real_time;
+	const char *dash_profile_extension;
+
+	GF_Config *dash_ctx;
+
+
+	Double subduration;
 
-	Bool segments_start_with_rap;
 	FILE *mpd;
-	const char *mpd_name, *seg_rad_name, *seg_ext;
-	s32 subsegs_per_sidx;
-	Bool daisy_chain_sidx;
-	u32 use_url_template;
-	Bool use_segment_timeline;
+	Bool segment_alignment_disabled;
 	u32 single_file_mode;
-	u32 segment_marker_4cc;
-	s32 time_shift_depth;
 	const char *bs_switch_segment_file;
 	Bool inband_param_set;
+	Bool force_period_end;
 
 	/*set if seg_rad_name depends on input file name (had %s in it). In this case, SegmentTemplate cannot be used at adaptation set level*/
 	Bool variable_seg_rad_name;
 
-	Bool fragments_start_with_rap;
-	Bool memory_mode;
-	Bool pssh_moof;
+	GF_DASH_ContentLocationMode cp_location_mode;
 
-	GF_Config *dash_ctx;
-	const char *tmpdir;
-	u32 initial_moof_sn;
-	u64 initial_tfdt;
-	Bool no_fragments_defaults;
-	Bool samplegroups_in_traf;
-	Bool single_traf_per_moof;
-	Bool content_protection_in_rep;
-} GF_DASHSegmenterOptions;
+	Double max_segment_duration;
+
+};
 
 struct _dash_segment_input
 {
 	char *file_name;
 	char representationID[100];
-	char periodID[100];
-	char xlink[100];
-	char role[100];
+	char *periodID;
+	Double media_duration; /*forced media duration*/
+	u32 nb_baseURL;
+	char **baseURL;
+	char *xlink;
+	char *role;
 	u32 nb_rep_descs;
 	char **rep_descs;
 	u32 nb_as_descs;
@@ -113,7 +153,7 @@
 	char **p_descs;
 	u32 bandwidth;
 	u32 dependency_bandwidth;
-	char dependencyID[100];
+	char *dependencyID;
 
 	/*if 0, input is disabled*/
 	u32 adaptation_set;
@@ -127,9 +167,9 @@
 	/*media-format specific functions*/
 	/*assigns the different media to the same adaptation set or group than the input_idx one*/
 	GF_Err (* dasher_input_classify) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type);
-	GF_Err ( *dasher_get_components_info) (GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *opts);
-	GF_Err ( *dasher_create_init_segment) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenterOptions *dash_opts, Bool *disable_bs_switching);
-	GF_Err ( *dasher_segment_file) (GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *opts, Bool first_in_set);
+	GF_Err ( *dasher_get_components_info) (GF_DashSegInput *dash_input, GF_DASHSegmenter *opts);
+	GF_Err ( *dasher_create_init_segment) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenter *dash_opts, GF_DashSwitchingMode bs_switch_mode, Bool *disable_bs_switching);
+	GF_Err ( *dasher_segment_file) (GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *opts, Bool first_in_set);
 
 	/*shall be set after call to dasher_input_classify*/
 	char szMime[50];
@@ -142,6 +182,11 @@
 
 	u32 protection_scheme_type;
 
+#ifdef GENERATE_VIRTUAL_REP_SRD
+	Bool virtual_representation;
+#endif
+
+	Double segment_duration;
 	/*all these shall be set after call to dasher_get_components_info*/
 	Double duration;
 	struct _dash_component components[20];
@@ -151,6 +196,17 @@
 	u32 x, y, w, h;
 
 	Bool disable_inband_param_set;
+
+	Bool period_id_not_specified;
+
+	Bool init_segment_generated;
+	char *init_seg_url;
+	Bool use_bs_switching;
+
+
+	Bool get_component_info_done;
+	//cached isobmf input
+	GF_ISOFile *isobmf_input;
 };
 
 
@@ -170,7 +226,7 @@
 			char_template+=1;	\
 
 GF_EXPORT
-GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_name, const char *rep_id, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
+GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
 {
 	char szFmt[20];
 	Bool has_number= GF_FALSE;
@@ -183,30 +239,28 @@
 	char tmp[100];
 	strcpy(segment_name, "");
 
-	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$ID$") || strstr(seg_rad_name, "$Bandwidth$")))
+	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$Bandwidth$")))
 		needs_init = GF_FALSE;
 
 	if (!seg_rad_name) {
-		strcpy(segment_name, output_file_name);
+		strcpy(segment_name, output_file_name); //already contains base_url
 	} else {
+		char c;
+		const size_t seg_rad_name_len = strlen(seg_rad_name);
+		while (char_template <= seg_rad_name_len) {
+			c = seg_rad_name[char_template];
 
-		while (1) {
-			char c = seg_rad_name[char_template];
-			if (!c) break;
-
-			if (!is_template && !is_init_template
-			 && (!strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18) || !strnicmp(& seg_rad_name[char_template], "$ID$", 4))
-			 ) {
-				char_template+=18;
+			if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18) ) {
+				char_template += 18;
 				strcat(segment_name, rep_id);
-				needs_init=GF_FALSE;
+				needs_init = GF_FALSE;
 			}
 			else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
 				EXTRACT_FORMAT(10);
 
 				sprintf(tmp, szFmt, bandwidth);
 				strcat(segment_name, tmp);
-				needs_init=GF_FALSE;
+				needs_init = GF_FALSE;
 			}
 			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
 				EXTRACT_FORMAT(5);
@@ -216,7 +270,7 @@
 				strcat(szFmt, &LLD[1]);
 				sprintf(tmp, szFmt, start_time);
 				strcat(segment_name, tmp);
-				has_number=1;
+				has_number = GF_TRUE;
 			}
 			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
 				EXTRACT_FORMAT(7);
@@ -224,14 +278,14 @@
 				if (is_init || is_init_template) continue;
 				sprintf(tmp, szFmt, segment_number);
 				strcat(segment_name, tmp);
-				has_number=GF_TRUE;
+				has_number = GF_TRUE;
 			}
 			else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
 				char *sep = strchr(seg_rad_name + char_template+6, '$');
 				if (sep) sep[0] = 0;
 				if (is_init || is_init_template) {
 					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init=GF_FALSE;
+					needs_init = GF_FALSE;
 				}
 				char_template += (u32) strlen(seg_rad_name + char_template)+1;
 				if (sep) sep[0] = '$';
@@ -241,7 +295,7 @@
 				if (sep) sep[0] = 0;
 				if (is_index) {
 					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init=GF_FALSE;
+					needs_init = GF_FALSE;
 				}
 				char_template += (u32) strlen(seg_rad_name + char_template)+1;
 				if (sep) sep[0] = '$';
@@ -249,10 +303,32 @@
 
 			else {
 				char_template+=1;
+				if (c=='\\') c = '/';
+
 				sprintf(tmp, "%c", c);
 				strcat(segment_name, tmp);
 			}
 		}
+
+		//take care of base_url, if any
+		if (gf_url_is_local(base_url)) {
+			const char *name;
+			char tmp_segment_name[GF_MAX_PATH], tmp_path[GF_MAX_PATH], tmp_path2[GF_MAX_PATH];
+			name = gf_url_get_resource_name(segment_name);
+			gf_url_get_resource_path(segment_name, tmp_path);
+			strcpy(tmp_segment_name, name);
+			gf_url_get_resource_path(base_url, tmp_path2);
+			if (tmp_path2[strlen(tmp_path2)] != GF_PATH_SEPARATOR) {
+				char ext[2];
+				ext[0] = GF_PATH_SEPARATOR;
+				ext[1] = 0;
+				strcat(tmp_path2, ext);
+			}
+			segment_name[0] = '\0';
+			strcat(segment_name, tmp_path);
+			strcat(segment_name, tmp_path2);
+			strcat(segment_name, tmp_segment_name);
+		}
 	}
 
 	if (is_template && ( ! use_segment_timeline || !strstr(seg_rad_name, "$Time")) && !strstr(seg_rad_name, "$Number"))
@@ -269,15 +345,46 @@
 		strcat(segment_name, ".");
 		strcat(segment_name, seg_ext);
 	}
+
+	if ((seg_type != GF_DASH_TEMPLATE_TEMPLATE) && (seg_type != GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE)) {
+		char *sep = strrchr(segment_name, '/');
+		if (sep) {
+			char c = sep[0];
+			sep[0] = 0;
+			if (!gf_dir_exists(segment_name)) {
+				gf_mkdir(segment_name);
+			}
+			sep[0] = c;
+		}
+	}
+
 	return GF_OK;
 }
 
-GF_Err gf_dasher_store_segment_info(GF_DASHSegmenterOptions *dash_cfg, const char *SegmentName, Double segStartTime)
+const char *gf_dasher_strip_output_dir(const char *mpd_url, const char *path)
+{
+	char c;
+	const char *res;
+	char *sep = strrchr(mpd_url, '/');
+	if (!sep) sep = strrchr(mpd_url, '\\');
+	if (!sep) return path;
+	c = sep[0];
+	sep[0] = 0;
+	if (!strncmp(mpd_url, path, strlen(mpd_url))) {
+		res = path + strlen(mpd_url) + 1;
+	} else {
+		res = path;
+	}
+	sep[0] = c;
+	return res;
+}
+
+GF_Err gf_dasher_store_segment_info(GF_DASHSegmenter *dash_cfg, const char *representationID, const char *SegmentName, u64 segStartTime, u64 segEndTime)
 {
 	char szKey[512];
 	if (!dash_cfg->dash_ctx) return GF_OK;
 
-	sprintf(szKey, "%g", segStartTime);
+	sprintf(szKey, ""LLU"-"LLU"@%s", segStartTime, segEndTime-segStartTime, representationID);
 	return gf_cfg_set_key(dash_cfg->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
 }
 
@@ -285,7 +392,7 @@
 #ifndef GPAC_DISABLE_ISOM
 
 GF_EXPORT
-GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec)
+GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec, Bool force_inband, Bool force_sbr)
 {
 	GF_ESD *esd;
 	GF_AVCConfig *avcc;
@@ -324,6 +431,19 @@
 			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 				/*5 first bits of AAC config*/
 				u8 audio_object_type = (esd->decoderConfig->decoderSpecificInfo->data[0] & 0xF8) >> 3;
+#ifndef GPAC_DISABLE_AV_PARSERS
+				if (force_sbr && (audio_object_type==2) ) {
+					GF_M4ADecSpecInfo a_cfg;
+					GF_Err e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
+					if (e==GF_OK) {
+						if (a_cfg.sbr_sr)
+							audio_object_type = a_cfg.sbr_object_type;
+						if (a_cfg.has_ps)
+							audio_object_type = 29;
+					}
+				}
+#endif
+
 				sprintf(szCodec, "mp4a.%02x.%01d", esd->decoderConfig->objectTypeIndication, audio_object_type);
 			} else {
 				sprintf(szCodec, "mp4a.%02x", esd->decoderConfig->objectTypeIndication);
@@ -352,7 +472,14 @@
 	case GF_ISOM_SUBTYPE_AVC2_H264:
 	case GF_ISOM_SUBTYPE_AVC3_H264:
 	case GF_ISOM_SUBTYPE_AVC4_H264:
+		//FIXME: in avc1 with multiple descriptor, we should take the right description index
 		avcc = gf_isom_avc_config_get(movie, track, 1);
+		if (force_inband) {
+			if (subtype==GF_ISOM_SUBTYPE_AVC_H264)
+				subtype = GF_ISOM_SUBTYPE_AVC3_H264;
+			else if (subtype==GF_ISOM_SUBTYPE_AVC2_H264)
+				subtype = GF_ISOM_SUBTYPE_AVC4_H264;
+		}
 		sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
 		gf_odf_avc_cfg_del(avcc);
 		return GF_OK;
@@ -369,10 +496,20 @@
 	case GF_ISOM_SUBTYPE_HVT1:
 	case GF_ISOM_SUBTYPE_SHC1:
 	case GF_ISOM_SUBTYPE_SHV1:
+
+		if (force_inband) {
+			if (subtype==GF_ISOM_SUBTYPE_HVC1) subtype = GF_ISOM_SUBTYPE_HEV1;
+			else if (subtype==GF_ISOM_SUBTYPE_HVC2) subtype = GF_ISOM_SUBTYPE_HEV2;
+		}
 		hvcc = gf_isom_hevc_config_get(movie, track, 1);
 		if (!hvcc) {
 			hvcc = gf_isom_shvc_config_get(movie, track, 1);
 		}
+		if (subtype==GF_ISOM_SUBTYPE_HVT1) {
+			u32 refTrack;
+			gf_isom_get_reference(movie, track, GF_ISOM_REF_TBAS, 1, &refTrack);
+			hvcc = gf_isom_hevc_config_get(movie, refTrack, 1);
+		}
 		if (hvcc) {
 			u8 c;
 			char szTemp[40];
@@ -389,6 +526,7 @@
 				u32 i, res = 0;
 				for (i=0; i<32; i++) {
 					res |= val & 1;
+					if (i==31) break;
 					res <<= 1;
 					val >>=1;
 				}
@@ -466,6 +604,7 @@
 	Bool all_sample_raps, splitable;
 	u32 split_sample_dts_shift;
 	s32 media_time_to_pres_time_shift;
+	u64 min_cts_in_segment;
 } GF_ISOMTrackFragmenter;
 
 static u64 isom_get_next_sap_time(GF_ISOFile *input, u32 track, u32 sample_count, u32 sample_num)
@@ -521,7 +660,80 @@
 	return GF_OK;
 }
 
-static GF_Err gf_media_isom_segment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, GF_DASHSegmenterOptions *dash_cfg, GF_DashSegInput *dash_input, Bool first_in_set)
+static void gf_dash_append_segment_timeline(GF_BitStream *mpd_timeline_bs, u64 segment_start, u64 segment_end, u64 *previous_segment_duration , Bool *first_segment_in_timeline,u32 *segment_timeline_repeat_count)
+{
+	char szMPDTempLine[2048];
+	u64 segment_dur = segment_end - segment_start;
+	if (*previous_segment_duration == segment_dur) {
+		*segment_timeline_repeat_count = *segment_timeline_repeat_count + 1;
+		return;
+	}
+
+	if (*previous_segment_duration) {
+		if (*segment_timeline_repeat_count) {
+			sprintf(szMPDTempLine, " r=\"%d\"/>\n", *segment_timeline_repeat_count);
+		} else {
+			sprintf(szMPDTempLine, "/>\n");
+		}
+		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+	}
+	*previous_segment_duration = segment_dur;
+	if (*first_segment_in_timeline) {
+		sprintf(szMPDTempLine, " <S t=\""LLU"\" d=\""LLU"\"", segment_start, segment_dur);
+		*first_segment_in_timeline = GF_FALSE;
+	} else {
+		sprintf(szMPDTempLine, " <S d=\""LLU"\"", segment_dur);
+	}
+	gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+	*segment_timeline_repeat_count = 0;
+}
+
+static void gf_dash_load_segment_timeline(GF_DASHSegmenter *dash_cfg, GF_BitStream *mpd_timeline_bs, const char *representationID, u64 *previous_segment_duration , Bool *first_segment_in_timeline,u32 *segment_timeline_repeat_count)
+{
+	u32 i, count;
+	char szRepID[100];
+
+	*first_segment_in_timeline = GF_TRUE;
+	*segment_timeline_repeat_count = 0;
+	*previous_segment_duration = 0;
+
+	count = gf_cfg_get_key_count(dash_cfg->dash_ctx, "SegmentsStartTimes");
+	for (i=0; i<count; i++) {
+		u64 start, dur;
+		const char *fileName = gf_cfg_get_key_name(dash_cfg->dash_ctx, "SegmentsStartTimes", i);
+		const char *MPDTime = gf_cfg_get_key(dash_cfg->dash_ctx, "SegmentsStartTimes", fileName);
+		if (!fileName)
+			break;
+
+		sscanf(MPDTime, ""LLU"-"LLU"@%s", &start, &dur, szRepID);
+		if (strcmp(representationID, szRepID)) continue;
+
+		gf_dash_append_segment_timeline(mpd_timeline_bs, start, start+dur, previous_segment_duration, first_segment_in_timeline, segment_timeline_repeat_count);
+	}
+}
+
+static u64 get_presentation_time(u64 media_time, s32 ts_shift)
+{
+	if ((ts_shift<0) && (media_time < -ts_shift)) {
+		media_time = 0;
+	} else {
+		media_time += ts_shift;
+	}
+	return media_time ;
+}
+
+static Bool is_splitable(u32 media_type) {
+	switch (media_type) {
+	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+		return GF_TRUE;
+	default:
+		return GF_FALSE;
+	}
+}
+
+static GF_Err gf_media_isom_segment_file(GF_ISOFile *input, const char *output_file, GF_DASHSegmenter *dash_cfg, GF_DashSegInput *dash_input, Bool first_in_set)
 {
 	u8 NbBits;
 	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done;
@@ -533,13 +745,16 @@
 	char sOpt[100], sKey[100];
 	char szCodecs[200], szCodec[100];
 	u32 cur_seg, fragment_index, max_sap_type;
+//	u32 first_seg;
 	GF_ISOFile *output, *bs_switch_segment;
 	GF_ISOSample *sample, *next;
 	GF_List *fragmenters;
-	u64 MaxFragmentDuration, MaxSegmentDuration, SegmentDuration, maxFragDurationOverSegment;
+	u64 MaxFragmentDuration, MaxSegmentDuration, period_duration;
+	Double segment_start_time, SegmentDuration, maxFragDurationOverSegment;
 	u64 presentationTimeOffset = 0;
-	Double segment_start_time, file_duration, period_duration, max_segment_duration;
+	Double file_duration, max_segment_duration;
 	u32 nb_segments, width, height, sample_rate, nb_channels, sar_w, sar_h, fps_num, fps_denum, startNumber;
+	u32 nbFragmentInSegment = 0;
 	char *langCode = NULL;
 	u32 index_start_range, index_end_range;
 	Bool force_switch_segment = GF_FALSE;
@@ -552,6 +767,7 @@
 	Bool simulation_pass = GF_FALSE;
 	Bool init_segment_deleted = GF_FALSE;
 	Bool first_segment_in_timeline = GF_TRUE;
+	Bool store_utc = GF_FALSE;
 	u64 previous_segment_duration = 0;
 	u32 segment_timeline_repeat_count = 0;
 	//u64 last_ref_cts = 0;
@@ -575,26 +791,45 @@
 	u32 *segments_info = NULL;
 	u32 nb_segments_info = 0;
 	u32 protected_track = 0;
-	u64 min_seg_dur, max_seg_dur, total_seg_dur;
-	Bool audio_only = GF_TRUE;
+	Double min_seg_dur, max_seg_dur, total_seg_dur, last_seg_dur;
 	Bool is_bs_switching = GF_FALSE;
 	Bool use_url_template = dash_cfg->use_url_template;
 	const char *seg_rad_name = dash_cfg->seg_rad_name;
 	const char *seg_ext = dash_cfg->seg_ext;
 	const char *bs_switching_segment_name = NULL;
-
+	u64 generation_start_ntp = 0;
+	u64 generation_start_utc = 0;
+	u64 ntpts = 0;
 	SegmentName[0] = 0;
 	SegmentDuration = 0;
 	nb_samp = 0;
 	fragmenters = NULL;
 	if (!seg_ext) seg_ext = "m4s";
 
+	if (dash_cfg->real_time && dash_cfg->dash_ctx) {
+		u32 sec, frac;
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "GenerationNTP");
+		sscanf(opt, "%u:%u", &sec, &frac);
+		generation_start_ntp = sec;
+		generation_start_ntp <<= 32;
+		generation_start_ntp |= frac;
+
+		generation_start_utc = sec - GF_NTP_SEC_1900_TO_1970;
+		generation_start_utc *= 1000;
+		generation_start_utc += ((u64) frac) * 1000 / 0xFFFFFFFFUL;
+	}
+
+	if (dash_cfg->insert_utc) {
+		ntpts = gf_net_get_ntp_ts();
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Sampling NTP TS "LLU" at "LLU" us, at UTC "LLU"\n", ntpts, gf_sys_clock_high_res(), gf_net_get_utc()));
+	}
+
 	bs_switch_segment = NULL;
 	if (dash_cfg->bs_switch_segment_file) {
 		bs_switch_segment = gf_isom_open(dash_cfg->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
 		if (bs_switch_segment) {
-			bs_switching_segment_name = gf_url_get_resource_name(dash_cfg->bs_switch_segment_file);
-			is_bs_switching = 1;
+			bs_switching_segment_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->bs_switch_segment_file);
+			is_bs_switching = GF_TRUE;
 		}
 	}
 
@@ -608,7 +843,11 @@
 
 	//create output file
 	/*need to precompute bandwidth*/
-	if (!bandwidth && seg_rad_name && strstr(seg_rad_name, "$Bandwidth$")) {
+	if ((!bandwidth && seg_rad_name && strstr(seg_rad_name, "$Bandwidth$"))
+#ifdef GENERATE_VIRTUAL_REP_SRD
+	 || dash_input->virtual_representation
+#endif
+	 ) {
 		for (i=0; i<gf_isom_get_track_count(input); i++) {
 			Double tk_dur = (Double) gf_isom_get_media_duration(input, i+1);
 			tk_dur /= gf_isom_get_media_timescale(input, i+1);
@@ -630,9 +869,9 @@
 	opt = dash_cfg->dash_ctx ? gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment") : NULL;
 	if (opt) {
 		output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, dash_cfg->tmpdir);
-		dash_moov_setup = 1;
+		dash_moov_setup = GF_TRUE;
 	} else {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->nb_baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
 		output = gf_isom_open(SegmentName, GF_ISOM_OPEN_WRITE, dash_cfg->tmpdir);
 	}
 	if (!output) {
@@ -659,28 +898,72 @@
 	} else if (dash_cfg->dash_ctx) {
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching");
 		if (opt && !strcmp(opt, "yes")) {
-			is_bs_switching = 1;
+			is_bs_switching = GF_TRUE;
 			if (bs_switch_segment)
 				gf_isom_delete(bs_switch_segment);
 			bs_switch_segment = output;
-			bs_switching_is_output = 1;
-			bs_switching_segment_name = gf_url_get_resource_name(gf_isom_get_filename(bs_switch_segment));
+			bs_switching_is_output = GF_TRUE;
+			bs_switching_segment_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, gf_isom_get_filename(bs_switch_segment));
 		}
 
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth");
 		if (opt) sscanf(opt, "%u", &bandwidth);
+
+		if (dash_cfg->use_segment_timeline) {
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NbSegmentsRemoved");
+			if (opt) {
+				u32 nb_removed = atoi(opt);
+				startNumber = 1 + nb_removed;
+			}
+		}
 	}
+
 	mpd_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (first_in_set && dash_cfg->use_segment_timeline) {
+	//if segment alignment not set or if first in AS, create SegmentTimeline
+	if (dash_cfg->use_segment_timeline && (first_in_set || dash_cfg->segment_alignment_disabled) ) {
 		mpd_timeline_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		sprintf(szMPDTempLine, " <SegmentTimeline>\n");
 		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+
+		if (dash_cfg->dash_ctx) {
+			gf_dash_load_segment_timeline(dash_cfg, mpd_timeline_bs, dash_input->representationID, &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
+		}
 	}
 
+	szCodecs[0] = 0;
 	nb_sync = 0;
 	nb_samp = 0;
 	fragmenters = gf_list_new();
 
+
+#ifdef GENERATE_VIRTUAL_REP_SRD
+	if (dash_input->virtual_representation) {
+		char *virtual_url;
+		FILE *vseg;
+		GF_BitStream *bs;
+		gf_media_get_rfc_6381_codec_name(input, dash_input->trackNum , szCodec, dash_cfg->inband_param_set, GF_TRUE);
+		if (strlen(szCodecs)) strcat(szCodecs, ",");
+		strcpy(szCodecs, szCodec);
+
+		sprintf(SegmentName, "virtual_rep_%d_segment.m4s", dash_input->idx_representations);
+		virtual_url = gf_url_concatenate(output_file, SegmentName);
+		vseg = gf_fopen(virtual_url, "w");
+		bs = gf_bs_from_file(vseg, GF_BITSTREAM_WRITE);
+		gf_bs_write_u32(bs, 20);
+		gf_bs_write_u32(bs, GF_4CC('s','t','y','p'));
+		gf_bs_write_u32(bs, GF_4CC('m','s','d','h'));
+		gf_bs_write_u32(bs, 0);
+		gf_bs_write_u32(bs, GF_4CC('m','s','d','h'));
+		gf_bs_del(bs);
+		gf_fclose(vseg);
+
+		gf_free(virtual_url);
+
+		output = NULL;
+		goto restart_fragmentation_pass;
+	}
+#endif
+
 	if (! dash_moov_setup) {
 		e = gf_isom_clone_movie(input, output, GF_FALSE, GF_FALSE, !dash_cfg->pssh_moof );
 		if (e) goto err_exit;
@@ -696,7 +979,7 @@
 
 	}
 
-	MaxFragmentDuration = (u32) (dash_cfg->dash_scale * max_duration_sec);
+	MaxFragmentDuration = (u32) (dash_cfg->dash_scale * dash_cfg->fragment_duration);
 	MaxSegmentDuration = (u32) (dash_cfg->dash_scale * dash_cfg->segment_duration);
 
 	/*in single segment mode, only one big SIDX is written between the end of the moov and the first fragment.
@@ -717,7 +1000,6 @@
 	file_duration = 0;
 	width = height = sample_rate = nb_channels = sar_w = sar_h = fps_num = fps_denum = 0;
 	langCode = NULL;
-	szCodecs[0] = 0;
 
 
 	mpd_timescale = nb_video = nb_audio = nb_text = nb_scene = 0;
@@ -800,8 +1082,6 @@
 		else if (mtype == GF_ISOM_MEDIA_SCENE) nb_scene++;
 		else if (mtype == GF_ISOM_MEDIA_DIMS) nb_scene++;
 
-		if (mtype != GF_ISOM_MEDIA_AUDIO) audio_only = GF_FALSE;
-
 		//setup fragmenters
 		if (! dash_moov_setup) {
 			//new initialization segment, setup fragmentation
@@ -823,7 +1103,7 @@
 			 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 		}
 
-		gf_media_get_rfc_6381_codec_name(bs_switch_segment ? bs_switch_segment : input, i+1, szCodec);
+		gf_media_get_rfc_6381_codec_name(input, i+1, szCodec, dash_cfg->inband_param_set, GF_TRUE);
 		if (strlen(szCodecs)) strcat(szCodecs, ",");
 		strcat(szCodecs, szCodec);
 
@@ -919,7 +1199,7 @@
 				/*more than one sampleDesc, we will need to indicate all the sample descs in the file in case we produce a single file,
 				otherwise the file would not be compliant*/
 				if (s_count > 1) {
-					gf_isom_clone_sample_descriptions(output, TrackNum, bs_switch_segment, sample_descs_track, 1);
+					gf_isom_clone_sample_descriptions(output, TrackNum, bs_switch_segment, sample_descs_track, GF_TRUE);
 				}
 
 				/*and search in new ones the new index*/
@@ -948,12 +1228,13 @@
 				presentationTimeOffset = tf->InitialTSOffset;
 		}
 
+		tf->splitable = is_splitable(mtype);
+
 		/*get language, width/height/layout info, audio info*/
 		switch (mtype) {
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
 		case GF_ISOM_MEDIA_MPEG_SUBT:
-			tf->splitable = GF_TRUE;
 			gf_isom_get_media_language(input, i+1, &langCode);
 		case GF_ISOM_MEDIA_VISUAL:
 		case GF_ISOM_MEDIA_SCENE:
@@ -1028,12 +1309,23 @@
 	}
 
 	//if single segment, add msix brand if we use indexes
-	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), ((dash_cfg->single_file_mode==1) && (dash_cfg->subsegs_per_sidx>=0)) ? 1 : 0);
+	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), ((dash_cfg->single_file_mode==1) && dash_cfg->enable_sidx) ? 1 : 0);
 
 	//flush movie
 	e = gf_isom_finalize_for_fragment(output, 1);
 	if (e) goto err_exit;
 
+	nb_done = 0;
+	for (i=0; i<gf_list_count(fragmenters); i++) {
+		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+		if (tf->SampleCount)
+			nb_done += tf->SampleCount - tf->SampleNum - 1;
+	}
+	if (!nb_done) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No samples in movie, rewriting moof and exit\n"));
+		goto err_exit;
+	}
+
 	start_range = 0;
 	file_size = gf_isom_get_file_size(bs_switch_segment ? bs_switch_segment : output);
 	end_range = file_size - 1;
@@ -1068,8 +1360,9 @@
 
 	if (!seg_rad_name) use_url_template = GF_FALSE;
 
-	cur_seg=1;
-	fragment_index=1;
+	//first_seg = 1;
+	cur_seg = 1;
+	fragment_index = 1;
 	if (dash_input->moof_seqnum_increase) {
 		fragment_index = dash_input->moof_seqnum_increase * dash_input->idx_representations + 1;
 	}
@@ -1095,11 +1388,14 @@
 		}
 
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
-		if (opt) cur_seg = atoi(opt);
+		if (opt) {
+			cur_seg = atoi(opt);
+			//first_seg = cur_seg;
+		}
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex");
 		if (opt) fragment_index = atoi(opt);
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration");
-		if (opt) period_duration = atof(opt);
+		if (opt) sscanf(opt, LLU, &period_duration);
 
 		for (i=0; i<gf_list_count(fragmenters); i++) {
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
@@ -1116,6 +1412,10 @@
 			if (opt) {
 				sscanf(opt, LLU, &tf->next_sample_dts);
 			}
+
+			sprintf(sKey, "TKID_%d_MediaTimeToPresTime", tf->TrackID);
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			if (opt) tf->media_time_to_pres_time_shift = atoi(opt);
 		}
 	}
 
@@ -1123,13 +1423,18 @@
 
 
 	max_segment_duration = 0;
-	min_seg_dur = max_seg_dur = total_seg_dur = 0;
+	min_seg_dur = max_seg_dur = total_seg_dur = last_seg_dur = 0;
 
 	while ( (count = gf_list_count(fragmenters)) ) {
 		Bool store_pssh = GF_FALSE;
+#ifdef GENERATE_VIRTUAL_REP_SRD
+		if (dash_input->virtual_representation)
+			break;
+#endif
+
 		if (switch_segment) {
 			if (dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= dash_cfg->dash_scale * dash_cfg->subduration)) {
-				/*done with file (next segment will exceppe of more than half the requested subduration : store all fragmenters state and abord*/
+				/*done with file (next segment will exceed of more than half the requested subduration : store all fragmenters state and abord*/
 				break;
 			}
 
@@ -1145,21 +1450,19 @@
 			} else {
 				start_range = gf_isom_get_file_size(output);
 				if (seg_rad_name) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, (u64) ( period_duration * dash_cfg->dash_scale + segment_start_time), bandwidth, cur_seg, dash_cfg->use_segment_timeline);
-					e = gf_isom_start_segment(output, SegmentName, dash_cfg->memory_mode);
-
-					gf_dasher_store_segment_info(dash_cfg, SegmentName, period_duration + segment_start_time / (Double) dash_cfg->dash_scale);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, period_duration + (u64)segment_start_time, bandwidth, cur_seg, dash_cfg->use_segment_timeline);
+					e = gf_isom_start_segment(output, SegmentName, dash_cfg->fragments_in_memory);
 
 					/*we are in bitstream switching mode, delete init segment*/
 					if (is_bs_switching && !init_segment_deleted) {
 						init_segment_deleted = GF_TRUE;
-						if (strcmp(dash_cfg->bs_switch_segment_file, gf_isom_get_filename(output))) {
+						if (dash_cfg->bs_switch_segment_file && strcmp(dash_cfg->bs_switch_segment_file, gf_isom_get_filename(output))) {
 							gf_delete_file(gf_isom_get_filename(output));
 						}
 					}
 
 					if (!use_url_template) {
-						const char *name = gf_url_get_resource_name(SegmentName);
+						const char *name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, SegmentName);
 						sprintf(szMPDTempLine, " <SegmentURL media=\"%s\"/>\n", name );
 						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 						if (dash_cfg->dash_ctx) {
@@ -1170,10 +1473,14 @@
 						}
 					}
 				} else {
-					e = gf_isom_start_segment(output, NULL, dash_cfg->memory_mode);
+					e = gf_isom_start_segment(output, NULL, dash_cfg->fragments_in_memory);
 				}
 				if (dash_cfg->pssh_moof)
 					store_pssh = GF_TRUE;
+
+				if (tfref && dash_cfg->insert_utc) {
+					store_utc = GF_TRUE;
+				}
 			}
 
 			cur_seg++;
@@ -1184,31 +1491,37 @@
 
 		sample = NULL;
 
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, starting fragment %d\n", SegmentName, nbFragmentInSegment));
 		if (simulation_pass) {
 			segments_info[nb_segments_info-1] ++;
 			e = GF_OK;
 		} else {
-			e = gf_isom_start_fragment(output, 1);
-			if (e) goto err_exit;
 
+			e = gf_isom_start_fragment(output, GF_TRUE);
+			if (e) goto err_exit;
 
 			for (i=0; i<count; i++) {
+				u64 tfdt;
 				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 				if (tf->done) continue;
 
 				if (dash_cfg->initial_tfdt && (tf->TimeScale != dash_cfg->dash_scale)) {
 					Double scale = tf->TimeScale;
 					scale /= dash_cfg->dash_scale;
-					gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, (u64) (dash_cfg->initial_tfdt*scale) + tf->InitialTSOffset + tf->next_sample_dts);
+					tfdt = (u64) (dash_cfg->initial_tfdt*scale) + tf->InitialTSOffset + tf->next_sample_dts;
 				} else {
-					gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->InitialTSOffset + tf->next_sample_dts);
+					tfdt = tf->InitialTSOffset + tf->next_sample_dts;
 				}
+				gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tfdt);
+				if (!SegmentDuration) tf->min_cts_in_segment = (u64)-1;
+
 			}
 			if (store_pssh) {
 				store_pssh = GF_FALSE;
 				e = gf_isom_clone_pssh(output, input, GF_TRUE);
 			}
 		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, starting fragment %d track processing\n", SegmentName, nbFragmentInSegment));
 
 		//process track by track
 		for (i=0; i<count; i++) {
@@ -1217,13 +1530,13 @@
 			u32 SAP_type = 0;
 
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			if (tf == tfref)
+			if (tf->is_ref_track)
 				has_rap = GF_FALSE;
 
 			if (tf->done) continue;
 			//if not the first TRAF in our moof and single traf per moof is requested, start a new moof
 			if (!simulation_pass && dash_cfg->single_traf_per_moof && (i>0) ) {
-				e = gf_isom_start_fragment(output, 1);
+				e = gf_isom_start_fragment(output, GF_TRUE);
 				if (e) goto err_exit;
 			}
 
@@ -1270,7 +1583,7 @@
 				}
 
 				if (tf->splitable) {
-					if (tfref==tf) {
+					if (tf->is_ref_track) {
 						u64 frag_dur = (tf->FragmentLength + defaultDuration) * dash_cfg->dash_scale / tf->TimeScale;
 						/*if media segment about to be produced is longer than max segment length, force segment split*/
 						if (SegmentDuration + frag_dur > MaxSegmentDuration) {
@@ -1284,7 +1597,6 @@
 					 /*&& next do not split if no next sample */
 
 					 /*next sample DTS */
-//								&& ((tf->next_sample_dts /*+ 1 accuracy*/ ) * tfref_timescale < tfref->next_sample_dts * tf->TimeScale)
 					 && ((tf->next_sample_dts + defaultDuration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale)) {
 						split_sample_duration = defaultDuration;
 						defaultDuration = (u32) ( (tfref->next_sample_dts * tf->TimeScale)/tfref_timescale - tf->next_sample_dts );
@@ -1296,7 +1608,7 @@
 					}
 				}
 
-				if (tf==tfref) {
+				if (tf->is_ref_track) {
 					if (segments_start_with_sap && first_sample_in_segment) {
 						first_sample_in_segment = GF_FALSE;
 						if (!SAP_type) segments_start_with_sap = GF_FALSE;
@@ -1324,6 +1636,14 @@
 				if (simulation_pass) {
 					e = GF_OK;
 				} else {
+					if (tf->is_ref_track && store_utc) {
+						gf_isom_set_fragment_reference_time(output, tf->TrackID, ntpts, sample->DTS + sample->CTS_Offset + tf->media_time_to_pres_time_shift);
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, storing NTP TS "LLU" at "LLU" us, at UTC "LLU"\n", SegmentName, ntpts, gf_sys_clock_high_res(), gf_net_get_utc()));
+						ntpts = gf_net_get_ntp_ts();
+
+						store_utc = GF_FALSE;
+					}
+
 					/*override descIndex with final index used in file*/
 					descIndex = tf->finalSampleDescriptionIndex;
 					e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex,
@@ -1331,6 +1651,9 @@
 					if (e)
 						goto err_exit;
 
+					if (sample->DTS + sample->CTS_Offset < tf->min_cts_in_segment)
+						tf->min_cts_in_segment = sample->DTS + sample->CTS_Offset;
+
 					e = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
 					if (e) goto err_exit;
 
@@ -1374,7 +1697,7 @@
 				}
 
 				if (next && SAP_type) {
-					if (tf==tfref) {
+					if (tf->is_ref_track) {
 						if (split_sample_duration) {
 							stop_frag = GF_TRUE;
 						}
@@ -1390,18 +1713,32 @@
 							/*if no more SAP after this one, do not switch segment*/
 							if (next_sap_time) {
 								u32 scaler;
+//								u32 SegmentNum;
+								Double SegmentStart;
+								u64 next_sap_dur;
+								if (dash_cfg->segment_duration_strict) {
+									SegmentStart = 0;
+//									SegmentNum = 1;
+								} else {
+									SegmentStart = segment_start_time;
+//									SegmentNum = cur_seg - first_seg;
+								}
 								/*this is the fragment duration from last sample added to next SAP*/
-								frag_dur += (s64) (next_sap_time - tf->next_sample_dts - next_dur) * dash_cfg->dash_scale / tf->TimeScale;
+								next_sap_dur = frag_dur + (s64) (next_sap_time - tf->next_sample_dts - next_dur) * dash_cfg->dash_scale / tf->TimeScale;
 								/*if media segment about to be produced is longer than max segment length, force segment split*/
-								if (!tf->splitable && (SegmentDuration + frag_dur > MaxSegmentDuration)) {
+								if (!tf->splitable && (SegmentStart + SegmentDuration + next_sap_dur > SegmentStart + MaxSegmentDuration)) {
+									//if (!tf->splitable && (SegmentStart + SegmentDuration + frag_dur > MaxSegmentDuration * SegmentNum)) {
 									split_at_rap = GF_TRUE;
 									/*force new segment*/
 									force_switch_segment = GF_TRUE;
 									stop_frag = GF_TRUE;
+									if (frag_dur < MaxSegmentDuration) {
+										GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Require segment starts with RAP but segment duration is not aligned with GOP duration (%d vs %d) - using GOP duration for this segment\n", MaxSegmentDuration, frag_dur));
+									}
 								}
 
 								if (! tf->all_sample_raps) {
-									/*if adding this SAP will result in stoping the fragment "soon" after it, stop now and start with SAP
+									/*if adding this SAP will result in stopping the fragment "soon" after it, stop now and start with SAP
 									if all samples are RAPs, just stop fragment if we exceed the requested duration by adding the next sample
 									otherwise, take 3 samples (should be refined of course)*/
 									scaler = 3;
@@ -1420,26 +1757,44 @@
 
 				if (tf->SampleNum==tf->SampleCount) {
 					stop_frag = GF_TRUE;
-				} else if (tf==tfref) {
+				} else if (tf->is_ref_track) {
 					/*fragmenting on "clock" track: no drift control*/
 					if (!dash_cfg->fragments_start_with_rap || ( tf->splitable && split_sample_duration ) || ( (next && next->IsRAP) || split_at_rap) ) {
-						if (tf->FragmentLength * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale) {
+						if ((tf->FragmentLength * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale)
+						 /* if we don't split segment at rap and if the current fragment makes the segment longer than required, stop the current fragment */
+						 || (!split_seg_at_rap && (SegmentDuration + (tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale) >= MaxSegmentDuration))
+						 ) {
 							stop_frag = GF_TRUE;
+							if (split_seg_at_rap && (next && !next->IsRAP)) {
+								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Require segment starts with RAP but next segment will not be compatible\n"));
+							}
 						}
 					}
 				}
 				/*do not abort fragment if ref track is done, put everything in the last fragment*/
 				else if (!flush_all_samples) {
+					u64 ept_next;
+					u64 tref_ept_next = get_presentation_time(ref_track_next_cts, tfref->media_time_to_pres_time_shift);
+					/*get next sample dts: if greater than tref EPT, abort. This ensures that we have at most
+					one au wihth EPT less than ref EPT*/
+					u64 next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
+					if (!next_dur) next_dur = defaultDuration;
+					ept_next = get_presentation_time(tf->next_sample_dts + next_dur, tf->media_time_to_pres_time_shift);
 					/*fragmenting on "non-clock" track: drift control*/
-					if ((tf->next_sample_dts /*+1 accuracy*/) * tfref_timescale >= ref_track_next_cts * tf->TimeScale)
+					if (ept_next * tfref_timescale > tref_ept_next * tf->TimeScale)
 						stop_frag = GF_TRUE;
 				}
 
 				if (stop_frag) {
 					gf_isom_sample_del(&sample);
 					sample = next = NULL;
-					if (maxFragDurationOverSegment <= tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale) {
-						maxFragDurationOverSegment = tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale;
+
+					//only compute max dur over segment for the track used for indexing / deriving MPD start time
+					if (!tfref || (tf->is_ref_track)) {
+						Double f_dur = (Double)( tf->FragmentLength ) * dash_cfg->dash_scale / tf->TimeScale;
+						if (maxFragDurationOverSegment <= f_dur) {
+							maxFragDurationOverSegment = f_dur;
+						}
 					}
 					tf->FragmentLength = 0;
 					if (split_sample_duration)
@@ -1455,64 +1810,102 @@
 			if (tf->SampleNum==tf->SampleCount) {
 				tf->done = GF_TRUE;
 				nb_tracks_done++;
-				if (tf == tfref) {
+				if (tf->is_ref_track) {
 					tfref = NULL;
 					flush_all_samples = GF_TRUE;
 				}
 			}
 		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, done fragment %d track processing\n", SegmentName, nbFragmentInSegment));
 
 		SegmentDuration += maxFragDurationOverSegment;
-		maxFragDurationOverSegment=0;
+		maxFragDurationOverSegment = 0;
+
+		/*if no simulation and no SIDX or realtime is used, flush fragments as we write them*/
+		if (!simulation_pass && (!dash_cfg->enable_sidx || dash_cfg->real_time) ) {
+
+			if (tfref && dash_cfg->real_time) {
+				u64 utc, end_time = tfref->InitialTSOffset + tfref->next_sample_dts - tfref->DefaultDuration;
+				end_time *= 1000;
+				end_time /= tfref->TimeScale;
+
+				assert(tfref->InitialTSOffset + tfref->next_sample_dts >= tfref->DefaultDuration);
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, going to sleep before flushing fragment %d at "LLU" us, at UTC "LLU" (flush target UTC "LLU")\n", SegmentName, nbFragmentInSegment, gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + end_time));
+				while (1) {
+					//s32 diff_ms = gf_net_get_ntp_diff_ms(generation_start_ntp);
+					//if (diff_ms >= end_time) break;
+					utc = gf_net_get_utc();
+					if (utc >= generation_start_utc + end_time) break;
+					gf_sleep(1);
+				}
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, flushing fragment %d at "LLU" us, at UTC "LLU" (flush target UTC "LLU")\n", SegmentName, nbFragmentInSegment,
+				 gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + end_time));
+			}
 
-		/*if no simulation and no SIDX is used, flush fragments as we write them*/
-		if (!simulation_pass && (dash_cfg->subsegs_per_sidx<0) ) {
 			e = gf_isom_flush_fragments(output, flush_all_samples ? GF_TRUE : GF_FALSE);
 			if (e) goto err_exit;
-		}
 
-
-		//this is now disabled - we try to keep segment duration as constant and close to the requested duration as possible
-		//this code was producing much shorter segments in case segment duration was way greater than fragment duration
-		//this means we will typically end up with one shorter fragment at the end of the segment
-#if 0
-		/*next fragment will exceed segment length, abort fragment now (all samples RAPs)*/
-		if (tfref && tfref->all_sample_raps && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
-			force_switch_segment = GF_TRUE;
+			nbFragmentInSegment++;
 		}
-#endif
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d flushed\n", SegmentName, nbFragmentInSegment));
 
-		if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap || tf->splitable))) {
+		if (force_switch_segment || flush_all_samples || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || !next || next_sample_rap || tf->splitable))) {
 			if (!min_seg_dur || (min_seg_dur>SegmentDuration))
 				min_seg_dur = SegmentDuration;
 			if (max_seg_dur < SegmentDuration)
-				max_seg_dur = SegmentDuration;			
+				max_seg_dur = SegmentDuration;
 			total_seg_dur += SegmentDuration;
+			last_seg_dur = SegmentDuration;
 
 			if (mpd_timeline_bs) {
-				if (previous_segment_duration == SegmentDuration) {
-					segment_timeline_repeat_count ++;
-				} else {
-					if (previous_segment_duration) {
-						if (segment_timeline_repeat_count) {
-							sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
-						} else {
-							sprintf(szMPDTempLine, "/>\n");
+				u32 tick_adjust = 0;
+
+				//since dash scale and ref track used for segmentation may not have the same timescale we will have drift in segment timelines. Adjust it
+				if (tfref) {
+					s64 seg_start_time_min_cts = (s64) (tfref->min_cts_in_segment + tfref->media_time_to_pres_time_shift) * dash_cfg->dash_scale;
+					u64 seg_start_time_mpd = (period_duration + (u64)segment_start_time) * tfref->TimeScale;
+
+					//if first CTS in segment is less than 0, this means that we have AUs that are not presented due to edit list.
+					//adjust the segment duration accordingly.
+					if (seg_start_time_min_cts<0) {
+						s64 mpd_time_adjust = seg_start_time_min_cts / tfref->TimeScale;
+						if ((s64) SegmentDuration < - mpd_time_adjust) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Segment duration is less than media time from edit list (%d vs %d)\n", MaxSegmentDuration, -tfref->media_time_to_pres_time_shift));
+							e = GF_BAD_PARAM;
+							goto err_exit;
 						}
-						gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+						SegmentDuration += mpd_time_adjust;
+						seg_start_time_min_cts=0;
 					}
-					previous_segment_duration = SegmentDuration;
-					if (first_segment_in_timeline) {
-						sprintf(szMPDTempLine, " <S t=\""LLU"\" d=\""LLU"\"", (u64) (segment_start_time*dash_cfg->dash_scale), (u64) SegmentDuration );
-						first_segment_in_timeline = GF_FALSE;
-					} else {
-						sprintf(szMPDTempLine, " <S d=\""LLU"\"", (u64) SegmentDuration);
+
+					if (seg_start_time_mpd != seg_start_time_min_cts) {
+						//compute diff in dash timescale
+						Double diff = (Double) seg_start_time_min_cts;
+						diff -= (Double) seg_start_time_mpd;
+						diff /= tfref->TimeScale;
+
+						//if we are ahead we will adjust keep track of how many ticks we miss
+						if (diff >= 1) {
+							tick_adjust = (u32) diff;
+							if (tick_adjust > 1) {
+								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Drift between minCTS of segment and MPD start time is %g s\n", diff/dash_cfg->dash_scale));
+							}
+						}
 					}
-					gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-					segment_timeline_repeat_count = 0;
 				}
+				//adjust
+				gf_dash_append_segment_timeline(mpd_timeline_bs, period_duration + (u64)segment_start_time, (u64)(period_duration + segment_start_time + SegmentDuration + tick_adjust), &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
+				period_duration += tick_adjust;
+			}
+			if (dash_cfg->max_segment_duration * dash_cfg->dash_scale < SegmentDuration) {
+				dash_cfg->max_segment_duration = (Double) SegmentDuration;
+				dash_cfg->max_segment_duration /= dash_cfg->dash_scale;
 			}
 
+			gf_dasher_store_segment_info(dash_cfg, dash_input->representationID, SegmentName, period_duration + (u64)segment_start_time, (u64)(period_duration + segment_start_time + SegmentDuration));
+
 			segment_start_time += SegmentDuration;
 			nb_segments++;
 			/*if (max_segment_duration * dash_cfg->dash_scale <= SegmentDuration) {
@@ -1525,12 +1918,22 @@
 			split_at_rap = GF_FALSE;
 			has_rap = GF_FALSE;
 			/*restore fragment duration*/
-			MaxFragmentDuration = (u32) (max_duration_sec * dash_cfg->dash_scale);
+			MaxFragmentDuration = (u32) (dash_cfg->fragment_duration * dash_cfg->dash_scale);
 
 			if (!simulation_pass) {
 				u64 idx_start_range, idx_end_range;
+				Bool last_segment = flush_all_samples ? GF_TRUE : GF_FALSE;
+
+				if (dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= dash_cfg->dash_scale * dash_cfg->subduration)) {
+					//onDemand with subdur: if we are done dashing the content set last segment to TRUE to flush sidx
+					//live and end of period forced, force last segment
+					if (dash_cfg->force_period_end || (dash_cfg->single_file_mode==1) )
+						last_segment = GF_TRUE;
+				}
 
-				gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, flush_all_samples ? GF_TRUE : GF_FALSE, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Closing segment %s at "LLU" us, at UTC "LLU" - segment AST "LLU" (MPD AST "LLU")\n", SegmentName, gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + period_duration + (u64)segment_start_time, generation_start_utc ));
+				gf_isom_close_segment(output, dash_cfg->enable_sidx ? dash_cfg->subsegs_per_sidx : 0, dash_cfg->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, last_segment, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
+				nbFragmentInSegment = 0;
 
 				//take care of scalable reps
 				if (dash_input->moof_seqnum_increase) {
@@ -1598,12 +2001,14 @@
 	if (!switch_segment) {
 		u64 idx_start_range, idx_end_range;
 
-		total_seg_dur += SegmentDuration;
-		
 		segment_start_time += SegmentDuration;
+		total_seg_dur += SegmentDuration;
+		last_seg_dur = SegmentDuration;
 
-		gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, 1, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Closing segment %s at "LLU" us, at UTC "LLU"\n", SegmentName, gf_sys_clock_high_res(), gf_net_get_utc()));
+		gf_isom_close_segment(output, dash_cfg->enable_sidx ? dash_cfg->subsegs_per_sidx : 0, dash_cfg->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, GF_TRUE, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
 		nb_segments++;
+		nbFragmentInSegment = 0;
 
 		if (!seg_rad_name) {
 			file_size = gf_isom_get_file_size(output);
@@ -1628,6 +2033,7 @@
 			file_size += gf_isom_get_file_size(output);
 		}
 	}
+	//close timeline
 	if (mpd_timeline_bs) {
 		if (previous_segment_duration == SegmentDuration) {
 			segment_timeline_repeat_count ++;
@@ -1644,7 +2050,7 @@
 			}
 			if (SegmentDuration) {
 				if (first_segment_in_timeline) {
-					sprintf(szMPDTempLine, " <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) (segment_start_time), (u64) SegmentDuration );
+					sprintf(szMPDTempLine, " <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) segment_start_time, (u64) SegmentDuration );
 					first_segment_in_timeline = GF_FALSE;
 				} else {
 					sprintf(szMPDTempLine, " <S d=\""LLU"\"/>\n", (u64) SegmentDuration);
@@ -1657,14 +2063,22 @@
 		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 	}
 	else if (!dash_cfg->use_segment_timeline) {
+		if (3*min_seg_dur < max_seg_dur) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration variation is higher than the +/- 50%% allowed by DASH-IF (min %g, max %g) - please reconsider encoding\n", (Double) min_seg_dur / dash_cfg->dash_scale, (Double) max_seg_dur / dash_cfg->dash_scale));
+		}
 		if (dash_cfg->dash_ctx) {
-			max_segment_duration = max_duration_sec;
+			max_segment_duration = dash_cfg->segment_duration;
+			if ((Double) max_seg_dur / dash_cfg->dash_scale < dash_cfg->segment_duration) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration is smaller than required (require %g s but DASH-ing only %g s)\n", dash_cfg->segment_duration, (Double) max_seg_dur / dash_cfg->dash_scale));
+			}
 		} else {
-			if (3*min_seg_dur < max_seg_dur) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Segment duration variation is higher than the +/- 50%% allowed by DASH-IF (min %g, max %g) - please reconsider encoding\n", (Double) min_seg_dur / dash_cfg->dash_scale, (Double) max_seg_dur / dash_cfg->dash_scale));
+			if (nb_segments == 1) {
+				max_segment_duration = (Double) total_seg_dur;
+				max_segment_duration /= nb_segments * dash_cfg->dash_scale;
+			} else {
+				max_segment_duration = (Double) (total_seg_dur - last_seg_dur);
+				max_segment_duration /= (nb_segments - 1) * dash_cfg->dash_scale;
 			}
-			max_segment_duration = (Double) total_seg_dur;
-			max_segment_duration /= nb_segments * dash_cfg->dash_scale;
 		}
 	}
 
@@ -1675,12 +2089,40 @@
 	bandwidth += dash_input->dependency_bandwidth;
 	dash_input->bandwidth = bandwidth;
 
+
+	/* max segment duration */
+	if (dash_cfg->dash_ctx) {
+		Double seg_dur;
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration");
+		if (opt) {
+			seg_dur = atof(opt);
+			if (seg_dur < max_segment_duration) {
+				sprintf(sOpt, "%f", max_segment_duration);
+				gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+				seg_dur = max_segment_duration;
+			} else {
+				max_segment_duration = seg_dur;
+			}
+		} else {
+			sprintf(sOpt, "%f", max_segment_duration);
+			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+		}
+	}
+
+	if (!max_segment_duration || !dash_cfg->segment_duration_strict) {
+		max_segment_duration = dash_cfg->segment_duration;
+	}
+
+
 	if (use_url_template) {
 		/*segment template does not depend on file name, write the template at the adaptationSet level*/
 		if (!dash_cfg->variable_seg_rad_name && first_in_set) {
-			const char *rad_name = gf_url_get_resource_name(seg_rad_name);
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dash_cfg->use_segment_timeline);
+			const char *rad_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, seg_rad_name);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dash_cfg->use_segment_timeline);
 			fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timeline_bs ? dash_cfg->dash_scale : mpd_timescale, SegmentName, startNumber);
+			if (dash_cfg->ast_offset_ms<0) {
+				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			}
 			if (!dash_cfg->use_segment_timeline) {
 				if (!max_segment_duration)
 					max_segment_duration = dash_cfg->segment_duration;
@@ -1690,7 +2132,7 @@
 			if (is_bs_switching) {
 				strcpy(SegmentName, bs_switching_segment_name);
 			} else {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
 			}
 			fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
 			if (presentationTimeOffset)
@@ -1710,18 +2152,23 @@
 			}
 		}
 		/*in BS switching we share the same IS for all reps, write the SegmentTemplate for the init segment*/
-		else if ((is_bs_switching || mpd_timeline_bs) && first_in_set ) {
+		else if ((is_bs_switching || mpd_timeline_bs) && first_in_set && !dash_cfg->segment_alignment_disabled) {
 			fprintf(dash_cfg->mpd, " <SegmentTemplate");
 			if (is_bs_switching) {
 				fprintf(dash_cfg->mpd, " initialization=\"%s\"", bs_switching_segment_name);
 				if (presentationTimeOffset)
 					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 			}
+			if (dash_cfg->ast_offset_ms<0) {
+				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			}
 
 			if (mpd_timeline_bs) {
 				char *mpd_seg_info = NULL;
 				u32 size;
-				fprintf(dash_cfg->mpd, ">\n");
+
+
+				fprintf(dash_cfg->mpd, " timescale=\"%d\">\n", dash_cfg->dash_scale);
 
 				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
 				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
@@ -1736,7 +2183,11 @@
 		char *mpd_seg_info = NULL;
 		u32 size;
 
-		fprintf(dash_cfg->mpd, " <SegmentList timescale=\"%d\">\n", dash_cfg->dash_scale);
+		fprintf(dash_cfg->mpd, " <SegmentList timescale=\"%d\"", dash_cfg->dash_scale);
+		if (dash_cfg->ast_offset_ms<0) {
+			fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+		}
+		fprintf(dash_cfg->mpd, "\n");
 
 		gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
 		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
@@ -1745,15 +2196,15 @@
 	}
 
 	/* Write adaptation set content protection element */
-	if (protected_track && first_in_set && !dash_cfg->content_protection_in_rep) {
+	if (protected_track && first_in_set && (dash_cfg->cp_location_mode != GF_DASH_CPMODE_REPRESENTATION) ) {
 		gf_isom_write_content_protection(input, dash_cfg->mpd, protected_track, 3);
 	}
 
 	fprintf(dash_cfg->mpd, " <Representation ");
-	if (dash_input->representationID) fprintf(dash_cfg->mpd, "id=\"%s\"", dash_input->representationID);
+	if ( strlen(dash_input->representationID) ) fprintf(dash_cfg->mpd, "id=\"%s\"", dash_input->representationID);
 	else fprintf(dash_cfg->mpd, "id=\"%p\"", output);
 
-	fprintf(dash_cfg->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", audio_only ? "audio" : "video", szCodecs);
+	fprintf(dash_cfg->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", (!nb_audio && !nb_video) ? "application" : (!nb_video ? "audio" : "video"), szCodecs);
 	if (width && height) {
 		fprintf(dash_cfg->mpd, " width=\"%u\" height=\"%u\"", width, height);
 
@@ -1771,19 +2222,36 @@
 		}
 	}
 	if (sample_rate) fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", sample_rate);
-	if (segments_start_with_sap || split_seg_at_rap) {
-		fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", max_sap_type);
-	} else {
-		fprintf(dash_cfg->mpd, " startWithSAP=\"0\"");
+
+	//single segment (onDemand profiles, assumes we always start with an IDR)
+	if (dash_cfg->single_file_mode==1) {
+		fprintf(dash_cfg->mpd, " startWithSAP=\"1\"");
+	}
+	//regular segmenting
+	else {
+		if (segments_start_with_sap || split_seg_at_rap) {
+			fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", max_sap_type);
+		} else {
+			fprintf(dash_cfg->mpd, " startWithSAP=\"0\"");
+		}
 	}
+
+
 	//only appears at AdaptationSet level - need to rewrite the DASH segementer to allow writing this at the proper place
 //		if ((single_file_mode==1) && segments_start_with_sap) fprintf(dash_cfg->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
 
 	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
-	if (strlen(dash_input->dependencyID))
+	if (dash_input->dependencyID)
 		fprintf(dash_cfg->mpd, " dependencyId=\"%s\"", dash_input->dependencyID);
 	fprintf(dash_cfg->mpd, ">\n");
 
+	/* baseURLs */
+	if (dash_input->nb_baseURL) {
+		for (i=0; i<dash_input->nb_baseURL; i++) {
+			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", dash_input->baseURL[i]);
+		}
+	}
+
 	/* writing Representation level descriptors */
 	if (dash_input->nb_rep_descs) {
 		for (i=0; i<dash_input->nb_rep_descs; i++) {
@@ -1795,62 +2263,75 @@
 		fprintf(dash_cfg->mpd, " <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels);
 
 	/* Write content protection element in representation */
-	if (protected_track && dash_cfg->content_protection_in_rep) {
+	if (protected_track && (dash_cfg->cp_location_mode != GF_DASH_CPMODE_ADAPTATION_SET)) {
 		gf_isom_write_content_protection(input, dash_cfg->mpd, protected_track, 4);
 	}
 
-	if (dash_cfg->dash_ctx) {
-		Double seg_dur;
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration");
-		if (opt) {
-			seg_dur = atof(opt);
-			if (seg_dur < max_segment_duration) {
-				sprintf(sOpt, "%f", max_segment_duration);
-				gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-				seg_dur = max_segment_duration;
-			} else {
-				max_segment_duration = seg_dur;
-			}
-		} else {
-			sprintf(sOpt, "%f", max_segment_duration);
-			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-		}
-	}
-
 	if (use_url_template) {
 		/*segment template depends on file name, but the template at the representation level*/
 		if (dash_cfg->variable_seg_rad_name) {
-			const char *rad_name = gf_url_get_resource_name(seg_rad_name);
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dash_cfg->use_segment_timeline);
-			fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timescale, SegmentName, startNumber);
+			const char *rad_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, seg_rad_name);
+#ifdef GENERATE_VIRTUAL_REP_SRD
+			//if virtual rep, SegmentName already contains the name of the empty media segment used
+			if (!dash_input->virtual_representation)
+#endif
+			{
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+			}
+
+			fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", dash_cfg->use_segment_timeline ? dash_cfg->dash_scale : mpd_timescale, SegmentName, startNumber);
 			if (!dash_cfg->use_segment_timeline) {
-				if (!max_segment_duration)
-					max_segment_duration = dash_cfg->segment_duration;
 				fprintf(dash_cfg->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale));
 			}
-			if (!is_bs_switching) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
+			//don't write init if scalable rep
+			if (!is_bs_switching && !dash_input->idx_representations) {
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
 				fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
 			}
 			if (presentationTimeOffset)
 				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-			fprintf(dash_cfg->mpd, "/>\n");
+
+			if (dash_cfg->ast_offset_ms<0) {
+				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			}
+
+			if (mpd_timeline_bs && (!first_in_set || dash_cfg->segment_alignment_disabled) ) {
+				char *mpd_seg_info = NULL;
+				u32 size;
+				fprintf(dash_cfg->mpd, ">\n");
+
+				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+				gf_free(mpd_seg_info);
+				fprintf(dash_cfg->mpd, " </SegmentTemplate>\n");
+			} else {
+				fprintf(dash_cfg->mpd, "/>\n");
+			}
 		}
 	} else if (dash_cfg->single_file_mode==1) {
-		fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );
-		fprintf(dash_cfg->mpd, " <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);
-		if (presentationTimeOffset)
-			fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-		if (!is_bs_switching) {
-			fprintf(dash_cfg->mpd, ">\n");
-			fprintf(dash_cfg->mpd, " <Initialization range=\"%d-%d\"/>\n", 0, index_start_range-1);
-			fprintf(dash_cfg->mpd, " </SegmentBase>\n");
-		} else {
-			fprintf(dash_cfg->mpd, "/>\n");
+#ifdef GENERATE_VIRTUAL_REP_SRD
+		if (dash_input->virtual_representation) {
+			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", SegmentName);
+			fprintf(dash_cfg->mpd, " <SegmentBase />\n");
+		} else
+#endif
+		{
+			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dash_cfg->mpd_name, gf_isom_get_filename(output) ) );
+			fprintf(dash_cfg->mpd, " <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);
+
+			if (presentationTimeOffset)
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+			if (!is_bs_switching) {
+				fprintf(dash_cfg->mpd, ">\n");
+				fprintf(dash_cfg->mpd, " <Initialization range=\"%d-%d\"/>\n", 0, index_start_range-1);
+				fprintf(dash_cfg->mpd, " </SegmentBase>\n");
+			} else {
+				fprintf(dash_cfg->mpd, "/>\n");
+			}
 		}
 	} else {
 		if (!seg_rad_name) {
-			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );
+			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dash_cfg->mpd_name, gf_isom_get_filename(output) ) );
 		}
 		fprintf(dash_cfg->mpd, " <SegmentList");
 		if (!mpd_timeline_bs) {
@@ -1859,6 +2340,9 @@
 		if (presentationTimeOffset) {
 			fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 		}
+		if (dash_cfg->ast_offset_ms<0) {
+			fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+		}
 		fprintf(dash_cfg->mpd, ">\n");
 		/*we are not in bitstreamSwitching mode*/
 		if (!is_bs_switching) {
@@ -1866,7 +2350,13 @@
 			if (!seg_rad_name) {
 				fprintf(dash_cfg->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
 			} else {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, gf_url_get_resource_name( seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+#ifdef GENERATE_VIRTUAL_REP_SRD
+				//if virtual rep, SegmentName already contains the name of the empty media segment used
+				if (!dash_input->virtual_representation)
+#endif
+				{
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+				}
 				fprintf(dash_cfg->mpd, " sourceURL=\"%s\"", SegmentName);
 			}
 			fprintf(dash_cfg->mpd, "/>\n");
@@ -1889,7 +2379,7 @@
 
 	/*store context*/
 	if (dash_cfg->dash_ctx) {
-		period_duration += (Double)segment_start_time / dash_cfg->dash_scale;
+		period_duration += (u64)segment_start_time; //change to get a Double period duration
 
 		for (i=0; i<gf_list_count(fragmenters); i++) {
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
@@ -1913,6 +2403,10 @@
 				sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
 				sprintf(sOpt, LLU, tf->next_sample_dts);
 				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+
+				sprintf(sKey, "TKID_%d_MediaTimeToPresTime", tf->TrackID);
+				sprintf(sOpt, "%d", tf->media_time_to_pres_time_shift);
+				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, sOpt);
 			}
 		}
 		sprintf(sOpt, "%d", cur_seg);
@@ -1923,7 +2417,7 @@
 		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
 
 
-		sprintf(sOpt, "%f", period_duration);
+		sprintf(sOpt, LLU, period_duration);
 		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
 
 		if (store_dash_params) {
@@ -1957,7 +2451,7 @@
 }
 
 
-static GF_Err dasher_isom_get_input_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
+static GF_Err dasher_isom_get_input_components_info(GF_DashSegInput *input, GF_DASHSegmenter *opts)
 {
 	u32 i;
 	GF_ISOFile *in;
@@ -1998,6 +2492,7 @@
 			input->components[input->nb_components].fps_num = gf_isom_get_media_timescale(in, i+1);
 			/*get duration of 2nd sample*/
 			input->components[input->nb_components].fps_denum = gf_isom_get_sample_duration(in, i+1, 2);
+			gf_isom_get_pixel_aspect_ratio(in, i+1, 1, &input->components[input->nb_components].sar_num, &input->components[input->nb_components].sar_denum);
 		}
 		/*non-video tracks, get lang*/
 		else if (mtype == GF_ISOM_MEDIA_AUDIO) {
@@ -2032,7 +2527,7 @@
 		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
 			continue;
 
-		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
+		if (dash_inputs[input_idx].role && dash_inputs[i].role && strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
 			continue;
 
 		/* if two inputs don't have the same (number and value) as_desc they don't belong to the same AdaptationSet
@@ -2051,6 +2546,9 @@
 		if (dash_inputs[input_idx].y != dash_inputs[i].y) continue;
 		if (dash_inputs[input_idx].w != dash_inputs[i].w) continue;
 		if (dash_inputs[input_idx].h != dash_inputs[i].h) continue;
+#ifdef GENERATE_VIRTUAL_REP_SRD
+		if (dash_inputs[i].virtual_representation) continue;
+#endif
 
 		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
 
@@ -2079,7 +2577,7 @@
 				break;
 			}
 			msub_type = gf_isom_get_media_subtype(set_file, j+1, 1);
-			if (msub_type != gf_isom_get_media_subtype(in, track, 1)) same_codec = 0;
+			if (msub_type != gf_isom_get_media_subtype(in, track, 1)) same_codec = GF_FALSE;
 			if ((msub_type==GF_ISOM_SUBTYPE_MPEG4)
 			 || (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP)
 			 || (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
@@ -2151,7 +2649,7 @@
 						valid_in_adaptation_set = GF_FALSE;
 						break;
 					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Files have non-proportional track layouts (%dx%d vs %dx%d) but sample size and aspect ratio match, assuming precision issue\n", w1, h1, w2, h2));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Files have non-proportional track layouts (%dx%d vs %dx%d) but sample size and aspect ratio match, assuming precision issue\n", w1, h1, w2, h2));
 					}
 				}
 
@@ -2179,18 +2677,18 @@
 	return GF_OK;
 }
 
-static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenterOptions *dash_opts, Bool *disable_bs_switching)
+static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenter *dash_opts, GF_DashSwitchingMode bs_switch_mode, Bool *disable_bs_switching)
 {
 	GF_Err e = GF_OK;
 	u32 i;
 	u32 single_track_id = 0;
-	Bool sps_merge_failed = 0;
-	Bool use_avc3 = 0;
-	Bool use_hevc = 0;
+	Bool sps_merge_failed = GF_FALSE;
+	Bool use_avc3 = GF_FALSE;
+	Bool use_hevc = GF_FALSE;
 	Bool use_inband_param_set;
 	u32 probe_inband_param_set;
 	u32 first_track = 0;
-	Bool single_segment = (dash_opts->single_file_mode==1) ? 1 : 0;
+	Bool single_segment = (dash_opts->single_file_mode==1) ? GF_TRUE : GF_FALSE;
 	GF_ISOFile *init_seg;
 
 
@@ -2207,15 +2705,23 @@
 			continue;
 
 		//no inband param set for scalable files
-		use_inband_param_set = dash_inputs[i].trackNum ? 0 : dash_opts->inband_param_set;
+		use_inband_param_set = dash_inputs[i].trackNum ? GF_FALSE : dash_opts->inband_param_set;
 
 		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
 		if (!in) {
 			e = gf_isom_last_error(NULL);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string( e ) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string( e ) ));
 			return e;
 		}
 
+		if (bs_switch_mode == GF_DASH_BSMODE_MULTIPLE_ENTRIES) {
+			if (gf_isom_get_track_count(in)>1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot use multi-stsd mode on files with multiple tracks\n"));
+				return GF_NOT_SUPPORTED;
+			}
+		}
+
+
 		for (j=0; j<gf_isom_get_track_count(in); j++) {
 			u32 track;
 
@@ -2227,6 +2733,7 @@
 					single_track_id = gf_isom_get_track_id(in, j+1);
 				//if not the same ID between the two tracks we cannot create a legal file with bitstream switching enabled
 				else if (single_track_id != gf_isom_get_track_id(in, j+1)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Track IDs different between representations, disabling bitstream switching\n"));
 					*disable_bs_switching = GF_TRUE;
 					gf_isom_delete(init_seg);
 					gf_delete_file(szInitName);
@@ -2240,14 +2747,19 @@
 				u32 outDescIndex;
 				if ( gf_isom_get_sample_description_count(in, j+1) != 1) {
 					e = GF_NOT_SUPPORTED;
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name ));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name ));
 					gf_isom_delete(init_seg);
 					gf_isom_delete(in);
 					return e;
 				}
 retry_track:
+
+				if (bs_switch_mode == GF_DASH_BSMODE_MULTIPLE_ENTRIES) {
+					gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
+				}
+
 				/*if not the same sample desc we might need to clone it*/
-				if (! gf_isom_is_same_sample_description(in, j+1, 1, init_seg, track, 1)) {
+				else if (! gf_isom_is_same_sample_description(in, j+1, 1, init_seg, track, 1)) {
 					u32 merge_mode = 1;
 					u32 stype1, stype2;
 					stype1 = gf_isom_get_media_subtype(in, j+1, 1);
@@ -2318,7 +2830,7 @@
 							}
 							gf_isom_avc_config_update(init_seg, track, 1, avccfg2);
 						} else {
-							sps_merge_failed = 1;
+							sps_merge_failed = GF_TRUE;
 						}
 						gf_odf_avc_cfg_del(avccfg1);
 						gf_odf_avc_cfg_del(avccfg2);
@@ -2333,7 +2845,7 @@
 							gf_isom_hevc_set_inband_config(init_seg, track, 1);
 							use_hevc = GF_TRUE;
 							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
-							sps_merge_failed = 0;
+							sps_merge_failed = GF_FALSE;
 							break;
 						case GF_ISOM_SUBTYPE_AVC_H264:
 						case GF_ISOM_SUBTYPE_AVC2_H264:
@@ -2341,7 +2853,7 @@
 							gf_isom_avc_set_inband_config(init_seg, track, 1);
 							use_avc3 = GF_TRUE;
 							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
-							sps_merge_failed = 0;
+							sps_merge_failed = GF_FALSE;
 							break;
 						}
 						goto retry_track;
@@ -2409,6 +2921,27 @@
 				 defaultPadding, defaultDegradationPriority);
 				if (e) break;
 			}
+			if (!e) {
+				u32 k, edit_count=gf_isom_get_edit_segment_count(in, j+1);
+
+				/*remove all segments*/
+				gf_isom_remove_edit_segments(init_seg, track);
+				//clone all edits before first nomal, and stop at first normal setting duration to 0
+				for (k=0; k<edit_count; k++) {
+					u64 EditTime, SegDuration, MediaTime;
+					u8 EditMode;
+
+					/*get first edit*/
+					gf_isom_get_edit_segment(in, j+1, k+1, &EditTime, &SegDuration, &MediaTime, &EditMode);
+
+					if (EditMode==GF_ISOM_EDIT_NORMAL) {
+						gf_isom_set_edit_segment(init_seg, track, EditTime, 0, MediaTime, EditMode);
+						break;
+					}
+
+					gf_isom_set_edit_segment(init_seg, track, EditTime, SegDuration, MediaTime, EditMode);
+				}
+			}
 		}
 		if (!i) {
 			if (use_hevc || use_avc3) {
@@ -2430,13 +2963,13 @@
 		gf_isom_close(in);
 	}
 	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldn't create initialization segment: error %s\n", gf_error_to_string(e) ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't create initialization segment: error %s\n", gf_error_to_string(e) ));
 		*disable_bs_switching = GF_TRUE;
 		gf_isom_delete(init_seg);
 		gf_delete_file(szInitName);
 		return GF_OK;
 	} else if (sps_merge_failed) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Could not merge AVC|H264 SPS from different files (same SPS ID used) - disabling bitstream switching\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not merge AVC|H264 SPS from different files (same SPS ID used) - disabling bitstream switching\n"));
 		*disable_bs_switching = GF_TRUE;
 		gf_isom_delete(init_seg);
 		gf_delete_file(szInitName);
@@ -2449,21 +2982,145 @@
 				if (dash_inputs[i].adaptation_set != adaptation_set)
 					continue;
 
-				dash_inputs[i].disable_inband_param_set = 1;
+				dash_inputs[i].disable_inband_param_set = GF_TRUE;
 			}
 		}
 	}
 	return e;
 }
 
-static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
-{
-	GF_ISOFile *in = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, dash_cfg->tmpdir);
-	GF_Err e = gf_media_isom_segment_file(in, szOutName, dash_cfg->fragment_duration, dash_cfg, dash_input, first_in_set);
-	gf_isom_close(in);
+static GF_Err dasher_isom_adjust_last_sample(GF_ISOFile *in, const u32 trackNumber, const u32 track_duration, const u32 target_duration_in_timescale, const Double fragment_duration_in_sec) {
+	const u32 fragment_duration_in_media_timescale = (u32)(fragment_duration_in_sec * gf_isom_get_media_timescale(in, trackNumber));
+	const u32 last_sample_duration = gf_isom_get_sample_duration(in, trackNumber, gf_isom_get_sample_count(in, trackNumber));
+	const u32 new_last_sample_duration_in_media_timescale = (u32) ( last_sample_duration + (target_duration_in_timescale - MIN(track_duration, target_duration_in_timescale)) * (u64)gf_isom_get_media_timescale(in, trackNumber) / gf_isom_get_timescale(in) );
+
+	if (new_last_sample_duration_in_media_timescale != last_sample_duration) {
+		if (!is_splitable(gf_isom_get_media_type(in, trackNumber)) && (new_last_sample_duration_in_media_timescale > fragment_duration_in_media_timescale)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong user parameter would lead to set the last sample duration to %u while fragment duration is %u. Aborting.\n", new_last_sample_duration_in_media_timescale, fragment_duration_in_media_timescale));
+			return GF_BAD_PARAM;
+		} else {
+			return gf_isom_set_last_sample_duration(in, trackNumber, new_last_sample_duration_in_media_timescale);
+		}
+	} else {
+		return GF_OK;
+	}
+}
+
+static u32 isom_get_track_duration_from_samples_in_timescale(GF_ISOFile *in, u32 trackNumber) {
+	u64 track_duration = 0;
+	u32 sampleNumber;
+	for (sampleNumber=1; sampleNumber<=gf_isom_get_sample_count(in, trackNumber); ++sampleNumber) {
+		track_duration += gf_isom_get_sample_duration(in, trackNumber, sampleNumber);
+	}
+	track_duration = track_duration * gf_isom_get_timescale(in) / gf_isom_get_media_timescale(in, trackNumber);
+	return (u32)track_duration;
+}
+
+static GF_Err dasher_isom_force_duration(GF_ISOFile *in, const Double duration_in_sec, const Double fragment_duration_in_sec) {
+	GF_Err e = GF_OK;
+
+	u32 trackNumber, trackCount=gf_isom_get_track_count(in);
+	for (trackNumber=1; trackNumber<=trackCount; ++trackNumber) {
+		const u32 target_duration_in_timescale = (u32)(duration_in_sec * gf_isom_get_timescale(in));
+		const u32 track_duration = isom_get_track_duration_from_samples_in_timescale(in, trackNumber);
+		gf_set_progress("ISO File Force Duration", trackNumber-1, trackCount);
+
+		if (target_duration_in_timescale < track_duration) {
+			u32 i, j, track_duration2, sample_count = gf_isom_get_sample_count(in, trackNumber);
+			track_duration2 = 0;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Target track %u duration shorter than %lfs: removing samples and adjusting last sample duration.\n", trackNumber, duration_in_sec));
+			for (i=1; i <= sample_count; ++i) {
+				u32 di;
+				GF_ISOSample *s = gf_isom_get_sample(in, trackNumber, i, &di);
+				gf_set_progress("ISO File Force Duration", (trackNumber-1)*sample_count+i, trackCount*sample_count);
+				if (s->DTS >= duration_in_sec * gf_isom_get_media_timescale(in, trackNumber)) {
+					track_duration2 = (u32)(s->DTS * gf_isom_get_timescale(in) / gf_isom_get_media_timescale(in, trackNumber));
+					break;
+				}
+			}
+			for (j=i; j <= sample_count; ++j) {
+				u32 di;
+				GF_ISOSample *s = gf_isom_get_sample(in, trackNumber, i, &di);
+				gf_set_progress("ISO File Force Duration", (trackNumber-1)*sample_count+j, trackCount*sample_count);
+				e = gf_isom_remove_sample(in, trackNumber, i);
+				gf_isom_sample_del(&s);
+				assert(e == GF_OK);
+			}
+			e = dasher_isom_adjust_last_sample(in, trackNumber, track_duration2, target_duration_in_timescale, fragment_duration_in_sec);
+		} else if (target_duration_in_timescale > track_duration) {
+			u32 i, edit_count;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Target track %u duration longer than %lfs: increase the last sample duration.\n", trackNumber, duration_in_sec));
+			e = dasher_isom_adjust_last_sample(in, trackNumber, track_duration, target_duration_in_timescale, fragment_duration_in_sec);
+			if (e) break;
+			edit_count = gf_isom_get_edit_segment_count(in, trackNumber);
+			for (i=1; i<=edit_count; ++i) {
+				u64 EditTime, SegmentDuration, MediaTime;
+				u8 EditMode;
+				gf_set_progress("ISO File Force Duration", (trackNumber-1)*edit_count+i, trackCount*edit_count);
+				e = gf_isom_get_edit_segment(in, trackNumber, i, &EditTime, &SegmentDuration, &MediaTime, &EditMode);
+				if (e) {
+					e = GF_OK;
+					continue;
+				}
+				if ((EditTime + MediaTime) * gf_isom_get_media_timescale(in, trackNumber) > (track_duration - SegmentDuration) * gf_isom_get_timescale(in)) {
+					u64 EditDuration = target_duration_in_timescale - (track_duration - SegmentDuration);
+					e = gf_isom_set_edit_segment(in, trackNumber, EditTime, EditDuration, MediaTime, EditMode);
+					if (e)
+						break;
+				}
+				if (EditMode == GF_ISOM_EDIT_NORMAL) {
+					if (i < edit_count) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Track %u, %u edit lists in track (max 1 allowed). Consider re-importing the content in MP4Box.\n", trackNumber, edit_count));
+						return GF_BAD_PARAM;
+					}
+
+					break;
+				}
+			}
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Target track %u duration already equal to %lfs. Nothing to do.\n", trackNumber, duration_in_sec));
+		}
+
+		if (e)
+			break;
+	}
+
+	gf_set_progress("ISO File Force Duration", 1, 1);
+	gf_isom_update_duration(in);
+
 	return e;
 }
 
+static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dash_cfg, Bool first_in_set)
+{
+	GF_Err e = GF_OK;
+
+	if (!dash_input->isobmf_input) {
+		GF_ISOFile *in = gf_isom_open(dash_input->file_name, dash_input->media_duration ? GF_ISOM_OPEN_EDIT : GF_ISOM_OPEN_READ, dash_cfg->tmpdir);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] ISOBMFF opened\n"));
+
+		if (!gf_isom_get_track_count(in)) {
+			gf_isom_delete(in);
+			return GF_BAD_PARAM;
+		}
+
+		if (dash_input->media_duration) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing media duration to %lfs.\n", dash_input->media_duration));
+			e = dasher_isom_force_duration(in, dash_input->media_duration, dash_cfg->fragment_duration);
+			if (e) {
+				gf_isom_delete(in);
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Media duration couldn't be forced. Aborting.\n"));
+				return e;
+			}
+		}
+		dash_input->isobmf_input = in;
+	}
+
+
+	return gf_media_isom_segment_file(dash_input->isobmf_input, szOutName, dash_cfg, dash_input, first_in_set);
+}
+
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 #ifndef GPAC_DISABLE_MPEG2TS
@@ -2566,7 +3223,7 @@
 
 #ifndef GPAC_DISABLE_MPEG2TS
 
-static GF_Err dasher_generic_get_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
+static GF_Err dasher_generic_get_components_info(GF_DashSegInput *input, GF_DASHSegmenter *opts)
 {
 #ifdef GPAC_DISABLE_MEDIA_IMPORT
 	return GF_NOT_SUPPORTED;
@@ -2734,7 +3391,7 @@
 static void m2ts_sidx_flush_entry(GF_TSSegmenter *index_info)
 {
 	u32 end_offset, size, duration;
-	Bool store_segment = 1;
+	Bool store_segment = GF_TRUE;
 
 	if (index_info->suspend_indexing)
 		return;
@@ -2776,17 +3433,17 @@
 		/* close the current index */
 		SAP_delta_time = (u32)(index_info->first_SAP_PTS - index_info->base_PTS);
 		SAP_offset = (u32)(index_info->first_SAP_offset - index_info->base_offset);
-		m2ts_sidx_add_entry(index_info->sidx, 0, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
+		m2ts_sidx_add_entry(index_info->sidx, GF_FALSE, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
 
 		/*add pcrb entry*/
 		index_info->pcrb->subsegment_count++;
-		index_info->pcrb->pcr_values = gf_realloc(index_info->pcrb->pcr_values, index_info->pcrb->subsegment_count*sizeof(u64));
+		index_info->pcrb->pcr_values = (u64*)gf_realloc(index_info->pcrb->pcr_values, index_info->pcrb->subsegment_count*sizeof(u64));
 		index_info->pcrb->pcr_values[index_info->pcrb->subsegment_count-1] = index_info->interpolated_pcr_value;
 
 		/* adjust the previous index duration */
 		if (index_info->sidx->nb_refs > 0 && (index_info->base_PTS < index_info->prev_last_PTS) ) {
 			prev_duration = (u32)(index_info->base_PTS-index_info->prev_base_PTS);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" time-range adj.: %.03f-%.03f / %.03f sec.\n",
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" time-range adj.: %.3f-%.3f / %.3f sec.\n",
 			 (index_info->prev_base_PTS - index_info->first_PTS)/90000.0,
 			 (index_info->base_PTS - index_info->first_PTS)/90000.0, prev_duration/90000.0));
 
@@ -2800,12 +3457,12 @@
 		/* Printing result */
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
 		//time-range:position-range:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %.03f-%0.3f / %.03f sec., %d-%d / %d bytes, ",
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %.3f-%.3f / %.3f sec., %d-%d / %d bytes, ",
 		 (index_info->base_PTS - index_info->first_PTS)/90000.0,
 		 (index_info->last_PTS - index_info->first_PTS)/90000.0, duration/90000.0,
 		 index_info->base_offset, end_offset, size));
 		if (index_info->SAP_type) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RAP @ %.03f sec. / %d bytes", (index_info->first_SAP_PTS - index_info->first_PTS)/90000.0,
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RAP @ %.3f sec. / %d bytes", (index_info->first_SAP_PTS - index_info->first_PTS)/90000.0,
 			 SAP_offset));
 		}
 		if (index_info->first_pat_position_valid) {
@@ -2856,7 +3513,7 @@
 		index_info->nb_pes_in_segment = 1;
 		index_info->base_PTS = index_info->first_SAP_PTS;
 
-		index_info->pes_after_last_pat_is_sap= 0;
+		index_info->pes_after_last_pat_is_sap = GF_FALSE;
 	} else {
 		index_info->SAP_type = 0;
 		index_info->first_SAP_PTS = 0;
@@ -2937,7 +3594,7 @@
 	GF_M2TS_PES_PCK *pck;
 	switch (evt_type) {
 	case GF_M2TS_EVT_PAT_REPEAT:
-		ts_seg->has_seen_pat = 1;
+		ts_seg->has_seen_pat = GF_TRUE;
 		break;
 	case GF_M2TS_EVT_PMT_FOUND:
 	{
@@ -2953,7 +3610,7 @@
 	case GF_M2TS_EVT_PMT_REPEAT:
 		if (ts_seg->has_seen_pat) {
 			u32 i, count;
-			Bool done = 1;
+			Bool done = GF_TRUE;
 			GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
 			count = gf_list_count(prog->streams);
 			for (i=0; i<count; i++) {
@@ -2961,7 +3618,7 @@
 				if (es->flags&GF_M2TS_ES_IS_PES) {
 					GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
 					if (!pes->aud_sr && !pes->vid_w) {
-						done = 0;
+						done = GF_FALSE;
 						break;
 					} else {
 						/*stream is configured, we only need PES header now*/
@@ -2973,7 +3630,7 @@
 		}
 		break;
 	case GF_M2TS_EVT_PES_PCK:
-		pck = par;
+		pck = (GF_M2TS_PES_PCK*)par;
 		/* we process packets only for the given PID */
 		if (pck->stream->pid == pck->stream->program->pcr_pid) {
 			if (!ts_seg->nb_pes_in_segment || (ts_seg->first_PTS > pck->PTS)) {
@@ -3004,56 +3661,56 @@
 	switch (evt_type) {
 	case GF_M2TS_EVT_PAT_FOUND:
 		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position_valid = GF_TRUE;
 			ts_seg->first_pat_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = 0;
-		ts_seg->pes_after_last_pat_is_sap = 0;
+		ts_seg->first_pes_after_last_pat = GF_FALSE;
+		ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
 		break;
 	case GF_M2TS_EVT_PAT_UPDATE:
 		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position_valid = GF_TRUE;
 			ts_seg->first_pat_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = 0;
-		ts_seg->pes_after_last_pat_is_sap = 0;
+		ts_seg->first_pes_after_last_pat = GF_FALSE;
+		ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
 		break;
 	case GF_M2TS_EVT_PAT_REPEAT:
 		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position_valid = GF_TRUE;
 			ts_seg->first_pat_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = 0;
-		ts_seg->pes_after_last_pat_is_sap = 0;
+		ts_seg->first_pes_after_last_pat = GF_FALSE;
+		ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
 		break;
 	case GF_M2TS_EVT_CAT_FOUND:
 		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position_valid = GF_TRUE;
 			ts_seg->first_cat_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_cat_position = (ts->pck_number-1)*188;
 		break;
 	case GF_M2TS_EVT_CAT_UPDATE:
 		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position_valid = GF_TRUE;
 			ts_seg->first_cat_position = (ts->pck_number-1)*188;
 		}
 		break;
 	case GF_M2TS_EVT_CAT_REPEAT:
 		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position_valid = GF_TRUE;
 			ts_seg->first_cat_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_cat_position = (ts->pck_number-1)*188;
 		break;
 	case GF_M2TS_EVT_PMT_FOUND:
-		ts_seg->has_seen_pat = 1;
+		ts_seg->has_seen_pat = GF_TRUE;
 		prog = (GF_M2TS_Program*)par;
 		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position_valid = GF_TRUE;
 			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
@@ -3064,26 +3721,26 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
 		for (i=0; i<count; i++) {
-			GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+			GF_M2TS_ES *es = (GF_M2TS_ES*)gf_list_get(prog->streams, i);
 			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
 		}
 		break;
 	case GF_M2TS_EVT_PMT_UPDATE:
 		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position_valid = GF_TRUE;
 			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
 		break;
 	case GF_M2TS_EVT_PMT_REPEAT:
 		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position_valid = GF_TRUE;
 			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
 		}
 		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
 		break;
 	case GF_M2TS_EVT_PES_PCK:
-		pck = par;
+		pck = (GF_M2TS_PES_PCK*)par;
 		/*We need the interpolated PCR for the pcrb, hence moved this calculus out, and saving the calculated value in ts_seg to put it in the pcrb*/
 		pes = pck->stream;
 		/* Interpolated PCR value for the TS packet containing the PES header start */
@@ -3114,7 +3771,7 @@
 
 				if (!ts_seg->first_pes_after_last_pat) {
 					ts_seg->first_pes_after_last_pat = ts_seg->nb_pes_in_segment;
-					ts_seg->pes_after_last_pat_is_sap=0;
+					ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
 				}
 			}
 
@@ -3133,7 +3790,7 @@
 					ts_seg->first_pes_sap = GF_TRUE;
 				}
 				if ((ts_seg->nb_pes_in_segment>1) && (ts_seg->first_pes_after_last_pat==ts_seg->nb_pes_in_segment)) {
-					ts_seg->pes_after_last_pat_is_sap=1;
+					ts_seg->pes_after_last_pat_is_sap=GF_TRUE;
 				}
 			}
 			/* we need to know the earliest PTS value (RAP or not) in the index*/
@@ -3158,7 +3815,7 @@
 		}
 		break;
 	case GF_M2TS_EVT_PES_PCR:
-		pck = par;
+		pck = (GF_M2TS_PES_PCK*)par;
 		if (!ts_seg->first_pcr_position_valid) {
 			ts_seg->first_pcr_position_valid = GF_TRUE;
 			ts_seg->first_pcr_position = (ts->pck_number-1)*188;
@@ -3171,9 +3828,9 @@
 static GF_Err dasher_get_ts_demux(GF_TSSegmenter *ts_seg, const char *file, u32 probe_mode)
 {
 	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
-	ts_seg->src = gf_f64_open(file, "rb");
+	ts_seg->src = gf_fopen(file, "rb");
 	if (!ts_seg->src) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot open input %s: no such file\n", file));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot open input %s: no such file\n", file));
 		return GF_URL_ERROR;
 	}
 	ts_seg->ts = gf_m2ts_demux_new();
@@ -3181,9 +3838,9 @@
 	ts_seg->ts->notify_pes_timing = GF_TRUE;
 	ts_seg->ts->user = ts_seg;
 
-	gf_f64_seek(ts_seg->src, 0, SEEK_END);
-	ts_seg->file_size = gf_f64_tell(ts_seg->src);
-	gf_f64_seek(ts_seg->src, 0, SEEK_SET);
+	gf_fseek(ts_seg->src, 0, SEEK_END);
+	ts_seg->file_size = gf_ftell(ts_seg->src);
+	gf_fseek(ts_seg->src, 0, SEEK_SET);
 
 	if (probe_mode) {
 		/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
@@ -3197,7 +3854,7 @@
 				break;
 		}
 		gf_m2ts_reset_parsers(ts_seg->ts);
-		gf_f64_seek(ts_seg->src, 0, SEEK_SET);
+		gf_fseek(ts_seg->src, 0, SEEK_SET);
 	}
 	ts_seg->ts->on_event = dash_m2ts_event;
 	return GF_OK;
@@ -3206,11 +3863,11 @@
 static void dasher_del_ts_demux(GF_TSSegmenter *ts_seg)
 {
 	if (ts_seg->ts) gf_m2ts_demux_del(ts_seg->ts);
-	if (ts_seg->src) fclose(ts_seg->src);
+	if (ts_seg->src) gf_fclose(ts_seg->src);
 	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
 }
 
-static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *dash_opts)
+static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenter *dash_opts)
 {
 	char sOpt[40];
 	GF_TSSegmenter ts_seg;
@@ -3243,10 +3900,10 @@
 
 #define NB_TSPCK_IO_BYTES 18800
 
-static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
+static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dash_cfg, Bool first_in_set)
 {
 	GF_TSSegmenter ts_seg;
-	Bool rewrite_input = 0;
+	Bool rewrite_input = GF_FALSE;
 	u8 is_pes[GF_M2TS_MAX_STREAMS];
 	char szOpt[100];
 	char SegName[GF_MAX_PATH], IdxName[GF_MAX_PATH];
@@ -3255,12 +3912,16 @@
 	const char *opt;
 	u32 i;
 	GF_Err e;
-	u64 start, pcr_shift, next_pcr_shift;
+	u64 start, pcr_shift, next_pcr_shift, presentationTimeOffset;
 	Double cumulated_duration = 0;
 	u32 bandwidth = 0;
 	u32 segment_index;
 	/*compute name for indexed segments*/
-	const char *basename = gf_url_get_resource_name(szOutName);
+	const char *basename = gf_dasher_strip_output_dir(dash_cfg->mpd_name, szOutName);
+
+	if (dash_input->media_duration) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] media duration cannot be forced with MPEG2-TS segmenter. Ignoring.\n"));
+	}
 
 	/*perform indexation of the file, this info will be destroyed at the end of the segment file routine*/
 	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 0);
@@ -3276,15 +3937,16 @@
 	segment_index = 1;
 	ts_seg.index_file = NULL;
 	ts_seg.index_bs = NULL;
+	presentationTimeOffset=0;
 	if (!dash_cfg->dash_ctx && (dash_cfg->use_url_template != 2)) {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		GF_SegmentTypeBox *styp;
 
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
 
-		ts_seg.index_file = gf_f64_open(IdxName, "wb");
+		ts_seg.index_file = gf_fopen(IdxName, "wb");
 		if (!ts_seg.index_file) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create index file %s\n", IdxName));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create index file %s\n", IdxName));
 			e = GF_IO_ERR;
 			goto exit;
 		}
@@ -3302,7 +3964,7 @@
 #endif
 	}
 
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
 
 	ts_seg.PCR_DTS_initial_diff = (u64) -1;
 	ts_seg.subduration = (u32) (dash_cfg->subduration * 90000);
@@ -3327,7 +3989,7 @@
 			}
 			gf_m2ts_reset_parsers(ts_seg.ts);
 			ts_seg.base_PTS = 0;
-			gf_f64_seek(ts_seg.src, offset, SEEK_SET);
+			gf_fseek(ts_seg.src, offset, SEEK_SET);
 			ts_seg.base_offset = offset;
 			ts_seg.ts->pck_number = (u32) (offset/188);
 		}
@@ -3335,6 +3997,12 @@
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset");
 		if (opt) sscanf(opt, LLU, &ts_seg.PCR_DTS_initial_diff);
 
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "PresentationTimeOffset");
+		if (opt) {
+			sscanf(opt, LLU, &presentationTimeOffset);
+			presentationTimeOffset++;
+		}
+
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "DurationAtLastPass");
 		if (opt) sscanf(opt, LLD, &ts_seg.duration_at_last_pass);
 	}
@@ -3348,6 +4016,14 @@
 	}
 	if (feof(ts_seg.src)) ts_seg.suspend_indexing = 0;
 
+	if (!presentationTimeOffset) {
+		presentationTimeOffset = 1 + ts_seg.first_PTS;
+		if (dash_cfg->dash_ctx) {
+			sprintf(szOpt, LLU, ts_seg.first_PTS);
+			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "PresentationTimeOffset", szOpt);
+		}
+	}
+
 	next_pcr_shift = 0;
 	if (!ts_seg.suspend_indexing) {
 		next_pcr_shift = ts_seg.last_DTS + ts_seg.last_frame_duration - ts_seg.PCR_DTS_initial_diff;
@@ -3356,9 +4032,9 @@
 	/* flush SIDX entry for the last packets */
 	m2ts_sidx_flush_entry(&ts_seg);
 	m2ts_sidx_finalize_size(&ts_seg, ts_seg.file_size);
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH]: Indexing done (1 sidx, %d entries).\n", ts_seg.sidx->nb_refs));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Indexing done (1 sidx, %d entries).\n", ts_seg.sidx->nb_refs));
 
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "six", 0, 0, 0, dash_cfg->use_segment_timeline);
 
 
 	memset(is_pes, 0, sizeof(u8)*GF_M2TS_MAX_STREAMS);
@@ -3389,18 +4065,29 @@
 			if (opt) sscanf(opt, LLU, &pcr_shift);
 
 			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration");
-			if (opt) cumulated_duration = atof(opt);
+			if (opt) {
+				u64 val;
+				sscanf(opt, LLU, &val);
+				cumulated_duration = ((Double) val) / dash_cfg->dash_scale;
+			}
 		}
 	}
 
 	/*write segment template for all representations*/
 	if (first_in_set && dash_cfg->seg_rad_name && dash_cfg->use_url_template && !dash_cfg->variable_seg_rad_name) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 		fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName);
+		//the SIDX we have is not compatible with the spec - until fixed, disable this
+#if 0
 		if (!dash_cfg->dash_ctx) {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 			fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName);
 		}
+#endif
+
+		if (dash_cfg->ast_offset_ms<0) {
+			fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+		}
 		fprintf(dash_cfg->mpd, "/>\n");
 	}
 
@@ -3433,8 +4120,18 @@
 		}
 	}
 
+
+	for (i=0; i<ts_seg.sidx->nb_refs; i++) {
+		GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
+		if (dash_cfg->max_segment_duration * ts_seg.sidx->timescale < ref->subsegment_duration) {
+			dash_cfg->max_segment_duration = (Double) ref->subsegment_duration;
+			dash_cfg->max_segment_duration /= ts_seg.sidx->timescale;
+		}
+	}
+
+
 	if (dash_cfg->single_file_mode==1) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 		fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", SegName);
 
 		fprintf(dash_cfg->mpd, " <SegmentBase>\n");
@@ -3442,31 +4139,44 @@
 		fprintf(dash_cfg->mpd, " </SegmentBase>\n");
 
 		/*we rewrite the file*/
-		rewrite_input = 1;
+		rewrite_input = GF_TRUE;
 	} else {
 		if (dash_cfg->seg_rad_name && dash_cfg->use_url_template) {
 			if (dash_cfg->variable_seg_rad_name) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 				fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName);
+
+				//the SIDX we have is not compatible with the spec - until fixed, disable this
+#if 0
 				if (!dash_cfg->dash_ctx) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 					fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName);
 				}
+#endif
+
+				if (presentationTimeOffset > 1)
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
 
-				if (dash_cfg->time_shift_depth>=0)
-					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift);
+				if (dash_cfg->ast_offset_ms<0) {
+					fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+				}
 				fprintf(dash_cfg->mpd, "/>\n");
-			} else if (dash_cfg->time_shift_depth>=0) {
-				fprintf(dash_cfg->mpd, " <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", ts_seg.sidx->earliest_presentation_time + pcr_shift);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH]: PTSOffset "LLD" - startNumber %d - time %g\n", ts_seg.sidx->earliest_presentation_time + pcr_shift, segment_index, (Double) (s64) (ts_seg.sidx->earliest_presentation_time + pcr_shift) / 90000.0));
+			} else if (presentationTimeOffset > 1) {
+				fprintf(dash_cfg->mpd, " <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", presentationTimeOffset - 1);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] PTSOffset "LLD" - startNumber %d - time %g\n", presentationTimeOffset - 1, segment_index, (Double) (s64) (ts_seg.sidx->earliest_presentation_time + pcr_shift) / 90000.0));
 			}
 		} else {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 			if (dash_cfg->single_file_mode)
 				fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n",SegName);
 			fprintf(dash_cfg->mpd, " <SegmentList timescale=\"90000\" duration=\"%d\"", (u32) (90000*dash_cfg->segment_duration));
-			if (dash_cfg->time_shift_depth>=0)
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift);
+
+			if (presentationTimeOffset > 1)
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
+
+			if (dash_cfg->ast_offset_ms<0) {
+				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			}
 			fprintf(dash_cfg->mpd, ">\n");
 
 			if (!dash_cfg->dash_ctx) {
@@ -3501,31 +4211,33 @@
 			FILE *src, *dst;
 			u64 pos, end;
 			Double current_time = cumulated_duration, dur;
-			src = gf_f64_open(dash_input->file_name, "rb");
+			src = gf_fopen(dash_input->file_name, "rb");
 			start = ts_seg.sidx->first_offset;
 			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
 				char buf[NB_TSPCK_IO_BYTES];
 				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
 
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 
 				/*warning - we may introduce repeated sequence number when concatenating files. We should use switching
 				segments to force reset of the continuity counter for all our pids - we don't because most players don't car ...*/
 				if (dash_cfg->use_url_template != 2) {
-					dst = gf_f64_open(SegName, "wb");
+					dst = gf_fopen(SegName, "wb");
 					if (!dst) {
-						fclose(src);
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
+						gf_fclose(src);
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create segment file %s\n", SegName));
 						e = GF_IO_ERR;
 						goto exit;
 					}
 
-					gf_dasher_store_segment_info(dash_cfg, SegName, current_time);
 					dur = ref->subsegment_duration;
 					dur /= 90000;
+
+					gf_dasher_store_segment_info(dash_cfg, dash_input->representationID, SegName, (u64) (current_time*dash_cfg->dash_scale), (u64) ((current_time+dur)*dash_cfg->dash_scale));
+
 					current_time += dur;
 
-					gf_f64_seek(src, start, SEEK_SET);
+					gf_fseek(src, start, SEEK_SET);
 					pos = start;
 					end = start+ref->reference_size;
 					while (pos<end) {
@@ -3540,17 +4252,17 @@
 							res = (u32) fwrite(buf, 1, to_read, dst);
 						}
 						if (res!=to_read) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: IO error while Extracting segment %03d / %03d\r", i+1, ts_seg.sidx->nb_refs));
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] IO error while Extracting segment %03d / %03d\r", i+1, ts_seg.sidx->nb_refs));
 							break;
 						}
 						pos += res;
 					}
-					fclose(dst);
+					gf_fclose(dst);
 				}
 				start += ref->reference_size;
 
 				if (!dash_cfg->use_url_template) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 					fprintf(dash_cfg->mpd, " <SegmentURL media=\"%s\"/>\n", SegName);
 
 					if (dash_cfg->dash_ctx) {
@@ -3564,7 +4276,7 @@
 				segment_index++;
 				gf_set_progress("Extracting segment ", i+1, ts_seg.sidx->nb_refs);
 			}
-			fclose(src);
+			gf_fclose(src);
 			cumulated_duration = current_time;
 		}
 		if (!dash_cfg->seg_rad_name || !dash_cfg->use_url_template) {
@@ -3577,17 +4289,17 @@
 		u64 fsize, done;
 		char buf[NB_TSPCK_IO_BYTES];
 
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, dash_cfg->seg_rad_name ? basename : szOutName, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-		out = gf_f64_open(SegName, "wb");
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, dash_cfg->seg_rad_name ? basename : szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+		out = gf_fopen(SegName, "wb");
 		if (!out) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create segment file %s\n", SegName));
 			e = GF_IO_ERR;
 			goto exit;
 		}
-		in = gf_f64_open(dash_input->file_name, "rb");
-		gf_f64_seek(in, 0, SEEK_END);
-		fsize = gf_f64_tell(in);
-		gf_f64_seek(in, 0, SEEK_SET);
+		in = gf_fopen(dash_input->file_name, "rb");
+		gf_fseek(in, 0, SEEK_END);
+		fsize = gf_ftell(in);
+		gf_fseek(in, 0, SEEK_SET);
 		done = 0;
 		while (1) {
 			u32 read = (u32) fread(buf, 1, NB_TSPCK_IO_BYTES, in);
@@ -3597,8 +4309,8 @@
 			gf_set_progress("Extracting segment ", done/188, fsize/188);
 			if (read<NB_TSPCK_IO_BYTES) break;
 		}
-		fclose(in);
-		fclose(out);
+		gf_fclose(in);
+		gf_fclose(out);
 	}
 
 	fprintf(dash_cfg->mpd, " </Representation>\n");
@@ -3610,7 +4322,7 @@
 		sprintf(szOpt, "%u", segment_index);
 		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "StartIndex", szOpt);
 
-		sprintf(szOpt, "%g", ts_seg.segment_duration);
+		sprintf(szOpt, LLU, (u64) (dash_cfg->dash_scale*ts_seg.segment_duration) );
 		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
 
 		sprintf(szOpt, LLU, next_pcr_shift + pcr_shift);
@@ -3624,9 +4336,6 @@
 
 		sprintf(szOpt, LLU, ts_seg.PCR_DTS_initial_diff);
 		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset", ts_seg.suspend_indexing ? szOpt : NULL);
-
-		sprintf(szOpt, "%g", cumulated_duration);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
 	}
 
 	if (ts_seg.sidx && ts_seg.index_bs) {
@@ -3641,8 +4350,12 @@
 exit:
 	if (ts_seg.sidx) gf_isom_box_del((GF_Box *)ts_seg.sidx);
 	if (ts_seg.pcrb) gf_isom_box_del((GF_Box *)ts_seg.pcrb);
-	if (ts_seg.index_file) fclose(ts_seg.index_file);
 	if (ts_seg.index_bs) gf_bs_del(ts_seg.index_bs);
+	if (ts_seg.index_file) {
+		gf_fclose(ts_seg.index_file);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+		gf_delete_file(IdxName);
+	}
 	dasher_del_ts_demux(&ts_seg);
 	return e;
 }
@@ -3662,23 +4375,26 @@
 }
 #endif
 
-GF_Err gf_dash_segmenter_probe_input(GF_DashSegInput **io_dash_inputs, u32 *nb_dash_inputs, u32 idx)
+static GF_Err gf_dash_segmenter_probe_input(GF_DashSegInput **io_dash_inputs, u32 *nb_dash_inputs, u32 idx)
 {
 	GF_DashSegInput *dash_inputs = *io_dash_inputs;
 	GF_DashSegInput *dash_input = & dash_inputs[idx];
 	char *uri_frag = strchr(dash_input->file_name, '#');
-	FILE *t = gf_f64_open(dash_input->file_name, "rb");
+	FILE *t;
 
 	if (uri_frag) uri_frag[0] = 0;
 
-	t = gf_f64_open(dash_input->file_name, "rb");
+	t = gf_fopen(dash_input->file_name, "rb");
 	if (!t) return GF_URL_ERROR;
-	fclose(t);
+	gf_fclose(t);
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (gf_isom_probe_file(dash_input->file_name)) {
 		GF_ISOFile *file;
-		u32 nb_track, j, max_nb_deps, cur_idx, rep_idx;
+		Bool has_tiling = GF_FALSE;
+		u32 nb_track, j, k, max_nb_deps, cur_idx, rep_idx;
+		const char *dep_representation_id;
+		const char *dep_representation_file=NULL;
 
 		strcpy(dash_input->szMime, "video/mp4");
 		dash_input->dasher_create_init_segment = dasher_isom_create_init_segment;
@@ -3688,10 +4404,11 @@
 
 		file = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, NULL);
 		if (!file) return gf_isom_last_error(NULL);
+
 		nb_track = gf_isom_get_track_count(file);
 
 		/*if this dash input file has only one track, or this has not the scalable track: handle as one representation*/
-		if ((nb_track == 1) || !gf_isom_has_scalable_layer(file)) {
+		if ((nb_track == 1) || !gf_isom_needs_layer_reconstruction(file)) {
 
 			if (uri_frag) {
 				u32 id = 0;
@@ -3700,7 +4417,7 @@
 				else if (!strnicmp(uri_frag+1, "ID=", 3))
 					id = atoi(uri_frag+4);
 				else if (!stricmp(uri_frag+1, "audio") || !stricmp(uri_frag+1, "video")) {
-					Bool check_video = !stricmp(uri_frag+1, "video") ? 1 : 0;
+					Bool check_video = !stricmp(uri_frag+1, "video") ? GF_TRUE : GF_FALSE;
 					u32 i;
 					for (i=0; i<nb_track; i++) {
 						switch (gf_isom_get_media_type(file, i+1)) {
@@ -3718,9 +4435,10 @@
 				nb_track = dash_input->single_track_num;
 			}
 			dash_input->protection_scheme_type = gf_isom_is_media_encrypted(file, nb_track, 1);
-			gf_isom_close(file);
+
 			dash_input->moof_seqnum_increase = 0;
 
+			gf_isom_close(file);
 			return GF_OK;
 		}
 
@@ -3728,16 +4446,20 @@
 		for (j = 0; j < nb_track; j++) {
 			//check scalability
 			if (gf_isom_get_media_type(file, j+1)==GF_ISOM_MEDIA_VISUAL) {
-				u32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
-				count += gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_TBAS);
-				if (count) {
+				u32 c1 = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
+				u32 c2 = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_TBAS);
+				if (c2) has_tiling = GF_TRUE;
+				if (c1 + c2) {
 					max_nb_deps ++;
 				}
 			}
 		}
+#ifdef GENERATE_VIRTUAL_REP_SRD
+		if (has_tiling) max_nb_deps++;
+#endif
 		//scalable input file, realloc
 		j = *nb_dash_inputs + max_nb_deps;
-		dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegInput) * j);
+		dash_inputs = (GF_DashSegInput*)gf_realloc(dash_inputs, sizeof(GF_DashSegInput) * j);
 		memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegInput) * max_nb_deps);
 		*io_dash_inputs = dash_inputs;
 
@@ -3746,18 +4468,58 @@
 		dash_input->idx_representations=0;
 		rep_idx = 1;
 		cur_idx = idx+1;
+		dep_representation_id = dash_input->representationID;
 
 		//create dash inputs
 		for (j = 0; j < nb_track; j++) {
+			u32 default_sample_group_index, id, independent;
+			Bool full_frame;
 			GF_DashSegInput *di;
 			u32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
 			count += gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_TBAS);
 			if (!count) {
+				u32 x, y, w, h;
+				Bool found_same_base = GF_FALSE;
+
+				//special case for HEVC tile, do not dublicate base representation if same res
+				count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_SABT);
+				count += gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_SCAL);
+				if (!has_tiling || !count) {
+					dash_input->trackNum = j+1;
+					continue;
+				}
+
+				w = h = 0;
+				gf_isom_get_tile_info(file, j+1, 1, &default_sample_group_index, &id, &independent, &full_frame, &x, &y, &w, &h);
+				if (!w && !h) {
+					gf_isom_get_visual_info(file, j+1, 1, &w, &h);
+					x = y = 0;
+				}
+				//look in all previous dash inputs
+				for (k=0; k<idx; k++) {
+					GF_DashSegInput *prev_dash_input = & dash_inputs[k];
+					if ( (prev_dash_input->x==x) && (prev_dash_input->y==y) && (prev_dash_input->w==w) && (prev_dash_input->h==h) ) {
+						GF_ISOFile *temp = gf_isom_open(prev_dash_input->file_name, GF_ISOM_OPEN_READ, NULL);
+
+						//same rep ?
+						if (gf_isom_is_same_sample_description(file, j+1, 1, temp, prev_dash_input->trackNum, 1)) {
+							found_same_base = GF_TRUE;
+							dep_representation_id = prev_dash_input->representationID;
+							dep_representation_file=prev_dash_input->file_name;
+						}
+						gf_isom_delete(temp);
+						if (found_same_base) break;
+					}
+				}
+				if (found_same_base) {
+					cur_idx --;
+					(*nb_dash_inputs) --;
+					continue;
+				}
 				dash_input->trackNum = j+1;
 				continue;
 			}
 
-
 			di = &dash_inputs [cur_idx];
 			*nb_dash_inputs += 1;
 			cur_idx++;
@@ -3765,7 +4527,7 @@
 			memcpy(di, dash_input, sizeof(GF_DashSegInput));
 
 			/*representationID*/
-			sprintf(di->representationID, "%s_%d", dash_input->representationID, cur_idx);
+			sprintf(di->representationID, "%s_%d", dep_representation_id, cur_idx);
 			di->trackNum = j+1;
 
 			di->protection_scheme_type = gf_isom_is_media_encrypted(file, di->trackNum, 1);
@@ -3774,33 +4536,87 @@
 			rep_idx ++;
 
 			if (gf_isom_get_reference_count(file, di->trackNum, GF_ISOM_REF_TBAS)) {
-				u32 default_sample_group_index, id, independent;
-				Bool full_frame;
 				gf_isom_get_tile_info(file, di->trackNum, 1, &default_sample_group_index, &id, &independent, &full_frame, &di->x, &di->y, &di->w, &di->h);
+
+				if (!dash_input->w) {
+					gf_isom_get_visual_info(file, dash_input->trackNum, 1, &dash_input->w, &dash_input->h);
+				}
 			}
 		}
+#ifdef GENERATE_VIRTUAL_REP_SRD
+		if (has_tiling) {
+			GF_DashSegInput *di = &dash_inputs [cur_idx];
+			*nb_dash_inputs += 1;
+			cur_idx++;
+			//copy over values from base rep
+			memcpy(di, dash_input, sizeof(GF_DashSegInput));
+			/*representationID*/
+			sprintf(di->representationID, "%s_%d", dep_representation_id, cur_idx);
+
+			di->trackNum = 0;
+			for (k = 0; k < nb_track; k++) {
+				//check scalability
+				if (gf_isom_get_media_type(file, k+1)==GF_ISOM_MEDIA_VISUAL) {
+					if (gf_isom_get_reference_count(file, k+1, GF_ISOM_REF_SABT)) {
+						di->trackNum = k+1;
+						break;
+					}
+				}
+			}
 
+			di->protection_scheme_type = gf_isom_is_media_encrypted(file, di->trackNum, 1);
+
+			di->idx_representations = rep_idx;
+			rep_idx ++;
+
+			di->virtual_representation = GF_TRUE;
+		}
+#endif
 
 		/*dependencyID - FIXME - the delaration of dependency and new dash_input entries should be in DEDENDENCY ORDER*/
-		for (j = idx; j < *nb_dash_inputs; j++) {
-			GF_DashSegInput *di;
-			u32 count, t, ref_track;
+		for (k=0; k<2; k++) {
+			for (j = idx; j < *nb_dash_inputs; j++) {
+				GF_DashSegInput *di;
+				u32 count, t, ref_track;
+				char *depID = (char*)gf_malloc(2);
+				u32 dep_type;
 
-			di = &dash_inputs[j];
-			count = gf_isom_get_reference_count(file, di->trackNum, GF_ISOM_REF_SCAL);
-			if (!count) continue;
-
-			di->lower_layer_track = dash_input->trackNum;
-			strcpy(di->dependencyID, "");
-			for (t=0; t < count; t++) {
-				gf_isom_get_reference(file, di->trackNum, GF_ISOM_REF_SCAL, t+1, &ref_track);
-				if (t) strcat(di->dependencyID, " ");
-				strcat(di->dependencyID, gf_dash_get_representationID(dash_inputs, *nb_dash_inputs, di->file_name, ref_track));
+				di = &dash_inputs[j];
 
-				di->lower_layer_track = ref_track;
-			}
+#ifdef GENERATE_VIRTUAL_REP_SRD
+				if (k==0) dep_type = (di->virtual_representation) ? GF_ISOM_REF_SABT : GF_ISOM_REF_TBAS;
+#else
+				if (k==0) dep_type = GF_ISOM_REF_TBAS;
+#endif
+				else dep_type = GF_ISOM_REF_SCAL;
+
+				count = gf_isom_get_reference_count(file, di->trackNum, dep_type);
+				if (!count) continue;
 
+				di->lower_layer_track = dash_input->trackNum;
+				strcpy(depID, "");
+				for (t=0; t < count; t++) {
+					u32 al_len = 0;
+					char *rid;
+					if (t) al_len++;
+					gf_isom_get_reference(file, di->trackNum, dep_type, t+1, &ref_track);
+					rid = gf_dash_get_representationID(dash_inputs, *nb_dash_inputs, dep_representation_file ? dep_representation_file : di->file_name, ref_track);
+
+					if (!rid) continue;
+					al_len += (u32) strlen(rid);
+					al_len += (u32) strlen(depID)+1;
+
+					depID = (char*)gf_realloc(depID, sizeof(char)*al_len);
+					if (t)
+						strcat(depID, " ");
+					strcat(depID, rid);
+
+					di->lower_layer_track = ref_track;
+				}
+				di->dependencyID = depID;
+			}
 		}
+
 		gf_isom_close(file);
 		return GF_OK;
 	}
@@ -3817,7 +4633,7 @@
 		count = gf_list_count(ts_seg.ts->programs);
 		dasher_del_ts_demux(&ts_seg);
 		if (count>1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: MPEG-2 TS file %s has several programs - this is not supported in MPEG-DASH - skipping\n", dash_input->file_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] MPEG-2 TS file %s has several programs - this is not supported in MPEG-DASH - skipping\n", dash_input->file_name));
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -3831,13 +4647,27 @@
 	}
 #endif
 
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: File %s not supported for dashing - skipping\n", dash_input->file_name));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] File %s not supported for dashing - skipping\n", dash_input->file_name));
 	return GF_NOT_SUPPORTED;
 }
 
-static GF_Err write_mpd_header(FILE *mpd, const char *mpd_name, GF_Config *dash_ctx, GF_DashProfile profile, Bool is_mpeg2, const char *title, const char *source, const char *copyright, const char *moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, Bool dash_dynamic, u32 time_shift_depth, Double mpd_duration, Double mpd_update_period, Double min_buffer, u32 ast_shift_sec, Bool use_cenc, Bool use_xlink)
+static void format_duration(FILE *mpd, Double dur, const char *name)
+{
+	Double s;
+	u32 h, m;
+
+	h = (u32) (dur/3600);
+	m = (u32) (dur/60 - h*60);
+	s = (dur - h*3600 - m*60);
+	fprintf(mpd, " %s=\"PT%dH%dM%.3fS\"", name, h, m, s);
+
+}
+
+static GF_Err write_mpd_header(GF_DASHSegmenter *dasher, FILE *mpd, Bool is_mpeg2, Double mpd_duration, Bool use_cenc, Bool use_xlink)
 {
 	u32 sec, frac;
+	u64 time_ms;
+	Double msec;
 #ifdef _WIN32_WCE
 	SYSTEMTIME syst;
 	FILETIME filet;
@@ -3845,11 +4675,21 @@
 	time_t gtime;
 	struct tm *t;
 #endif
-	u32 h, m, i;
-	Double s;
+	u32 i;
 
 	gf_net_get_ntp(&sec, &frac);
-	sec += ast_shift_sec;
+	time_ms = sec;
+	time_ms *= 1000;
+	msec = frac*1000.0;
+	msec /= 0xFFFFFFFF;
+
+	time_ms += (u32) msec;
+	if (dasher->ast_offset_ms > 0) {
+		time_ms += (u32) dasher->ast_offset_ms;
+	}
+	sec = (u32) (time_ms/1000);
+	time_ms -= ((u64)sec)*1000;
+	assert(time_ms<1000);
 
 	fprintf(mpd, "<?xml version=\"1.0\"?>\n");
 	fprintf(mpd, "\n");
 
 	/*TODO what should we put for minBufferTime */
-	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%fS\" type=\"%s\"", min_buffer, dash_dynamic ? "dynamic" : "static");
-	if (dash_dynamic) {
-		if (dash_ctx) {
+	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%.3fS\" type=\"%s\"", dasher->min_buffer, dasher->dash_mode ? "dynamic" : "static");
+
+
+	if (dasher->dash_mode != GF_DASH_STATIC) {
+		//set publish time
+#ifndef _WIN32_WCE
+		gtime = sec - GF_NTP_SEC_1900_TO_1970;
+		t = gmtime(&gtime);
+		fprintf(mpd, " publishTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+#else
+		GetSystemTime(&syst);
+		fprintf(mpd, " publishTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond);
+#endif
+
+		if (dasher->dash_ctx) {
 			//we only support profiles for which AST has to be the same
-			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
-			sscanf(opt, "%u", &sec);
-			sec += ast_shift_sec;
+			const char *opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
+			sscanf(opt, "%u:%u", &sec, &frac);
+
+			msec = frac*1000.0;
+			msec /= 0xFFFFFFFF;
+			time_ms = (u32) msec;
 		}
 
 #ifdef _WIN32_WCE
 		*(LONGLONG *) &filet = (sec - GF_NTP_SEC_1900_TO_1970) * 10000000 + TIMESPEC_TO_FILETIME_OFFSET;
 		FileTimeToSystemTime(&filet, &syst);
-		fprintf(mpd, " on %d-%02d-%02dT%02d:%02d:%02dZ", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond);
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Generating MPD at time %d-%02d-%02dT%02d:%02d:%02dZ\n", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond) );
+		fprintf(mpd, " " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\"", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond, (u32) time_ms);
 #else
 		gtime = sec - GF_NTP_SEC_1900_TO_1970;
 		t = gmtime(&gtime);
-		fprintf(mpd, " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-		if (ast_shift_sec) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] MPD AvailabilityStartTime %d-%02d-%02dT%02d:%02d:%02dZ\n", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec) );
-		}
+		fprintf(mpd, " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, (u32) time_ms);
 #endif
 
-		if ((s32)time_shift_depth>=0) {
-			h = (u32) (time_shift_depth/3600);
-			m = (u32) (time_shift_depth/60 - h*60);
-			s = time_shift_depth - h*3600 - m*60;
-			fprintf(mpd, " timeShiftBufferDepth=\"PT%dH%dM%.2fS\"", h, m, s);
-		}
-		if (mpd_update_period) {
-			h = (u32) (mpd_update_period/3600);
-			m = (u32) (mpd_update_period/60 - h*60);
-			s = mpd_update_period - h*3600 - m*60;
-			fprintf(mpd, " minimumUpdatePeriod=\"PT%dH%dM%.2fS\"", h, m, s);
+		if (dasher->time_shift_depth>=0) {
+			format_duration(mpd, dasher->time_shift_depth, "timeShiftBufferDepth");
+		}
+		if (dasher->mpd_update_time) {
+			format_duration(mpd, dasher->mpd_update_time, "minimumUpdatePeriod");
+		} else {
+			format_duration(mpd, mpd_duration, "mediaPresentationDuration");
 		}
 
 	} else {
-		h = (u32) (mpd_duration/3600);
-		m = (u32) (mpd_duration/60 - h*60);
-		s = mpd_duration - h*3600 - m*60;
-		fprintf(mpd, " mediaPresentationDuration=\"PT%dH%dM%.2fS\"", h, m, s);
-	}
-
-	if (profile==GF_DASH_PROFILE_LIVE) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-simple" : "isoff-live");
-	} else if (profile==GF_DASH_PROFILE_ONDEMAND) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\"");
-	} else if (profile==GF_DASH_PROFILE_MAIN) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-main" : "isoff-main");
-	} else if (profile==GF_DASH_PROFILE_AVC264_LIVE) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-live:2011, http://dashif.org/guildelines/dash264\"");
-	} else if (profile==GF_DASH_PROFILE_AVC264_ONDEMAND) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011, http://dashif.org/guildelines/dash264\"");
+		format_duration(mpd, mpd_duration, "mediaPresentationDuration");
+	}
+
+	if (dasher->max_segment_duration) {
+		format_duration(mpd, dasher->max_segment_duration, "maxSegmentDuration");
+	}
+
+	if (dasher->profile==GF_DASH_PROFILE_LIVE) {
+		if (use_xlink && !is_mpeg2) {
+			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-ext-live:2014");
+		} else {
+			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011", is_mpeg2 ? "mp2t-simple" : "isoff-live");
+		}
+	} else if (dasher->profile==GF_DASH_PROFILE_ONDEMAND) {
+		if (use_xlink) {
+			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-ext-on-demand:2014");
+		} else {
+			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011");
+		}
+	} else if (dasher->profile==GF_DASH_PROFILE_MAIN) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011", is_mpeg2 ? "mp2t-main" : "isoff-main");
+	} else if (dasher->profile==GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		fprintf(mpd, " profiles=\"urn:hbbtv:dash:profile:isoff-live:2012");
+	} else if (dasher->profile==GF_DASH_PROFILE_AVC264_LIVE) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-live:2011,http://dashif.org/guidelines/dash264");
+	} else if (dasher->profile==GF_DASH_PROFILE_AVC264_ONDEMAND) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011,http://dashif.org/guidelines/dash264");
 	} else {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011\"");
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011");
+	}
+
+	if (dasher->dash_profile_extension) {
+		fprintf(mpd, ",%s", dasher->dash_profile_extension);
 	}
+	fprintf(mpd, "\"");
+
 	if (use_cenc) {
 		fprintf(mpd, " xmlns:cenc=\"urn:mpeg:cenc:2013\"");
 	}
@@ -3932,73 +4796,77 @@
 
 	fprintf(mpd, ">\n");
 
-	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");
-	if (title)
-		fprintf(mpd, " <Title>%s</Title>\n", title);
+	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", dasher->moreInfoURL ? dasher->moreInfoURL : "http://gpac.sourceforge.net");
+	if (dasher->title)
+		fprintf(mpd, " <Title>%s</Title>\n", dasher->title);
 	else
-		fprintf(mpd, " <Title>%s generated by GPAC</Title>\n", mpd_name);
+		fprintf(mpd, " <Title>%s generated by GPAC</Title>\n", dasher->mpd_name);
 
-	if (source)
-		fprintf(mpd, " <Source>%s</Source>\n", source);
-	if (copyright)
-		fprintf(mpd, " <Copyright>%s</Copyright>\n", copyright);
+	if (dasher->source)
+		fprintf(mpd, " <Source>%s</Source>\n", dasher->source);
+	if (dasher->location)
+		fprintf(mpd, " <Location>%s</Location>\n", dasher->location);
+	if (dasher->copyright)
+		fprintf(mpd, " <Copyright>%s</Copyright>\n", dasher->copyright);
 	fprintf(mpd, " </ProgramInformation>\n");
 
-	for (i=0; i<nb_mpd_base_urls; i++) {
-		fprintf(mpd, " <BaseURL>%s</BaseURL>\n", mpd_base_urls[i]);
+	for (i=0; i<dasher->nb_base_urls; i++) {
+		fprintf(mpd, " <BaseURL>%s</BaseURL>\n", dasher->base_urls[i]);
 	}
 	fprintf(mpd, "\n");
 	return GF_OK;
 }
 
-static GF_Err write_period_header(FILE *mpd, const char *szID, Double period_start, Double period_duration,
- Bool dash_dynamic, const char *xlink,
- GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 period_num)
+static GF_Err write_period_header(GF_DASHSegmenter *dasher, FILE *mpd, const char *szID, Double period_start, Double period_duration,
+ const char *xlink, u32 period_num, Bool insert_xmlns)
 {
-	u32 h, m;
-	Double s;
 	u32 i,j;
-
 	fprintf(mpd, " <Period");
+
+	if (insert_xmlns) {
+		fprintf(mpd, " xmlns=\"urn:mpeg:dash:schema:mpd:2011\" ");
+	}
 	if (szID && strlen(szID))
 		fprintf(mpd, " id=\"%s\"", szID);
 
-	if (period_start || dash_dynamic) {
-		h = (u32) (period_start/3600);
-		m = (u32) (period_start/60 - h*60);
-		s = period_start - h*3600 - m*60;
-		fprintf(mpd, " start=\"PT%dH%dM%.2fS\"", h, m, s);
-	}
-	if (!dash_dynamic && period_duration) {
-		h = (u32) (period_duration/3600);
-		m = (u32) (period_duration/60 - h*60);
-		s = period_duration - h*3600 - m*60;
-		fprintf(mpd, " duration=\"PT%dH%dM%.2fS\"", h, m, s);
+	if (period_start || dasher->dash_mode) {
+		format_duration(mpd, period_start, "start");
+	}
+	if (!dasher->dash_mode && period_duration) {
+		format_duration(mpd, period_duration, "duration");
 	}
 	if (xlink) {
 		fprintf(mpd, " xlink:href=\"%s\"", xlink);
 	}
+
 	fprintf(mpd, ">\n");
 
 	/* writing Period level descriptors */
-	for (i=0; i< nb_dash_inputs; i++) {
-		if (dash_inputs[i].adaptation_set && (dash_inputs[i].period==period_num)) {
-			for (j = 0; j < dash_inputs[i].nb_p_descs; j++) {
-				fprintf(mpd, " %s\n", dash_inputs[i].p_descs[j]);
+	for (i=0; i< dasher->nb_inputs; i++) {
+		if (dasher->inputs[i].adaptation_set && (dasher->inputs[i].period==period_num)) {
+			for (j = 0; j < dasher->inputs[i].nb_p_descs; j++) {
+				fprintf(mpd, " %s\n", dasher->inputs[i].p_descs[j]);
 			}
 		}
 	}
 
+	if (xlink) {
+		fprintf(mpd, " </Period>\n");
+	}
+
 	return GF_OK;
 }
 
 static GF_Err write_adaptation_header(FILE *mpd, GF_DashProfile profile, Bool use_url_template, u32 single_file_mode,
 GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 period_num, u32 adaptation_set_num, u32 first_rep_in_set,
- Bool bitstream_switching_mode, u32 max_width, u32 max_height, char *szMaxFPS, char *szLang, const char *szInitSegment)
+ Bool bitstream_switching_mode, u32 max_width, u32 max_height, u32 dar_num, u32 dar_den, char *szMaxFPS, char *szLang, const char *szInitSegment, Bool segment_alignment_disabled, const char *mpd_name)
 {
 	u32 i, j;
+	Bool is_on_demand = ((profile==GF_DASH_PROFILE_ONDEMAND) || (profile==GF_DASH_PROFILE_AVC264_ONDEMAND));
 	GF_DashSegInput *first_rep = &dash_inputs[first_rep_in_set];
-	fprintf(mpd, " <AdaptationSet segmentAlignment=\"true\"");
+
+	//force segmentAlignment in onDemand
+	fprintf(mpd, " <AdaptationSet segmentAlignment=\"%s\"", (!is_on_demand && segment_alignment_disabled) ? "false" : "true");
 	if (bitstream_switching_mode) {
 		fprintf(mpd, " bitstreamSwitching=\"true\"");
 	}
@@ -4009,31 +4877,54 @@
 		fprintf(mpd, " maxWidth=\"%d\" maxHeight=\"%d\"", max_width, max_height);
 		if (strlen(szMaxFPS))
 			fprintf(mpd, " maxFrameRate=\"%s\"", szMaxFPS);
-		gf_media_reduce_aspect_ratio(&max_width, &max_height);
-		fprintf(mpd, " par=\"%d:%d\"", max_width, max_height);
+
+		gf_media_reduce_aspect_ratio(&dar_num, &dar_den);
+		fprintf(mpd, " par=\"%d:%d\"", dar_num, dar_den);
 	}
-	//add lang even if "und" to comply with dash-if 
+
+
+	//add lang even if "und" to comply with dash-if
 	if (szLang) {
 		fprintf(mpd, " lang=\"%s\"", szLang);
 	}
-	/*this should be fixed to use info collected during segmentation process*/
-	if (profile==GF_DASH_PROFILE_ONDEMAND)
+	if ((profile==GF_DASH_PROFILE_ONDEMAND) || (profile==GF_DASH_PROFILE_AVC264_ONDEMAND)) {
+		fprintf(mpd, " subsegmentAlignment=\"%s\"", segment_alignment_disabled ? "false" : "true");
+		//FIXME - we need inspection of the segments to figure out the SAP type !
 		fprintf(mpd, " subsegmentStartsWithSAP=\"1\"");
-
-	if (!strcmp(first_rep->szMime, "video/mp2t"))
-		fprintf(mpd, " subsegmentAlignment=\"true\"");
-
+	}
 	fprintf(mpd, ">\n");
 
 	/* writing AdaptationSet level descriptors specified only on one input (non discriminating during classification)*/
 	for (i=0; i< nb_dash_inputs; i++) {
-		if (dash_inputs[i].adaptation_set == adaptation_set_num && dash_inputs[i].period == period_num) {
+		if ((dash_inputs[i].adaptation_set == adaptation_set_num) && (dash_inputs[i].period == period_num)) {
 			for (j = 0; j < dash_inputs[i].nb_as_c_descs; j++) {
 				fprintf(mpd, " %s\n", dash_inputs[i].as_c_descs[j]);
 			}
 		}
 	}
 
+	//check SRD
+	for (i=0; i< nb_dash_inputs; i++) {
+		if ((dash_inputs[i].adaptation_set == adaptation_set_num) && (dash_inputs[i].period == period_num)) {
+			if (dash_inputs[i].w && dash_inputs[i].h
+#ifdef GENERATE_VIRTUAL_REP_SRD
+			 && !dash_inputs[i].virtual_representation
+#endif
+			 ) {
+				if (dash_inputs[i].dependencyID) {
+					fprintf(mpd, " <SupplementalProperty schemeIdUri=\"urn:mpeg:dash:srd:2014\" value=\"1,%d,%d,%d,%d\"/>\n", dash_inputs[i].x, dash_inputs[i].y, dash_inputs[i].w, dash_inputs[i].h);
+					break;
+				}
+				//this is the base layer
+				else {
+					fprintf(mpd, " <EssentialProperty schemeIdUri=\"urn:mpeg:dash:srd:2014\" value=\"1,0,0,0,0\"/>\n");
+					break;
+				}
+			}
+		}
+	}
+
+
 	if (first_rep) {
 
 		/* writing AdaptationSet level descriptors specified only all inputs for that AdaptationSet*/
@@ -4051,13 +4942,14 @@
 		}
 
 		/*set role*/
-		if (strlen(first_rep->role)) {
+		if (first_rep->role) {
 			if (!strcmp(first_rep->role, "caption") || !strcmp(first_rep->role, "subtitle") || !strcmp(first_rep->role, "main")
 			 || !strcmp(first_rep->role, "alternate") || !strcmp(first_rep->role, "supplementary") || !strcmp(first_rep->role, "commentary")
 			 || !strcmp(first_rep->role, "dub")
 			 ) {
 				fprintf(mpd, " <Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"%s\"/>\n", first_rep->role);
 			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Unrecognized role %s - using GPAC urn for schemaID\n", first_rep->role));
 				fprintf(mpd, " <Role schemeIdUri=\"urn:gpac:dash:role:2013\" value=\"%s\"/>\n", first_rep->role);
 			}
 		}
@@ -4093,22 +4985,18 @@
 
 		if (bitstream_switching_mode && !use_url_template && (single_file_mode!=1) && strlen(szInitSegment) ) {
 			fprintf(mpd, " <SegmentList>\n");
-			fprintf(mpd, " <Initialization sourceURL=\"%s\"/>\n", gf_url_get_resource_name( szInitSegment ));
+			fprintf(mpd, " <Initialization sourceURL=\"%s\"/>\n", gf_dasher_strip_output_dir(mpd_name, szInitSegment ));
 			fprintf(mpd, " </SegmentList>\n");
 		}
 	}
 	return GF_OK;
 }
 
-static GF_Err gf_dasher_init_context(GF_Config *dash_ctx, u32 *dynamic, u32 *timeShiftBufferDepth, const char *periodID, u32 ast_shift_sec)
+static GF_Err gf_dasher_init_context(GF_Config *dash_ctx, GF_DashDynamicMode *dash_mode, s32 *timeShiftBufferDepth, const char *periodID, s32 ast_shift_ms)
 {
 	const char *opt;
 	char szVal[100];
 	Bool first_run = GF_FALSE;
-	u32 sec, frac;
-#ifndef _WIN32_WCE
-	time_t gtime;
-#endif
 
 	if (!dash_ctx) return GF_BAD_PARAM;
 
@@ -4117,17 +5005,17 @@
 	if (!opt) {
 		first_run = GF_TRUE;
 		sprintf(szVal, "%d", *timeShiftBufferDepth);
-		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*dynamic==2) ? "dynamic-debug" : ( *dynamic ? "dynamic" : "static" ) );
+		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*dash_mode == GF_DASH_DYNAMIC_DEBUG) ? "dynamic-debug" : ( *dash_mode ? "dynamic" : "static" ) );
 		gf_cfg_set_key(dash_ctx, "DASH", "TimeShiftBufferDepth", szVal);
 		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "yes");
 	}
 	//switching from live to static
-	else if (! (*dynamic) && !strncmp(opt, "dynamic", 7)) {
+	else if (! (*dash_mode) && !strncmp(opt, "dynamic", 7)) {
 		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", "static");
 	} else {
-		*dynamic = 0;
-		if (!strcmp(opt, "dynamic")) *dynamic = 1;
-		else if (!strcmp(opt, "dynamic-debug")) *dynamic = 2;
+		*dash_mode = GF_DASH_STATIC;
+		if (!strcmp(opt, "dynamic")) *dash_mode = GF_DASH_DYNAMIC;
+		else if (!strcmp(opt, "dynamic-debug")) *dash_mode = GF_DASH_DYNAMIC_DEBUG;
 
 		opt = gf_cfg_get_key(dash_ctx, "DASH", "TimeShiftBufferDepth");
 		*timeShiftBufferDepth = atoi(opt);
@@ -4136,17 +5024,19 @@
 
 	gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "no");
 
-	gf_net_get_ntp(&sec, &frac);
-
 	if (first_run) {
+		u32 sec, frac;
+#ifndef _WIN32_WCE
+		time_t gtime;
+#endif
+		gf_net_get_ntp(&sec, &frac);
+
 #ifndef _WIN32_WCE
 		gtime = sec - GF_NTP_SEC_1900_TO_1970;
 		gf_cfg_set_key(dash_ctx, "DASH", "GenerationTime", asctime(gmtime(&gtime)));
 #endif
-		sprintf(szVal, "%u", sec);
+		sprintf(szVal, "%u:%u", sec, frac);
 		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTP", szVal);
-		sprintf(szVal, "%u", frac);
-		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTPFraction", szVal);
 
 		if (periodID)
 			gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
@@ -4168,34 +5058,42 @@
 }
 
 GF_EXPORT
-u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time)
+u32 gf_dasher_next_update_time(GF_DASHSegmenter *dasher)
 {
 	Double max_dur = 0;
 	Double safety_dur;
 	Double ms_elapsed;
-	u32 i, ntp_sec, frac, prev_sec, prev_frac;
+	u32 i, ntp_sec, frac, prev_sec, prev_frac, dash_scale;
 	const char *opt, *section;
 
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
+	if (!dasher || !dasher->dash_ctx) return -1;
+
+	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
 	if (!opt) return 0;
 
-	safety_dur = atof(opt);
-	if (safety_dur > (Double) mpd_update_time)
-		safety_dur = (Double) mpd_update_time;
+	safety_dur = atof(opt) / 2;
+	if (safety_dur > dasher->mpd_update_time)
+		safety_dur = dasher->mpd_update_time;
+
+	safety_dur = 0;
 
+	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
+	sscanf(opt, "%u:%u", &prev_sec, &prev_frac);
 
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
-	sscanf(opt, "%u", &prev_sec);
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTPFraction");
-	sscanf(opt, "%u", &prev_frac);
+	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "TimeScale");
+	sscanf(opt, "%u", &dash_scale);
 
 	/*compute cumulated duration*/
-	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
+	for (i=0; i<gf_cfg_get_section_count(dasher->dash_ctx); i++) {
 		Double dur = 0;
-		section = gf_cfg_get_section_name(dash_ctx, i);
+		section = gf_cfg_get_section_name(dasher->dash_ctx, i);
 		if (section && !strncmp(section, "Representation_", 15)) {
-			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
-			if (opt) dur = atof(opt);
+			opt = gf_cfg_get_key(dasher->dash_ctx, section, "CumulatedDuration");
+			if (opt) {
+				u64 val;
+				sscanf(opt, LLU, &val);
+				dur = ((Double) val) / dash_scale;
+			}
 			if (dur>max_dur) max_dur = dur;
 		}
 	}
@@ -4217,46 +5115,53 @@
 }
 
 /*peform all file cleanup*/
-static Bool gf_dasher_cleanup(GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double dash_duration, u32 ast_shift_sec)
+static Bool gf_dasher_cleanup(GF_DASHSegmenter *dasher)
 {
 	Double max_dur = 0;
 	Double elapsed = 0;
-	Double safety_dur = MAX(mpd_update_time, (u32) dash_duration);
-	u32 i, ntp_sec, frac, prev_sec;
+	Double dash_duration = 1000*dasher->segment_duration / dasher->dash_scale;
+	Double safety_dur = MAX(dasher->mpd_update_time, dash_duration);
+	u32 i, ntp_sec, frac, prev_sec, prev_frac;
 	const char *opt, *section;
 	GF_Err e;
 
-	if (!dash_dynamic) return 1;
+	if (!dasher->dash_mode) return GF_TRUE;
 
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "StoreParams");
-	if (opt && !strcmp(opt, "yes")) return 1;
+	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "StoreParams");
+	if (opt && !strcmp(opt, "yes")) return GF_TRUE;
 
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
-	if (!opt) return 1;
-	sscanf(opt, "%u", &prev_sec);
+	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
+	if (!opt) return GF_TRUE;
+	sscanf(opt, "%u:%u", &prev_sec, &prev_frac);
 
 	/*compute cumulated duration*/
-	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
+	for (i=0; i<gf_cfg_get_section_count(dasher->dash_ctx); i++) {
 		Double dur = 0;
-		section = gf_cfg_get_section_name(dash_ctx, i);
+		section = gf_cfg_get_section_name(dasher->dash_ctx, i);
 		if (section && !strncmp(section, "Representation_", 15)) {
-			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
-			if (opt) dur = atof(opt);
+			opt = gf_cfg_get_key(dasher->dash_ctx, section, "CumulatedDuration");
+			if (opt) {
+				u64 val;
+				sscanf(opt, LLU, &val);
+				dur = ((Double) val) / dasher->dash_scale;
+			}
 			if (dur>max_dur) max_dur = dur;
 		}
 	}
-	if (!max_dur) return 1;
+	if (!max_dur) return GF_TRUE;
 	gf_net_get_ntp(&ntp_sec, &frac);
 
-	if (dash_dynamic==2) {
+	if (dasher->dash_mode == GF_DASH_DYNAMIC_DEBUG) {
 		elapsed = (u32)-1;
 	} else {
 		elapsed = ntp_sec;
+		elapsed += (frac*1.0)/0xFFFFFFFF;
 		elapsed -= prev_sec;
+		elapsed -= (prev_frac*1.0)/0xFFFFFFFF;
 		/*check if we need to generate */
-		if (!dash_dynamic && elapsed < max_dur - safety_dur ) {
+		if (!dasher->dash_mode && elapsed < max_dur - safety_dur ) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Asked to regenerate segments before expiration of the current segment list, please wait %g seconds - ignoring\n", max_dur + prev_sec - ntp_sec ));
-			return 0;
+			return GF_FALSE;
 		}
 		if (elapsed > max_dur) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Generating segments and MPD %g seconds too late\n", elapsed - (u32) max_dur));
@@ -4267,26 +5172,32 @@
 	}
 
 	/*cleanup old segments*/
-	if ((s32) time_shift_depth >= 0) {
-		for (i=0; i<gf_cfg_get_key_count(dash_ctx, "SegmentsStartTimes"); i++) {
+	if (dasher->time_shift_depth >= 0) {
+		for (i=0; i<gf_cfg_get_key_count(dasher->dash_ctx, "SegmentsStartTimes"); i++) {
 			Double seg_time;
-			Bool found=0;
+			u64 start, dur;
+			char szRepID[100];
+			char szSecName[200];
 			u32 j;
-			const char *fileName = gf_cfg_get_key_name(dash_ctx, "SegmentsStartTimes", i);
-			const char *MPDTime = gf_cfg_get_key(dash_ctx, "SegmentsStartTimes", fileName);
+			const char *fileName = gf_cfg_get_key_name(dasher->dash_ctx, "SegmentsStartTimes", i);
+			const char *opt = gf_cfg_get_key(dasher->dash_ctx, "SegmentsStartTimes", fileName);
 			if (!fileName)
 				break;
 
-			seg_time = atof(MPDTime);
-			seg_time += ast_shift_sec;
-			seg_time += dash_duration + time_shift_depth;
+			sscanf(opt, ""LLU"-"LLU"@%s", &start, &dur, szRepID);
+			seg_time = (Double) start;
+			seg_time /= dasher->dash_scale;
+			if (dasher->ast_offset_ms > 0)
+				seg_time += ((Double) dasher->ast_offset_ms) / 1000;
+
+
+			seg_time += 2 * dash_duration + dasher->time_shift_depth;
 			seg_time -= elapsed;
-			/*safety gard of one second*/
-			if (seg_time >= -1)
-				break;
+			if (seg_time >= 0)
+				continue;
 
-			if (dash_dynamic!=2) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Removing segment %s - %g sec too late\n", fileName, -seg_time));
+			if (! (dasher->dash_mode == GF_DASH_DYNAMIC_DEBUG) ) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Removing segment %s - %g sec too late\n", fileName, -seg_time - dash_duration));
 			}
 
 			e = gf_delete_file(fileName);
@@ -4295,28 +5206,31 @@
 				break;
 			}
 
-			/*check all reps*/
-			for (j=0; j<gf_cfg_get_section_count(dash_ctx); j++) {
-				u32 k;
-				const char *secName = gf_cfg_get_section_name(dash_ctx, j);
-				if (!strstr(secName, "URLs_")) continue;
-				for (k=0; k<gf_cfg_get_key_count(dash_ctx, secName); k++) {
-					const char *entry = gf_cfg_get_key_name(dash_ctx, secName, k);
-					const char *name = gf_cfg_get_key(dash_ctx, secName, entry);
-					if (strstr(name, fileName)) {
-						gf_cfg_set_key(dash_ctx, secName, entry, NULL);
-						found=1;
-						break;
-					}
+			sprintf(szSecName, "URLs_%s", szRepID);
+
+			/*remove URLs*/
+			for (j=0; j<gf_cfg_get_key_count(dasher->dash_ctx, szSecName); j++) {
+				const char *entry = gf_cfg_get_key_name(dasher->dash_ctx, szSecName, j);
+				const char *name = gf_cfg_get_key(dasher->dash_ctx, szSecName, entry);
+				if (strstr(name, fileName)) {
+					gf_cfg_set_key(dasher->dash_ctx, szSecName, entry, NULL);
+					break;
 				}
-				if (found) break;
 			}
 
-			gf_cfg_set_key(dash_ctx, "SegmentsStartTimes", fileName, NULL);
+			/*adjust seg removed count - this is needed to adjust startNumber for SegmentTimeline case*/
+			sprintf(szSecName, "Representation_%s", szRepID);
+			j = 1;
+			opt = gf_cfg_get_key(dasher->dash_ctx, szSecName, "NbSegmentsRemoved");
+			if (opt) j += atoi(opt);
+			sprintf(szRepID, "%d", j);
+			gf_cfg_set_key(dasher->dash_ctx, szSecName, "NbSegmentsRemoved", szRepID);
+
+			gf_cfg_set_key(dasher->dash_ctx, "SegmentsStartTimes", fileName, NULL);
 			i--;
 		}
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 static u32 gf_dash_get_dependency_bandwidth(GF_DashSegInput *inputs, u32 nb_dash_inputs, const char *file_name, u32 trackNum) {
@@ -4335,14 +5249,14 @@
 	FILE *period_mpd;
 	u32 xml_size;
 
-	period_mpd = gf_f64_open(szPeriodXML, "rb");
+	period_mpd = gf_fopen(szPeriodXML, "rb");
 	if (!period_mpd) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Error opening period MPD file %s\n", szPeriodXML));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Error opening period MPD file %s\n", szPeriodXML));
 		return GF_IO_ERR;
 	}
-	gf_f64_seek(period_mpd, 0, SEEK_END);
-	xml_size = (u32) gf_f64_tell(period_mpd);
-	gf_f64_seek(period_mpd, 0, SEEK_SET);
+	gf_fseek(period_mpd, 0, SEEK_END);
+	xml_size = (u32) gf_ftell(period_mpd);
+	gf_fseek(period_mpd, 0, SEEK_SET);
 
 	while (xml_size) {
 		char buf[4096];
@@ -4350,15 +5264,16 @@
 		if (xml_size<4096) size = xml_size;
 		read = (u32) fread(buf, 1, size, period_mpd);
 		if (read != size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Error reading from period MPD file: got %d but requested %d bytes\n", read, size ));
-			fclose(period_mpd);
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Error reading from period MPD file: got %d but requested %d bytes\n", read, size ));
+			gf_fclose(period_mpd);
 			return GF_IO_ERR;
 		}
 
 		fwrite(buf, 1, size, mpd);
 		xml_size -= size;
 	}
-	fclose(period_mpd);
+	gf_fclose(period_mpd);
+	//we cannot delet the file because we don't know if we will be called again with a new period, in which case we need to reinsert this XML ...
 	return GF_OK;
 }
 
@@ -4378,502 +5293,954 @@
 	}
 }
 
-/*dash segmenter*/
-GF_EXPORT
-GF_Err gf_dasher_segment_files(const char *mpdfile, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile dash_profile,
- const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
- const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls,
- u32 use_url_template, Bool use_segment_timeline, Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching,
- Bool seg_at_rap, Double dash_duration, char *seg_name, char *seg_ext, u32 segment_marker_4cc,
- Double frag_duration, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool frag_at_rap, const char *tmpdir,
- GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer,
- u32 ast_shift_sec, u32 dash_scale, Bool fragments_in_memory, u32 initial_moof_sn, u64 initial_tfdt, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof)
+typedef struct
 {
-	u32 i, j, k, segment_mode;
-	char *sep, szSegName[GF_MAX_PATH], szSolvedSegName[GF_MAX_PATH], szTempMPD[GF_MAX_PATH], szOpt[GF_MAX_PATH];
 	char szPeriodXML[GF_MAX_PATH];
+	const char *xlink;
+	Double period_duration;
+	Bool is_xlink;
+	u32 period_idx;
+	const char *id;
+} PeriodEntry;
+
+
+GF_EXPORT
+GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile dash_profile, const char *tmp_dir, u32 dash_timescale, GF_Config *dasher_context_file)
+{
+	GF_DASHSegmenter *dasher;
+	GF_SAFEALLOC(dasher, GF_DASHSegmenter);
+
+	dasher->mpd_name = gf_strdup(mpdName);
+	dasher->dash_scale = dash_timescale ? dash_timescale : 1000;
+	if (tmp_dir) dasher->tmpdir = gf_strdup(tmp_dir);
+	dasher->profile = dash_profile;
+	dasher->dash_ctx = dasher_context_file;
+
+	return dasher;
+}
+
+GF_EXPORT
+void gf_dasher_clean_inputs(GF_DASHSegmenter *dasher)
+{
+	u32 i, j;
+	for (i=0; i < dasher->nb_inputs; i++) {
+		for (j = 0; j < dasher->inputs[i].nb_components; j++) {
+			if (dasher->inputs[i].components[j].lang) {
+				gf_free(dasher->inputs[i].components[j].lang);
+			}
+		}
+		if (dasher->inputs[i].dependencyID) gf_free(dasher->inputs[i].dependencyID);
+		if (dasher->inputs[i].init_seg_url) gf_free(dasher->inputs[i].init_seg_url);
+
+		if (dasher->inputs[i].isobmf_input) {
+			//we don't want to save any modif due to duration adjustments
+			gf_isom_delete(dasher->inputs[i].isobmf_input);
+		}
+	}
+	gf_free(dasher->inputs);
+	dasher->inputs = NULL;
+	dasher->nb_inputs = 0;
+}
+
+GF_EXPORT
+void gf_dasher_del(GF_DASHSegmenter *dasher)
+{
+	if (dasher->seg_rad_name) gf_free(dasher->seg_rad_name);
+	gf_dasher_clean_inputs(dasher);
+	gf_free(dasher->base_urls);
+	gf_free(dasher->tmpdir);
+	gf_free(dasher->mpd_name);
+	gf_free(dasher->title);
+	gf_free(dasher->copyright);
+	gf_free(dasher->moreInfoURL);
+	gf_free(dasher->source);
+	gf_free(dasher->location);
+	gf_free(dasher);
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_info(GF_DASHSegmenter *dasher, const char *title, const char *copyright, const char *moreInfoURL, const char *sourceInfo)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	if (title) dasher->title = gf_strdup(title);
+	if (copyright) dasher->copyright = gf_strdup(copyright);
+	if (moreInfoURL) dasher->moreInfoURL = gf_strdup(moreInfoURL);
+	if (sourceInfo) dasher->source = gf_strdup(sourceInfo);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_location(GF_DASHSegmenter *dasher, const char *location)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	if (location) dasher->location = gf_strdup(location);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_add_base_url(GF_DASHSegmenter *dasher, const char *base_url)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->base_urls = gf_realloc(dasher->base_urls, sizeof(const char **) * (1+dasher->nb_base_urls));
+	dasher->base_urls[dasher->nb_base_urls] = (char *)base_url;
+	dasher->nb_base_urls++;
+	return GF_OK;
+}
+
+static void dasher_format_seg_name(GF_DASHSegmenter *dasher, const char *inName)
+{
+	char szName[GF_MAX_PATH];
+	/*if output is not in the current working dir, concatenate output path to segment name*/
+	szName[0] = 0;
+
+	if (inName && gf_url_get_resource_path(dasher->mpd_name, szName)) {
+		strcat(szName, inName);
+		dasher->seg_rad_name = gf_strdup(szName);
+	} else {
+		if (inName) dasher->seg_rad_name = gf_strdup(inName);
+	}
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->use_url_template = enable;
+	dasher->seg_ext = default_extension;
+	dasher_format_seg_name(dasher, default_template);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_segment_timeline(GF_DASHSegmenter *dasher, Bool enable)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->use_segment_timeline = enable;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_single_segment(GF_DASHSegmenter *dasher, Bool enable)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->single_segment = enable;
+	return GF_OK;
+}
+GF_EXPORT
+GF_Err gf_dasher_enable_single_file(GF_DASHSegmenter *dasher, Bool enable)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->single_file = enable;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_switch_mode(GF_DASHSegmenter *dasher, GF_DashSwitchingMode bitstream_switching)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->bitstream_switching_mode = bitstream_switching;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Bool segment_duration_strict, Double default_fragment_duration)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->segment_duration = default_segment_duration * 1000 / dasher->dash_scale;
+	dasher->segment_duration_strict = segment_duration_strict;
+	if (default_fragment_duration)
+		dasher->fragment_duration = default_fragment_duration * 1000 / dasher->dash_scale;
+	else
+		dasher->fragment_duration = dasher->segment_duration;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_rap_splitting(GF_DASHSegmenter *dasher, Bool segments_start_with_rap, Bool fragments_start_with_rap)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->segments_start_with_rap = segments_start_with_rap;
+	dasher->fragments_start_with_rap = fragments_start_with_rap;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_segment_marker(GF_DASHSegmenter *dasher, u32 segment_marker_4cc)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->segment_marker_4cc = segment_marker_4cc;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->enable_sidx = enable_sidx;
+	dasher->subsegs_per_sidx = subsegs_per_sidx;
+	dasher->daisy_chain_sidx = daisy_chain_sidx;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_dynamic_mode(GF_DASHSegmenter *dasher, GF_DashDynamicMode dash_mode, Double mpd_update_time, s32 time_shift_depth, Double mpd_live_duration)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->dash_mode = dash_mode;
+	dasher->mpd_update_time = mpd_update_time;
+	dasher->time_shift_depth = time_shift_depth;
+	dasher->mpd_live_duration = mpd_live_duration;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_min_buffer(GF_DASHSegmenter *dasher, Double min_buffer)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->min_buffer = min_buffer;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_ast_offset(GF_DASHSegmenter *dasher, s32 ast_offset_ms)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->ast_offset_ms = ast_offset_ms;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_memory_fragmenting(GF_DASHSegmenter *dasher, Bool fragments_in_memory)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->fragments_in_memory = fragments_in_memory;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_initial_isobmf(GF_DASHSegmenter *dasher, u32 initial_moof_sn, u64 initial_tfdt)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->initial_moof_sn = initial_moof_sn;
+	dasher->initial_tfdt = initial_tfdt;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->no_fragments_defaults = no_fragments_defaults;
+	dasher->pssh_moof = pssh_moof;
+	dasher->samplegroups_in_traf = samplegroups_in_traf;
+	dasher->single_traf_per_moof = single_traf_per_moof;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_utc_ref(GF_DASHSegmenter *dasher, Bool insert_utc)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->insert_utc = insert_utc;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_real_time(GF_DASHSegmenter *dasher, Bool real_time)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->real_time = real_time;
+	return GF_OK;
+}
+
+GF_EXPORT
+
+GF_Err gf_dasher_set_content_protection_location_mode(GF_DASHSegmenter *dasher, GF_DASH_ContentLocationMode mode)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->cp_location_mode = mode;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_profile_extension(GF_DASHSegmenter *dasher, const char *dash_profile_extension)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->dash_profile_extension = dash_profile_extension;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, GF_DashSegmenterInput *input)
+{
+	GF_Err e;
+	GF_DashSegInput *dash_input;
+	if (!dasher) return GF_BAD_PARAM;
+
+	dasher->inputs = gf_realloc(dasher->inputs, sizeof(GF_DashSegInput) * (dasher->nb_inputs+1));
+	dash_input = &dasher->inputs[dasher->nb_inputs];
+	dasher->nb_inputs++;
+	memset(dash_input, 0, sizeof(GF_DashSegInput));
+
+	dash_input->file_name = input->file_name;
+	if (input->representationID)
+		strcpy(dash_input->representationID, input->representationID);
+
+	dash_input->periodID = input->periodID;
+	dash_input->media_duration = input->media_duration;
+	dash_input->nb_baseURL = input->nb_baseURL;
+	dash_input->baseURL = input->baseURL;
+	dash_input->xlink = input->xlink;
+	dash_input->role = input->role;
+
+	dash_input->nb_rep_descs = input->nb_rep_descs;
+	dash_input->rep_descs = input->rep_descs;
+	dash_input->nb_as_descs = input->nb_as_descs;
+	dash_input->as_descs = input->as_descs;
+	dash_input->nb_as_c_descs = input->nb_as_c_descs;
+	dash_input->as_c_descs = input->as_c_descs;
+	dash_input->nb_p_descs = input->nb_p_descs;
+	dash_input->p_descs = input->p_descs;
+
+	dash_input->bandwidth = input->bandwidth;
+
+	if (! dash_input->periodID) {
+		dash_input->period_id_not_specified = GF_TRUE;
+		//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
+		if (dasher->dash_mode || dasher->dash_ctx) {
+			dash_input->periodID = "GENID_DEF";
+		}
+	}
+	if (!strcmp(dash_input->file_name, "NULL") || !strcmp(dash_input->file_name, "") || !dash_input->file_name) {
+		if (!strcmp(dash_input->xlink, "")) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No input file specified and no xlink set - cannot dash\n"));
+			dasher->nb_inputs --;
+			return GF_BAD_PARAM;
+		}
+		dash_input->duration = input->period_duration;
+	} else {
+		dash_input->segment_duration = input->period_duration;
+
+		e = gf_dash_segmenter_probe_input(&dasher->inputs, &dasher->nb_inputs, dasher->nb_inputs-1);
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot open file %s for dashing: %s\n", dash_input->file_name, gf_error_to_string(e) ));
+			dasher->nb_inputs --;
+			return e;
+		}
+	}
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_dasher_process(GF_DASHSegmenter *dasher, Double sub_duration)
+{
+	u32 i, j, max_period, cur_period;
+	Bool has_role = GF_FALSE;
+	char *sep, szSolvedSegName[GF_MAX_PATH], szTempMPD[GF_MAX_PATH], szOpt[GF_MAX_PATH];
 	const char *opt;
+	GF_Err e;
+	Bool uses_xlink = GF_FALSE;
+	Bool has_mpeg2 = GF_FALSE;
+	Bool none_supported = GF_TRUE;
+	u32 valid_inputs = 0;
 	u32 cur_adaptation_set;
 	u32 max_adaptation_set = 0;
-	u32 cur_period;
-	u32 max_period = 0;
 	u32 cur_group_id = 0;
 	u32 max_sap_type = 0;
+	u32 nb_sap_type_greater_than_3 = 0;
+	u32 nb_sap_type_greater_than_4 = 0;
 	u32 max_comp_per_input;
-	u32 last_period_rep_idx_plus_one = 0;
 	Bool use_cenc = GF_FALSE;
-	Bool none_supported = GF_TRUE;
-	Bool has_mpeg2 = GF_FALSE;
-	Bool has_role = GF_FALSE;
-	Bool content_protection_in_rep = GF_TRUE; /*if not in rep, then in the adptation set*/
+	Bool segment_alignment = GF_TRUE;
+	GF_List *period_links = NULL;
 	Double presentation_duration = 0;
 	Double active_period_start = 0;
-	GF_Err e = GF_OK;
+	u32 last_period_rep_idx_plus_one = 0;
 	FILE *mpd = NULL;
-	GF_DashSegInput *dash_inputs;
-	GF_DASHSegmenterOptions dash_opts;
-	u32 nb_dash_inputs;
-	Bool uses_xlink = GF_FALSE;
+	PeriodEntry *p;
+	if (!dasher) return GF_BAD_PARAM;
 
-	/*init dash context if needed*/
-	if (dash_ctx) {
-		e = gf_dasher_init_context(dash_ctx, &dash_dynamic, &time_shift_depth, NULL, ast_shift_sec);
-		if (e) return e;
-		if (dash_ctx) {
-			Bool regenerate;
-			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
-			if (opt) {
-				Double seg_dur = atof(opt);
-				/*
-								if (seg_dur != dash_duration) {
-									return GF_NOT_SUPPORTED;
-								}
-				*/
-				dash_duration = seg_dur;
-			} else {
-				char sOpt[100];
-				sprintf(sOpt, "%f", dash_duration);
-				gf_cfg_set_key(dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-			}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Dashing starting\n"));
+
+	dasher->force_period_end = GF_FALSE;
+
+	if (dasher->dash_mode && !dasher->mpd_update_time && !dasher->mpd_live_duration) {
+		if (dasher->dash_mode == GF_DASH_DYNAMIC_LAST) {
+			dasher->force_period_end = GF_TRUE;
+			dasher->dash_mode = GF_DASH_DYNAMIC;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Either MPD refresh (update) period or MPD duration shall be set in dynamic mode.\n"));
+			return GF_BAD_PARAM;
+		}
+	}
+	if (dasher->real_time && (dasher->nb_inputs>1)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] real-time simulation is only supported with a single representation.\n"));
+		return GF_BAD_PARAM;
+	}
 
-			/*peform all file cleanup*/
-			regenerate = gf_dasher_cleanup(dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_duration, ast_shift_sec);
-			if (!regenerate) return GF_OK;
 
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "HasXLINK");
-			if (opt && !strcmp(opt, "yes")) uses_xlink = GF_TRUE;
+	/*update dash context*/
+	if (dasher->dash_ctx) {
+		Bool regenerate;
+		e = gf_dasher_init_context(dasher->dash_ctx, &dasher->dash_mode, &dasher->time_shift_depth, NULL, dasher->ast_offset_ms);
+		if (e) return e;
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
+		if (opt) {
+			Double seg_dur = atof(opt);
+			dasher->max_segment_duration = seg_dur;
+		} else {
+			sprintf(szOpt, "%f", dasher->segment_duration);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", szOpt);
 		}
+		sprintf(szOpt, "%u", dasher->dash_scale);
+		gf_cfg_set_key(dasher->dash_ctx, "DASH", "TimeScale", szOpt);
+
+		/*peform all file cleanup*/
+		regenerate = gf_dasher_cleanup(dasher);
+		if (!regenerate) return GF_OK;
+
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "HasXLINK");
+		if (opt && !strcmp(opt, "yes")) uses_xlink = GF_TRUE;
 	}
 
-	/*copy over input files to our internal structure*/
 	max_period = 0;
-	/* first, we assume that nb_dash_inputs is equal to nb_inputs. This value will be recompute then*/
-	nb_dash_inputs = nb_inputs;
-	dash_inputs = gf_malloc(sizeof(GF_DashSegInput)*nb_dash_inputs);
-	memset(dash_inputs, 0, sizeof(GF_DashSegInput)*nb_dash_inputs);
-	j = 0;
-	for (i=0; i<nb_inputs; i++) {
-		s32 nb_diff;
-		dash_inputs[j].file_name = inputs[i].file_name;
-		strcpy(dash_inputs[j].representationID, inputs[i].representationID);
-		strcpy(dash_inputs[j].periodID, inputs[i].periodID);
-		strcpy(dash_inputs[j].xlink, inputs[i].xlink);
-		if (strlen(dash_inputs[j].xlink)) uses_xlink = GF_TRUE;
-		strcpy(dash_inputs[j].role, inputs[i].role);
-		dash_inputs[j].nb_rep_descs = inputs[i].nb_rep_descs;
-		dash_inputs[j].rep_descs = (char **)gf_malloc(dash_inputs[j].nb_rep_descs*sizeof(char *));
-		for (k = 0; k < dash_inputs[j].nb_rep_descs; k++) {
-			dash_inputs[j].rep_descs[k] = inputs[i].rep_descs[k];
-		}
-		dash_inputs[j].nb_as_descs = inputs[i].nb_as_descs;
-		dash_inputs[j].as_descs = (char **)gf_malloc(dash_inputs[j].nb_as_descs*sizeof(char *));
-		for (k = 0; k < dash_inputs[j].nb_as_descs; k++) {
-			dash_inputs[j].as_descs[k] = inputs[i].as_descs[k];
-		}
-		dash_inputs[j].nb_as_c_descs = inputs[i].nb_as_c_descs;
-		dash_inputs[j].as_c_descs = (char **)gf_malloc(dash_inputs[j].nb_as_c_descs*sizeof(char *));
-		for (k = 0; k < dash_inputs[j].nb_as_c_descs; k++) {
-			dash_inputs[j].as_c_descs[k] = inputs[i].as_c_descs[k];
-		}
-		dash_inputs[j].nb_p_descs = inputs[i].nb_p_descs;
-		dash_inputs[j].p_descs = (char **)gf_malloc(dash_inputs[j].nb_p_descs*sizeof(char *));
-		for (k = 0; k < dash_inputs[j].nb_p_descs; k++) {
-			dash_inputs[j].p_descs[k] = inputs[i].p_descs[k];
+
+	for (i=0; i<dasher->nb_inputs; i++) {
+		GF_DashSegInput *dash_input = &dasher->inputs[i];
+		dash_input->period = 0;
+
+		dash_input->moof_seqnum_increase = dash_input->nb_representations;
+		if (!dash_input->moof_seqnum_increase) dash_input->moof_seqnum_increase=1;
+
+		/*layered coded representation*/
+		if (dash_input->idx_representations) {
+			continue;
 		}
-		dash_inputs[j].bandwidth = inputs[i].bandwidth;
 
-		if (strlen(inputs[i].role) && strcmp(inputs[i].role, "main"))
-			has_role = 1;
+		if (dash_input->xlink) uses_xlink = GF_TRUE;
 
-		if (!strlen(dash_inputs[j].periodID)) {
+		if (dash_input->role && strcmp(dash_input->role, "main"))
+			has_role = GF_TRUE;
+
+		if (dash_input->period_id_not_specified) {
 			max_period = 1;
-			dash_inputs[j].period = 1;
-			//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
-			if (dash_dynamic || dash_ctx) {
-				strcpy(dash_inputs[j].periodID, "GENID_DEF");
-			}
 		}
-		nb_diff = nb_dash_inputs;
-		dash_inputs[j].moof_seqnum_increase = 2 + (u32) (dash_duration/frag_duration);
-		e = gf_dash_segmenter_probe_input(&dash_inputs, &nb_dash_inputs, j);
-		nb_diff = nb_dash_inputs - nb_diff;
-		if (e) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Cannot open file %s for dashing: %s\n", dash_inputs[i].file_name, gf_error_to_string(e) ));
-			nb_diff--;
-		}
-
-		if (!strcmp(dash_inputs[j].szMime, "video/mp2t")) has_mpeg2 = 1;
 
-		j += 1+nb_diff;
+		if (!strcmp(dash_input->szMime, "video/mp2t")) has_mpeg2 = GF_TRUE;
+		valid_inputs++;
 	}
-	if (!j) {
+	if (!valid_inputs) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: no suitable file found for dashing.\n"));
-		e = GF_BAD_PARAM;
-		goto exit;
+		return GF_BAD_PARAM;
 	}
 
-	memset(&dash_opts, 0, sizeof(GF_DASHSegmenterOptions));
+	//assign periods
+	for (i=0; i<dasher->nb_inputs; i++) {
+		GF_DashSegInput *dash_input = &dasher->inputs[i];
 
-	/*set all default roles to main if needed*/
-	if (has_role) {
-		for (i=0; i<nb_dash_inputs; i++) {
-			if (!strlen(dash_inputs[i].role))
-				strcpy(dash_inputs[i].role, "main");
-		}
-	}
+		/*set all default roles to main if needed*/
+		if (has_role && !dash_input->role)
+			dash_input->role = "main";
 
-	for (i=0; i<nb_dash_inputs; i++) {
-		if (dash_inputs[i].period)
+		//reset adaptation classifier
+		dash_input->adaptation_set = 0;
+
+
+		if (dash_input->period)
 			continue;
-		if (strlen(dash_inputs[i].periodID)) {
+
+		if (dash_input->period_id_not_specified) {
+			dash_input->period = 1;
+		}
+		else if (dash_input->periodID) {
 			max_period++;
-			dash_inputs[i].period = max_period;
+			dash_input->period = max_period;
 
-			for (j=i+1; j<nb_dash_inputs; j++) {
-				if (!strcmp(dash_inputs[j].periodID, dash_inputs[i].periodID))
-					dash_inputs[j].period = dash_inputs[i].period;
+			for (j=i+1; j<dasher->nb_inputs; j++) {
+				if (!strcmp(dasher->inputs[j].periodID, dasher->inputs[i].periodID))
+					dasher->inputs[j].period = dasher->inputs[i].period;
 			}
 		}
 	}
-	if (dash_dynamic && max_period>1) {
+
+	if (dasher->dash_mode && (max_period > 1) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Multiple periods in live mode not supported\n"));
-		e = GF_NOT_SUPPORTED;
-		goto exit;
+		return GF_NOT_SUPPORTED;
 	}
 
 	for (cur_period=0; cur_period<max_period; cur_period++) {
+		Double seg_duration_in_period = 0;
 		/*classify all input in possible adaptation sets*/
-		for (i=0; i<nb_dash_inputs; i++) {
+		for (i=0; i<dasher->nb_inputs; i++) {
+			GF_DashSegInput *dash_input = &dasher->inputs[i];
 			/*this file does not belong to our current period*/
-			if (dash_inputs[i].period != cur_period+1) continue;
+			if (dash_input->period != cur_period+1) continue;
+
+			if (!seg_duration_in_period) {
+				seg_duration_in_period = dash_input->segment_duration ? dash_input->segment_duration : dasher->segment_duration;
+			} else if (dash_input->segment_duration && (dash_input->segment_duration != seg_duration_in_period)) {
+				segment_alignment = GF_FALSE;
+			}
 
 			/*this file already belongs to an adaptation set*/
-			if (dash_inputs[i].adaptation_set) continue;
+			if (dash_input->adaptation_set) continue;
 
 			/*we cannot fragment the input file*/
-			if (!dash_inputs[i].dasher_input_classify || !dash_inputs[i].dasher_segment_file) {
+			if (!dash_input->dasher_input_classify || !dash_input->dasher_segment_file) {
+				//this is a remote period insertion
+				if (dash_input->xlink) {
+					//assign a AS for this fake source (otherwise first active period detection will fail)
+					dash_input->adaptation_set = 1;
+					none_supported = GF_FALSE;
+				}
 				continue;
 			}
 
-			max_adaptation_set ++;
-			dash_inputs[i].adaptation_set = max_adaptation_set;
-			dash_inputs[i].nb_rep_in_adaptation_set = 1;
-
-			e = dash_inputs[i].dasher_input_classify(dash_inputs, nb_dash_inputs, i, &cur_group_id, &max_sap_type);
-			if (e) goto exit;
-			none_supported = 0;
+			max_adaptation_set++;
+			dash_input->adaptation_set = max_adaptation_set;
+			dash_input->nb_rep_in_adaptation_set = 1;
+
+			e = dash_input->dasher_input_classify(dasher->inputs, dasher->nb_inputs, i, &cur_group_id, &max_sap_type);
+			if (e) return e;
+			none_supported = GF_FALSE;
+			if (max_sap_type>=3) nb_sap_type_greater_than_3++;
+			if (max_sap_type>3) nb_sap_type_greater_than_4++;
 		}
 		if (none_supported) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: None of the input types are supported for DASHing - nothing to do ...\n"));
-			e = GF_OK;
-			goto exit;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] None of the input types are supported for DASHing - nothing to do ...\n"));
+			return GF_OK;
 		}
 	}
 
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH classification done\n"));
+
 	/*check requested profiles can be generated, or adjust them*/
-	if (max_sap_type>=3) {
-		if (dash_profile) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type));
+	if (nb_sap_type_greater_than_4 || (nb_sap_type_greater_than_3 > 1)) {
+		if (dasher->profile) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type));
 		}
-		dash_profile = 0;
+		dasher->profile = GF_DASH_PROFILE_FULL;
+	}
+
+	switch (dasher->profile) {
+	case GF_DASH_PROFILE_AVC264_LIVE:
+	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+		if (dasher->cp_location_mode == GF_DASH_CPMODE_REPRESENTATION) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] ERROR! The selected DASH profile (DASH-IF IOP) requires the ContentProtection element to be present in the AdaptationSet element.\n"));
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
+	default:
+		break;
 	}
 
 	/*adjust params based on profiles*/
-	switch (dash_profile) {
+	switch (dasher->profile) {
 	case GF_DASH_PROFILE_LIVE:
-		seg_at_rap = 1;
-		use_url_template = 1;
-		single_segment = single_file = 0;
+		dasher->segments_start_with_rap = GF_TRUE;
+		dasher->use_url_template = 1;
+		dasher->single_segment = dasher->single_file = GF_FALSE;
 		break;
+	case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE: {
+		dasher->bitstream_switching_mode = GF_DASH_BSMODE_MULTIPLE_ENTRIES;
+		for (i=0; i<dasher->nb_inputs; i++) {
+			if (dasher->inputs[i].role && !strcmp(dasher->inputs[i].role, "main"))
+				break;
+		}
+		if (i == dasher->nb_inputs) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] HbbTV 1.5 ISO live profile requires to have at least one Adaptation Set\nlabelled with a Role@value of \"main\". Consider adding \":role=main\" to your inputs.\n"));
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
+	}
 	case GF_DASH_PROFILE_AVC264_LIVE:
-		seg_at_rap = 1;
-		no_fragments_defaults = 1;
-		use_url_template = 1;
-		single_segment = single_file = 0;
-		content_protection_in_rep = GF_FALSE;
+		dasher->segments_start_with_rap = GF_TRUE;
+		dasher->no_fragments_defaults = GF_TRUE;
+		dasher->use_url_template = 1;
+		dasher->single_segment = dasher->single_file = GF_FALSE;
+		for (i=0; i<dasher->nb_inputs; i++) {
+			if (strcmp(dasher->inputs[i].szMime, "video/mp4")) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment container %s forbidden in DASH-AVC/264 live profile.\n", dasher->inputs[i].szMime));
+				e = GF_BAD_PARAM;
+				goto exit;
+			}
+		}
 		break;
 	case GF_DASH_PROFILE_AVC264_ONDEMAND:
-		seg_at_rap = 1;
-		no_fragments_defaults = 1;
-		content_protection_in_rep = GF_FALSE;
-		if (seg_name) {
+		dasher->segments_start_with_rap = GF_TRUE;
+		dasher->no_fragments_defaults = GF_TRUE;
+		if (dasher->seg_rad_name) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment-name not allowed in DASH-AVC/264 onDemand profile.\n"));
-			e = GF_NOT_SUPPORTED;
-			goto exit;
+			return GF_BAD_PARAM;
+		}
+		for (i=0; i<dasher->nb_inputs; i++) {
+			if (strcmp(dasher->inputs[i].szMime, "video/mp4")) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment container %s forbidden in DASH-AVC/264 onDemand profile.\n", dasher->inputs[i].szMime));
+				e = GF_BAD_PARAM;
+				goto exit;
+			}
 		}
 	case GF_DASH_PROFILE_ONDEMAND:
-		seg_at_rap = 1;
-		single_segment = 1;
+		dasher->segments_start_with_rap = GF_TRUE;
+		dasher->single_segment = GF_TRUE;
+		if ((dasher->bitstream_switching_mode != GF_DASH_BSMODE_DEFAULT) && (dasher->bitstream_switching_mode != GF_DASH_BSMODE_NONE)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] onDemand profile, bitstream switching mode cannot be used.\n"));
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
 		/*BS switching is meaningless in onDemand profile*/
-		bitstream_switching = GF_DASH_BSMODE_NONE;
-		use_url_template = single_file = 0;
+		dasher->bitstream_switching_mode = GF_DASH_BSMODE_NONE;
+		dasher->use_url_template = dasher->single_file = GF_FALSE;
 		break;
 	case GF_DASH_PROFILE_MAIN:
-		seg_at_rap = 1;
-		single_segment = 0;
+		dasher->segments_start_with_rap = GF_TRUE;
+		dasher->single_segment = GF_FALSE;
 		break;
 	default:
 		break;
 	}
-
-	if (use_url_template && !seg_name) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
-		seg_name = "%s_dash";
+	if (dasher->bitstream_switching_mode == GF_DASH_BSMODE_DEFAULT) {
+		dasher->bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
 	}
-	/*if output id not in the current working dir, concatenate output path to segment name*/
-	szSegName[0] = 0;
-	if (seg_name) {
-		if (gf_url_get_resource_path(mpdfile, szSegName)) {
-			strcat(szSegName, seg_name);
-			seg_name = szSegName;
+
+	//we allow using inband param set when not time aligned. set the option now before overriding flags for non time aligned
+	dasher->inband_param_set = ((dasher->bitstream_switching_mode == GF_DASH_BSMODE_INBAND) || (dasher->bitstream_switching_mode == GF_DASH_BSMODE_SINGLE) ) ? GF_TRUE : GF_FALSE;
+
+	if (!segment_alignment) {
+		if (dasher->profile) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segments are not time-aligned in each representation of each period\n\tswitching to FULL profile\n"));
+			dasher->profile = GF_DASH_PROFILE_FULL;
+		}
+		if (dasher->bitstream_switching_mode != GF_DASH_BSMODE_NONE) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segments are not time-aligned in each representation of each period\n\tdisabling bitstream switching\n"));
+			dasher->bitstream_switching_mode = GF_DASH_BSMODE_NONE;
 		}
 	}
 
+	//check we have a segment template
+	if (dasher->use_url_template && !dasher->seg_rad_name) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
+		dasher_format_seg_name(dasher, "%s_dash");
+	}
 
-	segment_mode = single_segment ? 1 : (single_file ? 2 : 0);
-
-	if (single_segment) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
-		subsegs_per_sidx = 0;
+	if (dasher->single_segment) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (dasher->nb_inputs>1) ? "s" : "", dasher->segment_duration, dasher->fragment_duration));
+		dasher->subsegs_per_sidx = 0;
 	} else {
-		if (!seg_ext) seg_ext = "m4s";
+		if (!dasher->seg_ext) dasher->seg_ext = "m4s";
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s: %.2fs segments %.2fs fragments ", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
-		if (subsegs_per_sidx<0) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s: %.2fs segments %.2fs fragments ", (dasher->nb_inputs>1) ? "s" : "", dasher->segment_duration, dasher->fragment_duration));
+		if (!dasher->enable_sidx) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("no sidx used"));
-		} else if (subsegs_per_sidx) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("%d subsegments per sidx", subsegs_per_sidx));
+		} else if (dasher->subsegs_per_sidx) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("%d subsegments per sidx", dasher->subsegs_per_sidx));
 		} else {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("single sidx per segment"));
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
 	}
-	if (frag_at_rap) seg_at_rap = 1;
 
-	if (seg_at_rap) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Spliting segments %sat GOP boundaries\n", frag_at_rap ? "and fragments " : ""));
+	if (dasher->fragments_start_with_rap) dasher->segments_start_with_rap = GF_TRUE;
+
+	if (dasher->segments_start_with_rap) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Spliting segments %sat GOP boundaries\n", dasher->fragments_start_with_rap ? "and fragments " : ""));
 	}
 
-	dash_opts.mpd_name = mpdfile;
-	dash_opts.segments_start_with_rap = seg_at_rap;
-	dash_opts.seg_ext = seg_ext;
-	dash_opts.daisy_chain_sidx = daisy_chain_sidx;
-	dash_opts.subsegs_per_sidx = subsegs_per_sidx;
-	dash_opts.use_url_template = use_url_template;
-	dash_opts.use_segment_timeline = use_segment_timeline;
-	dash_opts.single_file_mode = segment_mode;
-	dash_opts.fragments_start_with_rap = frag_at_rap;
-	dash_opts.dash_scale = dash_scale ? dash_scale : 1000;
-	dash_opts.tmpdir = tmpdir;
-	dash_opts.dash_ctx = dash_ctx;
-	dash_opts.time_shift_depth = (s32) time_shift_depth;
-	dash_opts.segment_marker_4cc = segment_marker_4cc;
-	dash_opts.inband_param_set = ((bitstream_switching == GF_DASH_BSMODE_INBAND) || (bitstream_switching == GF_DASH_BSMODE_SINGLE) ) ? 1 : 0;
-	dash_opts.memory_mode = fragments_in_memory;
-	dash_opts.pssh_moof = pssh_moof;
-	dash_opts.samplegroups_in_traf = samplegroups_in_traf;
-	dash_opts.single_traf_per_moof = single_traf_per_moof;
-	dash_opts.content_protection_in_rep = content_protection_in_rep;
-
-
-	dash_opts.segment_duration = dash_duration * 1000 / dash_scale;
-	dash_opts.subduration = subduration * 1000 / dash_scale;
-	dash_opts.fragment_duration = frag_duration * 1000 / dash_scale;
-	dash_opts.initial_moof_sn = initial_moof_sn;
-	dash_opts.initial_tfdt = initial_tfdt;
-	dash_opts.no_fragments_defaults = no_fragments_defaults;
+	dasher->single_file_mode = (dasher->single_segment) ? 1 : (dasher->single_file ? 2 : 0);
 
+	dasher->subduration = sub_duration * 1000 / dasher->dash_scale;
 
 	max_comp_per_input = 0;
 	for (cur_period=0; cur_period<max_period; cur_period++) {
 		u32 first_in_period = 0;
 		Double period_duration=0;
 
-		for (i=0; i<nb_dash_inputs; i++) {
+		for (i=0; i<dasher->nb_inputs; i++) {
+			Double dur = 0;
+			GF_DashSegInput *dash_input = &dasher->inputs[i];
 			/*this file does not belongs to any adaptation set*/
-			if (dash_inputs[i].period != cur_period+1) continue;
+			if (dash_input->period != cur_period+1) continue;
 
 			/*this file does not belongs to any adaptation set*/
-			if (!dash_inputs[i].adaptation_set) continue;
+			if (!dash_input->adaptation_set) continue;
 
 			if (!first_in_period) {
 				first_in_period = i+1;
 				last_period_rep_idx_plus_one = first_in_period;
 			}
 
-			if (dash_inputs[i].dasher_get_components_info) {
-				e = dash_inputs[i].dasher_get_components_info(&dash_inputs[i], &dash_opts);
-				if (e) goto exit;
+			//only get component info once
+			if (!dash_input->get_component_info_done) {
+				dash_input->get_component_info_done = GF_TRUE;
+				if (dash_input->dasher_get_components_info) {
+					e = dash_input->dasher_get_components_info(dash_input, dasher);
+					if (e) return e;
+				}
 			}
-			if (dash_inputs[i].duration > period_duration)
-				period_duration = dash_inputs[i].duration;
 
-			switch (dash_inputs[i].protection_scheme_type) {
+			/*force media duration if requested by the author*/
+			if (dash_input->media_duration) {
+				dash_input->period_duration = dash_input->media_duration;
+				dash_input->duration = dash_input->media_duration;
+			}
+
+			dur = dash_input->duration;
+			if (sub_duration && (sub_duration < dur * dasher->dash_scale) ) {
+				dur = dasher->subduration;
+			}
+
+			if (dur > period_duration)
+				period_duration = dur;
+
+			switch (dash_input->protection_scheme_type) {
 			case GF_ISOM_CENC_SCHEME:
 			case GF_ISOM_CBC_SCHEME:
 				use_cenc = GF_TRUE;
 				break;
 			}
-			if (max_comp_per_input < dash_inputs[i].nb_components)
-				max_comp_per_input = dash_inputs[i].nb_components;
+			if (max_comp_per_input < dash_input->nb_components)
+				max_comp_per_input = dash_input->nb_components;
 		}
 		if (first_in_period) {
-			dash_inputs[first_in_period-1].period_duration = period_duration;
+			dasher->inputs[first_in_period-1].period_duration = period_duration;
 		}
 		presentation_duration += period_duration;
 	}
 
-	if ((max_comp_per_input>1) && (dash_profile==GF_DASH_PROFILE_AVC264_LIVE)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Muxed representations not allowed in DASH-IF AVC264 live profile\n\tswitching to regular live profile\n"));
-		dash_profile = GF_DASH_PROFILE_LIVE;
-	}
-	if ((max_comp_per_input>1) && (dash_profile==GF_DASH_PROFILE_AVC264_ONDEMAND)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Muxed representations not allowed in DASH-IF AVC264 onDemand profile\n\tswitching to regular onDemand profile\n"));
-		dash_profile = GF_DASH_PROFILE_ONDEMAND;
+	if (max_comp_per_input > 1) {
+		if (dasher->profile == GF_DASH_PROFILE_AVC264_LIVE) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Muxed representations not allowed in DASH-IF AVC264 live profile\n\tswitching to regular live profile\n"));
+			dasher->profile = GF_DASH_PROFILE_LIVE;
+		} else if (dasher->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Muxed representations not allowed in HbbTV 1.5 ISOBMF live profile\n\tswitching to regular live profile\n"));
+			dasher->profile = GF_DASH_PROFILE_LIVE;
+		} else if (dasher->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Muxed representations not allowed in DASH-IF AVC264 onDemand profile\n\tswitching to regular onDemand profile\n"));
+			dasher->profile = GF_DASH_PROFILE_ONDEMAND;
+		}
 	}
 
+	/*HbbTV 1.5 ISO live specific checks*/
+	if (dasher->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		if (max_adaptation_set > 16) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Max 16 adaptation sets in HbbTV 1.5 ISO live profile\n\tswitching to DASH AVC/264 live profile\n"));
+			dasher->profile = GF_DASH_PROFILE_AVC264_LIVE;
+		}
+		if (max_period > 32) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Max 32 periods in HbbTV 1.5 ISO live profile\n\tswitching to regular DASH AVC/264 live profile\n"));
+			dasher->profile = GF_DASH_PROFILE_AVC264_LIVE;
+		}
+		if (dasher->segment_duration < 1.0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Min segment duration 1s in HbbTV 1.5 ISO live profile\n\tcapping to 1s\n"));
+			dasher->segment_duration = 1.0;
+		}
+		if (dasher->segment_duration > 15.0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Max segment duration 15s in HbbTV 1.5 ISO live profile\n\tcapping to 15s\n"));
+			dasher->segment_duration = 15.0;
+		}
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH fetched component infos\n"));
+
 	active_period_start = 0;
-	if (dash_ctx) {
+	if (dasher->dash_ctx) {
 		Double duration;
 		char *id = "";
-		if (last_period_rep_idx_plus_one) id = dash_inputs[last_period_rep_idx_plus_one-1].periodID;
+		if (last_period_rep_idx_plus_one) id = dasher->inputs[last_period_rep_idx_plus_one-1].periodID;
 		if (!id) id = "";
 
-		opt = gf_cfg_get_key(dash_ctx, "DASH", "LastActivePeriod");
+		//restore max segment duration
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
+		if (opt) dasher->max_segment_duration = atof(opt);
+
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriod");
 		//period has changed
 		if (opt && strcmp(opt, id)) {
 			Bool prev_period_not_done = GF_FALSE;
 			const char *prev_id = opt;
 			Double last_period_dur = 0;
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
+			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
 			duration = opt ? atof(opt) : 0.0;
 
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "LastPeriodDuration");
+			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
 			if (opt) last_period_dur = atof(opt);
-			presentation_duration += last_period_dur;
+
+			if (!last_period_dur) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] last period has no known duration, cannot insert new period. Try re-dashing previous period and specifying its duration\n"));
+				return GF_BAD_PARAM;
+			}
 
 			//we may have called the segmenter with the end of the previous active period and the start of the new one - locate the
 			//previous period and update cumulated duration
-			for (i=0; i<nb_dash_inputs; i++) {
-				char *p_id = dash_inputs[i].periodID;
+			for (i=0; i<dasher->nb_inputs; i++) {
+				char *p_id = dasher->inputs[i].periodID;
 				if (!p_id) p_id = "";
 				if (!strcmp(p_id, prev_id)) {
-					last_period_dur += dash_inputs[last_period_rep_idx_plus_one-1].period_duration;
+					last_period_dur += dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;
+					presentation_duration -= dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;;
 					prev_period_not_done = GF_TRUE;
 					break;
 				}
 			}
-			gf_cfg_set_key(dash_ctx, "DASH", "LastPeriodDuration", NULL);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", NULL);
 
 			duration += last_period_dur;
+			presentation_duration += duration;
+
 			sprintf(szOpt, "%g", duration);
-			gf_cfg_set_key(dash_ctx, "DASH", "CumulatedPastPeriodsDuration", szOpt);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration", szOpt);
 
 			//get active period start
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "LastActivePeriodStart");
+			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart");
 			if (opt) active_period_start = atof(opt);
 			active_period_start += last_period_dur;
 
-			//and add period to past periods, storing their start time
+			//and add period to past periods, storing their duration and xlink
 			if (! prev_period_not_done) {
-				sprintf(szOpt, "%g", presentation_duration - last_period_dur);
-				gf_cfg_set_key(dash_ctx, "PastPeriods", prev_id, szOpt);
+				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK");
+				sprintf(szOpt, "%g,%s", last_period_dur, opt ? opt : "INLINE");
+				gf_cfg_set_key(dasher->dash_ctx, "PastPeriods", prev_id, szOpt);
+				if (opt) {
+					gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK", NULL);
+				}
 
 				//update active period start
 				sprintf(szOpt, "%g", active_period_start);
-				gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
+				gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
 
-				purge_dash_context(dash_ctx);
+				purge_dash_context(dasher->dash_ctx);
 			}
 
 			//and finally switch active period
-			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriod", id);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriod", id);
 
-			sprintf(szOpt, "%g", dash_inputs[last_period_rep_idx_plus_one-1].period_duration);
-			gf_cfg_set_key(dash_ctx, "DASH", "LastPeriodDuration", szOpt);
+			sprintf(szOpt, "%g", dasher->inputs[last_period_rep_idx_plus_one-1].period_duration);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
 		} else {
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "LastPeriodDuration");
+			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
 			if (opt) {
 				duration = atof(opt);
-				dash_inputs[last_period_rep_idx_plus_one-1].period_duration += duration;
+				dasher->inputs[last_period_rep_idx_plus_one-1].period_duration += duration;
 				presentation_duration += duration;
 			}
-			sprintf(szOpt, "%g", dash_inputs[last_period_rep_idx_plus_one-1].period_duration);
-			gf_cfg_set_key(dash_ctx, "DASH", "LastPeriodDuration", szOpt);
-			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriod", id);
+			sprintf(szOpt, "%g", dasher->inputs[last_period_rep_idx_plus_one-1].period_duration);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriod", id);
 
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
+			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
 			presentation_duration += opt ? atof(opt) : 0.0;
 		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH context restored\n"));
 	}
 
-	strcpy(szTempMPD, mpdfile);
-	if (dash_dynamic) strcat(szTempMPD, ".tmp");
+	strcpy(szTempMPD, dasher->mpd_name);
+	if (dasher->dash_mode) strcat(szTempMPD, ".tmp");
 
-	mpd = gf_f64_open(szTempMPD, "wt");
+	mpd = gf_fopen(szTempMPD, "wt");
 	if (!mpd) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MPD] Cannot open MPD file %s for writing\n", szTempMPD));
-		e = GF_IO_ERR;
-		goto exit;
+		return GF_IO_ERR;
 	}
 
-	dash_opts.mpd = mpd;
 
-	e = write_mpd_header(mpd, mpdfile, dash_ctx, dash_profile, has_mpeg2, mpd_title, mpd_source, mpd_copyright, mpd_moreInfoURL, (const char **) mpd_base_urls, nb_mpd_base_urls, dash_dynamic, time_shift_depth, presentation_duration, mpd_update_time, min_buffer, ast_shift_sec,use_cenc, uses_xlink);
-	if (e) goto exit;
+	period_links = gf_list_new();
 
-	if (dash_ctx) {
-		u32 count = gf_cfg_get_key_count(dash_ctx, "PastPeriods");
+	if (dasher->dash_ctx) {
+		u32 count = gf_cfg_get_key_count(dasher->dash_ctx, "PastPeriods");
 		for (i=0; i<count; i++) {
-			const char *xlink = NULL;
-			const char *p_id = gf_cfg_get_key_name(dash_ctx, "PastPeriods", i);
-
-			strcpy(szPeriodXML, mpdfile);
-			sep = strrchr(szPeriodXML, '.');
-			if (sep) sep[0] = 0;
-			strcat(szPeriodXML, "-Period_");
-			strcat(szPeriodXML, p_id);
-			strcat(szPeriodXML, ".mpd");
-
-			if (xlink) {
-				//TODO !
-				//write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink);
+			const char *id = gf_cfg_get_key_name(dasher->dash_ctx, "PastPeriods", i);
+			const char *xlink = gf_cfg_get_key(dasher->dash_ctx, "PastPeriods", id);
+			char *sep = (char *)strchr(xlink, ',');
+			if (!sep) continue;
+
+			GF_SAFEALLOC(p, PeriodEntry);
+			gf_list_add(period_links, p);
+			p->id = id;
+
+			sep[0] = 0;
+			p->period_duration = (Double) atof(xlink);
+			sep[0]=',';
+			xlink = &sep[1];
+			if (!strcmp(xlink, "INLINE")) {
+				strcpy(p->szPeriodXML, dasher->mpd_name);
+				sep = strrchr(p->szPeriodXML, '.');
+				if (sep) sep[0] = 0;
+				strcat(p->szPeriodXML, "-Period_");
+				strcat(p->szPeriodXML, id);
+				strcat(p->szPeriodXML, ".mpd");
 			} else {
-				dash_insert_period_xml(mpd, szPeriodXML);
+				char *url = gf_url_concatenate(dasher->mpd_name, xlink);
+				strcpy(p->szPeriodXML, url ? url : xlink);
+				if (url) gf_free(url);
+				p->xlink = xlink;
+				p->is_xlink = GF_TRUE;
 			}
 		}
 	}
 
 	for (cur_period=0; cur_period<max_period; cur_period++) {
+		Bool flush_period = GF_FALSE;
 		FILE *period_mpd;
 		Double period_duration = 0;
 		const char *id=NULL;
 		const char *xlink = NULL;
 
 		/* Find period information for this period */
-		for (i=0; i< nb_dash_inputs; i++) {
-			if (dash_inputs[i].adaptation_set && (dash_inputs[i].period==cur_period+1)) {
-				period_duration = dash_inputs[i].period_duration;
-				id = dash_inputs[i].periodID;
-				if (strlen(dash_inputs[i].xlink))
-					xlink = dash_inputs[i].xlink;
+		for (i=0; i< dasher->nb_inputs; i++) {
+			if (dasher->inputs[i].adaptation_set && (dasher->inputs[i].period==cur_period+1)) {
+				period_duration = dasher->inputs[i].period_duration;
+				id = dasher->inputs[i].periodID;
+				if (dasher->inputs[i].xlink)
+					xlink = dasher->inputs[i].xlink;
 				break;
 			}
 		}
 
-		strcpy(szPeriodXML, mpdfile);
-		sep = strrchr(szPeriodXML, '.');
-		if (sep) sep[0] = 0;
-		strcat(szPeriodXML, "-Period_");
-		strcat(szPeriodXML, id ? id : "");
-		strcat(szPeriodXML, ".mpd");
+		GF_SAFEALLOC(p, PeriodEntry);
+		gf_list_add(period_links, p);
+		p->period_duration = period_duration;
+		p->period_idx = cur_period+1;
+		p->id = id;
+
+		if (xlink) {
+			char *url = gf_url_concatenate(dasher->mpd_name, xlink);
+			strcpy(p->szPeriodXML, url ? url : xlink);
+			if (url) gf_free(url);
+			p->xlink = xlink;
+			p->is_xlink = GF_TRUE;
+		} else {
+			strcpy(p->szPeriodXML, dasher->mpd_name);
+			sep = strrchr(p->szPeriodXML, '.');
+			if (sep) sep[0] = 0;
+			strcat(p->szPeriodXML, "-Period_");
+			strcat(p->szPeriodXML, id ? id : "");
+			strcat(p->szPeriodXML, ".mpd");
+		}
+
+		period_mpd = NULL;
 
-		period_mpd = gf_f64_open(szPeriodXML, "wb");
-		dash_opts.mpd = period_mpd;
+		//only open file if we are to dash something (max_adaptation_set=0: no source file, only period xlink insertion)
+		if (max_adaptation_set) {
+			period_mpd = gf_fopen(p->szPeriodXML, "wb");
 
-		e = write_period_header(period_mpd, id, 0.0, period_duration, dash_dynamic, NULL, dash_inputs, nb_dash_inputs, cur_period+1);
-		if (e) goto exit;
+			if (!period_mpd) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot open period MPD %s for writing, aborting\n", p->szPeriodXML));
+				e = GF_IO_ERR;
+				goto exit;
+			}
+
+			dasher->mpd = period_mpd;
 
+			e = write_period_header(dasher, period_mpd, id, 0.0, period_duration, NULL, cur_period+1, (xlink!=NULL) ? GF_TRUE : GF_FALSE);
+			if (e) goto exit;
+		}
+		//keep track of the last period xlink
+		if (dasher->dash_ctx)
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK", xlink);
 
 		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
 		for (cur_adaptation_set=0; cur_adaptation_set < max_adaptation_set; cur_adaptation_set++) {
@@ -4881,93 +6248,136 @@
 			u32 first_rep_in_set=0;
 			u32 max_width = 0;
 			u32 max_height = 0;
+			u32 dar_num = 1;
+			u32 dar_den = 1;
 			u32 fps_num = 0;
 			u32 fps_denum = 0;
-			Bool use_bs_switching = bitstream_switching ? 1 : 0;
+			Double seg_duration_in_as = 0;
+			Bool has_scalability = GF_FALSE;
+			Bool use_bs_switching = (dasher->bitstream_switching_mode==GF_DASH_BSMODE_NONE) ? GF_FALSE : GF_TRUE;
 			char *lang;
 			char szFPS[100];
-			Bool is_first_rep=0;
-			Bool skip_init_segment_creation = 0;
+			Bool is_first_rep = GF_FALSE;
+			Bool skip_init_segment_creation = GF_FALSE;
+
+			dasher->segment_alignment_disabled = GF_FALSE;
 
-			while (dash_inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
+			while (dasher->inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
 				first_rep_in_set++;
 
 			/*not in our period*/
-			if (dash_inputs[first_rep_in_set].period != cur_period+1)
+			if (dasher->inputs[first_rep_in_set].period != cur_period+1)
 				continue;
 
-			strcpy(tmp, mpdfile);
-			sep = strrchr(tmp, '.');
-			if (sep) sep[0] = 0;
+			if (dasher->inputs[first_rep_in_set].idx_representations)
+				skip_init_segment_creation = GF_TRUE;
 
-			if (max_adaptation_set==1) {
-				strcpy(szInit, tmp);
-				strcat(szInit, "_init.mp4");
-			} else {
-				sprintf(szInit, "%s_set%d_init.mp4", tmp, cur_adaptation_set+1);
-			}
-			/*unless asked to do BS switching on single rep, don't do it ...*/
-			if ((bitstream_switching < GF_DASH_BSMODE_SINGLE) && dash_inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
-				use_bs_switching = 0;
+			if (!dasher->inputs[first_rep_in_set].init_segment_generated) {
 
-			if (! use_bs_switching) {
-				skip_init_segment_creation = 1;
-			}
-			else if (! dash_inputs[first_rep_in_set].dasher_create_init_segment) {
-				skip_init_segment_creation = 1;
-				strcpy(szInit, "");
-			}
-			/*if we already wrote the InitializationSegment, get rid of it (no overwrite) and let the dashing routine open it*/
-			else if (dash_ctx) {
-				char RepSecName[GF_MAX_PATH];
-				const char *init_seg_name;
-				sprintf(RepSecName, "Representation_%s", dash_inputs[first_rep_in_set].representationID);
-				if ((init_seg_name = gf_cfg_get_key(dash_ctx, RepSecName, "InitializationSegment")) != NULL) {
-					skip_init_segment_creation = 1;
+				strcpy(tmp, dasher->mpd_name);
+				sep = strrchr(tmp, '.');
+				if (sep) sep[0] = 0;
+
+				if (max_adaptation_set==1) {
+					strcpy(szInit, tmp);
+					strcat(szInit, "_init.mp4");
+				} else {
+					sprintf(szInit, "%s_set%d_init.mp4", tmp, cur_adaptation_set+1);
+				}
+				/*unless asked to do BS switching on single rep, don't do it ...*/
+				if ((dasher->bitstream_switching_mode < GF_DASH_BSMODE_SINGLE)
+				 && (dasher->inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
+				 /*unless the representation is a scalable one split across several adaptation sets ...*/
+				 && (dasher->inputs[first_rep_in_set].nb_representations<=1)
+				 ) {
+					use_bs_switching = GF_FALSE;
+				}
+
+				if (! use_bs_switching) {
+					skip_init_segment_creation = GF_TRUE;
+				}
+				else if (! dasher->inputs[first_rep_in_set].dasher_create_init_segment) {
+					skip_init_segment_creation = GF_TRUE;
+					strcpy(szInit, "");
+				}
+				/*if we already wrote the InitializationSegment, get rid of it (no overwrite) and let the dashing routine open it*/
+				else if (dasher->dash_ctx) {
+					char RepSecName[GF_MAX_PATH];
+					const char *init_seg_name;
+					sprintf(RepSecName, "Representation_%s", dasher->inputs[first_rep_in_set].representationID);
+					if ((init_seg_name = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "InitializationSegment")) != NULL) {
+						skip_init_segment_creation = GF_TRUE;
+					}
 				}
-			}
 
-			if (!skip_init_segment_creation) {
-				Bool disable_bs_switching = 0;
-				e = dash_inputs[first_rep_in_set].dasher_create_init_segment(dash_inputs, nb_dash_inputs, cur_adaptation_set+1, szInit, tmpdir, &dash_opts, &disable_bs_switching);
-				if (e) goto exit;
-				if (disable_bs_switching)
-					use_bs_switching = 0;
+				if (!skip_init_segment_creation) {
+					Bool disable_bs_switching = GF_FALSE;
+					e = dasher->inputs[first_rep_in_set].dasher_create_init_segment(dasher->inputs, dasher->nb_inputs, cur_adaptation_set+1, szInit, dasher->tmpdir, dasher, dasher->bitstream_switching_mode, &disable_bs_switching);
+					if (e) goto exit;
+					if (disable_bs_switching)
+						use_bs_switching = GF_FALSE;
+				}
+
+				dasher->inputs[first_rep_in_set].init_seg_url = use_bs_switching ? gf_strdup(szInit) : NULL;
+				dasher->inputs[first_rep_in_set].use_bs_switching = use_bs_switching;
+				dasher->inputs[first_rep_in_set].init_segment_generated = GF_TRUE;
+			} else {
+				use_bs_switching = dasher->inputs[first_rep_in_set].use_bs_switching;
 			}
 
-			dash_opts.bs_switch_segment_file = use_bs_switching ? szInit : NULL;
-			dash_opts.use_url_template = seg_name ? use_url_template : 0;
+			dasher->bs_switch_segment_file = use_bs_switching ? dasher->inputs[first_rep_in_set].init_seg_url : NULL;
+
 
+			dasher->segment_alignment_disabled = GF_FALSE;
 			szFPS[0] = 0;
 			lang = NULL;
 			/*compute some max defaults*/
-			for (i=0; i<nb_dash_inputs && !e; i++) {
+			for (i=0; i<dasher->nb_inputs && !e; i++) {
+				GF_DashSegInput *dash_input = &dasher->inputs[i];
 
-				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
+				if (dash_input->adaptation_set!=cur_adaptation_set+1)
 					continue;
 
-				for (j=0; j<dash_inputs[i].nb_components; j++) {
-					if (dash_inputs[i].components[j].width > max_width)
-						max_width = dash_inputs[i].components[j].width;
-					if (dash_inputs[i].components[j].height > max_height)
-						max_height = dash_inputs[i].components[j].height;
+				if (dash_input->idx_representations)
+					has_scalability = GF_TRUE;
+
+				for (j=0; j<dash_input->nb_components; j++) {
+					struct _dash_component *comp = & dash_input->components[j];
+					if (comp->width > max_width)
+						max_width = comp->width;
+					if (comp->height > max_height)
+						max_height = comp->height;
 
 					if (! fps_num || !fps_denum) {
-						fps_num = dash_inputs[i].components[j].fps_num;
-						fps_denum = dash_inputs[i].components[j].fps_denum;
+						fps_num = comp->fps_num;
+						fps_denum = comp->fps_denum;
+					}
+					else if (fps_num * comp->fps_denum < comp->fps_num * fps_denum) {
+						fps_num = comp->fps_num;
+						fps_denum = comp->fps_denum;
 					}
-					else if (fps_num * dash_inputs[i].components[j].fps_denum < dash_inputs[i].components[j].fps_num * fps_denum) {
-						fps_num = dash_inputs[i].components[j].fps_num;
-						fps_denum = dash_inputs[i].components[j].fps_denum;
+
+					if (dar_num * comp->sar_denum * comp->height != dar_den * comp->sar_num * comp->width) {
+						dar_num = comp->sar_num * comp->width;
+						dar_den = comp->sar_denum * comp->height;
 					}
 
-					if (dash_inputs[i].components[j].lang) {
-						if (lang && strcmp(lang, dash_inputs[i].components[j].lang)) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] two languages in adaptation set: %s will be kept %s will be ignored\n", lang, dash_inputs[i].components[j].lang));
-						} else if (!lang) {
-							lang = gf_strdup(dash_inputs[i].components[j].lang);
+					if (comp->lang) {
+						if (lang && strcmp(lang, comp->lang) ) {
+							if (!strcmp(lang, "und") || !strcmp(comp->lang, "lang")) {
+								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] two languages in adaptation set: %s will be kept %s will be ignored\n", lang, comp->lang));
+							}
+						} else if (!lang) {
+							lang = gf_strdup(comp->lang);
 						}
 					}
+
+					if (dash_input->segment_duration) {
+						if (!seg_duration_in_as)
+							seg_duration_in_as = dash_input->segment_duration;
+						else if (dash_input->segment_duration != seg_duration_in_as)
+							dasher->segment_alignment_disabled = GF_TRUE;
+					}
 				}
 			}
 
@@ -4979,132 +6389,233 @@
 					sprintf(szFPS, "%d", fps_num);
 			}
 
-			e = write_adaptation_header(period_mpd, dash_profile, use_url_template, segment_mode, dash_inputs, nb_dash_inputs, cur_period+1, cur_adaptation_set+1, first_rep_in_set, use_bs_switching, max_width, max_height, szFPS, lang, szInit);
-			if (e) goto exit;
+			e = write_adaptation_header(period_mpd, dasher->profile, dasher->use_url_template, dasher->single_file_mode, dasher->inputs, dasher->nb_inputs, cur_period+1, cur_adaptation_set+1, first_rep_in_set,
+			 use_bs_switching, max_width, max_height, dar_num, dar_den, szFPS, lang, szInit, dasher->segment_alignment_disabled, dasher->mpd_name);
+			gf_free(lang);
 
-			is_first_rep = 1;
-			for (i=0; i<nb_dash_inputs && !e; i++) {
-				char szOutName[GF_MAX_PATH], *segment_name;
+			if (e) goto exit;
 
-				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
+			is_first_rep = GF_TRUE;
+			for (i=0; i<dasher->nb_inputs && !e; i++) {
+				char szOutName[GF_MAX_PATH], *segment_name, *orig_seg_name;
+				GF_DashSegInput *dash_input = &dasher->inputs[i];
+				Double segdur, fragdur;
+				if (dash_input->adaptation_set!=cur_adaptation_set+1)
 					continue;
 
-				segment_name = seg_name;
+				orig_seg_name = segment_name = dasher->seg_rad_name;
 
-				strcpy(szOutName, gf_url_get_resource_name(dash_inputs[i].file_name));
+				strcpy(szOutName, gf_url_get_resource_name(dash_input->file_name));
 				sep = strrchr(szOutName, '.');
 				if (sep) sep[0] = 0;
 
 				/*in scalable case: seg_name is variable*/
-				dash_opts.variable_seg_rad_name = (nb_dash_inputs != nb_inputs) ? 1 : 0;
-				if (seg_name) {
-					if (strstr(seg_name, "%s")) {
-						sprintf(szSolvedSegName, seg_name, szOutName);
-						dash_opts.variable_seg_rad_name = 1;
-						if (dash_inputs[i].single_track_num) {
+				dasher->variable_seg_rad_name = has_scalability ? GF_TRUE : GF_FALSE;
+				if (segment_name) {
+					if (strstr(segment_name, "%s")) {
+						sprintf(szSolvedSegName, segment_name, szOutName);
+						dasher->variable_seg_rad_name = GF_TRUE;
+						if (dash_input->single_track_num) {
 							char szTkNum[50];
-							sprintf(szTkNum, "_track%d_", dash_inputs[i].single_track_num);
+							sprintf(szTkNum, "_track%d_", dash_input->single_track_num);
 							strcat(szSolvedSegName, szTkNum);
 						}
 					} else {
-						strcpy(szSolvedSegName, seg_name);
+						strcpy(szSolvedSegName, segment_name);
 					}
+
 					segment_name = szSolvedSegName;
 				}
-				if ((dash_inputs[i].trackNum || dash_inputs[i].single_track_num)
-				 && (!seg_name || (!strstr(seg_name, "$RepresentationID$") && !strstr(seg_name, "$ID$")))
-				 ) {
+
+				/* user added a relative-path baseURL */
+				if (dash_input->nb_baseURL) {
+					if (gf_url_is_local(dash_input->baseURL[0])) {
+						const char *name;
+						char tmp_segment_name[GF_MAX_PATH];
+						if (dash_input->nb_baseURL > 1)
+							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Several relative path baseURL for input %s: selecting \"%s\"\n", dash_input->file_name, dash_input->baseURL[0]));
+						name = gf_url_get_resource_name(szOutName);
+						strcpy(tmp_segment_name, name);
+						gf_url_get_resource_path(dash_input->baseURL[0], szOutName);
+						if (szOutName[strlen(szOutName)] != GF_PATH_SEPARATOR) {
+							char ext[2];
+							ext[0] = GF_PATH_SEPARATOR;
+							ext[1] = 0;
+							strcat(szOutName, ext);
+						}
+						strcat(szOutName, tmp_segment_name);
+					} else {
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found baseURL for input %s but not a relative path (%s)\n", dash_input->file_name, dash_input->baseURL[0]));
+					}
+				}
+
+				if ((dash_input->trackNum || dash_input->single_track_num) && (!dasher->seg_rad_name || !strstr(dasher->seg_rad_name, "$RepresentationID$") ) ) {
 					char tmp[10];
-					sprintf(tmp, "_track%d", dash_inputs[i].trackNum ? dash_inputs[i].trackNum : dash_inputs[i].single_track_num);
+					sprintf(tmp, "_track%d", dash_input->trackNum ? dash_input->trackNum : dash_input->single_track_num);
 					strcat(szOutName, tmp);
 				}
 				strcat(szOutName, "_dash");
 
-				if (gf_url_get_resource_path(mpdfile, tmp)) {
+				if (gf_url_get_resource_path(dasher->mpd_name, tmp)) {
 					strcat(tmp, szOutName);
 					strcpy(szOutName, tmp);
 				}
-				if (segment_name && dash_inputs[i].trackNum && !strstr(seg_name, "$RepresentationID$") && !strstr(seg_name, "$ID$")) {
+				if (segment_name && dash_input->trackNum && !strstr(dasher->seg_rad_name, "$RepresentationID$") ) {
 					char tmp[10];
-					sprintf(tmp, "_track%d_", dash_inputs[i].trackNum);
+					sprintf(tmp, "_track%d_", dash_input->trackNum);
 					strcat(segment_name, tmp);
 				}
-				dash_opts.seg_rad_name = segment_name;
+				dasher->seg_rad_name = segment_name;
 
 				/*in scalable case, we need also the bandwidth of dependent representation*/
-				if (strlen(dash_inputs[i].dependencyID)) {
-					dash_inputs[i].dependency_bandwidth = gf_dash_get_dependency_bandwidth(dash_inputs, nb_dash_inputs, dash_inputs[i].file_name, dash_inputs[i].lower_layer_track);
+				if (dash_input->dependencyID) {
+					dash_input->dependency_bandwidth = gf_dash_get_dependency_bandwidth(dasher->inputs, dasher->nb_inputs, dash_input->file_name, dash_input->lower_layer_track);
+				}
+
+				segdur = dasher->segment_duration;
+				fragdur = dasher->fragment_duration;
+
+				if (dash_input->segment_duration)
+					dasher->segment_duration = dash_input->segment_duration;
+
+				if (dash_input->segment_duration && (dasher->fragment_duration * dasher->dash_scale > dash_input->segment_duration)) {
+					dasher->fragment_duration = dasher->segment_duration;
 				}
 
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_inputs[i].file_name));
-				e = dash_inputs[i].dasher_segment_file(&dash_inputs[i], szOutName, &dash_opts, is_first_rep);
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_input->file_name));
+				e = dash_input->dasher_segment_file(dash_input, szOutName, dasher, is_first_rep);
+
+				dasher->seg_rad_name = orig_seg_name;
+				dasher->segment_duration = segdur;
+				dasher->fragment_duration = fragdur;
 
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while DASH-ing file: %s\n", gf_error_to_string(e)));
 					goto exit;
 				}
-				is_first_rep = 0;
+				is_first_rep = GF_FALSE;
 			}
 			/*close adaptation set*/
 			fprintf(period_mpd, " </AdaptationSet>\n");
 		}
 
-		fprintf(period_mpd, " </Period>\n");
-		fclose(period_mpd);
-
-		if (xlink) {
-			write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink, dash_inputs, nb_dash_inputs, cur_period+1);
-		} else {
-			dash_insert_period_xml(mpd, szPeriodXML);
-		}
-
-		if (!dash_ctx && !xlink) {
-			gf_delete_file(szPeriodXML);
+		if (period_mpd) {
+			fprintf(period_mpd, " </Period>\n");
+			gf_fclose(period_mpd);
 		}
 
-		dash_opts.mpd = period_mpd;
+		dasher->mpd = period_mpd;
 
 		//and add periods done to past periods, storing their start time
 		if (!id) id="";
-		if (last_period_rep_idx_plus_one && strcmp(id, dash_inputs[last_period_rep_idx_plus_one-1].periodID) ) {
+		if (last_period_rep_idx_plus_one && dasher->inputs[last_period_rep_idx_plus_one-1].periodID && strcmp(id, dasher->inputs[last_period_rep_idx_plus_one-1].periodID) ) {
+			flush_period = GF_TRUE;
+		}
+		else if (dasher->force_period_end) {
+			flush_period = GF_TRUE;
+		}
+		if (flush_period) {
 			sprintf(szOpt, "%g", active_period_start);
-			gf_cfg_set_key(dash_ctx, "PastPeriods", id, szOpt);
+			gf_cfg_set_key(dasher->dash_ctx, "PastPeriods", id, szOpt);
 			active_period_start += period_duration;
 
 			sprintf(szOpt, "%g", active_period_start);
-			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
+
+			if (dasher->dash_ctx) purge_dash_context(dasher->dash_ctx);
+		}
+	}
+
+	if (dasher->dash_ctx) {
+		sprintf(szOpt, "%g", dasher->max_segment_duration);
+		gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", szOpt);
+	}
 
-			if (dash_ctx) purge_dash_context(dash_ctx);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH Segment generation done\n"));
+
+
+	/*ready to write the MPD*/
+	dasher->mpd = mpd;
+
+	if (dasher->dash_mode && !dasher->mpd_update_time) {
+		presentation_duration = dasher->mpd_live_duration;
+	}
+
+	if (dasher->force_period_end && !dasher->mpd_update_time && !presentation_duration) {
+		presentation_duration = 0;
+		i=0;
+		while ((p = (PeriodEntry *) gf_list_enum(period_links, &i))) {
+			presentation_duration = p->period_duration;
 		}
 	}
+
+	e = write_mpd_header(dasher, mpd, has_mpeg2, presentation_duration, use_cenc, uses_xlink);
+	if (e) goto exit;
+
+
+	i=0;
+	while ((p = (PeriodEntry *) gf_list_enum(period_links, &i))) {
+		if (!p->period_idx) {
+			if (p->is_xlink) {
+				write_period_header(dasher, mpd, p->id, 0.0, p->period_duration, p->xlink, 0, GF_FALSE);
+			} else {
+				dash_insert_period_xml(mpd, p->szPeriodXML);
+			}
+		} else {
+			if (p->is_xlink) {
+				write_period_header(dasher, mpd, p->id, 0.0, p->period_duration, p->xlink, p->period_idx, GF_FALSE);
+			} else {
+				dash_insert_period_xml(mpd, p->szPeriodXML);
+			}
+
+			if (!dasher->dash_ctx && !p->is_xlink) {
+				gf_delete_file(p->szPeriodXML);
+			}
+
+		}
+	}
+
 	fprintf(mpd, "</MPD>");
 
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH MPD done\n"));
+
+
+	if (dasher->dash_ctx && dasher->dash_mode) {
+		const char *opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
+		if (opt) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Current Period Duration: %s\n", opt) );
+		}
+	}
+
+	if (dasher->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		if (gf_ftell(mpd) > 100*1024)
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[DASH] Manifest MPD is too big for HbbTV 1.5. Limit is 100kB, current size is "LLU"kB\n", gf_ftell(mpd)/1024));
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Done dashing\n"));
+
 exit:
 	if (mpd) {
-		fclose(mpd);
-		if (!e && dash_dynamic) {
-			gf_delete_file(mpdfile);
-			e = gf_move_file(szTempMPD, mpdfile);
+		gf_fclose(mpd);
+		if (!e && dasher->dash_mode) {
+			gf_delete_file(dasher->mpd_name);
+			e = gf_move_file(szTempMPD, dasher->mpd_name);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[DASH] Error moving file %s to %s: %s\n", szTempMPD, mpdfile, gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[DASH] Error moving file %s to %s: %s\n", szTempMPD, dasher->mpd_name, gf_error_to_string(e) ));
 			}
 		}
 	}
-	for (i=0; i < nb_inputs; i++) {
-		if (dash_inputs[i].as_descs) gf_free(dash_inputs[i].as_descs);
-		if (dash_inputs[i].as_c_descs) gf_free(dash_inputs[i].as_c_descs);
-		if (dash_inputs[i].p_descs) gf_free(dash_inputs[i].p_descs);
-		if (dash_inputs[i].rep_descs) gf_free(dash_inputs[i].rep_descs);
-		for (j = 0; j < dash_inputs[i].nb_components; j++) {
-			if (dash_inputs[i].components[j].lang) {
-				gf_free(dash_inputs[i].components[j].lang);
-			}
+
+	if (period_links) {
+		while (gf_list_count(period_links)) {
+			PeriodEntry *p = (PeriodEntry *) gf_list_pop_back(period_links);
+			if (p) gf_free(p);
 		}
+		gf_list_del(period_links);
 	}
-	gf_free(dash_inputs);
+
 	return e;
 }
 
 #endif /* GPAC_DISABLE_ISOM_WRITE */
-
-

v0.5.2.tar.gz/src/media_tools/dsmcc.c -> v0.6.1.tar.gz/src/media_tools/dsmcc.c Changed

v0.5.2.tar.gz/src/media_tools/filestreamer.c -> v0.6.1.tar.gz/src/media_tools/filestreamer.c Changed

v0.5.2.tar.gz/src/media_tools/html5_mse.c -> v0.6.1.tar.gz/src/media_tools/html5_mse.c Changed

@@ -24,7 +24,8 @@
 */
 #include <gpac/setup.h>
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifndef GPAC_DISABLE_MSE
+
 #include <gpac/html5_mse.h>
 #include <gpac/internal/isomedia_dev.h>
 
@@ -786,8 +787,10 @@
 				e = sb->parser->ChannelGetSLP(sb->parser, track->channel,
 				 &packet->data, &packet->size, &packet->sl_header,
 				 &packet->is_compressed, &packet->status, &packet->is_new_data);
-				assert(e == GF_OK);
-				if (packet->status == GF_OK && packet->is_new_data && packet->size) {
+				if (e!=GF_OK) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MSE] Failed to fetch AU from channel\n"));
+				}
+				else if (packet->status == GF_OK && packet->is_new_data && packet->size) {
 					char *data;
 					assert(packet->is_new_data && packet->size);
 					data = (char *)gf_malloc(packet->size);
@@ -826,7 +829,9 @@
 	buffer->url = (char *)gf_malloc(256);
 	sprintf(buffer->url, "gmem://%d@%p", buffer->length, buffer->data);
 	buffer->reference_count++;
+#ifndef GPAC_DISABLE_ISOM
 	buffer->is_init = (gf_isom_probe_file(buffer->url) == 2 ? GF_TRUE : GF_FALSE);
+#endif
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Appending segment %s to SourceBuffer %p\n", buffer->url, sb));
 
 	gf_list_add(sb->input_buffer, buffer);
@@ -1054,4 +1059,4 @@
 }
 
 
-#endif
+#endif //GPAC_DISABLE_MSE

v0.5.2.tar.gz/src/media_tools/img.c -> v0.6.1.tar.gz/src/media_tools/img.c Changed

v0.5.2.tar.gz/src/media_tools/ismacryp.c -> v0.6.1.tar.gz/src/media_tools/ismacryp.c Changed

@@ -302,7 +302,7 @@
 	strcpy(szPath, getenv("HOME"));
 	strcat(szPath , "/.kms_data");
 	got_it = 0;
-	kms = gf_f64_open(szPath, "r");
+	kms = gf_fopen(szPath, "r");
 	while (kms && !feof(kms)) {
 		if (!fgets(szPath, 1024, kms)) break;
 		szPath[strlen(szPath) - 1] = 0;
@@ -314,7 +314,7 @@
 		if (i==24) got_it = 1;
 		break;
 	}
-	if (kms) fclose(kms);
+	if (kms) gf_fclose(kms);
 	if (got_it) {
 		/*watchout, MPEG4IP stores SALT|KEY, NOT KEY|SALT*/
 		memcpy(key, catKey+8, sizeof(char)*16);
@@ -786,74 +786,59 @@
 }
 
 /*Common Encryption*/
-static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u64 BSO, u8 IV_size, Bool isNewSample) {
-	char next_IV[17];
-	GF_BitStream *bs, *tmp;
-	u64 prev_block_count;
-	u32 remain;
-	/*for log*/
-	u8 digest[33];
-	char t[3];
+static void increase_counter(char *x, int x_size) {
+	register int i, y=0;
 
-	if (isNewSample) {
-		prev_block_count = BSO % 16 ? BSO / 16 + 1 : BSO / 16;
-		remain = 0;
-	}
-	else {
-		prev_block_count = BSO / 16;
-		remain = (u32) (BSO % 16);
-	}
+	for (i=x_size-1; i>=0; i--) {
+		y = 0;
+		if ((u8) x[i] == 0xFF) {
+			x[i] = 0;
+			y = 1;
+		} else x[i]++;
 
-	tmp = gf_bs_new(IV, 16, GF_BITSTREAM_READ);
-	bs = gf_bs_new(next_IV, 17, GF_BITSTREAM_WRITE);
-	gf_bs_write_u8(bs, 0);	/*begin of counter*/
-	if (isNewSample && (IV_size == 8)) {
-		u64 IV_value;
-		IV_value = gf_bs_read_u64(tmp);
-		if (IV_value == 0xFFFFFFFFFFFFFFFFULL)
-			IV_value = 0x0;
-		else
-			IV_value++;
-		gf_bs_write_u64(bs, IV_value);
-		gf_bs_write_u64(bs, 0x0);
-	}
-	else {
-		u64 salt_portion, block_count_portion;
-		salt_portion = gf_bs_read_u64(tmp);
-		block_count_portion = gf_bs_read_u64(tmp);
-		/*reset the block counter to zero without affecting the other 64 bits of the IV*/
-		if (prev_block_count > 0xFFFFFFFFFFFFFFFFULL - block_count_portion)
-			block_count_portion = prev_block_count - (0xFFFFFFFFFFFFFFFFULL - block_count_portion) - 1;
-		else
-			block_count_portion += prev_block_count;
-		gf_bs_write_u64(bs, salt_portion);
-		gf_bs_write_u64(bs, block_count_portion);
-	}
-
-	gf_crypt_set_state(mc, next_IV, 17);
-	/*decrypt remain bytes*/
-	if (remain) {
-		char dummy[20];
-		gf_crypt_decrypt(mc, dummy, remain);
+		if (y==0) break;
 	}
 
-	/* IV for subsequence sample*/
-	if (isNewSample) {
-		memset(IV, 0, 16*sizeof(char));
-		memmove(IV, next_IV+1, 16*sizeof(char));
-	}
-	else {
-		u32 j;
-		digest[0] = 0;
-		for ( j=0; j<16; j++ ) {
-			t[2] = 0;
-			sprintf ( t, "%02X", (u8) next_IV[j+1] );
-			strcat ( (char*)digest, t );
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[CENC] \t next NALU: %s \n", digest) );
-	}
-	gf_bs_del(bs);
-	gf_bs_del(tmp);
+	return;
+}
+
+static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u8 IV_size) {
+	char next_IV[17];
+	int size = 17;
+
+	gf_crypt_get_state(mc, &next_IV, &size);
+	/*
+		NOTE 1: the next_IV returned by get_state has 17 bytes, the first byte being the current counter position in the following 16 bytes.
+		If this index is 0, this means that we are at the begining of a new block and we can use it as IV for next sample,
+		otherwise we must discard unsued bytes in the counter (next sample shall begin with counter at 0)
+		if less than 16 blocks were cyphered, we must force inscreasing the next IV for next sample, not doing so would produce the same IV for the next bytes cyphered,
+		which is forbidden by CENC (unique IV per sample). In GPAC, we ALWAYS force counter increase
+
+		NOTE 2: in case where IV_size is 8, because the cypher block is treated as 16 bytes while processing,
+		we need to increment manually the 8-bytes IV (bytes 0 to 7) for the next sample, otherwise we would likely the same IV (eg unless we had cyphered 16 * 2^64 - 1
+		bytes in the last sample , quite unlikely !)
+
+		NOTE 3: Bytes 8 to 15 are set to 0 when forcing a new IV for 8-bytes IVs.
+
+		NOTE 4: Since CENC forces declaration of a unique, potentially random, IV per sample, we could increase the IV counter at each sample start
+		but this is currently not done
+	*/
+	if (IV_size == 8) {
+		/*cf note 2*/
+		increase_counter(&next_IV[1], IV_size);
+		next_IV[0] = 0;
+		/*cf note 3*/
+		memset(&next_IV[9], 0, 8*sizeof(char));
+	} else if (next_IV[0]) {
+		/*cf note 1*/
+		increase_counter(&next_IV[1], IV_size);
+		next_IV[0] = 0;
+	}
+
+	gf_crypt_set_state(mc, next_IV, size);
+
+	memset(IV, 0, 16*sizeof(char));
+	memcpy(IV, next_IV+1, 16*sizeof(char));
 }
 
 static GF_Err gf_cenc_encrypt_sample_ctr(GF_Crypt *mc, GF_ISOSample *samp, Bool is_nalu_video, u32 nalu_size_length, char IV[16], u32 IV_size, char **sai, u32 *saiz, u32 bytes_in_nalhr) {
@@ -914,11 +899,6 @@
 
 
 		gf_list_add(subsamples, entry);
-
-
-		/*update IV for next sub-samples*/
-		if (gf_bs_available(pleintext_bs))
-			cenc_resync_IV(mc, IV, BSO, IV_size, GF_FALSE);
 	}
 
 	if (samp->data) {
@@ -937,7 +917,7 @@
 	}
 	gf_list_del(subsamples);
 	gf_bs_get_content(sai_bs, sai, saiz);
-	cenc_resync_IV(mc, IV, BSO, IV_size, GF_TRUE);
+	cenc_resync_IV(mc, IV, IV_size);
 
 exit:
 	if (buffer) gf_free(buffer);
@@ -1263,7 +1243,6 @@
 {
 	GF_Err e;
 	u32 track, count, i, j, si, max_size, subsample_count, nb_samp_decrypted;
-	u64 BSO;
 	GF_ISOSample *samp = NULL;
 	GF_Crypt *mc;
 	char IV[17];
@@ -1323,7 +1302,6 @@
 
 		memset(IV, 0, 17);
 		memset(buffer, 0, max_size);
-		BSO = 0;
 
 		samp = gf_isom_get_sample(mp4, track, i+1, &si);
 		if (!samp)
@@ -1403,13 +1381,6 @@
 				gf_crypt_decrypt(mc, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
 				gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
 
-				/*update IV for next subsample*/
-				if (tci->enc_type == 2) {
-					BSO += sai->subsamples[subsample_count].bytes_encrypted_data;
-					if (gf_bs_available(cyphertext_bs))
-						cenc_resync_IV(mc, (char *)sai->IV, BSO, tci->IV_size, GF_FALSE);
-				}
-
 				subsample_count++;
 			}
 		}
@@ -1813,13 +1784,13 @@
 				}
 			} else if (!drm_file) {
 				FILE *test = NULL;
-				if (!stricmp(scheme_URI, "urn:gpac:isma:encryption_scheme")) test = gf_f64_open(KMS_URI, "rt");
+				if (!stricmp(scheme_URI, "urn:gpac:isma:encryption_scheme")) test = gf_fopen(KMS_URI, "rt");
 
 				if (!test) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] TrackID %d does not contain decryption keys - skipping\n", trackID));
 					continue;
 				}
-				fclose(test);
+				gf_fclose(test);
 				if (gf_ismacryp_gpac_get_info(tci.trackID, (char *) KMS_URI, (char *) tci.key, (char *) tci.salt) != GF_OK) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Couldn't load TrackID %d keys in GPAC DRM file %s\n", tci.trackID, KMS_URI));
 					continue;
@@ -1977,7 +1948,7 @@
 	GF_Err e;
 	u32 i, count, nb_tracks, common_idx, idx;
 	GF_CryptInfo *info;
-	Bool is_oma;
+	Bool is_oma, is_encrypted=GF_FALSE;
 	GF_TrackCryptInfo *tci;
 
 	is_oma = 0;
@@ -2043,6 +2014,7 @@
 		e = gf_encrypt_track(mp4, tci, NULL, NULL);
 		if (e) break;
 
+		is_encrypted = GF_TRUE;
 		if (tci->enc_type==1) is_oma = 1;
 	}
 
@@ -2056,6 +2028,10 @@
 #endif
 	}
 
+	if (is_encrypted == GF_FALSE) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Warning: no track was encrypted (but PSSH was written).\n"));
+	}
+
 	del_crypt_info(info);
 	return e;
 }

v0.5.2.tar.gz/src/media_tools/isom_hinter.c -> v0.6.1.tar.gz/src/media_tools/isom_hinter.c Changed

v0.5.2.tar.gz/src/media_tools/isom_tools.c -> v0.6.1.tar.gz/src/media_tools/isom_tools.c Changed

@@ -151,10 +151,10 @@
 	Bool is_isom = gf_isom_probe_file(file);
 #endif
 
-	in = gf_f64_open(file, "rb");
-	gf_f64_seek(in, 0, SEEK_END);
-	size = gf_f64_tell(in);
-	gf_f64_seek(in, 0, SEEK_SET);
+	in = gf_fopen(file, "rb");
+	gf_fseek(in, 0, SEEK_END);
+	size = gf_ftell(in);
+	gf_fseek(in, 0, SEEK_SET);
 
 	ctx = gf_sha1_starts();
 	tot = 0;
@@ -199,7 +199,7 @@
 #ifndef GPAC_DISABLE_ISOM
 	if (bs) gf_bs_del(bs);
 #endif
-	fclose(in);
+	gf_fclose(in);
 	return GF_OK;
 #endif
 }
@@ -580,8 +580,8 @@
 		case GF_ISOM_MEDIA_VISUAL:
 			/*remove image tracks if wanted*/
 			if (gf_isom_get_sample_count(mp4file, i+1)<=1) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Visual track ID %d: only one sample found, assuming image and removing track\n", gf_isom_get_track_id(mp4file, i+1) ));
-				goto remove_track;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[3GPP convert] Visual track ID %d: only one sample found\n", gf_isom_get_track_id(mp4file, i+1) ));
+				//goto remove_track;
 			}
 
 			if (stype == GF_ISOM_SUBTYPE_MPEG4_CRYP) gf_isom_get_ismacryp_info(mp4file, i+1, 1, &stype, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -940,23 +940,25 @@
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u32(bs, subtype);
 	udesc = gf_isom_get_generic_sample_description(mp4, track, 1);
-	if (type==GF_ISOM_MEDIA_AUDIO) {
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		gf_bs_write_u32(bs, udesc->samplerate);
-		gf_bs_write_u16(bs, udesc->nb_channels);
-		gf_bs_write_u16(bs, 0);
-		gf_bs_write_u8(bs, udesc->bits_per_sample);
-		gf_bs_write_u8(bs, 0);
-	} else {
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		gf_bs_write_u16(bs, udesc->width);
-		gf_bs_write_u16(bs, udesc->height);
-	}
-	if (udesc && udesc->extension_buf_size) {
-		gf_bs_write_data(bs, udesc->extension_buf, udesc->extension_buf_size);
-		gf_free(udesc->extension_buf);
+	if (udesc) {
+		if (type==GF_ISOM_MEDIA_AUDIO) {
+			esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+			gf_bs_write_u32(bs, udesc->samplerate);
+			gf_bs_write_u16(bs, udesc->nb_channels);
+			gf_bs_write_u16(bs, 0);
+			gf_bs_write_u8(bs, udesc->bits_per_sample);
+			gf_bs_write_u8(bs, 0);
+		} else {
+			esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+			gf_bs_write_u16(bs, udesc->width);
+			gf_bs_write_u16(bs, udesc->height);
+		}
+		if (udesc->extension_buf_size) {
+			gf_bs_write_data(bs, udesc->extension_buf, udesc->extension_buf_size);
+			gf_free(udesc->extension_buf);
+		}
+		gf_free(udesc);
 	}
-	if (udesc) gf_free(udesc);
 	gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
 	gf_bs_del(bs);
 	return esd;
@@ -1081,7 +1083,7 @@
 	char *buffer;
 	s32 *sps_track, *sps, *pps;
 	u64 offset;
-	Bool is_splited;
+	Bool is_splitted;
 	Bool *first_sample_track, *is_subseq_pps;
 	u64 *first_DTS_track;
 	s8 sample_offset;
@@ -1113,12 +1115,12 @@
 	}
 	num_pps = gf_list_count(svccfg->pictureParameterSets);
 	if ((gf_isom_get_avc_svc_type(file, track, 1) == GF_ISOM_AVCTYPE_SVC_ONLY) && !gf_isom_has_svc_explicit(file, track))
-		is_splited = 1;
+		is_splitted = 1;
 	else
-		is_splited = 0;
+		is_splitted = 0;
 	num_subseq = gf_isom_has_svc_explicit(file, track) ? num_sps - 1 : num_sps;
 
-	if (is_splited)
+	if (is_splitted)
 	{
 		/*this track has only one SVC ...*/
 		if (num_sps == 1)
@@ -1181,7 +1183,7 @@
 		}
 		pps[j] = pps_id;
 	}
-	if (!is_splited)
+	if (!is_splitted)
 		ref_trackID = gf_isom_get_track_id(file, track);
 	else
 	{
@@ -1566,7 +1568,7 @@
 	}
 
 	/*if this is a merged file*/
-	if (!is_splited)
+	if (!is_splitted)
 	{
 		/*a normal stream: delete SVC config*/
 		if (!gf_isom_has_svc_explicit(file, track))
@@ -1616,7 +1618,7 @@
 				goto exit;
 		}
 	}
-	/*if this is as splited file: delete this track*/
+	/*if this is as splitted file: delete this track*/
 	else
 	{
 		gf_isom_remove_track(file, track);
@@ -2233,7 +2235,7 @@
 					gf_bs_write_int(xbs, trefidx, 8);
 					// no sample offset
 					gf_bs_write_int(xbs, 0, 8);
-					// data offset: we start from begining of the sample data, not the extractor
+					// data offset: we start from beginning of the sample data, not the extractor
 					gf_bs_write_int(xbs, sti[k].data_offset, 8*shvccfg->nal_unit_size);
 					gf_bs_write_int(xbs, sti[k].data_size, 8*shvccfg->nal_unit_size);
 				}
@@ -2340,9 +2342,9 @@
 		if (level) slc->data[3] = level;
 	}
 	e = gf_isom_avc_config_update(file, track, 1, avcc);
-	assert (e == GF_OK);
+
 	gf_odf_avc_cfg_del(avcc);
-	return GF_OK;
+	return e;
 }
 
 
@@ -2350,21 +2352,20 @@
 {
 	HEVCSliceInfo *si = &hevc->s_info;
 	u32 i, tbX, tbY, PicWidthInCtbsY, PicHeightInCtbsY, tileX, tileY, oX, oY, val;
+
 	PicWidthInCtbsY = si->sps->width / si->sps->max_CU_width;
+	if (PicWidthInCtbsY * si->sps->max_CU_width < si->sps->width) PicWidthInCtbsY++;
 	PicHeightInCtbsY = si->sps->height / si->sps->max_CU_width;
+	if (PicHeightInCtbsY * si->sps->max_CU_width < si->sps->height) PicHeightInCtbsY++;
 
 	tbX = si->slice_segment_address % PicWidthInCtbsY;
 	tbY = si->slice_segment_address / PicWidthInCtbsY;
 
 	tileX = tileY = 0;
 	oX = oY = 0;
-	for (i=0; i<si->pps->num_tile_columns; i++) {
+	for (i=0; i < si->pps->num_tile_columns; i++) {
 		if (si->pps->uniform_spacing_flag) {
-			if (i<si->pps->num_tile_columns-1) {
-				val = (i+1)*PicWidthInCtbsY / si->pps->num_tile_columns - (i)*PicWidthInCtbsY / si->pps->num_tile_columns;
-			} else {
-				val = (i)*PicWidthInCtbsY / si->pps->num_tile_columns - (i-1)*PicWidthInCtbsY / si->pps->num_tile_columns;
-			}
+			val = (i+1)*PicWidthInCtbsY / si->pps->num_tile_columns - (i)*PicWidthInCtbsY / si->pps->num_tile_columns;
 		} else {
 			if (i<si->pps->num_tile_columns-1) {
 				val = si->pps->column_width[i];
@@ -2381,11 +2382,7 @@
 	}
 	for (i=0; i<si->pps->num_tile_rows; i++) {
 		if (si->pps->uniform_spacing_flag) {
-			if (i<si->pps->num_tile_rows-1) {
-				val = (i+1)*PicHeightInCtbsY / si->pps->num_tile_rows - (i)*PicHeightInCtbsY / si->pps->num_tile_rows;
-			} else {
-				val = (i)*PicHeightInCtbsY / si->pps->num_tile_rows - (i-1)*PicHeightInCtbsY / si->pps->num_tile_rows;
-			}
+			val = (i+1)*PicHeightInCtbsY / si->pps->num_tile_rows - (i)*PicHeightInCtbsY / si->pps->num_tile_rows;
 		} else {
 			if (i<si->pps->num_tile_rows-1) {
 				val = si->pps->row_height[i];
@@ -2410,14 +2407,14 @@
 
 typedef struct
 {
-	u32 track, track_id;
+	u32 track, track_id, sample_count;
 	u32 tx, ty, tw, th;
 	u32 data_offset;
 	GF_BitStream *sample_data;
 } HEVCTileImport;
 
 GF_EXPORT
-GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file)
+GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file, Bool use_extractors)
 {
 #if defined(GPAC_DISABLE_HEVC) || defined(GPAC_DISABLE_AV_PARSERS)
 	return GF_NOT_SUPPORTED;
@@ -2475,6 +2472,8 @@
 	if (! hevc.pps[pps_idx].tiles_enabled_flag) return GF_OK;
 	nb_tracks = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;
 	tiles = gf_malloc(sizeof(HEVCTileImport) * nb_tracks);
+	if (!tiles) return GF_OUT_OF_MEM;
+	memset(tiles, 0, sizeof(HEVCTileImport) * nb_tracks);
 
 	//first clone tracks
 	for (i=0; i<nb_tracks; i++) {
@@ -2486,7 +2485,9 @@
 	//then setup track references (done in two pass otherwise we would clone the tref box ...)
 	for (i=0; i<nb_tracks; i++) {
 		gf_isom_set_track_reference(file, tiles[i].track, GF_ISOM_REF_TBAS, gf_isom_get_track_id(file, track) );
-		gf_isom_set_track_reference(file, track, GF_ISOM_REF_SCAL, tiles[i].track_id) ;
+		if (use_extractors) {
+			gf_isom_set_track_reference(file, track, GF_ISOM_REF_SCAL, tiles[i].track_id);
+		}
 	}
 
 	count = gf_isom_get_sample_count(file, track);
@@ -2554,20 +2555,31 @@
 				if (e)
 					goto err_exit;
 
-				//write extractor (12 = 2*nalu_size_length + 4 bytes)
-				gf_bs_write_int(bs, 2*nalu_size_length + 4, 8*nalu_size_length);
-				gf_bs_write_int(bs, 0, 1);
-				gf_bs_write_int(bs, 49, 6); //extractor
-				gf_bs_write_int(bs, layer_id, 6);
-				gf_bs_write_int(bs, temporal_id, 3);
-				//set ref track index
-				trefidx = (u8) gf_isom_has_track_reference(file, track, GF_ISOM_REF_SCAL, tiles[cur_tile].track_id);
-				gf_bs_write_int(bs, trefidx, 8);
-				// no sample offset
-				gf_bs_write_int(bs, 0, 8);
-				// data offset: we start from last NAL written in this sample in this tile track
-				gf_bs_write_int(bs, tiles[cur_tile].data_offset, 8*nalu_size_length);
-				gf_bs_write_int(bs, nalu_size + nalu_size_length, 8*nalu_size_length);
+				if (use_extractors) {
+					//write extractor (12 = 2*nalu_size_length + 4 bytes)
+					gf_bs_write_int(bs, 2*nalu_size_length + 4, 8*nalu_size_length);
+					gf_bs_write_int(bs, 0, 1);
+					gf_bs_write_int(bs, 49, 6); //extractor
+					gf_bs_write_int(bs, layer_id, 6);
+					gf_bs_write_int(bs, temporal_id, 3);
+					//set ref track index
+					trefidx = (u8) gf_isom_has_track_reference(file, track, GF_ISOM_REF_SCAL, tiles[cur_tile].track_id);
+					gf_bs_write_int(bs, trefidx, 8);
+					// no sample offset
+					gf_bs_write_int(bs, 0, 8);
+					// data offset: we start from last NAL written in this sample in this tile track
+					gf_bs_write_int(bs, tiles[cur_tile].data_offset, 8*nalu_size_length);
+
+					//we always write 0 to force complete NAL referencing. This avoids size issues when mixing tile tracks
+					//at different rates :)
+					//gf_bs_write_int(bs, nalu_size + nalu_size_length, 8*nalu_size_length);
+					gf_bs_write_int(bs, 0, 8*nalu_size_length);
+				} else {
+
+					if (! gf_isom_has_track_reference(file, track, GF_ISOM_REF_SABT, tiles[cur_tile].track_id)) {
+						gf_isom_set_track_reference(file, track, GF_ISOM_REF_SABT, tiles[cur_tile].track_id);
+					}
+				}
 				tiles[cur_tile].data_offset += nalu_size + nalu_size_length;
 
 				break;
@@ -2591,12 +2603,20 @@
 		for (j=0; j<nb_tracks; j++) {
 			sample->dataLength = 0;
 			gf_bs_get_content(tiles[j].sample_data, &sample->data, &sample->dataLength);
+			if (!sample->data)
+				continue;
+
 			e = gf_isom_add_sample(file, tiles[j].track, 1, sample);
 			if (e) goto err_exit;
+			tiles[j].sample_count ++;
+
 			gf_bs_del(tiles[j].sample_data);
 			tiles[j].sample_data = NULL;
 			gf_free(sample->data);
 			sample->data = NULL;
+
+			e = gf_isom_copy_sample_info(file, tiles[j].track, file, track, i+1);
+			if (e) goto err_exit;
 		}
 
 		gf_isom_sample_del(&sample);
@@ -2609,7 +2629,15 @@
 		u32 width, height;
 		s32 translation_x, translation_y;
 		s16 layer;
-		GF_BitStream *bs = gf_bs_new(data, 11, GF_BITSTREAM_WRITE);
+		GF_BitStream *bs;
+
+		tiles[i].track = gf_isom_get_track_by_id(file, tiles[i].track_id);
+		if (!tiles[i].sample_count) {
+			gf_isom_remove_track(file, tiles[i].track);
+			continue;
+		}
+
+		bs = gf_bs_new(data, 11, GF_BITSTREAM_WRITE);
 		gf_bs_write_u16(bs, tiles[i].track);
 		gf_bs_write_int(bs, 1, 2);
 		gf_bs_write_int(bs, 0, 1);//not full frame
@@ -2723,9 +2751,11 @@
 			gf_isom_add_track_kind(output, TrackNum, scheme, value);
 		}
 
-		//if few samples don't fragment track
 		count = gf_isom_get_sample_count(input, i+1);
-		if (count<=2) {
+		//we always fragment each track regardless of the sample count
+#if 0
+		//if few samples don't fragment track
+		if (count<=1) {
 			for (j=0; j<count; j++) {
 				sample = gf_isom_get_sample(input, i+1, j+1, &descIndex);
 				e = gf_isom_add_sample(output, TrackNum, 1, sample);
@@ -2734,7 +2764,9 @@
 			}
 		}
 		//otherwise setup fragmented
-		else {
+		else
+#endif
+		{
 			gf_isom_get_fragment_defaults(input, i+1,
 			 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 			//otherwise setup fragmentation
@@ -2746,7 +2778,7 @@
 
 			GF_SAFEALLOC(tf, GF_TrackFragmenter);
 			tf->TrackID = gf_isom_get_track_id(output, TrackNum);
-			tf->SampleCount = gf_isom_get_sample_count(input, i+1);
+			tf->SampleCount = count;
 			tf->OriginalTrack = i+1;
 			tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
 			tf->MediaType = gf_isom_get_media_type(input, i+1);
@@ -2764,6 +2796,11 @@
 	e = gf_isom_finalize_for_fragment(output, 0);
 	if (e) goto err_exit;
 
+	if (!nb_samp) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOBMFF Fragmenting] No samples in movie, rewriting moof and exit\n"));
+		goto err_exit;
+	}
+
 	nb_done = 0;
 
 	while ( (count = gf_list_count(fragmenters)) ) {

v0.5.2.tar.gz/src/media_tools/m2ts_mux.c -> v0.6.1.tar.gz/src/media_tools/m2ts_mux.c Changed

@@ -44,17 +44,17 @@
 
 
 static GFINLINE Bool gf_m2ts_time_less(GF_M2TS_Time *a, GF_M2TS_Time *b) {
-	if (a->sec>b->sec) return 0;
-	if (a->sec==b->sec) return (a->nanosec<b->nanosec) ? 1 : 0;
-	return 1;
+	if (a->sec>b->sec) return GF_FALSE;
+	if (a->sec==b->sec) return (a->nanosec<b->nanosec) ? GF_TRUE : GF_FALSE;
+	return GF_TRUE;
 }
 static GFINLINE Bool gf_m2ts_time_equal(GF_M2TS_Time *a, GF_M2TS_Time *b) {
 	return ((a->sec==b->sec) && (a->nanosec == b->nanosec) );
 }
 static GFINLINE Bool gf_m2ts_time_less_or_equal(GF_M2TS_Time *a, GF_M2TS_Time *b) {
-	if (a->sec>b->sec) return 0;
-	if (a->sec==b->sec) return (a->nanosec>b->nanosec) ? 0 : 1;
-	return 1;
+	if (a->sec>b->sec) return GF_FALSE;
+	if (a->sec==b->sec) return (a->nanosec>b->nanosec) ? GF_FALSE : GF_TRUE;
+	return GF_TRUE;
 }
 
 static GFINLINE void gf_m2ts_time_inc(GF_M2TS_Time *time, u64 delta_inc_num, u32 delta_inc_den)
@@ -410,7 +410,7 @@
 	stream->current_table = stream->tables;
 	stream->current_section = stream->current_table->section;
 	stream->current_section_offset = 0;
-	stream->table_needs_send = 1;
+	stream->table_needs_send = GF_TRUE;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Generating %d sections for MPEG-4 SL packet - version number %d - extension ID %d\n", stream->pid, nb_sections, table->version_number, table_id_extension));
 
@@ -493,9 +493,12 @@
 	u32 padding_length = 0;
 #endif
 
-	stream->table_needs_send = 0;
+	stream->table_needs_send = GF_FALSE;
 	table = stream->current_table;
-	assert(table);
+	if (!table) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Invalid muxer state, table is NULL!\n"));
+		return;
+	}
 
 	section = stream->current_section;
 	assert(section);
@@ -634,9 +637,9 @@
 		}
 		gf_bs_get_content(bs, (char**)&payload, &size);
 		gf_bs_del(bs);
-		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_SDT_ACTUAL, muxer->ts_id, payload, size, 1, 0, 0);
-		stream->table_needs_update = 0;
-		stream->table_needs_send = 1;
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_SDT_ACTUAL, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE, GF_FALSE);
+		stream->table_needs_update = GF_FALSE;
+		stream->table_needs_send = GF_TRUE;
 		gf_free(payload);
 	}
 	if (stream->table_needs_send)
@@ -664,9 +667,9 @@
 		}
 		gf_bs_get_content(bs, (char**)&payload, &size);
 		gf_bs_del(bs);
-		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PAT, muxer->ts_id, payload, size, 1, 0, 0);
-		stream->table_needs_update = 0;
-		stream->table_needs_send = 1;
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PAT, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE, GF_FALSE);
+		stream->table_needs_update = GF_FALSE;
+		stream->table_needs_send = GF_TRUE;
 		gf_free(payload);
 	}
 	if (stream->table_needs_send)
@@ -695,7 +698,7 @@
 
 		if (stream->program->loop_descriptors) {
 			for (i=0; i<gf_list_count(stream->program->loop_descriptors); i++) {
-				GF_M2TSDescriptor *desc = gf_list_get(stream->program->loop_descriptors, i);
+				GF_M2TSDescriptor *desc = (GF_M2TSDescriptor*)gf_list_get(stream->program->loop_descriptors, i);
 				info_length += 2 + desc->data_len;
 			}
 		}
@@ -711,7 +714,7 @@
 
 			/*rewrite SL config in IOD streams*/
 			i=0;
-			while (NULL != (esd = gf_list_enum(((GF_ObjectDescriptor*)stream->program->iod)->ESDescriptors, &i))) {
+			while (NULL != (esd = (GF_ESD*)gf_list_enum(((GF_ObjectDescriptor*)stream->program->iod)->ESDescriptors, &i))) {
 				GF_M2TS_Mux_Stream *es_stream = stream->program->streams;
 				while (es_stream) {
 					if (es_stream->ifce && (es_stream->ifce->stream_id==esd->ESID)) {
@@ -749,7 +752,7 @@
 		/*write all other descriptors*/
 		if (stream->program->loop_descriptors) {
 			for (i=0; i<gf_list_count(stream->program->loop_descriptors); i++) {
-				GF_M2TSDescriptor *desc = gf_list_get(stream->program->loop_descriptors, i);
+				GF_M2TSDescriptor *desc = (GF_M2TSDescriptor*)gf_list_get(stream->program->loop_descriptors, i);
 				gf_bs_write_int(bs,	desc->tag, 8);
 				gf_bs_write_int(bs,	desc->data_len, 8);
 				gf_bs_write_data(bs, desc->data, desc->data_len);
@@ -758,7 +761,7 @@
 
 		es = stream->program->streams;
 		while (es) {
-			Bool has_lang = 0;
+			Bool has_lang = GF_FALSE;
 			u8 type = es->mpeg2_stream_type;
 			nb_streams++;
 			es_info_length = 0;
@@ -790,14 +793,14 @@
 			{
 				for (i=0; i<gf_list_count(es->loop_descriptors); i++)
 				{
-					GF_M2TSDescriptor *desc = gf_list_get(es->loop_descriptors, i);
+					GF_M2TSDescriptor *desc = (GF_M2TSDescriptor*)gf_list_get(es->loop_descriptors, i);
 					es_info_length += 2 +desc->data_len;
 				}
 			}
 
 			if (es->ifce && es->ifce->lang && (es->ifce->lang != GF_4CC('u', 'n', 'd', ' ')) ) {
 				es_info_length += 2 + 3;
-				has_lang = 1;
+				has_lang = GF_TRUE;
 			}
 
 			gf_bs_write_int(bs,	es_info_length, 12);
@@ -856,9 +859,9 @@
 		gf_bs_get_content(bs, (char**)&payload, &length);
 		gf_bs_del(bs);
 
-		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PMT, stream->program->number, payload, length, 1, 0, 0);
-		stream->table_needs_update = 0;
-		stream->table_needs_send = 1;
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PMT, stream->program->number, payload, length, GF_TRUE, GF_FALSE, GF_FALSE);
+		stream->table_needs_update = GF_FALSE;
+		stream->table_needs_send = GF_TRUE;
 		gf_free(payload);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Updating PMT - Program Number %d - %d streams - size %d%s\n", stream->pid, stream->program->number, nb_streams, length, stream->program->iod ? " - MPEG-4 Systems detected":""));
@@ -891,7 +894,7 @@
 		else
 			stream->program->initial_ts = 0;
 
-		stream->program->initial_ts_set = 1;
+		stream->program->initial_ts_set = GF_TRUE;
 	}
 	else if (*dts < stream->program->initial_ts) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is less than initial DTS "LLD" - adjusting\n", stream->pid, *dts, stream->program->initial_ts));
@@ -936,10 +939,45 @@
 	gf_bs_del(bs);
 }
 
+static Bool gf_m2ts_adjust_next_stream_time_for_pcr(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
+{
+	u32 pck_diff;
+	s32 us_diff;
+	GF_M2TS_Time next_pcr_time, stream_time;
+
+	if (!muxer->enable_forced_pcr) return 1;
+
+	if (!muxer->bit_rate) return 1;
+
+	next_pcr_time = stream->program->ts_time_at_pcr_init;
+	pck_diff = (u32) (stream->program->nb_pck_last_pcr - stream->program->num_pck_at_pcr_init);
+	gf_m2ts_time_inc(&next_pcr_time, pck_diff*1504, stream->program->mux->bit_rate);
+	gf_m2ts_time_inc(&next_pcr_time, stream->program->mux->pcr_update_ms, 1000);
+
+	stream_time = stream->pcr_only_mode ? stream->next_time : stream->time;
+	//If next_pcr_time < stream->time, we need to inject pure pcr data
+	us_diff = gf_m2ts_time_diff_us(&next_pcr_time, &stream_time);
+	if (us_diff > 0) {
+		if (!stream->pcr_only_mode) {
+			stream->pcr_only_mode = GF_TRUE;
+			stream->next_time = stream->time;
+		}
+		stream->time = next_pcr_time;
+		/*if too ahead of mux time, don't insert PCR*/
+		us_diff = gf_m2ts_time_diff_us(&stream->program->mux->time, &stream->time);
+		if (us_diff>1000)
+			return 0;
+	} else if (stream->pcr_only_mode) {
+		stream->pcr_only_mode = GF_FALSE;
+		stream->time = stream->next_time;
+	}
+	return 1;
+}
+
 static u32 gf_m2ts_stream_process_pes(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
 	u64 time_inc;
-	Bool ret = 0;
+	Bool ret = GF_FALSE;
 
 	if (stream->mpeg2_stream_type==GF_M2TS_SYSTEMS_MPEG4_SECTIONS) {
 		/*section has just been updated */
@@ -949,10 +987,16 @@
 		if (stream->current_section && (stream->current_section_offset || stream->current_section!=stream->current_table->section))
 			return stream->scheduling_priority;
 		if (stream->ifce->repeat_rate && stream->tables)
-			ret = stream->program->pcr_init_time ? stream->scheduling_priority : 0;
+			ret = stream->program->pcr_init_time ? stream->scheduling_priority : GF_FALSE;
 	}
+	/*PES packet not completely sent yet*/
 	else if (stream->curr_pck.data_len && stream->pck_offset < stream->curr_pck.data_len) {
-		/*PES packet not completely sent yet*/
+		//if in pure PCR mode, check if we can fall back to regular mode and start sending the stream
+		if ((stream == stream->program->pcr) && stream->pcr_only_mode) {
+			if (! gf_m2ts_adjust_next_stream_time_for_pcr(muxer, stream)) {
+				return 0;
+			}
+		}
 		return stream->scheduling_priority;
 	}
 
@@ -966,7 +1010,7 @@
 		}
 		stream->pck_offset = 0;
 		stream->curr_pck.data_len = 0;
-		stream->discard_data = 0;
+		stream->discard_data = GF_FALSE;
 
 		/*EOS*/
 		if (stream->ifce->caps & GF_ESI_STREAM_IS_OVER) return ret;
@@ -1004,7 +1048,7 @@
 		/*discard first packet*/
 		stream->pck_first = curr_pck->next;
 		gf_free(curr_pck);
-		stream->discard_data = 1;
+		stream->discard_data = GF_TRUE;
 
 		gf_mx_v(stream->mx);
 	}
@@ -1021,7 +1065,7 @@
 				while (!stream->program->pcr_init_time)
 					stream->program->pcr_init_time = gf_rand();
 			}
-			stream->program->pcr_init_time_set = 1;
+			stream->program->pcr_init_time_set = GF_TRUE;
 			stream->program->ts_time_at_pcr_init = muxer->time;
 			stream->program->num_pck_at_pcr_init = muxer->tot_pck_sent;
 
@@ -1053,7 +1097,7 @@
 		stream->sl_header.decodingTimeStampFlag = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? 1: 0;
 		stream->sl_header.decodingTimeStamp = stream->curr_pck.dts;
 
-		gf_m2ts_mux_table_update_mpeg4(stream, stream->table_id, muxer->ts_id, stream->curr_pck.data, stream->curr_pck.data_len, 1, 0, (stream->curr_pck.flags & GF_ESI_DATA_REPEAT) ? 0 : 1, 0);
+		gf_m2ts_mux_table_update_mpeg4(stream, stream->table_id, muxer->ts_id, stream->curr_pck.data, stream->curr_pck.data_len, GF_TRUE, GF_FALSE, (stream->curr_pck.flags & GF_ESI_DATA_REPEAT) ? GF_FALSE : GF_TRUE, GF_FALSE);
 
 		/*packet data is now copied in sections, discard it if not pull*/
 		if (!(stream->ifce->caps & GF_ESI_AU_PULL_CAP)) {
@@ -1094,7 +1138,7 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Encapsulating MPEG-4 SL Data (%p - %p) on PES - SL Header size %d\n", stream->pid, src_data, stream->curr_pck.data, stream->curr_pck.data_len - src_data_len));
 
 		/*moving from PES to SL reallocates a new buffer, force discard even in pull mode*/
-		stream->discard_data = 1;
+		stream->discard_data = GF_TRUE;
 	}
 	break;
 	/*perform LATM encapsulation*/
@@ -1153,7 +1197,7 @@
 		stream->curr_pck.data[1] |= (size>>8) & 0x1F;
 		stream->curr_pck.data[2] = (size) & 0xFF;
 		/*since we reallocated the packet data buffer, force a discard in pull mode*/
-		stream->discard_data = 1;
+		stream->discard_data = GF_TRUE;
 	}
 	break;
 	/*perform ADTS encapsulation*/
@@ -1187,13 +1231,13 @@
 			stream->reframe_overhead = 7;
 		}
 		/*since we reallocated the packet data buffer, force a discard in pull mode*/
-		stream->discard_data = 1;
+		stream->discard_data = GF_TRUE;
 		break;
 	case GF_M2TS_METADATA_PES:
 	case GF_M2TS_METADATA_ID3_HLS:
 	{
 		id3_tag_create(&stream->curr_pck.data, &stream->curr_pck.data_len);
-		stream->discard_data = 1;
+		stream->discard_data = GF_TRUE;
 	}
 	break;
 	}
@@ -1207,29 +1251,15 @@
 	/*rewrite timestamps for PES header*/
 	gf_m2ts_remap_timestamps_for_pes(stream, stream->curr_pck.flags, &stream->curr_pck.dts, &stream->curr_pck.cts, &stream->curr_pck.duration);
 
-
 	/*compute next interesting time in TS unit: this will be DTS of next packet*/
 	stream->time = stream->program->ts_time_at_pcr_init;
 	time_inc = stream->curr_pck.dts - stream->program->pcr_offset;
 
-	//this is disabled nd controled through stream->program->pcr_offset
-#if 0
-	//CBR mux: how long does it take to send our data ?
-	if (stream->program->mux->fixed_rate) {
-		u32 nb_pck = 1 + (stream->curr_pck.data_len / 184);
-		u64 send_time = nb_pck * 135360000 /* 188 * 8 * 90000*/ / stream->program->mux->bit_rate;
-		//send_time += stream->max_send_delay;
-		if (send_time<time_inc) {
-			time_inc -= send_time;
-		} else {
-			time_inc = 0;
-		}
-	}
-#endif
-
 	gf_m2ts_time_inc(&stream->time, time_inc, 90000);
 
-	/*PCR injection is now decided when building TS packet*/
+	if (stream == stream->program->pcr) {
+		gf_m2ts_adjust_next_stream_time_for_pcr(muxer, stream);
+	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Next data schedule for %d:%09d - mux time %d:%09d\n", stream->pid, stream->time.sec, stream->time.nanosec, muxer->time.sec, muxer->time.nanosec));
 
@@ -1248,7 +1278,7 @@
 
 			if (stream->program->mux->fixed_rate || (stream->bit_rate < bitrate)) {
 				stream->bit_rate = bitrate;
-				stream->program->mux->needs_reconfig = 1;
+				stream->program->mux->needs_reconfig = GF_TRUE;
 			}
 			stream->last_br_time = 0;
 			stream->bytes_since_last_time = 0;
@@ -1265,11 +1295,11 @@
 	u64 pcr;
 	/*compute PCR*/
 	if (stream->program->mux->fixed_rate ) {
-		u32 nb_pck = (u32) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init);
-		pcr = 27000000;
-		pcr *= nb_pck*1504;
-		pcr /= stream->program->mux->bit_rate;
-		pcr += stream->program->pcr_init_time;
+		Double abs_pcr = (Double) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init);
+		abs_pcr *= 27000000;
+		abs_pcr *= 1504;
+		abs_pcr /= stream->program->mux->bit_rate;
+		pcr = (u64) abs_pcr + stream->program->pcr_init_time;
 	}
 	/*in non-realtime mode with no fixed rate we only insert PCR based on DTS */
 	else {
@@ -1280,23 +1310,15 @@
 
 void gf_m2ts_stream_update_data_following(GF_M2TS_Mux_Stream *stream)
 {
-	Bool ignore_next=0;
+	Bool ignore_next = GF_FALSE;
 	stream->next_payload_size = 0;
 	stream->next_next_payload_size = 0;
 
 	stream->next_pck_flags = 0;
 	stream->copy_from_next_packets = 0;
 
-	if (stream->program->mux->one_au_per_pes) return;
-
-	switch (stream->mpeg2_stream_type) {
-	/*the following stream types do not allow PES boundaries at any place on their payload*/
-	case GF_M2TS_SYSTEMS_MPEG4_PES:
-		/*one and only one SL per PES: we cannot concatenate*/
-		return;
-	default:
-		break;
-	}
+	//AU packing in single PES is disabled
+	if (stream->force_single_au) return;
 
 	if (stream->ifce->caps & GF_ESI_AU_PULL_CAP) {
 		GF_ESIPacket test_pck;
@@ -1328,12 +1350,12 @@
 	/*consider we don't have the next AU if:
 	1- we are asked to start new PES at RAP, just consider we don't have the next AU*/
 	if (stream->start_pes_at_rap && (stream->next_pck_flags & GF_ESI_DATA_AU_RAP) ) {
-		ignore_next=1;
+		ignore_next = GF_TRUE;
 //		stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_START;
 	}
 	/*if we have a RAP about to start on a stream in this program, force all other streams to stop merging data in their current PES*/
 	else if (stream->program->mux->force_pat_pmt_state) {
-		ignore_next=1;
+		ignore_next = GF_TRUE;
 	}
 
 	if (ignore_next) {
@@ -1410,13 +1432,13 @@
 		}
 
 		if (stream->min_bytes_copy_from_next && stream->copy_from_next_packets) {
-			/*if we don't have enough space in the PES to store begining of new AU, don't copy it and ask
+			/*if we don't have enough space in the PES to store beginning of new AU, don't copy it and ask
 			to recompute header (we might no longer have DTS/CTS signaled)*/
 			if (stream->copy_from_next_packets < stream->min_bytes_copy_from_next) {
 				stream->copy_from_next_packets = 0;
 				stream->next_payload_size = 0;
 				stream->next_pck_flags = 0;
-				return 0;
+				return GF_FALSE;
 			}
 			/*if what will remain after copying next AU is less than the minimum safety copy only copy next AU and
 			realign n+2 AU start with PES*/
@@ -1431,7 +1453,7 @@
 			stream->copy_from_next_packets = 0;
 			stream->next_payload_size = 0;
 			stream->next_pck_flags = 0;
-			return 0;
+			return GF_FALSE;
 		}
 
 		if (stream->ifce->caps & GF_ESI_STREAM_IS_OVER) {
@@ -1450,7 +1472,7 @@
 		}
 	}
 	stream->pes_data_remain = stream->pes_data_len;
-	return 1;
+	return GF_TRUE;
 }
 
 static u32 gf_m2ts_stream_get_pes_header_length(GF_M2TS_Mux_Stream *stream)
@@ -1480,18 +1502,18 @@
 
 	/*next AU start in current PES and current AU began in previous PES, use next AU timing*/
 	if (stream->pck_offset && stream->copy_from_next_packets) {
-		use_pts = (stream->next_pck_flags & GF_ESI_DATA_HAS_CTS) ? 1 : 0;
-		use_dts = (stream->next_pck_flags & GF_ESI_DATA_HAS_DTS) ? 1 : 0;
+		use_pts = (stream->next_pck_flags & GF_ESI_DATA_HAS_CTS) ? GF_TRUE : GF_FALSE;
+		use_dts = (stream->next_pck_flags & GF_ESI_DATA_HAS_DTS) ? GF_TRUE : GF_FALSE;
 		dts = stream->next_pck_dts;
 		cts = stream->next_pck_cts;
 	}
-	/*we already sent the begining of the AU*/
+	/*we already sent the beginning of the AU*/
 	else if (stream->pck_offset) {
-		use_pts = use_dts = 0;
+		use_pts = use_dts = GF_FALSE;
 		dts = cts = 0;
 	} else {
-		use_pts = (stream->curr_pck.flags & GF_ESI_DATA_HAS_CTS) ? 1 : 0;
-		use_dts = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? 1 : 0;
+		use_pts = (stream->curr_pck.flags & GF_ESI_DATA_HAS_CTS) ? GF_TRUE : GF_FALSE;
+		use_dts = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? GF_TRUE : GF_FALSE;
 		dts = stream->curr_pck.dts;
 		cts = stream->curr_pck.cts;
 	}
@@ -1557,80 +1579,91 @@
 	assert(stream->pid);
 	bs = gf_bs_new(packet, 188, GF_BITSTREAM_WRITE);
 
-	hdr_len = gf_m2ts_stream_get_pes_header_length(stream);
-
-	adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
-	/*we may need two pass in case we first compute hdr len and TS payload size by considering
-	we concatenate next au start in this PES but finally couldn't do it when computing PES len
-	and AU alignment constraint of the stream*/
-	first_pass = 1;
-	while (1) {
-		if (hdr_len) {
-			if (first_pass)
-				gf_m2ts_stream_update_data_following(stream);
-			hdr_len = gf_m2ts_stream_get_pes_header_length(stream);
-		}
+	if (stream->pcr_only_mode) {
+		payload_length = 184 - 8;
+		payload_to_copy = padding_length = 0;
+		needs_pcr = GF_TRUE;
+		adaptation_field_control = GF_M2TS_ADAPTATION_ONLY;
+		hdr_len = 0;
+	} else {
+		hdr_len = gf_m2ts_stream_get_pes_header_length(stream);
 
 		adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
-		payload_length = 184 - hdr_len;
-		payload_to_copy = padding_length = 0;
-		needs_pcr = 0;
-
-		if (stream == stream->program->pcr) {
-			if (hdr_len)
-				needs_pcr = 1;
-			/*if we forced inserting PAT/PMT before new RAP, also insert PCR here*/
-			if (stream->program->mux->force_pat_pmt_state == GF_SEG_BOUNDARY_FORCE_PCR) {
-				stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_NONE;
-				needs_pcr = 1;
+
+		/*we may need two pass in case we first compute hdr len and TS payload size by considering
+		we concatenate next au start in this PES but finally couldn't do it when computing PES len
+		and AU alignment constraint of the stream*/
+		first_pass = GF_TRUE;
+		while (1) {
+			if (hdr_len) {
+				if (first_pass)
+					gf_m2ts_stream_update_data_following(stream);
+				hdr_len = gf_m2ts_stream_get_pes_header_length(stream);
 			}
 
-			if (!needs_pcr && (stream->program->mux->real_time || stream->program->mux->fixed_rate) ) {
-				u64 clock;
-				u32 diff;
-				if (stream->program->mux->fixed_rate) {
-					clock = stream->program->mux->tot_pck_sent - stream->program->nb_pck_last_pcr;
-					clock *= 1504*1000000;
-					clock /= stream->program->mux->bit_rate;
-					if (clock >= (stream->program->mux->pcr_update_ms-5) *1000) {
-						needs_pcr = 1;
-					}
+			adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
+			payload_length = 184 - hdr_len;
+			payload_to_copy = padding_length = 0;
+			needs_pcr = GF_FALSE;
+
+			if (stream == stream->program->pcr) {
+				if (hdr_len)
+					needs_pcr = GF_TRUE;
+				/*if we forced inserting PAT/PMT before new RAP, also insert PCR here*/
+				if (stream->program->mux->force_pat_pmt_state == GF_SEG_BOUNDARY_FORCE_PCR) {
+					stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_NONE;
+					needs_pcr = GF_TRUE;
 				}
 
-				if (!needs_pcr && stream->program->mux->real_time) {
-					clock = gf_sys_clock_high_res();
-					diff = (u32) (clock - stream->program->sys_clock_at_last_pcr);
+				if (!needs_pcr && (stream->program->mux->real_time || stream->program->mux->fixed_rate) ) {
+					u64 clock;
+					u32 diff;
+					if (stream->program->mux->fixed_rate) {
+						//check if PCR, if send at next packet, exceeds requested PCR update time
+						clock = 1 + stream->program->mux->tot_pck_sent - stream->program->nb_pck_last_pcr;
+						clock *= 1504*1000000;
+						clock /= stream->program->mux->bit_rate;
+						if (clock >= 500 + stream->program->mux->pcr_update_ms*1000) {
+							needs_pcr = GF_TRUE;
+						}
+					}
 
-					if (diff >= (stream->program->mux->pcr_update_ms-2) *1000) {
-						needs_pcr = 1;
+					if (!needs_pcr && stream->program->mux->real_time) {
+						clock = gf_sys_clock_high_res();
+						diff = (u32) (clock - stream->program->sys_clock_at_last_pcr);
+
+						if (diff >= 100 + stream->program->mux->pcr_update_ms*1000) {
+							needs_pcr = GF_TRUE;
+						}
 					}
 				}
 			}
-		}
 
-		if (needs_pcr) {
-			/*AF headers + PCR*/
-			payload_length -= 8;
-			adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
-		}
-		if (stream->curr_pck.mpeg2_af_descriptors) {
-			if (adaptation_field_control == GF_M2TS_ADAPTATION_NONE) {
-				payload_length -= 2; //AF header but no PCR
+			if (needs_pcr) {
+				/*AF headers + PCR*/
+				payload_length -= 8;
 				adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
 			}
-			payload_length -= 2 + stream->curr_pck.mpeg2_af_descriptors_size; //AF extension field and AF descriptor
-		}
-
-		if (hdr_len) {
-			assert(!stream->pes_data_remain);
-			if (! gf_m2ts_stream_compute_pes_length(stream, payload_length)) {
-				first_pass = 0;
-				continue;
+			//af descriptors are only inserted at the start of the pes for the time being
+			if (hdr_len && stream->curr_pck.mpeg2_af_descriptors) {
+				if (adaptation_field_control == GF_M2TS_ADAPTATION_NONE) {
+					payload_length -= 2; //AF header but no PCR
+					adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
+				}
+				payload_length -= 2 + stream->curr_pck.mpeg2_af_descriptors_size; //AF extension field and AF descriptor
 			}
 
-			assert(stream->pes_data_remain==stream->pes_data_len);
+			if (hdr_len) {
+				assert(!stream->pes_data_remain);
+				if (! gf_m2ts_stream_compute_pes_length(stream, payload_length)) {
+					first_pass = GF_FALSE;
+					continue;
+				}
+
+				assert(stream->pes_data_remain==stream->pes_data_len);
+			}
+			break;
 		}
-		break;
 	}
 
 	copy_next = stream->copy_from_next_packets;
@@ -1691,11 +1724,15 @@
 	gf_bs_write_int(bs,	0, 2); // scrambling
 	gf_bs_write_int(bs,	adaptation_field_control, 2); // we do not use adaptation field for sections
 	gf_bs_write_int(bs,	stream->continuity_counter, 4); // continuity counter
-	if (stream->continuity_counter < 15) stream->continuity_counter++;
-	else stream->continuity_counter=0;
+
+	//CC field shall not be incremented for if adaptation field only
+	if (adaptation_field_control != GF_M2TS_ADAPTATION_ONLY) {
+		if (stream->continuity_counter < 15) stream->continuity_counter++;
+		else stream->continuity_counter=0;
+	}
 
 	if (adaptation_field_control != GF_M2TS_ADAPTATION_NONE) {
-		Bool is_rap;
+		Bool is_rap = GF_FALSE;
 		u64 pcr = 0;
 		if (needs_pcr) {
 			u64 now = gf_sys_clock_high_res();
@@ -1703,15 +1740,23 @@
 
 			if (stream->program->mux->real_time || stream->program->mux->fixed_rate) {
 				u64 clock;
-				u32 diff = (s32) (now - stream->program->sys_clock_at_last_pcr);
-				if (diff > 5000 + stream->program->mux->pcr_update_ms*1000 ) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sending PCR %d us too late (PCR send rate %d ms)\n", (u32) (diff - stream->program->mux->pcr_update_ms*1000), stream->program->mux->pcr_update_ms ));
-				}
 				clock = stream->program->mux->tot_pck_sent - stream->program->nb_pck_last_pcr;
-				clock *= 1504*1000000;
+				clock *= 1504000000;
 				clock /= stream->program->mux->bit_rate;
 
-//				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PCR diff %d us (PCR send rate %d ms) - accuracy %d us\n", (s32) diff , stream->program->mux->pcr_update_ms, (s32) clock));
+				//allow 2 ms drift
+				if (clock > 2000 + stream->program->mux->pcr_update_ms*1000) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] PCR sent %d us later than requested PCR send rate %d ms\n", (s32) (clock - stream->program->mux->pcr_update_ms*1000), stream->program->mux->pcr_update_ms ));
+				}
+
+				if (stream->program->mux->real_time) {
+					u32 diff = (s32) (now - stream->program->sys_clock_at_last_pcr);
+					//since we currently only send the PCR when an AU is sent, it may happen that we exceed PCR the refresh rate depending in the target bitrate and frame rate.
+					//we only throw a warning when twiice the PCR refresh is exceeded
+					if (diff > 5000 + 2*stream->program->mux->pcr_update_ms*1000 ) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Sending PCR %d us too late (PCR send rate %d ms)\n", (u32) (diff - stream->program->mux->pcr_update_ms*1000), stream->program->mux->pcr_update_ms ));
+					}
+				}
 			}
 
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] Inserted PCR "LLD" (%d @90kHz) at mux time %d:%09d\n", pcr, (u32) (pcr/300), stream->program->mux->time.sec, stream->program->mux->time.nanosec ));
@@ -1721,8 +1766,8 @@
 			stream->program->last_dts = stream->curr_pck.dts;
 			stream->program->nb_pck_last_pcr = stream->program->mux->tot_pck_sent;
 		}
-		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ) ? 1 : 0;
-		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length, stream->curr_pck.mpeg2_af_descriptors, stream->curr_pck.mpeg2_af_descriptors_size);
+		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ) ? GF_TRUE : GF_FALSE;
+		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length, hdr_len ? stream->curr_pck.mpeg2_af_descriptors : NULL, hdr_len ? stream->curr_pck.mpeg2_af_descriptors_size : 0);
 
 		if (stream->curr_pck.mpeg2_af_descriptors) {
 			gf_free(stream->curr_pck.mpeg2_af_descriptors);
@@ -1738,6 +1783,11 @@
 	pos = (u32) gf_bs_get_position(bs);
 	gf_bs_del(bs);
 
+
+	if (adaptation_field_control == GF_M2TS_ADAPTATION_ONLY) {
+		return;
+	}
+
 	assert(stream->curr_pck.data_len - stream->pck_offset >= payload_to_copy);
 	memcpy(packet+pos, stream->curr_pck.data + stream->pck_offset, payload_to_copy);
 	stream->pck_offset += payload_to_copy;
@@ -1838,7 +1888,7 @@
 		}
 		else if (stream->program->mux->force_pat_pmt_state==GF_SEG_BOUNDARY_START) {
 			stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PAT;
-			stream->program->mux->force_pat = 1;
+			stream->program->mux->force_pat = GF_TRUE;
 		}
 	}
 	stream->bytes_since_last_time += 188;
@@ -1883,15 +1933,15 @@
 			stream->pck_reassembler->dts = esi_pck->dts;
 			stream->pck_reassembler->duration = esi_pck->duration;
 			if (esi_pck->mpeg2_af_descriptors) {
-				stream->pck_reassembler->mpeg2_af_descriptors = gf_realloc(stream->pck_reassembler->mpeg2_af_descriptors, sizeof(u8)* (stream->pck_reassembler->mpeg2_af_descriptors_size + esi_pck->mpeg2_af_descriptors_size) );
+				stream->pck_reassembler->mpeg2_af_descriptors = (char*)gf_realloc(stream->pck_reassembler->mpeg2_af_descriptors, sizeof(u8)* (stream->pck_reassembler->mpeg2_af_descriptors_size + esi_pck->mpeg2_af_descriptors_size) );
 				memcpy(stream->pck_reassembler->mpeg2_af_descriptors + stream->pck_reassembler->mpeg2_af_descriptors_size, esi_pck->mpeg2_af_descriptors, sizeof(u8)* esi_pck->mpeg2_af_descriptors_size );
 				stream->pck_reassembler->mpeg2_af_descriptors_size += esi_pck->mpeg2_af_descriptors_size;
 			}
 		}
 
-		stream->force_new = esi_pck->flags & GF_ESI_DATA_AU_END ? 1 : 0;
+		stream->force_new = esi_pck->flags & GF_ESI_DATA_AU_END ? GF_TRUE : GF_FALSE;
 
-		stream->pck_reassembler->data = gf_realloc(stream->pck_reassembler->data , sizeof(char)*(stream->pck_reassembler->data_len+esi_pck->data_len) );
+		stream->pck_reassembler->data = (char*)gf_realloc(stream->pck_reassembler->data , sizeof(char)*(stream->pck_reassembler->data_len+esi_pck->data_len) );
 		memcpy(stream->pck_reassembler->data + stream->pck_reassembler->data_len, esi_pck->data, esi_pck->data_len);
 		stream->pck_reassembler->data_len += esi_pck->data_len;
 
@@ -2034,7 +2084,7 @@
 	stream->loop_descriptors = gf_list_new();
 
 	if (program->streams) {
-		/*if PCR keep stream at the begining*/
+		/*if PCR keep stream at the beginning*/
 		if (is_pcr) {
 			stream->next = program->streams;
 			program->streams = stream;
@@ -2046,10 +2096,12 @@
 	} else {
 		program->streams = stream;
 	}
-	if (program->pmt) program->pmt->table_needs_update = 1;
+	if (program->pmt) program->pmt->table_needs_update = GF_TRUE;
 	stream->bit_rate = ifce->bit_rate;
 	stream->scheduling_priority = 1;
 
+	stream->force_single_au = (stream->program->mux->au_pes_mode == GF_M2TS_PACK_ALL) ? GF_FALSE : GF_TRUE;
+
 	switch (ifce->stream_type) {
 	case GF_STREAM_VISUAL:
 		/*just pick first valid stream_id in visual range*/
@@ -2057,7 +2109,7 @@
 		/*for video streams, prevent sending two frames start in one PES. This will
 		introduce more overhead at very low bitrates where such cases happen, but will ensure proper timing
 		of each frame*/
-		stream->prevent_two_au_start_in_pes = 1;
+		stream->prevent_two_au_start_in_pes = GF_TRUE;
 		switch (ifce->object_type_indication) {
 		case GPAC_OTI_VIDEO_MPEG4_PART2:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG4;
@@ -2088,7 +2140,7 @@
 			stream->min_bytes_copy_from_next = 12;
 			gf_m2ts_stream_add_hierarchy_descriptor(stream);
 			//force by default with SHVC since we don't have any delimiter / layer yet
-			stream->program->mux->one_au_per_pes = 1;
+			stream->force_single_au = GF_TRUE;
 			break;
 		case GPAC_OTI_VIDEO_MPEG1:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG1;
@@ -2105,6 +2157,7 @@
 		case GPAC_OTI_IMAGE_JPEG:
 		case GPAC_OTI_IMAGE_PNG:
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_PES;
+			stream->force_single_au = GF_TRUE;
 			stream->mpeg2_stream_id = 0xFA;
 			gf_m2ts_stream_set_default_slconfig(stream);
 			break;
@@ -2113,6 +2166,8 @@
 		}
 		break;
 	case GF_STREAM_AUDIO:
+		//override default packing for audio
+		stream->force_single_au = (stream->program->mux->au_pes_mode == GF_M2TS_PACK_NONE) ? GF_TRUE : GF_FALSE;
 		switch (ifce->object_type_indication) {
 		case GPAC_OTI_AUDIO_MPEG1:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_MPEG1;
@@ -2143,6 +2198,7 @@
 		gf_m2ts_stream_set_default_slconfig(stream);
 		if (force_pes) {
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_PES;
+			stream->force_single_au = GF_TRUE;
 		} else {
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_SECTIONS;
 		}
@@ -2154,6 +2210,7 @@
 
 		if (force_pes) {
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_PES;
+			stream->force_single_au = GF_TRUE;
 		} else {
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_SECTIONS;
 		}
@@ -2170,6 +2227,7 @@
 		if (program->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL) {
 			if (stream->mpeg2_stream_type != GF_M2TS_SYSTEMS_MPEG4_SECTIONS) {
 				stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_PES;
+				stream->force_single_au = GF_TRUE;
 				stream->mpeg2_stream_id = 0xFA;/*ISO/IEC14496-1_SL-packetized_stream*/
 				gf_m2ts_stream_set_default_slconfig(stream);
 			}
@@ -2226,8 +2284,8 @@
 	}
 	program->pmt = gf_m2ts_stream_new(pmt_pid);
 	program->pmt->program = program;
-	program->pmt->table_needs_update = 1;
-	muxer->pat->table_needs_update = 1;
+	program->pmt->table_needs_update = GF_TRUE;
+	muxer->pat->table_needs_update = GF_TRUE;
 	program->pmt->process = gf_m2ts_stream_process_pmt;
 	program->pmt->refresh_rate_ms = pmt_refresh_rate ? pmt_refresh_rate : (u32) -1;
 	return program;
@@ -2242,7 +2300,7 @@
 	if (program->provider) gf_free(program->provider);
 	program->provider = provider_name ? gf_strdup(provider_name) : NULL;
 
-	if (program->mux->sdt) program->mux->sdt->table_needs_update = 1;
+	if (program->mux->sdt) program->mux->sdt->table_needs_update = GF_TRUE;
 }
 
 GF_EXPORT
@@ -2257,7 +2315,7 @@
 	muxer->real_time = real_time;
 	muxer->bit_rate = mux_rate;
 	muxer->init_pcr_value = 0;
-	if (mux_rate) muxer->fixed_rate = 1;
+	if (mux_rate) muxer->fixed_rate = GF_TRUE;
 
 	/*format NULL packet*/
 	bs = gf_bs_new(muxer->null_pck, 188, GF_BITSTREAM_WRITE);
@@ -2270,7 +2328,7 @@
 	gf_bs_write_int(bs,	1, 2);
 	gf_bs_write_int(bs,	0, 4);
 	gf_bs_del(bs);
-	gf_rand_init(0);
+	gf_rand_init(GF_FALSE);
 	muxer->pcr_update_ms = 100;
 	return muxer;
 }
@@ -2283,7 +2341,7 @@
 		mux->sdt->process = gf_m2ts_stream_process_sdt;
 		mux->sdt->refresh_rate_ms = refresh_rate_ms;
 	}
-	mux->sdt->table_needs_update = 1;
+	mux->sdt->table_needs_update = GF_TRUE;
 	return;
 }
 
@@ -2317,7 +2375,7 @@
 	if (st->mx) gf_mx_del(st->mx);
 	if (st->loop_descriptors) {
 		while (gf_list_count(st->loop_descriptors) ) {
-			GF_M2TSDescriptor *desc = gf_list_last(st->loop_descriptors);
+			GF_M2TSDescriptor *desc = (GF_M2TSDescriptor*)gf_list_last(st->loop_descriptors);
 			gf_list_rem_last(st->loop_descriptors);
 			if (desc->data) gf_free(desc->data);
 			gf_free(desc);
@@ -2336,7 +2394,7 @@
 	}
 	if (prog->loop_descriptors) {
 		while (gf_list_count(prog->loop_descriptors) ) {
-			GF_M2TSDescriptor *desc = gf_list_last(prog->loop_descriptors);
+			GF_M2TSDescriptor *desc = (GF_M2TSDescriptor*)gf_list_last(prog->loop_descriptors);
 			gf_list_rem_last(prog->loop_descriptors);
 			if (desc->data) gf_free(desc->data);
 			gf_free(desc);
@@ -2427,10 +2485,10 @@
 }
 
 GF_EXPORT
-GF_Err gf_m2ts_mux_use_single_au_pes_mode(GF_M2TS_Mux *muxer, Bool strict_au_pes_mode)
+GF_Err gf_m2ts_mux_use_single_au_pes_mode(GF_M2TS_Mux *muxer, GF_M2TS_PackMode au_pes_mode)
 {
 	if (!muxer) return GF_BAD_PARAM;
-	muxer->one_au_per_pes = strict_au_pes_mode ? 1 : 0;
+	muxer->au_pes_mode = au_pes_mode;
 	return GF_OK;
 }
 
@@ -2443,6 +2501,15 @@
 }
 
 GF_EXPORT
+GF_Err gf_m2ts_mux_enable_pcr_only_packets(GF_M2TS_Mux *muxer, Bool enable_forced_pcr)
+{
+	if (!muxer) return GF_BAD_PARAM;
+	muxer->enable_forced_pcr = enable_forced_pcr;
+	return GF_OK;
+}
+
+
+GF_EXPORT
 const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status, u32 *usec_till_next)
 {
 	GF_M2TS_Mux_Program *program;
@@ -2452,8 +2519,8 @@
 	u64 now_us;
 	char *ret;
 	u32 res, highest_priority;
-	Bool flush_all_pes = 0;
-	Bool check_max_time = 0;
+	Bool flush_all_pes = GF_FALSE;
+	Bool check_max_time = GF_FALSE;
 
 	nb_streams = nb_streams_done = 0;
 	*status = GF_M2TS_STATE_IDLE;
@@ -2494,8 +2561,8 @@
 
 	/*bitrate have changed*/
 	if (muxer->needs_reconfig) {
-		gf_m2ts_mux_update_config(muxer, 0);
-		muxer->needs_reconfig = 0;
+		gf_m2ts_mux_update_config(muxer, GF_FALSE);
+		muxer->needs_reconfig = GF_FALSE;
 	}
 
 	if (muxer->flush_pes_at_rap && muxer->force_pat) {
@@ -2504,7 +2571,7 @@
 			stream = program->streams;
 			while (stream) {
 				if (stream->pes_data_remain) {
-					flush_all_pes = 1;
+					flush_all_pes = GF_TRUE;
 					break;
 				}
 				stream = stream->next;
@@ -2525,7 +2592,7 @@
 			time = muxer->pat->time;
 			stream_to_process = muxer->pat;
 			if (muxer->force_pat) {
-				muxer->force_pat = 0;
+				muxer->force_pat = GF_FALSE;
 				muxer->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PMT;
 			}
 			/*force sending the PAT regardless of other streams*/
@@ -2563,7 +2630,7 @@
 		if (!muxer->real_time) {
 			time.sec = 0xFFFFFFFF;
 		} else {
-			check_max_time = 1;
+			check_max_time = GF_TRUE;
 		}
 	}

v0.5.2.tar.gz/src/media_tools/m3u8.c -> v0.6.1.tar.gz/src/media_tools/m3u8.c Changed

@@ -29,7 +29,6 @@
 #include <gpac/network.h>
 
 
-
 /********** playlist_element **********/
 
 GF_Err playlist_element_del(PlaylistElement * e);
@@ -75,6 +74,11 @@
 		gf_free(e->video_group);
 		e->video_group = NULL;
 	}
+	if (e->key_uri) {
+		gf_free(e->key_uri);
+		e->key_uri = NULL;
+	}
+	memset(e->key_iv, 0, sizeof(bin128) );
 	assert(e->url);
 	gf_free(e->url);
 	e->url = NULL;
@@ -99,7 +103,7 @@
 * This element can be either a playlist of a stream according to first parameter.
 * \return NULL if element could not be created. Elements will be deleted recursively.
 */
-static PlaylistElement* playlist_element_new(PlaylistElementType element_type, const char *url, const char *title, const char *codecs, const char *language, double duration_info, u64 byte_range_start, u64 byte_range_end) {
+static PlaylistElement* playlist_element_new(PlaylistElementType element_type, const char *url, const char *title, const char *codecs, const char *language, double duration_info, u64 byte_range_start, u64 byte_range_end, PlaylistElementDRMMethod drm_method, const char *key_uri, const unsigned char *iv) {
 	PlaylistElement *e = gf_malloc(sizeof(PlaylistElement));
 	memset(e, 0, sizeof(PlaylistElement));
 	if (e == NULL)
@@ -111,6 +115,10 @@
 	e->title = (title ? gf_strdup(title) : NULL);
 	e->codecs = (codecs ? gf_strdup(codecs) : NULL);
 	e->language = (language ? gf_strdup(language) : NULL);
+	e->drm_method = drm_method;
+	e->key_uri = (key_uri ? gf_strdup(key_uri) : NULL);
+	memcpy(e->key_iv, iv, sizeof(bin128));
+
 	assert(url);
 	e->url = gf_strdup(url);
 	e->bandwidth = 0;
@@ -135,12 +143,16 @@
 				gf_free(e->video_group);
 			if (e->url)
 				gf_free(e->url);
+			if (e->key_uri)
+				gf_free(e->key_uri);
 			e->url = NULL;
 			e->title = NULL;
 			e->codecs = NULL;
 			e->language = NULL;
 			e->audio_group = NULL;
 			e->video_group = NULL;
+			e->key_uri = NULL;
+			memset(e->key_iv, 0, sizeof(bin128));
 			gf_free(e);
 			return NULL;
 		}
@@ -218,7 +230,7 @@
 	MEDIA_TYPE_##type + \
 	string2num(group_id) \
 	) \
-
+ 
 static Bool safe_start_equals(const char *attribute, const char *line) {
 	size_t len, atlen;
 	if (line == NULL)
@@ -251,22 +263,22 @@
 	int version;
 	int compatibility_version; /*compute version required by the M3U8 content*/
 	Bool is_master_playlist;
+	Bool is_media_segment;
 	Bool is_playlist_ended;
 	u64 byte_range_start, byte_range_end;
+	PlaylistElementDRMMethod key_method;
+	char *key_url;
+	bin128 key_iv;
 } s_accumulated_attributes;
 
-static void reset_attributes(s_accumulated_attributes *attributes) {
+static void reset_attributes(s_accumulated_attributes *attributes)
+{
 	memset(attributes, 0, sizeof(s_accumulated_attributes));
-	attributes->bandwidth = 0;
-	attributes->duration_in_seconds = 0;
-	attributes->target_duration_in_seconds = 0;
 	attributes->type = MEDIA_TYPE_UNKNOWN;
-	attributes->is_master_playlist = GF_FALSE;
-	attributes->is_playlist_ended = GF_FALSE;
 	attributes->min_media_sequence = 1;
-	attributes->current_media_seq = 0;
 	attributes->version = 1;
 	attributes->compatibility_version = 0;
+	attributes->key_method = DRM_NONE;
 }
 
 static char** extract_attributes(const char *name, const char *line, const int num_attributes) {
@@ -375,6 +387,7 @@
 	if (ret) {
 		M3U8_COMPATIBILITY_VERSION(1);
 		/* #EXTINF:<duration>,<title> */
+		attributes->is_media_segment = GF_TRUE;
 		if (ret[0]) {
 			double_value = strtod(ret[0], &end_ptr);
 			if (end_ptr != ret[0]) {
@@ -398,6 +411,13 @@
 			if (strncmp(ret[0]+method_len, "NONE", 4)) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] EXT-X-KEY not supported.\n", line));
 			}
+			attributes->key_method = DRM_AES_128;
+			if (ret[1] != NULL && safe_start_equals("URI=\"", ret[1])) {
+				int_value = (u32) strlen(ret[1]);
+				if (ret[1][int_value-1] == '"') {
+					attributes->key_url = gf_strdup(&(ret[1][4]));
+				}
+			}
 		}
 		M3U8_COMPATIBILITY_VERSION(1);
 		return ret;
@@ -576,9 +596,9 @@
 			attributes->mediaURL = NULL;
 		}
 		if ((attributes->type == MEDIA_TYPE_AUDIO && !attributes->group.audio)
-			|| (attributes->type == MEDIA_TYPE_VIDEO && !attributes->group.video)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: missing GROUP-ID attribute. Ignoring the line.\n"));
-				return NULL;
+		 || (attributes->type == MEDIA_TYPE_VIDEO && !attributes->group.video)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: missing GROUP-ID attribute. Ignoring the line.\n"));
+			return NULL;
 		}
 		if (!attributes->stream_id) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: no ID was computed. Check previous errors. Ignoring the line.\n"));
@@ -613,12 +633,12 @@
 
 /********** master_playlist **********/
 
-GF_Err gf_m3u8_master_playlist_del(MasterPlaylist *playlist) {
-	if (playlist == NULL)
+GF_Err gf_m3u8_master_playlist_del(MasterPlaylist **playlist) {
+	if ((playlist == NULL) || (*playlist == NULL))
 		return GF_OK;
-	assert(playlist->streams);
-	while (gf_list_count(playlist->streams)) {
-		Stream *p = gf_list_get(playlist->streams, 0);
+	assert((*playlist)->streams);
+	while (gf_list_count((*playlist)->streams)) {
+		Stream *p = gf_list_get((*playlist)->streams, 0);
 		assert(p);
 		while (gf_list_count(p->variants)) {
 			PlaylistElement *pl = gf_list_get(p->variants, 0);
@@ -629,11 +649,12 @@
 		gf_list_del(p->variants);
 		p->variants = NULL;
 		stream_del(p);
-		gf_list_rem(playlist->streams, 0);
+		gf_list_rem((*playlist)->streams, 0);
 	}
-	gf_list_del(playlist->streams);
-	playlist->streams = NULL;
-	gf_free(playlist);
+	gf_list_del((*playlist)->streams);
+	(*playlist)->streams = NULL;
+	gf_free(*playlist);
+	*playlist = NULL;
 
 	return GF_OK;
 }
@@ -668,46 +689,27 @@
 
 GF_Err declare_sub_playlist(char *currentLine, const char *baseURL, s_accumulated_attributes *attribs, PlaylistElement *sub_playlist, MasterPlaylist **playlist, Stream *in_stream)
 {
-	int i;
+	u32 i, iv, count;
 
-	char *fullURL = strstr(currentLine, "?");
-	if (fullURL) {
-		/*some URL contains garbage after the filename*/
-		size_t len = fullURL-currentLine;
-		fullURL = gf_malloc(len+1);
-		strncpy(fullURL, currentLine, len);
-		fullURL[len] = '\0';
-	} else {
-		fullURL = currentLine;
+	char *fullURL = currentLine;
+
+	if (attribs->is_master_playlist && attribs->is_media_segment) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Media segment tag MUST NOT appear in a Master Playlist\n"));
+		return GF_BAD_PARAM;
 	}
-	if (gf_url_is_local(fullURL)) {
-		/*
-		if (gf_url_is_local(baseURL)){
-		int num_chars = -1;
-		if (baseURL[strlen(baseURL)-1] == '/'){
-		num_chars = gf_asprintf(&fullURL, "%s%s", baseURL, currentLine);
-		} else {
-		num_chars = gf_asprintf(&fullURL, "%s/%s", baseURL, currentLine);
-		}
-		if (num_chars < 0 || fullURL == NULL){
-		gf_m3u8_master_playlist_del(*playlist);
-		playlist = NULL;
-		return GF_OUT_OF_MEM;
-		}
-		} else */ {
-			char *currFullURL = fullURL;
-			fullURL = gf_url_concatenate(baseURL, currFullURL);
-			if (currFullURL != currentLine)
-				gf_free(currFullURL);
-		}
 
+	if (gf_url_is_local(fullURL)) {
+		fullURL = gf_url_concatenate(baseURL, fullURL);
 		assert(fullURL);
 	}
-	
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] declaring sub-playlist %s\n", fullURL));
-	
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] declaring %s %s\n", attribs->is_master_playlist ? "sub-playlist" : "media segment", fullURL));
+
+	memset(attribs->key_iv, 0, sizeof(bin128) );
+	iv = gf_htonl(attribs->current_media_seq);
+	memcpy(attribs->key_iv + 12, (const void *) &iv, sizeof(iv));
+
 	{
-		u32 count;
 		PlaylistElement *curr_playlist = sub_playlist;
 		/* First, we have to find the matching stream */
 		Stream *stream = in_stream;
@@ -718,8 +720,7 @@
 			stream = stream_new(attribs->stream_id);
 			if (stream == NULL) {
 				/* OUT of memory */
-				gf_m3u8_master_playlist_del(*playlist);
-				playlist = NULL;
+				gf_m3u8_master_playlist_del(playlist);
 				return GF_OUT_OF_MEM;
 			}
 			gf_list_add((*playlist)->streams, stream);
@@ -739,7 +740,8 @@
 				assert(i_playlist_element);
 				if (stream->stream_id < MEDIA_TYPE_AUDIO) {
 					/* regular stream (EXT-X-STREAM-INF) */
-					if (i_playlist_element->bandwidth == attribs->bandwidth) {
+					// Two stream are identical only if they have the same URL
+					if (attribs->is_media_segment || !strcmp(i_playlist_element->url, fullURL)) {
 						curr_playlist = i_playlist_element;
 						break;
 					}
@@ -757,17 +759,17 @@
 				assert(0);
 			}
 			curr_playlist = playlist_element_new(
-				TYPE_UNKNOWN,
-				fullURL,
-				attribs->title,
-				attribs->codecs,
-				attribs->language,
-				attribs->duration_in_seconds,
-				attribs->byte_range_start, attribs->byte_range_end);
+			 TYPE_PLAYLIST,
+			 fullURL,
+			 attribs->title,
+			 attribs->codecs,
+			 attribs->language,
+			 attribs->duration_in_seconds,
+			 attribs->byte_range_start, attribs->byte_range_end,
+			 attribs->key_method, attribs->key_url, attribs->key_iv);
 			if (curr_playlist == NULL) {
 				/* OUT of memory */
-				gf_m3u8_master_playlist_del(*playlist);
-				playlist = NULL;
+				gf_m3u8_master_playlist_del(playlist);
 				return GF_OUT_OF_MEM;
 			}
 			assert(fullURL);
@@ -797,17 +799,18 @@
 				PlaylistElement *subElement;
 				assert(baseURL);
 				curr_playlist = playlist_element_new(
-					TYPE_PLAYLIST,
-					baseURL,
-					attribs->title,
-					attribs->codecs,
-					attribs->language,
-					attribs->duration_in_seconds,
-					attribs->byte_range_start, attribs->byte_range_end);
+				 TYPE_PLAYLIST,
+				 baseURL,
+				 attribs->title,
+				 attribs->codecs,
+				 attribs->language,
+				 attribs->duration_in_seconds,
+				 attribs->byte_range_start, attribs->byte_range_end,
+				 attribs->key_method, attribs->key_url,
+				 attribs->key_iv);
 				if (curr_playlist == NULL) {
 					/* OUT of memory */
-					gf_m3u8_master_playlist_del(*playlist);
-					playlist = NULL;
+					gf_m3u8_master_playlist_del(playlist);
 					return GF_OUT_OF_MEM;
 				}
 				assert(curr_playlist->element.playlist.elements);
@@ -816,17 +819,18 @@
 				curr_playlist->title = NULL;
 				curr_playlist->codecs = NULL;
 				subElement = playlist_element_new(
-					TYPE_UNKNOWN,
-					fullURL,
-					attribs->title,
-					attribs->codecs,
-					attribs->language,
-					attribs->duration_in_seconds,
-					attribs->byte_range_start, attribs->byte_range_end);
+				 TYPE_UNKNOWN,
+				 fullURL,
+				 attribs->title,
+				 attribs->codecs,
+				 attribs->language,
+				 attribs->duration_in_seconds,
+				 attribs->byte_range_start, attribs->byte_range_end,
+				 attribs->key_method, attribs->key_url,
+				 attribs->key_iv);
 				if (subElement == NULL) {
-					gf_m3u8_master_playlist_del(*playlist);
+					gf_m3u8_master_playlist_del(playlist);
 					playlist_element_del(curr_playlist);
-					playlist = NULL;
 					return GF_OUT_OF_MEM;
 				}
 				gf_list_add(curr_playlist->element.playlist.elements, subElement);
@@ -837,22 +841,23 @@
 				assert(curr_playlist);
 			} else {
 				PlaylistElement *subElement = playlist_element_new(
-					TYPE_UNKNOWN,
-					fullURL,
-					attribs->title,
-					attribs->codecs,
-					attribs->language,
-					attribs->duration_in_seconds,
-					attribs->byte_range_start, attribs->byte_range_end);
+				 TYPE_UNKNOWN,
+				 fullURL,
+				 attribs->title,
+				 attribs->codecs,
+				 attribs->language,
+				 attribs->duration_in_seconds,
+				 attribs->byte_range_start, attribs->byte_range_end,
+				 attribs->key_method, attribs->key_url,
+				 attribs->key_iv);
 				if (curr_playlist->element_type != TYPE_PLAYLIST) {
 					curr_playlist->element_type = TYPE_PLAYLIST;
 					if (!curr_playlist->element.playlist.elements)
 						curr_playlist->element.playlist.elements = gf_list_new();
 				}
 				if (subElement == NULL) {
-					gf_m3u8_master_playlist_del(*playlist);
+					gf_m3u8_master_playlist_del(playlist);
 					playlist_element_del(curr_playlist);
-					playlist = NULL;
 					return GF_OUT_OF_MEM;
 				}
 				gf_list_add(curr_playlist->element.playlist.elements, subElement);
@@ -875,7 +880,7 @@
 			}
 		}
 		curr_playlist->element.playlist.media_seq_min = attribs->min_media_sequence;
-		curr_playlist->element.playlist.media_seq_max = attribs->current_media_seq++;
+		curr_playlist->element.playlist.media_seq_max = attribs->current_media_seq;
 		if (attribs->bandwidth > 1)
 			curr_playlist->bandwidth = attribs->bandwidth;
 		if (attribs->is_playlist_ended)
@@ -927,7 +932,7 @@
 			return GF_SERVICE_ERROR;
 		}
 	} else {
-		f = gf_f64_open(file, "rt");
+		f = gf_fopen(file, "rt");
 		if (!f) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot open m3u8 file %s for reading\n", file));
 			return GF_SERVICE_ERROR;
@@ -936,7 +941,7 @@
 	if (*playlist == NULL) {
 		*playlist = master_playlist_new();
 		if (!(*playlist)) {
-			if (f) fclose(f);
+			if (f) gf_fclose(f);
 			return GF_OUT_OF_MEM;
 		}
 	}
@@ -953,10 +958,12 @@
 			if (m3u8pos >= m3u8_size)
 				break;
 			while (1) {
+				assert(__idx < M3U8_BUF_SIZE);
+
 				currentLine[__idx] = m3u8_payload[m3u8pos];
 				__idx++;
 				m3u8pos++;
-				if ((currentLine[__idx-1]=='\n') || (currentLine[__idx-1]=='\r')) {
+				if ((currentLine[__idx-1]=='\n') || (currentLine[__idx-1]=='\r') || (m3u8pos >= m3u8_size)) {
 					currentLine[__idx]=0;
 					break;
 				}
@@ -975,8 +982,8 @@
 		if (currentLineNumber == 1) {
 			/* Playlist MUST start with #EXTM3U */
 			if (len < 7 || (strncmp("#EXTM3U", currentLine, 7) != 0)) {
-				fclose(f);
-				gf_m3u8_master_playlist_del(*playlist);
+				gf_fclose(f);
+				gf_m3u8_master_playlist_del(playlist);
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Failed to parse M3U8 File, it should start with #EXTM3U, but was : %s\n", currentLine));
 				return GF_STREAM_NOT_FOUND;
 			}
@@ -1009,20 +1016,28 @@
 					gf_free(attribs.mediaURL);
 					attribs.mediaURL = NULL;
 					if (e != GF_OK) {
-						if (f) fclose(f);
+						if (f) gf_fclose(f);
 						return e;
 					}
 				}
 			}
 		} else {
+			/*file encountered: sub-playlist or segment*/
 			GF_Err e = declare_sub_playlist(currentLine, baseURL, &attribs, sub_playlist, playlist, in_stream);
+			attribs.current_media_seq += 1;
 			if (e != GF_OK) {
-				if (f) fclose(f);
+				if (f) gf_fclose(f);
 				return e;
 			}
+
+			//do not reset all attributes but at least set width/height/codecs to NULL, otherwise we may miss detection
+			//of audio-only playlists in av sequences
+			//reset_attributes(&attribs);
+			attribs.width = attribs.height = 0;
+			attribs.codecs = NULL;
 		}
 	}
-	if (f) fclose(f);
+	if (f) gf_fclose(f);
 
 	for (i=0; i<(int)gf_list_count((*playlist)->streams); i++) {
 		u32 j;
@@ -1035,8 +1050,10 @@
 					prog->computed_duration = ple->element.playlist.computed_duration;
 			}
 		}
-	}
 
+	}
+	if (attribs.key_url)
+		gf_free(attribs.key_url);
 	if (attribs.version < attribs.compatibility_version) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Version %d specified but tags from version %d detected\n", attribs.version, attribs.compatibility_version));
 	}

v0.5.2.tar.gz/src/media_tools/media_export.c -> v0.6.1.tar.gz/src/media_tools/media_export.c Changed

@@ -64,6 +64,8 @@
 #endif
 	return e;
 }
+
+#ifndef GPAC_DISABLE_AV_PARSERS
 /*that's very very crude, we only support vorbis & theora in MP4 - this will need cleanup as soon as possible*/
 static GF_Err gf_dump_to_ogg(GF_MediaExporter *dumper, char *szName, u32 track)
 {
@@ -88,7 +90,7 @@
 	op.b_o_s = 1;
 	op.e_o_s = 0;
 
-	out = szName ? gf_f64_open(szName, "wb") : stdout;
+	out = szName ? gf_fopen(szName, "wb") : stdout;
 	if (!out) return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 
 	theora_kgs = 0;
@@ -180,10 +182,11 @@
 		gf_fwrite(og.body, 1, og.body_len, out);
 	}
 	ogg_stream_clear(&os);
-	if (szName) fclose(out);
+	if (szName) gf_fclose(out);
 	return GF_OK;
 #endif
 }
+#endif
 
 GF_Err gf_export_hint(GF_MediaExporter *dumper)
 {
@@ -218,9 +221,9 @@
 		}
 		if (e) return gf_export_message(dumper, e, "Error fetching hint packet %d", i);
 		sprintf(szName, "%s_pck_%04d.%s", dumper->out_name, i, gf_4cc_to_str(m_stype));
-		out = gf_f64_open(szName, "wb");
+		out = gf_fopen(szName, "wb");
 		gf_fwrite(pck, size, 1, out);
-		fclose(out);
+		gf_fclose(out);
 		gf_free(pck);
 		i++;
 		if (count) gf_set_progress("Hint Export", sn, count);
@@ -418,6 +421,18 @@
 	} else if (m_stype==GF_ISOM_SUBTYPE_STXT) {
 		gf_export_message(dumper, GF_OK, "Extracting Simple Text sample%s", szNum);
 		strcpy(szEXT, ".txt");
+	} else if (m_stype==GF_ISOM_SUBTYPE_METT) {
+		gf_export_message(dumper, GF_OK, "Extracting Metadata Text sample%s", szNum);
+		strcpy(szEXT, ".txt");
+	} else if (m_stype==GF_ISOM_SUBTYPE_SBTT) {
+		gf_export_message(dumper, GF_OK, "Extracting Subtitle Text sample%s", szNum);
+		strcpy(szEXT, ".txt");
+	} else if (m_stype==GF_ISOM_SUBTYPE_METX) {
+		gf_export_message(dumper, GF_OK, "Extracting Metadata XML sample%s", szNum);
+		strcpy(szEXT, ".xml");
+	} else if (m_stype==GF_ISOM_SUBTYPE_STPP) {
+		gf_export_message(dumper, GF_OK, "Extracting Subtitle XML sample%s", szNum);
+		strcpy(szEXT, ".xml");
 	} else if (m_type==GF_ISOM_MEDIA_HINT) {
 		return gf_export_hint(dumper);
 	} else if (m_stype==GF_4CC('m','j','p','2')) {
@@ -463,7 +478,7 @@
 		} else {
 			sprintf(szName, "%s_%d%s", dumper->out_name, dumper->sample_num, szEXT);
 		}
-		out = is_stdout ? stdout : gf_f64_open(szName, "wb");
+		out = is_stdout ? stdout : gf_fopen(szName, "wb");
 		bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
 		if (is_mj2k)
 			write_jp2_file(bs, samp->data, samp->dataLength, dsi, dsi_size);
@@ -487,7 +502,7 @@
 		gf_bs_del(bs);
 
 		if (!is_stdout)
-			fclose(out);
+			gf_fclose(out);
 		if (dsi)
 			gf_free(dsi);
 		return GF_OK;
@@ -514,7 +529,7 @@
 			}
 		}
 
-		out = is_stdout ? stdout : gf_f64_open(szName, "wb");
+		out = is_stdout ? stdout : gf_fopen(szName, "wb");
 		bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
 		if (dsi) gf_bs_write_data(bs, dsi, dsi_size);
 		if (is_mj2k)
@@ -539,13 +554,14 @@
 		gf_set_progress("Media Export", i+1, count);
 		gf_bs_del(bs);
 		if (!is_stdout)
-			fclose(out);
+			gf_fclose(out);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
 	}
 	if (dsi) gf_free(dsi);
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_AV_PARSERS
 static GF_Err gf_dump_to_vobsub(GF_MediaExporter *dumper, char *szName, u32 track, char *dsi, u32 dsiSize)
 {
 #ifndef GPAC_DISABLE_VOBSUB
@@ -560,7 +576,7 @@
 	}
 
 	/* Create an idx file */
-	fidx = gf_f64_open(szName, "w");
+	fidx = gf_fopen(szName, "w");
 	if (!fidx) {
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
@@ -568,9 +584,9 @@
 	/* Create a sub file */
 	vobsub_trim_ext(szName);
 	szName = strcat(szName, ".sub");
-	fsub = gf_f64_open(szName, "wb");
+	fsub = gf_fopen(szName, "wb");
 	if (!fsub) {
-		fclose(fidx);
+		gf_fclose(fidx);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
 
@@ -637,14 +653,14 @@
 		mm = (u32)(dts % 60);
 		hh = (u32)(dts / 60);
 #if defined(WIN32) && !defined(__GNUC__)
-		fprintf(fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09lx\n", hh, mm, ss, ms, gf_f64_tell(fsub));
+		fprintf(fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09I64x\n", hh, mm, ss, ms, gf_ftell(fsub));
 #else
-		fprintf(fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: " LLXPAD("09") "\n", hh, mm, ss, ms, gf_f64_tell(fsub));
+		fprintf(fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: " LLXPAD("09") "\n", hh, mm, ss, ms, gf_ftell(fsub));
 #endif
 		if (vobsub_packetize_subpicture(fsub, samp->DTS, samp->data, samp->dataLength) != GF_OK) {
 			gf_isom_sample_del(&samp);
-			fclose(fsub);
-			fclose(fidx);
+			gf_fclose(fsub);
+			gf_fclose(fidx);
 			return gf_export_message(dumper, GF_IO_ERR, "Unable packetize subpicture into file %s\n", szName);
 		}
 
@@ -661,8 +677,8 @@
 		gf_isom_sample_del(&samp);
 	}
 
-	fclose(fsub);
-	fclose(fidx);
+	gf_fclose(fsub);
+	gf_fclose(fidx);
 
 	return GF_OK;
 #else
@@ -675,6 +691,9 @@
 static const char *QCP_EVRC_GUID = "\x8D\xD4\x89\xE6\x76\x90\xB5\x46\x91\xEF\x73\x6A\x51\x00\xCE\xB4";
 static const char *QCP_SMV_GUID = "\x75\x2B\x7C\x8D\x97\xA7\x46\xED\x98\x5E\xD5\x3C\x8C\xC7\x5F\x84";
 
+#endif // GPAC_DISABLE_AV_PARSERS
+
+
 #define DUMP_AVCPARAM(_params) \
 		count = gf_list_count(_params); \
 		for (i=0;i<count;i++) { \
@@ -711,7 +730,7 @@
 	GF_AVCConfig *avccfg, *svccfg;
 	GF_HEVCConfig *hevccfg, *shvccfg;
 	GF_M4ADecSpecInfo a_cfg;
-	char *stxtcfg;
+	const char *stxtcfg;
 	GF_BitStream *bs;
 	u32 track, i, di, count, m_type, m_stype, dsi_size, qcp_type;
 	Bool is_ogg, has_qcp_pad, is_vobsub;
@@ -759,7 +778,7 @@
 		if (strrchr(lastPathPart , '.')==NULL) {
 			add_ext = GF_TRUE;
 		} else {
-			add_ext = GF_FALSE;
+			add_ext = (dumper->flags & GF_EXPORT_FORCE_EXT) ? GF_TRUE : GF_FALSE;
 		}
 	} else {
 		add_ext = GF_FALSE;
@@ -1014,25 +1033,32 @@
 			is_webvtt = GF_TRUE;
 			if (add_ext)
 				strcat(szName, ".vtt");
-		} else if (m_stype==GF_ISOM_SUBTYPE_STXT) {
-			gf_export_message(dumper, GF_OK, "Extracting Simple Text Stream");
+		} else if ((m_stype==GF_ISOM_SUBTYPE_STXT) || (m_stype==GF_ISOM_SUBTYPE_METT)) {
+			const char *mime;
+			const char *encoding;
+			gf_export_message(dumper, GF_OK, "Extracting %s Stream", (m_stype==GF_ISOM_SUBTYPE_STXT) ? "Simple Text" : "Text-based Metadata");
+			gf_isom_stxt_get_description(dumper->file, track, 1, &mime, &encoding, &stxtcfg);
 			if (add_ext) {
-				char *mime;
-				if (gf_isom_stxt_info_get(dumper->file, track, 1, &mime, &stxtcfg) == GF_OK) {
-					if (mime && !strcmp(mime, "image/svg+xml")) {
-						strcat(szName, ".svg");
-					} else {
-						strcat(szName, ".txt");
-					}
+				if (mime && !strcmp(mime, "image/svg+xml")) {
+					gf_export_message(dumper, GF_OK, "as SVG file");
+					strcat(szName, ".svg");
 				} else {
 					strcat(szName, ".txt");
 				}
 			}
+		} else if (m_stype==GF_ISOM_SUBTYPE_SBTT) {
+			gf_export_message(dumper, GF_OK, "Extracting Text-based Subtitle Stream");
+			if (add_ext)
+				strcat(szName, ".txt");
 		} else if (m_stype==GF_ISOM_SUBTYPE_STPP) {
-			gf_export_message(dumper, GF_OK, "Extracting XML Subtitles");
+			gf_export_message(dumper, GF_OK, "Extracting XML Subtitle Stream");
 			if (add_ext)
 				strcat(szName, ".xml");
 			return gf_export_message(dumper, GF_NOT_SUPPORTED, "XML Subtitles re-assembling is not supported yet.", dumper->trackID);
+		} else if (m_stype==GF_ISOM_SUBTYPE_METX) {
+			gf_export_message(dumper, GF_OK, "Extracting XML Metadata Stream");
+			if (add_ext)
+				strcat(szName, ".xml");
 		} else {
 			if (add_ext) {
 				strcat(szName, ".");
@@ -1112,10 +1138,10 @@
 	if (is_stdout) {
 		out = stdout;
 	} else if (dumper->out_name && (dumper->flags & GF_EXPORT_MERGE)) {
-		out = gf_f64_open(dumper->out_name, "a+b");
-		if (out) gf_f64_seek(out, 0, SEEK_END);
+		out = gf_fopen(dumper->out_name, "a+b");
+		if (out) gf_fseek(out, 0, SEEK_END);
 	} else {
-		out = gf_f64_open(szName, "wb");
+		out = gf_fopen(szName, "wb");
 	}
 	if (!out) {
 		if (dsi) gf_free(dsi);
@@ -1208,7 +1234,7 @@
 		if (qcp_type==2) gf_bs_write_data(bs, "#!SMV\n", 6);
 		else gf_bs_write_data(bs, "#!EVRC\n", 7);
 		qcp_type = 0;
-	} else if (m_stype==GF_ISOM_SUBTYPE_STXT) {
+	} else if ((m_stype==GF_ISOM_SUBTYPE_STXT) || (m_stype==GF_ISOM_SUBTYPE_METT)) {
 		if (stxtcfg) {
 			gf_bs_write_data(bs, stxtcfg, (u32)strlen(stxtcfg));
 		}
@@ -1390,7 +1416,7 @@
 	if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
 	gf_bs_del(bs);
 	if (!is_stdout)
-		fclose(out);
+		gf_fclose(out);
 	return e;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 }
@@ -1440,7 +1466,7 @@
 			strcpy(szOutFile, dumper->out_name);
 		}
 
-		fout = is_stdout ? stdout : gf_f64_open(szOutFile, "wb");
+		fout = is_stdout ? stdout : gf_fopen(szOutFile, "wb");
 
 		max_size = 0;
 		frame = NULL;
@@ -1461,17 +1487,26 @@
 		}
 		gf_free(frame);
 		if(!is_stdout)
-			fclose(fout);
+			gf_fclose(fout);
 		fout = NULL;
 		goto exit;
 	}
 	i = 0;
 	tot_size = max_size = 0;
-	while ((size = (s32) AVI_audio_size(in, i) )>0) {
-		if (max_size<(u32) size) max_size=size;
+	size = (s32) AVI_audio_size(in, i);
+	if (size < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[AVIExport] Error reading AVI audio sample\n"));
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		goto exit;
+	}
+
+	while (size > 0) {
+		if (max_size < (u32) size) max_size = size;
 		tot_size += size;
 		i++;
+		size = (s32) AVI_audio_size(in, i);
 	}
+
 	frame = (char*)gf_malloc(sizeof(char) * max_size);
 	AVI_seek_start(in);
 	AVI_set_audio_position(in, 0);
@@ -1522,6 +1557,9 @@
 	case 0x55:
 		comp = "mp3";
 		break;
+	case 0x0000706d:
+		comp = "aac";
+		break;
 	default:
 		comp = "raw";
 		break;
@@ -1535,12 +1573,19 @@
 		strcpy(szOutFile, dumper->out_name);
 	}
 
-	fout = is_stdout ? stdout : gf_f64_open(szOutFile, "wb");
+	fout = is_stdout ? stdout : gf_fopen(szOutFile, "wb");
 	num_samples = 0;
 	while (1) {
 		Bool continuous;
 		size = (s32) AVI_read_audio(in, frame, max_size, (int*)&continuous);
-		if (!size) break;
+		if (size < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[AVIExport] Error reading AVI audio sample\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto exit;
+		}
+		if (size == 0)
+			break;
+
 		num_samples += size;
 		gf_fwrite(frame, 1, size, fout);
 		gf_set_progress("AVI Extract", num_samples, tot_size);
@@ -1549,7 +1594,7 @@
 
 
 exit:
-	if (fout && !is_stdout) fclose(fout);
+	if (fout && !is_stdout) gf_fclose(fout);
 	AVI_close(in);
 	return e;
 }
@@ -1577,16 +1622,16 @@
 	}
 
 	sprintf(szName, "%s.media", dumper->out_name);
-	out_med = gf_f64_open(szName, "wb");
+	out_med = gf_fopen(szName, "wb");
 	if (!out_med) {
 		gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
 
 	sprintf(szName, "%s.nhnt", dumper->out_name);
-	out_nhnt = gf_f64_open(szName, "wb");
+	out_nhnt = gf_fopen(szName, "wb");
 	if (!out_nhnt) {
-		fclose(out_med);
+		gf_fclose(out_med);
 		gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
@@ -1596,9 +1641,9 @@
 
 	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 		sprintf(szName, "%s.info", dumper->out_name);
-		out_inf = gf_f64_open(szName, "wb");
+		out_inf = gf_fopen(szName, "wb");
 		if (out_inf) gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 1, out_inf);
-		fclose(out_inf);
+		gf_fclose(out_inf);
 	}
 
 	/*write header*/
@@ -1659,9 +1704,9 @@
 		gf_set_progress("NHNT Export", i+1, count);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
 	}
-	fclose(out_med);
+	gf_fclose(out_med);
 	gf_bs_del(bs);
-	fclose(out_nhnt);
+	gf_fclose(out_nhnt);
 	return GF_OK;
 }
 
@@ -1855,11 +1900,11 @@
 	add_to_iod = 1;
 	mode = GF_ISOM_WRITE_EDIT;
 	if (!is_stdout && (dumper->flags & GF_EXPORT_MERGE)) {
-		FILE *t = gf_f64_open(szName, "rb");
+		FILE *t = gf_fopen(szName, "rb");
 		if (t) {
 			add_to_iod = 0;
 			mode = GF_ISOM_OPEN_EDIT;
-			fclose(t);
+			gf_fclose(t);
 		}
 	}
 	outfile = gf_isom_open(is_stdout ? "std" : szName, mode, NULL);
@@ -1899,7 +1944,9 @@
 	avi_t *avi_out;
 	char dumdata[1];
 	u32 track, i, di, count, w, h, frame_d;
+#ifndef GPAC_DISABLE_AV_PARSERS
 	GF_M4VDecSpecInfo dsi;
+#endif
 	Double FPS;
 
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
@@ -1936,7 +1983,7 @@
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
 
-	/*compute FPS - note we assume constant frame rate without droped frames...*/
+	/*compute FPS - note we assume constant frame rate without dropped frames...*/
 	count = gf_isom_get_sample_count(dumper->file, track);
 	FPS = gf_isom_get_media_timescale(dumper->file, track);
 	FPS *= (count-1);
@@ -1962,6 +2009,8 @@
 		gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 		w = dsi.width;
 		h = dsi.height;
+#else
+		gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 #endif
 
 		v4CC = "XVID";
@@ -2051,7 +2100,7 @@
 		szRootName = "DIMSStream";
 	} else {
 		sprintf(szMedia, "%s.media", dumper->out_name);
-		med = gf_f64_open(szMedia, "wb");
+		med = gf_fopen(szMedia, "wb");
 		if (!med) {
 			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 			return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szMedia);
@@ -2060,15 +2109,17 @@
 		sprintf(szName, "%s.nhml", dumper->out_name);
 		szRootName = "NHNTStream";
 	}
-	nhml = gf_f64_open(szName, "wt");
+	nhml = gf_fopen(szName, "wt");
 	if (!nhml) {
-		fclose(med);
+		gf_fclose(med);
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
 
 	mstype = gf_isom_get_media_subtype(dumper->file, track, 1);
 
+	gf_export_message(dumper, GF_OK, "Exporting NHML for track %s", gf_4cc_to_str(mstype) );
+
 	/*write header*/
 	fprintf(nhml, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
 	fprintf(nhml, "<%s version=\"1.0\" timeScale=\"%d\" ", szRootName, gf_isom_get_media_timescale(dumper->file, track) );
@@ -2076,9 +2127,9 @@
 		fprintf(nhml, "streamType=\"%d\" objectTypeIndication=\"%d\" ", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 			sprintf(szName, "%s.info", dumper->out_name);
-			inf = gf_f64_open(szName, "wb");
+			inf = gf_fopen(szName, "wb");
 			if (inf) gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 1, inf);
-			fclose(inf);
+			gf_fclose(inf);
 			fprintf(nhml, "specificInfoFile=\"%s\" ", szName);
 		}
 		gf_odf_desc_del((GF_Descriptor *) esd);
@@ -2109,13 +2160,26 @@
 			}
 			if (sdesc->extension_buf) {
 				sprintf(szName, "%s.info", dumper->out_name);
-				inf = gf_f64_open(szName, "wb");
+				inf = gf_fopen(szName, "wb");
 				if (inf) gf_fwrite(sdesc->extension_buf, sdesc->extension_buf_size, 1, inf);
-				fclose(inf);
+				gf_fclose(inf);
 				fprintf(nhml, "specificInfoFile=\"%s\" ", szName);
 				gf_free(sdesc->extension_buf);
 			}
 			gf_free(sdesc);
+		} else {
+			const char *mime, *encoding, *config;
+			switch (mstype) {
+			case GF_ISOM_SUBTYPE_METT:
+				if (gf_isom_stxt_get_description(dumper->file, track, 1, &mime, &encoding, &config) == GF_OK) {
+					sprintf(szName, "%s.info", dumper->out_name);
+					inf = gf_fopen(szName, "wb");
+					if (inf) gf_fwrite(config, strlen(config), 1, inf);
+					gf_fclose(inf);
+					fprintf(nhml, "specificInfoFile=\"%s\" ", szName);
+				}
+				break;
+			}
 		}
 	}
 
@@ -2215,8 +2279,8 @@
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Error: your version of GPAC was compile with no libz support."));
 					gf_bs_del(bs);
 					gf_isom_sample_del(&samp);
-					if (med) fclose(med);
-					fclose(nhml);
+					if (med) gf_fclose(med);
+					gf_fclose(nhml);
 					return GF_NOT_SUPPORTED;
 #endif
 				} else {
@@ -2245,8 +2309,8 @@
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
 	}
 	fprintf(nhml, "</%s>\n", szRootName);
-	if (med) fclose(med);
-	fclose(nhml);
+	if (med) gf_fclose(med);
+	gf_fclose(nhml);
 	return GF_OK;
 }
 
@@ -2282,7 +2346,7 @@
 	if (dumper->flags & GF_EXPORT_WEBVTT_META_EMBEDDED) {
 	} else {
 		sprintf(szMedia, "%s.media", dumper->out_name);
-		med = gf_f64_open(szMedia, "wb");
+		med = gf_fopen(szMedia, "wb");
 		if (!med) {
 			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 			return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szMedia);
@@ -2290,9 +2354,9 @@
 	}
 
 	sprintf(szName, "%s.vtt", dumper->out_name);
-	vtt = gf_f64_open(szName, "wt");
+	vtt = gf_fopen(szName, "wt");
 	if (!vtt) {
-		fclose(med);
+		gf_fclose(med);
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
@@ -2483,8 +2547,8 @@
 		gf_set_progress("WebVTT metadata Export", i+1, count);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
 	}
-	if (med) fclose(med);
-	fclose(vtt);
+	if (med) gf_fclose(med);
+	gf_fclose(vtt);
 	return GF_OK;
 }
 
@@ -2513,7 +2577,7 @@
 	esd = gf_isom_get_esd(dumper->file, track, 1);
 	media = NULL;
 	sprintf(szMedia, "%s.media", dumper->out_name);
-	media = gf_f64_open(szMedia, "wb");
+	media = gf_fopen(szMedia, "wb");
 	if (!media) {
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szMedia);
@@ -2522,9 +2586,9 @@
 	sprintf(szName, "%s.six", dumper->out_name);
 	szRootName = "stream";
 
-	six = gf_f64_open(szName, "wt");
+	six = gf_fopen(szName, "wt");
 	if (!six) {
-		fclose(media);
+		gf_fclose(media);
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
@@ -2592,8 +2656,8 @@
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
 	}
 	fprintf(six, "</%s>\n", szRootName);
-	if (media) fclose(media);
-	fclose(six);
+	if (media) gf_fclose(media);
+	gf_fclose(six);
 	return GF_OK;
 
 }
@@ -2690,7 +2754,7 @@
 		is_stdout = 1;
 	strcpy(out_file, dumper->out_name);
 	strcat(out_file, ".saf");
-	saf_f = is_stdout ? stdout : gf_f64_open(out_file, "wb");
+	saf_f = is_stdout ? stdout : gf_fopen(out_file, "wb");
 
 	samp_done = 0;
 	while (samp_done<tot_samp) {
@@ -2719,7 +2783,7 @@
 		gf_free(data);
 	}
 	if (!is_stdout)
-		fclose(saf_f);
+		gf_fclose(saf_f);
 
 	gf_saf_mux_del(mux);
 	return GF_OK;
@@ -2734,7 +2798,7 @@
 {
 //	if (evt_type == GF_M2TS_EVT_PAT_REPEAT) ts->user = NULL;
 	if (evt_type == GF_M2TS_EVT_PMT_REPEAT) ts->user = NULL;
-	else if (evt_type == GF_M2TS_EVT_PAT_FOUND) ts->segment_switch = 1;
+	else if (evt_type == GF_M2TS_EVT_PAT_FOUND) gf_m2ts_abort_parsing(ts, GF_FALSE);
 }
 
 struct _ts_export
@@ -2791,12 +2855,12 @@
 
 	if (dumper->flags & GF_EXPORT_PROBE_ONLY) return GF_OK;
 
-	src = gf_f64_open(dumper->in_name, "rb");
+	src = gf_fopen(dumper->in_name, "rb");
 	if (!src) return gf_export_message(dumper, GF_CODEC_NOT_FOUND, "Error opening %s", dumper->in_name);
 
-	gf_f64_seek(src, 0, SEEK_END);
-	fsize = gf_f64_tell(src);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_END);
+	fsize = gf_ftell(src);
+	gf_fseek(src, 0, SEEK_SET);
 
 	ts = gf_m2ts_demux_new();
 	ts->on_event = m2ts_export_check;
@@ -2809,12 +2873,12 @@
 		gf_m2ts_process_data(ts, data, (u32)size);
 		if (!ts->user) break;
 	}
-	if (!ts->segment_switch && ts->user) {
-		fclose(src);
+	if (!ts->abort_parsing && ts->user) {
+		gf_fclose(src);
 		gf_m2ts_demux_del(ts);
 		return gf_export_message(dumper, GF_URL_ERROR, "Cannot locate program association table");
 	}
-	ts->segment_switch = 0;
+	ts->abort_parsing = GF_FALSE;
 
 	stream = NULL;
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
@@ -2829,7 +2893,7 @@
 		}
 	}
 	if (!stream) {
-		fclose(src);
+		gf_fclose(src);
 		gf_m2ts_demux_del(ts);
 		return gf_export_message(dumper, GF_URL_ERROR, "Cannot find PID %d in transport stream", dumper->trackID);
 	}
@@ -2891,15 +2955,15 @@
 	if (dumper->out_name && !strcmp(dumper->out_name, "std"))
 		is_stdout=1;
 
-	tsx.dst = is_stdout ? stdout : gf_f64_open(szFile, "wb");
+	tsx.dst = is_stdout ? stdout : gf_fopen(szFile, "wb");
 	if (!tsx.dst) {
-		fclose(src);
+		gf_fclose(src);
 		gf_m2ts_demux_del(ts);
 		return gf_export_message(dumper, GF_IO_ERR, "Cannot open file %s for writing", szFile);
 	}
 
 	gf_m2ts_reset_parsers(ts);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_SET);
 	fdone = 0;
 	ts->user = &tsx;
 	ts->on_event = m2ts_export_dump;
@@ -2915,8 +2979,8 @@
 	gf_set_progress("MPEG-2 TS Extract", fsize, fsize);
 
 	if (!is_stdout)
-		fclose(tsx.dst);
-	fclose(src);
+		gf_fclose(tsx.dst);
+	gf_fclose(src);
 	gf_m2ts_demux_del(ts);
 	return GF_OK;
 }

v0.5.2.tar.gz/src/media_tools/media_import.c -> v0.6.1.tar.gz/src/media_tools/media_import.c Changed

@@ -104,19 +104,22 @@
 }
 
 
-static void MP4T_RecomputeBitRate(GF_ISOFile *file, u32 track)
+static void gf_media_update_bitrate(GF_ISOFile *file, u32 track)
 {
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	u32 i, count, timescale;
-	u64 time_wnd, rate, max_rate, avg_rate;
+	u32 i, count, timescale, db_size;
+	u64 time_wnd, rate, max_rate, avg_rate, bitrate;
 	Double br;
 	GF_ESD *esd;
 
-	esd = gf_isom_get_esd(file, track, 1);
-	if (!esd) return;
+	db_size = 0;
 
-	esd->decoderConfig->avgBitrate = 0;
-	esd->decoderConfig->maxBitrate = 0;
+	esd = gf_isom_get_esd(file, track, 1);
+	if (esd) {
+		db_size = esd->decoderConfig->bufferSizeDB;
+		esd->decoderConfig->avgBitrate = 0;
+		esd->decoderConfig->maxBitrate = 0;
+	}
 	rate = max_rate = avg_rate = time_wnd = 0;
 
 	timescale = gf_isom_get_media_timescale(file, track);
@@ -124,9 +127,8 @@
 	for (i=0; i<count; i++) {
 		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, NULL, NULL);
 
-		if (samp->dataLength>esd->decoderConfig->bufferSizeDB) esd->decoderConfig->bufferSizeDB = samp->dataLength;
+		if (samp->dataLength > db_size) db_size = samp->dataLength;
 
-		if (esd->decoderConfig->bufferSizeDB < samp->dataLength) esd->decoderConfig->bufferSizeDB = samp->dataLength;
 		avg_rate += samp->dataLength;
 		rate += samp->dataLength;
 		if (samp->DTS > time_wnd + timescale) {
@@ -140,13 +142,21 @@
 
 	br = (Double) (s64) gf_isom_get_media_duration(file, track);
 	br /= timescale;
-	esd->decoderConfig->avgBitrate = (u32) ((Double) (s64)avg_rate / br);
+	bitrate = (u32) ((Double) (s64)avg_rate / br);
+	bitrate *= 8;
+	max_rate *= 8;
+
 	/*move to bps*/
-	esd->decoderConfig->avgBitrate *= 8;
-	esd->decoderConfig->maxBitrate = (u32) (max_rate*8);
+	if (esd) {
+		esd->decoderConfig->avgBitrate = (u32) bitrate;
+		esd->decoderConfig->maxBitrate = (u32) max_rate;
+		esd->decoderConfig->bufferSizeDB = db_size;
+		gf_isom_change_mpeg4_description(file, track, 1, esd);
+		gf_odf_desc_del((GF_Descriptor *)esd);
+	} else {
+		gf_isom_update_bitrate(file, track, 1, (u32) bitrate, (u32) max_rate, db_size);
+	}
 
-	gf_isom_change_mpeg4_description(file, track, 1, esd);
-	gf_odf_desc_del((GF_Descriptor *)esd);
 #endif
 }
 
@@ -188,15 +198,15 @@
 	else if (import->esd)
 		import_mpeg4 = GF_TRUE;
 
-	src = gf_f64_open(import->in_name, "rb");
+	src = gf_fopen(import->in_name, "rb");
 	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
-	gf_f64_seek(src, 0, SEEK_END);
-	size = (u32) gf_f64_tell(src);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_END);
+	size = (u32) gf_ftell(src);
+	gf_fseek(src, 0, SEEK_SET);
 	data = (char*)gf_malloc(sizeof(char)*size);
 	size = (u32) fread(data, sizeof(char), size, src);
-	fclose(src);
+	gf_fclose(src);
 
 	/*get image size*/
 	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
@@ -230,14 +240,14 @@
 	}
 
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 
 	id = 0;
 	if (import_mpeg4) {
 
 		if (!import->esd) {
 			import->esd = gf_odf_desc_esd_new(2);
-			destroy_esd = 1;
+			destroy_esd = GF_TRUE;
 		}
 		/*update stream type/oti*/
 		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
@@ -358,15 +368,15 @@
 		return GF_OK;
 	}
 
-	src = gf_f64_open(import->in_name, "rb");
+	src = gf_fopen(import->in_name, "rb");
 	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
-	gf_f64_seek(src, 0, SEEK_END);
-	size = (u32) gf_f64_tell(src);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_END);
+	size = (u32) gf_ftell(src);
+	gf_fseek(src, 0, SEEK_SET);
 	data = (char*)gf_malloc(sizeof(char)*size);
 	size = (u32) fread(data, sizeof(char), size, src);
-	fclose(src);
+	gf_fclose(src);
 
 	OTI = GPAC_OTI_SCENE_AFX;
 
@@ -375,10 +385,10 @@
 	dsi[0] = GPAC_AFX_SCALABLE_COMPLEXITY;
 
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(0);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	/*update stream type/oti*/
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
@@ -463,7 +473,7 @@
 	u64 done, tot_size, offset, duration;
 	GF_ISOSample *samp;
 
-	in = gf_f64_open(import->in_name, "rb");
+	in = gf_fopen(import->in_name, "rb");
 	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 
@@ -482,7 +492,7 @@
 					}
 					sz--;
 				}
-				id3_end = ftell(in); 
+				id3_end = (u32) gf_ftell(in);
 			}
 		}
 		fseek(in, id3_end, SEEK_SET);
@@ -490,18 +500,18 @@
 
 	hdr = gf_mp3_get_next_header(in);
 	if (!hdr) {
-		fclose(in);
+		gf_fclose(in);
 		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-1/2 audio");
 	}
 	sr = gf_mp3_sampling_rate(hdr);
 	oti = gf_mp3_object_type_indication(hdr);
 	if (!oti) {
-		fclose(in);
+		gf_fclose(in);
 		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-1/2 audio");
 	}
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		fclose(in);
+		gf_fclose(in);
 		import->tk_info[0].track_num = 1;
 		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
 		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
@@ -513,15 +523,15 @@
 
 
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	} else {
-		force_mpeg4 = 1;
+		force_mpeg4 = GF_TRUE;
 	}
 	if (import->flags & GF_IMPORT_FORCE_MPEG4)
-		force_mpeg4 = 1;
+		force_mpeg4 = GF_TRUE;
 
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
@@ -553,14 +563,16 @@
 		memset(&udesc, 0, sizeof(GF_GenericSampleDescription));
 		udesc.codec_tag = GF_4CC('.', 'm', 'p', '3');
 		memcpy(udesc.compressor_name, "\3MP3", 4);
+		udesc.samplerate = sr;
+		udesc.nb_channels = nb_chan;
 		gf_isom_new_generic_sample_description(import->dest, track, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &udesc, &di);
 	}
 
 	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16);
 
-	gf_f64_seek(in, 0, SEEK_END);
-	tot_size = gf_f64_tell(in);
-	gf_f64_seek(in, id3_end, SEEK_SET);
+	gf_fseek(in, 0, SEEK_END);
+	tot_size = gf_ftell(in);
+	gf_fseek(in, id3_end, SEEK_SET);
 
 	e = GF_OK;
 	samp = gf_isom_sample_new();
@@ -578,7 +590,7 @@
 		/*MP3 stream truncated*/
 		if (!hdr) break;
 
-		offset = gf_f64_tell(in) - 4;
+		offset = gf_ftell(in) - 4;
 		size = gf_mp3_frame_size(hdr);
 		assert(size);
 		if (size>max_size) {
@@ -608,7 +620,7 @@
 		if (duration && (samp->DTS > duration)) break;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	gf_set_progress("Importing MP3", tot_size, tot_size);
 
 exit:
@@ -617,7 +629,7 @@
 		import->esd = NULL;
 	}
 	if (samp) gf_isom_sample_del(&samp);
-	fclose(in);
+	gf_fclose(in);
 	return e;
 }
 
@@ -644,9 +656,9 @@
 			gf_bs_read_int(bs, 4);
 			continue;
 		}
-		hdr->is_mp2 = gf_bs_read_int(bs, 1);
+		hdr->is_mp2 = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 2);
-		hdr->no_crc = gf_bs_read_int(bs, 1);
+		hdr->no_crc = (Bool)gf_bs_read_int(bs, 1);
 		pos = gf_bs_get_position(bs) - 2;
 
 		hdr->profile = 1 + gf_bs_read_int(bs, 2);
@@ -665,7 +677,7 @@
 			continue;
 		}
 		hdr->frame_size -= hdr_size;
-		if (gf_bs_available(bs) == hdr->frame_size) return 1;
+		if (gf_bs_available(bs) == hdr->frame_size) return GF_TRUE;
 
 		gf_bs_skip_bytes(bs, hdr->frame_size);
 		val = gf_bs_read_u8(bs);
@@ -682,9 +694,9 @@
 			continue;
 		}
 		gf_bs_seek(bs, pos+hdr_size);
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool LOAS_LoadFrame(GF_BitStream *bs, GF_M4ADecSpecInfo *acfg, u32 *nb_bytes, u8 *buffer)
@@ -706,9 +718,9 @@
 		if (!gf_bs_read_int(bs, 1)) {
 			Bool amux_version, amux_versionA;
 
-			amux_version = gf_bs_read_int(bs, 1);
-			amux_versionA = 0;
-			if (amux_version) amux_versionA = gf_bs_read_int(bs, 1);
+			amux_version = (Bool)gf_bs_read_int(bs, 1);
+			amux_versionA = GF_FALSE;
+			if (amux_version) amux_versionA = (Bool)gf_bs_read_int(bs, 1);
 			if (!amux_versionA) {
 				u32 i, allStreamsSameTimeFraming, numProgram;
 				if (amux_version) gf_latm_get_value(bs);
@@ -722,11 +734,11 @@
 					for (j=0; j<=num_lay; j++) {
 						u32 frameLengthType;
 						Bool same_cfg = GF_FALSE;
-						if (i || j) same_cfg = gf_bs_read_int(bs, 1);
+						if (i || j) same_cfg = (Bool)gf_bs_read_int(bs, 1);
 
 						if (!same_cfg) {
 							if (amux_version==1) gf_latm_get_value(bs);
-							gf_m4a_parse_config(bs, acfg, 0);
+							gf_m4a_parse_config(bs, acfg, GF_FALSE);
 						}
 						frameLengthType = gf_bs_read_int(bs, 3);
 						if (!frameLengthType) {
@@ -770,9 +782,9 @@
 			continue;
 		}
 
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_Err gf_import_aac_loas(GF_MediaImporter *import)
@@ -792,7 +804,7 @@
 	u32 track, di;
 	GF_ISOSample *samp;
 
-	in = gf_f64_open(import->in_name, "rb");
+	in = gf_fopen(import->in_name, "rb");
 	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
@@ -811,7 +823,7 @@
 		import->tk_info[0].audio_info.sample_rate = sr;
 		import->tk_info[0].audio_info.nb_channels = acfg.nb_chan;
 		gf_bs_del(bs);
-		fclose(in);
+		gf_fclose(in);
 		return GF_OK;
 	}
 
@@ -827,10 +839,10 @@
 	dts_inc = 1024;
 
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
@@ -890,7 +902,7 @@
 		if (duration && (samp->DTS > duration)) break;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, acfg.audioPL);
 	gf_set_progress("Importing AAC", tot_size, tot_size);
 
@@ -904,7 +916,7 @@
 		gf_isom_sample_del(&samp);
 	}
 	gf_bs_del(bs);
-	fclose(in);
+	gf_fclose(in);
 	return e;
 }
 
@@ -925,7 +937,7 @@
 	u32 max_size, track, di, i;
 	GF_ISOSample *samp;
 
-	in = gf_f64_open(import->in_name, "rb");
+	in = gf_fopen(import->in_name, "rb");
 	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
@@ -933,7 +945,7 @@
 	sync_frame = ADTS_SyncFrame(bs, &hdr, &frames_skipped);
 	if (!sync_frame) {
 		gf_bs_del(bs);
-		fclose(in);
+		gf_fclose(in);
 		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-2/4 AAC with ADTS");
 	}
 
@@ -942,16 +954,16 @@
 		sync_frame = LOAS_LoadFrame(bs, &acfg, NULL, NULL);
 		if (sync_frame) {
 			gf_bs_del(bs);
-			fclose(in);
+			gf_fclose(in);
 			return gf_import_aac_loas(import);
 		}
 	}
 
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) hdr.is_mp2 = 0;
+	if (import->flags & GF_IMPORT_FORCE_MPEG4) hdr.is_mp2 = GF_FALSE;
 
 	/*keep MPEG-2 AAC OTI even for HE-SBR (that's correct according to latest MPEG-4 audio spec)*/
 	oti = hdr.is_mp2 ? hdr.profile+GPAC_OTI_AUDIO_AAC_MPEG2_MP-1 : GPAC_OTI_AUDIO_AAC_MPEG4;
-	timescale = sr = GF_M4ASampleRates[hdr.sr_idx];
+	sr = GF_M4ASampleRates[hdr.sr_idx];
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		import->tk_info[0].track_num = 1;
@@ -961,7 +973,7 @@
 		import->tk_info[0].audio_info.sample_rate = sr;
 		import->tk_info[0].audio_info.nb_channels = hdr.nb_ch;
 		gf_bs_del(bs);
-		fclose(in);
+		gf_fclose(in);
 		return GF_OK;
 	}
 
@@ -1008,7 +1020,7 @@
 	acfg.nb_chan = gf_m4a_get_channel_cfg(hdr.nb_ch);
 	acfg.sbr_object_type = 0;
 	if (import->flags & GF_IMPORT_SBR_EXPLICIT) {
-		acfg.has_sbr = 1;
+		acfg.has_sbr = GF_TRUE;
 		acfg.base_object_type = 5;
 		acfg.sbr_object_type = hdr.profile;
 
@@ -1016,13 +1028,13 @@
 		dts_inc = 2048;
 		sr = sbr_sr;
 	} else if (import->flags & GF_IMPORT_SBR_IMPLICIT) {
-		acfg.has_sbr = 1;
+		acfg.has_sbr = GF_TRUE;
 	}
 	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
-		acfg.has_ps = 1;
+		acfg.has_ps = GF_TRUE;
 		acfg.base_object_type = 29;
 	} else if (import->flags & GF_IMPORT_PS_IMPLICIT) {
-		acfg.has_ps = 1;
+		acfg.has_ps = GF_TRUE;
 	}
 
 	acfg.audioPL = gf_m4a_get_profile(&acfg);
@@ -1061,14 +1073,15 @@
 	}
 	/*not MPEG4 tool*/
 	if (0 && hdr.is_mp2) acfg.audioPL = 0xFE;
-
 	gf_bs_align(dsi);
 
+	timescale = sr;
+
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
@@ -1149,7 +1162,7 @@
 		if (duration && (samp->DTS > duration)) break;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, acfg.audioPL);
 	gf_set_progress("Importing AAC", tot_size, tot_size);
 
@@ -1160,7 +1173,7 @@
 	}
 	if (samp) gf_isom_sample_del(&samp);
 	gf_bs_del(bs);
-	fclose(in);
+	gf_fclose(in);
 	return e;
 }
 
@@ -1213,8 +1226,8 @@
 	GF_M4VParser *vparse;
 	GF_BitStream *bs;
 
-	destroy_esd = forced_packed = 0;
-	mdia = gf_f64_open(import->in_name, "rb");
+	destroy_esd = forced_packed = GF_FALSE;
+	mdia = gf_fopen(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Opening %s failed", import->in_name);
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
 
@@ -1228,16 +1241,16 @@
 
 	tot_size = gf_bs_get_size(bs);
 	done_size = 0;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	FPS = mpeg12 ? dsi.fps : GF_IMPORT_DEFAULT_FPS;
 	if (import->video_fps) FPS = (Double) import->video_fps;
 	get_video_timing(FPS, &timescale, &dts_inc);
 
 	duration = (u64) (import->duration*FPS);
 
-	is_packed = 0;
+	is_packed = GF_FALSE;
 	nbNotCoded = nbI = nbP = nbB = max_b = 0;
-	is_vfr = erase_pl = 0;
+	is_vfr = erase_pl = GF_FALSE;
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		import->tk_info[0].track_num = 1;
@@ -1262,14 +1275,14 @@
 	PL = dsi.VideoPL;
 	if (!PL) {
 		PL = 0x01;
-		erase_pl = 1;
+		erase_pl = GF_TRUE;
 	}
 	samp_offset = 0;
 	/*MPEG-4 visual*/
 	if (!mpeg12) samp_offset = gf_m4v_get_object_start(vparse);
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(0);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
 	if (!track) {
@@ -1302,7 +1315,7 @@
 		gf_bs_seek(bs, pos);
 
 		/*remove packed flag if any (VOSH user data)*/
-		forced_packed = 0;
+		forced_packed = GF_FALSE;
 		i=0;
 		while (1) {
 			char *frame = import->esd->decoderConfig->decoderSpecificInfo->data;
@@ -1315,16 +1328,16 @@
 			frame = import->esd->decoderConfig->decoderSpecificInfo->data + i + 4;
 			frame = strchr(frame, 'p');
 			if (frame) {
-				forced_packed = 1;
+				forced_packed = GF_TRUE;
 				frame[0] = 'n';
 			}
 			break;
 		}
 	}
 
-	if (import->flags & GF_IMPORT_FORCE_PACKED) forced_packed = 1;
+	if (import->flags & GF_IMPORT_FORCE_PACKED) forced_packed = GF_TRUE;
 
-	gf_isom_set_cts_packing(import->dest, track, 1);
+	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
 
 	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name: NULL, NULL, &di);
 	if (e) goto exit;
@@ -1337,7 +1350,7 @@
 
 	gf_media_update_par(import->dest, track);
 
-	has_cts_offset = 0;
+	has_cts_offset = GF_FALSE;
 	nb_samp = b_frames = ref_frame = 0;
 	do_vfr = !(import->flags & GF_IMPORT_NO_FRAME_DROP);
 
@@ -1357,12 +1370,12 @@
 			nbNotCoded ++;
 			/*if prev is B and we're parsing a packed bitstream discard n-vop*/
 			if (forced_packed && b_frames) {
-				is_packed = 1;
+				is_packed = GF_TRUE;
 				continue;
 			}
 			/*policy is to import at variable frame rate, skip*/
 			if (do_vfr) {
-				is_vfr = 1;
+				is_vfr = GF_TRUE;
 				samp->DTS += dts_inc;
 				continue;
 			}
@@ -1379,7 +1392,7 @@
 				for (i=0; i<gf_isom_get_sample_count(import->dest, track); i++) {
 					gf_isom_modify_cts_offset(import->dest, track, i+1, dts_inc);
 				}
-				has_cts_offset = 1;
+				has_cts_offset = GF_TRUE;
 			}
 		} else {
 			if (ftype==0) {
@@ -1426,7 +1439,7 @@
 	gf_set_progress("Importing M4V", nb_samp, nb_samp);
 	if (has_cts_offset) {
 		gf_import_message(import, GF_OK, "Has B-Frames (%d max consecutive B-VOPs)", max_b);
-		gf_isom_set_cts_packing(import->dest, track, 0);
+		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 
 
 		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST))
@@ -1436,7 +1449,7 @@
 		we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
 		if (PL<=3) {
 			PL = 0xF5;
-			erase_pl = 1;
+			erase_pl = GF_TRUE;
 			gf_import_message(import, GF_OK, "WARNING: indicated profile doesn't include B-VOPs - forcing %s", gf_m4v_get_profile_name((u8) PL));
 		}
 		gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps - %d Bs)", nb_samp, nbI, nbP, nbB);
@@ -1449,7 +1462,7 @@
 		gf_m4v_rewrite_pl(&import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength, (u8) PL);
 		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
 	}
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 	if (is_vfr) {
 		if (!nbB) {
@@ -1473,7 +1486,7 @@
 
 	/*this destroys the bitstream as well*/
 	gf_m4v_parser_del(vparse);
-	fclose(mdia);
+	gf_fclose(mdia);
 	return e;
 }
 
@@ -1500,9 +1513,9 @@
 	char *comp, *frame;
 	avi_t *in;
 
-	test = gf_f64_open(import->in_name, "rb");
+	test = gf_fopen(import->in_name, "rb");
 	if (!test) return gf_import_message(import, GF_URL_ERROR, "Opening %s failed", import->in_name);
-	fclose(test);
+	gf_fclose(test);
 	in = AVI_open_input_file(import->in_name, 1);
 	if (!in) return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Unsupported avi file");
 
@@ -1533,11 +1546,11 @@
 		AVI_close(in);
 		return GF_OK;
 	}
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	frame = NULL;
 	AVI_seek_start(in);
 
-	erase_pl = 0;
+	erase_pl = GF_FALSE;
 	comp = AVI_video_compressor(in);
 	if (!comp) {
 		e = GF_NOT_SUPPORTED;
@@ -1590,14 +1603,14 @@
 	samp = gf_isom_sample_new();
 	PL = 0;
 	track = 0;
-	is_vfr = 0;
+	is_vfr = GF_FALSE;
 
-	is_packed = 0;
+	is_packed = GF_FALSE;
 	nbDummy = nbNotCoded = nbI = nbP = nbB = max_b = 0;
-	has_cts_offset = 0;
+	has_cts_offset = GF_FALSE;
 	cur_samp = b_frames = ref_frame = 0;
 
-	is_init = 0;
+	is_init = GF_FALSE;
 
 	for (i=0; i<num_samples; i++) {
 		size = AVI_frame_size(in, i);
@@ -1614,13 +1627,13 @@
 
 		/*get DSI*/
 		if (!is_init) {
-			is_init = 1;
-			vparse = gf_m4v_parser_new(frame, size, 0);
+			is_init = GF_TRUE;
+			vparse = gf_m4v_parser_new(frame, size, GF_FALSE);
 			e = gf_m4v_parse_config(vparse, &dsi);
 			PL = dsi.VideoPL;
 			if (!PL) {
 				PL = 0x01;
-				erase_pl = 1;
+				erase_pl = GF_TRUE;
 			}
 			samp_offset = gf_m4v_get_object_start(vparse);
 			assert(samp_offset < 1<<31);
@@ -1632,7 +1645,7 @@
 
 			if (!import->esd) {
 				import->esd = gf_odf_desc_esd_new(0);
-				destroy_esd = 1;
+				destroy_esd = GF_TRUE;
 			}
 			track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
 			if (!track) {
@@ -1655,7 +1668,7 @@
 			memcpy(import->esd->decoderConfig->decoderSpecificInfo->data, frame, sizeof(char) * (size_t)samp_offset);
 			import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) samp_offset;
 
-			gf_isom_set_cts_packing(import->dest, track, 1);
+			gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
 
 			/*remove packed flag if any (VOSH user data)*/
 			while (1) {
@@ -1693,7 +1706,7 @@
 			size -= samp_offset;
 			file_offset = (u64) AVI_get_video_position(in, i);
 
-			vparse = gf_m4v_parser_new(frame + samp_offset, size, 0);
+			vparse = gf_m4v_parser_new(frame + samp_offset, size, GF_FALSE);
 
 			samp->dataLength = 0;
 			/*removing padding frames*/
@@ -1711,7 +1724,7 @@
 					if (!gf_m4v_is_valid_object_type(vparse)) gf_import_message(import, GF_OK, "WARNING: AVI frame %d doesn't look like MPEG-4 Visual", i+1);
 					nbNotCoded ++;
 					if (!is_packed) {
-						is_vfr = 1;
+						is_vfr = GF_TRUE;
 						/*policy is to import at constant frame rate from AVI*/
 						if (import->flags & GF_IMPORT_NO_FRAME_DROP) goto proceed;
 						/*policy is to import at variable frame rate from AVI*/
@@ -1721,7 +1734,7 @@
 				} else {
 proceed:
 					if (e==GF_EOS) size = 0;
-					else is_packed = 1;
+					else is_packed = GF_TRUE;
 					nb_f++;
 
 					samp->IsRAP = RAP_NO;
@@ -1735,7 +1748,7 @@
 							for (i=0; i<gf_isom_get_sample_count(import->dest, track); i++) {
 								gf_isom_modify_cts_offset(import->dest, track, i+1, dts_inc);
 							}
-							has_cts_offset = 1;
+							has_cts_offset = GF_TRUE;
 						}
 					} else {
 						if (!ftype) {
@@ -1793,7 +1806,7 @@
 	if (has_cts_offset) {
 		gf_import_message(import, GF_OK, "Has B-Frames (%d max consecutive B-VOPs%s)", max_b, is_packed ? " - packed bitstream" : "");
 		/*repack CTS tables and adjust offsets for B-frames*/
-		gf_isom_set_cts_packing(import->dest, track, 0);
+		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 
 		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST))
 			update_edit_list_for_bframes(import->dest, track);
@@ -1802,7 +1815,7 @@
 		we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
 		if (PL<=3) {
 			PL = 0xF5;
-			erase_pl = 1;
+			erase_pl = GF_TRUE;
 			gf_import_message(import, GF_OK, "WARNING: indicated profile doesn't include B-VOPs - forcing %s", gf_m4v_get_profile_name((u8) PL));
 		}
 		gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps - %d Bs)", num_samples, nbI, nbP, nbB);
@@ -1819,7 +1832,7 @@
 		gf_m4v_rewrite_pl(&import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength, (u8) PL);
 		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
 	}
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 	if (is_vfr) {
 		if (nbB) {
@@ -1870,9 +1883,9 @@
 	if (import->trackID==1) return GF_OK;
 
 
-	test = gf_f64_open(import->in_name, "rb");
+	test = gf_fopen(import->in_name, "rb");
 	if (!test) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-	fclose(test);
+	gf_fclose(test);
 	in = AVI_open_input_file(import->in_name, 1);
 	if (!in) return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported avi file");
 
@@ -1900,9 +1913,9 @@
 	}
 
 	frame = NULL;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 		import->esd = gf_odf_desc_esd_new(0);
 	}
 	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, sampleRate);
@@ -1945,16 +1958,16 @@
 
 	samp = gf_isom_sample_new();
 	done=max_size=0;
-	is_cbr = 1;
+	is_cbr = GF_TRUE;
 	while (1) {
 		if (AVI_read_audio(in, frame, 4, (int*)&continuous) != 4) break;
-		offset = gf_f64_tell(in->fdes) - 4;
+		offset = gf_ftell(in->fdes) - 4;
 		hdr = GF_4CC((u8) frame[0], (u8) frame[1], (u8) frame[2], (u8) frame[3]);
 
 		size = gf_mp3_frame_size(hdr);
 		if (size>max_size) {
 			frame = (char*)gf_realloc(frame, sizeof(char) * size);
-			if (max_size) is_cbr = 0;
+			if (max_size) is_cbr = GF_FALSE;
 			max_size = size;
 		}
 		size = 4 + (s32) AVI_read_audio(in, &frame[4], size - 4, &continuous);
@@ -1988,7 +2001,7 @@
 	samp->data = NULL;
 	gf_isom_sample_del(&samp);
 
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, 0xFE);
 
@@ -2035,6 +2048,8 @@
 			gf_isom_get_media_language(import->orig, i+1, &lang);
 			if (lang) {
 				import->tk_info[i].lang = GF_4CC(' ', lang[0], lang[1], lang[2]);
+				gf_free(lang);
+				lang = NULL;
 			}
 			import->nb_tracks ++;
 		}
@@ -2056,8 +2071,8 @@
 		origin_esd->OCRESID = import->esd->OCRESID;
 		/*there may be other things to import...*/
 	}
-	ps = 0;
-	sbr = 0;
+	ps = GF_FALSE;
+	sbr = GF_FALSE;
 	sbr_sr = 0;
 	cur_extract_mode = gf_isom_get_nalu_extract_mode(import->orig, track_in);
 	iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(import->orig);
@@ -2086,8 +2101,8 @@
 		u8 PL = iod ? iod->audio_profileAndLevel : 0xFE;
 		bps = 16;
 		sr = ch = sbr_sr = 0;
-		sbr = 0;
-		ps = 0;
+		sbr = GF_FALSE;
+		ps = GF_FALSE;
 		gf_isom_get_audio_info(import->orig, track_in, 1, &sr, &ch, &bps);
 #ifndef GPAC_DISABLE_AV_PARSERS
 		if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_AUDIO_AAC_MPEG4)) {
@@ -2097,7 +2112,7 @@
 			if (dsi.has_sbr) sbr_sr = dsi.sbr_sr;
 			ch = dsi.nb_chan;
 			PL = dsi.audioPL;
-			sbr = dsi.has_sbr ? ((dsi.base_object_type==GF_M4A_AAC_SBR || dsi.base_object_type==GF_M4A_AAC_PS) ? 2 : 1) : 0;
+			sbr = dsi.has_sbr ? ((dsi.base_object_type==GF_M4A_AAC_SBR || dsi.base_object_type==GF_M4A_AAC_PS) ? 2 : 1) : GF_FALSE;
 			ps = dsi.has_ps;
 		}
 #endif
@@ -2118,7 +2133,7 @@
 		gf_isom_set_timescale(import->dest, timescale);
 	}
 
-	e = gf_isom_clone_track(import->orig, track_in, import->dest, (import->flags & GF_IMPORT_USE_DATAREF), &track);
+	e = gf_isom_clone_track(import->orig, track_in, import->dest, (import->flags & GF_IMPORT_USE_DATAREF) ? GF_TRUE : GF_FALSE, &track);
 	if (e) goto exit;
 
 	di = 1;
@@ -2133,6 +2148,8 @@
 		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
 	}
 
+	mstype = gf_isom_get_media_subtype(import->orig, track_in, di);
+
 	switch (mtype) {
 	case GF_ISOM_MEDIA_VISUAL:
 		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Video (size %d x %d)", orig_name, trackID, w, h);
@@ -2170,10 +2187,32 @@
 		gf_isom_sample_del(&samp);
 	}
 
+	is_cenc = gf_isom_is_cenc_media(import->orig, track_in, 1);
+
 	duration = (u64) (((Double)import->duration * gf_isom_get_media_timescale(import->orig, track_in)) / 1000);
 	gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT);
+
+	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+		if (is_cenc ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] CENC media detected - cannot switch parameter set storage mode\n"));
+		} else if (import->flags & GF_IMPORT_USE_DATAREF) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] Cannot switch parameter set storage mode when using data reference\n"));
+		} else {
+			switch (mstype) {
+			case GF_4CC('a', 'v', 'c', '1'):
+				gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+				gf_isom_avc_set_inband_config(import->dest, track, 1);
+				break;
+			case GF_4CC('h', 'v', 'c', '1'):
+				gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+				gf_isom_hevc_set_inband_config(import->dest, track, 1);
+				break;
+			}
+		}
+	}
+
 	num_samples = gf_isom_get_sample_count(import->orig, track_in);
-	is_cenc = gf_isom_is_cenc_media(import->orig, track_in, 1);
+
 	if (is_cenc) {
 		u32 container_type;
 		e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, 0, NULL, &container_type);
@@ -2260,12 +2299,26 @@
 		}
 	}
 
+	//adjust last sample duration
+	if (i==num_samples) {
+		u32 dur = gf_isom_get_sample_duration(import->orig, track_in, num_samples);
+		gf_isom_set_last_sample_duration(import->dest, track, dur);
+	} else {
+		s64 mediaOffset;
+		if (gf_isom_get_edit_list_type(import->orig, track_in, &mediaOffset)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOBMF Import] Multiple edits found in source media, import may be broken\n"));
+		}
+		gf_isom_update_edit_list_duration(import->dest, track);
+		gf_isom_update_duration(import->dest);
+	}
+
 	if (gf_isom_has_time_offset(import->orig, track_in)==2) {
-		e = gf_isom_set_composition_offset_mode(import->dest, track, 1);
+		e = gf_isom_set_composition_offset_mode(import->dest, track, GF_TRUE);
 		if (e)
 			goto exit;
 	}
 
+
 	if (import->esd) {
 		if (!import->esd->slConfig) {
 			import->esd->slConfig = origin_esd ? origin_esd->slConfig : NULL;
@@ -2277,7 +2330,7 @@
 		}
 	}
 
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 exit:
 	if (origin_esd) gf_odf_desc_del((GF_Descriptor *) origin_esd);
@@ -2385,9 +2438,9 @@
 	duration *= timescale;
 	duration /= 1000;
 
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 		import->esd = gf_odf_desc_esd_new(0);
 	}
 	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
@@ -2410,7 +2463,12 @@
 	gf_import_message(import, GF_OK, "%s Video import - Resolution %d x %d @ %02.4f FPS", (mtype==GPAC_OTI_VIDEO_MPEG1) ? "MPEG-1" : "MPEG-2", w, h, FPS);
 	gf_isom_set_visual_info(import->dest, track, di, w, h);
 
-	gf_isom_set_cts_packing(import->dest, track, 1);
+	if (!gf_isom_get_media_timescale(import->dest, track)) {
+		e = gf_import_message(import, GF_BAD_PARAM, "No timescale for imported track - ignoring");
+		if (e) goto exit;
+	}
+
+	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
 
 	file_size = mpeg2ps_get_ps_size(ps);
 	last_pos = 0;
@@ -2442,13 +2500,13 @@
 		if (duration && (dts_inc*(frames-1) >= duration) ) break;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
-	gf_isom_set_cts_packing(import->dest, track, 0);
+	gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 	if (!(import->flags & GF_IMPORT_NO_EDIT_LIST))
 		update_edit_list_for_bframes(import->dest, track);
 
 	if (last_pos!=file_size) gf_set_progress("Importing MPEG-PS Video", frames, frames);
 
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	if (ar) gf_media_change_par(import->dest, track, ar>>16, ar&0xffff);
 
 exit:
@@ -2517,9 +2575,9 @@
 	sr = gf_mp3_sampling_rate(hdr);
 	nb_ch = gf_mp3_num_channels(hdr);
 
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 		import->esd = gf_odf_desc_esd_new(0);
 	}
 	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, sr);
@@ -2568,7 +2626,7 @@
 	samp->data = NULL;
 	gf_isom_sample_del(&samp);
 	if (last_pos!=file_size) gf_set_progress("Importing MPEG-PS Audio", frames, frames);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 exit:
 	if (import->esd && destroy_esd) {
@@ -2607,23 +2665,23 @@
 
 	strcpy(szMedia, szName);
 	strcat(szMedia, ".nhnt");
-	nhnt = gf_f64_open(szMedia, "rb");
+	nhnt = gf_fopen(szMedia, "rb");
 	if (!nhnt) return gf_import_message(import, GF_URL_ERROR, "Cannot find NHNT file %s", szMedia);
 
 	strcpy(szMedia, szName);
 	strcat(szMedia, ".media");
-	mdia = gf_f64_open(szMedia, "rb");
+	mdia = gf_fopen(szMedia, "rb");
 	if (!mdia) {
-		fclose(nhnt);
+		gf_fclose(nhnt);
 		return gf_import_message(import, GF_URL_ERROR, "Cannot find MEDIA file %s", szMedia);
 	}
 
 
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	/*update stream type/oti*/
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
@@ -2632,20 +2690,20 @@
 
 	strcpy(szNhnt, szName);
 	strcat(szNhnt, ".info");
-	info = gf_f64_open(szNhnt, "rb");
+	info = gf_fopen(szNhnt, "rb");
 	if (info) {
 		if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
 		import->esd->decoderConfig->decoderSpecificInfo = NULL;
 		import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		gf_f64_seek(info, 0, SEEK_END);
-		import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) gf_f64_tell(info);
+		gf_fseek(info, 0, SEEK_END);
+		import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) gf_ftell(info);
 		import->esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char) * import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-		gf_f64_seek(info, 0, SEEK_SET);
+		gf_fseek(info, 0, SEEK_SET);
 		if (0==fread(import->esd->decoderConfig->decoderSpecificInfo->data, 1, import->esd->decoderConfig->decoderSpecificInfo->dataLength, info)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER,
 			 ("[NHML import] Failed to read dataLength\n"));
 		}
-		fclose(info);
+		gf_fclose(info);
 	}
 	/*keep parsed dsi (if any) if no .info file exists*/
 
@@ -2742,23 +2800,23 @@
 	samp->data = (char*)gf_malloc(sizeof(char) * 1024);
 	max_size = 1024;
 	count = 0;
-	gf_f64_seek(mdia, 0, SEEK_END);
-	media_size = gf_f64_tell(mdia);
-	gf_f64_seek(mdia, 0, SEEK_SET);
+	gf_fseek(mdia, 0, SEEK_END);
+	media_size = gf_ftell(mdia);
+	gf_fseek(mdia, 0, SEEK_SET);
 	media_done = 0;
-	next_is_start = 1;
+	next_is_start = GF_TRUE;
 
 	while (!feof(nhnt)) {
 		Bool is_start, is_end;
 		samp->dataLength = gf_bs_read_u24(bs);
 		samp->IsRAP = gf_bs_read_int(bs, 1);
-		is_start = gf_bs_read_int(bs, 1);
+		is_start = (Bool)gf_bs_read_int(bs, 1);
 		if (next_is_start) {
-			is_start = 1;
-			next_is_start = 0;
+			is_start = GF_TRUE;
+			next_is_start = GF_FALSE;
 		}
-		is_end = gf_bs_read_int(bs, 1);
-		if (is_end) next_is_start = 1;
+		is_end = (Bool)gf_bs_read_int(bs, 1);
+		if (is_end) next_is_start = GF_TRUE;
 		/*3 reserved + AU type (2)*/
 		gf_bs_read_int(bs, 5);
 		if (sig) {
@@ -2787,7 +2845,7 @@
 				samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
 				max_size = samp->dataLength;
 			}
-			gf_f64_seek(mdia, offset, SEEK_SET);
+			gf_fseek(mdia, offset, SEEK_SET);
 			if (0==fread( samp->data, 1, samp->dataLength, mdia)) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Failed to read samp->dataLength\n"));
 			}
@@ -2806,12 +2864,12 @@
 	}
 	if (media_done!=media_size) gf_set_progress("Importing NHNT", (u32) (media_size/1024), (u32) (media_size/1024));
 	gf_isom_sample_del(&samp);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 exit:
 	gf_bs_del(bs);
-	fclose(nhnt);
-	fclose(mdia);
+	gf_fclose(nhnt);
+	gf_fclose(mdia);
 	if (import->esd && destroy_esd) {
 		gf_odf_desc_del((GF_Descriptor *) import->esd);
 		import->esd = NULL;
@@ -2852,14 +2910,14 @@
 
 	if (breaker->from_is_start && breaker->from_id && !strcmp(breaker->from_id, node_id)) {
 		breaker->from_pos = gf_xml_sax_get_node_start_pos(breaker->sax);
-		breaker->from_is_start = 0;
+		breaker->from_is_start = GF_FALSE;
 	}
 	if (breaker->to_is_start && breaker->to_id && !strcmp(breaker->to_id, node_id)) {
 		breaker->to_pos = gf_xml_sax_get_node_start_pos(breaker->sax);
-		breaker->to_is_start = 0;
+		breaker->to_is_start = GF_FALSE;
 	}
 	if (!breaker->to_is_start && !breaker->from_is_start && !breaker->to_is_end && !breaker->from_is_end) {
-		gf_xml_sax_suspend(breaker->sax, 1);
+		gf_xml_sax_suspend(breaker->sax, GF_TRUE);
 	}
 
 }
@@ -2871,15 +2929,15 @@
 	gf_list_rem_last(breaker->id_stack);
 	if (breaker->from_is_end && breaker->from_id && !strcmp(breaker->from_id, node_id)) {
 		breaker->from_pos = gf_xml_sax_get_node_end_pos(breaker->sax);
-		breaker->from_is_end = 0;
+		breaker->from_is_end = GF_FALSE;
 	}
 	if (breaker->to_is_end && breaker->to_id && !strcmp(breaker->to_id, node_id)) {
 		breaker->to_pos = gf_xml_sax_get_node_end_pos(breaker->sax);
-		breaker->to_is_end = 0;
+		breaker->to_is_end = GF_FALSE;
 	}
 	gf_free(node_id);
 	if (!breaker->to_is_start && !breaker->from_is_start && !breaker->to_is_end && !breaker->from_is_end) {
-		gf_xml_sax_suspend(breaker->sax, 1);
+		gf_xml_sax_suspend(breaker->sax, GF_TRUE);
 	}
 }
 
@@ -2887,39 +2945,51 @@
 GF_Err gf_import_sample_from_xml(GF_MediaImporter *import, GF_ISOSample *samp, char *xml_file, char *xmlFrom, char *xmlTo, u32 *max_size)
 {
 	GF_Err e;
+	u32 read;
 	XMLBreaker breaker;
 	char *tmp;
 	FILE *xml;
-
+	u8 szBOM[3];
 	if (!xml_file || !xmlFrom || !xmlTo) return GF_BAD_PARAM;
 
 	memset(&breaker, 0, sizeof(XMLBreaker));
 
-	xml = gf_f64_open(xml_file, "rb");
+	xml = gf_fopen(xml_file, "rb");
 	if (!xml) {
 		e = gf_import_message(import, GF_BAD_PARAM, "NHML import failure: file %s not found", xml_file);
 		goto exit;
 	}
+	//we cannot use files with BOM since the XML position we get from the parser are offsets in the UTF-8 version of the XML.
+	//TODO: to support files with BOM we would need to serialize on the fly the callback from the sax parser
+	read = (u32) fread(szBOM, 1, 3, xml);
+	if (read==3) {
+		fseek(xml, 0, SEEK_SET);
+		if ((szBOM[0]==0xFF) || (szBOM[0]==0xFE) || (szBOM[0]==0xEF)) {
+			e = gf_import_message(import, GF_NOT_SUPPORTED, "NHML import failure: XML file %s uses BOM, please convert to plin UTF-8 or ANSI first", xml_file);
+			goto exit;
+		}
+	}
+
 
 	memset(&breaker, 0, sizeof(XMLBreaker));
 	breaker.id_stack = gf_list_new();
 
-	if (strstr(xmlFrom, ".start")) breaker.from_is_start = 1;
-	else breaker.from_is_end = 1;
+	if (strstr(xmlFrom, ".start")) breaker.from_is_start = GF_TRUE;
+	else breaker.from_is_end = GF_TRUE;
 	tmp = strchr(xmlFrom, '.');
 	*tmp = 0;
 	if (stricmp(xmlFrom, "doc")) breaker.from_id = gf_strdup(xmlFrom);
 	/*doc start pos is 0, no need to look for it*/
-	else if (breaker.from_is_start) breaker.from_is_start = 0;
+	else if (breaker.from_is_start) breaker.from_is_start = GF_FALSE;
 	*tmp = '.';
 
-	if (strstr(xmlTo, ".start")) breaker.to_is_start = 1;
-	else breaker.to_is_end = 1;
+	if (strstr(xmlTo, ".start")) breaker.to_is_start = GF_TRUE;
+	else breaker.to_is_end = GF_TRUE;
 	tmp = strchr(xmlTo, '.');
 	*tmp = 0;
 	if (stricmp(xmlTo, "doc")) breaker.to_id = gf_strdup(xmlTo);
 	/*doc end pos is file size, no need to look for it*/
-	else if (breaker.to_is_end) breaker.to_is_end = 0;
+	else if (breaker.to_is_end) breaker.to_is_end = GF_FALSE;
 	*tmp = '.';
 
 	breaker.sax = gf_xml_sax_new(nhml_node_start, nhml_node_end, NULL, &breaker);
@@ -2929,9 +2999,9 @@
 	e = GF_OK;
 
 	if (!breaker.to_id) {
-		gf_f64_seek(xml, 0, SEEK_END);
-		breaker.to_pos = gf_f64_tell(xml);
-		gf_f64_seek(xml, 0, SEEK_SET);
+		gf_fseek(xml, 0, SEEK_END);
+		breaker.to_pos = gf_ftell(xml);
+		gf_fseek(xml, 0, SEEK_SET);
 	}
 	if(breaker.to_pos < breaker.from_pos) {
 		e = gf_import_message(import, GF_BAD_PARAM, "NHML import failure: xmlFrom %s is located after xmlTo %s", xmlFrom, xmlTo);
@@ -2945,13 +3015,13 @@
 		*max_size = samp->dataLength;
 		samp->data = (char*)gf_realloc(samp->data, sizeof(char)*samp->dataLength);
 	}
-	gf_f64_seek(xml, breaker.from_pos, SEEK_SET);
+	gf_fseek(xml, breaker.from_pos, SEEK_SET);
 	if (0==fread(samp->data, 1, samp->dataLength, xml)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Failed to read samp->dataLength\n"));
 	}
 
 exit:
-	if (xml) fclose(xml);
+	if (xml) gf_fclose(xml);
 	while (gf_list_count(breaker.id_stack)) {
 		char *id = (char *)gf_list_last(breaker.id_stack);
 		gf_list_rem_last(breaker.id_stack);
@@ -3014,7 +3084,7 @@
 	}
 	if (*max_size < stream.total_out) {
 		*max_size = samp->dataLength*ZLIB_COMPRESS_SAFE;
-		samp->data = gf_realloc(samp->data, *max_size * sizeof(char));
+		samp->data = (char*)gf_realloc(samp->data, *max_size * sizeof(char));
 	}
 
 	memcpy(samp->data + offset, dest, sizeof(char)*stream.total_out);
@@ -3045,19 +3115,23 @@
 {
 	GF_Err e;
 	GF_DIMSDescription dims;
-	Bool destroy_esd, inRootOD, do_compress, use_dict, is_dims;
-	u32 i, track, tkID, di, mtype, max_size, count, streamType, oti, timescale, specInfoSize, dts_inc, par_den, par_num;
+	Bool destroy_esd, inRootOD, do_compress, is_dims;
+	u32 i, track, tkID, di, mtype, max_size, count, streamType, oti, timescale, specInfoSize, header_end, dts_inc, par_den, par_num;
 	GF_ISOSample *samp;
 	GF_XMLAttribute *att;
 	s64 media_size, media_done, offset;
 	u64 duration, sample_duration;
 	FILE *nhml, *mdia, *info;
 	char *dictionary = NULL;
-	char *ext, szName[1000], szMedia[1000], szMediaTemp[1000], szInfo[1000], szXmlFrom[1000], szXmlTo[1000], *specInfo;
+	char *ext, szName[1000], szMedia[1000], szMediaTemp[1000], szInfo[1000], szXmlFrom[1000], szXmlTo[1000], szXmlHeaderEnd[1000];
+	char *specInfo;
 	GF_GenericSampleDescription sdesc;
 	GF_DOMParser *parser;
 	GF_XMLNode *root, *node, *childnode;
 	char *szRootName, *szSampleName, *szImpName;
+#ifndef GPAC_DISABLE_ZLIB
+	Bool use_dict = GF_FALSE;
+#endif
 
 	szRootName = dims_doc ? "DIMSStream" : "NHNTStream";
 	szSampleName = dims_doc ? "DIMSUnit" : "NHNTSample";
@@ -3070,8 +3144,8 @@
 		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
 		return GF_OK;
 	}
-	nhml = gf_f64_open(import->in_name, "rt");
-	if (!nhml) return gf_import_message(import, GF_URL_ERROR, "Cannot find %s file %s", szImpName, szMedia);
+	nhml = gf_fopen(import->in_name, "rt");
+	if (!nhml) return gf_import_message(import, GF_URL_ERROR, "Cannot find %s file %s", szImpName, import->in_name);
 
 	strcpy(szName, import->in_name);
 	ext = strrchr(szName, '.');
@@ -3085,7 +3159,7 @@
 	parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(parser, import->in_name, nhml_on_progress, import);
 	if (e) {
-		fclose(nhml);
+		gf_fclose(nhml);
 		gf_import_message(import, e, "Error parsing %s file: Line %d - %s", szImpName, gf_xml_dom_get_line(parser), gf_xml_dom_get_error(parser));
 		gf_xml_dom_del(parser);
 		return e;
@@ -3098,118 +3172,167 @@
 	}
 
 	mdia = NULL;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	dts_inc = 0;
-	inRootOD = 0;
-	do_compress = 0;
-	is_dims = 0;
+	inRootOD = GF_FALSE;
+	do_compress = GF_FALSE;
+	is_dims = GF_FALSE;
 	specInfo = NULL;
 	samp = NULL;
 	memset(&dims, 0, sizeof(GF_DIMSDescription));
 	dims.profile = dims.level = 255;
-	dims.streamType = 1;
+	dims.streamType = GF_TRUE;
 	dims.containsRedundant = 1;
 
 	if (stricmp(root->name, szRootName)) {
 		e = gf_import_message(import, GF_BAD_PARAM, "Error parsing %s file - \"%s\" root expected, got \"%s\"", szImpName, szRootName, root->name);
 		goto exit;
 	}
-	use_dict = 0;
+
 	memset(&sdesc, 0, sizeof(GF_GenericSampleDescription));
 	tkID = mtype = streamType = oti = par_den = par_num = 0;
 	timescale = 1000;
 	i=0;
+	strcpy(szXmlHeaderEnd, "");
+	header_end = 0;
+
 	while ((att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
-		if (!stricmp(att->name, "streamType")) NHML_SCAN_INT("%u", streamType)
-			else if (!stricmp(att->name, "mediaType") && (strlen(att->value)==4)) {
-				mtype = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
-			}
-			else if (!stricmp(att->name, "mediaSubType") && (strlen(att->value)==4)) {
-				sdesc.codec_tag = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
-			}
-			else if (!stricmp(att->name, "objectTypeIndication")) NHML_SCAN_INT("%u", oti)
-				else if (!stricmp(att->name, "timeScale")) NHML_SCAN_INT("%u", timescale)
-					else if (!stricmp(att->name, "width")) NHML_SCAN_INT("%hu", sdesc.width)
-						else if (!stricmp(att->name, "height")) NHML_SCAN_INT("%hu", sdesc.height)
-							else if (!stricmp(att->name, "parNum")) NHML_SCAN_INT("%u", par_num)
-								else if (!stricmp(att->name, "parDen")) NHML_SCAN_INT("%u", par_den)
-									else if (!stricmp(att->name, "sampleRate")) NHML_SCAN_INT("%u", sdesc.samplerate)
-										else if (!stricmp(att->name, "numChannels")) NHML_SCAN_INT("%hu", sdesc.nb_channels)
-											else if (!stricmp(att->name, "baseMediaFile")) strcpy(szMedia, att->value);
-											else if (!stricmp(att->name, "specificInfoFile")) strcpy(szInfo, att->value);
-											else if (!stricmp(att->name, "trackID")) NHML_SCAN_INT("%u", tkID)
-												else if (!stricmp(att->name, "inRootOD")) inRootOD = (!stricmp(att->value, "yes") );
-												else if (!stricmp(att->name, "DTS_increment")) NHML_SCAN_INT("%u", dts_inc)
-													else if (!stricmp(att->name, "gzipSamples")) do_compress = (!stricmp(att->value, "yes")) ? 1 : 0;
-													else if (!stricmp(att->name, "gzipDictionary")) {
-														u64 d_size;
-														if (stricmp(att->value, "self")) {
-															FILE *d = gf_f64_open(att->value, "rb");
-															if (!d) {
-																gf_import_message(import, GF_IO_ERR, "Cannot open dictionary file %s", att->value);
-																continue;
-															}
-															gf_f64_seek(d, 0, SEEK_END);
-															d_size = gf_f64_tell(d);
-															dictionary = (char*)gf_malloc(sizeof(char)*(size_t)(d_size+1));
-															gf_f64_seek(d, 0, SEEK_SET);
-															d_size = fread(dictionary, sizeof(char), (size_t)d_size, d);
-															dictionary[d_size]=0;
-														}
-														use_dict = 1;
-													}
+		if (!stricmp(att->name, "streamType")) {
+			NHML_SCAN_INT("%u", streamType)
+		} else if (!stricmp(att->name, "mediaType") && (strlen(att->value)==4)) {
+			mtype = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+		} else if (!stricmp(att->name, "mediaSubType") && (strlen(att->value)==4)) {
+			sdesc.codec_tag = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+		} else if (!stricmp(att->name, "objectTypeIndication")) {
+			NHML_SCAN_INT("%u", oti)
+		} else if (!stricmp(att->name, "timeScale")) {
+			NHML_SCAN_INT("%u", timescale)
+		} else if (!stricmp(att->name, "width")) {
+			NHML_SCAN_INT("%hu", sdesc.width)
+		} else if (!stricmp(att->name, "height")) {
+			NHML_SCAN_INT("%hu", sdesc.height)
+		} else if (!stricmp(att->name, "parNum")) {
+			NHML_SCAN_INT("%u", par_num)
+		} else if (!stricmp(att->name, "parDen")) {
+			NHML_SCAN_INT("%u", par_den)
+		} else if (!stricmp(att->name, "sampleRate")) {
+			NHML_SCAN_INT("%u", sdesc.samplerate)
+		} else if (!stricmp(att->name, "numChannels")) {
+			NHML_SCAN_INT("%hu", sdesc.nb_channels)
+		} else if (!stricmp(att->name, "baseMediaFile")) {
+			strcpy(szMedia, att->value);
+		} else if (!stricmp(att->name, "specificInfoFile")) {
+			strcpy(szInfo, att->value);
+		} else if (!stricmp(att->name, "headerEnd")) {
+			NHML_SCAN_INT("%u", header_end)
+		} else if (!stricmp(att->name, "trackID")) {
+			NHML_SCAN_INT("%u", tkID)
+		} else if (!stricmp(att->name, "inRootOD")) {
+			inRootOD = (!stricmp(att->value, "yes") );
+		} else if (!stricmp(att->name, "DTS_increment")) {
+			NHML_SCAN_INT("%u", dts_inc)
+		} else if (!stricmp(att->name, "gzipSamples")) {
+			do_compress = (!stricmp(att->value, "yes")) ? GF_TRUE : GF_FALSE;
+		}
+#ifndef GPAC_DISABLE_ZLIB
+		else if (!stricmp(att->name, "gzipDictionary")) {
+			u64 d_size;
+			if (stricmp(att->value, "self")) {
+				FILE *d = gf_fopen(att->value, "rb");
+				if (!d) {
+					gf_import_message(import, GF_IO_ERR, "Cannot open dictionary file %s", att->value);
+					continue;
+				}
+				gf_fseek(d, 0, SEEK_END);
+				d_size = gf_ftell(d);
+				dictionary = (char*)gf_malloc(sizeof(char)*(size_t)(d_size+1));
+				gf_fseek(d, 0, SEEK_SET);
+				d_size = fread(dictionary, sizeof(char), (size_t)d_size, d);
+				dictionary[d_size]=0;
+			}
+			use_dict = GF_TRUE;
+		}
+#endif
 		/*unknow desc related*/
-													else if (!stricmp(att->name, "compressorName")) strcpy(sdesc.compressor_name, att->value);
-													else if (!stricmp(att->name, "codecVersion")) NHML_SCAN_INT("%hu", sdesc.version)
-														else if (!stricmp(att->name, "codecRevision")) NHML_SCAN_INT("%hu", sdesc.revision)
-															else if (!stricmp(att->name, "codecVendor") && (strlen(att->value)==4)) {
-																sdesc.vendor_code = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
-															}
-															else if (!stricmp(att->name, "temporalQuality")) NHML_SCAN_INT("%u", sdesc.temporal_quality)
-																else if (!stricmp(att->name, "spatialQuality")) NHML_SCAN_INT("%u", sdesc.spatial_quality)
-																	else if (!stricmp(att->name, "horizontalResolution")) NHML_SCAN_INT("%u", sdesc.h_res)
-																		else if (!stricmp(att->name, "verticalResolution")) NHML_SCAN_INT("%u", sdesc.v_res)
-																			else if (!stricmp(att->name, "bitDepth")) NHML_SCAN_INT("%hu", sdesc.depth)
-																				else if (!stricmp(att->name, "bitsPerSample")) NHML_SCAN_INT("%hu", sdesc.bits_per_sample)
-
-																					/*DIMS stuff*/
-																					else if (!stricmp(att->name, "profile")) NHML_SCAN_INT("%c", dims.profile)
-																						else if (!stricmp(att->name, "level")) NHML_SCAN_INT("%c", dims.level)
-																							else if (!stricmp(att->name, "pathComponents")) NHML_SCAN_INT("%c", dims.pathComponents)
-																								else if (!stricmp(att->name, "useFullRequestHost") && !stricmp(att->value, "yes")) dims.fullRequestHost = 1;
-																								else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) dims.streamType = 0;
-																								else if (!stricmp(att->name, "contains_redundant")) {
-																									if (!stricmp(att->value, "main")) dims.containsRedundant = 1;
-																									else if (!stricmp(att->value, "redundant")) dims.containsRedundant = 2;
-																									else if (!stricmp(att->value, "main+redundant")) dims.containsRedundant = 3;
-																								}
-																								else if (!stricmp(att->name, "text_encoding")) dims.textEncoding = att->value;
-																								else if (!stricmp(att->name, "content_encoding")) {
-																									if (!strcmp(att->value, "deflate")) {
-																										dims.contentEncoding = att->value;
-																										do_compress = 1;
-																									}
-																								}
-																								else if (!stricmp(att->name, "content_script_types")) dims.content_script_types = att->value;
-																								else if (!stricmp(att->name, "mime_type")) dims.mime_type = att->value;
-																								else if (!stricmp(att->name, "media_namespace")) dims.mime_type = att->value;
-																								else if (!stricmp(att->name, "media_schema_location")) dims.xml_schema_loc = att->value;
-																								else if (!stricmp(att->name, "xml_namespace")) dims.contentEncoding = att->value;
-																								else if (!stricmp(att->name, "xml_schema_location")) dims.xml_schema_loc = att->value;
-
+		else if (!stricmp(att->name, "compressorName")) {
+			strcpy(sdesc.compressor_name, att->value);
+		} else if (!stricmp(att->name, "codecVersion")) {
+			NHML_SCAN_INT("%hu", sdesc.version)
+		} else if (!stricmp(att->name, "codecRevision")) {
+			NHML_SCAN_INT("%hu", sdesc.revision)
+		} else if (!stricmp(att->name, "codecVendor") && (strlen(att->value)==4)) {
+			sdesc.vendor_code = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+		} else if (!stricmp(att->name, "temporalQuality")) {
+			NHML_SCAN_INT("%u", sdesc.temporal_quality)
+		} else if (!stricmp(att->name, "spatialQuality")) {
+			NHML_SCAN_INT("%u", sdesc.spatial_quality)
+		} else if (!stricmp(att->name, "horizontalResolution")) {
+			NHML_SCAN_INT("%u", sdesc.h_res)
+		} else if (!stricmp(att->name, "verticalResolution")) {
+			NHML_SCAN_INT("%u", sdesc.v_res)
+		} else if (!stricmp(att->name, "bitDepth")) {
+			NHML_SCAN_INT("%hu", sdesc.depth)
+		} else if (!stricmp(att->name, "bitsPerSample")) {
+			NHML_SCAN_INT("%hu", sdesc.bits_per_sample)
+		}
+		/*DIMS stuff*/
+		else if (!stricmp(att->name, "profile")) {
+			NHML_SCAN_INT("%c", dims.profile)
+		} else if (!stricmp(att->name, "level")) {
+			NHML_SCAN_INT("%c", dims.level)
+		} else if (!stricmp(att->name, "pathComponents")) {
+			NHML_SCAN_INT("%c", dims.pathComponents)
+		} else if (!stricmp(att->name, "useFullRequestHost") && !stricmp(att->value, "yes")) {
+			dims.fullRequestHost = GF_TRUE;
+		} else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) {
+			dims.streamType = GF_FALSE;
+		} else if (!stricmp(att->name, "contains_redundant")) {
+			if (!stricmp(att->value, "main")) {
+				dims.containsRedundant = 1;
+			} else if (!stricmp(att->value, "redundant")) {
+				dims.containsRedundant = 2;
+			} else if (!stricmp(att->value, "main+redundant")) {
+				dims.containsRedundant = 3;
+			}
+		} else if (!stricmp(att->name, "text_encoding")) {
+			dims.textEncoding = att->value;
+		} else if (!stricmp(att->name, "content_encoding")) {
+			if (!strcmp(att->value, "deflate")) {
+				dims.contentEncoding = att->value;
+				do_compress = GF_TRUE;
+			}
+		} else if (!stricmp(att->name, "content_script_types")) {
+			dims.content_script_types = att->value;
+		} else if (!stricmp(att->name, "mime_type")) {
+			dims.mime_type = att->value;
+		} else if (!stricmp(att->name, "media_namespace")) {
+			dims.mime_type = att->value;
+		} else if (!stricmp(att->name, "media_schema_location")) {
+			dims.xml_schema_loc = att->value;
+		} else if (!stricmp(att->name, "xml_namespace")) {
+			dims.mime_type = att->value;
+		} else if (!stricmp(att->name, "xml_schema_location")) {
+			dims.xml_schema_loc = att->value;
+		} else if (!stricmp(att->name, "xmlHeaderEnd")) {
+			strcpy(szXmlHeaderEnd, att->value);
+		}
+	}
+	if (sdesc.samplerate && !timescale) {
+		timescale = sdesc.samplerate;
+	}
+	if (!sdesc.bits_per_sample) {
+		sdesc.bits_per_sample = 16;
 	}
-	if (sdesc.samplerate && !timescale) timescale = sdesc.samplerate;
-	if (!sdesc.bits_per_sample) sdesc.bits_per_sample = 16;
 
 	if (dims_doc || (sdesc.codec_tag==GF_ISOM_SUBTYPE_3GP_DIMS)) {
 		mtype = GF_ISOM_MEDIA_DIMS;
 		sdesc.codec_tag=GF_ISOM_SUBTYPE_3GP_DIMS;
-		is_dims = 1;
-		streamType=0;
+		is_dims = GF_TRUE;
+		streamType = 0;
 		import->flags &= ~GF_IMPORT_USE_DATAREF;
 	}
 
-	mdia = gf_f64_open(szMedia, "rb");
+	mdia = gf_fopen(szMedia, "rb");
 
 	specInfoSize = 0;
 	if (!streamType && !mtype && !sdesc.codec_tag) {
@@ -3217,14 +3340,36 @@
 		goto exit;
 	}
 
-	info = gf_f64_open(szInfo, "rb");
+	info = gf_fopen(szInfo, "rb");
 	if (info) {
-		gf_f64_seek(info, 0, SEEK_END);
-		specInfoSize = (u32) gf_f64_tell(info);
+		gf_fseek(info, 0, SEEK_END);
+		specInfoSize = (u32) gf_ftell(info);
 		specInfo = (char*)gf_malloc(sizeof(char) * specInfoSize);
-		gf_f64_seek(info, 0, SEEK_SET);
+		gf_fseek(info, 0, SEEK_SET);
 		specInfoSize = (u32) fread(specInfo, sizeof(char), specInfoSize, info);
-		fclose(info);
+		gf_fclose(info);
+	} else if (header_end) {
+		/* for text based streams, the decoder specific info can be at the beginning of the file */
+		specInfoSize = header_end;
+		specInfo = (char*)gf_malloc(sizeof(char) * (specInfoSize+1));
+		specInfoSize = (u32) fread(specInfo, sizeof(char), specInfoSize, mdia);
+		specInfo[specInfoSize] = 0;
+		header_end = specInfoSize;
+	} else if (strlen(szXmlHeaderEnd)) {
+		/* for XML based streams, the decoder specific info can be up to some element in the file */
+		samp = gf_isom_sample_new();
+		max_size = 0;
+		strcpy(szXmlFrom, "doc.start");
+		e = gf_import_sample_from_xml(import, samp, szMedia, szXmlFrom, szXmlHeaderEnd, &max_size);
+		if (e) {
+			gf_isom_sample_del(&samp);
+			goto exit;
+		}
+		specInfo = (char*)gf_malloc(sizeof(char) * (samp->dataLength+1));
+		memcpy(specInfo, samp->data, samp->dataLength);
+		specInfoSize = samp->dataLength;
+		specInfo[specInfoSize] = 0;
+		gf_isom_sample_del(&samp);
 	}
 
 	i=0;
@@ -3243,7 +3388,7 @@
 	if (streamType) {
 		if (!import->esd) {
 			import->esd = gf_odf_desc_esd_new(2);
-			destroy_esd = 1;
+			destroy_esd = GF_TRUE;
 			import->esd->ESID = tkID;
 		}
 		/*update stream type/oti*/
@@ -3332,17 +3477,46 @@
 		if (e) goto exit;
 
 		gf_import_message(import, GF_OK, "3GPP DIMS import");
-	} else if (mtype == GF_ISOM_MEDIA_MPEG_SUBT) {
+	} else if (mtype == GF_ISOM_MEDIA_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT || mtype == GF_ISOM_MEDIA_TEXT) {
 		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
 		if (!track) {
 			e = gf_isom_last_error(import->dest);
 			goto exit;
 		}
-		e = gf_isom_new_xml_subtitle_description(import->dest, track,
-		 (char *)dims.contentEncoding, (char *)dims.xml_schema_loc, (char *)dims.mime_type,
-		 &di);
+		if(sdesc.codec_tag == GF_ISOM_SUBTYPE_STPP) {
+			e = gf_isom_new_xml_subtitle_description(import->dest, track,
+			 dims.mime_type, dims.xml_schema_loc, NULL,
+			 &di);
+		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_SBTT) {
+			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_SBTT,
+			 dims.mime_type, dims.textEncoding, specInfo,
+			 &di);
+		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_STXT) {
+			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT,
+			 dims.mime_type, dims.textEncoding, specInfo,
+			 &di);
+		} else {
+			e = GF_NOT_SUPPORTED;
+		}
+		if (e) goto exit;
+	} else if (mtype == GF_ISOM_MEDIA_META) {
+		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
+		if (!track) {
+			e = gf_isom_last_error(import->dest);
+			goto exit;
+		}
+		if(sdesc.codec_tag == GF_ISOM_SUBTYPE_METX) {
+			e = gf_isom_new_xml_metadata_description(import->dest, track,
+			 dims.mime_type, dims.xml_schema_loc, dims.textEncoding,
+			 &di);
+		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_METT) {
+			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_METT,
+			 dims.mime_type, dims.textEncoding, specInfo,
+			 &di);
+		} else {
+			e = GF_NOT_SUPPORTED;
+		}
 		if (e) goto exit;
-
 	} else {
 		char szT[5];
 		sdesc.extension_buf = specInfo;
@@ -3386,11 +3560,12 @@
 	count = 0;
 	media_size = 0;
 	if (mdia) {
-		gf_f64_seek(mdia, 0, SEEK_END);
-		media_size = gf_f64_tell(mdia);
-		gf_f64_seek(mdia, 0, SEEK_SET);
+		gf_fseek(mdia, 0, SEEK_END);
+		media_size = gf_ftell(mdia);
+		gf_fseek(mdia, 0, SEEK_SET);
 	}
-	media_done = 0;
+	/* if we've read the header from the same file, mark the header data as used */
+	media_done = header_end;
 
 	samp->IsRAP = RAP;
 	i=0;
@@ -3408,7 +3583,7 @@
 		offset = 0;
 		samp->dataLength = 0;
 		dims_flags = 0;
-		append = 0;
+		append = GF_FALSE;
 		compress = do_compress;
 		sample_duration = 0;
 
@@ -3455,7 +3630,7 @@
 			dims_flags |= GF_DIMS_UNIT_M;
 		if (!count && samp->DTS) samp->DTS = 0;
 
-		if (!(dims_flags & GF_DIMS_UNIT_C)) compress = 0;
+		if (!(dims_flags & GF_DIMS_UNIT_C)) compress = GF_FALSE;
 		count++;
 
 		has_subbs = GF_FALSE;
@@ -3479,7 +3654,7 @@
 			e = gf_import_sample_from_xml(import, samp, xml_file, szXmlFrom, szXmlTo, &max_size);
 		} else if (is_dims && !strlen(szMediaTemp)) {
 			GF_BitStream *bs;
-			char *content = gf_xml_dom_serialize(node, 1);
+			char *content = gf_xml_dom_serialize(node, GF_TRUE);
 
 			samp->dataLength = 3 + (u32) strlen(content);
 
@@ -3496,7 +3671,7 @@
 			gf_bs_del(bs);
 			/*same DIMS unit*/
 			if (gf_isom_get_sample_from_dts(import->dest, track, samp->DTS))
-				append = 1;
+				append = GF_TRUE;
 
 		} else if (has_subbs) {
 			if (samp->data) gf_free(samp->data );
@@ -3508,9 +3683,9 @@
 			Bool close = GF_FALSE;
 			FILE *f = mdia;
 			if (strlen(szMediaTemp)) {
-				f = gf_f64_open(szMediaTemp, "rb");
+				f = gf_fopen(szMediaTemp, "rb");
 				close = GF_TRUE;
-				if (offset) gf_f64_seek(f, offset, SEEK_SET);
+				if (offset) gf_fseek(f, offset, SEEK_SET);
 			} else {
 				if (!offset) offset = media_done;
 			}
@@ -3520,14 +3695,14 @@
 			}
 
 			if (!samp->dataLength) {
-				u64 cur_pos = gf_f64_tell(f);
-				gf_f64_seek(f, 0, SEEK_END);
-				assert(gf_f64_tell(f) < 1<<31);
-				samp->dataLength = (u32) gf_f64_tell(f);
-				gf_f64_seek(f, cur_pos, SEEK_SET);
+				u64 cur_pos = gf_ftell(f);
+				gf_fseek(f, 0, SEEK_END);
+				assert(gf_ftell(f) < 1<<31);
+				samp->dataLength = (u32) gf_ftell(f);
+				gf_fseek(f, cur_pos, SEEK_SET);
 			}
 
-			gf_f64_seek(f, offset, SEEK_SET);
+			gf_fseek(f, offset, SEEK_SET);
 			if (is_dims) {
 				GF_BitStream *bs;
 				if (samp->dataLength+3>max_size) {
@@ -3545,17 +3720,17 @@
 
 				/*same DIMS unit*/
 				if (gf_isom_get_sample_from_dts(import->dest, track, samp->DTS))
-					append = 1;
+					append = GF_TRUE;
 			} else {
 				if (samp->dataLength>max_size) {
 					samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
 					max_size = samp->dataLength;
 				}
 				if (samp->dataLength != fread( samp->data, sizeof(char), samp->dataLength, f)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHML import dims] Failed to fully read samp->dataLength\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHML import] Failed to fully read samp->dataLength\n"));
 				}
 			}
-			if (close) fclose(f);
+			if (close) gf_fclose(f);
 		}
 		if (e) goto exit;
 
@@ -3611,17 +3786,17 @@
 	}
 
 	if (media_done!=media_size) gf_set_progress(is_dims ? "Importing DIMS" : "Importing NHML", (u32) media_size, (u32) media_size);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 	if (inRootOD) gf_isom_add_track_to_root_od(import->dest, track);
 
 exit:
-	fclose(nhml);
+	gf_fclose(nhml);
 	if (samp) {
 		samp->dataLength = 1;
 		gf_isom_sample_del(&samp);
 	}
-	if (mdia) fclose(mdia);
+	if (mdia) gf_fclose(mdia);
 	if (import->esd && destroy_esd) {
 		gf_odf_desc_del((GF_Descriptor *) import->esd);
 		import->esd = NULL;
@@ -3636,7 +3811,7 @@
 GF_Err gf_import_amr_evrc_smv(GF_MediaImporter *import)
 {
 	GF_Err e;
-	u32 track, trackID, di, sample_rate, block_size, i, readen;
+	u32 track, trackID, di, sample_rate, block_size, i, read;
 	GF_ISOSample *samp;
 	char magic[20], *msg;
 	Bool delete_esd, update_gpp_cfg;
@@ -3654,61 +3829,61 @@
 		return GF_OK;
 	}
 
-	mdia = gf_f64_open(import->in_name, "rb");
+	mdia = gf_fopen(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
 
-	update_gpp_cfg = 0;
+	update_gpp_cfg = GF_FALSE;
 	oti = mtype = 0;
 	sample_rate = 8000;
 	block_size = 160;
 	if (6 > fread(magic, sizeof(char), 20, mdia)) {
-		fclose(mdia);
+		gf_fclose(mdia);
 		return gf_import_message(import, GF_URL_ERROR, "Cannot guess type for file %s, size lower than 6", import->in_name);
 
 	}
 	if (!strnicmp(magic, "#!AMR\n", 6)) {
 		gf_import_message(import, GF_OK, "Importing AMR Audio");
-		gf_f64_seek(mdia, 6, SEEK_SET);
+		gf_fseek(mdia, 6, SEEK_SET);
 		mtype = GF_ISOM_SUBTYPE_3GP_AMR;
-		update_gpp_cfg = 1;
+		update_gpp_cfg = GF_TRUE;
 		msg = "Importing AMR";
 	}
 	else if (!strnicmp(magic, "#!EVRC\n", 7)) {
 		gf_import_message(import, GF_OK, "Importing EVRC Audio");
-		gf_f64_seek(mdia, 7, SEEK_SET);
+		gf_fseek(mdia, 7, SEEK_SET);
 		mtype = GF_ISOM_SUBTYPE_3GP_EVRC;
 		oti = GPAC_OTI_AUDIO_EVRC_VOICE;
 		msg = "Importing EVRC";
 	}
 	else if (!strnicmp(magic, "#!SMV\n", 6)) {
 		gf_import_message(import, GF_OK, "Importing SMV Audio");
-		gf_f64_seek(mdia, 6, SEEK_SET);
+		gf_fseek(mdia, 6, SEEK_SET);
 		mtype = GF_ISOM_SUBTYPE_3GP_SMV;
 		oti = GPAC_OTI_AUDIO_SMV_VOICE;
 		msg = "Importing SMV";
 	}
 	else if (!strnicmp(magic, "#!AMR_MC1.0\n", 12)) {
-		fclose(mdia);
+		gf_fclose(mdia);
 		return gf_import_message(import, GF_NOT_SUPPORTED, "Multichannel AMR Audio Not Supported");
 	}
 	else if (!strnicmp(magic, "#!AMR-WB\n", 9)) {
 		gf_import_message(import, GF_OK, "Importing AMR WideBand Audio");
-		gf_f64_seek(mdia, 9, SEEK_SET);
+		gf_fseek(mdia, 9, SEEK_SET);
 		mtype = GF_ISOM_SUBTYPE_3GP_AMR_WB;
 		sample_rate = 16000;
 		block_size = 320;
-		update_gpp_cfg = 1;
+		update_gpp_cfg = GF_TRUE;
 		msg = "Importing AMR-WB";
 	}
 	else if (!strnicmp(magic, "#!AMR-WB_MC1.0\n", 15)) {
-		fclose(mdia);
+		gf_fclose(mdia);
 		return gf_import_message(import, GF_NOT_SUPPORTED, "Multichannel AMR WideBand Audio Not Supported");
 	}
 	else {
 		char *ext = strrchr(import->in_name, '.');
 		if (ext && !stricmp(ext, ".amr")) {
 			mtype = GF_ISOM_SUBTYPE_3GP_AMR;
-			update_gpp_cfg = 1;
+			update_gpp_cfg = GF_TRUE;
 			ext = "AMR";
 			msg = "Importing AMR";
 		}
@@ -3725,15 +3900,15 @@
 			msg = "Importing SMV";
 		}
 		else {
-			fclose(mdia);
+			gf_fclose(mdia);
 			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Corrupted AMR/SMV/EVRC file header");
 		}
 
-		gf_f64_seek(mdia, 0, SEEK_SET);
+		gf_fseek(mdia, 0, SEEK_SET);
 		gf_import_message(import, GF_OK, "Importing %s Audio (File header corrupted, missing \"#!%s\\n\")", ext, ext);
 	}
 
-	delete_esd = 0;
+	delete_esd = GF_FALSE;
 	trackID = 0;
 	e = GF_OK;
 	if (import->esd) trackID = import->esd->ESID;
@@ -3758,7 +3933,7 @@
 
 	if (oti && (import->flags & GF_IMPORT_FORCE_MPEG4)) {
 		if (!import->esd) {
-			delete_esd = 1;
+			delete_esd = GF_TRUE;
 			import->esd = gf_odf_desc_esd_new(2);
 			import->esd->ESID = trackID;
 		}
@@ -3780,10 +3955,10 @@
 	samp = gf_isom_sample_new();
 	samp->data = (char*)gf_malloc(sizeof(char) * 200);
 	samp->IsRAP = RAP;
-	offset = gf_f64_tell(mdia);
-	gf_f64_seek(mdia, 0, SEEK_END);
-	media_size = gf_f64_tell(mdia) - offset;
-	gf_f64_seek(mdia, offset, SEEK_SET);
+	offset = gf_ftell(mdia);
+	gf_fseek(mdia, 0, SEEK_END);
+	media_size = gf_ftell(mdia) - offset;
+	gf_fseek(mdia, offset, SEEK_SET);
 
 	media_done = 0;
 	nb_frames = 0;
@@ -3791,7 +3966,7 @@
 	while (!feof(mdia)) {
 		u8 ft, toc;
 
-		offset = gf_f64_tell(mdia);
+		offset = gf_ftell(mdia);
 		toc = fgetc(mdia);
 		switch (gpp_cfg.type) {
 		case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -3824,8 +3999,11 @@
 		}
 
 		if (samp->dataLength) {
-			readen = (u32) fread( samp->data + 1, sizeof(char), samp->dataLength, mdia);
-			assert(readen == samp->dataLength);
+			read = (u32) fread( samp->data + 1, sizeof(char), samp->dataLength, mdia);
+			if (read != samp->dataLength) {
+				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Failed to read logs");
+				goto exit;
+			}
 		}
 		samp->dataLength += 1;
 		/*if last frame is "no data", abort - this happens in many files with constant mode (ie constant files), where
@@ -3854,7 +4032,7 @@
 	gf_isom_sample_del(&samp);
 	gf_isom_refresh_size_info(import->dest, track);
 
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) MP4T_RecomputeBitRate(import->dest, track);
+	if (import->flags & GF_IMPORT_FORCE_MPEG4) gf_media_update_bitrate(import->dest, track);
 
 	if (update_gpp_cfg) gf_isom_3gp_config_update(import->dest, track, &gpp_cfg, 1);
 
@@ -3863,7 +4041,7 @@
 		gf_odf_desc_del((GF_Descriptor *) import->esd);
 		import->esd = NULL;
 	}
-	fclose(mdia);
+	gf_fclose(mdia);
 	return e;
 }
 
@@ -3898,9 +4076,9 @@
 	}
 
 	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
-	delete_esd = 0;
+	delete_esd = GF_FALSE;
 
-	mdia = gf_f64_open(import->in_name, "rb");
+	mdia = gf_fopen(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
 
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
@@ -3929,7 +4107,7 @@
 		goto exit;
 	}
 	chunk_size = gf_bs_read_u32_le(bs);
-	has_pad = (chunk_size%2) ? 1 : 0;
+	has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
 	/*major = */gf_bs_read_u8(bs);
 	/*minor = */gf_bs_read_u8(bs);
 	chunk_size -= 2;
@@ -3977,7 +4155,7 @@
 		goto exit;
 	}
 	chunk_size = gf_bs_read_u32_le(bs);
-	has_pad = (chunk_size%2) ? 1 : 0;
+	has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
 	vrat_rate_flag = gf_bs_read_u32_le(bs);
 	size_in_packets = gf_bs_read_u32_le(bs);
 	chunk_size -= 8;
@@ -4007,7 +4185,7 @@
 	if (import->flags & GF_IMPORT_FORCE_MPEG4) {
 		if (!import->esd) {
 			import->esd = gf_odf_desc_esd_new(2);
-			delete_esd = 1;
+			delete_esd = GF_TRUE;
 		}
 		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig*)gf_odf_desc_new(GF_ODF_DCD_TAG);
 		import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
@@ -4047,10 +4225,10 @@
 	samp->data = (char*)gf_malloc(sizeof(char) * 200);
 	samp->IsRAP = RAP;
 	max_size = 200;
-	offset = gf_f64_tell(mdia);
-	gf_f64_seek(mdia, 0, SEEK_END);
-	media_size = gf_f64_tell(mdia) - offset;
-	gf_f64_seek(mdia, offset, SEEK_SET);
+	offset = gf_ftell(mdia);
+	gf_fseek(mdia, 0, SEEK_END);
+	media_size = gf_ftell(mdia) - offset;
+	gf_fseek(mdia, offset, SEEK_SET);
 
 	nb_pck = 0;
 	media_done = 0;
@@ -4058,7 +4236,7 @@
 	while (gf_bs_available(bs)) {
 		gf_bs_read_data(bs, magic, 4);
 		chunk_size = gf_bs_read_u32_le(bs);
-		has_pad = (chunk_size%2) ? 1 : 0;
+		has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
 		/*process chunk by chunk*/
 		if (!strnicmp(magic, "data", 4)) {
 
@@ -4127,7 +4305,7 @@
 	}
 	gf_isom_sample_del(&samp);
 	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_3G2A, 65536);
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) MP4T_RecomputeBitRate(import->dest, track);
+	if (import->flags & GF_IMPORT_FORCE_MPEG4) gf_media_update_bitrate(import->dest, track);
 	gf_set_progress("Importing QCP", size_in_packets, size_in_packets);
 
 exit:
@@ -4136,7 +4314,7 @@
 		import->esd = NULL;
 	}
 	gf_bs_del(bs);
-	fclose(mdia);
+	gf_fclose(mdia);
 	return e;
 }
 
@@ -4145,8 +4323,8 @@
 {
 	u32 c;
 	c = gf_bs_peek_bits(bs, 22, 0);
-	if (c==0x20) return 1;
-	return 0;
+	if (c==0x20) return GF_TRUE;
+	return GF_FALSE;
 }
 
 #define H263_CACHE_SIZE	4096
@@ -4223,7 +4401,7 @@
 	FILE *mdia;
 	GF_BitStream *bs;
 
-	mdia = gf_f64_open(import->in_name, "rb");
+	mdia = gf_fopen(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
 
 	e = GF_OK;
@@ -4335,7 +4513,7 @@
 
 exit:
 	gf_bs_del(bs);
-	fclose(mdia);
+	gf_fclose(mdia);
 	return e;
 }
 
@@ -4371,7 +4549,7 @@
 		samp->dataLength = 0;
 		gf_bs_get_content(newbs, &samp->data, &samp->dataLength);
 		gf_bs_del(newbs);
-		gf_isom_update_sample(file, track, i+1, samp, 1);
+		gf_isom_update_sample(file, track, i+1, samp, GF_TRUE);
 		gf_isom_sample_del(&samp);
 	}
 	gf_free(buffer);
@@ -4383,7 +4561,7 @@
 static GF_Err gf_import_avc_h264(GF_MediaImporter *import)
 {
 	u64 nal_start, nal_end, total_size;
-	u32 nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay;
+	u32 nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay, nb_nalus;
 	s32 idx, sei_recovery_frame_count;
 	u64 duration;
 	u8 nal_type;
@@ -4414,12 +4592,12 @@
 		return GF_OK;
 	}
 
-	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? 1 : 0;
+	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? GF_TRUE : GF_FALSE;
 
-	mdia = gf_f64_open(import->in_name, "rb");
+	mdia = gf_fopen(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
 
-	detect_fps = 1;
+	detect_fps = GF_TRUE;
 	FPS = (Double) import->video_fps;
 	if (!FPS) {
 		FPS = GF_IMPORT_DEFAULT_FPS;
@@ -4427,7 +4605,7 @@
 		if (import->video_fps == GF_IMPORT_AUTO_FPS)
 			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection is h264*/
 		else
-			detect_fps = 0;								/*fps is forced by the caller*/
+			detect_fps = GF_FALSE;								/*fps is forced by the caller*/
 	}
 	get_video_timing(FPS, &timescale, &dts_inc);
 
@@ -4444,7 +4622,7 @@
 	svccfg->complete_representation = 1;
 	buffer = (char*)gf_malloc(sizeof(char) * max_size);
 	sample_data = NULL;
-	first_avc = 1;
+	first_avc = GF_TRUE;
 	last_svc_sps = 0;
 	sei_recovery_frame_count = -1;
 
@@ -4482,28 +4660,29 @@
 	gf_isom_set_nalu_extract_mode(import->dest, track, GF_ISOM_NALU_EXTRACT_INSPECT);
 
 	sample_data = NULL;
-	sample_is_rap = 0;
-	sample_has_islice = 0;
+	sample_is_rap = GF_FALSE;
+	sample_has_islice = GF_FALSE;
 	cur_samp = 0;
-	is_paff = 0;
+	is_paff = GF_FALSE;
 	total_size = gf_bs_get_size(bs);
 	nal_start = gf_bs_get_position(bs);
 	duration = (u64) ( ((Double)import->duration) * timescale / 1000.0);
 
 	nb_i = nb_idr = nb_p = nb_b = nb_sp = nb_si = nb_sei = 0;
 	max_w = max_h = 0;
-	first_nal = 1;
+	first_nal = GF_TRUE;
 	ref_frame = 0;
 	last_poc = max_last_poc = max_last_b_poc = prev_last_poc = 0;
 	max_total_delay = 0;
 
-	gf_isom_set_cts_packing(import->dest, track, 1);
-	has_cts_offset = 0;
+	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
+	has_cts_offset = GF_FALSE;
 	min_poc = 0;
 	poc_shift = 0;
 	prev_nalu_prefix_size = 0;
 	res_prev_nalu_prefix = 0;
 	priority_prev_nalu_prefix = 0;
+	nb_nalus = 0;
 
 	while (gf_bs_available(bs)) {
 		u8 nal_hdr, skip_nal, is_subseq, add_sps;
@@ -4528,16 +4707,17 @@
 
 		is_subseq = 0;
 		skip_nal = 0;
-		copy_size = flush_sample = 0;
-		is_islice = 0;
+		copy_size = flush_sample = GF_FALSE;
+		is_islice = GF_FALSE;
 
 		if (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM || nal_type == GF_AVC_NALU_SVC_PREFIX_NALU || nal_type == GF_AVC_NALU_SVC_SLICE) {
-			avc.is_svc = 1;
+			avc.is_svc = GF_TRUE;
 		}
+		nb_nalus ++;
 
 		switch (gf_media_avc_parse_nalu(bs, nal_hdr, &avc)) {
 		case 1:
-			flush_sample = 1;
+			flush_sample = GF_TRUE;
 			break;
 		case -1:
 			gf_import_message(import, GF_OK, "Waring: Error parsing NAL unit");
@@ -4591,6 +4771,12 @@
 				}
 			}
 
+			//always keep NAL
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				copy_size = nal_size;
+			}
+
+			//first declaration of SPS,
 			if (add_sps) {
 				dstcfg->configurationVersion = 1;
 				dstcfg->profile_compatibility = avc.sps[idx].prof_compat;
@@ -4600,12 +4786,18 @@
 				dstcfg->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
 				dstcfg->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
 
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-				gf_list_add(dstcfg->sequenceParameterSets, slc);
+
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					copy_size = nal_size;
+				} else {
+					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					slc->size = nal_size;
+					slc->id = idx;
+					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+					memcpy(slc->data, buffer, sizeof(char)*slc->size);
+					gf_list_add(dstcfg->sequenceParameterSets, slc);
+				}
+
 				/*disable frame rate scan, most bitstreams have wrong values there*/
 				if (detect_fps && avc.sps[idx].vui.timing_info_present_flag
 				 /*if detected FPS is greater than 1000, assume wrong timing info*/
@@ -4642,7 +4834,7 @@
 					buffer = NULL;
 					gf_bs_del(bs);
 					bs = NULL;
-					gf_f64_seek(mdia, 0, SEEK_SET);
+					gf_fseek(mdia, 0, SEEK_SET);
 					goto restart_import;
 				}
 
@@ -4659,7 +4851,7 @@
 					copy_size = 0;
 				} else {
 					if (first_avc) {
-						first_avc = 0;
+						first_avc = GF_FALSE;
 						if (!(import->flags & GF_IMPORT_SVC_EXPLICIT)) {
 							gf_import_message(import, GF_OK, "AVC-H264 import - frame size %d x %d at %02.3f FPS", avc.sps[idx].width, avc.sps[idx].height, FPS);
 						}
@@ -4686,23 +4878,28 @@
 				copy_size = nal_size;
 			}
 
-			if (avc.pps[idx].status==1) {
-				avc.pps[idx].status = 2;
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-				dstcfg = (import->flags & GF_IMPORT_SVC_EXPLICIT) ? svccfg : avccfg;
+			//always keep NAL
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				copy_size = nal_size;
+			} else {
+				if (avc.pps[idx].status==1) {
+					avc.pps[idx].status = 2;
+					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					slc->size = nal_size;
+					slc->id = idx;
+					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+					memcpy(slc->data, buffer, sizeof(char)*slc->size);
+					dstcfg = (import->flags & GF_IMPORT_SVC_EXPLICIT) ? svccfg : avccfg;
 
-				/* by default, we put all PPS in the base AVC layer,
-				 they will be moved to the SVC layer upon analysis of SVC slice. */
-				dstcfg = avccfg;
+					/* by default, we put all PPS in the base AVC layer,
+					 they will be moved to the SVC layer upon analysis of SVC slice. */
+					dstcfg = avccfg;
 
-				if (import->flags & GF_IMPORT_SVC_EXPLICIT)
-					dstcfg = svccfg;
+					if (import->flags & GF_IMPORT_SVC_EXPLICIT)
+						dstcfg = svccfg;
 
-				gf_list_add(dstcfg->pictureParameterSets, slc);
+					gf_list_add(dstcfg->pictureParameterSets, slc);
+				}
 			}
 			break;
 		case GF_AVC_NALU_SEI:
@@ -4728,7 +4925,7 @@
 				case GF_AVC_TYPE_I:
 				case GF_AVC_TYPE2_I:
 					nb_i++;
-					is_islice = 1;
+					is_islice = GF_TRUE;
 					break;
 				case GF_AVC_TYPE_B:
 				case GF_AVC_TYPE2_B:
@@ -4758,14 +4955,13 @@
 				copy_size = 0;
 				break;
 			}
-			assert(prev_nalu_prefix_size==0);
 			copy_size = nal_size;
 			break;
 		case GF_AVC_NALU_SVC_SLICE:
 		{
 			u32 i;
 			for (i = 0; i < gf_list_count(avccfg->pictureParameterSets); i ++) {
-				slc = gf_list_get(avccfg->pictureParameterSets, i);
+				slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->pictureParameterSets, i);
 				if (avc.s_info.pps->id == slc->id) {
 					/* This PPS is used by an SVC NAL unit, it should be moved to the SVC Config Record) */
 					gf_list_rem(avccfg->pictureParameterSets, i);
@@ -4863,7 +5059,7 @@
 						gf_isom_sample_get_subsample(import->dest, track, cur_samp+1, nb_subs, &size, &priority, &reserved, &discardable);
 
 						/*remove last subsample entry!*/
-						gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, 0, 0, 0);
+						gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, 0, 0, GF_FALSE);
 					}
 				}
 
@@ -4890,12 +5086,12 @@
 			/*write sampleGroups info*/
 			if (!samp->IsRAP && ( (sei_recovery_frame_count>=0) || sample_has_islice) ) {
 				/*generic GDR*/
-				if (sei_recovery_frame_count>=0) {
+				if (sei_recovery_frame_count > 0) {
 					if (!use_opengop_gdr) use_opengop_gdr = 1;
 					e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, (s16) sei_recovery_frame_count);
 				}
 				/*open-GOP*/
-				else if (sample_has_islice) {
+				else if ((sei_recovery_frame_count == 0) && sample_has_islice) {
 					if (!use_opengop_gdr) use_opengop_gdr = 2;
 					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
 				}
@@ -4904,18 +5100,18 @@
 
 			gf_isom_sample_del(&samp);
 			gf_set_progress("Importing AVC-H264", (u32) (nal_start/1024), (u32) (total_size/1024) );
-			first_nal = 1;
+			first_nal = GF_TRUE;
 
 			if (min_poc > last_poc)
 				min_poc = last_poc;
 
-			sample_has_islice = 0;
+			sample_has_islice = GF_FALSE;
 			sei_recovery_frame_count = -1;
 		}
 
 		if (copy_size) {
 			if (is_islice)
-				sample_has_islice = 1;
+				sample_has_islice = GF_TRUE;
 
 			if ((size_length<32) && ( (u32) (1<<size_length)-1 < copy_size)) {
 				u32 diff_size = 8;
@@ -4971,7 +5167,7 @@
 				prio = (63 - (p[1] & 0x3F)) << 2;
 
 				if (set_subsamples) {
-					gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, prio, res, 1);
+					gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, prio, res, GF_TRUE);
 				}
 
 				if (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) {
@@ -4981,7 +5177,7 @@
 				}
 			} else if (set_subsamples) {
 				/* use the res and priority value of last prefix NALU */
-				gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, priority_prev_nalu_prefix, res_prev_nalu_prefix, 0);
+				gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, priority_prev_nalu_prefix, res_prev_nalu_prefix, GF_FALSE);
 			}
 			if (nal_type!=GF_AVC_NALU_SVC_PREFIX_NALU) {
 				res_prev_nalu_prefix = 0;
@@ -4991,7 +5187,7 @@
 			if (nal_type != GF_AVC_NALU_SVC_PREFIX_NALU) {
 				prev_nalu_prefix_size = 0;
 			} else {
-				prev_nalu_prefix_size = nal_size;
+				prev_nalu_prefix_size += nal_size;
 			}
 
 			switch (nal_type) {
@@ -5004,17 +5200,17 @@
 			case GF_AVC_NALU_SLICE_AUX:
 //			case GF_AVC_NALU_SVC_SLICE:
 				if (!is_paff && avc.s_info.bottom_field_flag)
-					is_paff = 1;
+					is_paff = GF_TRUE;
 
-				slice_is_ref = (avc.s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE);
+				slice_is_ref = (avc.s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE) ? GF_TRUE : GF_FALSE;
 				if (slice_is_ref)
 					nb_idr++;
-				slice_force_ref = 0;
+				slice_force_ref = GF_FALSE;
 
 				/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
 				SEI recovery should be used to build sampleToGroup & RollRecovery tables*/
 				if (first_nal) {
-					first_nal = 0;
+					first_nal = GF_FALSE;
 					if (avc.sei.recovery_point.valid || (import->flags & GF_IMPORT_FORCE_SYNC)) {
 						Bool bIntraSlice = gf_media_avc_slice_is_intra(&avc);
 						assert(avc.s_info.nal_unit_type!=GF_AVC_NALU_IDR_SLICE || bIntraSlice);
@@ -5031,7 +5227,7 @@
 						}
 						avc.sei.recovery_point.valid = 0;
 						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0))
-							slice_force_ref = 1;
+							slice_force_ref = GF_TRUE;
 					}
 					sample_is_rap = gf_media_avc_slice_is_IDR(&avc);
 				}
@@ -5080,7 +5276,7 @@
 				/*stricly greater*/
 				else if (max_last_poc>last_poc) {
 					/*need to store TS offsets*/
-					has_cts_offset = 1;
+					has_cts_offset = GF_TRUE;
 					switch (avc.s_info.slice_type) {
 					case GF_AVC_TYPE_B:
 					case GF_AVC_TYPE2_B:
@@ -5226,7 +5422,7 @@
 			gf_isom_sample_del(&samp);
 		}
 		/*and repack table*/
-		gf_isom_set_cts_packing(import->dest, track, 0);
+		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 
 		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST) && min_cts) {
 			last_dts = max_cts - min_cts + gf_isom_get_sample_duration(import->dest, track, gf_isom_get_sample_count(import->dest, track) );
@@ -5245,35 +5441,41 @@
 	avccfg->nal_unit_size = size_length/8;
 	svccfg->nal_unit_size = size_length/8;
 
-	if (gf_list_count(avccfg->sequenceParameterSets) || !gf_list_count(svccfg->sequenceParameterSets) ) {
+
+	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+		gf_isom_avc_config_update(import->dest, track, 1, avccfg);
+		gf_isom_avc_set_inband_config(import->dest, track, 1);
+	} else if (gf_list_count(avccfg->sequenceParameterSets) || !gf_list_count(svccfg->sequenceParameterSets) ) {
 		gf_isom_avc_config_update(import->dest, track, 1, avccfg);
 		if (gf_list_count(svccfg->sequenceParameterSets)) {
-			gf_isom_svc_config_update(import->dest, track, 1, svccfg, 1);
+			gf_isom_svc_config_update(import->dest, track, 1, svccfg, GF_TRUE);
 		}
 	} else {
-		gf_isom_svc_config_update(import->dest, track, 1, svccfg, 0);
+		gf_isom_svc_config_update(import->dest, track, 1, svccfg, GF_FALSE);
 	}
+
+
 	gf_media_update_par(import->dest, track);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0x15);
+	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0x7F);
 	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_AVC1, 1);
 
-	if (!gf_list_count(avccfg->sequenceParameterSets) && !gf_list_count(svccfg->sequenceParameterSets)) {
+	if (!gf_list_count(avccfg->sequenceParameterSets) && !gf_list_count(svccfg->sequenceParameterSets) && !(import->flags & GF_IMPORT_FORCE_XPS_INBAND)) {
 		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
 	} else {
 		u32 i;
 		if (nb_sp || nb_si) {
-			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
-			 cur_samp, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
+			gf_import_message(import, GF_OK, "AVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
+			 cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
 		} else {
-			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B - %d SEI - %d IDR",
-			 cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
+			gf_import_message(import, GF_OK, "AVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B - %d SEI - %d IDR",
+			 cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sei, nb_idr);
 		}
 
 		for (i=0; i<gf_list_count(svccfg->sequenceParameterSets); i++) {
 			AVC_SPS *sps;
-			GF_AVCConfigSlot *svcc = gf_list_get(svccfg->sequenceParameterSets, i);
+			GF_AVCConfigSlot *svcc = (GF_AVCConfigSlot*)gf_list_get(svccfg->sequenceParameterSets, i);
 			sps = & avc.sps[svcc->id];
 			if (sps && (sps->state & AVC_SUBSPS_PARSED)) {
 				gf_import_message(import, GF_OK, "SVC (SSPS ID %d) Import results: Slices: %d I %d P %d B", svcc->id - GF_SVC_SSPS_ID_SHIFT, sps->nb_ei, sps->nb_ep, sps->nb_eb);
@@ -5306,7 +5508,7 @@
 	gf_odf_avc_cfg_del(svccfg);
 	gf_free(buffer);
 	gf_bs_del(bs);
-	fclose(mdia);
+	gf_fclose(mdia);
 	return e;
 }
 
@@ -5315,7 +5517,7 @@
 {
 	u32 i, count = hevc_cfg->param_array ? gf_list_count(hevc_cfg->param_array) : 0;
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = gf_list_get(hevc_cfg->param_array, i);
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(hevc_cfg->param_array, i);
 		if (ar->type==type) return ar;
 	}
 	return NULL;
@@ -5341,7 +5543,7 @@
 
 	for (i=0; i<count; i++) {
 		HEVC_PPS *pps;
-		GF_AVCConfigSlot *slc = gf_list_get(ar->nalus, i);
+		GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, i);
 		s32 idx = gf_media_hevc_read_pps(slc->data, slc->size, &hevc);
 
 		if (idx>=0) {
@@ -5368,7 +5570,7 @@
 #else
 	Bool detect_fps;
 	u64 nal_start, nal_end, total_size;
-	u32 i, nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay;
+	u32 i, nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay, nb_nalus;
 	s32 idx, sei_recovery_frame_count;
 	u64 duration;
 	GF_Err e;
@@ -5379,12 +5581,14 @@
 	GF_HEVCParamArray *spss, *ppss, *vpss;
 	GF_BitStream *bs;
 	GF_BitStream *sample_data;
-	Bool flush_sample, flush_next_sample, is_empty_sample, sample_is_rap, sample_has_islice, is_islice, first_nal, slice_is_ref, has_cts_offset, is_paff, set_subsamples, slice_force_ref;
+	Bool flush_sample, flush_next_sample, is_empty_sample, sample_has_islice, is_islice, first_nal, slice_is_ref, has_cts_offset, is_paff, set_subsamples, slice_force_ref;
 	u32 ref_frame, timescale, copy_size, size_length, dts_inc;
 	s32 last_poc, max_last_poc, max_last_b_poc, poc_diff, prev_last_poc, min_poc, poc_shift;
 	Bool first_hevc;
 	u32 use_opengop_gdr = 0;
 	u8 layer_ids[64];
+	SAPType sample_rap_type;
+
 
 	Double FPS;
 	char *buffer;
@@ -5398,9 +5602,9 @@
 		return GF_OK;
 	}
 
-	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? 1 : 0;
+	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? GF_TRUE : GF_FALSE;
 
-	mdia = gf_f64_open(import->in_name, "rb");
+	mdia = gf_fopen(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
 
 	detect_fps = GF_TRUE;
@@ -5425,13 +5629,14 @@
 	hevc.sps_active_idx = -1;
 	dst_cfg = hevc_cfg = gf_odf_hevc_cfg_new();
 	shvc_cfg = gf_odf_hevc_cfg_new();
-	shvc_cfg->complete_representation = 1;
-	shvc_cfg->non_hevc_base_layer = 0;
+	shvc_cfg->complete_representation = GF_TRUE;
+	shvc_cfg->non_hevc_base_layer = GF_FALSE;
 	buffer = (char*)gf_malloc(sizeof(char) * max_size);
 	sample_data = NULL;
-	first_hevc = 1;
+	first_hevc = GF_TRUE;
 	sei_recovery_frame_count = -1;
 	spss = ppss = vpss = NULL;
+	nb_nalus = 0;
 
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
 	if (!gf_media_nalu_is_start_code(bs)) {
@@ -5468,17 +5673,17 @@
 	memset(layer_ids, 0, sizeof(u8)*64);
 
 	sample_data = NULL;
-	sample_is_rap = 0;
-	sample_has_islice = 0;
+	sample_rap_type = RAP_NO;
+	sample_has_islice = GF_FALSE;
 	cur_samp = 0;
-	is_paff = 0;
+	is_paff = GF_FALSE;
 	total_size = gf_bs_get_size(bs);
 	nal_start = gf_bs_get_position(bs);
 	duration = (u64) ( ((Double)import->duration) * timescale / 1000.0);
 
 	nb_i = nb_idr = nb_p = nb_b = nb_sp = nb_si = nb_sei = 0;
 	max_w = max_h = 0;
-	first_nal = 1;
+	first_nal = GF_TRUE;
 	ref_frame = 0;
 	last_poc = max_last_poc = max_last_b_poc = prev_last_poc = 0;
 	max_total_delay = 0;
@@ -5498,7 +5703,7 @@
 		Bool skip_nal, add_sps, is_slice, has_vcl_nal;
 		u32 nal_and_trailing_size;
 
-		has_vcl_nal = 0;
+		has_vcl_nal = GF_FALSE;
 		nal_and_trailing_size = nal_size = gf_media_nalu_next_start_code_bs(bs);
 		if (!(import->flags & GF_IMPORT_KEEP_TRAILING)) {
 			nal_size = gf_media_nalu_payload_end_bs(bs);
@@ -5521,13 +5726,22 @@
 			goto next_nal;
 		}
 
-		is_islice = 0;
+		if (import->max_temporal_id_plus_one && (temporal_id+1 > import->max_temporal_id_plus_one)) {
+			goto next_nal;
+		}
+		if (import->max_layer_id_plus_one && (layer_id+1 > import->max_layer_id_plus_one)) {
+			goto next_nal;
+		}
+
+		nb_nalus++;
+
+		is_islice = GF_FALSE;
 
 		prev_cfg = dst_cfg;
 		//todo check layer type, for now only scalable (not 3D etc) ...
 		if (import->flags & GF_IMPORT_SVC_EXPLICIT) {
 			dst_cfg = shvc_cfg;
-			force_shvc = 1;
+			force_shvc = GF_TRUE;
 		} else
 			dst_cfg = layer_id ? shvc_cfg : hevc_cfg;
 
@@ -5537,28 +5751,28 @@
 			ppss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_PIC_PARAM);
 		}
 
-		skip_nal = 0;
-		copy_size = flush_sample = 0;
-		is_slice = 0;
+		skip_nal = GF_FALSE;
+		copy_size = flush_sample = GF_FALSE;
+		is_slice = GF_FALSE;
 
 		switch (res) {
 		case 1:
-			flush_sample = 1;
+			flush_sample = GF_TRUE;
 			break;
 		case -1:
 			gf_import_message(import, GF_OK, "Waring: Error parsing NAL unit");
-			skip_nal = 1;
+			skip_nal = GF_TRUE;
 			break;
 		case -2:
-			skip_nal = 1;
+			skip_nal = GF_TRUE;
 			break;
 		default:
 			break;
 		}
 
 		if (! layer_id && flush_next_sample && (nal_unit_type!=GF_HEVC_NALU_SEI_SUFFIX)) {
-			flush_next_sample = 0;
-			flush_sample = 1;
+			flush_next_sample = GF_FALSE;
+			flush_sample = GF_TRUE;
 		}
 
 		switch (nal_unit_type) {
@@ -5572,7 +5786,7 @@
 			if (hevc.vps[idx].state == 2) {
 				if (hevc.vps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
-					has_vcl_nal = 1;
+					has_vcl_nal = GF_TRUE;
 					assert(vpss);
 					vpss->array_completeness = 0;
 				}
@@ -5596,14 +5810,24 @@
 					vpss->type = GF_HEVC_NALU_VID_PARAM;
 				}
 
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					vpss->array_completeness = 0;
+					copy_size = nal_size;
+				} else {
+					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					slc->size = nal_size;
+					slc->id = idx;
+					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+					memcpy(slc->data, buffer, sizeof(char)*slc->size);
 
-				gf_list_add(vpss->nalus, slc);
+					gf_list_add(vpss->nalus, slc);
+				}
+			}
+
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				copy_size = nal_size;
 			}
+
 			break;
 		case GF_HEVC_NALU_SEQ_PARAM:
 			idx = gf_media_hevc_read_sps(buffer, nal_size, &hevc);
@@ -5611,10 +5835,10 @@
 				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing SeqInfo");
 				break;
 			}
-			add_sps = 0;
+			add_sps = GF_FALSE;
 			if ((hevc.sps[idx].state & AVC_SPS_PARSED) && !(hevc.sps[idx].state & AVC_SPS_DECLARED)) {
 				hevc.sps[idx].state |= AVC_SPS_DECLARED;
-				add_sps = 1;
+				add_sps = GF_TRUE;
 				hevc.sps[idx].crc = gf_crc_32(buffer, nal_size);
 			}
 
@@ -5622,7 +5846,7 @@
 			else if (hevc.sps[idx].state & AVC_SPS_DECLARED) {
 				if (hevc.sps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
-					has_vcl_nal = 1;
+					has_vcl_nal = GF_TRUE;
 					assert(spss);
 					spss->array_completeness = 0;
 				}
@@ -5654,13 +5878,6 @@
 					spss->type = GF_HEVC_NALU_SEQ_PARAM;
 				}
 
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-				gf_list_add(spss->nalus, slc);
-
 				/*disable frame rate scan, most bitstreams have wrong values there*/
 				if (detect_fps && hevc.sps[idx].has_timing_info
 				 /*if detected FPS is greater than 1000, assume wrong timing info*/
@@ -5669,7 +5886,7 @@
 					timescale = hevc.sps[idx].time_scale;
 					dts_inc = hevc.sps[idx].num_units_in_tick;
 					FPS = (Double)timescale / dts_inc;
-					detect_fps = 0;
+					detect_fps = GF_FALSE;
 					gf_isom_remove_track(import->dest, track);
 					if (sample_data) gf_bs_del(sample_data);
 					gf_odf_hevc_cfg_del(hevc_cfg);
@@ -5680,12 +5897,24 @@
 					buffer = NULL;
 					gf_bs_del(bs);
 					bs = NULL;
-					gf_f64_seek(mdia, 0, SEEK_SET);
+					gf_fseek(mdia, 0, SEEK_SET);
 					goto restart_import;
 				}
 
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					spss->array_completeness = 0;
+					copy_size = nal_size;
+				} else {
+					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					slc->size = nal_size;
+					slc->id = idx;
+					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+					memcpy(slc->data, buffer, sizeof(char)*slc->size);
+					gf_list_add(spss->nalus, slc);
+				}
+
 				if (first_hevc) {
-					first_hevc = 0;
+					first_hevc = GF_FALSE;
 					gf_import_message(import, GF_OK, "HEVC import - frame size %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
 				} else {
 					gf_import_message(import, GF_OK, "SHVC detected - %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
@@ -5697,6 +5926,9 @@
 					max_h = hevc.sps[idx].height;
 				}
 			}
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				copy_size = nal_size;
+			}
 			break;
 
 		case GF_HEVC_NALU_PIC_PARAM:
@@ -5709,7 +5941,7 @@
 			if (hevc.pps[idx].state == 2) {
 				if (hevc.pps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
-					has_vcl_nal = 1;
+					has_vcl_nal = GF_TRUE;
 					assert(ppss);
 					ppss->array_completeness = 0;
 				}
@@ -5727,26 +5959,41 @@
 					ppss->type = GF_HEVC_NALU_PIC_PARAM;
 				}
 
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					ppss->array_completeness = 0;
+					copy_size = nal_size;
+				} else {
+					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					slc->size = nal_size;
+					slc->id = idx;
+					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+					memcpy(slc->data, buffer, sizeof(char)*slc->size);
 
-				gf_list_add(ppss->nalus, slc);
+					gf_list_add(ppss->nalus, slc);
+				}
+			}
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				copy_size = nal_size;
 			}
+
 			break;
 		case GF_HEVC_NALU_SEI_SUFFIX:
-			if (!layer_id) flush_next_sample = 1;
-		case GF_HEVC_NALU_SEI_PREFIX:
+			if (!layer_id) flush_next_sample = GF_TRUE;
 			if (hevc.sps_active_idx != -1) {
-				/*TODO*/
-				//copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &hevc);
 				copy_size = nal_size;
 				if (copy_size)
 					nb_sei++;
 			}
 			break;
+		case GF_HEVC_NALU_SEI_PREFIX:
+			if (hevc.sps_active_idx != -1) {
+				copy_size = nal_size;
+				if (copy_size) {
+					nb_sei++;
+					flush_sample = GF_TRUE;
+				}
+			}
+			break;
 
 		/*slice_segment_layer_rbsp*/
 		case GF_HEVC_NALU_SLICE_STSA_N:
@@ -5765,7 +6012,7 @@
 		case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 		case GF_HEVC_NALU_SLICE_IDR_N_LP:
 		case GF_HEVC_NALU_SLICE_CRA:
-			is_slice = 1;
+			is_slice = GF_TRUE;
 			/*			if ((hevc.s_info.slice_segment_address<=100) || (hevc.s_info.slice_segment_address>=200))
 							skip_nal = 1;
 						if (!hevc.s_info.slice_segment_address)
@@ -5773,14 +6020,14 @@
 			*/
 			if (! skip_nal) {
 				copy_size = nal_size;
-				has_vcl_nal = 1;
+				has_vcl_nal = GF_TRUE;
 				switch (hevc.s_info.slice_type) {
 				case GF_HEVC_TYPE_P:
 					nb_p++;
 					break;
 				case GF_HEVC_TYPE_I:
 					nb_i++;
-					is_islice = 1;
+					is_islice = GF_TRUE;
 					break;
 				case GF_HEVC_TYPE_B:
 					nb_b++;
@@ -5805,13 +6052,13 @@
 		if (!nal_size) break;
 
 		if (flush_sample && is_empty_sample)
-			flush_sample = 0;
+			flush_sample = GF_FALSE;
 
 		if (flush_sample && sample_data) {
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->DTS = (u64)dts_inc*cur_samp;
-			samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
-			if (!sample_is_rap) {
+			samp->IsRAP = ((sample_rap_type==SAP_TYPE_1) || (sample_rap_type==SAP_TYPE_2)) ? RAP : RAP_NO;
+			if (! samp->IsRAP) {
 				if (sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) {
 					samp->IsRAP = RAP;
 					if (!use_opengop_gdr) {
@@ -5836,12 +6083,12 @@
 			/*write sampleGroups info*/
 			if (!samp->IsRAP && ((sei_recovery_frame_count>=0) || sample_has_islice) ) {
 				/*generic GDR*/
-				if (sei_recovery_frame_count >= 0) {
+				if (sei_recovery_frame_count > 0) {
 					if (!use_opengop_gdr) use_opengop_gdr = 1;
 					e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, (s16) sei_recovery_frame_count);
 				}
 				/*open-GOP*/
-				else if (sample_has_islice) {
+				else if (sample_rap_type==SAP_TYPE_3) {
 					if (!use_opengop_gdr) use_opengop_gdr = 2;
 					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
 				}
@@ -5850,19 +6097,19 @@
 
 			gf_isom_sample_del(&samp);
 			gf_set_progress("Importing HEVC", (u32) (nal_start/1024), (u32) (total_size/1024) );
-			first_nal = 1;
+			first_nal = GF_TRUE;
 
 			if (min_poc > last_poc)
 				min_poc = last_poc;
 
-			sample_has_islice = 0;
+			sample_has_islice = GF_FALSE;
 			sei_recovery_frame_count = -1;
-			is_empty_sample = 1;
+			is_empty_sample = GF_TRUE;
 		}
 
 		if (copy_size) {
 			if (is_islice)
-				sample_has_islice = 1;
+				sample_has_islice = GF_TRUE;
 
 			if ((size_length<32) && ( (u32) (1<<size_length)-1 < copy_size)) {
 				u32 diff_size = 8;
@@ -5903,11 +6150,11 @@
 
 			if (set_subsamples) {
 				/* use the res and priority value of last prefix NALU */
-				gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, 0, 0, 0);
+				gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, 0, 0, GF_FALSE);
 			}
 
 			if (has_vcl_nal) {
-				is_empty_sample = 0;
+				is_empty_sample = GF_FALSE;
 			}
 			layer_ids[layer_id] = 1;
 
@@ -5917,16 +6164,14 @@
 				slice_is_ref = gf_media_hevc_slice_is_IDR(&hevc);
 				if (slice_is_ref)
 					nb_idr++;
-				slice_force_ref = 0;
+				slice_force_ref = GF_FALSE;
 
 				/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
 				SEI recovery should be used to build sampleToGroup & RollRecovery tables*/
 				if (first_nal) {
-					first_nal = 0;
+					first_nal = GF_FALSE;
 					if (hevc.sei.recovery_point.valid || (import->flags & GF_IMPORT_FORCE_SYNC)) {
 						Bool bIntraSlice = gf_media_hevc_slice_is_intra(&hevc);
-						assert(hevc.s_info.nal_unit_type!=GF_AVC_NALU_IDR_SLICE || bIntraSlice);
-
 						sei_recovery_frame_count = hevc.sei.recovery_point.frame_cnt;
 
 						/*we allow to mark I-frames as sync on open-GOPs (with sei_recovery_frame_count=0) when forcing sync even when the SEI RP is not available*/
@@ -5939,9 +6184,26 @@
 						}
 						hevc.sei.recovery_point.valid = 0;
 						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0))
-							slice_force_ref = 1;
+							slice_force_ref = GF_TRUE;
+					}
+					sample_rap_type = RAP_NO;
+					if (gf_media_hevc_slice_is_IDR(&hevc)) {
+						sample_rap_type = SAP_TYPE_1;
+					}
+					else {
+						switch (hevc.s_info.nal_unit_type) {
+						case GF_HEVC_NALU_SLICE_BLA_W_LP:
+						case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+							sample_rap_type = SAP_TYPE_3;
+							break;
+						case GF_HEVC_NALU_SLICE_BLA_N_LP:
+							sample_rap_type = SAP_TYPE_1;
+							break;
+						case GF_HEVC_NALU_SLICE_CRA:
+							sample_rap_type = SAP_TYPE_3;
+							break;
+						}
 					}
-					sample_is_rap = gf_media_hevc_slice_is_IDR(&hevc);
 				}
 
 				if (hevc.s_info.poc<poc_shift) {
@@ -5988,7 +6250,7 @@
 				/*stricly greater*/
 				else if (max_last_poc>last_poc) {
 					/*need to store TS offsets*/
-					has_cts_offset = 1;
+					has_cts_offset = GF_TRUE;
 					switch (hevc.s_info.slice_type) {
 					case GF_AVC_TYPE_B:
 					case GF_AVC_TYPE2_B:
@@ -6042,8 +6304,8 @@
 	if (sample_data) {
 		GF_ISOSample *samp = gf_isom_sample_new();
 		samp->DTS = (u64)dts_inc*cur_samp;
-		samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
-		if (!sample_is_rap && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
+		samp->IsRAP = (sample_rap_type == SAP_TYPE_1) ? RAP : RAP_NO;
+		if (!sample_rap_type && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
 			samp->IsRAP = RAP;
 		}
 		/*we store the frame order (based on the POC) as the CTS offset and update the whole table at the end*/
@@ -6135,7 +6397,7 @@
 			gf_isom_sample_del(&samp);
 		}
 		/*and repack table*/
-		gf_isom_set_cts_packing(import->dest, track, 0);
+		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 
 		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST) && min_cts) {
 			last_dts = max_cts - min_cts + gf_isom_get_sample_duration(import->dest, track, gf_isom_get_sample_count(import->dest, track) );
@@ -6158,7 +6420,12 @@
 			shvc_cfg->num_layers ++;
 	}
 
-	if (gf_list_count(hevc_cfg->param_array) || !gf_list_count(shvc_cfg->param_array) ) {
+
+	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+		hevc_set_parall_type(hevc_cfg);
+		gf_isom_hevc_config_update(import->dest, track, 1, hevc_cfg);
+		gf_isom_hevc_set_inband_config(import->dest, track, 1);
+	} else if (gf_list_count(hevc_cfg->param_array) || !gf_list_count(shvc_cfg->param_array) ) {
 		hevc_set_parall_type(hevc_cfg);
 		gf_isom_hevc_config_update(import->dest, track, 1, hevc_cfg);
 		if (gf_list_count(shvc_cfg->param_array)) {
@@ -6169,15 +6436,15 @@
 			shvc_cfg->numTemporalLayers = hevc_cfg->numTemporalLayers;
 			shvc_cfg->temporalIdNested = hevc_cfg->temporalIdNested;
 
-			gf_isom_shvc_config_update(import->dest, track, 1, shvc_cfg, 1);
+			gf_isom_shvc_config_update(import->dest, track, 1, shvc_cfg, GF_TRUE);
 		}
 	} else {
 		hevc_set_parall_type(shvc_cfg);
-		gf_isom_shvc_config_update(import->dest, track, 1, shvc_cfg, 0);
+		gf_isom_shvc_config_update(import->dest, track, 1, shvc_cfg, GF_FALSE);
 	}
 
 	gf_media_update_par(import->dest, track);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 
 //	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0x15);
 	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_ISO4, 1);
@@ -6188,11 +6455,11 @@
 		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
 	} else {
 		if (nb_sp || nb_si) {
-			gf_import_message(import, GF_OK, "HEVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
-			 cur_samp, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
+			gf_import_message(import, GF_OK, "HEVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
+			 cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
 		} else {
-			gf_import_message(import, GF_OK, "HEVC Import results: %d samples - Slices: %d I %d P %d B - %d SEI - %d IDR",
-			 cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
+			gf_import_message(import, GF_OK, "HEVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B - %d SEI - %d IDR",
+			 cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sei, nb_idr);
 		}
 
 		if (max_total_delay>1) {
@@ -6221,7 +6488,7 @@
 	gf_odf_hevc_cfg_del(shvc_cfg);
 	gf_free(buffer);
 	gf_bs_del(bs);
-	fclose(mdia);
+	gf_fclose(mdia);
 	return e;
 #endif //GPAC_DISABLE_HEVC
 }
@@ -6234,14 +6501,14 @@
 
 Bool OGG_ReadPage(FILE *f_in, ogg_sync_state *oy, ogg_page *oggpage)
 {
-	if (feof(f_in)) return 0;
+	if (feof(f_in)) return GF_FALSE;
 	while (ogg_sync_pageout(oy, oggpage ) != 1 ) {
 		char *buffer = ogg_sync_buffer(oy, OGG_BUFFER_SIZE);
 		u32 bytes = (u32) fread(buffer, sizeof(char), OGG_BUFFER_SIZE, f_in);
 		ogg_sync_wrote(oy, bytes);
-		if (feof(f_in)) return 1;
+		if (feof(f_in)) return GF_TRUE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 static u32 get_ogg_serial_no_for_stream(char *fileName, u32 stream_num, Bool is_video)
@@ -6256,7 +6523,7 @@
 	/*means first one*/
 	if (!stream_num) return 0;
 
-	f_in = gf_f64_open(fileName, "rb");
+	f_in = gf_fopen(fileName, "rb");
 	if (!f_in) return 0;
 
 	track = 0;
@@ -6285,7 +6552,7 @@
 		serial_no = 0;
 	}
 	ogg_sync_clear(&oy);
-	fclose(f_in);
+	gf_fclose(f_in);
 	return serial_no;
 }
 
@@ -6311,17 +6578,17 @@
 	dts_inc = 0;
 	/*assume audio or simple AV file*/
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		f_in = gf_f64_open(import->in_name, "rb");
+		f_in = gf_fopen(import->in_name, "rb");
 		if (!f_in) return GF_URL_ERROR;
 
 		import->nb_tracks = 0;
-		go = 1;
+		go = GF_TRUE;
 		ogg_sync_init(&oy);
 		while (go) {
 			if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
 
 			if (!ogg_page_bos(&oggpage)) {
-				go = 0;
+				go = GF_FALSE;
 				continue;
 			}
 			serial_no = ogg_page_serialno(&oggpage);
@@ -6353,27 +6620,27 @@
 			import->nb_tracks++;
 		}
 		ogg_sync_clear(&oy);
-		fclose(f_in);
+		gf_fclose(f_in);
 		return GF_OK;
 	}
 
 	if (import->flags & GF_IMPORT_USE_DATAREF) return gf_import_message(import, GF_NOT_SUPPORTED, "Cannot use data referencing with OGG files");
 
-	sno = get_ogg_serial_no_for_stream(import->in_name, import->trackID, 1);
+	sno = get_ogg_serial_no_for_stream(import->in_name, import->trackID, GF_TRUE);
 	/*not our stream*/
 	if (!sno && import->trackID) return GF_OK;
 
-	f_in = gf_f64_open(import->in_name, "rb");
+	f_in = gf_fopen(import->in_name, "rb");
 	if (!f_in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 	e = GF_OK;
 	done = 0;
-	gf_f64_seek(f_in, 0, SEEK_END);
-	tot_size = gf_f64_tell(f_in);
-	gf_f64_seek(f_in, 0, SEEK_SET);
+	gf_fseek(f_in, 0, SEEK_END);
+	tot_size = gf_ftell(f_in);
+	gf_fseek(f_in, 0, SEEK_SET);
 
 
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	samp = gf_isom_sample_new();
 
 	/*avoids gcc warnings*/
@@ -6385,7 +6652,7 @@
 
 	bs = NULL;
 	serial_no = 0;
-	go = 1;
+	go = GF_TRUE;
 	while (go) {
 		if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
 
@@ -6457,7 +6724,7 @@
 				/*let's go, create the track*/
 				if (num_headers==3) {
 					if (!import->esd) {
-						destroy_esd = 1;
+						destroy_esd = GF_TRUE;
 						import->esd = gf_odf_desc_esd_new(0);
 					}
 					get_video_timing(FPS, &timescale, &dts_inc);
@@ -6508,7 +6775,7 @@
 			gf_set_progress("Importing OGG Video", (u32) (done/1024), (u32) (tot_size/1024));
 			done += oggpacket.bytes;
 			if ((duration && (samp->DTS > duration) ) || (import->flags & GF_IMPORT_DO_ABORT)) {
-				go = 0;
+				go = GF_FALSE;
 				break;
 			}
 		}
@@ -6518,7 +6785,7 @@
 	if (!serial_no) {
 		gf_import_message(import, GF_OK, "OGG: No supported video found");
 	} else {
-		MP4T_RecomputeBitRate(import->dest, track);
+		gf_media_update_bitrate(import->dest, track);
 
 		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0xFE);
 	}
@@ -6533,7 +6800,7 @@
 		gf_odf_desc_del((GF_Descriptor *) import->esd);
 		import->esd = NULL;
 	}
-	fclose(f_in);
+	gf_fclose(f_in);
 	return e;
 }
 
@@ -6562,19 +6829,19 @@
 
 	if (import->flags & GF_IMPORT_USE_DATAREF) return gf_import_message(import, GF_NOT_SUPPORTED, "Cannot use data referencing with OGG files");
 
-	sno = get_ogg_serial_no_for_stream(import->in_name, import->trackID, 0);
+	sno = get_ogg_serial_no_for_stream(import->in_name, import->trackID, GF_FALSE);
 	/*not our stream*/
 	if (!sno && import->trackID) return GF_OK;
 
-	f_in = gf_f64_open(import->in_name, "rb");
+	f_in = gf_fopen(import->in_name, "rb");
 	if (!f_in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 	e = GF_OK;
 
 	done = 0;
-	gf_f64_seek(f_in, 0, SEEK_END);
-	tot_size = gf_f64_tell(f_in);
-	gf_f64_seek(f_in, 0, SEEK_SET);
+	gf_fseek(f_in, 0, SEEK_END);
+	tot_size = gf_ftell(f_in);
+	gf_fseek(f_in, 0, SEEK_SET);
 
 	destroy_esd = GF_FALSE;
 	samp = gf_isom_sample_new();
@@ -6586,7 +6853,7 @@
 
 	vbs = NULL;
 	serial_no = 0;
-	go = 1;
+	go = GF_TRUE;
 	while (go) {
 		if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
 
@@ -6641,7 +6908,7 @@
 					gf_import_message(import, GF_OK, "OGG Vorbis import - sample rate %d - %d channel%s", vp.sample_rate, vp.channels, (vp.channels>1) ? "s" : "");
 
 					if (!import->esd) {
-						destroy_esd = 1;
+						destroy_esd = GF_TRUE;
 						import->esd = gf_odf_desc_esd_new(0);
 					}
 					track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, vp.sample_rate);
@@ -6689,7 +6956,7 @@
 			gf_set_progress("Importing OGG Audio", (u32) done, (u32) tot_size);
 			done += oggpacket.bytes;
 			if ((duration && (samp->DTS > duration) ) || (import->flags & GF_IMPORT_DO_ABORT)) {
-				go = 0;
+				go = GF_FALSE;
 				break;
 			}
 		}
@@ -6703,7 +6970,7 @@
 		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, 0xFE);
 		gf_set_progress("Importing OGG Audio", (u32) tot_size, (u32) tot_size);
 
-		MP4T_RecomputeBitRate(import->dest, track);
+		gf_media_update_bitrate(import->dest, track);
 	}
 
 exit:
@@ -6715,7 +6982,7 @@
 		gf_odf_desc_del((GF_Descriptor *) import->esd);
 		import->esd = NULL;
 	}
-	fclose(f_in);
+	gf_fclose(f_in);
 	return e;
 #endif /*defined(GPAC_DISABLE_AV_PARSERS) */
 }
@@ -6727,7 +6994,7 @@
 {
 	GF_Err e;
 	GF_ISOSample *samp;
-	u32 mtype, track, di, timescale, readen;
+	u32 mtype, track, di, timescale, read;
 	FILE *src;
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
@@ -6739,7 +7006,7 @@
 		return gf_import_message(import, GF_BAD_PARAM, "Raw stream needs ESD and DecoderConfig for import");
 	}
 
-	src = gf_f64_open(import->in_name, "rb");
+	src = gf_fopen(import->in_name, "rb");
 	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 	switch (import->esd->decoderConfig->streamType) {
@@ -6796,19 +7063,23 @@
 	gf_import_message(import, GF_OK, "Raw Access Unit import (StreamType %s)", gf_odf_stream_type_name(import->esd->decoderConfig->streamType));
 
 	samp = gf_isom_sample_new();
-	gf_f64_seek(src, 0, SEEK_END);
-	assert(gf_f64_tell(src) < 1<<31);
-	samp->dataLength = (u32) gf_f64_tell(src);
-	gf_f64_seek(src, 0, SEEK_SET);
+	gf_fseek(src, 0, SEEK_END);
+	assert(gf_ftell(src) < 1<<31);
+	samp->dataLength = (u32) gf_ftell(src);
+	gf_fseek(src, 0, SEEK_SET);
 	samp->IsRAP = RAP;
 	samp->data = (char *)gf_malloc(sizeof(char)*samp->dataLength);
-	readen = (u32) fread(samp->data, sizeof(char), samp->dataLength, src);
-	assert( readen == samp->dataLength );
+	read = (u32) fread(samp->data, sizeof(char), samp->dataLength, src);
+	if ( read != samp->dataLength ) {
+		e = gf_import_message(import, GF_IO_ERR, "Failed to read raw unit %d bytes", samp->dataLength);
+		goto exit;
+
+	}
 	e = gf_isom_add_sample(import->dest, track, di, samp);
 	gf_isom_sample_del(&samp);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 exit:
-	fclose(src);
+	gf_fclose(src);
 	return e;
 }
 
@@ -6825,7 +7096,7 @@
 		import->flags |= GF_IMPORT_USE_DATAREF;
 	}
 
-	saf = gf_f64_open(import->in_name, "rb");
+	saf = gf_fopen(import->in_name, "rb");
 	if (!saf) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
 	track = 0;
@@ -6836,14 +7107,14 @@
 	while (gf_bs_available(bs)) {
 		Bool is_rap;
 		u32 cts, au_size, type, stream_id;
-		is_rap = gf_bs_read_int(bs, 1);
+		is_rap = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 15);
 		gf_bs_read_int(bs, 2);
 		cts = gf_bs_read_int(bs, 30);
 		au_size = gf_bs_read_u16(bs);
 		if (au_size<2) {
 			gf_bs_del(bs);
-			fclose(saf);
+			gf_fclose(saf);
 			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Invalid SAF Packet Header");
 		}
 		type = gf_bs_read_int(bs, 4);
@@ -6872,7 +7143,7 @@
 				mtype = GF_ISOM_MEDIA_SCENE;
 				name = (char *) ( (oti==GPAC_OTI_SCENE_LASER) ? "LASeR Scene" : "BIFS Scene" );
 				stype = (oti==GPAC_OTI_SCENE_LASER) ? GF_4CC('L','A','S','R') : GF_4CC('B','I','F','S');
-				in_root_od = 1;
+				in_root_od = GF_TRUE;
 			}
 			else if (st==GF_STREAM_VISUAL) {
 				mtype = GF_ISOM_MEDIA_VISUAL;
@@ -7007,7 +7278,7 @@
 			gf_isom_sample_del(&samp);
 			if (e) {
 				gf_bs_del(bs);
-				fclose(saf);
+				gf_fclose(saf);
 				return e;
 			}
 			gf_set_progress("Importing SAF", gf_bs_get_position(bs), tot);
@@ -7015,11 +7286,11 @@
 		gf_bs_skip_bytes(bs, au_size);
 	}
 	gf_bs_del(bs);
-	fclose(saf);
+	gf_fclose(saf);
 	if (import->flags & GF_IMPORT_PROBE_ONLY) return GF_OK;
 
 	gf_set_progress("Importing SAF", tot, tot);
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	return GF_OK;
 #else
 	return GF_NOT_SUPPORTED;
@@ -7184,7 +7455,7 @@
 		}
 		if (!import->esd) {
 			import->esd = gf_odf_desc_esd_new(2);
-			destroy_esd = 1;
+			destroy_esd = GF_TRUE;
 		}
 		/*update stream type/oti*/
 		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
@@ -7238,7 +7509,7 @@
 
 	gf_bs_del(bs);
 
-	e = gf_isom_update_sample(import->dest, tsimp->track, count, samp, 1);
+	e = gf_isom_update_sample(import->dest, tsimp->track, count, samp, GF_TRUE);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error rewriting AVC NALUs: %s\n", gf_error_to_string(e) ));
 	}
@@ -7246,14 +7517,15 @@
 }
 
 #ifndef GPAC_DISABLE_HEVC
-static void hevc_cfg_add_nalu(GF_HEVCConfig *hevccfg, u8 nal_type, char *data, u32 data_len)
+static void hevc_cfg_add_nalu(GF_MediaImporter *import, GF_HEVCConfig *hevccfg, u8 nal_type, char *data, u32 data_len)
 {
 	u32 i, count;
 	GF_AVCConfigSlot *sl;
 	GF_HEVCParamArray *ar = NULL;
+
 	count = gf_list_count(hevccfg->param_array);
 	for (i=0; i<count; i++) {
-		ar = gf_list_get(hevccfg->param_array, i);
+		ar = (GF_HEVCParamArray*)gf_list_get(hevccfg->param_array, i);
 		if (ar->type == nal_type) break;
 		ar = NULL;
 	}
@@ -7264,9 +7536,15 @@
 		ar->nalus = gf_list_new();
 		gf_list_add(hevccfg->param_array, ar);
 	}
+
+	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+		ar->array_completeness = 0;
+		return;
+	}
+
 	if (data) {
 		GF_SAFEALLOC(sl, GF_AVCConfigSlot);
-		sl->data = gf_malloc(sizeof(char)*data_len);
+		sl->data = (char*)gf_malloc(sizeof(char)*data_len);
 		sl->size = data_len;
 		memcpy(sl->data, data, data_len);
 		gf_list_add(ar->nalus, sl);
@@ -7461,13 +7739,13 @@
 
 			/* Since the GF_M2TS_ES_IS_MPEG4_OD flag is stored at the ES level and ES are reset after probe,
 			 we need to set it again as in probe mode */
-			found = 0;
+			found = GF_FALSE;
 			count = gf_list_count(prog->streams);
 			for (i=0; i<count; i++) {
 				GF_ESD *esd;
 				es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
 				if (es->pid == prog->pmt_pid) continue;
-				if (es->pid == import->trackID) found = 1;
+				if (es->pid == import->trackID) found = GF_TRUE;
 				if (es->flags & GF_M2TS_ES_IS_SECTION) {
 					//ses = (GF_M2TS_SECTION_ES *)es;
 				} else {
@@ -7500,7 +7778,7 @@
 			}
 
 			mtype = stype = oti = 0;
-			is_in_iod = 0;
+			is_in_iod = GF_FALSE;
 
 			switch (es->stream_type) {
 			case GF_M2TS_VIDEO_MPEG1:
@@ -7555,12 +7833,17 @@
 				stype = GF_STREAM_AUDIO;
 				oti = GPAC_OTI_AUDIO_AAC_MPEG4;
 				break;
+			case GF_M2TS_AUDIO_AC3:
+				mtype = GF_ISOM_MEDIA_AUDIO;
+				stype = GF_STREAM_AUDIO;
+				oti = GPAC_OTI_AUDIO_AC3;
+				break;
 			case GF_M2TS_SYSTEMS_MPEG4_PES:
 			case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
 				if (prog->pmt_iod && !import->esd) {
 					import->esd = gf_m2ts_get_esd(es);
 					m2ts_set_track_mpeg4_creation_info(import, &mtype, &stype, &oti);
-					is_in_iod = 1;
+					is_in_iod = GF_TRUE;
 				}
 				break;
 			}
@@ -7578,7 +7861,7 @@
 				gf_isom_change_mpeg4_description(import->dest, tsimp->track, 1, esd);
 				esd->decoderConfig->decoderSpecificInfo->data = NULL;
 				gf_odf_desc_del((GF_Descriptor *)esd);
-				tsimp->stream_setup = 1;
+				tsimp->stream_setup = GF_TRUE;
 				gf_isom_set_audio_info(import->dest, tsimp->track, 1, ((GF_M2TS_PES_PCK*)par)->stream->aud_sr, ((GF_M2TS_PES_PCK*)par)->stream->aud_nb_ch, 8);
 			}
 		}
@@ -7651,7 +7934,7 @@
 			pck->stream->flags |= GF_M2TS_ES_FIRST_DTS;
 			pck->stream->first_dts = (pck->PTS!=pck->DTS) ? pck->DTS : pck->PTS;
 			if (!pck->stream->program->first_dts || pck->stream->program->first_dts > pck->stream->first_dts) {
-				pck->stream->program->first_dts = pck->stream->first_dts;
+				pck->stream->program->first_dts = 1 + pck->stream->first_dts;
 
 				if (pck->stream->pid != import->trackID) {
 					gf_m2ts_set_pes_framing((GF_M2TS_PES *)pck->stream, GF_M2TS_PES_FRAMING_SKIP);
@@ -7694,28 +7977,39 @@
 						tsimp->avccfg->profile_compatibility = tsimp->avc.sps[idx].prof_compat;
 						tsimp->avccfg->AVCProfileIndication = tsimp->avc.sps[idx].profile_idc;
 						tsimp->avccfg->AVCLevelIndication = tsimp->avc.sps[idx].level_idc;
-						slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-						slc->size = pck->data_len-4;
-						slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-						memcpy(slc->data, pck->data+4, sizeof(char)*slc->size);
-						gf_list_add(tsimp->avccfg->sequenceParameterSets, slc);
 
 						if (pck->stream->vid_w < tsimp->avc.sps[idx].width)
 							pck->stream->vid_w = tsimp->avc.sps[idx].width;
 						if (pck->stream->vid_h < tsimp->avc.sps[idx].height)
 							pck->stream->vid_h = tsimp->avc.sps[idx].height;
+
+						if (!(import->flags & GF_IMPORT_FORCE_XPS_INBAND)) {
+							slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+							slc->size = pck->data_len-4;
+							slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+							memcpy(slc->data, pck->data+4, sizeof(char)*slc->size);
+							gf_list_add(tsimp->avccfg->sequenceParameterSets, slc);
+						}
 					}
 				}
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					break;
+				}
 				return;
 			case GF_AVC_NALU_PIC_PARAM:
 				idx = gf_media_avc_read_pps(pck->data+4, pck->data_len-4, &tsimp->avc);
 				if ((idx>=0) && (tsimp->avc.pps[idx].status==1)) {
 					tsimp->avc.pps[idx].status = 2;
-					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-					slc->size = pck->data_len-4;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					memcpy(slc->data, pck->data+4, sizeof(char)*slc->size);
-					gf_list_add(tsimp->avccfg->pictureParameterSets, slc);
+					if (!(import->flags & GF_IMPORT_FORCE_XPS_INBAND)) {
+						slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+						slc->size = pck->data_len-4;
+						slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+						memcpy(slc->data, pck->data+4, sizeof(char)*slc->size);
+						gf_list_add(tsimp->avccfg->pictureParameterSets, slc);
+					}
+				}
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					break;
 				}
 				/*else discard because of invalid PPS*/
 				return;
@@ -7729,11 +8023,7 @@
 				return;
 			case GF_AVC_NALU_SEI:
 				break;
-				if (tsimp->avc.sps_active_idx != -1) {
-					idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
-					if (idx>0) pck->data_len = idx+4;
-				}
-				break;
+
 			}
 
 			if (tsimp->force_next_au_start) {
@@ -7753,17 +8043,17 @@
 			switch (nal_type) {
 			case GF_HEVC_NALU_SEQ_PARAM:
 				idx = gf_media_hevc_read_sps(pck->data+4, pck->data_len-4, &tsimp->hevc);
-				add_sps = 0;
+				add_sps = GF_FALSE;
 				if (idx>=0) {
 					if (is_subseq) {
 						if ((tsimp->hevc.sps[idx].state & AVC_SUBSPS_PARSED) && !(tsimp->hevc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
 							tsimp->hevc.sps[idx].state |= AVC_SUBSPS_DECLARED;
-							add_sps = 1;
+							add_sps = GF_TRUE;
 						}
 					} else {
 						if ((tsimp->hevc.sps[idx].state & AVC_SPS_PARSED) && !(tsimp->hevc.sps[idx].state & AVC_SPS_DECLARED)) {
 							tsimp->hevc.sps[idx].state |= AVC_SPS_DECLARED;
-							add_sps = 1;
+							add_sps = GF_TRUE;
 						}
 					}
 					if (add_sps) {
@@ -7781,7 +8071,7 @@
 						tsimp->hevccfg->luma_bit_depth = tsimp->hevc.sps[idx].bit_depth_luma;
 						tsimp->hevccfg->chroma_bit_depth = tsimp->hevc.sps[idx].bit_depth_chroma;
 
-						hevc_cfg_add_nalu(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+						hevc_cfg_add_nalu(import, tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
 
 						if (pck->stream->vid_w < tsimp->avc.sps[idx].width)
 							pck->stream->vid_w = tsimp->avc.sps[idx].width;
@@ -7789,12 +8079,20 @@
 							pck->stream->vid_h = tsimp->avc.sps[idx].height;
 					}
 				}
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					is_au_start = GF_TRUE;
+					break;
+				}
 				return;
 			case GF_HEVC_NALU_PIC_PARAM:
 				idx = gf_media_hevc_read_pps(pck->data+4, pck->data_len-4, &tsimp->hevc);
 				if ((idx>=0) && (tsimp->hevc.pps[idx].state==1)) {
 					tsimp->hevc.pps[idx].state = 2;
-					hevc_cfg_add_nalu(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+					hevc_cfg_add_nalu(import, tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+				}
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					is_au_start = GF_TRUE;
+					break;
 				}
 				return;
 			case GF_HEVC_NALU_VID_PARAM:
@@ -7804,29 +8102,29 @@
 					tsimp->hevccfg->avgFrameRate = tsimp->hevc.vps[idx].rates[0].avg_pic_rate;
 					tsimp->hevccfg->constantFrameRate = tsimp->hevc.vps[idx].rates[0].constand_pic_rate_idc;
 					tsimp->hevccfg->numTemporalLayers = tsimp->hevc.vps[idx].max_sub_layers;
-					hevc_cfg_add_nalu(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+					hevc_cfg_add_nalu(import, tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+				}
+				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					is_au_start = GF_TRUE;
+					break;
 				}
 				return;
 			/*remove*/
 			case GF_HEVC_NALU_ACCESS_UNIT:
-				tsimp->force_next_au_start = 1;
+				tsimp->force_next_au_start = GF_TRUE;
 				return;
 			case GF_HEVC_NALU_FILLER_DATA:
 			case GF_HEVC_NALU_END_OF_SEQ:
 			case GF_HEVC_NALU_END_OF_STREAM:
 				return;
 			case GF_HEVC_NALU_SEI_PREFIX:
-				/*TODO					if (tsimp->avc.sps_active_idx != -1) {
-										idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
-										if (idx>0) pck->data_len = idx+4;
-									}
-				*/
+				is_au_start = GF_TRUE;
 				break;
 			}
 
 			if (tsimp->force_next_au_start) {
-				is_au_start = 1;
-				tsimp->force_next_au_start = 0;
+				is_au_start = GF_TRUE;
+				tsimp->force_next_au_start = GF_FALSE;
 			}
 		}
 #endif //GPAC_DISABLE_HEVC
@@ -7835,7 +8133,7 @@
 			e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
 			if (e) {
 				if (!gf_isom_get_sample_count(import->dest, tsimp->track)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] missed begining of sample data\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] missed beginning of sample data\n"));
 					e = GF_OK;
 				} else {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error appending sample data\n"));
@@ -7884,6 +8182,12 @@
 			case GF_M2TS_AUDIO_AAC:
 				gf_import_message(import, GF_OK, "MPEG-4 AAC Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
 				break;
+			case GF_M2TS_AUDIO_AC3:
+				gf_import_message(import, GF_OK, "Dolby AC3 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
+				break;
+			case GF_M2TS_AUDIO_EC3:
+				gf_import_message(import, GF_OK, "Dolby E-AC3 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
+				break;
 			}
 			if (pck->stream->lang)
 				gf_isom_set_media_language(import->dest, tsimp->track, (char *) gf_4cc_to_str(pck->stream->lang)+1);
@@ -7891,7 +8195,7 @@
 		if (!tsimp->stream_setup) {
 			if (pck->stream->aud_sr) {
 				gf_isom_set_audio_info(import->dest, tsimp->track, 1, pck->stream->aud_sr, pck->stream->aud_nb_ch, 16);
-				tsimp->stream_setup = 1;
+				tsimp->stream_setup = GF_TRUE;
 			}
 			else if (pck->stream->vid_w) {
 				u32 w = pck->stream->vid_w;
@@ -7901,17 +8205,25 @@
 				if (w != pck->stream->vid_w)
 					e = gf_isom_set_pixel_aspect_ratio(import->dest, tsimp->track, 1, pck->stream->vid_par>>16, pck->stream->vid_par&0xff);
 
-				tsimp->stream_setup = 1;
+				tsimp->stream_setup = GF_TRUE;
 			}
 		}
 
+		if (samp->DTS < pck->stream->first_dts) {
+			u32 sample_num = gf_isom_get_sample_count(import->dest, tsimp->track);
+			u32 dur = gf_isom_get_sample_duration(import->dest, tsimp->track, sample_num);
+
+			pck->stream->first_dts = samp->DTS - (tsimp->last_dts + 1 + dur);
+			pck->stream->program->first_dts = pck->stream->first_dts;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - PCR loop/discontinuity, adjusting\n"));
+		}
 		if (samp->DTS >= pck->stream->first_dts) {
 			samp->DTS -= pck->stream->first_dts;
 			samp->IsRAP = (pck->flags & GF_M2TS_PES_PCK_RAP) ? RAP : RAP_NO;
 			samp->data = pck->data;
 			samp->dataLength = pck->data_len;
 
-			if (samp->DTS && (samp->DTS==tsimp->last_dts)) {
+			if ((pck->stream->flags & GF_M2TS_ES_FIRST_DTS) && (samp->DTS + 1 == tsimp->last_dts)) {
 				e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
 			} else {
 
@@ -7924,13 +8236,14 @@
 				//import->flags |= GF_IMPORT_DO_ABORT;
 				import->last_error = e;
 			}
-			if (import->duration && (import->duration<=(samp->DTS+samp->CTS_Offset)/90))
+			if (import->duration && (import->duration<=(samp->DTS+samp->CTS_Offset)/90)) {
 				//import->flags |= GF_IMPORT_DO_ABORT;
+			}
 
-				if (pck->flags & GF_M2TS_PES_PCK_I_FRAME) tsimp->nb_i++;
+			if (pck->flags & GF_M2TS_PES_PCK_I_FRAME) tsimp->nb_i++;
 			if (pck->flags & GF_M2TS_PES_PCK_P_FRAME) tsimp->nb_p++;
 			if (pck->flags & GF_M2TS_PES_PCK_B_FRAME) tsimp->nb_b++;
-			tsimp->last_dts = samp->DTS;
+			tsimp->last_dts = samp->DTS + 1;
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - skipping\n"));
 		}
@@ -8014,7 +8327,7 @@
 			mtype = stype = oti = 0;
 			import->esd = gf_m2ts_get_esd(sl_pck->stream);
 			m2ts_set_track_mpeg4_creation_info(import, &mtype, &stype, &oti);
-			m2ts_create_track(tsimp, mtype, stype, oti, sl_pck->stream->mpeg4_es_id, 0);
+			m2ts_create_track(tsimp, mtype, stype, oti, sl_pck->stream->mpeg4_es_id, GF_FALSE);
 		}
 
 		if (import->esd) {
@@ -8032,17 +8345,16 @@
 					sl_pck->stream->flags |= GF_M2TS_ES_FIRST_DTS;
 
 					if (!hdr.compositionTimeStampFlag) {
-						hdr.compositionTimeStamp = sl_pck->stream->program->first_dts;
+						hdr.compositionTimeStamp = sl_pck->stream->program->first_dts - 1;
 						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] PID %d First SL Access unit start flag set without any composition time stamp - defaulting to last CTS seen on program\n", sl_pck->stream->pid));
 					}
 					sl_pck->stream->first_dts = (hdr.decodingTimeStamp?hdr.decodingTimeStamp:hdr.compositionTimeStamp);
-					if (!sl_pck->stream->program->first_dts ||
-					 sl_pck->stream->program->first_dts > sl_pck->stream->first_dts) {
-						sl_pck->stream->program->first_dts = sl_pck->stream->first_dts;
+					if (!sl_pck->stream->program->first_dts || (sl_pck->stream->program->first_dts > sl_pck->stream->first_dts)) {
+						sl_pck->stream->program->first_dts = sl_pck->stream->first_dts + 1;
 					}
 				} else {
 					if (!hdr.compositionTimeStampFlag) {
-						hdr.compositionTimeStamp = sl_pck->stream->first_dts + tsimp->last_dts+1;
+						hdr.compositionTimeStamp = sl_pck->stream->first_dts + tsimp->last_dts - 1;
 						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] PID %d SL Access unit start flag set without any composition time stamp - defaulting to last CTS seen on stream + 1\n", sl_pck->stream->pid));
 					}
 				}
@@ -8055,7 +8367,7 @@
 					samp->IsRAP = import->esd->slConfig->useRandomAccessPointFlag ? hdr.randomAccessPointFlag : RAP;
 
 					/*fix for some DMB streams where TSs are not coded*/
-					if ((tsimp->last_dts == samp->DTS) && gf_isom_get_sample_count(import->dest, tsimp->track))
+					if ((tsimp->last_dts == 1 + samp->DTS) && gf_isom_get_sample_count(import->dest, tsimp->track))
 						samp->DTS += gf_isom_get_media_timescale(import->dest, tsimp->track);
 
 					samp->data = sl_pck->data + hdr_len;
@@ -8069,14 +8381,13 @@
 					if (import->duration && (import->duration<=(samp->DTS+samp->CTS_Offset)/90)) {
 						//import->flags |= GF_IMPORT_DO_ABORT;
 					}
-					tsimp->last_dts = samp->DTS;
+					tsimp->last_dts = samp->DTS + 1;
 
 				} else {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - skipping\n"));
 					sl_pck->stream->first_dts = samp->DTS;
-					if (!sl_pck->stream->program->first_dts ||
-					 sl_pck->stream->program->first_dts > sl_pck->stream->first_dts) {
-						sl_pck->stream->program->first_dts = sl_pck->stream->first_dts;
+					if (!sl_pck->stream->program->first_dts || (sl_pck->stream->program->first_dts > sl_pck->stream->first_dts)) {
+						sl_pck->stream->program->first_dts = sl_pck->stream->first_dts + 1;
 					}
 				}
 				samp->data = NULL;
@@ -8106,12 +8417,12 @@
 	if (import->trackID > GF_M2TS_MAX_STREAMS)
 		return gf_import_message(import, GF_BAD_PARAM, "Invalid PID %d", import->trackID );
 
-	mts = gf_f64_open(import->in_name, "rb");
+	mts = gf_fopen(import->in_name, "rb");
 	if (!mts) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
-	gf_f64_seek(mts, 0, SEEK_END);
-	fsize = gf_f64_tell(mts);
-	gf_f64_seek(mts, 0, SEEK_SET);
+	gf_fseek(mts, 0, SEEK_END);
+	fsize = gf_ftell(mts);
+	gf_fseek(mts, 0, SEEK_SET);
 	done = 0;
 
 	memset(&tsimp, 0, sizeof(GF_TSImport));
@@ -8122,9 +8433,9 @@
 	ts->user = &tsimp;
 	ts->file_size = fsize;
 
-	ts->dvb_h_demux = (import->flags & GF_IMPORT_MPE_DEMUX) ? 1 : 0;
+	ts->dvb_h_demux = (import->flags & GF_IMPORT_MPE_DEMUX) ? GF_TRUE : GF_FALSE;
 
-	if (import->flags & GF_IMPORT_PROBE_ONLY) do_import = 0;
+	if (import->flags & GF_IMPORT_PROBE_ONLY) do_import = GF_FALSE;
 
 	sprintf(progress, "Importing MPEG-2 TS (PID %d)", import->trackID);
 	if (do_import) gf_import_message(import, GF_OK, progress);
@@ -8148,7 +8459,7 @@
 		if (tsimp.avccfg) gf_odf_avc_cfg_del(tsimp.avccfg);
 		if (tsimp.hevccfg) gf_odf_hevc_cfg_del(tsimp.hevccfg);
 		gf_m2ts_demux_del(ts);
-		fclose(mts);
+		gf_fclose(mts);
 		return e;
 	}
 
@@ -8172,7 +8483,7 @@
 		es = (GF_M2TS_ES *)ts->ess[import->trackID];
 		if (!es) {
 			gf_m2ts_demux_del(ts);
-			fclose(mts);
+			gf_fclose(mts);
 			return gf_import_message(import, GF_BAD_PARAM, "Unknown PID %d", import->trackID);
 		}
 
@@ -8180,6 +8491,11 @@
 			u32 w = ((GF_M2TS_PES*)es)->vid_w;
 			u32 h = ((GF_M2TS_PES*)es)->vid_h;
 			gf_isom_avc_config_update(import->dest, tsimp.track, 1, tsimp.avccfg);
+
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				gf_isom_avc_set_inband_config(import->dest, tsimp.track, 1);
+			}
+
 			gf_isom_set_visual_info(import->dest, tsimp.track, 1, w, h);
 			gf_isom_set_track_layout_info(import->dest, tsimp.track, w<<16, h<<16, 0, 0, 0);
 
@@ -8194,6 +8510,11 @@
 			u32 h = ((GF_M2TS_PES*)es)->vid_h;
 			hevc_set_parall_type(tsimp.hevccfg);
 			gf_isom_hevc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg);
+
+			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+				gf_isom_hevc_set_inband_config(import->dest, tsimp.track, 1);
+			}
+
 			gf_isom_set_visual_info(import->dest, tsimp.track, 1, w, h);
 			gf_isom_set_track_layout_info(import->dest, tsimp.track, w<<16, h<<16, 0, 0, 0);
 
@@ -8204,7 +8525,7 @@
 
 
 		if (tsimp.track) {
-			MP4T_RecomputeBitRate(import->dest, tsimp.track);
+			gf_media_update_bitrate(import->dest, tsimp.track);
 			/* creation of the edit lists */
 			if ((es->first_dts != es->program->first_dts) && gf_isom_get_sample_count(import->dest, tsimp.track) ) {
 				u32 media_ts, moov_ts, offset;
@@ -8212,17 +8533,17 @@
 				Double pdur, poffset;
 				media_ts = gf_isom_get_media_timescale(import->dest, tsimp.track);
 				moov_ts = gf_isom_get_timescale(import->dest);
-				assert(es->program->first_dts <= es->first_dts);
-				poffset = (es->first_dts - es->program->first_dts) * 1.0 * moov_ts / media_ts;
+				assert(es->program->first_dts - 1 <= es->first_dts);
+				poffset = (es->first_dts - (es->program->first_dts - 1) ) * 1.0 * moov_ts / media_ts;
 				offset = (u32)poffset;
 				pdur = gf_isom_get_media_duration(import->dest, tsimp.track) * 1.0 * moov_ts / media_ts;
 				dur = (u64)pdur;
 				if (poffset != offset || pdur != dur) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("Movie timescale not precise enough to store edit\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("Movie timescale (%u) not precise enough to store edit (media timescale: %u)\n", moov_ts, media_ts));
 				}
 				gf_isom_set_edit_segment(import->dest, tsimp.track, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
 				gf_isom_set_edit_segment(import->dest, tsimp.track, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
-				gf_import_message(import, GF_OK, "Timeline offset: %d ms", (offset * 1000) / moov_ts);
+				gf_import_message(import, GF_OK, "Timeline offset: %u ms", (offset * 1000) / moov_ts);
 			}
 
 			if (tsimp.nb_p) {
@@ -8235,7 +8556,7 @@
 	}
 
 	gf_m2ts_demux_del(ts);
-	fclose(mts);
+	gf_fclose(mts);
 	return GF_OK;
 }
 
@@ -8262,7 +8583,7 @@
 	vobsub_trim_ext(filename);
 	strcat(filename, ".idx");
 
-	file = gf_f64_open(filename, "r");
+	file = gf_fopen(filename, "r");
 	if (!file) {
 		err = gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", filename);
 		goto error;
@@ -8275,7 +8596,7 @@
 	}
 
 	err = vobsub_read_idx(file, vobsub, &version);
-	fclose(file);
+	gf_fclose(file);
 
 	if (err != GF_OK) {
 		err = gf_import_message(import, err, "Reading VobSub file %s failed", filename);
@@ -8303,7 +8624,7 @@
 	vobsub_trim_ext(filename);
 	strcat(filename, ".sub");
 
-	file = gf_f64_open(filename, "rb");
+	file = gf_fopen(filename, "rb");
 	if (!file) {
 		err = gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", filename);
 		goto error;
@@ -8331,7 +8652,7 @@
 
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	if (!import->esd->decoderConfig) {
 		import->esd->decoderConfig = (GF_DecoderConfig*)gf_odf_desc_new(GF_ODF_DCD_TAG);
@@ -8370,7 +8691,7 @@
 	gf_isom_set_media_language(import->dest, track, vobsub->langs[trackID].name);
 
 	samp = gf_isom_sample_new();
-	samp->IsRAP	 = 1;
+	samp->IsRAP = SAP_TYPE_1;
 	samp->dataLength = sizeof(null_subpic);
 	samp->data	= (char*)null_subpic;
 
@@ -8388,8 +8709,8 @@
 			break;
 		}
 
-		gf_f64_seek(file, pos->filepos, SEEK_SET);
-		if (gf_f64_tell(file) != pos->filepos) {
+		gf_fseek(file, pos->filepos, SEEK_SET);
+		if (gf_ftell(file) != pos->filepos) {
 			err = gf_import_message(import, GF_IO_ERR, "Could not seek in file");
 			goto error;
 		}
@@ -8472,7 +8793,7 @@
 
 	gf_isom_set_last_sample_duration(import->dest, track, last_samp_dur);
 
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	gf_set_progress("Importing VobSub", total, total);
 
 	err = GF_OK;
@@ -8491,7 +8812,7 @@
 		vobsub_free(vobsub);
 	}
 	if (file) {
-		fclose(file);
+		gf_fclose(file);
 	}
 
 	return err;
@@ -8517,7 +8838,7 @@
 	GF_ISOSample *samp;
 	Bool (*ac3_parser_bs)(GF_BitStream*, GF_AC3Header*, Bool) = gf_ac3_parser_bs;
 
-	in = gf_f64_open(import->in_name, "rb");
+	in = gf_fopen(import->in_name, "rb");
 	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
 
@@ -8526,7 +8847,7 @@
 	if (is_EAC3 || !gf_ac3_parser_bs(bs, &hdr, GF_TRUE)) {
 		if (!gf_eac3_parser_bs(bs, &hdr, GF_TRUE)) {
 			gf_bs_del(bs);
-			fclose(in);
+			gf_fclose(in);
 			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio is neither AC3 or E-AC3 audio");
 		}
 		is_EAC3 = GF_TRUE;
@@ -8536,7 +8857,7 @@
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		gf_bs_del(bs);
-		fclose(in);
+		gf_fclose(in);
 		import->tk_info[0].track_num = 1;
 		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
 		import->tk_info[0].media_type = GF_4CC('A', 'C', '3', ' ');
@@ -8548,10 +8869,10 @@
 	}
 
 	e = GF_OK;
-	destroy_esd = 0;
+	destroy_esd = GF_FALSE;
 	if (!import->esd) {
 		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = 1;
+		destroy_esd = GF_TRUE;
 	}
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
@@ -8615,7 +8936,10 @@
 				samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
 				max_size = samp->dataLength;
 			}
-			gf_bs_read_data(bs, samp->data, samp->dataLength);
+			if (!gf_bs_read_data(bs, samp->data, samp->dataLength)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[AC3 import] Truncated file - want to read %d bytes but remain only %d bytes\n", samp->dataLength, gf_bs_get_size(bs) - gf_bs_get_position(bs)));
+				break;
+			}
 			e = gf_isom_add_sample(import->dest, track, di, samp);
 		}
 		if (e)
@@ -8630,7 +8954,7 @@
 		if (import->flags & GF_IMPORT_DO_ABORT)
 			break;
 	}
-	MP4T_RecomputeBitRate(import->dest, track);
+	gf_media_update_bitrate(import->dest, track);
 	gf_set_progress("Importing AC3", tot_size, tot_size);
 
 exit:
@@ -8640,7 +8964,7 @@
 	}
 	if (samp) gf_isom_sample_del(&samp);
 	gf_bs_del(bs);
-	fclose(in);
+	gf_fclose(in);
 	return e;
 }
 #endif
@@ -8656,7 +8980,7 @@
 	u32 i, h, m, s, ms, fr, fps;
 	char line[1024];
 	char szTitle[1024];
-	FILE *f = gf_f64_open(import->in_name, "rt");
+	FILE *f = gf_fopen(import->in_name, "rt");
 	if (!f) return GF_URL_ERROR;
 
 	readen = (u32) fread(line, 1, 4, f);
@@ -8683,7 +9007,7 @@
 	} else {
 		offset = 0;
 	}
-	gf_f64_seek(f, offset, SEEK_SET);
+	gf_fseek(f, offset, SEEK_SET);
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		Bool is_chap_or_sub = GF_FALSE;
@@ -8692,17 +9016,17 @@
 			char *sep;
 			strlwr(line);
 
-			if (strstr(line, "addchapter(")) is_chap_or_sub = 1;
-			else if (strstr(line, "-->")) is_chap_or_sub = 1;
+			if (strstr(line, "addchapter(")) is_chap_or_sub = GF_TRUE;
+			else if (strstr(line, "-->")) is_chap_or_sub = GF_TRUE;
 			else if ((sep = strstr(line, "chapter")) != NULL) {
 				sep+=7;
-				if (!strncmp(sep+1, "name", 4)) is_chap_or_sub = 1;
-				else if (!strncmp(sep+2, "name", 4)) is_chap_or_sub = 1;
-				else if (!strncmp(sep+3, "name", 4)) is_chap_or_sub = 1;
-				else if (strstr(line, "Zoom") || strstr(line, "zoom")) is_chap_or_sub = 1;
+				if (!strncmp(sep+1, "name", 4)) is_chap_or_sub = GF_TRUE;
+				else if (!strncmp(sep+2, "name", 4)) is_chap_or_sub = GF_TRUE;
+				else if (!strncmp(sep+3, "name", 4)) is_chap_or_sub = GF_TRUE;
+				else if (strstr(line, "Zoom") || strstr(line, "zoom")) is_chap_or_sub = GF_TRUE;
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 		if (is_chap_or_sub) {
 			import->nb_tracks = 1;
 			import->tk_info[0].media_type = GF_4CC('C','H','A','P');
@@ -8887,7 +9211,7 @@
 
 
 err_exit:
-	fclose(f);
+	gf_fclose(f);
 	return e;
 }
 
@@ -8969,7 +9293,7 @@
 
 #ifndef GPAC_DISABLE_MPEG2TS
 	/*MPEG-2 TS*/
-	if (!strnicmp(ext, ".ts", 3) || !strnicmp(ext, ".m2t", 4)
+	if (!strnicmp(ext, ".ts", 3) || !strnicmp(ext, ".m2t", 4) || !strnicmp(ext, ".trp", 4) || !strnicmp(ext, ".mts", 4)
 	 || !stricmp(fmt, "MPEGTS") || !stricmp(fmt, "MPEG-TS")
 	 || !stricmp(fmt, "MPGTS") || !stricmp(fmt, "MPG-TS")
 	 || !stricmp(fmt, "MPEG2TS") || !stricmp(fmt, "MPEG2-TS")
@@ -8988,7 +9312,7 @@
 		return gf_import_aac_adts(importer);
 	/*MPEG-4 video*/
 	if (!strnicmp(ext, ".cmp", 4) || !strnicmp(ext, ".m4v", 4) || !stricmp(fmt, "CMP") || !stricmp(fmt, "MPEG4-Video") )
-		return gf_import_cmp(importer, 0);
+		return gf_import_cmp(importer, GF_FALSE);
 	/*MPEG-1/2 video*/
 	if (!strnicmp(ext, ".m2v", 4) || !strnicmp(ext, ".m1v", 4) || !stricmp(fmt, "MPEG2-Video") || !stricmp(fmt, "MPEG1-Video") )
 		return gf_import_cmp(importer, 2);
@@ -9016,10 +9340,10 @@
 		return gf_import_nhnt(importer);
 	/*NHML*/
 	if (!strnicmp(ext, ".nhml", 5) || !stricmp(fmt, "NHML") )
-		return gf_import_nhml_dims(importer, 0);
+		return gf_import_nhml_dims(importer, GF_FALSE);
 	/*jpg & png & jp2*/
 	if (!strnicmp(ext, ".jpg", 4) || !strnicmp(ext, ".jpeg", 5) || !strnicmp(ext, ".jp2", 4) || !strnicmp(ext, ".png", 4) || !stricmp(fmt, "JPEG") || !stricmp(fmt, "PNG") || !stricmp(fmt, "JP2") )
-		return gf_import_still_image(importer, 1);
+		return gf_import_still_image(importer, GF_TRUE);
 	/*AMR & 3GPP2 speec codecs*/
 	if (!strnicmp(ext, ".amr", 4) || !strnicmp(ext, ".awb", 4) || !strnicmp(ext, ".smv", 4) || !strnicmp(ext, ".evc", 4)
 	 || !stricmp(fmt, "AMR") || !stricmp(fmt, "EVRC") || !stricmp(fmt, "SMV") )
@@ -9048,10 +9372,10 @@
 	}
 	/*DIMS*/
 	if (!strnicmp(ext, ".dml", 4) || !stricmp(fmt, "DIMS") )
-		return gf_import_nhml_dims(importer, 1);
+		return gf_import_nhml_dims(importer, GF_TRUE);
 	/*SC3DMC*/
 	if (!strnicmp(ext, ".s3d", 4) || !stricmp(fmt, "SC3DMC") )
-		return gf_import_afx_sc3dmc(importer, 1);
+		return gf_import_afx_sc3dmc(importer, GF_TRUE);
 
 	if (!strnicmp(ext, ".txt", 4) || !strnicmp(ext, ".chap", 5) || !stricmp(fmt, "CHAP") )
 		return gf_media_import_chapters_file(importer);
@@ -9076,15 +9400,18 @@
 		}
 		else if (!stricmp(xml_type, "NHNTStream")) {
 			gf_free(xml_type);
-			return gf_import_nhml_dims(importer, 0);
+			return gf_import_nhml_dims(importer, GF_FALSE);
 		}
 		else if (!stricmp(xml_type, "DIMSStream") ) {
 			gf_free(xml_type);
-			return gf_import_nhml_dims(importer, 1);
+			return gf_import_nhml_dims(importer, GF_TRUE);
 		}
 		gf_free(xml_type);
 	}
 
+	if (gf_m2ts_probe_file(importer->in_name))
+		return gf_import_mpeg_ts(importer);
+
 	return gf_import_message(importer, e, "[Importer] Unknown input file type for \"%s\"", importer->in_name);
 }

v0.5.2.tar.gz/src/media_tools/mpd.c -> v0.6.1.tar.gz/src/media_tools/mpd.c Changed

@@ -35,6 +35,8 @@
 #include <time.h>
 #endif
 
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
 static Bool gf_mpd_parse_bool(char *attr)
 {
 	if (!strcmp(attr, "true")) return 1;
@@ -47,6 +49,7 @@
 	return gf_strdup(attr);
 }
 
+
 static Bool gf_mpd_valid_child(GF_MPD *mpd, GF_XMLNode *child)
 {
 	if (child->type != GF_XML_NODE_TYPE) return 0;
@@ -368,6 +371,10 @@
 		else if (!strcmp(att->name, "index")) seg->index = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "mediaRange")) seg->media_range = gf_mpd_parse_byte_range(att->value);
 		else if (!strcmp(att->name, "indexRange")) seg->index_range = gf_mpd_parse_byte_range(att->value);
+		//else if (!strcmp(att->name, "hls:keyMethod")) seg->key_url = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "hls:keyURL")) seg->key_url = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "hls:keyIV")) gf_bin128_parse(att->value, seg->key_iv);
+
 	}
 }
 
@@ -435,13 +442,13 @@
 			i--;	\
 			gf_list_rem(root->attributes, i);	\
 			gf_list_add(_elem->attributes, att);	\
-
+ 
 #define MPD_STORE_EXTENSION_NODE(_elem)	\
 		if (!_elem->children) _elem->children = gf_list_new();	\
 		i--;	\
 		gf_list_rem(root->content, i);	\
 		gf_list_add(_elem->children, child);	\
-
+ 
 static GF_Err gf_mpd_parse_descriptor(GF_List *container, GF_XMLNode *root)
 {
 	GF_XMLAttribute *att;
@@ -611,7 +618,7 @@
 	i = 0;
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (strstr(att->name, "href")) set->xlink_href = gf_mpd_parse_string(att->value);
-		else if (strstr(att->name, "actuate")) set->xlink_actuate_on_load = !strcmp(att->value, "onLoad") ? 1 : 0;
+		else if (strstr(att->name, "actuate")) set->xlink_actuate_on_load = !strcmp(att->value, "onLoad") ? GF_TRUE : GF_FALSE;
 		else if (!strcmp(att->name, "id")) set->id = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "group")) set->group = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "lang")) set->lang = gf_mpd_parse_string(att->value);
@@ -785,6 +792,7 @@
 	if (ptr->index_range) gf_free(ptr->index_range);
 	if (ptr->media) gf_free(ptr->media);
 	if (ptr->media_range) gf_free(ptr->media_range);
+	if (ptr->key_url) gf_free(ptr->key_url);
 	gf_free(ptr);
 }
 void gf_mpd_segment_base_free(void *_item)
@@ -810,7 +818,7 @@
 void gf_mpd_segment_list_free(void *_item)
 {
 	GF_MPD_SegmentList *ptr = (GF_MPD_SegmentList *)_item;
-	if (ptr->xlink_href) gf_free(ptr->xlink_href);
+	//if (ptr->xlink_href) gf_free(ptr->xlink_href);
 	if (ptr->initialization_segment) gf_mpd_url_free(ptr->initialization_segment);
 	if (ptr->bitstream_switching_url) gf_mpd_url_free(ptr->bitstream_switching_url);
 	if (ptr->representation_index) gf_mpd_url_free(ptr->representation_index);
@@ -896,6 +904,7 @@
 
 	if (ptr->playback.cached_init_segment_url) gf_free(ptr->playback.cached_init_segment_url);
 	if (ptr->playback.init_segment_data) gf_free(ptr->playback.init_segment_data);
+	if (ptr->playback.key_url) gf_free(ptr->playback.key_url);
 
 	gf_mpd_del_list(ptr->base_URLs, gf_mpd_base_url_free, 0);
 	gf_mpd_del_list(ptr->sub_representations, NULL/*TODO*/, 0);
@@ -1029,7 +1038,7 @@
 
 	i = 0;
 	while ( ( child = gf_list_enum(root->content, &i )) ) {
-		if (! gf_mpd_valid_child(mpd, child)) 
+		if (! gf_mpd_valid_child(mpd, child))
 			continue;
 
 		if (!strcmp(child->name, "ProgramInformation")) {
@@ -1076,153 +1085,36 @@
 }
 
 GF_EXPORT
-GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url,
- const char *mpd_file,
- u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter)
+void gf_mpd_getter_del_session(GF_FileDownload *getter) {
+	if (!getter && !getter->del_session)
+		return;
+	getter->del_session(getter);
+}
+
+static GF_Err gf_m3u8_fill_mpd_struct(MasterPlaylist *pl, const char *m3u8_file, const char *base_url, const char *mpd_file, char *title, Double update_interval,
+ char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool is_end, u32 max_dur, GF_MPD *mpd, Bool parse_sub_playlist)
 {
-	GF_Err e;
 	char *sep, *template_base, *template_ext;
-	u32 i, nb_streams, j, k, template_width, template_idx_start;
-	Double update_interval;
-	MasterPlaylist *pl = NULL;
-	Bool use_template;
+	u32 nb_streams, i, j, k, template_width, template_idx_start;
 	Stream *stream;
-	PlaylistElement *pe, *the_pe, *elt;
-	FILE *fmpd;
-	Bool is_end;
-	u32 max_dur = 0;
-
-	e = gf_m3u8_parse_master_playlist(m3u8_file, &pl, base_url);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Failed to parse root playlist '%s', error = %s\n", m3u8_file, gf_error_to_string(e)));
-		if (pl)
-			gf_m3u8_master_playlist_del(pl);
-		pl = NULL;
-		return e;
-	}
-	if (mpd_file == NULL) {
-		gf_delete_file(m3u8_file);
-		mpd_file = m3u8_file;
-	}
-
-	the_pe = NULL;
-	pe = NULL;
-	i = 0;
-	assert(pl);
-	assert(pl->streams);
-	while ((stream = gf_list_enum(pl->streams, &i))) {
-		j = 0;
-		while (NULL != (pe = gf_list_enum(stream->variants, &j))) {
-			Bool found = GF_FALSE;
-			char *suburl;
-			if (!pe->url)
-				continue;
-
-			/* filter out duplicated entries (seen on M6 m3u8) */
-			for (k=0; k<j-1; ++k) {
-				PlaylistElement *a_pe = gf_list_get(stream->variants, k);
-				if (a_pe->url && pe->url && !strcmp(a_pe->url, pe->url)) {
-					found = GF_TRUE;
-					break;
-				}
-			}
-			if (found)
-				continue;
-
-			the_pe = pe;
-			suburl = NULL;
-			if (!strstr(pe->url, ".m3u8"))
-				continue; /*not HLS*/
-
-			if (strcmp(base_url, pe->url))
-				suburl = gf_url_concatenate(base_url, pe->url);
-
-			if (!suburl || !strcmp(base_url, suburl)) {
-				if (suburl)
-					gf_free(suburl);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Not downloading, programs are identical for %s...\n", pe->url));
-				continue;
-			}
-
-			if (getter && getter->new_session && getter->del_session && getter->get_cache_name) {
-				e = getter->new_session(getter, suburl);
-				if (e) {
-					gf_free(suburl);
-					break;
-				}
-				if (e == GF_OK) {
-					e = gf_m3u8_parse_sub_playlist(getter->get_cache_name(getter), &pl, suburl, stream, pe);
-				}
-				getter->del_session(getter);
-
-#if 0
-				GF_DownloadSession *sess = gf_service_download_new(service, suburl, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL);
-				if (!sess) {
-					gf_free(suburl);
-					break;
-				}
-				e = gf_dm_sess_process(sess);
-				if (e==GF_OK) {
-					e = gf_m3u8_parse_sub_playlist(gf_dm_sess_get_cache_name(sess), &pl, suburl, prog, pe);
-				}
-				gf_service_download_del(sess);
-#endif
-			} else { /* for use in MP4Box */
-				if (strstr(suburl, "://")) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Downloading %s...\n", suburl));
-					e = gf_dm_wget(suburl, "tmp.m3u8", 0, 0);
-					if (e == GF_OK) {
-						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe);
-					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] Download faile for %s\n", suburl));
-					}
-					gf_delete_file("tmp.m3u8");
-				} else {
-					e = gf_m3u8_parse_sub_playlist(suburl, &pl, suburl, stream, pe);
-				}
-			}
-			gf_free(suburl);
-		}
-		if (max_dur < (u32) stream->computed_duration) {
-			max_dur = (u32) stream->computed_duration;
-		}
-	}
-
-	is_end = !pl->playlist_needs_refresh;
-	assert(the_pe);
+	PlaylistElement *pe, *elt;
+	GF_MPD_ProgramInfo *info;
+	GF_MPD_Period *period;
+	GF_Err e;
+	char str[1024];
 
-	update_interval = 0;
-	/*update interval is set to the duration of the last media file with rules defined in http live streaming RFC section 6.3.4*/
-	switch (reload_count) {
-	case 0:
-		update_interval = the_pe->duration_info;
-		break;
-	case 1:
-		update_interval = (Double)the_pe->duration_info / 2;
-		break;
-	case 2:
-		update_interval = 3 * ((Double)the_pe->duration_info / 2);
-		break;
-	default:
-		update_interval = 3 * the_pe->duration_info;
-		break;
-	}
-	if (is_end || ((the_pe->element_type == TYPE_PLAYLIST) && the_pe->element.playlist.is_ended)) {
-		update_interval = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] No need to refresh playlist!\n"));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Playlist will be refreshed every %g seconds, len=%d\n", update_interval, the_pe->duration_info));
-	}
+	if (!mpd) return GF_BAD_PARAM;
+	assert(!mpd->periods);
+	mpd->periods = gf_list_new();
+	mpd->program_infos = gf_list_new();
+	mpd->base_URLs = gf_list_new();
+	mpd->locations = gf_list_new();
+	mpd->metrics = gf_list_new();
+	mpd->time_shift_buffer_depth = (u32) -1; /*infinite by default*/
+	mpd->xml_namespace = "urn:mpeg:dash:schema:mpd:2011";
+	mpd->type = is_end ? GF_MPD_TYPE_STATIC : GF_MPD_TYPE_DYNAMIC;
 
-	assert(mpd_file);
-	fmpd = gf_f64_open(mpd_file, "wt");
-	if (!fmpd) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD Generator] Cannot write to temp file %s!\n", mpd_file));
-		gf_m3u8_master_playlist_del(pl);
-		return GF_IO_ERR;
-	}
 
-	fprintf(fmpd, "<MPD type=\"%s\" xmlns=\"urn:mpeg:DASH:schema:MPD:2011\" profiles=\"urn:mpeg:dash:profile:full:2011\"", is_end ? "static" : "dynamic" );
 	sep = strrchr(m3u8_file, '/');
 	if (!sep)
 		sep = strrchr(m3u8_file, '\\');
@@ -1230,38 +1122,47 @@
 		sep = sep + 1;
 	else
 		sep = (char *)m3u8_file;
-	fprintf(fmpd, " id=\"%s\"", sep);
-
-	if (update_interval)
-		fprintf(fmpd, " minimumUpdatePeriod=\"PT%02.2gS\"", update_interval);
-	if (is_end)
-		fprintf(fmpd, " mediaPresentationDuration=\"PT%dS\"", max_dur);
-	fprintf(fmpd, " minBufferTime=\"PT1.5S\"");
-	fprintf(fmpd, ">\n");
-
-	fprintf(fmpd, " <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n");
-	{
-		char *title = the_pe->title;
-		if (!title || strlen(title) < 2)
-			title = the_pe->url;
-		fprintf(fmpd, " <Title>%s</Title>\n", title);
-	}
-	fprintf(fmpd, " <Source>Generated from URL %s</Source>\n", base_url );
-	fprintf(fmpd, " <Copyright>Generated by GPAC %s from %s</Copyright>\n", GPAC_FULL_VERSION, base_url);
-
-	fprintf(fmpd, " </ProgramInformation>\n");
-	fprintf(fmpd, " <Period start=\"PT0S\"");
-	if (is_end) fprintf(fmpd, " duration=\"PT%dS\"", max_dur);
-	fprintf(fmpd, " >\n");
-	
+	mpd->ID = gf_strdup(sep);
+
+	if (update_interval) {
+		mpd->minimum_update_period = (u32) (update_interval*1000);
+	}
+	if (is_end) {
+		mpd->media_presentation_duration = (u32) (max_dur*1000);
+	}
+	if (mpd->type == GF_MPD_TYPE_STATIC)
+		mpd->minimum_update_period = mpd->time_shift_buffer_depth = 0;
+	mpd->min_buffer_time = 1500;
+
+	GF_SAFEALLOC(info, GF_MPD_ProgramInfo);
+	if (!info) return GF_OUT_OF_MEM;
+	info->more_info_url = gf_strdup("http://gpac.sourceforge.net");
+	info->title = gf_strdup(title);
+	sprintf(str, "Generated from URL %s", base_url);
+	info->source = gf_strdup(str);
+	sprintf(str, "Generated by GPAC %s from %s", GPAC_FULL_VERSION, base_url);
+	info->copyright = gf_strdup(str);
+	gf_list_add(mpd->program_infos, info);
+
+	GF_SAFEALLOC(period, GF_MPD_Period);
+	if (!period) return GF_OUT_OF_MEM;
+	period->adaptation_sets = gf_list_new();
+	period->base_URLs = gf_list_new();
+	period->subsets = gf_list_new();
+	e = gf_list_add(mpd->periods, period);
+	if (e) return e;
+	if (is_end) {
+		period->duration = max_dur*1000;
+	}
+
 	nb_streams = gf_list_count(pl->streams);
 	/*check if we use templates*/
 	template_base = NULL;
 	template_ext = NULL;
-	use_template = use_mpd_templates;
 	template_width = 0;
 	template_idx_start = 0;
 	elt = NULL;
+	pe = NULL;
 	for (i=0; i<nb_streams; i++) {
 		u32 count_variants;
 		stream = gf_list_get(pl->streams, i);
@@ -1276,7 +1177,7 @@
 			if (!count_elements)
 				continue;
 
-			if (!template_base && use_template) {
+			if (!template_base && use_mpd_templates) {
 				char *sub_url;
 				elt = gf_list_get(pe->element.playlist.elements, 0);
 				sub_url = strrchr(elt->url, '/');
@@ -1301,14 +1202,14 @@
 					}
 					k++;
 					if (!template_base[k]) {
-						use_template = GF_FALSE;
+						use_mpd_templates = GF_FALSE;
 						break;
 					}
 				}
 			}
 			if (!template_ext) template_ext="";
 
-			if (use_template) {
+			if (use_mpd_templates) {
 				for (k=0; k<count_elements; k++) {
 					char szURL[GF_MAX_PATH], *sub_url;
 					elt = gf_list_get(pe->element.playlist.elements, k);
@@ -1330,7 +1231,7 @@
 					if (!sub_url) sub_url = elt->url;
 					else sub_url ++;
 					if (strcmp(szURL, sub_url)) {
-						use_template = GF_FALSE;
+						use_mpd_templates = GF_FALSE;
 						break;
 					}
 				}
@@ -1338,29 +1239,44 @@
 
 		}
 	}
-	
+
 	nb_streams = gf_list_count(pl->streams);
 	for (i=0; i<nb_streams; i++) {
 		u32 count_variants;
 		u32 width, height, samplerate, num_channels;
-		fprintf(fmpd, " <AdaptationSet segmentAlignment=\"true\">\n");
+		GF_MPD_AdaptationSet *set;
+		GF_SAFEALLOC(set, GF_MPD_AdaptationSet);
+		if (!set) return GF_OUT_OF_MEM;
+		gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)set);
+		set->accessibility = gf_list_new();
+		set->role = gf_list_new();
+		set->rating = gf_list_new();
+		set->viewpoint = gf_list_new();
+		set->content_component = gf_list_new();
+		set->base_URLs = gf_list_new();
+		set->representations = gf_list_new();
+		/*assign default ID and group*/
+		set->group = -1;
+		set->segment_alignment = GF_TRUE;
+		e = gf_list_add(period->adaptation_sets, set);
+		if (e) return e;
 
 		/*if we use templates, put the SegmentTemplate element at the adaptationSet level*/
-		if (use_template) {
-			fprintf(fmpd, " <SegmentTemplate");
-
-			fprintf(fmpd, " duration=\"%d\"", (u32) pe->duration_info);
+		if (use_mpd_templates) {
+			GF_SAFEALLOC(set->segment_template, GF_MPD_SegmentTemplate);
+			if (!set->segment_template) return GF_OUT_OF_MEM;
+			set->segment_template->duration = (u32)pe->duration_info;
 			if (template_width > 1) {
-				fprintf(fmpd, " media=\"%s$%%0%ddNumber$%s\"", template_base, template_width, template_ext);
+				sprintf(str, "%s$%%0%ddNumber$%s", template_base, template_width, template_ext);
 			} else {
-				fprintf(fmpd, " media=\"%s$Number$%s\"", template_base, template_ext);
+				sprintf(str, "%s$Number$%s", template_base, template_ext);
 			}
-			fprintf(fmpd, " startNumber=\"%d\"", template_idx_start);
-			fprintf(fmpd, "/>\n");
+			set->segment_template->media = gf_strdup(str);
+			set->segment_template->start_number = template_idx_start;
 		}
 
 		if (elt && do_import) {
-	#ifndef GPAC_DISABLE_MEDIA_IMPORT
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 			GF_Err e;
 			GF_MediaImporter import;
 			char *tmp_file = NULL;
@@ -1373,7 +1289,7 @@
 				tmp_file = strrchr(elt->url, '/');
 				if (!tmp_file) tmp_file = strrchr(elt->url, '\\');
 				if (tmp_file) {
-					e = gf_dm_wget(elt->url, tmp_file, 0, 0);
+					e = gf_dm_wget(elt->url, tmp_file, 0, 0, NULL);
 					if (e==GF_OK) {
 						import.in_name = tmp_file;
 						e = gf_media_import(&import);
@@ -1386,26 +1302,24 @@
 
 			if (import.nb_tracks > 1) {
 				for (k=0; k<import.nb_tracks; k++) {
-					fprintf(fmpd, " <ContentComponent id=\"%d\"", import.tk_info[k].track_num);
 					if (import.tk_info[k].lang)
-						fprintf(fmpd, " lang=\"%s\"", gf_4cc_to_str(import.tk_info[k].lang));
-					switch (import.tk_info[k].type) {
-					case GF_ISOM_MEDIA_VISUAL:
-						fprintf(fmpd, " contentType=\"video\"");
-						break;
-					case GF_ISOM_MEDIA_AUDIO:
-						fprintf(fmpd, " contentType=\"audio\"");
-						break;
-					default:
-						fprintf(fmpd, " contentType=\"application\"");
-						break;
-					}
-					fprintf(fmpd, "/>\n");
+						//fprintf(fmpd, " lang=\"%s\"", gf_4cc_to_str(import.tk_info[k].lang));
+						switch (import.tk_info[k].type) {
+						case GF_ISOM_MEDIA_VISUAL:
+							//fprintf(fmpd, " contentType=\"video\"");
+							break;
+						case GF_ISOM_MEDIA_AUDIO:
+							//fprintf(fmpd, " contentType=\"audio\"");
+							break;
+						default:
+							//fprintf(fmpd, " contentType=\"application\"");
+							break;
+						}
 				}
 			}
 			if (tmp_file)
 				gf_delete_file(tmp_file);
-	#endif
+#endif
 		}
 
 		/*check if we use templates*/
@@ -1417,22 +1331,26 @@
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 			Bool import_file = do_import;
 #endif
-			Bool is_aac = GF_FALSE;
 			char *byte_range_media_file = NULL;
+			GF_MPD_Representation *rep;
 			pe = gf_list_get(stream->variants, j);
 
 			if (pe->element_type == TYPE_MEDIA) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 Media\n"));
+			} else if (pe->load_error) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error loading playlist element %s\n", pe->url));
 			} else if (pe->element_type != TYPE_PLAYLIST) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 unknown type for %s\n", pe->url));
 			}
 
 			count_elements = gf_list_count(pe->element.playlist.elements);
-			if (!count_elements)
+			if (parse_sub_playlist && !count_elements)
 				continue;
 
 			base_url = gf_strdup(pe->url);
 			sep = strrchr(base_url, '/');
+			if (!sep)
+				sep = strrchr(base_url, '\\');
 
 			if (pe->codecs && (pe->codecs[0] == '\"')) {
 				u32 len = (u32) strlen(pe->codecs);
@@ -1446,23 +1364,19 @@
 #endif
 
 			k = 0;
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 try_next_segment:
+#endif
 			k++;
 			elt = gf_list_get(pe->element.playlist.elements, k);
-			if (!elt)
+			if (parse_sub_playlist && !elt)
 				break;
-			/*get rid of level 0 aac*/
-			if (elt && strstr(elt->url, ".aac"))
-				is_aac = GF_TRUE;
-
-			if (is_aac)
-				fprintf(fmpd, "");
+					url->URL = gf_strdup(base_url);
+				}
 				continue;
 			}
 
-			fprintf(fmpd, ">\n");
-
 			byte_range_media_file = NULL;
 			elt = gf_list_get(pe->element.playlist.elements, 0);
 			if (elt && (elt->byte_range_end || elt->byte_range_start)) {
+				GF_MPD_BaseURL *url;
+				GF_SAFEALLOC(url, GF_MPD_BaseURL);
+				if (! url) return GF_OUT_OF_MEM;
+				e = gf_list_add(rep->base_URLs, url);
+				if (e) return GF_OUT_OF_MEM;
 				byte_range_media_file = elt->url;
-				fprintf(fmpd, " <BaseURL>%s</BaseURL>\n", byte_range_media_file);
+				url->URL = gf_strdup(byte_range_media_file);
 			} else if (sep) {
+				GF_MPD_BaseURL *url;
+				GF_SAFEALLOC(url, GF_MPD_BaseURL);
+				if (! url) return GF_OUT_OF_MEM;
+				e = gf_list_add(rep->base_URLs, url);
+				if (e) return GF_OUT_OF_MEM;
 				sep[1] = 0;
-				fprintf(fmpd, " <BaseURL>%s</BaseURL>\n", base_url);
+				url->URL = gf_strdup(base_url);
 			}
 
-			fprintf(fmpd, " <SegmentList duration=\"%lf\">\n", pe->duration_info);
+			GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
+			if (!rep->segment_list) return GF_OUT_OF_MEM;
+			// doesn't parse sub-playlists, we need to save URL to these sub-playlist in xlink:href so that we can get the segment URL when we need
+			// note: for MPD type static, always parse all sub-playlist because we just do it once in a period
+			if ((mpd->type == GF_MPD_TYPE_DYNAMIC) && !parse_sub_playlist) {
+				rep->segment_list->xlink_href = gf_strdup(pe->url);
+				gf_free(base_url);
+				base_url = NULL;
+				if (template_base) {
+					gf_free(template_base);
+					template_base = NULL;
+				}
+				continue;
+			}
+			rep->segment_list->segment_URLs = gf_list_new();
+			rep->segment_list->duration = (u64) (pe->duration_info * 1000);
 			update_interval = (count_elements - 1) * pe->duration_info * 1000;
 			for (k=0; k<count_elements; k++) {
-				u32 cmp = 0;
-				char *src_url, *seg_url;
+				GF_MPD_SegmentURL *segment_url;
 				elt = gf_list_get(pe->element.playlist.elements, k);
 
-				/* remove protocol scheme and try to find the common part in baseURL and segment URL - this avoids copying the entire url */
-				src_url = strstr(base_url, "://");
-				if (src_url) src_url += 3;
-				else src_url = base_url;
-
-				seg_url = strstr(elt->url, "://");
-				if (seg_url) seg_url += 3;
-				else seg_url = elt->url;
-
-				while (src_url[cmp] == seg_url[cmp]) cmp++;
-
+				GF_SAFEALLOC(segment_url, GF_MPD_SegmentURL);
+				if (!segment_url) return GF_OUT_OF_MEM;
+				gf_list_add(rep->segment_list->segment_URLs, segment_url);
 				if (byte_range_media_file) {
-					fprintf(fmpd, " <SegmentURL mediaRange=\""LLU"-"LLU"\"", elt->byte_range_start, elt->byte_range_end);
-					if (strcmp(elt->url, byte_range_media_file))
-						fprintf(fmpd, " media=\"%s\"", elt->url);
-					fprintf(fmpd, "/>\n");
+					segment_url->media_range->start_range = elt->byte_range_start;
+					segment_url->media_range->end_range = elt->byte_range_end;
+					if (strcmp(elt->url, byte_range_media_file)) {
+						segment_url->media = gf_strdup(elt->url);
+					}
 				} else {
-					fprintf(fmpd, " <SegmentURL media=\"%s\"/>\n", cmp ? (seg_url + cmp) : elt->url);
+					segment_url->media =gf_url_concatenate(pe->url, elt->url);
+				}
+				if (elt->drm_method != DRM_NONE) {
+					//segment_url->key_url = "aes-128";
+					if (elt->key_uri) {
+						segment_url->key_url = gf_strdup(elt->key_uri);
+						memcpy(segment_url->key_iv, elt->key_iv, sizeof(bin128));
+					}
 				}
 			}
-			fprintf(fmpd, " </SegmentList>\n");
-			fprintf(fmpd, " </Representation>\n");
 			gf_free(base_url);
-
-			if (is_aac)
-				fprintf(fmpd, " -->\n");
 		}
 
 		if (template_base) {
@@ -1619,17 +1565,245 @@
 			template_base = NULL;
 		}
 
-		fprintf(fmpd, " </AdaptationSet>\n");
 	}
-	fprintf(fmpd, " </Period>\n");
-	fprintf(fmpd, "</MPD>");
 
-	fclose(fmpd);
-	gf_m3u8_master_playlist_del(pl);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url,
+ const char *mpd_file,
+ u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter,
+ GF_MPD *mpd, Bool parse_sub_playlist)
+{
+	GF_Err e;
+	char *title;
+	u32 i, j, k;
+	Double update_interval;
+	MasterPlaylist *pl = NULL;
+	Stream *stream;
+	PlaylistElement *pe, *the_pe;
+	Bool is_end;
+	u32 max_dur = 0;
+
+	// first, we always need to parse the master playlist
+	e = gf_m3u8_parse_master_playlist(m3u8_file, &pl, base_url);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Failed to parse root playlist '%s', error = %s\n", m3u8_file, gf_error_to_string(e)));
+		gf_m3u8_master_playlist_del(&pl);
+		return e;
+	}
+	if (mpd_file == NULL) {
+		gf_delete_file(m3u8_file);
+		mpd_file = m3u8_file;
+	}
+
+	the_pe = NULL;
+	pe = NULL;
+	i = 0;
+	assert(pl);
+	assert(pl->streams);
+	while ((stream = gf_list_enum(pl->streams, &i))) {
+		j = 0;
+		while (NULL != (pe = gf_list_enum(stream->variants, &j))) {
+			Bool found = GF_FALSE;
+			char *suburl;
+			if (!pe->url)
+				continue;
+
+			/* filter out duplicated entries (seen on M6 m3u8) */
+			for (k=0; k<j-1; ++k) {
+				PlaylistElement *a_pe = gf_list_get(stream->variants, k);
+				if (a_pe->url && pe->url && !strcmp(a_pe->url, pe->url)) {
+					found = GF_TRUE;
+					break;
+				}
+			}
+			if (found)
+				continue;
+
+			the_pe = pe;
+			suburl = NULL;
+			if (!strstr(pe->url, ".m3u8"))
+				continue; /*not HLS*/
+
+			if (!parse_sub_playlist)
+				continue;
+
+			if (strcmp(base_url, pe->url))
+				suburl = gf_url_concatenate(base_url, pe->url);
+
+			if (!suburl || !strcmp(base_url, suburl)) {
+				if (suburl)
+					gf_free(suburl);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Not downloading, programs are identical for %s...\n", pe->url));
+				continue;
+			}
+
+			if (getter && getter->new_session && getter->del_session && getter->get_cache_name) {
+				e = getter->new_session(getter, suburl);
+				if (e) {
+					gf_free(suburl);
+					pe->load_error = e;
+					continue;
+				}
+				if (e == GF_OK) {
+					pe->load_error = gf_m3u8_parse_sub_playlist(getter->get_cache_name(getter), &pl, suburl, stream, pe);
+				}
+				//getter->del_session(getter);
+			} else { /* for use in MP4Box */
+				if (strstr(suburl, "://")) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Downloading %s...\n", suburl));
+					e = gf_dm_wget(suburl, "tmp.m3u8", 0, 0, NULL);
+					if (e == GF_OK) {
+						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe);
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] Download faile for %s\n", suburl));
+					}
+					gf_delete_file("tmp.m3u8");
+				} else {
+					e = gf_m3u8_parse_sub_playlist(suburl, &pl, suburl, stream, pe);
+				}
+			}
+			gf_free(suburl);
+		}
+		if (max_dur < (u32) stream->computed_duration) {
+			max_dur = (u32) stream->computed_duration;
+		}
+	}
+
+	is_end = !pl->playlist_needs_refresh;
+	if (!the_pe) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] The M3U8 playlist is not correct.\n"));
+		return GF_BAD_PARAM;
+	}
+
+	update_interval = 0;
+	/*update interval is set to the duration of the last media file with rules defined in http live streaming RFC section 6.3.4*/
+	switch (reload_count) {
+	case 0:
+		update_interval = the_pe->duration_info;
+		break;
+	case 1:
+		update_interval = (Double)the_pe->duration_info / 2;
+		break;
+	case 2:
+		update_interval = 3 * ((Double)the_pe->duration_info / 2);
+		break;
+	default:
+		update_interval = 3 * the_pe->duration_info;
+		break;
+	}
+	if (is_end || ((the_pe->element_type == TYPE_PLAYLIST) && the_pe->element.playlist.is_ended)) {
+		update_interval = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] No need to refresh playlist!\n"));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Playlist will be refreshed every %g seconds, len=%d\n", update_interval, the_pe->duration_info));
+	}
+
+	title = the_pe->title;
+	if (!title || strlen(title) < 2)
+		title = the_pe->url;
+
+	assert(mpd_file);
+	assert(mpd);
+	e = gf_m3u8_fill_mpd_struct(pl, m3u8_file, base_url, mpd_file, title, update_interval, mimeTypeForM3U8Segments, do_import, use_mpd_templates, is_end, max_dur, mpd, parse_sub_playlist);
+
+	gf_m3u8_master_playlist_del(&pl);
+
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u32 *duration)
+{
+	GF_Err e;
+	MasterPlaylist *pl = NULL;
+	Stream *stream;
+	PlaylistElement *pe;
+	u32 k, count_elements;
+
+	if (!getter && !getter->new_session && !getter->del_session && !getter->get_cache_name) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] FileDownloader not found\n"));
+		return GF_BAD_PARAM;
+	}
+
+	e = getter->new_session(getter, rep->segment_list->xlink_href);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Download failed for %s\n", rep->segment_list->xlink_href));
+		return e;
+	}
+	e = gf_m3u8_parse_master_playlist(getter->get_cache_name(getter), &pl, rep->segment_list->xlink_href);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Failed to parse playlist %s\n", rep->segment_list->xlink_href));
+		return e;
+	}
+
+	assert(pl);
+	assert(pl->streams);
+	assert(gf_list_count(pl->streams) == 1);
+
+	if (is_static) {
+		*is_static = pl->playlist_needs_refresh ? GF_FALSE : GF_TRUE;
+	}
+
+	stream = (Stream *)gf_list_get(pl->streams, 0);
+	assert(gf_list_count(stream->variants) == 1);
+	pe = (PlaylistElement *)gf_list_get(stream->variants, 0);
+
+	if (duration) {
+		*duration = (u32) (stream->computed_duration * 1000);
+	}
+
+	rep->segment_list->duration = (u64) (pe->duration_info * 1000);
+	rep->segment_list->timescale = 1000;
+	rep->m3u8_media_seq_min = pe->element.playlist.media_seq_min;
+	rep->m3u8_media_seq_max = pe->element.playlist.media_seq_max;
+	if (!rep->segment_list->segment_URLs)
+		rep->segment_list->segment_URLs = gf_list_new();
+	count_elements = gf_list_count(pe->element.playlist.elements);
+	for (k=0; k<count_elements; k++) {
+		GF_MPD_SegmentURL *segment_url;
+		PlaylistElement *elt = gf_list_get(pe->element.playlist.elements, k);
+
+		GF_SAFEALLOC(segment_url, GF_MPD_SegmentURL);
+		if (!segment_url) {
+			return GF_OUT_OF_MEM;
+		}
+		gf_list_add(rep->segment_list->segment_URLs, segment_url);
+		segment_url->media = gf_url_concatenate(pe->url, elt->url);
+		if (elt->drm_method != DRM_NONE) {
+			if (elt->key_uri) {
+				segment_url->key_url = gf_strdup(elt->key_uri);
+				memcpy(segment_url->key_iv, elt->key_iv, sizeof(bin128));
+			}
+		}
+	}
+
+	if (!gf_list_count(rep->segment_list->segment_URLs)) {
+		gf_list_del(rep->segment_list->segment_URLs);
+		rep->segment_list->segment_URLs = NULL;
+	}
+
+	gf_free(rep->segment_list->xlink_href);
+	rep->segment_list->xlink_href = NULL;
 
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_MPD_SegmentList *gf_mpd_solve_segment_list_xlink(GF_MPD *mpd, GF_XMLNode *root)
+{
+	return gf_mpd_parse_segment_list(mpd, root);
+}
+
+GF_EXPORT
+void gf_mpd_delete_segment_list(GF_MPD_SegmentList *segment_list)
+{
+	gf_mpd_segment_list_free(segment_list);
+}
+
+
 void gf_mpd_print_date(FILE *out, char *name, u64 time)
 {
 	time_t gtime;
@@ -1650,11 +1824,11 @@
 	fprintf(out, " %s=\"PT%02dH%02dM%02.2fS\"", name, h, m, s);
 }
 
-static void gf_mpd_print_base_url(FILE *out, GF_List *base_URLs, char *indent) 
+static void gf_mpd_print_base_url(FILE *out, GF_List *base_URLs, char *indent)
 {
 	GF_MPD_BaseURL *url;
 	u32 i;
-	i=0; 
+	i=0;
 	while ((url = (GF_MPD_BaseURL *)gf_list_enum(base_URLs, &i))) {
 		fprintf(out, "%s<BaseURL ", indent);
 		if (url->service_location)
@@ -1680,7 +1854,7 @@
 	if (s->index_range) fprintf(out, " indexRange=\""LLD"-"LLD"\"", s->index_range->start_range, s->index_range->end_range);
 	if (s->index_range_exact) fprintf(out, " indexRangeExact=\"true\"");
 	if (s->availability_time_offset) fprintf(out, " availabilityTimeOffset=\"%g\"", s->availability_time_offset);
-	if (s->time_shift_buffer_depth) 
+	if (s->time_shift_buffer_depth)
 		gf_mpd_print_duration(out, "timeShiftBufferDepth", s->time_shift_buffer_depth);
 }
 
@@ -1722,7 +1896,7 @@
 
 
 	if (!ms->bitstream_switching_url && !ms->segment_timeline && !ms->initialization_segment && !ms->representation_index) {
-		fprintf(out, "/>\n");
+		fprintf(out, ">\n");
 		return 1;
 	}
 	fprintf(out, ">\n");
@@ -1740,7 +1914,7 @@
 	fprintf(out, "%s<SegmentList", indent);
 	if (s->xlink_href) {
 		fprintf(out, " xlink:href=\"%s\"", s->xlink_href);
-		if (s->xlink_actuate_on_load) 
+		if (s->xlink_actuate_on_load)
 			fprintf(out, " actuate=\"onLoad\"");
 	}
 	gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent);
@@ -1755,7 +1929,15 @@
 			if (url->index) fprintf(out, " index=\"%s\"", url->index);
 			if (url->media_range) fprintf(out, " mediaRange=\""LLD"-"LLD"\"", url->media_range->start_range, url->media_range->end_range);
 			if (url->index_range) fprintf(out, " indexRange=\""LLD"-"LLD"\"", url->index_range->start_range, url->index_range->end_range);
-			fprintf(out, ">\n");
+			if (url->key_url) {
+				u32 idx;
+				fprintf(out, " hls:keyMethod=\"aes-128\" hls:KeyURL=%s hls:KeyIV=\"", url->key_url);
+				for (idx=0; idx<16; i++) {
+					fprintf(out, "%02x", url->key_iv[i]);
+				}
+				fprintf(out, "\"");
+			}
+			fprintf(out, "/>\n");
 		}
 	}
 	fprintf(out, "%s</SegmentList>\n", indent);
@@ -1810,7 +1992,7 @@
 		if (desc->id) fprintf(out, " id=\"%s\"", desc->id);
 		if (desc->scheme_id_uri) fprintf(out, " schemeIdUri=\"%s\"", desc->scheme_id_uri);
 		if (desc->value) fprintf(out, " value=\"%s\"", desc->value);
-	
+
 		if (desc->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)desc);
 
 		if (desc->children) {
@@ -1828,7 +2010,7 @@
 	if (ca->width) fprintf(out, " width=\"%d\"", ca->width);
 	if (ca->height) fprintf(out, " height=\"%d\"", ca->height);
 	if (ca->sar) fprintf(out, " sar=\"%d:%d\"", ca->sar->num, ca->sar->den);
-	if (ca->framerate) fprintf(out, " frameRate=\"%d:%d\"", ca->framerate->num, ca->framerate->den);
+	if (ca->framerate) fprintf(out, " frameRate=\"%d/%d\"", ca->framerate->num, ca->framerate->den);
 	if (ca->samplerate) fprintf(out, " audioSamplingRate=\"%d\"", ca->samplerate);
 	if (ca->mime_type) fprintf(out, " mimeType=\"%s\"", ca->mime_type);
 	if (ca->segmentProfiles) fprintf(out, " segmentProfiles=\"%s\"", ca->segmentProfiles);
@@ -1883,7 +2065,7 @@
 		can_close = 1;
 	}
 
-	if (gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)rep, " ", can_close)) 
+	if (gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)rep, " ", can_close))
 		return;
 
 	gf_mpd_print_base_url(out, rep->base_URLs, " ");
@@ -1896,10 +2078,10 @@
 	if (rep->segment_template) {
 		gf_mpd_print_segment_template(out, rep->segment_template, " ");
 	}
-		/*TODO
-					e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
-					if (e) return e;
-		*/
+	/*TODO
+				e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
+				if (e) return e;
+	*/
 
 	fprintf(out, " </Representation>\n");
 }
@@ -1912,7 +2094,7 @@
 
 	if (as->xlink_href) {
 		fprintf(out, " xlink:href=\"%s\"", as->xlink_href);
-		if (as->xlink_actuate_on_load) 
+		if (as->xlink_actuate_on_load)
 			fprintf(out, " actuate=\"onLoad\"");
 	}
 	if (as->id) fprintf(out, " id=\"%d\"", as->id);
@@ -1934,7 +2116,7 @@
 
 
 	gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)as, " ", 0);
-	
+
 	gf_mpd_print_base_url(out, as->base_URLs, " ");
 
 	gf_mpd_print_descriptors(out, as->accessibility, "Accessibility", " ");
@@ -1943,7 +2125,7 @@
 	gf_mpd_print_descriptors(out, as->viewpoint, "Viewpoint", " ");
 
 //			e = gf_mpd_parse_content_component(set->content_component, child);
-	
+
 	if (as->segment_base) {
 		gf_mpd_print_segment_base(out, as->segment_base, " ");
 	}
@@ -1970,20 +2152,20 @@
 	fprintf(out, " <Period");
 	if (period->xlink_href) {
 		fprintf(out, " xlink:href=\"%s\"", period->xlink_href);
-		if (period->xlink_actuate_on_load) 
+		if (period->xlink_actuate_on_load)
 			fprintf(out, " actuate=\"onLoad\"");
 	}
-	if (period->ID) 
+	if (period->ID)
 		fprintf(out, " id=\"%s\"", period->ID);
-	if (period->start) 
+	if (period->start)
 		gf_mpd_print_duration(out, "start", period->start);
-	if (period->duration) 
+	if (period->duration)
 		gf_mpd_print_duration(out, "duration", period->start);
-	if (period->bitstream_switching) 
+	if (period->bitstream_switching)
 		fprintf(out, " bitstreamSwitching=\"true\"");
 
 	fprintf(out, ">\n");
-	
+
 	gf_mpd_print_base_url(out, period->base_URLs, " ");
 
 	if (period->segment_base) {
@@ -2015,7 +2197,7 @@
 
 	if (mpd->ID)
 		fprintf(out, " ID=\"%s\"", mpd->ID);
-	
+
 	if (mpd->profiles)
 		fprintf(out, " profiles=\"%s\"", mpd->profiles);
 	if (mpd->availabilityStartTime)
@@ -2024,19 +2206,19 @@
 		gf_mpd_print_date(out, "availabilityStartTime", mpd->availabilityEndTime);
 	if (mpd->publishTime)
 		gf_mpd_print_date(out, "availabilityStartTime", mpd->publishTime);
-	if (mpd->media_presentation_duration) 
+	if (mpd->media_presentation_duration)
 		gf_mpd_print_duration(out, "mediaPresentationDuration", mpd->media_presentation_duration);
-	if (mpd->minimum_update_period) 
+	if (mpd->minimum_update_period)
 		gf_mpd_print_duration(out, "minimumUpdatePeriod", mpd->minimum_update_period);
-	if (mpd->min_buffer_time) 
+	if (mpd->min_buffer_time)
 		gf_mpd_print_duration(out, "minBufferTime", mpd->min_buffer_time);
-	if (mpd->time_shift_buffer_depth) 
+	if (mpd->time_shift_buffer_depth)
 		gf_mpd_print_duration(out, "timeShiftBufferDepth", mpd->time_shift_buffer_depth);
-	if (mpd->suggested_presentaton_delay) 
+	if (mpd->suggested_presentaton_delay)
 		gf_mpd_print_duration(out, "suggestedPresentationDelay", mpd->suggested_presentaton_delay);
-	if (mpd->max_segment_duration) 
+	if (mpd->max_segment_duration)
 		gf_mpd_print_duration(out, "maxSegmentDuration", mpd->max_segment_duration);
-	if (mpd->max_subsegment_duration) 
+	if (mpd->max_subsegment_duration)
 		gf_mpd_print_duration(out, "maxSubsegmentDuration", mpd->max_subsegment_duration);
 
 	if (mpd->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)mpd);
@@ -2045,9 +2227,9 @@
 
 	if (mpd->children) {
 		gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)mpd);
-	} 
+	}
 
-	i=0; 
+	i=0;
 	while ((info = (GF_MPD_ProgramInfo *)gf_list_enum(mpd->program_infos, &i))) {
 		fprintf(out, " <ProgramInformation");
 		if (info->lang) {
@@ -2071,19 +2253,19 @@
 
 	gf_mpd_print_base_url(out, mpd->base_URLs, " ");
 
-	i=0; 
+	i=0;
 	while ((text = (char *)gf_list_enum(mpd->locations, &i))) {
 		fprintf(out, " <Location>%s</Location>\n", text);
 	}
 
-/*
-	i=0; 
-	while ((text = (char *)gf_list_enum(mpd->metrics, &i))) {
-		
-	}
-*/
+	/*
+		i=0;
+		while ((text = (char *)gf_list_enum(mpd->metrics, &i))) {
 
-	i=0; 
+		}
+	*/
+
+	i=0;
 	while ((period = (GF_MPD_Period *)gf_list_enum(mpd->periods, &i))) {
 		gf_mpd_print_period(period, out);
 	}
@@ -2101,18 +2283,18 @@
 	FILE *out;
 	if (!strcmp(file_name, "std")) out = stdout;
 	else {
-		out = fopen(file_name, "wb");
+		out = gf_fopen(file_name, "wb");
 		if (!out) return GF_IO_ERR;
 	}
 
 	e = gf_mpd_write(mpd, out);
-	fclose(out);
+	gf_fclose(out);
 	return e;
 }
 
 
 GF_EXPORT
-GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
+GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url, char **out_key_url, bin128 *out_key_iv)
 {
 	GF_MPD_BaseURL *url_child;
 	GF_MPD_SegmentTimeline *timeline = NULL;
@@ -2124,7 +2306,7 @@
 
 	*out_range_start = *out_range_end = 0;
 	*out_url = NULL;
-
+	if (out_key_url) *out_key_url = NULL;
 	/*resolve base URLs from document base (download location) to representation (media)*/
 	url = gf_strdup(mpd_url);
 
@@ -2185,7 +2367,11 @@
 			if (is_in_base_url) *is_in_base_url = 0;
 			/*no initialization segment / index, use base URL*/
 			if (res_url && res_url->sourceURL) {
-				*out_url = gf_url_concatenate(url, res_url->sourceURL);
+				if (res_url->is_resolved) {
+					*out_url = gf_strdup(res_url->sourceURL);
+				} else {
+					*out_url = gf_url_concatenate(url, res_url->sourceURL);
+				}
 				gf_free(url);
 			} else {
 				*out_url = url;
@@ -2248,7 +2434,11 @@
 		case GF_MPD_RESOLVE_URL_INIT:
 			if (init_url) {
 				if (init_url->sourceURL) {
-					*out_url = gf_url_concatenate(url, init_url->sourceURL);
+					if (init_url->is_resolved) {
+						*out_url = gf_strdup(init_url->sourceURL);
+					} else {
+						*out_url = gf_url_concatenate(url, init_url->sourceURL);
+					}
 					gf_free(url);
 				} else {
 					*out_url = url;
@@ -2284,6 +2474,11 @@
 			if (segment->duration) {
 				*segment_duration = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
 			}
+			if (segment->key_url && out_key_url) {
+				*out_key_url = gf_strdup((const char *) segment->key_url);
+				if (out_key_iv)
+					memcpy((*out_key_iv), segment->key_iv, sizeof(bin128) );
+			}
 			return GF_OK;
 		case GF_MPD_RESOLVE_URL_INDEX:
 			if (item_index >= segment_count) {
@@ -2474,3 +2669,4 @@
 	return GF_OK;
 }
 
+#endif /*GPAC_DISABLE_CORE_TOOLS*/

v0.5.2.tar.gz/src/media_tools/mpeg2_ps.c -> v0.6.1.tar.gz/src/media_tools/mpeg2_ps.c Changed

@@ -143,7 +143,7 @@
  *************************************************************************/
 static FILE *file_open (const char *name)
 {
-	return gf_f64_open(name, "rb");
+	return gf_fopen(name, "rb");
 }
 
 static Bool file_okay (FILE *fd)
@@ -153,7 +153,7 @@
 
 static void file_close (FILE *fd)
 {
-	fclose(fd);
+	gf_fclose(fd);
 }
 
 static Bool file_read_bytes(FILE *fd,
@@ -167,18 +167,18 @@
 // note: len could be negative.
 static void file_skip_bytes (FILE *fd, s32 len)
 {
-	gf_f64_seek(fd, len, SEEK_CUR);
+	gf_fseek(fd, len, SEEK_CUR);
 }
 
-#define file_location(__f) gf_f64_tell(__f)
-#define file_seek_to(__f, __off) gf_f64_seek(__f, __off, SEEK_SET)
+#define file_location(__f) gf_ftell(__f)
+#define file_seek_to(__f, __off) gf_fseek(__f, __off, SEEK_SET)
 
 static u64 file_size(FILE *fd)
 {
 	u64 ret;
-	gf_f64_seek(fd, 0, SEEK_END);
-	ret = gf_f64_tell(fd);
-	gf_f64_seek(fd, 0, SEEK_SET);
+	gf_fseek(fd, 0, SEEK_END);
+	ret = gf_ftell(fd);
+	gf_fseek(fd, 0, SEEK_SET);
 	return ret;
 }
 
@@ -1784,12 +1784,12 @@
 s64 mpeg2ps_get_video_pos(mpeg2ps_t *ps, u32 streamno)
 {
 	if (invalid_video_streamno(ps, streamno)) return 0;
-	return gf_f64_tell(ps->video_streams[streamno]->m_fd);
+	return gf_ftell(ps->video_streams[streamno]->m_fd);
 }
 s64 mpeg2ps_get_audio_pos(mpeg2ps_t *ps, u32 streamno)
 {
 	if (invalid_audio_streamno(ps, streamno)) return 0;
-	return gf_f64_tell(ps->audio_streams[streamno]->m_fd);
+	return gf_ftell(ps->audio_streams[streamno]->m_fd);
 }
 
 #endif /*GPAC_DISABLE_MPEG2PS*/

v0.5.2.tar.gz/src/media_tools/mpegts.c -> v0.6.1.tar.gz/src/media_tools/mpegts.c Changed

@@ -147,7 +147,7 @@
 			ts->pcr_pid = pcr_pid;
 			ts->nb_pck_at_pcr = ts->nb_pck;
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] Estimated duration based on instant bitrate: %g sec\n", ts->duration));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Estimated duration based on instant bitrate: %g sec\n", ts->duration));
 
 			if (ts->on_event && changed) {
 				GF_M2TS_PES_PCK pck;
@@ -195,6 +195,7 @@
 	return 0;
 }
 
+
 static u32 gf_m2ts_reframe_nalu_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr, Bool is_hevc)
 {
 	Bool au_start_in_pes=0;
@@ -1075,6 +1076,65 @@
 }
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
+
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static u32 gf_m2ts_reframe_ac3(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
+{
+	GF_M2TS_PES_PCK pck;
+	pck.flags = 0;
+	if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
+	if (!same_pts) pck.flags |= GF_M2TS_PES_PCK_AU_START;
+	pck.DTS = pes->DTS;
+	pck.PTS = pes->PTS;
+
+	if (!pes->aud_sr) {
+		GF_AC3Header hdr;
+		u32 pos;
+		if (gf_ac3_parser(data, data_len, &pos, &hdr, GF_TRUE)) {
+			pes->aud_sr = hdr.sample_rate;
+			pes->aud_nb_ch = hdr.channels;
+		}
+	}
+
+	pck.data = (char *)data;
+	pck.data_len = data_len;
+	pck.stream = pes;
+	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+	/*we consumed all data*/
+	return 0;
+}
+
+static u32 gf_m2ts_reframe_ec3(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
+{
+	GF_M2TS_PES_PCK pck;
+	pck.flags = 0;
+	if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
+	if (!same_pts) pck.flags |= GF_M2TS_PES_PCK_AU_START;
+	pck.DTS = pes->DTS;
+	pck.PTS = pes->PTS;
+
+	if (!pes->aud_sr) {
+		GF_AC3Header hdr;
+		GF_BitStream *bs = gf_bs_new((const char *) data, data_len, GF_BITSTREAM_READ);
+		if (gf_eac3_parser_bs(bs, &hdr, GF_TRUE)) {
+			pes->aud_sr = hdr.sample_rate;
+			pes->aud_nb_ch = hdr.channels;
+		}
+		gf_bs_del(bs);
+	}
+
+	pck.data = (char *)data;
+	pck.data_len = data_len;
+	pck.stream = pes;
+	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+	/*we consumed all data*/
+	return 0;
+}
+
+#endif /*GPAC_DISABLE_AV_PARSERS*/
+
+
 typedef enum {
 	ID3V2_FRAME_AENC = GF_4CC('A','E','N','C'),
 	ID3V2_FRAME_APIC = GF_4CC('A','P','I','C'),
@@ -1198,7 +1258,7 @@
 			/* parsing a frame */
 			type = (GF_ID3v2FrameType)(((data[pos+3]) + ((data[pos+2]) << 8) + ((data[pos+1]) << 16) + ((data[pos]) << 24)));
 			pos+=4;
-			frame_size = 10 + ((data[pos+3]) + ((data[pos+2]) << 8) + ((data[pos+1]) << 16) + ((data[pos]) << 24));
+			frame_size = 10 + ((data[pos+3] & 0x7f) + ((data[pos+2] & 0x7f) << 7) + ((data[pos+1] & 0x7f) << 14) + ((data[pos] & 0x7f) << 21));
 			pos+=4;
 			//tag_alter_preservation_flag = ((data[pos]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
 			//file_alter_preservation_flag = ((data[pos]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
@@ -1262,7 +1322,12 @@
 
 	while (i<ts->buffer_size) {
 		if (i+188>ts->buffer_size) return ts->buffer_size;
-		if ((ts->buffer[i]==0x47) && (ts->buffer[i+188]==0x47)) break;
+		if ((ts->buffer[i]==0x47) && (ts->buffer[i+188]==0x47))
+			break;
+		if ((ts->buffer[i]==0x47) && (ts->buffer[i+192]==0x47)) {
+			ts->prefix_present = 1;
+			break;
+		}
 		i++;
 	}
 	if (i) {
@@ -1569,7 +1634,7 @@
 
 			if (t->last_section_number == t->section_number) {
 				u32 table_size;
-				
+
 				status |= GF_M2TS_TABLE_END;
 
 				table_size = 0;
@@ -1915,7 +1980,9 @@
 	data_size = section->data_size;
 
 	/*TOT only contains 40 bits of UTC_time; TDT add descriptors and a CRC*/
-	assert(table_id!=GF_M2TS_TABLE_ID_TDT || data_size == 5); /**/
+	if ((table_id==GF_M2TS_TABLE_ID_TDT) && (data_size != 5)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Corrupted TDT size\n", table_name));
+	}
 	GF_SAFEALLOC(time_table, GF_M2TS_TDT_TOT);
 
 	/*UTC_time - see annex C of DVB-SI ETSI EN 300468*/
@@ -2287,15 +2354,17 @@
 			break;
 
 		case GF_M2TS_MPE_SECTIONS:
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("stream type MPE found : pid = %d \n", pid));
+			if (! ts->prefix_present) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("stream type MPE found : pid = %d \n", pid));
 #ifdef GPAC_ENABLE_MPE
-			es = gf_dvb_mpe_section_new();
-			if (es->flags & GF_M2TS_ES_IS_SECTION) {
-				/* NULL means: trigger the call to on_event with DVB_GENERAL type and the raw section as payload */
-				((GF_M2TS_SECTION_ES*)es)->sec = gf_m2ts_section_filter_new(NULL, 1);
-			}
+				es = gf_dvb_mpe_section_new();
+				if (es->flags & GF_M2TS_ES_IS_SECTION) {
+					/* NULL means: trigger the call to on_event with DVB_GENERAL type and the raw section as payload */
+					((GF_M2TS_SECTION_ES*)es)->sec = gf_m2ts_section_filter_new(NULL, 1);
+				}
 #endif
-			break;
+				break;
+			}
 
 		default:
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Stream type (0x%x) for PID %d not supported\n", stream_type, pid ) );
@@ -2339,6 +2408,9 @@
 					case GF_4CC('V', 'C', '-', '1'):
 						es->stream_type = GF_M2TS_VIDEO_VC1;
 						break;
+					default:
+						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Unknown registration descriptor %s\n", gf_4cc_to_str(reg_desc_format) ));
+						break;
 					}
 					break;
 				case GF_M2TS_DVB_EAC3_DESCRIPTOR:
@@ -2468,7 +2540,7 @@
 		u32 i;
 		//translate hierarchy descriptors indexes into PIDs - check whether the PMT-index rules are the same for HEVC
 		for (i=0; i<gf_list_count(pmt->program->streams); i++) {
-			GF_M2TS_PES *an_es = (GF_M2TS_PES *)gf_list_get(pmt->program->streams, i);
+			GF_M2TS_PES *an_es = NULL;
 			GF_M2TS_PES *es = (GF_M2TS_PES *)gf_list_get(pmt->program->streams, i);
 			if ( !(es->flags & GF_M2TS_ES_IS_PES)) continue;
 			if (!es->depends_on_pid) continue;
@@ -2485,7 +2557,6 @@
 	}
 }
 
-static u32 nb_pat=0;
 static void gf_m2ts_process_pat(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *ses, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
 {
 	GF_M2TS_Program *prog;
@@ -2496,8 +2567,6 @@
 	unsigned char *data;
 	GF_M2TS_Section *section;
 
-	nb_pat++;
-
 	/*wait for the last section */
 	if (!(status&GF_M2TS_TABLE_END)) return;
 
@@ -2684,32 +2753,33 @@
 	}
 }
 
-static void gf_m2ts_flush_temi(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
+static void gf_m2ts_store_temi(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
 {
-	GF_M2TS_TemiTimecodeDescriptor temi_tc;
 	GF_BitStream *bs = gf_bs_new(pes->temi_tc_desc, pes->temi_tc_desc_len, GF_BITSTREAM_READ);
 	u32 has_timestamp = gf_bs_read_int(bs, 2);
-	/*u32 has_ntp = */gf_bs_read_int(bs, 1);
+	Bool has_ntp = (Bool) gf_bs_read_int(bs, 1);
 	/*u32 has_ptp = */gf_bs_read_int(bs, 1);
 	/*u32 has_timecode = */gf_bs_read_int(bs, 2);
 
-	memset(&temi_tc, 0, sizeof(GF_M2TS_TemiTimecodeDescriptor));
-	temi_tc.force_reload = gf_bs_read_int(bs, 1);
-	temi_tc.is_paused = gf_bs_read_int(bs, 1);
-	temi_tc.is_discontinuity = gf_bs_read_int(bs, 1);
+	memset(&pes->temi_tc, 0, sizeof(GF_M2TS_TemiTimecodeDescriptor));
+	pes->temi_tc.force_reload = gf_bs_read_int(bs, 1);
+	pes->temi_tc.is_paused = gf_bs_read_int(bs, 1);
+	pes->temi_tc.is_discontinuity = gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
-	temi_tc.timeline_id = gf_bs_read_int(bs, 8);
+	pes->temi_tc.timeline_id = gf_bs_read_int(bs, 8);
 	if (has_timestamp) {
-		temi_tc.media_timescale = gf_bs_read_u32(bs);
+		pes->temi_tc.media_timescale = gf_bs_read_u32(bs);
 		if (has_timestamp==2)
-			temi_tc.media_timestamp = gf_bs_read_u64(bs);
+			pes->temi_tc.media_timestamp = gf_bs_read_u64(bs);
 		else
-			temi_tc.media_timestamp = gf_bs_read_u32(bs);
+			pes->temi_tc.media_timestamp = gf_bs_read_u32(bs);
+	}
+	if (has_ntp) {
+		pes->temi_tc.ntp = gf_bs_read_u64(bs);
 	}
-	temi_tc.pes_pts = pes->PTS;
 	gf_bs_del(bs);
 	pes->temi_tc_desc_len = 0;
-	ts->on_event(ts, GF_M2TS_EVT_TEMI_TIMECODE, &temi_tc);
+	pes->temi_pending = 1;
 }
 
 void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
@@ -2720,6 +2790,8 @@
 	if ((pes->pck_data_len >= 4) && !pes->pck_data[0] && !pes->pck_data[1] && (pes->pck_data[2]==0x1)) {
 		u32 len;
 		u32 stream_id = pes->pck_data[3] | 0x100;
+		Bool same_pts = 0;
+
 		if ((stream_id >= 0x1c0 && stream_id <= 0x1df) ||
 		 (stream_id >= 0x1e0 && stream_id <= 0x1ef) ||
 		 (stream_id == 0x1bd) ||
@@ -2727,107 +2799,114 @@
 		 /*SL-packetized*/
 		 ((u8) pes->pck_data[3]==0xfa)
 		 ) {
-			Bool same_pts = 0;
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: unknown stream ID %08X\n", pes->pid, stream_id));
+		}
 
-			/*OK read header*/
-			gf_m2ts_pes_header(pes, pes->pck_data+3, pes->pck_data_len-3, &pesh);
 
-			/*send PES timing*/
-			if (ts->notify_pes_timing) {
-				GF_M2TS_PES_PCK pck;
-				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
-				pck.PTS = pesh.PTS;
-				pck.DTS = pesh.DTS;
-				pck.stream = pes;
-				if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
-				pes->pes_end_packet_number = ts->pck_number;
-				if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_PES_TIMING, &pck);
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d Got PES header PTS %d\n", pes->pid, pesh.PTS));
-
-			if (pesh.PTS) {
-
-				if (pesh.PTS==pes->PTS) {
-					same_pts = 1;
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same PTS "LLU" for two consecutive PES packets \n", pes->pid, pes->PTS) );
-				}
+		/*OK read header*/
+		gf_m2ts_pes_header(pes, pes->pck_data+3, pes->pck_data_len-3, &pesh);
+
+		/*send PES timing*/
+		if (ts->notify_pes_timing) {
+			GF_M2TS_PES_PCK pck;
+			memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
+			pck.PTS = pesh.PTS;
+			pck.DTS = pesh.DTS;
+			pck.stream = pes;
+			if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
+			pes->pes_end_packet_number = ts->pck_number;
+			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_PES_TIMING, &pck);
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d Got PES header PTS %d\n", pes->pid, pesh.PTS));
+
+		if (pesh.PTS) {
+
+			if (pesh.PTS==pes->PTS) {
+				same_pts = 1;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same PTS "LLU" for two consecutive PES packets \n", pes->pid, pes->PTS) );
+			}
 #ifndef GPAC_DISABLE_LOG
-				/*FIXME - this test should only be done for non bi-directionnally coded media
-				else if (pesh.PTS < pes->PTS) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - PTS "LLU" less than previous packet PTS "LLU"\n", pes->pid, pesh.PTS, pes->PTS) );
-				}
-				*/
+			/*FIXME - this test should only be done for non bi-directionnally coded media
+			else if (pesh.PTS < pes->PTS) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - PTS "LLU" less than previous packet PTS "LLU"\n", pes->pid, pesh.PTS, pes->PTS) );
+			}
+			*/
 #endif
 
-				pes->PTS = pesh.PTS;
+			pes->PTS = pesh.PTS;
 #ifndef GPAC_DISABLE_LOG
-				{
-					if (pes->DTS && (pesh.DTS==pes->DTS)) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same DTS "LLU" for two consecutive PES packets \n", pes->pid, pes->DTS) );
-					}
-					if (pesh.DTS<pes->DTS) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - DTS "LLU" less than previous DTS "LLU"\n", pes->pid, pesh.DTS, pes->DTS) );
-					}
+			{
+				if (pes->DTS && (pesh.DTS==pes->DTS)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same DTS "LLU" for two consecutive PES packets \n", pes->pid, pes->DTS) );
+				}
+				if (pesh.DTS<pes->DTS) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - DTS "LLU" less than previous DTS "LLU"\n", pes->pid, pesh.DTS, pes->DTS) );
 				}
-#endif
-				pes->DTS = pesh.DTS;
 			}
-			/*no PTSs were coded, same time*/
-			else if (!pesh.hdr_data_len)
-				same_pts = 1;
+#endif
+			pes->DTS = pesh.DTS;
+		}
+		/*no PTSs were coded, same time*/
+		else if (!pesh.hdr_data_len)
+			same_pts = 1;
 
 
-			/*3-byte start-code + 6 bytes header + hdr extensions*/
-			len = 9 + pesh.hdr_data_len;
+		/*3-byte start-code + 6 bytes header + hdr extensions*/
+		len = 9 + pesh.hdr_data_len;
 
-			if ((u8) pes->pck_data[3]==0xfa) {
-				GF_M2TS_SL_PCK sl_pck;
+		if ((u8) pes->pck_data[3]==0xfa) {
+			GF_M2TS_SL_PCK sl_pck;
 
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] SL Packet in PES for %d - ES ID %d\n", pes->pid, pes->mpeg4_es_id));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] SL Packet in PES for %d - ES ID %d\n", pes->pid, pes->mpeg4_es_id));
 
-				if (pes->pck_data_len > len) {
-					sl_pck.data = (char *)pes->pck_data + len;
-					sl_pck.data_len = pes->pck_data_len - len;
-					sl_pck.stream = (GF_M2TS_ES *)pes;
-					if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_SL_PCK, &sl_pck);
+			if (pes->pck_data_len > len) {
+				sl_pck.data = (char *)pes->pck_data + len;
+				sl_pck.data_len = pes->pck_data_len - len;
+				sl_pck.stream = (GF_M2TS_ES *)pes;
+				if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_SL_PCK, &sl_pck);
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Bad SL Packet size: (%d indicated < %d header)\n", pes->pid, pes->pck_data_len, len));
+			}
+		} else if (pes->reframe) {
+			u32 remain = 0;
+			u32 offset = len;
+
+			if (pesh.pck_len && (pesh.pck_len-3-pesh.hdr_data_len != pes->pck_data_len-len)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES payload size %d but received %d bytes\n", pes->pid, (u32) ( pesh.pck_len-3-pesh.hdr_data_len), pes->pck_data_len-len));
+			}
+			//copy over the remaining of previous PES payload before start of this PES payload
+			if (pes->prev_data_len) {
+				if (pes->prev_data_len < len) {
+					offset = len - pes->prev_data_len;
+					memcpy(pes->pck_data + offset, pes->prev_data, pes->prev_data_len);
 				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Bad SL Packet size: (%d indicated < %d header)\n", pes->pid, pes->pck_data_len, len));
-				}
-			} else if (pes->reframe) {
-				u32 remain = 0;
-				u32 offset = len;
-
-				if (pesh.pck_len && (pesh.pck_len-3-pesh.hdr_data_len != pes->pck_data_len-len)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES payload size %d but received %d bytes\n", pes->pid, (u32) ( pesh.pck_len-3-pesh.hdr_data_len), pes->pck_data_len-len));
-				}
-				//copy over the remaining of previous PES payload before start of this PES payload
-				if (pes->prev_data_len) {
-					if (pes->prev_data_len < len) {
-						offset = len - pes->prev_data_len;
-						memcpy(pes->pck_data + offset, pes->prev_data, pes->prev_data_len);
-					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES reassembly buffer overflow (%d bytes not processed from previous PES) - discarding prev data\n", pes->pid, pes->prev_data_len ));
-					}
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES reassembly buffer overflow (%d bytes not processed from previous PES) - discarding prev data\n", pes->pid, pes->prev_data_len ));
 				}
+			}
+
+			if (!pes->temi_pending && pes->temi_tc_desc_len) {
+				gf_m2ts_store_temi(ts, pes);
+			}
 
-				if (pes->temi_tc_desc_len)
-					gf_m2ts_flush_temi(ts, pes);
+			if (pes->temi_pending) {
+				pes->temi_pending = 0;
+				pes->temi_tc.pes_pts = pes->PTS;
+				ts->on_event(ts, GF_M2TS_EVT_TEMI_TIMECODE, &pes->temi_tc);
+			}
 
-				if (! ts->start_range)
-					remain = pes->reframe(ts, pes, same_pts, pes->pck_data+offset, pes->pck_data_len-offset, &pesh);
+			if (! ts->start_range)
+				remain = pes->reframe(ts, pes, same_pts, pes->pck_data+offset, pes->pck_data_len-offset, &pesh);
 
-				//CLEANUP alloc stuff
-				if (pes->prev_data) gf_free(pes->prev_data);
-				pes->prev_data = NULL;
-				pes->prev_data_len = 0;
-				if (remain) {
-					pes->prev_data = gf_malloc(sizeof(char)*remain);
-					memcpy(pes->prev_data, pes->pck_data + pes->pck_data_len - remain, remain);
-					pes->prev_data_len = remain;
-				}
+			//CLEANUP alloc stuff
+			if (pes->prev_data) gf_free(pes->prev_data);
+			pes->prev_data = NULL;
+			pes->prev_data_len = 0;
+			if (remain) {
+				pes->prev_data = gf_malloc(sizeof(char)*remain);
+				memcpy(pes->prev_data, pes->pck_data + pes->pck_data_len - remain, remain);
+				pes->prev_data_len = remain;
 			}
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: unknown stream ID %08X\n", pes->pid, stream_id));
 		}
 	} else if (pes->pck_data_len) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Bad PES Header, discarding packet (maybe stream is encrypted ?)\n", pes->pid));
@@ -2846,7 +2925,10 @@
 	/*duplicated packet, NOT A DISCONTINUITY, we should discard the packet - however we may encounter this configuration in DASH at segment boundaries.
 	If payload start is set, ignore duplication*/
 	if (hdr->continuity_counter==pes->cc) {
-		if (!hdr->payload_start || (hdr->adaptation_field!=3) ) return;
+		if (!hdr->payload_start || (hdr->adaptation_field!=3) ) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Duplicated Packet found (CC %d) - skipping\n", pes->pid, pes->cc));
+			return;
+		}
 	} else {
 		expect_cc = (pes->cc<0) ? hdr->continuity_counter : (pes->cc + 1) & 0xf;
 		if (expect_cc != hdr->continuity_counter)
@@ -2972,30 +3054,30 @@
 		af_desc_not_present = af_extension[1] & 0x10 ? 1 : 0;
 		af_extension += 2;
 		if (!afext_bytes) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension found\n", pid));
 			return;
 		}
 		afext_bytes-=1;
 		if (ltw_flag) {
 			af_extension += 2;
-			if (!afext_bytes<2) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+			if (afext_bytes<2) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension found\n", pid));
 				return;
 			}
 			afext_bytes-=2;
 		}
 		if (pwr_flag) {
 			af_extension += 3;
-			if (!afext_bytes<3) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+			if (afext_bytes<3) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension found\n", pid));
 				return;
 			}
 			afext_bytes-=3;
 		}
 		if (seamless_flag) {
 			af_extension += 3;
-			if (!afext_bytes<3) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension fopund\n", pid));
+			if (afext_bytes<3) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension found\n", pid));
 				return;
 			}
 			afext_bytes-=3;
@@ -3053,6 +3135,10 @@
 				case GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR:
 					if (ts->ess[pid] && (ts->ess[pid]->flags & GF_M2TS_ES_IS_PES)) {
 						GF_M2TS_PES *pes = (GF_M2TS_PES *) ts->ess[pid];
+
+						if (pes->temi_tc_desc_len)
+							gf_m2ts_store_temi(ts, pes);
+
 						if (pes->temi_tc_desc_alloc_size < desc_len) {
 							pes->temi_tc_desc = gf_realloc(pes->temi_tc_desc, desc_len);
 							pes->temi_tc_desc_alloc_size = desc_len;
@@ -3060,7 +3146,7 @@
 						memcpy(pes->temi_tc_desc, desc, desc_len);
 						pes->temi_tc_desc_len = desc_len;
 
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Timeline descriptor found\n", pid));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Timeline descriptor found\n", pid));
 					}
 					break;
 				}
@@ -3076,7 +3162,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Adaptation Field found: Discontinuity %d - RAP %d - PCR: "LLD"\n", pid, paf->discontinuity_indicator, paf->random_access_indicator, paf->PCR_flag ? paf->PCR_base * 300 + paf->PCR_ext : 0));
 }
 
-static void gf_m2ts_process_packet(GF_M2TS_Demuxer *ts, unsigned char *data)
+static GF_Err gf_m2ts_process_packet(GF_M2TS_Demuxer *ts, unsigned char *data)
 {
 	GF_M2TS_ES *es;
 	GF_M2TS_Header hdr;
@@ -3088,6 +3174,10 @@
 
 	/* read TS packet header*/
 	hdr.sync = data[0];
+	if (hdr.sync != 0x47) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d does not start with sync marker\n", ts->pck_number));
+		return GF_CORRUPTED_DATA;
+	}
 	hdr.error = (data[1] & 0x80) ? 1 : 0;
 	hdr.payload_start = (data[1] & 0x40) ? 1 : 0;
 	hdr.priority = (data[1] & 0x20) ? 1 : 0;
@@ -3097,16 +3187,17 @@
 	hdr.continuity_counter = data[3] & 0xf;
 
 	if (hdr.error) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet has error (PID could be %d)\n", hdr.pid));
-		return;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d has error (PID could be %d)\n", ts->pck_number, hdr.pid));
+		return GF_CORRUPTED_DATA;
 	}
 //#if DEBUG_TS_PACKET
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Packet PID %d CC %d Encrypted %d\n", hdr.pid, hdr.continuity_counter, hdr.scrambling_ctrl));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d PID %d CC %d Encrypted %d\n", ts->pck_number, hdr.pid, hdr.continuity_counter, hdr.scrambling_ctrl));
 //#endif
 
 	if (hdr.scrambling_ctrl) {
 		//TODO add decyphering
-		return;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d is scrambled - not supported\n", ts->pck_number, hdr.pid));
+		return GF_NOT_SUPPORTED;
 	}
 
 	paf = NULL;
@@ -3117,15 +3208,16 @@
 	case 3:
 		af_size = data[4];
 		if (af_size>183) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d AF field larger than 183 !\n", ts->pck_number));
 			//error
-			return;
+			return GF_CORRUPTED_DATA;
 		}
 		paf = &af;
 		memset(paf, 0, sizeof(GF_M2TS_AdaptationField));
 		//this will stop you when processing invalid (yet existing) mpeg2ts streams in debug
 		assert( af_size<=182);
 		if (af_size>182)
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Detected wrong adaption field size %u when control value is 3\n", af_size));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d Detected wrong adaption field size %u when control value is 3\n", ts->pck_number, af_size));
 		if (af_size) gf_m2ts_get_adaptation_field(ts, paf, data+5, af_size, hdr.pid);
 		pos += 1+af_size;
 		payload_size = 183 - af_size;
@@ -3134,8 +3226,8 @@
 	case 2:
 		af_size = data[4];
 		if (af_size != 183) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Non conformant bitstream: AF size is %d when it must be 183 for AF type 2\n", af_size));
-			return;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] TS Packet %d AF size is %d when it must be 183 for AF type 2\n", ts->pck_number, af_size));
+			return GF_CORRUPTED_DATA;
 		}
 		paf = &af;
 		memset(paf, 0, sizeof(GF_M2TS_AdaptationField));
@@ -3143,11 +3235,11 @@
 		payload_size = 0;
 		/*no payload and no PCR, return*/
 		if (! paf->PCR_flag)
-			return;
+			return GF_OK;
 		break;
 	/*reserved*/
 	case 0:
-		return;
+		return GF_OK;
 	default:
 		break;
 	}
@@ -3156,94 +3248,156 @@
 	/*PAT*/
 	if (hdr.pid == GF_M2TS_PID_PAT) {
 		gf_m2ts_gather_section(ts, ts->pat, NULL, &hdr, data, payload_size);
-		return;
+		return GF_OK;
 	} else if (hdr.pid == GF_M2TS_PID_CAT) {
 		gf_m2ts_gather_section(ts, ts->cat, NULL, &hdr, data, payload_size);
-		return;
-	} else {
-		es = ts->ess[hdr.pid];
-		if (paf && paf->PCR_flag) {
-			if (!es) {
-				u32 i, j;
-				for(i=0; i<gf_list_count(ts->programs); i++) {
-					GF_M2TS_PES *first_pes = NULL;
-					GF_M2TS_Program *program = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
-					if(program->pcr_pid != hdr.pid) continue;
-					for (j=0; j<gf_list_count(program->streams); j++) {
-						GF_M2TS_PES *pes = (GF_M2TS_PES *) gf_list_get(program->streams, j);
-						if (pes->flags & GF_M2TS_INHERIT_PCR) {
-							ts->ess[hdr.pid] = (GF_M2TS_ES *) pes;
-							break;
-						}
-						if (pes->flags & GF_M2TS_ES_IS_PES) 
-							first_pes = pes;
+		return GF_OK;
+	}
+
+	es = ts->ess[hdr.pid];
+	if (paf && paf->PCR_flag) {
+		if (!es) {
+			u32 i, j;
+			for(i=0; i<gf_list_count(ts->programs); i++) {
+				GF_M2TS_PES *first_pes = NULL;
+				GF_M2TS_Program *program = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
+				if(program->pcr_pid != hdr.pid) continue;
+				for (j=0; j<gf_list_count(program->streams); j++) {
+					GF_M2TS_PES *pes = (GF_M2TS_PES *) gf_list_get(program->streams, j);
+					if (pes->flags & GF_M2TS_INHERIT_PCR) {
+						ts->ess[hdr.pid] = (GF_M2TS_ES *) pes;
+						pes->flags |= GF_M2TS_FAKE_PCR;
+						break;
 					}
-					//non found, use the first media stream as a PCR destination - Q: is it legal to have PCR only streams not declared in PMT ?
-					if (!es) {
-						es = (GF_M2TS_ES *) first_pes;
+					if (pes->flags & GF_M2TS_ES_IS_PES) {
+						first_pes = pes;
 					}
-					break;
 				}
-				if (!es) 
-					es = ts->ess[hdr.pid];
+				//non found, use the first media stream as a PCR destination - Q: is it legal to have PCR only streams not declared in PMT ?
+				if (!es && first_pes) {
+					es = (GF_M2TS_ES *) first_pes;
+					first_pes->flags |= GF_M2TS_FAKE_PCR;
+				}
+				break;
 			}
-			if (es) {
-				GF_M2TS_PES_PCK pck;
-				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
-				es->program->before_last_pcr_value = es->program->last_pcr_value;
-				es->program->before_last_pcr_value_pck_number = es->program->last_pcr_value_pck_number;
-				es->program->last_pcr_value_pck_number = ts->pck_number;
-				es->program->last_pcr_value = paf->PCR_base * 300 + paf->PCR_ext;
-				if (!es->program->last_pcr_value) es->program->last_pcr_value = 1;
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PCR found "LLU" ("LLU" at 90kHz) - PCR diff is %d us\n", es->program->last_pcr_value, es->program->last_pcr_value/300, (u32) (es->program->last_pcr_value - es->program->before_last_pcr_value)/27 ));
-
-				pck.PTS = es->program->last_pcr_value;
-				pck.stream = (GF_M2TS_PES *)es;
-				if (paf->discontinuity_indicator)
+			if (!es)
+				es = ts->ess[hdr.pid];
+		}
+		if (es) {
+			GF_M2TS_PES_PCK pck;
+			s64 prev_diff_in_us;
+			Bool discontinuity;
+			s32 cc = -1;
+
+			if (es->flags & GF_M2TS_FAKE_PCR) {
+				cc = es->program->pcr_cc;
+				es->program->pcr_cc = hdr.continuity_counter;
+			}
+			else if (es->flags & GF_M2TS_ES_IS_PES) cc = ((GF_M2TS_PES*)es)->cc;
+			else if (((GF_M2TS_SECTION_ES*)es)->sec) cc = ((GF_M2TS_SECTION_ES*)es)->sec->cc;
+
+			discontinuity = paf->discontinuity_indicator;
+			if ((cc>=0) && es->program->before_last_pcr_value) {
+				//no increment of CC if AF only packet
+				if (hdr.adaptation_field == 2) {
+					if (hdr.continuity_counter != cc) {
+						discontinuity = GF_TRUE;
+					}
+				} else if (hdr.continuity_counter != ((cc + 1) & 0xF)) {
+					discontinuity = GF_TRUE;
+				}
+			}
+
+			memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
+			prev_diff_in_us = (s64) (es->program->last_pcr_value /27- es->program->before_last_pcr_value/27);
+			es->program->before_last_pcr_value = es->program->last_pcr_value;
+			es->program->before_last_pcr_value_pck_number = es->program->last_pcr_value_pck_number;
+			es->program->last_pcr_value_pck_number = ts->pck_number;
+			es->program->last_pcr_value = paf->PCR_base * 300 + paf->PCR_ext;
+			if (!es->program->last_pcr_value) es->program->last_pcr_value = 1;
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR found "LLU" ("LLU" at 90kHz) - PCR diff is %d us\n", hdr.pid, es->program->last_pcr_value, es->program->last_pcr_value/300, (s32) (es->program->last_pcr_value - es->program->before_last_pcr_value)/27 ));
+
+			pck.PTS = es->program->last_pcr_value;
+			pck.stream = (GF_M2TS_PES *)es;
+
+			//try to ignore all discontinuities that are less than 200 ms (seen in some HLS setup ...)
+			if (discontinuity) {
+				s64 diff_in_us = (s64) (es->program->last_pcr_value - es->program->before_last_pcr_value) / 27;
+				u64 diff = ABS(diff_in_us - prev_diff_in_us);
+
+				if ((diff_in_us<0) && (diff_in_us >= -200000)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d new PCR, with discontinuity signaled, is less than previously received PCR (diff %d us) but not too large, trying to ignore discontinuity\n", hdr.pid, diff_in_us));
+				}
+
+				//ignore PCR discontinuity indicator if PCR found is larger than previously received PCR and diffence between PCR before and after discontinuity indicator is smaller than 50ms
+				else if ((diff_in_us > 0) && (diff < 200000)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled but diff is small (diff %d us - PCR diff %d vs prev PCR diff %d) - ignore it\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled (diff %d us - PCR diff %d vs prev PCR diff %d)\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
 					pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
-				if (ts->on_event) {
-					gf_m2ts_estimate_duration(ts, es->program->last_pcr_value, hdr.pid);
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCR, &pck);
 				}
 			}
-		}
+			else if ( (es->program->last_pcr_value < es->program->before_last_pcr_value) ) {
+				s64 diff_in_us = (s64) (es->program->last_pcr_value - es->program->before_last_pcr_value) / 27;
+				//if less than 200 ms before PCR loop at the last PCR, this is a PCR loop
+				if (GF_M2TS_MAX_PCR - es->program->before_last_pcr_value < 5400000 /*2*2700000*/) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR loop found from "LLU" to "LLU" \n", hdr.pid, es->program->before_last_pcr_value, es->program->last_pcr_value));
+				} else if ((diff_in_us<0) && (diff_in_us >= -200000)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d new PCR, without discontinuity signaled, is less than previously received PCR (diff %d us) but not too large, trying to ignore discontinuity\n", hdr.pid, diff_in_us));
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR found "LLU" is less than previously received PCR "LLU" (PCR diff %g sec) but no discontinuity signaled\n", hdr.pid, es->program->last_pcr_value, es->program->before_last_pcr_value, (GF_M2TS_MAX_PCR - es->program->before_last_pcr_value + es->program->last_pcr_value) / 27000000.0));
 
-		/*check for DVB reserved PIDs*/
-		if (!es) {
-			if (hdr.pid == GF_M2TS_PID_SDT_BAT_ST) {
-				gf_m2ts_gather_section(ts, ts->sdt, NULL, &hdr, data, payload_size);
-				return;
-			} else if (hdr.pid == GF_M2TS_PID_NIT_ST) {
-				/*ignore them, unused at application level*/
-				gf_m2ts_gather_section(ts, ts->nit, NULL, &hdr, data, payload_size);
-				return;
-			} else if (hdr.pid == GF_M2TS_PID_EIT_ST_CIT) {
-				/* ignore EIT messages for the moment */
-				gf_m2ts_gather_section(ts, ts->eit, NULL, &hdr, data, payload_size);
-				return;
-			} else if (hdr.pid == GF_M2TS_PID_TDT_TOT_ST) {
-				gf_m2ts_gather_section(ts, ts->tdt_tot, NULL, &hdr, data, payload_size);
-			} else {
-				/* ignore packet */
+					pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
+				}
 			}
-		} else if (es->flags & GF_M2TS_ES_IS_SECTION) { 	/* The stream uses sections to carry its payload */
-			GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
-			if (ses->sec) gf_m2ts_gather_section(ts, ses->sec, ses, &hdr, data, payload_size);
+
+			if (pck.flags & GF_M2TS_PES_PCK_DISCONTINUITY) {
+				gf_m2ts_reset_parsers_for_program(ts, es->program);
+			}
+
+			if (ts->on_event) {
+				gf_m2ts_estimate_duration(ts, es->program->last_pcr_value, hdr.pid);
+				ts->on_event(ts, GF_M2TS_EVT_PES_PCR, &pck);
+			}
+		}
+	}
+
+	/*check for DVB reserved PIDs*/
+	if (!es) {
+		if (hdr.pid == GF_M2TS_PID_SDT_BAT_ST) {
+			gf_m2ts_gather_section(ts, ts->sdt, NULL, &hdr, data, payload_size);
+			return GF_OK;
+		} else if (hdr.pid == GF_M2TS_PID_NIT_ST) {
+			/*ignore them, unused at application level*/
+			gf_m2ts_gather_section(ts, ts->nit, NULL, &hdr, data, payload_size);
+			return GF_OK;
+		} else if (hdr.pid == GF_M2TS_PID_EIT_ST_CIT) {
+			/* ignore EIT messages for the moment */
+			gf_m2ts_gather_section(ts, ts->eit, NULL, &hdr, data, payload_size);
+			return GF_OK;
+		} else if (hdr.pid == GF_M2TS_PID_TDT_TOT_ST) {
+			gf_m2ts_gather_section(ts, ts->tdt_tot, NULL, &hdr, data, payload_size);
 		} else {
-			GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
-			/* regular stream using PES packets */
-			if (pes->reframe && payload_size) gf_m2ts_process_pes(ts, pes, &hdr, data, payload_size, paf);
+			/* ignore packet */
 		}
+	} else if (es->flags & GF_M2TS_ES_IS_SECTION) { 	/* The stream uses sections to carry its payload */
+		GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
+		if (ses->sec) gf_m2ts_gather_section(ts, ses->sec, ses, &hdr, data, payload_size);
+	} else {
+		GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
+		/* regular stream using PES packets */
+		if (pes->reframe && payload_size) gf_m2ts_process_pes(ts, pes, &hdr, data, payload_size, paf);
 	}
 
-	return;
+	return GF_OK;
 }
 
 GF_EXPORT
 GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *ts, char *data, u32 data_size)
 {
-	u32 pos;
+	GF_Err e;
+	u32 pos, pck_size;
 	Bool is_align = 1;
 	if (ts->buffer) {
 		if (ts->alloc_size < ts->buffer_size+data_size) {
@@ -3268,14 +3422,16 @@
 		}
 		return GF_OK;
 	}
+	pck_size = ts->prefix_present ? 192 : 188;
+	e=GF_OK;
 	for (;;) {
 		/*wait for a complete packet*/
-		if (ts->buffer_size - pos < 188) {
+		if (ts->buffer_size < pos + pck_size) {
 			ts->buffer_size -= pos;
 			if (!ts->buffer_size) {
 				if (!is_align) gf_free(ts->buffer);
 				ts->buffer = NULL;
-				return GF_OK;
+				return e;
 			}
 			if (is_align) {
 				data = ts->buffer+pos;
@@ -3285,13 +3441,19 @@
 			} else {
 				memmove(ts->buffer, ts->buffer + pos, sizeof(char)*ts->buffer_size);
 			}
-			return GF_OK;
+			return e;
 		}
 		/*process*/
-		gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer+pos);
-		pos += 188;
+		e |= gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer+pos);
+		pos += pck_size;
+
+		if (ts->abort_parsing) {
+			if (!is_align) gf_free(ts->buffer);
+			ts->buffer = NULL;
+			return e;
+		}
 	}
-	return GF_OK;
+	return e;
 }
 
 GF_ESD *gf_m2ts_get_esd(GF_M2TS_ES *es)
@@ -3339,13 +3501,14 @@
 }
 
 GF_EXPORT
-void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts)
+void gf_m2ts_reset_parsers_for_program(GF_M2TS_Demuxer *ts, GF_M2TS_Program *prog)
 {
 	u32 i;
-	ts->pck_number = 0;
+
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
 		GF_M2TS_ES *es = (GF_M2TS_ES *) ts->ess[i];
 		if (!es) continue;
+		if (prog && (es->program != prog) ) continue;
 
 		if (es->flags & GF_M2TS_ES_IS_SECTION) {
 			GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
@@ -3360,6 +3523,8 @@
 			pes->prev_data = NULL;
 			pes->prev_data_len = 0;
 			pes->PTS = pes->DTS = 0;
+//			pes->prev_PTS = 0;
+//			pes->first_dts = 0;
 			pes->pes_len = pes->pes_end_packet_number = pes->pes_start_packet_number = 0;
 			if (pes->buf) gf_free(pes->buf);
 			pes->buf = NULL;
@@ -3374,9 +3539,15 @@
 				pes->program->before_last_pcr_value = pes->program->before_last_pcr_value_pck_number = 0;
 			}
 		}
-//		gf_free(es);
-//		ts->ess[i] = NULL;
 	}
+}
+
+GF_EXPORT
+void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts)
+{
+	gf_m2ts_reset_parsers_for_program(ts, NULL);
+
+	ts->pck_number = 0;
 
 	gf_m2ts_section_filter_reset(ts->cat);
 	gf_m2ts_section_filter_reset(ts->pat);
@@ -3456,11 +3627,6 @@
 		case GF_M2TS_VIDEO_MPEG2:
 			pes->reframe = gf_m2ts_reframe_mpeg_video;
 			break;
-#ifndef GPAC_DISABLE_AV_PARSERS
-		case GF_M2TS_AUDIO_MPEG1:
-		case GF_M2TS_AUDIO_MPEG2:
-			pes->reframe = gf_m2ts_reframe_mpeg_audio;
-			break;
 		case GF_M2TS_VIDEO_H264:
 		case GF_M2TS_VIDEO_SVC:
 			pes->reframe = gf_m2ts_reframe_avc_h264;
@@ -3471,12 +3637,23 @@
 			pes->reframe = gf_m2ts_reframe_hevc;
 			pes->single_nal_mode = (mode==GF_M2TS_PES_FRAMING_DEFAULT_NAL) ? 1 : 0;
 			break;
+#ifndef GPAC_DISABLE_AV_PARSERS
+		case GF_M2TS_AUDIO_MPEG1:
+		case GF_M2TS_AUDIO_MPEG2:
+			pes->reframe = gf_m2ts_reframe_mpeg_audio;
+			break;
 		case GF_M2TS_AUDIO_AAC:
 			pes->reframe = gf_m2ts_reframe_aac_adts;
 			break;
 		case GF_M2TS_AUDIO_LATM_AAC:
 			pes->reframe = gf_m2ts_reframe_aac_latm;
 			break;
+		case GF_M2TS_AUDIO_AC3:
+			pes->reframe = gf_m2ts_reframe_ac3;
+			break;
+		case GF_M2TS_AUDIO_EC3:
+			pes->reframe = gf_m2ts_reframe_ec3;
+			break;
 #endif
 
 		case GF_M2TS_PRIVATE_DATA:
@@ -3524,6 +3701,26 @@
 }
 
 GF_EXPORT
+void gf_m2ts_abort_parsing(GF_M2TS_Demuxer *ts, Bool force_reset_pes)
+{
+	u32 i, j, count, count2;
+
+	if (force_reset_pes) {
+		count = gf_list_count(ts->programs);
+		for (i=0; i<count; i++) {
+			GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs, i);
+			count2 = gf_list_count(prog->streams);
+			for (j=0; j<count2; j++) {
+				GF_M2TS_PES *pes = (GF_M2TS_PES *)gf_list_get(prog->streams, j);
+				if (pes)
+					pes->pck_data_len = 0;
+			}
+		}
+	}
+	ts->abort_parsing = GF_TRUE;
+}
+
+GF_EXPORT
 void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *ts) {
 
 	char* temp_dir;
@@ -3560,7 +3757,8 @@
 	if (ts->tdt_tot) gf_m2ts_section_filter_del(ts->tdt_tot);
 
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-		if (ts->ess[i]) gf_m2ts_es_del(ts->ess[i], ts);
+		//bacause of pure PCR streams, en ES might be reassigned on 2 PIDs, one for the ES and one for the PCR
+		if (ts->ess[i] && (ts->ess[i]->pid==i)) gf_m2ts_es_del(ts->ess[i], ts);
 	}
 	if (ts->buffer) gf_free(ts->buffer);
 	while (gf_list_count(ts->programs)) {
@@ -3647,7 +3845,12 @@
 	GF_BitStream *bs = NULL;
 	FILE *f = NULL;
 
-	if (fileName && !strnicmp(fileName, "gmem://", 7)) {
+	//force EOS signaing
+	if (!fileName) {
+		if (!signal_end_of_stream) return GF_BAD_PARAM;
+		ts->pos_in_stream = 0;
+	}
+	else if (fileName && !strnicmp(fileName, "gmem://", 7)) {
 		void *mem_address;
 		u32 remain;
 		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
@@ -3665,6 +3868,7 @@
 		size -= remain;
 
 		/*process chunk*/
+		ts->abort_parsing = GF_FALSE;
 		e = gf_m2ts_process_data(ts, mem_address, size);
 
 		if (refresh_type==2)
@@ -3675,7 +3879,7 @@
 	} else if (fileName) {
 		char data[188000];
 
-		f = gf_f64_open(fileName, "rb");
+		f = gf_fopen(fileName, "rb");
 
 		if (!f) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", fileName));
@@ -3693,6 +3897,7 @@
 			}
 		}
 		read = 0;
+		ts->abort_parsing = GF_FALSE;
 		while (1) {
 			u32 to_read = 188000;
 			Bool done = 0;
@@ -3719,6 +3924,8 @@
 			}
 			read += size;
 			if (done) break;
+			if (ts->abort_parsing)
+				break;
 		}
 
 		if ((refresh_type==2) || !gf_bs_available(bs)) {
@@ -3728,8 +3935,8 @@
 		}
 
 		gf_bs_del(bs);
-		fclose(f);
-
+		gf_fclose(f);
+		ts->abort_parsing = GF_FALSE;
 	}
 
 	if (signal_end_of_stream && !ts->pos_in_stream) {
@@ -3750,19 +3957,16 @@
 {
 	u32 i;
 	GF_Err e;
-	char data[UDP_BUFFER_SIZE];
-#ifdef GPAC_HAS_LINUX_DVB
-	char dvbts[DVB_BUFFER_SIZE];
-#endif
+	char data[GF_M2TS_UDP_BUFFER_SIZE];
 	u32 size;
-	//u32 i;
 	GF_M2TS_Demuxer *ts = _p;
 
 	gf_m2ts_reset_parsers(ts);
+	ts->abort_parsing = GF_FALSE;
 
 	//recreate the socket if needed
 	if (ts->socket_url && !ts->sock) {
-		gf_m2ts_get_socket(ts->socket_url, ts->network_type, UDP_BUFFER_SIZE, &ts->sock);
+		gf_m2ts_get_socket(ts->socket_url, ts->network_type, GF_M2TS_UDP_BUFFER_SIZE, &ts->sock);
 	}
 
 #ifdef GPAC_HAS_LINUX_DVB
@@ -3775,8 +3979,8 @@
 				continue;
 			}
 
-			ts_size = read(ts->tuner->ts_fd, dvbts, DVB_BUFFER_SIZE);
-			if (ts_size>0) gf_m2ts_process_data(ts, dvbts, (u32) ts_size);
+			ts_size = read(ts->tuner->ts_fd, data, GF_M2TS_UDP_BUFFER_SIZE);
+			if (ts_size>0) gf_m2ts_process_data(ts, data, (u32) ts_size);
 		}
 	} else
 #endif
@@ -3789,7 +3993,7 @@
 			Bool first_run, is_rtp;
 			FILE *record_to = NULL;
 			if (ts->record_to)
-				record_to = gf_f64_open(ts->record_to, "wb");
+				record_to = gf_fopen(ts->record_to, "wb");
 
 			first_run = 1;
 			is_rtp = 0;
@@ -3800,7 +4004,7 @@
 				}
 				size = 0;
 				/*m2ts chunks by chunks*/
-				e = gf_sk_receive(ts->sock, data, UDP_BUFFER_SIZE, 0, &size);
+				e = gf_sk_receive(ts->sock, data, GF_M2TS_UDP_BUFFER_SIZE, 0, &size);
 				if (!size || e) {
 					nb_empty++;
 					if (nb_empty==1000) {
@@ -3846,7 +4050,7 @@
 				}
 			}
 			if (record_to)
-				fclose(record_to);
+				gf_fclose(record_to);
 
 #ifndef GPAC_DISABLE_STREAMING
 			if (ch)
@@ -3997,7 +4201,7 @@
 static GF_Err gf_m2ts_demuxer_setup_live(GF_M2TS_Demuxer *ts, char *url)
 {
 	GF_Err e;
-	e = gf_m2ts_get_socket(url, ts->network_type, UDP_BUFFER_SIZE, &ts->sock);
+	e = gf_m2ts_get_socket(url, ts->network_type, GF_M2TS_UDP_BUFFER_SIZE, &ts->sock);
 	if (e) return e;
 
 	if (ts->socket_url) gf_free(ts->socket_url);
@@ -4024,7 +4228,7 @@
 	char frontend_name[100], demux_name[100], dvr_name[100];
 	u32 adapter_num;
 
-	chanfile = gf_f64_open(chan_path, "r");
+	chanfile = gf_fopen(chan_path, "r");
 	if (!chanfile) return GF_BAD_PARAM;
 
 	chan_name = (char *) url+6; // 6 = strlen("dvb://")
@@ -4106,7 +4310,7 @@
 			}
 		}
 	}
-	fclose(chanfile);
+	gf_fclose(chanfile);
 
 	sprintf(frontend_name, "/dev/dvb/adapter%d/frontend0", adapter_num);
 	sprintf(demux_name, "/dev/dvb/adapter%d/demux0", adapter_num);
@@ -4170,7 +4374,7 @@
 
 	channel_name = (char *)url+6;
 
-	channels_config_file = gf_f64_open(channels_config_path, "r");
+	channels_config_file = gf_fopen(channels_config_path, "r");
 	if (!channels_config_file) return GF_BAD_PARAM;
 
 	freq = 0;
@@ -4239,16 +4443,16 @@
 			ts->ts_data_chunk = mem_address;
 		} else {
 
-			ts->file = gf_f64_open(url, "rb");
+			ts->file = gf_fopen(url, "rb");
 			if (!ts->file) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));
 				return GF_IO_ERR;
 			}
 			strcpy(ts->filename, url);
 
-			gf_f64_seek(ts->file, 0, SEEK_END);
-			ts->file_size = gf_f64_tell(ts->file);
-			gf_f64_seek(ts->file, 0, SEEK_SET);
+			gf_fseek(ts->file, 0, SEEK_END);
+			ts->file_size = gf_ftell(ts->file);
+			gf_fseek(ts->file, 0, SEEK_SET);
 		}
 	}
 
@@ -4309,7 +4513,7 @@
 		ts->th = NULL;
 	}
 
-	if (ts->file) fclose(ts->file);
+	if (ts->file) gf_fclose(ts->file);
 	ts->file = NULL;
 	ts->ts_data_chunk = NULL;
 
@@ -4332,44 +4536,36 @@
 
 }
 
+#define M2TS_PROBE_SIZE	188000
 GF_EXPORT
 Bool gf_m2ts_probe_file(const char *fileName)
 {
-	char buf[188];
-	u32 count = 10;
+	char buf[M2TS_PROBE_SIZE];
+	GF_Err e;
+	u32 size;
 	FILE *t;
+	GF_M2TS_Demuxer *ts;
 
 	if (!strncmp(fileName, "gmem://", 7)) {
-		u32 size;
 		u8 *mem_address;
 		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
 			return GF_FALSE;
 		}
-		while (size>188 && count) {
-			if (mem_address[0] != 0x47)
-				return 0;
-			mem_address+=188;
-			size-=188;
-			count--;
-		}
-		return GF_TRUE;
-	}
-
-	t = gf_f64_open(fileName, "rb");
-	while (t && count) {
-		u32 read = (u32) fread(buf, 1, 188, t);
-		if (!read) {
-			count = 0;
-			break;
-		}
-		if (buf[0] != 0x47)
-			break;
-		if (read<188)
-			count = 0;
-		else count--;
-	}
-	if (t) fclose(t);
-	return count ? GF_FALSE : GF_TRUE;
+		if (size>M2TS_PROBE_SIZE) size = M2TS_PROBE_SIZE;
+		memcpy(buf, mem_address, size);
+	} else {
+		t = gf_fopen(fileName, "rb");
+		if (!t) return 0;
+		size = (u32) fread(buf, 1, M2TS_PROBE_SIZE, t);
+		gf_fclose(t);
+		if (!size) return 0;
+	}
+	ts = gf_m2ts_demux_new();
+	e = gf_m2ts_process_data(ts, buf, size);
+	if (!ts->pck_number) e = GF_BAD_PARAM;
+	gf_m2ts_demux_del(ts);
+	if (e) return 0;
+	return 1;
 }
 
 static void rewrite_pts_dts(unsigned char *ptr, u64 TS)
@@ -4481,4 +4677,3 @@
 }
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
-

v0.5.2.tar.gz/src/media_tools/text_import.c -> v0.6.1.tar.gz/src/media_tools/text_import.c Changed

@@ -67,20 +67,20 @@
 	if ((BOM[0]==0xFF) && (BOM[1]==0xFE)) {
 		/*UTF32 not supported*/
 		if (!BOM[2] && !BOM[3]) return -1;
-		gf_f64_seek(in_src, 2, SEEK_SET);
+		gf_fseek(in_src, 2, SEEK_SET);
 		return 3;
 	}
 	if ((BOM[0]==0xFE) && (BOM[1]==0xFF)) {
 		/*UTF32 not supported*/
 		if (!BOM[2] && !BOM[3]) return -1;
-		gf_f64_seek(in_src, 2, SEEK_SET);
+		gf_fseek(in_src, 2, SEEK_SET);
 		return 2;
 	} else if ((BOM[0]==0xEF) && (BOM[1]==0xBB) && (BOM[2]==0xBF)) {
-		gf_f64_seek(in_src, 3, SEEK_SET);
+		gf_fseek(in_src, 3, SEEK_SET);
 		return 1;
 	}
 	if (BOM[0]<0x80) {
-		gf_f64_seek(in_src, 0, SEEK_SET);
+		gf_fseek(in_src, 0, SEEK_SET);
 		return 0;
 	}
 	return -1;
@@ -91,7 +91,7 @@
 	char szLine[2048];
 	u32 val;
 	s32 uni_type;
-	FILE *test = gf_f64_open(filename, "rb");
+	FILE *test = gf_fopen(filename, "rb");
 	if (!test) return GF_URL_ERROR;
 	uni_type = gf_text_get_utf_type(test);
 
@@ -110,13 +110,13 @@
 
 	*fmt = GF_TEXT_IMPORT_NONE;
 	if ((szLine[0]=='{') && strstr(szLine, "}{")) *fmt = GF_TEXT_IMPORT_SUB;
-	else if (!strnicmp(szLine, "<?xml ", 6)) {
+	else if (szLine[0] == '<') {
 		char *ext = strrchr(filename, '.');
 		if (!strnicmp(ext, ".ttxt", 5)) *fmt = GF_TEXT_IMPORT_TTXT;
 		else if (!strnicmp(ext, ".ttml", 5)) *fmt = GF_TEXT_IMPORT_TTML;
 		ext = strstr(szLine, "?>");
 		if (ext) ext += 2;
-		if (!ext[0]) {
+		if (ext && !ext[0]) {
 			if (!fgets(szLine, 2048, test))
 				szLine[0] = '\0';
 		}
@@ -129,7 +129,7 @@
 	else if (strstr(szLine, " --> ") )
 		*fmt = GF_TEXT_IMPORT_SRT; /* might want to change the default to WebVTT */
 
-	fclose(test);
+	gf_fclose(test);
 	return GF_OK;
 }
 
@@ -286,14 +286,14 @@
 	char szLine[2048], szText[2048], *ptr;
 	unsigned short uniLine[5000], uniText[5000], *sptr;
 
-	srt_in = gf_f64_open(import->in_name, "rt");
-	gf_f64_seek(srt_in, 0, SEEK_END);
-	file_size = gf_f64_tell(srt_in);
-	gf_f64_seek(srt_in, 0, SEEK_SET);
+	srt_in = gf_fopen(import->in_name, "rt");
+	gf_fseek(srt_in, 0, SEEK_END);
+	file_size = gf_ftell(srt_in);
+	gf_fseek(srt_in, 0, SEEK_SET);
 
 	unicode_type = gf_text_get_utf_type(srt_in);
 	if (unicode_type<0) {
-		fclose(srt_in);
+		gf_fclose(srt_in);
 		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported SRT UTF encoding");
 	}
 
@@ -322,7 +322,7 @@
 	if (cfg && cfg->timescale) timescale = cfg->timescale;
 	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_TEXT, timescale);
 	if (!track) {
-		fclose(srt_in);
+		gf_fclose(srt_in);
 		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
 	}
 	gf_isom_set_track_enabled(import->dest, track, 1);
@@ -452,7 +452,7 @@
 					gf_isom_text_reset(samp);
 
 					//gf_import_progress(import, nb_samp, nb_samp+1);
-					gf_set_progress("Importing SRT", gf_f64_tell(srt_in), file_size);
+					gf_set_progress("Importing SRT", gf_ftell(srt_in), file_size);
 					if (duration && (end >= duration)) break;
 				}
 				state = 0;
@@ -709,7 +709,7 @@
 
 exit:
 	if (e) gf_isom_remove_track(import->dest, track);
-	fclose(srt_in);
+	gf_fclose(srt_in);
 	return e;
 }
 
@@ -901,36 +901,42 @@
 static void gf_text_import_ebu_ttd_remove_samples(GF_XMLNode *root, GF_XMLNode **sample_list_node)
 {
 	u32 idx = 0, body_num = 0;
-	GF_XMLNode *node = NULL, *body_node = NULL;
+	GF_XMLNode *node = NULL;
 	*sample_list_node = NULL;
 	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &idx))) {
 		if (!strcmp(node->name, "body")) {
-			*sample_list_node = node;
-			body_num = gf_list_count(node->content);
-			while (body_num--) {
-				body_node = (GF_XMLNode*)gf_list_get(node->content, 0);
-				assert(gf_list_find(node->content, body_node) == 0);
-				gf_list_rem(node->content, 0);
-				gf_xml_dom_node_del(body_node);
+			GF_XMLNode *body_node;
+			u32 body_idx = 0;
+			while ( (body_node = (GF_XMLNode*)gf_list_enum(node->content, &body_idx))) {
+				if (!strcmp(body_node->name, "div")) {
+					*sample_list_node = body_node;
+					body_num = gf_list_count(body_node->content);
+					while (body_num--) {
+						GF_XMLNode *content_node = (GF_XMLNode*)gf_list_get(body_node->content, 0);
+						assert(gf_list_find(body_node->content, content_node) == 0);
+						gf_list_rem(body_node->content, 0);
+						gf_xml_dom_node_del(content_node);
+					}
+					return;
+				}
 			}
-			return;
 		}
 	}
 }
 
+#define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
 static GF_Err gf_text_import_ebu_ttd(GF_MediaImporter *import, GF_DOMParser *parser, GF_XMLNode *root)
 {
-	GF_Err e;
+	GF_Err e, e_opt;
 	u32 i, track, ID, desc_idx, nb_samples, nb_children;
 	u64 last_sample_duration, last_sample_end;
 	GF_XMLAttribute *att;
 	GF_XMLNode *node, *root_working_copy, *sample_list_node;
 	GF_DOMParser *parser_working_copy;
-	char *samp_text, *xmlns;
+	char *samp_text;
 	Bool has_body;
 
 	samp_text = NULL;
-	xmlns = NULL;
 	root_working_copy = NULL;
 	parser_working_copy = NULL;
 	e = GF_OK;
@@ -943,6 +949,7 @@
 		goto exit;
 	}
 	gf_isom_set_track_enabled(import->dest, track, 1);
+
 	/*some MPEG-4 setup*/
 	if (import->esd) {
 		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
@@ -962,11 +969,10 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("Found root attribute name %s, value %s\n", att->name, att->value));
 
 		if (!strcmp(att->name, "xmlns")) {
-			if (strcmp(att->value, "http://www.w3.org/ns/ttml")) {
-				e = gf_import_message(import, GF_BAD_PARAM, "Found invalid EBU-TTD root attribute name %s, value %s (shall be \"%s\")\n", att->name, att->value, "http://www.w3.org/ns/ttml");
+			if (strcmp(att->value, TTML_NAMESPACE)) {
+				e = gf_import_message(import, GF_BAD_PARAM, "Found invalid EBU-TTD root attribute name %s, value %s (shall be \"%s\")\n", att->name, att->value, TTML_NAMESPACE);
 				goto exit;
 			}
-			xmlns = att->name;
 		} else if (!strcmp(att->name, "xml:lang")) {
 			if (import->esd && !import->esd->langDesc) {
 				char *lang;
@@ -974,97 +980,90 @@
 				import->esd->langDesc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
 				gf_isom_set_media_language(import->dest, track, lang);
 			}
-		} else if (!strcmp(att->name, "ttp:timeBase") && strcmp(att->value, "media")) {
-			e = gf_import_message(import, GF_BAD_PARAM, "Found invalid EBU-TTD root attribute name %s, value %s (shall be \"%s\")\n", att->name, att->value, "media");
-			goto exit;
-		} else if (!strcmp(att->name, "xmlns:ttp") && strcmp(att->value, "http://www.w3.org/ns/ttml#parameter")) {
-			e = gf_import_message(import, GF_BAD_PARAM, "Found invalid EBU-TTD root attribute name %s, value %s (shall be \"%s\")\n", att->name, att->value, "http://www.w3.org/ns/ttml#parameter");
-			goto exit;
-		} else if (!strcmp(att->name, "xmlns:tts") && strcmp(att->value, "http://www.w3.org/ns/ttml#styling")) {
-			e = gf_import_message(import, GF_BAD_PARAM, "Found invalid EBU-TTD root attribute name %s, value %s (shall be \"%s\")\n", att->name, att->value, "http://www.w3.org/ns/ttml#styling");
-			goto exit;
 		}
 	}
 
 	/*** style ***/
 #if 0
-	Bool has_styling, has_style;
-	GF_TextSampleDescriptor *sd;
-	has_styling = GF_FALSE;
-	has_style = GF_FALSE;
-	sd = (GF_TextSampleDescriptor*)gf_odf_desc_new(GF_ODF_TX3G_TAG);
-	i=0;
-	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
-		if (node->type) {
-			continue;
-		} else if (!strcmp(node->name, "head")) {
-			GF_XMLNode *head_node;
-			u32 head_idx = 0;
-			while ( (head_node = (GF_XMLNode*)gf_list_enum(node->content, &head_idx))) {
-				if (!strcmp(head_node->name, "styling")) {
-					GF_XMLNode *styling_node;
-					u32 styling_idx;
-					if (has_styling) {
-						e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated \"styling\" element. Abort.\n");
-						goto exit;
-					}
-					has_styling = GF_TRUE;
-
-					styling_idx = 0;
-					while ( (styling_node = (GF_XMLNode*)gf_list_enum(head_node->content, &styling_idx))) {
-						if (!strcmp(styling_node->name, "style")) {
-							GF_XMLAttribute *p_att;
-							u32 style_idx = 0;
-							while ( (p_att = (GF_XMLAttribute*)gf_list_enum(styling_node->attributes, &style_idx))) {
-								if (!strcmp(p_att->name, "tts:direction")) {
-								} else if (!strcmp(p_att->name, "tts:fontFamily")) {
-									sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-									sd->font_count = 1;
-									sd->fonts[0].fontID = 1;
-									sd->fonts[0].fontName = gf_strdup(p_att->value);
-								} else if (!strcmp(p_att->name, "tts:backgroundColor")) {
-									GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("EBU-TTD style attribute \"%s\" ignored.\n", p_att->name));
-									//sd->back_color = ;
-								} else {
-									if ( !strcmp(p_att->name, "tts:fontSize")
-									 || !strcmp(p_att->name, "tts:lineHeight")
-									 || !strcmp(p_att->name, "tts:textAlign")
-									 || !strcmp(p_att->name, "tts:color")
-									 || !strcmp(p_att->name, "tts:fontStyle")
-									 || !strcmp(p_att->name, "tts:fontWeight")
-									 || !strcmp(p_att->name, "tts:textDecoration")
-									 || !strcmp(p_att->name, "tts:unicodeBidi")
-									 || !strcmp(p_att->name, "tts:wrapOption")
-									 || !strcmp(p_att->name, "tts:multiRowAlign")
-									 || !strcmp(p_att->name, "tts:linePadding")) {
+	{
+		Bool has_styling, has_style;
+		GF_TextSampleDescriptor *sd;
+		has_styling = GF_FALSE;
+		has_style = GF_FALSE;
+		sd = (GF_TextSampleDescriptor*)gf_odf_desc_new(GF_ODF_TX3G_TAG);
+		i=0;
+		while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
+			if (node->type) {
+				continue;
+			} else if (gf_xml_get_element_check_namespace(node, "head", root->ns) == GF_OK) {
+				GF_XMLNode *head_node;
+				u32 head_idx = 0;
+				while ( (head_node = (GF_XMLNode*)gf_list_enum(node->content, &head_idx))) {
+					if (gf_xml_get_element_check_namespace(head_node, "styling", root->ns) == GF_OK) {
+						GF_XMLNode *styling_node;
+						u32 styling_idx;
+						if (has_styling) {
+							e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"styling\" element. Abort.\n");
+							goto exit;
+						}
+						has_styling = GF_TRUE;
+
+						styling_idx = 0;
+						while ( (styling_node = (GF_XMLNode*)gf_list_enum(head_node->content, &styling_idx))) {
+							if (gf_xml_get_element_check_namespace(styling_node, "style", root->ns) == GF_OK) {
+								GF_XMLAttribute *p_att;
+								u32 style_idx = 0;
+								while ( (p_att = (GF_XMLAttribute*)gf_list_enum(styling_node->attributes, &style_idx))) {
+									if (!strcmp(p_att->name, "tts:direction")) {
+									} else if (!strcmp(p_att->name, "tts:fontFamily")) {
+										sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
+										sd->font_count = 1;
+										sd->fonts[0].fontID = 1;
+										sd->fonts[0].fontName = gf_strdup(p_att->value);
+									} else if (!strcmp(p_att->name, "tts:backgroundColor")) {
 										GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("EBU-TTD style attribute \"%s\" ignored.\n", p_att->name));
+										//sd->back_color = ;
 									} else {
-										GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("EBU-TTD unknown style attribute: \"%s\". Ignoring.\n", p_att->name));
+										if ( !strcmp(p_att->name, "tts:fontSize")
+										 || !strcmp(p_att->name, "tts:lineHeight")
+										 || !strcmp(p_att->name, "tts:textAlign")
+										 || !strcmp(p_att->name, "tts:color")
+										 || !strcmp(p_att->name, "tts:fontStyle")
+										 || !strcmp(p_att->name, "tts:fontWeight")
+										 || !strcmp(p_att->name, "tts:textDecoration")
+										 || !strcmp(p_att->name, "tts:unicodeBidi")
+										 || !strcmp(p_att->name, "tts:wrapOption")
+										 || !strcmp(p_att->name, "tts:multiRowAlign")
+										 || !strcmp(p_att->name, "tts:linePadding")) {
+											GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("EBU-TTD style attribute \"%s\" ignored.\n", p_att->name));
+										} else {
+											GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("EBU-TTD unknown style attribute: \"%s\". Ignoring.\n", p_att->name));
+										}
 									}
 								}
+								break; //TODO: we only take care of the first style
 							}
-							break; //TODO: we only take care of the first style
 						}
 					}
 				}
 			}
 		}
+		if (!has_styling) {
+			e = gf_import_message(import, GF_BAD_PARAM, "[TTML] missing \"styling\" element. Abort.\n");
+			goto exit;
+		}
+		if (!has_style) {
+			e = gf_import_message(import, GF_BAD_PARAM, "[TTML] missing \"style\" element. Abort.\n");
+			goto exit;
+		}
+		e = gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &desc_idx);
+		gf_odf_desc_del((GF_Descriptor*)sd);
 	}
-	if (!has_styling) {
-		e = gf_import_message(import, GF_BAD_PARAM, "TTML: missing \"styling\" element. Abort.\n");
-		goto exit;
-	}
-	if (!has_style) {
-		e = gf_import_message(import, GF_BAD_PARAM, "TTML: missing \"style\" element. Abort.\n");
-		goto exit;
-	}
-	e = gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &desc_idx);
-	gf_odf_desc_del((GF_Descriptor*)sd);
 #else
-	e = gf_isom_new_xml_subtitle_description(import->dest, track, xmlns, NULL, NULL, &desc_idx);
+	e = gf_isom_new_xml_subtitle_description(import->dest, track, TTML_NAMESPACE, NULL, NULL, &desc_idx);
 #endif
 	if (e != GF_OK) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML: incorrect sample description. Abort.\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] incorrect sample description. Abort.\n"));
 		e = gf_isom_last_error(import->dest);
 		goto exit;
 	}
@@ -1087,12 +1086,15 @@
 			continue;
 		}
 
-		if (!strcmp(node->name, "body")) {
+		e_opt = gf_xml_get_element_check_namespace(node, "body", root->ns);
+		if (e_opt == GF_BAD_PARAM) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] ignored \"%s\" node, check your namespaces\n", node->name));
+		} else if (e_opt == GF_OK) {
 			GF_XMLNode *body_node;
 			u32 body_idx = 0;
 
 			if (has_body) {
-				e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated \"body\" element. Abort.\n");
+				e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"body\" element. Abort.\n");
 				goto exit;
 			}
 			has_body = GF_TRUE;
@@ -1101,11 +1103,17 @@
 			gf_text_import_ebu_ttd_remove_samples(root_working_copy, &sample_list_node);
 
 			while ( (body_node = (GF_XMLNode*)gf_list_enum(node->content, &body_idx))) {
-				if (!strcmp(body_node->name, "div")) {
+				e_opt = gf_xml_get_element_check_namespace(body_node, "div", root->ns);
+				if (e_opt == GF_BAD_PARAM) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] ignored \"%s\" node, check your namespaces\n", node->name));
+				} else if (e_opt == GF_OK) {
 					GF_XMLNode *div_node;
 					u32 div_idx = 0;
 					while ( (div_node = (GF_XMLNode*)gf_list_enum(body_node->content, &div_idx))) {
-						if (!strcmp(div_node->name, "p")) {
+						e_opt = gf_xml_get_element_check_namespace(div_node, "p", root->ns);
+						if (e_opt == GF_BAD_PARAM) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] ignored \"%s\" node, check your namespaces\n", node->name));
+						} else if (e_opt == GF_OK) {
 							GF_XMLNode *p_node;
 							GF_XMLAttribute *p_att;
 							u32 p_idx = 0, h, m, s, ms;
@@ -1115,19 +1123,23 @@
 							while ( (p_att = (GF_XMLAttribute*)gf_list_enum(div_node->attributes, &p_idx))) {
 								if (!strcmp(p_att->name, "begin")) {
 									if (ts_begin != -1) {
-										e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated \"begin\" attribute. Abort.\n");
+										e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"begin\" attribute. Abort.\n");
 										goto exit;
 									}
 									if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 										ts_begin = (h*3600 + m*60+s)*1000+ms;
+									} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+										ts_begin = (h*3600 + m*60+s)*1000;
 									}
 								} else if (!strcmp(p_att->name, "end")) {
 									if (ts_end != -1) {
-										e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated \"end\" attribute. Abort.\n");
+										e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"end\" attribute. Abort.\n");
 										goto exit;
 									}
 									if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 										ts_end = (h*3600 + m*60+s)*1000+ms;
+									} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+										ts_end = (h*3600 + m*60+s)*1000;
 									}
 								}
 								if ((ts_begin != -1) && (ts_end != -1) && !samp_text && sample_list_node) {
@@ -1143,30 +1155,37 @@
 							//or under a 
 							p_idx = 0;
 							while ( (p_node = (GF_XMLNode*)gf_list_enum(div_node->content, &p_idx))) {
-								if (!strcmp(p_node->name, "span")) {
+								e_opt = gf_xml_get_element_check_namespace(p_node, "span", root->ns);
+								if (e_opt == GF_BAD_PARAM) {
+									GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] ignored \"%s\" node, check your namespaces\n", node->name));
+								} else if (e_opt == GF_OK) {
 									u32 span_idx = 0;
 									GF_XMLAttribute *span_att;
 									while ( (span_att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
 										if (!strcmp(span_att->name, "begin")) {
 											if (ts_begin != -1) {
-												e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated \"begin\" attribute under . Abort.\n");
+												e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"begin\" attribute under . Abort.\n");
 												goto exit;
 											}
 											if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 												ts_begin = (h*3600 + m*60+s)*1000+ms;
+											} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+												ts_begin = (h*3600 + m*60+s)*1000;
 											}
 										} else if (!strcmp(span_att->name, "end")) {
 											if (ts_end != -1) {
-												e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated \"end\" attribute under . Abort.\n");
+												e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"end\" attribute under . Abort.\n");
 												goto exit;
 											}
 											if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 												ts_end = (h*3600 + m*60+s)*1000+ms;
+											} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+												ts_end = (h*3600 + m*60+s)*1000;
 											}
 										}
 										if ((ts_begin != -1) && (ts_end != -1) && !samp_text && sample_list_node) {
 											if (samp_text) {
-												e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated sample text under . Abort.\n");
+												e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated sample text under . Abort.\n");
 												goto exit;
 											}
 
@@ -1189,12 +1208,12 @@
 								char *str;
 
 								if (ts_end < ts_begin) {
-									e = gf_import_message(import, GF_BAD_PARAM, "TTML: invalid timings: \"begin\"="LLD" , \"end\"="LLD". Abort.\n", ts_begin, ts_end);
+									e = gf_import_message(import, GF_BAD_PARAM, "[TTML] invalid timings: \"begin\"="LLD" , \"end\"="LLD". Abort.\n", ts_begin, ts_end);
 									goto exit;
 								}
 
 								if (ts_begin < (s64)last_sample_end) {
-									e = gf_import_message(import, GF_BAD_PARAM, "TTML: timing overlapping not supported: \"begin\" is "LLD" , last \"end\" was "LLD". Abort.\n", ts_begin, last_sample_end);
+									e = gf_import_message(import, GF_BAD_PARAM, "[TTML] timing overlapping not supported: \"begin\" is "LLD" , last \"end\" was "LLD". Abort.\n", ts_begin, last_sample_end);
 									goto exit;
 								}
 
@@ -1211,10 +1230,11 @@
 								gf_isom_delete_xml_subtitle_sample(samp);
 								if (!nb_samples) {
 									s->DTS = 0; /*in MP4 we must start at T=0*/
+									last_sample_duration = ts_end;
 								} else {
 									s->DTS = ts_begin;
+									last_sample_duration = ts_end - ts_begin;
 								}
-								last_sample_duration = ts_end - ts_begin;
 								last_sample_end = ts_end;
 								GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("ts_begin="LLD", ts_end="LLD", last_sample_duration="LLU" (real duration: "LLU"), last_sample_end="LLU"\n", ts_begin, ts_end, ts_end - last_sample_end, last_sample_duration, last_sample_end));
 
@@ -1227,7 +1247,7 @@
 								if (import->duration && (ts_end > import->duration))
 									break;
 							} else {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML: incomplete sample (begin="LLD", end="LLD", text=\"%s\"). Skip.\n", ts_begin, ts_end, samp_text ? samp_text : "NULL"));
+								GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] incomplete sample (begin="LLD", end="LLD", text=\"%s\"). Skip.\n", ts_begin, ts_end, samp_text ? samp_text : "NULL"));
 							}
 						}
 					}
@@ -1236,7 +1256,7 @@
 		}
 	}
 	if (!has_body) {
-		e = gf_import_message(import, GF_BAD_PARAM, "TTML: missing \"body\" element. Abort.\n");
+		e = gf_import_message(import, GF_BAD_PARAM, "[TTML] missing \"body\" element. Abort.\n");
 		goto exit;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("last_sample_duration="LLU", last_sample_end="LLU"\n", last_sample_duration, last_sample_end));
@@ -1246,6 +1266,9 @@
 exit:
 	gf_free(samp_text);
 	gf_xml_dom_del(parser_working_copy);
+	if (!gf_isom_get_sample_count(import->dest, track)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[EBU-TTD] No sample imported. Might be an error. Check your content.\n"));
+	}
 	return e;
 }
 
@@ -1272,18 +1295,22 @@
 		return e;
 	}
 
-	/*look for EBU-TTD*/
-	if (!strcmp(root->name, "tt")) {
+	/*look for TTML*/
+	if (gf_xml_get_element_check_namespace(root, "tt", NULL) == GF_OK) {
 		e = gf_text_import_ebu_ttd(import, parser, root);
 		if (e == GF_OK) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Note: TTML import - EBU-TTD detected\n"));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Unsupported TTML file - only EBU-TTD is supported (root shall be \"tt\", got %s)\n", root->name));
+			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Unsupported TTML file - only EBU-TTD is supported (root shall be \"tt\", got \"%s\")\n", root->name));
 			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Importing as generic TTML\n"));
 			e = GF_OK;
 		}
 	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("TTML file not recognized: found \"%s\" as root, \"%s\" expected\n", root->name, "tt"));
+		if (root->ns) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML file not recognized: root element is \"%s:%s\" (check your namespaces)\n", root->ns, root->name));
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML file not recognized: root element is \"%s\"\n", root->name));
+		}
 		e = GF_BAD_PARAM;
 	}
 
@@ -1292,111 +1319,8 @@
 }
 
 /* SimpleText Text tracks -related functions */
-GF_SimpleTextSampleEntryBox *gf_isom_get_simpletext_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex)
-{
-	GF_SimpleTextSampleEntryBox *stxt;
-	GF_TrackBox *trak;
-	GF_Err e;
-
-	if (!descriptionIndex) return NULL;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_READ);
-	if (e) return NULL;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return NULL;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_TEXT:
-		break;
-	default:
-		return NULL;
-	}
-
-	stxt = (GF_SimpleTextSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-	if (!stxt) return NULL;
-	return stxt;
-}
-
 GF_Box *boxstring_new_with_data(u32 type, const char *string);
 
-GF_Err gf_isom_update_simpletext_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config)
-{
-	GF_Err e;
-	GF_SimpleTextSampleEntryBox *stxt;
-	GF_TrackBox *trak;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return GF_BAD_PARAM;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_TEXT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	stxt = (GF_SimpleTextSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-	if (!stxt) {
-		return GF_BAD_PARAM;
-	} else {
-		switch (stxt->type) {
-		case GF_ISOM_BOX_TYPE_STXT:
-			break;
-		default:
-			return GF_BAD_PARAM;
-		}
-		if (!movie->keep_utc)
-			trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-		stxt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTC, config);
-		return GF_OK;
-	}
-}
-
-GF_Err gf_isom_new_simpletext_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname,
- const char *content_encoding, const char *mime, u32 *outDescriptionIndex)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-	u32 dataRefIndex;
-	GF_SimpleTextSampleEntryBox *stxt;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_TEXT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-	if (e) return e;
-	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-		if (e) return e;
-	}
-	if (!movie->keep_utc)
-		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	stxt = (GF_SimpleTextSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STXT);
-	stxt->dataReferenceIndex = dataRefIndex;
-	stxt->mime_type = gf_strdup(mime);
-	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, stxt);
-	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-	return e;
-}
-
-
 #ifndef GPAC_DISABLE_SWF_IMPORT
 
 /* SWF Importer */
@@ -1431,9 +1355,9 @@
 	GF_ISOFlusher		*flusher = (GF_ISOFlusher *)user;
 	if (!flusher) return GF_BAD_PARAM;
 	if (isHeader) {
-		return gf_isom_update_simpletext_description(flusher->import->dest, flusher->track, flusher->descriptionIndex , data);
+		return gf_isom_update_stxt_description(flusher->import->dest, flusher->track, NULL, data, flusher->descriptionIndex);
 	} else {
-		return GF_OK;
+		return gf_isom_append_sample_data(flusher->import->dest, flusher->track, (char *)data, length);
 	}
 }
 
@@ -1504,7 +1428,7 @@
 		/*and set sample descriptions*/
 		count =	gf_list_count(cfg->sample_descriptions);
 		for	(i=0; i<count; i++)	{
-			gf_isom_new_simpletext_description(import->dest, track, NULL, NULL, NULL, NULL, mime, &descIndex);
+			gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT, mime, NULL, NULL, &descIndex);
 		}
 		gf_import_message(import, GF_OK, "SWF import - text track %d	x %d", cfg->text_width,	cfg->text_height);
 		gf_odf_desc_del((GF_Descriptor *)cfg);
@@ -1515,7 +1439,7 @@
 		gf_text_get_video_size(import, &w, &h);
 		gf_isom_set_track_layout_info(import->dest,	track, w<<16, h<<16, 0,	0, 0);
 
-		gf_isom_new_simpletext_description(import->dest, track,	NULL, NULL,	NULL, NULL, mime, &descIndex);
+		gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT, mime, NULL,	NULL, &descIndex);
 
 		gf_import_message(import, GF_OK, "SWF import (as text - type: %s)", import->streamFormat);
 	}
@@ -1529,10 +1453,16 @@
 	flusher.timescale = timescale;
 	flusher.descriptionIndex = descIndex;
 	gf_swf_reader_set_user_mode(read, &flusher, swf_svg_add_iso_sample, swf_svg_add_iso_header);
+
+	e = GF_NOT_SUPPORTED;
 	if (!import->streamFormat || (import->streamFormat && !stricmp(import->streamFormat, "SVG"))) {
+#ifndef GPAC_DISABLE_SVG
 		e = swf_to_svg_init(read, import->swf_flags, import->swf_flatten_angle);
+#endif
 	} else { /*if (import->streamFormat && !strcmp(import->streamFormat, "BIFS"))*/
+#ifndef GPAC_DISABLE_VRML
 		e = swf_to_bifs_init(read);
+#endif
 	}
 	if (e) {
 		goto exit;
@@ -1573,14 +1503,14 @@
 	char szLine[2048], szTime[20], szText[2048];
 	GF_ISOSample *s;
 
-	sub_in = gf_f64_open(import->in_name, "rt");
-	gf_f64_seek(sub_in, 0, SEEK_END);
-	file_size = gf_f64_tell(sub_in);
-	gf_f64_seek(sub_in, 0, SEEK_SET);
+	sub_in = gf_fopen(import->in_name, "rt");
+	gf_fseek(sub_in, 0, SEEK_END);
+	file_size = gf_ftell(sub_in);
+	gf_fseek(sub_in, 0, SEEK_SET);
 
 	unicode_type = gf_text_get_utf_type(sub_in);
 	if (unicode_type<0) {
-		fclose(sub_in);
+		gf_fclose(sub_in);
 		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported SUB UTF encoding");
 	}
 
@@ -1611,7 +1541,7 @@
 	if (cfg && cfg->timescale) timescale = cfg->timescale;
 	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_TEXT, timescale);
 	if (!track) {
-		fclose(sub_in);
+		gf_fclose(sub_in);
 		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
 	}
 	gf_isom_set_track_enabled(import->dest, track, 1);
@@ -1778,7 +1708,7 @@
 		nb_samp++;
 		gf_isom_text_reset(samp);
 		prev_end = end;
-		gf_set_progress("Importing SUB", gf_f64_tell(sub_in), file_size);
+		gf_set_progress("Importing SUB", gf_ftell(sub_in), file_size);
 		if (duration && (end >= duration)) break;
 	}
 	gf_isom_delete_text_sample(samp);
@@ -1791,7 +1721,7 @@
 
 exit:
 	if (e) gf_isom_remove_track(import->dest, track);
-	fclose(sub_in);
+	gf_fclose(sub_in);
 	return e;
 }
 
@@ -2636,8 +2566,8 @@
 	if (import->streamFormat) {
 		if (!strcmp(import->streamFormat, "VTT")) fmt = GF_TEXT_IMPORT_WEBVTT;
 		else if (!strcmp(import->streamFormat, "TTML")) fmt = GF_TEXT_IMPORT_TTML;
+		if ((strstr(import->in_name, ".swf") || strstr(import->in_name, ".SWF")) && !stricmp(import->streamFormat, "SVG")) fmt = GF_TEXT_IMPORT_SWF_SVG;
 	}
-	if ((strstr(import->in_name, ".swf") || strstr(import->in_name, ".SWF")) && !stricmp(import->streamFormat, "SVG")) fmt = GF_TEXT_IMPORT_SWF_SVG;
 	if (!fmt) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTXT Import] Input %s does not look like a supported text format - ignoring\n", import->in_name));
 		return GF_NOT_SUPPORTED;

v0.5.2.tar.gz/src/media_tools/webvtt.c -> v0.6.1.tar.gz/src/media_tools/webvtt.c Changed

@@ -399,120 +399,8 @@
 }
 #endif /* GPAC_DISABLE_ISOM_DUMP */
 
-GF_WebVTTSampleEntryBox *gf_webvtt_isom_get_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex)
-{
-	GF_WebVTTSampleEntryBox *wvtt;
-	GF_TrackBox *trak;
-
-	if (!descriptionIndex) return NULL;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return NULL;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_TEXT:
-		break;
-	default:
-		return NULL;
-	}
-
-	wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-	if (!wvtt) return NULL;
-	switch (wvtt->type) {
-	case GF_ISOM_BOX_TYPE_WVTT:
-		break;
-	default:
-		return NULL;
-	}
-	return wvtt;
-}
-
-GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config)
-{
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	GF_Err e;
-	GF_WebVTTSampleEntryBox *wvtt;
-	GF_TrackBox *trak;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return GF_BAD_PARAM;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_TEXT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
-	if (!wvtt) return GF_BAD_PARAM;
-	switch (wvtt->type) {
-	case GF_ISOM_BOX_TYPE_WVTT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-	if (wvtt) {
-		if (!movie->keep_utc)
-			trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-		wvtt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_VTTC, config);
-	} else {
-		e = GF_BAD_PARAM;
-	}
-	return e;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-
-GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex)
-{
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	GF_TrackBox *trak;
-	GF_Err e;
-	u32 dataRefIndex;
-	GF_WebVTTSampleEntryBox *wvtt;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media) return GF_BAD_PARAM;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_TEXT:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-	if (e) return e;
-	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-		if (e) return e;
-	}
-	if (!movie->keep_utc)
-		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	wvtt = (GF_WebVTTSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_WVTT);
-	wvtt->dataReferenceIndex = dataRefIndex;
-	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, wvtt);
-	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-	return e;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-
 #endif /*GPAC_DISABLE_ISOM*/
 
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
 typedef enum {
 	WEBVTT_PARSER_STATE_WAITING_SIGNATURE,
 	WEBVTT_PARSER_STATE_WAITING_HEADER,
@@ -540,6 +428,9 @@
 	void (*on_cue_read)(void *, GF_WebVTTCue *);
 };
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+
+
 /* mark the overlapped cue in the previous sample as split */
 /* duplicate the cue, mark it as split and adjust its timing */
 /* adjust the end of the overlapped cue in the previous sample */
@@ -672,14 +563,14 @@
 				parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
 			}
 		}
-		parser->vtt_in = gf_f64_open(input_file, "rt");
-		gf_f64_seek(parser->vtt_in, 0, SEEK_END);
-		parser->file_size = gf_f64_tell(parser->vtt_in);
-		gf_f64_seek(parser->vtt_in, 0, SEEK_SET);
+		parser->vtt_in = gf_fopen(input_file, "rt");
+		gf_fseek(parser->vtt_in, 0, SEEK_END);
+		parser->file_size = gf_ftell(parser->vtt_in);
+		gf_fseek(parser->vtt_in, 0, SEEK_SET);
 
 		parser->unicode_type = gf_text_get_utf_type(parser->vtt_in);
 		if (parser->unicode_type<0) {
-			fclose(parser->vtt_in);
+			gf_fclose(parser->vtt_in);
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -699,7 +590,7 @@
 			gf_webvtt_sample_del((GF_WebVTTSample *)gf_list_get(parser->samples, 0));
 			gf_list_rem(parser->samples, 0);
 		}
-		if (parser->vtt_in) fclose(parser->vtt_in);
+		if (parser->vtt_in) gf_fclose(parser->vtt_in);
 		parser->file_size = 0;
 		parser->last_duration = 0;
 		parser->on_header_parsed = NULL;
@@ -730,37 +621,6 @@
 	}
 }
 
-Bool gf_webvtt_timestamp_is_zero(GF_WebVTTTimestamp *ts)
-{
-	return (ts->hour == 0 && ts->min == 0 && ts->sec == 0 && ts->ms == 0) ? GF_TRUE : GF_FALSE;
-}
-
-void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *ts, u64 value)
-{
-	u64 tmp;
-	tmp = value;
-	ts->hour = (u32)(tmp/(3600*1000));
-	tmp -= ts->hour*3600*1000;
-	ts->min = (u32)(tmp/(60*1000));
-	tmp -= ts->min*60*1000;
-	ts->sec = (u32)(tmp/1000);
-	tmp -= ts->sec*1000;
-	ts->ms = (u32)tmp;
-}
-
-u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *ts)
-{
-	return (3600*ts->hour + 60*ts->min + ts->sec)*1000 + ts->ms;
-}
-
-void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour)
-{
-	if (dump_hour || ts->hour != 0) {
-		fprintf(dump, "%02u:", ts->hour);
-	}
-
-	fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
-}
 
 static GF_Err gf_webvtt_add_cue_to_samples(GF_WebVTTParser *parser, GF_List *samples, GF_WebVTTCue *cue)
 {
@@ -1179,7 +1039,7 @@
 				gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
 				cue = NULL;
 
-				gf_set_progress("Importing WebVTT", gf_f64_tell(parser->vtt_in), parser->file_size);
+				gf_set_progress("Importing WebVTT", gf_ftell(parser->vtt_in), parser->file_size);
 				if ((duration && (end >= duration)) || !sOK) {
 					do_parse = GF_FALSE;
 					break;
@@ -1217,70 +1077,6 @@
 	return e;
 }
 
-GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const char *data, u32 dataLength, u32 *dumpedLength)
-{
-	GF_Err e;
-	GF_Box *box;
-	GF_StringBox *config;
-	GF_BitStream *bs;
-	*dumpedLength = 0;
-	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
-	e = gf_isom_parse_box(&box, bs);
-	if (!box || (box->type != GF_ISOM_BOX_TYPE_VTTC && box->type != GF_ISOM_BOX_TYPE_STTC)) return GF_BAD_PARAM;
-	config = (GF_StringBox *)box;
-	if (config->string) {
-		fprintf(dump, "%s", config->string);
-		*dumpedLength = (u32)strlen(config->string)+1;
-	}
-	gf_bs_del(bs);
-	gf_isom_box_del(box);
-	return e;
-}
-
-GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, u32 index)
-{
-	GF_WebVTTSampleEntryBox *wvtt;
-	wvtt = gf_webvtt_isom_get_description(file, track, index);
-	if (!wvtt) return GF_BAD_PARAM;
-	fprintf(dump, "%s\n\n", wvtt->config->string);
-	return GF_OK;
-}
-
-GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample)
-{
-	GF_Err e;
-	GF_BitStream *bs;
-
-	bs = gf_bs_new(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
-	while(gf_bs_available(bs))
-	{
-		GF_Box *box;
-		GF_WebVTTTimestamp ts;
-		e = gf_isom_parse_box(&box, bs);
-		if (e) return e;
-		if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
-			GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
-			if (cuebox->id) fprintf(dump, "%s", cuebox->id->string);
-			gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
-			gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
-			fprintf(dump, " --> NEXT");
-			if (cuebox->settings) fprintf(dump, " %s", cuebox->settings->string);
-			fprintf(dump, "\n");
-			if (cuebox->payload) fprintf(dump, "%s", cuebox->payload->string);
-			fprintf(dump, "\n");
-		} else if (box->type == GF_ISOM_BOX_TYPE_VTTE) {
-			gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
-			gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
-			fprintf(dump, " --> NEXT\n\n");
-		} else if (box->type == GF_ISOM_BOX_TYPE_VTTA) {
-			fprintf(dump, "%s\n\n", ((GF_StringBox *)box)->string);
-		}
-		gf_isom_box_del(box);
-	}
-	gf_bs_del(bs);
-	return GF_OK;
-}
-
 GF_EXPORT
 GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start)
 {
@@ -1338,6 +1134,11 @@
 	return cues;
 }
 
+Bool gf_webvtt_timestamp_is_zero(GF_WebVTTTimestamp *ts)
+{
+	return (ts->hour == 0 && ts->min == 0 && ts->sec == 0 && ts->ms == 0) ? GF_TRUE : GF_FALSE;
+}
+
 GF_Err gf_webvtt_merge_cues(GF_WebVTTParser *parser, u64 start, GF_List *cues)
 {
 	GF_WebVTTSample *wsample;
@@ -1439,6 +1240,8 @@
 		gf_webvtt_merge_cues(parser, start, cues);
 		gf_list_del(cues);
 	} else {
+		GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
+
 		gf_webvtt_dump_iso_sample((FILE *)parser->user, timescale, iso_sample);
 	}
 
@@ -1446,6 +1249,103 @@
 }
 #endif //GPAC_DISABLE_MEDIA_IMPORT
 
+
+void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *ts, u64 value)
+{
+	u64 tmp;
+	tmp = value;
+	ts->hour = (u32)(tmp/(3600*1000));
+	tmp -= ts->hour*3600*1000;
+	ts->min = (u32)(tmp/(60*1000));
+	tmp -= ts->min*60*1000;
+	ts->sec = (u32)(tmp/1000);
+	tmp -= ts->sec*1000;
+	ts->ms = (u32)tmp;
+}
+
+u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *ts)
+{
+	return (3600*ts->hour + 60*ts->min + ts->sec)*1000 + ts->ms;
+}
+
+void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour)
+{
+	if (dump_hour || ts->hour != 0) {
+		fprintf(dump, "%02u:", ts->hour);
+	}
+
+	fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
+}
+GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const char *data, u32 dataLength, u32 *dumpedLength)
+{
+#ifdef GPAC_DISABLE_ISOM
+	return GF_NOT_SUPPORTED;
+#else
+	GF_Err e;
+	GF_Box *box;
+	GF_StringBox *config;
+	GF_BitStream *bs;
+	*dumpedLength = 0;
+	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
+	e = gf_isom_parse_box(&box, bs);
+	if (!box || (box->type != GF_ISOM_BOX_TYPE_VTTC)) return GF_BAD_PARAM;
+	config = (GF_StringBox *)box;
+	if (config->string) {
+		fprintf(dump, "%s", config->string);
+		*dumpedLength = (u32)strlen(config->string)+1;
+	}
+	gf_bs_del(bs);
+	gf_isom_box_del(box);
+	return e;
+#endif
+}
+
+#ifndef GPAC_DISABLE_ISOM
+GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, u32 index)
+{
+	GF_WebVTTSampleEntryBox *wvtt;
+	wvtt = gf_webvtt_isom_get_description(file, track, index);
+	if (!wvtt) return GF_BAD_PARAM;
+	fprintf(dump, "%s\n\n", wvtt->config->string);
+	return GF_OK;
+}
+
+GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample)
+{
+	GF_Err e;
+	GF_BitStream *bs;
+
+	bs = gf_bs_new(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
+	while(gf_bs_available(bs))
+	{
+		GF_Box *box;
+		GF_WebVTTTimestamp ts;
+		e = gf_isom_parse_box(&box, bs);
+		if (e) return e;
+		if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
+			GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
+			if (cuebox->id) fprintf(dump, "%s", cuebox->id->string);
+			gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
+			gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
+			fprintf(dump, " --> NEXT");
+			if (cuebox->settings) fprintf(dump, " %s", cuebox->settings->string);
+			fprintf(dump, "\n");
+			if (cuebox->payload) fprintf(dump, "%s", cuebox->payload->string);
+			fprintf(dump, "\n");
+		} else if (box->type == GF_ISOM_BOX_TYPE_VTTE) {
+			gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
+			gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
+			fprintf(dump, " --> NEXT\n\n");
+		} else if (box->type == GF_ISOM_BOX_TYPE_VTTA) {
+			fprintf(dump, "%s\n\n", ((GF_StringBox *)box)->string);
+		}
+		gf_isom_box_del(box);
+	}
+	gf_bs_del(bs);
+	return GF_OK;
+}
+#endif
+
 #ifndef GPAC_DISABLE_ISOM_DUMP
 static GF_Err gf_webvtt_parser_dump_finalize(GF_WebVTTParser *parser, u64 duration)
 {
@@ -1518,6 +1418,9 @@
 
 GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge)
 {
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+	return GF_NOT_SUPPORTED;
+#else
 	GF_Err e;
 	u32 i;
 	u32 count;
@@ -1527,7 +1430,7 @@
 	u64 duration;
 	GF_WebVTTParser *parser;
 
-	out = szName ? gf_f64_open(szName, "wt") : stdout;
+	out = szName ? gf_fopen(szName, "wt") : stdout;
 	if (!out) return GF_IO_ERR;// gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 
 	parser = gf_webvtt_parser_new();
@@ -1555,8 +1458,9 @@
 
 exit:
 	gf_webvtt_parser_del(parser);
-	if (szName) fclose(out);
+	if (szName) gf_fclose(out);
 	return e;
+#endif
 }
 
 #endif //GPAC_DISABLE_ISOM_DUMP

v0.5.2.tar.gz/src/odf/desc_private.c -> v0.6.1.tar.gz/src/odf/desc_private.c Changed

v0.5.2.tar.gz/src/odf/descriptors.c -> v0.6.1.tar.gz/src/odf/descriptors.c Changed

@@ -352,7 +352,7 @@
 	if (!dsi || !dsi->data || !dsi->dataLength ) {
 		/* Hack for T-DMB non compliant streams (OnTimeTek ?) */
 		cfg = (GF_BIFSConfig *) gf_odf_desc_new(GF_ODF_BIFS_CFG_TAG);
-		cfg->pixelMetrics = 1;
+		cfg->pixelMetrics = GF_TRUE;
 		cfg->version = 1;
 		return cfg;
 	}
@@ -369,7 +369,7 @@
 	cfg->routeIDbits = gf_bs_read_int(bs, 5);
 	if (oti==2) cfg->protoIDbits = gf_bs_read_int(bs, 5);
 
-	cmd_stream = gf_bs_read_int(bs, 1);
+	cmd_stream = (Bool)gf_bs_read_int(bs, 1);
 	if (!cmd_stream) {
 		cfg->elementaryMasks = gf_list_new();
 		while (1) {
@@ -384,8 +384,8 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[ODF] Reading bifs config: shift in sizes (not supported)\n"));
 		}
 	} else {
-		cfg->pixelMetrics = gf_bs_read_int(bs, 1);
-		hasSize = gf_bs_read_int(bs, 1);
+		cfg->pixelMetrics = (Bool)gf_bs_read_int(bs, 1);
+		hasSize = (Bool)gf_bs_read_int(bs, 1);
 		if (hasSize) {
 			cfg->pixelWidth = gf_bs_read_int(bs, 16);
 			cfg->pixelHeight = gf_bs_read_int(bs, 16);
@@ -735,14 +735,14 @@
 	cfg->MPEGExtendedFormat = gf_bs_read_int(bs, 8);
 	cfg->profileLevel = gf_bs_read_int(bs, 8);
 	cfg->timescale = gf_bs_read_int(bs, 24);
-	has_alt_format = gf_bs_read_int(bs, 1);
+	has_alt_format = (Bool)gf_bs_read_int(bs, 1);
 	cfg->sampleDescriptionFlags = gf_bs_read_int(bs, 2);
 #ifndef GPAC_DISABLE_ISOM
-	has_sd = gf_bs_read_int(bs, 1);
+	has_sd = (Bool)gf_bs_read_int(bs, 1);
 #else
 	gf_bs_read_int(bs, 1);
 #endif
-	cfg->has_vid_info = gf_bs_read_int(bs, 1);
+	cfg->has_vid_info = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 3);
 	cfg->layer = gf_bs_read_int(bs, 8);
 	cfg->text_width = gf_bs_read_int(bs, 16);
@@ -890,7 +890,7 @@
 	gf_bs_write_int(bs, count, 8);
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
-		GF_HEVCParamArray *ar = gf_list_get(cfg->param_array, i);
+		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
 		gf_bs_write_int(bs, ar->array_completeness, 1);
 		gf_bs_write_int(bs, 0, 1);
 		gf_bs_write_int(bs, ar->type, 6);
@@ -959,9 +959,9 @@
 	cfg->nal_unit_size = 1 + gf_bs_read_int(bs, 2);
 
 	if (is_shvc) {
-		cfg->is_shvc = 1;
-		cfg->complete_representation = gf_bs_read_int(bs, 1);
-		cfg->non_hevc_base_layer = gf_bs_read_int(bs, 1);
+		cfg->is_shvc = GF_TRUE;
+		cfg->complete_representation = (Bool)gf_bs_read_int(bs, 1);
+		cfg->non_hevc_base_layer = (Bool)gf_bs_read_int(bs, 1);
 		cfg->num_layers = 1 + gf_bs_read_int(bs, 6);
 		cfg->scalability_mask = gf_bs_read_int(bs, 16);
 	}

v0.5.2.tar.gz/src/odf/ipmpx_code.c -> v0.6.1.tar.gz/src/odf/ipmpx_code.c Changed

@@ -236,7 +236,7 @@
 		GF_SAFEALLOC(p, GF_IPMPX_AUTH_AlgorithmDescriptor);
 		if (!p) return GF_OUT_OF_MEM;
 		p->tag = tag;
-		isReg = gf_bs_read_int(bs, 1);
+		isReg = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 7);
 		if (isReg) {
 			p->regAlgoID = gf_bs_read_int(bs, 16);
@@ -389,11 +389,11 @@
 	Bool requestNegotiation, successNegotiation, inclAuthenticationData, inclAuthCodes;
 	GF_IPMPX_MutualAuthentication *p = (GF_IPMPX_MutualAuthentication *)_p;
 
-	requestNegotiation = gf_bs_read_int(bs, 1);
-	successNegotiation = gf_bs_read_int(bs, 1);
-	p->failedNegotiation =  gf_bs_read_int(bs, 1);
-	inclAuthenticationData = gf_bs_read_int(bs, 1);
-	inclAuthCodes = gf_bs_read_int(bs, 1);
+	requestNegotiation = (Bool)gf_bs_read_int(bs, 1);
+	successNegotiation = (Bool)gf_bs_read_int(bs, 1);
+	p->failedNegotiation =  (Bool)gf_bs_read_int(bs, 1);
+	inclAuthenticationData = (Bool)gf_bs_read_int(bs, 1);
+	inclAuthCodes = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 3);
 
 	if (requestNegotiation) {
@@ -602,7 +602,7 @@
 			tts->tag = GF_IPMPX_TRUST_SPECIFICATION_TAG;
 			nbSpec--;
 			gf_list_add(tt->trustSpecifications, tts);
-			has_cc = gf_bs_read_int(bs, 1);
+			has_cc = (Bool)gf_bs_read_int(bs, 1);
 			gf_bs_read_int(bs, 7);
 			if (has_cc) {
 				tts->CCTrustMetadata = GF_IPMPX_GetByteArray(bs);
@@ -681,9 +681,9 @@
 {
 	Bool has_enc, has_mac;
 	GF_IPMPX_SecureContainer *p = (GF_IPMPX_SecureContainer *)_p;
-	has_enc = gf_bs_read_int(bs, 1);
-	has_mac = gf_bs_read_int(bs, 1);
-	p->isMACEncrypted = gf_bs_read_int(bs, 1);
+	has_enc = (Bool)gf_bs_read_int(bs, 1);
+	has_mac = (Bool)gf_bs_read_int(bs, 1);
+	p->isMACEncrypted = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 5);
 	if (has_enc) {
 		p->encryptedData = GF_IPMPX_GetByteArray(bs);
@@ -699,7 +699,7 @@
 {
 	u32 size = 1;
 	GF_IPMPX_SecureContainer *p = (GF_IPMPX_SecureContainer *)_p;
-	if (p->MAC) p->isMACEncrypted = 0;
+	if (p->MAC) p->isMACEncrypted = GF_FALSE;
 	if (p->encryptedData) {
 		size += GF_IPMPX_GetByteArraySize(p->encryptedData);
 		if (p->MAC) size += GF_IPMPX_GetByteArraySize(p->MAC);
@@ -712,7 +712,7 @@
 static GF_Err WriteGF_IPMPX_SecureContainer(GF_BitStream *bs, GF_IPMPX_Data *_p)
 {
 	GF_IPMPX_SecureContainer *p = (GF_IPMPX_SecureContainer *)_p;
-	if (p->MAC) p->isMACEncrypted = 0;
+	if (p->MAC) p->isMACEncrypted = GF_FALSE;
 	gf_bs_write_int(bs, p->encryptedData ? 1 : 0, 1);
 	gf_bs_write_int(bs, (p->MAC || p->isMACEncrypted) ? 1 : 0, 1);
 	gf_bs_write_int(bs, p->isMACEncrypted, 1);
@@ -902,7 +902,7 @@
 static GF_Err ReadGF_IPMPX_ToolParamCapabilitiesResponse(GF_BitStream *bs, GF_IPMPX_Data *_p, u32 size)
 {
 	GF_IPMPX_ToolParamCapabilitiesResponse *p = (GF_IPMPX_ToolParamCapabilitiesResponse*)_p;
-	p->capabilitiesSupported = gf_bs_read_int(bs, 1);
+	p->capabilitiesSupported = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
 	return GF_OK;
 }
@@ -992,7 +992,7 @@
 	Bool has_idex;
 	GF_IPMPX_GetToolContext*p = (GF_IPMPX_GetToolContext*)_p;
 	p->scope = gf_bs_read_int(bs, 3);
-	has_idex = gf_bs_read_int(bs, 1);
+	has_idex = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 4);
 	if (has_idex) p->IPMP_DescriptorIDEx = gf_bs_read_int(bs, 16);
 
@@ -1026,7 +1026,7 @@
 {
 	Bool has_esid;
 	GF_IPMPX_GetToolContextResponse*p = (GF_IPMPX_GetToolContextResponse*)_p;
-	has_esid = gf_bs_read_int(bs, 1);
+	has_esid = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 5);
 	p->OD_ID = gf_bs_read_int(bs, 10);
 	if (has_esid) p->ESD_ID = gf_bs_read_int(bs, 16);
@@ -1131,7 +1131,7 @@
 {
 	Bool has_id;
 	GF_IPMPX_NotifyToolEvent*p = (GF_IPMPX_NotifyToolEvent*)_p;
-	has_id = gf_bs_read_int(bs, 1);
+	has_id = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
 	if (has_id) {
 		p->OD_ID = gf_bs_read_int(bs, 10);
@@ -1174,7 +1174,7 @@
 static GF_Err ReadGF_IPMPX_CanProcess(GF_BitStream *bs, GF_IPMPX_Data *_p, u32 size)
 {
 	GF_IPMPX_CanProcess*p = (GF_IPMPX_CanProcess*)_p;
-	p->canProcess = gf_bs_read_int(bs, 1);
+	p->canProcess = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
 	return GF_OK;
 }
@@ -1325,7 +1325,7 @@
 		count--;
 		gf_bs_read_data(bs, (char*)sb->cipher_Id, 16);
 		sb->syncBoundary = gf_bs_read_int(bs, 8);
-		is_block = gf_bs_read_int(bs, 1);
+		is_block = (Bool)gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 7);
 		if (is_block) {
 			sb->mode = gf_bs_read_int(bs, 8);
@@ -1335,7 +1335,7 @@
 			sb->Stream_Cipher_Specific_Init_Info = GF_IPMPX_GetByteArray(bs);
 		}
 	}
-	is_spec = gf_bs_read_int(bs, 1);
+	is_spec = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
 	if (is_spec) {
 		Bool is_map;
@@ -1349,11 +1349,11 @@
 			sf->field_Scope = gf_bs_read_int(bs, 3);
 			gf_bs_read_int(bs, 5);
 			sf->buf = gf_bs_read_int(bs, 8);
-			is_map = gf_bs_read_int(bs, 1);
+			is_map = (Bool)gf_bs_read_int(bs, 1);
 			gf_bs_read_int(bs, 7);
 			if (is_map) {
-				Bool sendMapTable = gf_bs_read_int(bs, 1);
-				Bool isShuffled = gf_bs_read_int(bs, 1);
+				Bool sendMapTable = (Bool)gf_bs_read_int(bs, 1);
+				Bool isShuffled = (Bool)gf_bs_read_int(bs, 1);
 				gf_bs_read_int(bs, 6);
 				if (sendMapTable) {
 					sf->mappingTableSize = gf_bs_read_int(bs, 16);
@@ -1478,7 +1478,7 @@
 
 	p->inputFormat = gf_bs_read_int(bs, 8);
 	p->requiredOp = gf_bs_read_int(bs, 4);
-	has_opaque_data = gf_bs_read_int(bs, 1);
+	has_opaque_data = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 3);
 	if (p->inputFormat==0x01) {
 		if (p->tag == GF_IPMPX_AUDIO_WM_INIT_TAG) {
@@ -1584,7 +1584,7 @@
 	GF_IPMPX_SendWatermark *p = (GF_IPMPX_SendWatermark*)_p;
 	p->wm_status = gf_bs_read_int(bs, 2);
 	p->compression_status = gf_bs_read_int(bs, 2);
-	has_op_data = gf_bs_read_int(bs, 1);
+	has_op_data = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 3);
 	if (p->wm_status==GF_IPMPX_WM_PAYLOAD) p->payload = GF_IPMPX_GetByteArray(bs);
 	if (has_op_data) p->opaqueData = GF_IPMPX_GetByteArray(bs);
@@ -1628,8 +1628,8 @@
 {
 	Bool has_i, has_m;
 	GF_IPMPX_ToolAPI_Config*p = (GF_IPMPX_ToolAPI_Config*)_p;
-	has_i = gf_bs_read_int(bs, 1);
-	has_m = gf_bs_read_int(bs, 1);
+	has_i = (Bool)gf_bs_read_int(bs, 1);
+	has_m = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 6);
 	if (has_i) p->Instantiation_API_ID = gf_bs_read_int(bs, 32);
 	if (has_m) p->Messaging_API_ID = gf_bs_read_int(bs, 32);
@@ -1674,7 +1674,7 @@
 	GF_IPMPX_ISMACryp*p = (GF_IPMPX_ISMACryp*)_p;
 	p->cryptoSuite = gf_bs_read_int(bs, 8);
 	p->IV_length = gf_bs_read_int(bs, 8);
-	p->use_selective_encryption = gf_bs_read_int(bs, 1);
+	p->use_selective_encryption = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
 	p->key_indicator_length = gf_bs_read_int(bs, 8);
 	return GF_OK;

v0.5.2.tar.gz/src/odf/ipmpx_dump.c -> v0.6.1.tar.gz/src/odf/ipmpx_dump.c Changed

@@ -149,10 +149,10 @@
 	if (name) StartAttribute(trace, name, indent, XMTDump);
 	if (!XMTDump) fprintf(trace, "\"");
 
-	ASCII_Dump = 1;
+	ASCII_Dump = GF_TRUE;
 	for (i=0; i<dataLength; i++) {
 		if ((data[i]<32) || (data[i]>126)) {
-			ASCII_Dump = 0;
+			ASCII_Dump = GF_FALSE;
 			break;
 		}
 	}
@@ -221,9 +221,9 @@
 			indent++;
 			DumpData(trace, "array", _p->data, _p->length, indent, XMTDump);
 			indent--;
-			EndAttributes(trace, 1, 0);
+			EndAttributes(trace, GF_TRUE, GF_FALSE);
 		} else {
-			DumpData(trace, attName ? attName : "ByteArray", _p->data, _p->length, indent, 0);
+			DumpData(trace, attName ? attName : "ByteArray", _p->data, _p->length, indent, GF_FALSE);
 		}
 	}
 }
@@ -237,8 +237,8 @@
 		GF_IPMPX_AUTH_KeyDescriptor *p = (GF_IPMPX_AUTH_KeyDescriptor *)ipa;
 		StartElement(trace, "IPMP_KeyDescriptor", indent, XMTDump);
 		DumpData(trace, "keyBody", p->keyBody, p->keyBodyLength, indent+1, XMTDump);
-		if (XMTDump) EndAttributes(trace, 1, 0);
-		else EndElement(trace, "", indent, 0);
+		if (XMTDump) EndAttributes(trace, GF_TRUE, GF_FALSE);
+		else EndElement(trace, "", indent, GF_FALSE);
 	}
 	break;
 	case GF_IPMPX_AUTH_AlgorithmDescr_Tag:
@@ -250,7 +250,7 @@
 		} else {
 			gf_ipmpx_dump_ByteArray(p->specAlgoID, "specAlgoID", trace, indent+1, XMTDump);
 		}
-		EndAttributes(trace, XMTDump, 1);
+		EndAttributes(trace, XMTDump, GF_TRUE);
 		if (p->OpaqueData) gf_ipmpx_dump_ByteArray(p->OpaqueData, "OpaqueData", trace, indent+1, XMTDump);
 
 		EndElement(trace, "IPMP_AlgorithmDescriptor", indent, XMTDump);
@@ -280,7 +280,7 @@
 
 	StartElement(trace, (p->tag==GF_IPMPX_RIGHTS_DATA_TAG) ? "IPMP_RightsData" : "IPMP_OpaqueData", indent, XMTDump);
 	indent++;
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	gf_ipmpx_dump_ByteArray(p->opaqueData, (p->tag==GF_IPMPX_RIGHTS_DATA_TAG) ? "rightsInfo" : "opaqueData", trace, indent, XMTDump);
 	indent--;
@@ -305,7 +305,7 @@
 	if (p->flags & 4) DumpLargeInt(trace, "expireDTS", p->expireDTS, indent, XMTDump);
 	if (p->flags & 8) DumpInt(trace, "expirePacketID", p->expirePacketID, indent, XMTDump);
 
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	gf_ipmpx_dump_ByteArray(p->keyBody, "keyBody", trace, indent, XMTDump);
 	gf_ipmpx_dump_ByteArray(p->OpaqueData, "OpaqueData", trace, indent, XMTDump);
@@ -320,7 +320,7 @@
 	StartElement(trace, "IPMP_SecureContainer", indent, XMTDump);
 	indent++;
 	DumpBool(trace, "isMACEncrypted", p->isMACEncrypted, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	if (p->encryptedData) gf_ipmpx_dump_ByteArray(p->encryptedData, "encryptedData", trace, indent, XMTDump);
 	if (p->protectedMsg) gf_ipmpx_dump_data(p->protectedMsg, trace, indent, XMTDump);
@@ -336,7 +336,7 @@
 	indent++;
 	DumpInt(trace, "Context", p->Context, indent, XMTDump);
 	DumpInt(trace, "AuthType", p->AuthType, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_InitAuthentication", indent, XMTDump);
@@ -349,7 +349,7 @@
 	GF_IPMPX_TrustSecurityMetadata*p = (GF_IPMPX_TrustSecurityMetadata*)_p;
 	StartElement(trace, "IPMP_TrustSecurityMetadata", indent, XMTDump);
 	indent++;
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 
 	StartList(trace, "trustedTools", indent, XMTDump);
@@ -361,7 +361,7 @@
 		indent++;
 		DumpBin128(trace, "toolID", (char *)tt->toolID, indent, XMTDump);
 		DumpDate(trace, "AuditDate", tt->AuditDate, indent, XMTDump);
-		EndAttributes(trace, XMTDump, 1);
+		EndAttributes(trace, XMTDump, GF_TRUE);
 		StartList(trace, "trustSpecifications", indent, XMTDump);
 		indent++;
 		for (j=0; j<gf_list_count(tt->trustSpecifications); j++) {
@@ -371,7 +371,7 @@
 			DumpDate(trace, "startDate", ts->startDate, indent, XMTDump);
 			DumpInt(trace, "attackerProfile", ts->attackerProfile, indent, XMTDump);
 			DumpInt(trace, "trustedDuration", ts->trustedDuration, indent, XMTDump);
-			EndAttributes(trace, XMTDump, 1);
+			EndAttributes(trace, XMTDump, GF_TRUE);
 			if (ts->CCTrustMetadata) gf_ipmpx_dump_ByteArray(ts->CCTrustMetadata, "CCTrustMetadata", trace, indent, XMTDump);
 			indent--;
 			EndElement(trace, "IPMP_TrustSpecification", indent, XMTDump);
@@ -398,7 +398,7 @@
 	DumpBool(trace, "failedNegotiation", p->failedNegotiation, indent, XMTDump);
 	if (gf_list_count(p->certificates)) DumpInt(trace, "certType", p->certType, indent, XMTDump);
 
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 
 	StartList(trace, "candidateAlgorithms", indent, XMTDump);
@@ -433,8 +433,8 @@
 				if (XMTDump) {
 					gf_ipmpx_dump_ByteArray(ipd, NULL, trace, indent, XMTDump);
 				} else {
-					StartAttribute(trace, "", indent, 0);
-					DumpData(trace, NULL, ipd->data, ipd->length, indent, 0);
+					StartAttribute(trace, "", indent, GF_FALSE);
+					DumpData(trace, NULL, ipd->data, ipd->length, indent, GF_FALSE);
 					if (i+1<count) fprintf(trace, ",");
 					fprintf(trace, "\n");
 				}
@@ -449,10 +449,10 @@
 		else if (p->opaque) {
 			gf_ipmpx_dump_ByteArray(p->opaque, "opaque", trace, indent, XMTDump);
 		}
-		if (!XMTDump) StartAttribute(trace, "trustData", indent, 0);
+		if (!XMTDump) StartAttribute(trace, "trustData", indent, GF_FALSE);
 		else {
 			StartElement(trace, "trustData", indent, XMTDump);
-			EndAttributes(trace, XMTDump, 1);
+			EndAttributes(trace, XMTDump, GF_TRUE);
 		}
 		gf_ipmpx_dump_data((GF_IPMPX_Data *)p->trustData, trace, indent, XMTDump);
 		if (XMTDump) EndElement(trace, "trustData", indent, XMTDump);
@@ -469,9 +469,9 @@
 	GF_IPMPX_GetToolsResponse*p = (GF_IPMPX_GetToolsResponse*)_p;
 	StartElement(trace, "IPMP_GetToolsResponse", indent, XMTDump);
 	indent++;
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
-	DumpDescList(p->ipmp_tools, trace, indent, "IPMP_Tools", XMTDump, 0);
+	DumpDescList(p->ipmp_tools, trace, indent, "IPMP_Tools", XMTDump, GF_FALSE);
 	indent--;
 	EndElement(trace, "IPMP_GetToolsResponse", indent, XMTDump);
 	return GF_OK;
@@ -485,7 +485,7 @@
 	indent++;
 	DumpInt(trace, "majorVersion", p->majorVersion, indent, XMTDump);
 	DumpInt(trace, "minorVersion", p->minorVersion, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	gf_ipmpx_dump_ByteArray(p->descriptionComment, "descriptionComment", trace, indent, XMTDump);
 
@@ -495,7 +495,7 @@
 		GF_IPMPX_ParametricDescriptionItem *it = (GF_IPMPX_ParametricDescriptionItem *)gf_list_get(p->descriptions, i);
 		StartElement(trace, "IPMP_ParametricDescriptionItem", indent, XMTDump);
 		indent++;
-		EndAttributes(trace, XMTDump, 1);
+		EndAttributes(trace, XMTDump, GF_TRUE);
 		gf_ipmpx_dump_ByteArray(it->main_class, "class", trace, indent, XMTDump);
 		gf_ipmpx_dump_ByteArray(it->subClass, "subClass", trace, indent, XMTDump);
 		gf_ipmpx_dump_ByteArray(it->typeData, "typeData", trace, indent, XMTDump);
@@ -516,12 +516,12 @@
 	GF_IPMPX_ToolParamCapabilitiesQuery*p = (GF_IPMPX_ToolParamCapabilitiesQuery*)_p;
 	StartElement(trace, "IPMP_ToolParamCapabilitiesQuery", indent, XMTDump);
 	indent++;
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
-	if (!XMTDump) StartAttribute(trace, "description", indent, 0);
+	if (!XMTDump) StartAttribute(trace, "description", indent, GF_FALSE);
 	else {
 		StartElement(trace, "description", indent, XMTDump);
-		EndAttributes(trace, XMTDump, 1);
+		EndAttributes(trace, XMTDump, GF_TRUE);
 	}
 	gf_ipmpx_dump_data((GF_IPMPX_Data *) p->description, trace, indent, XMTDump);
 	if (XMTDump) EndElement(trace, "description", indent, XMTDump);
@@ -536,7 +536,7 @@
 	StartElement(trace, "IPMP_ToolParamCapabilitiesResponse", indent, XMTDump);
 	indent++;
 	DumpBool(trace, "capabilitiesSupported", p->capabilitiesSupported, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_ToolParamCapabilitiesResponse", indent, XMTDump);
@@ -547,12 +547,12 @@
 	GF_IPMPX_ConnectTool*p = (GF_IPMPX_ConnectTool*)_p;
 	StartElement(trace, "IPMP_ConnectTool", indent, XMTDump);
 	indent++;
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
-	if (!XMTDump) StartAttribute(trace, "toolDescriptor", indent, 0);
+	if (!XMTDump) StartAttribute(trace, "toolDescriptor", indent, GF_FALSE);
 	else {
 		StartElement(trace, "toolDescriptor", indent, XMTDump);
-		EndAttributes(trace, XMTDump, 1);
+		EndAttributes(trace, XMTDump, GF_TRUE);
 	}
 	gf_odf_dump_desc((GF_Descriptor *)p->toolDescriptor, trace, indent, XMTDump);
 	if (XMTDump) EndElement(trace, "toolDescriptor", indent, XMTDump);
@@ -567,7 +567,7 @@
 	StartElement(trace, "IPMP_DisconnectTool", indent, XMTDump);
 	indent++;
 	DumpInt(trace, "IPMP_ToolContextID", p->IPMP_ToolContextID, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_DisconnectTool", indent, XMTDump);
@@ -580,7 +580,7 @@
 	indent++;
 	DumpInt(trace, "scope", p->scope, indent, XMTDump);
 	DumpInt(trace, "IPMP_DescriptorIDEx", p->IPMP_DescriptorIDEx, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_GetToolContext", indent, XMTDump);
@@ -594,7 +594,7 @@
 	DumpInt(trace, "OD_ID", p->OD_ID, indent, XMTDump);
 	DumpInt(trace, "ESD_ID", p->ESD_ID, indent, XMTDump);
 	DumpInt(trace, "IPMP_ToolContextID", p->IPMP_ToolContextID, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_GetToolContextResponse", indent, XMTDump);
@@ -620,7 +620,7 @@
 	}
 	if (!XMTDump) fprintf(trace, "\"");
 	EndAttribute(trace, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_AddToolNotificationListener", indent, XMTDump);
@@ -645,7 +645,7 @@
 	}
 	if (!XMTDump) fprintf(trace, "\"");
 	EndAttribute(trace, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_RemoveToolNotificationListener", indent, XMTDump);
@@ -660,7 +660,7 @@
 	DumpInt(trace, "ESD_ID", p->ESD_ID, indent, XMTDump);
 	DumpInt(trace, "IPMP_ToolContextID", p->IPMP_ToolContextID, indent, XMTDump);
 	DumpInt(trace, "eventType", p->eventType, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_NotifyToolEvent", indent, XMTDump);
@@ -672,7 +672,7 @@
 	StartElement(trace, "IPMP_CanProcess", indent, XMTDump);
 	indent++;
 	DumpBool(trace, "canProcess", p->canProcess, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "IPMP_CanProcess", indent, XMTDump);
@@ -685,7 +685,7 @@
 	indent++;
 	DumpInt(trace, "Instantiation_API_ID", p->Instantiation_API_ID, indent, XMTDump);
 	DumpInt(trace, "Messaging_API_ID", p->Messaging_API_ID, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	gf_ipmpx_dump_ByteArray(p->opaqueData, "opaqueData", trace, indent, XMTDump);
 	indent--;
@@ -722,7 +722,7 @@
 	}
 	if (p->opaqueData) DumpData(trace, "opaqueData", p->opaqueData, p->opaqueDataSize, indent, XMTDump);
 
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, (char*) ( (_p->tag==GF_IPMPX_AUDIO_WM_INIT_TAG) ? "IPMP_AudioWatermarkingInit" : "IPMP_VideoWatermarkingInit"), indent, XMTDump);
@@ -735,7 +735,7 @@
 	indent++;
 	DumpInt(trace, "wmStatus", p->wm_status, indent, XMTDump);
 	DumpInt(trace, "compression_status", p->compression_status, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	if (p->wm_status==GF_IPMPX_WM_PAYLOAD) gf_ipmpx_dump_ByteArray(p->payload, "payload", trace, indent, XMTDump);
 	if (p->opaqueData) gf_ipmpx_dump_ByteArray(p->opaqueData, "opaqueData", trace, indent, XMTDump);
@@ -755,7 +755,7 @@
 	DumpInt(trace, "profileLevelIndication", p->profileLevelIndication, indent, XMTDump);
 	DumpInt(trace, "compliance", p->compliance, indent, XMTDump);
 	if (p->RLE_Data) DumpData_16(trace, "RLE_Data", p->RLE_Data, p->RLE_DataLength, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 
 	count = gf_list_count(p->SelEncBuffer);
@@ -773,7 +773,7 @@
 				DumpInt(trace, "blockSize", sb->blockSize, indent, XMTDump);
 				DumpInt(trace, "keySize", sb->keySize, indent, XMTDump);
 			}
-			EndAttributes(trace, XMTDump, 1);
+			EndAttributes(trace, XMTDump, GF_TRUE);
 			if (sb->Stream_Cipher_Specific_Init_Info)
 				gf_ipmpx_dump_ByteArray(sb->Stream_Cipher_Specific_Init_Info, "StreamCipher", trace, indent, XMTDump);
 
@@ -796,7 +796,7 @@
 			DumpInt(trace, "field_Scope", sf->field_Scope, indent, XMTDump);
 			DumpInt(trace, "buf", sf->buf, indent, XMTDump);
 			if (sf->mappingTable) DumpData_16(trace, "mappingTable", sf->mappingTable, sf->mappingTableSize, indent, XMTDump);
-			EndAttributes(trace, XMTDump, 1);
+			EndAttributes(trace, XMTDump, GF_TRUE);
 			if (sf->shuffleSpecificInfo)
 				gf_ipmpx_dump_ByteArray(sf->shuffleSpecificInfo, "shuffleSpecificInfo", trace, indent, XMTDump);
 
@@ -821,7 +821,7 @@
 	DumpInt(trace, "IV_length", p->IV_length, indent, XMTDump);
 	DumpBool(trace, "selective_encryption", p->use_selective_encryption, indent, XMTDump);
 	DumpInt(trace, "key_indicator_length", p->key_indicator_length, indent, XMTDump);
-	EndAttributes(trace, XMTDump, 1);
+	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
 	indent--;
 	EndElement(trace, "ISMACryp_Data", indent, XMTDump);

v0.5.2.tar.gz/src/odf/ipmpx_parse.c -> v0.6.1.tar.gz/src/odf/ipmpx_parse.c Changed

v0.5.2.tar.gz/src/odf/odf_code.c -> v0.6.1.tar.gz/src/odf/odf_code.c Changed

@@ -28,6 +28,7 @@
 
 #define DATE_CODING_BIT_LEN	40
 
+#ifndef GPAC_MINIMAL_ODF
 
 static GFINLINE GF_Err OD_ReadUTF8String(GF_BitStream *bs, char **string, Bool isUTF8, u32 *read)
 {
@@ -62,6 +63,8 @@
 	}
 }
 
+#endif // GPAC_MINIMAL_ODF
+
 /*use to parse strings read the length as well - Warning : the alloc is done here !!*/
 GF_Err gf_odf_read_url_string(GF_BitStream *bs, char **string, u32 *readBytes)
 {
@@ -1155,7 +1158,7 @@
 			break;
 
 		/*iPod fix: delete and aborts, this will create an InvalidDescriptor at the ESD level with a loaded DSI,
-		laoding will abort with a partially valid ESD which is all the matters*/
+		loading will abort with a partially valid ESD which is all the matters*/
 		case GF_ODF_SLC_TAG:
 			gf_odf_delete_descriptor(tmp);
 			return GF_OK;
@@ -1486,9 +1489,9 @@
 
 GF_Descriptor *gf_odf_new_lang()
 {
-	GF_Language *newDesc = (GF_Language *) gf_malloc(sizeof(GF_Language));
+	GF_Language *newDesc;
+	GF_SAFEALLOC(newDesc, GF_Language);
 	if (!newDesc) return NULL;
-	newDesc->langCode = 0;
 	newDesc->tag = GF_ODF_LANG_TAG;
 	return (GF_Descriptor *) newDesc;
 }
@@ -1496,6 +1499,7 @@
 GF_Err gf_odf_del_lang(GF_Language *ld)
 {
 	if (!ld) return GF_BAD_PARAM;
+	if (ld->full_lang_code) gf_free(ld->full_lang_code);
 	gf_free(ld);
 	return GF_OK;
 }
@@ -1640,7 +1644,7 @@
 {
 	if (!mi) return GF_BAD_PARAM;
 	if (mi->file_name) gf_free(mi->file_name);
-    if (mi->src_url) gf_free(mi->src_url);
+	if (mi->src_url) gf_free(mi->src_url);
 	if (mi->streamFormat) gf_free(mi->streamFormat);
 	if (mi->textNode) gf_free(mi->textNode);
 	if (mi->fontNode) gf_free(mi->fontNode);
@@ -1738,9 +1742,6 @@
 
 
 
-
-
-
 GF_Descriptor *gf_odf_new_cc()
 {
 	GF_CCDescriptor *newDesc = (GF_CCDescriptor *) gf_malloc(sizeof(GF_CCDescriptor));
@@ -2635,9 +2636,9 @@
 	if (!kwd) return GF_BAD_PARAM;
 
 	e = gf_odf_size_descriptor((GF_Descriptor *)kwd, &size);
-	assert(e == GF_OK);
+	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, kwd->tag, size);
-	assert(e == GF_OK);
+	if (e) return e;
 
 	gf_bs_write_int(bs, kwd->languageCode, 24);
 	gf_bs_write_int(bs, kwd->isUTF8, 1);
@@ -3144,10 +3145,10 @@
 
 	scid->languageCode = gf_bs_read_int(bs, 24);
 	nbBytes += 3;
-	e = OD_ReadUTF8String(bs, & scid->supplContentIdentifierTitle, 1, &len);
+	e = OD_ReadUTF8String(bs, & scid->supplContentIdentifierTitle, GF_TRUE, &len);
 	if (e) return e;
 	nbBytes += len;
-	e = OD_ReadUTF8String(bs, & scid->supplContentIdentifierValue, 1, &len);
+	e = OD_ReadUTF8String(bs, & scid->supplContentIdentifierValue, GF_TRUE, &len);
 	if (e) return e;
 	nbBytes += len;
 	if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;
@@ -3158,7 +3159,7 @@
 GF_Err gf_odf_size_sup_cid(GF_SCIDesc *scid, u32 *outSize)
 {
 	if (! scid) return GF_BAD_PARAM;
-	*outSize = 3 + OD_SizeUTF8String(scid->supplContentIdentifierTitle, 1) + OD_SizeUTF8String(scid->supplContentIdentifierValue, 1);
+	*outSize = 3 + OD_SizeUTF8String(scid->supplContentIdentifierTitle, GF_TRUE) + OD_SizeUTF8String(scid->supplContentIdentifierValue, GF_TRUE);
 	return GF_OK;
 }
 GF_Err gf_odf_write_sup_cid(GF_BitStream *bs, GF_SCIDesc *scid)
@@ -3171,8 +3172,8 @@
 	e = gf_odf_write_base_descriptor(bs, scid->tag, size);
 	if (e) return e;
 	gf_bs_write_int(bs, scid->languageCode, 24);
-	OD_WriteUTF8String(bs, scid->supplContentIdentifierTitle, 1);
-	OD_WriteUTF8String(bs, scid->supplContentIdentifierValue, 1);
+	OD_WriteUTF8String(bs, scid->supplContentIdentifierTitle, GF_TRUE);
+	OD_WriteUTF8String(bs, scid->supplContentIdentifierValue, GF_TRUE);
 	return GF_OK;
 }
 
@@ -3266,8 +3267,8 @@
 	u32 nbBytes = 0;
 	if (! ipmpt) return GF_BAD_PARAM;
 	gf_bs_read_data(bs, (char*) ipmpt->IPMP_ToolID, 16);
-	is_alt = gf_bs_read_int(bs, 1);
-	is_param = gf_bs_read_int(bs, 1);
+	is_alt = (Bool)gf_bs_read_int(bs, 1);
+	is_param = (Bool)gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 6);
 	nbBytes = 17;

v0.5.2.tar.gz/src/odf/odf_codec.c -> v0.6.1.tar.gz/src/odf/odf_codec.c Changed

v0.5.2.tar.gz/src/odf/odf_command.c -> v0.6.1.tar.gz/src/odf/odf_command.c Changed

v0.5.2.tar.gz/src/odf/odf_dump.c -> v0.6.1.tar.gz/src/odf/odf_dump.c Changed

@@ -381,7 +381,7 @@
 	if (!list) return GF_OK;
 	count = gf_list_count(list);
 	if (!no_skip_empty && !count) return GF_OK;
-	StartElement(trace, ListName, indent, XMTDump, 1);
+	StartElement(trace, ListName, indent, XMTDump, GF_TRUE);
 	indent++;
 	OD_FORMAT_INDENT(ind_buf, indent);
 	for (i=0; i<count; i++) {
@@ -391,7 +391,7 @@
 		gf_odf_dump_desc(desc, trace, indent, XMTDump);
 	}
 	indent--;
-	EndElement(trace, ListName, indent, XMTDump, 1);
+	EndElement(trace, ListName, indent, XMTDump, GF_TRUE);
 	return GF_OK;
 }
 
@@ -411,7 +411,7 @@
 	}
 	if (!num_desc) return GF_OK;
 
-	StartElement(trace, ListName, indent, XMTDump, 1);
+	StartElement(trace, ListName, indent, XMTDump, GF_TRUE);
 	indent++;
 	OD_FORMAT_INDENT(ind_buf, indent);
 	for (i=0; i<count; i++) {
@@ -423,7 +423,7 @@
 		}
 	}
 	indent--;
-	EndElement(trace, ListName, indent, XMTDump, 1);
+	EndElement(trace, ListName, indent, XMTDump, GF_TRUE);
 	return GF_OK;
 }
 
@@ -462,26 +462,26 @@
 	}
 
 	if (XMTDump) {
-		StartElement(trace, "Descr", indent, XMTDump, 1);
+		StartElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 		indent++;
 	}
 	//ESDescr
-	DumpDescList(iod->ESDescriptors, trace, indent, "esDescr", XMTDump, 0);
-	DumpDescList(iod->OCIDescriptors, trace, indent, "ociDescr", XMTDump, 0);
+	DumpDescList(iod->ESDescriptors, trace, indent, "esDescr", XMTDump, GF_FALSE);
+	DumpDescList(iod->OCIDescriptors, trace, indent, "ociDescr", XMTDump, GF_FALSE);
 	DumpDescListFilter(iod->IPMP_Descriptors, trace, indent, "ipmpDescrPtr", XMTDump, GF_ODF_IPMP_PTR_TAG);
 	DumpDescListFilter(iod->IPMP_Descriptors, trace, indent, "ipmpDescr", XMTDump, GF_ODF_IPMP_TAG);
 
-	DumpDescList(iod->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
+	DumpDescList(iod->extensionDescriptors, trace, indent, "extDescr", XMTDump, GF_FALSE);
 
 	if (iod->IPMPToolList) {
-		StartElement(trace, "toolListDescr" , indent, XMTDump, 0);
+		StartElement(trace, "toolListDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(iod->IPMPToolList, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "toolListDescr" , indent, XMTDump, 0);
+		EndElement(trace, "toolListDescr" , indent, XMTDump, GF_FALSE);
 	}
 
 	if (XMTDump) {
 		indent--;
-		EndElement(trace, "Descr", indent, XMTDump, 1);
+		EndElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 	}
 	indent--;
 	EndDescDump(trace, "InitialObjectDescriptor", indent, XMTDump);
@@ -531,45 +531,45 @@
 		EndSubElement(trace, indent, XMTDump);
 	}
 	if (esd->decoderConfig) {
-		StartElement(trace, "decConfigDescr" , indent, XMTDump, 0);
+		StartElement(trace, "decConfigDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(esd->decoderConfig, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "decConfigDescr" , indent, XMTDump, 0);
+		EndElement(trace, "decConfigDescr" , indent, XMTDump, GF_FALSE);
 	}
 	if (esd->slConfig) {
-		StartElement(trace, "slConfigDescr" , indent, XMTDump, 0);
+		StartElement(trace, "slConfigDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(esd->slConfig, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "slConfigDescr" , indent, XMTDump, 0);
+		EndElement(trace, "slConfigDescr" , indent, XMTDump, GF_FALSE);
 	} else {
-		StartElement(trace, "slConfigDescr" , indent, XMTDump, 0);
+		StartElement(trace, "slConfigDescr" , indent, XMTDump, GF_FALSE);
 		StartDescDump(trace, "SLConfigDescriptor", indent, XMTDump);
 		EndAttributes(trace, indent, XMTDump);
 		EndDescDump(trace, "SLConfigDescriptor", indent, XMTDump);
-		EndElement(trace, "slConfigDescr" , indent, XMTDump, 0);
+		EndElement(trace, "slConfigDescr" , indent, XMTDump, GF_FALSE);
 	}
 	if (esd->ipiPtr) {
-		StartElement(trace, "ipiPtr" , indent, XMTDump, 0);
+		StartElement(trace, "ipiPtr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(esd->ipiPtr, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "ipiPtr" , indent, XMTDump, 0);
+		EndElement(trace, "ipiPtr" , indent, XMTDump, GF_FALSE);
 	}
 
-	DumpDescList(esd->IPIDataSet, trace, indent, "ipIDS", XMTDump, 0);
-	DumpDescList(esd->IPMPDescriptorPointers, trace, indent, "ipmpDescrPtr", XMTDump, 0);
+	DumpDescList(esd->IPIDataSet, trace, indent, "ipIDS", XMTDump, GF_FALSE);
+	DumpDescList(esd->IPMPDescriptorPointers, trace, indent, "ipmpDescrPtr", XMTDump, GF_FALSE);
 
 	if (esd->qos) {
-		StartElement(trace, "qosDescr" , indent, XMTDump, 0);
+		StartElement(trace, "qosDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(esd->qos, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "qosDescr" , indent, XMTDump, 0);
+		EndElement(trace, "qosDescr" , indent, XMTDump, GF_FALSE);
 	}
 	if (esd->langDesc) {
-		StartElement(trace, "langDescr" , indent, XMTDump, 0);
+		StartElement(trace, "langDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(esd->langDesc, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "langDescr" , indent, XMTDump, 0);
+		EndElement(trace, "langDescr" , indent, XMTDump, GF_FALSE);
 	}
 
 	if (esd->RegDescriptor) {
-		StartElement(trace, "regDescr" , indent, XMTDump, 0);
+		StartElement(trace, "regDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(esd->RegDescriptor, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "regDescr" , indent, XMTDump, 0);
+		EndElement(trace, "regDescr" , indent, XMTDump, GF_FALSE);
 	}
 
 	mi = NULL;
@@ -582,16 +582,16 @@
 		mi = NULL;
 	}
 
-	DumpDescList(esd->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
+	DumpDescList(esd->extensionDescriptors, trace, indent, "extDescr", XMTDump, GF_FALSE);
 
 	if (mi) {
 		gf_list_insert(esd->extensionDescriptors, mi, i);
 		if (XMTDump) {
-			gf_odf_dump_desc(mi, trace, indent, 1);
+			gf_odf_dump_desc(mi, trace, indent, GF_TRUE);
 		} else {
-			StartElement(trace, "muxInfo" , indent, 0, 0);
-			gf_odf_dump_desc(mi, trace, indent, 0);
-			EndElement(trace, "muxInfo" , indent, 0, 0);
+			StartElement(trace, "muxInfo", indent, GF_FALSE, GF_FALSE);
+			gf_odf_dump_desc(mi, trace, indent, GF_FALSE);
+			EndElement(trace, "muxInfo", indent, GF_FALSE, GF_FALSE);
 		}
 	}
 
@@ -628,8 +628,8 @@
 			if (em->node_id) DumpInt(trace, "atNode", em->node_id, indent, XMTDump);
 			else if (em->node_name) DumpString(trace, "atNode", em->node_name, indent, XMTDump);
 			EndAttributes(trace, indent, XMTDump);
-			if (XMTDump) EndDescDump(trace, "ElementaryMask", indent, 1);
-			else EndDescDump(trace, "ElementaryMask", indent, 0);
+			if (XMTDump) EndDescDump(trace, "ElementaryMask", indent, GF_TRUE);
+			else EndDescDump(trace, "ElementaryMask", indent, GF_FALSE);
 		}
 		EndDescDump(trace, "AnimationMask", indent, XMTDump);
 		indent--;
@@ -759,9 +759,9 @@
 	char ind_buf[OD_MAX_TREE];
 	StartDescDump(trace, "TextConfig", indent, XMTDump);
 	indent++;
-	DumpIntHex(trace, "3GPPBaseFormat", desc->Base3GPPFormat, indent, XMTDump, 1);
-	DumpIntHex(trace, "MPEGExtendedFormat", desc->MPEGExtendedFormat, indent, XMTDump, 1);
-	DumpIntHex(trace, "profileLevel", desc->profileLevel, indent, XMTDump, 1);
+	DumpIntHex(trace, "3GPPBaseFormat", desc->Base3GPPFormat, indent, XMTDump, GF_TRUE);
+	DumpIntHex(trace, "MPEGExtendedFormat", desc->MPEGExtendedFormat, indent, XMTDump, GF_TRUE);
+	DumpIntHex(trace, "profileLevel", desc->profileLevel, indent, XMTDump, GF_TRUE);
 	DumpInt(trace, "durationClock", desc->timescale, indent, XMTDump);
 	DumpInt(trace, "layer", desc->layer, indent, XMTDump);
 	DumpInt(trace, "text_width", desc->text_width, indent, XMTDump);
@@ -771,7 +771,7 @@
 	if (desc->horiz_offset) DumpInt(trace, "horizontal_offset", desc->horiz_offset, indent, XMTDump);
 	if (desc->vert_offset) DumpInt(trace, "vertical_offset", desc->vert_offset, indent, XMTDump);
 
-	StartElement(trace, "SampleDescriptions", indent, XMTDump, 1);
+	StartElement(trace, "SampleDescriptions", indent, XMTDump, GF_TRUE);
 	indent++;
 	OD_FORMAT_INDENT(ind_buf, indent);
 
@@ -783,17 +783,17 @@
 		if (!XMTDump) fprintf(trace, "%s", ind_buf);
 		StartDescDump(trace, "TextSampleDescriptor", indent, XMTDump);
 		indent++;
-		DumpIntHex(trace, "displayFlags", sd->displayFlags, indent, XMTDump, 0);
+		DumpIntHex(trace, "displayFlags", sd->displayFlags, indent, XMTDump, GF_FALSE);
 		DumpInt(trace, "horiz_justif", sd->horiz_justif, indent, XMTDump);
 		DumpInt(trace, "vert_justif", sd->vert_justif, indent, XMTDump);
-		DumpIntHex(trace, "back_color", sd->back_color, indent, XMTDump, 0);
+		DumpIntHex(trace, "back_color", sd->back_color, indent, XMTDump, GF_FALSE);
 		DumpInt(trace, "top", sd->default_pos.top, indent, XMTDump);
 		DumpInt(trace, "bottom", sd->default_pos.bottom, indent, XMTDump);
 		DumpInt(trace, "left", sd->default_pos.left, indent, XMTDump);
 		DumpInt(trace, "right", sd->default_pos.right, indent, XMTDump);
 		DumpInt(trace, "style_font_ID", sd->default_style.fontID, indent, XMTDump);
 		DumpInt(trace, "style_font_size", sd->default_style.font_size, indent, XMTDump);
-		DumpIntHex(trace, "style_text_color", sd->default_style.text_color, indent, XMTDump, 0);
+		DumpIntHex(trace, "style_text_color", sd->default_style.text_color, indent, XMTDump, GF_FALSE);
 		strcpy(szStyles, "");
 		if (sd->default_style.style_flags & GF_TXT_STYLE_BOLD) strcat(szStyles, "bold ");
 		if (sd->default_style.style_flags & GF_TXT_STYLE_ITALIC) strcat(szStyles, "italic ");
@@ -810,7 +810,7 @@
 	}
 
 	indent--;
-	EndElement(trace, "SampleDescriptions", indent, XMTDump, 1);
+	EndElement(trace, "SampleDescriptions", indent, XMTDump, GF_TRUE);
 
 	indent--;
 	EndDescDump(trace, "TextConfig", indent, XMTDump);
@@ -974,17 +974,17 @@
 	if (dcd->decoderSpecificInfo) {
 		if (dcd->decoderSpecificInfo->tag==GF_ODF_DSI_TAG) {
 			if (dcd->decoderSpecificInfo->dataLength) {
-				StartElement(trace, "decSpecificInfo" , indent, XMTDump, 0);
+				StartElement(trace, "decSpecificInfo" , indent, XMTDump, GF_FALSE);
 				OD_DumpDSI(dcd->decoderSpecificInfo, trace, indent + (XMTDump ? 1 : 0), XMTDump, dcd->streamType, dcd->objectTypeIndication);
-				EndElement(trace, "decSpecificInfo" , indent, XMTDump, 0);
+				EndElement(trace, "decSpecificInfo" , indent, XMTDump, GF_FALSE);
 			}
 		} else {
-			StartElement(trace, "decSpecificInfo" , indent, XMTDump, 0);
+			StartElement(trace, "decSpecificInfo" , indent, XMTDump, GF_FALSE);
 			gf_odf_dump_desc(dcd->decoderSpecificInfo, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-			EndElement(trace, "decSpecificInfo" , indent, XMTDump, 0);
+			EndElement(trace, "decSpecificInfo" , indent, XMTDump, GF_FALSE);
 		}
 	}
-	DumpDescList(dcd->profileLevelIndicationIndexDescriptor, trace, indent, "profileLevelIndicationIndexDescr", XMTDump, 0);
+	DumpDescList(dcd->profileLevelIndicationIndexDescriptor, trace, indent, "profileLevelIndicationIndexDescr", XMTDump, GF_FALSE);
 	indent--;
 	EndDescDump(trace, "DecoderConfigDescriptor", indent, XMTDump);
 
@@ -1040,7 +1040,7 @@
 		EndSubElement(trace, indent, XMTDump);
 	}
 	indent--;
-	if (XMTDump) EndElement(trace, "custom" , indent, XMTDump, 1);
+	if (XMTDump) EndElement(trace, "custom" , indent, XMTDump, GF_TRUE);
 
 	indent--;
 	EndDescDump(trace, "SLConfigDescriptor", indent, XMTDump);
@@ -1060,9 +1060,9 @@
 		}
 		indent--;
 		if (XMTDump) {
-			EndSubElement(trace, indent, 1);
+			EndSubElement(trace, indent, GF_TRUE);
 		} else {
-			EndDescDump(trace, "", indent, 0);
+			EndDescDump(trace, "", indent, GF_FALSE);
 		}
 	} else {
 		StartDescDump(trace, "DefaultDescriptor", indent, XMTDump);
@@ -1222,12 +1222,12 @@
 	StartDescDump(trace, "IPMP_Descriptor", indent, XMTDump);
 	indent++;
 
-	DumpIntHex(trace, "IPMP_DescriptorID", ipmp->IPMP_DescriptorID, indent, XMTDump, 1);
-	DumpIntHex(trace, "IPMPS_Type", ipmp->IPMPS_Type, indent, XMTDump, 0);
+	DumpIntHex(trace, "IPMP_DescriptorID", ipmp->IPMP_DescriptorID, indent, XMTDump, GF_TRUE);
+	DumpIntHex(trace, "IPMPS_Type", ipmp->IPMPS_Type, indent, XMTDump, GF_FALSE);
 
 
 	if ((ipmp->IPMP_DescriptorID==0xFF) && (ipmp->IPMPS_Type==0xFFFF)) {
-		DumpIntHex(trace, "IPMP_DescriptorIDEx", ipmp->IPMP_DescriptorIDEx, indent, XMTDump, 0);
+		DumpIntHex(trace, "IPMP_DescriptorIDEx", ipmp->IPMP_DescriptorIDEx, indent, XMTDump, GF_FALSE);
 		/*how the heck do we represent toolID??*/
 		DumpBin128(trace, "IPMP_ToolID", (char*)ipmp->IPMP_ToolID, indent, XMTDump);
 		DumpInt(trace, "controlPointCode", ipmp->control_point, indent, XMTDump);
@@ -1235,7 +1235,7 @@
 		EndAttributes(trace, indent, XMTDump);
 #ifndef GPAC_MINIMAL_ODF
 		/*parse IPMPX data*/
-		StartElement(trace, "IPMPX_Data", indent, XMTDump, 1);
+		StartElement(trace, "IPMPX_Data", indent, XMTDump, GF_TRUE);
 		indent++;
 		count = gf_list_count(ipmp->ipmpx_data);
 		for (i=0; i<count; i++) {
@@ -1243,7 +1243,7 @@
 			gf_ipmpx_dump_data(p, trace, indent, XMTDump);
 		}
 		indent--;
-		EndElement(trace, "IPMPX_Data", indent, XMTDump, 1);
+		EndElement(trace, "IPMPX_Data", indent, XMTDump, GF_TRUE);
 #endif
 	}
 	else if (!ipmp->IPMPS_Type) {
@@ -1319,7 +1319,7 @@
 	StartDescDump(trace, "AuxiliaryVideoData", indent, XMTDump);
 	indent++;
 
-	DumpIntHex(trace, "aux_video_type", ld->aux_video_type, indent, XMTDump, 1);
+	DumpIntHex(trace, "aux_video_type", ld->aux_video_type, indent, XMTDump, GF_TRUE);
 	DumpInt(trace, "position_offset_h", ld->position_offset_h, indent, XMTDump);
 	DumpInt(trace, "position_offset_v", ld->position_offset_v, indent, XMTDump);
 	DumpInt(trace, "knear", ld->knear, indent, XMTDump);
@@ -1356,7 +1356,7 @@
 	EndAttributes(trace, indent, XMTDump);
 
 
-	StartSubElement(trace, "Profile", indent, 1);
+	StartSubElement(trace, "Profile", indent, GF_TRUE);
 
 	DumpInt(trace, "audioProfileLevelIndication", iod->audio_profileAndLevel, indent, XMTDump);
 	DumpInt(trace, "visualProfileLevelIndication", iod->visual_profileAndLevel, indent, XMTDump);
@@ -1374,30 +1374,30 @@
 	}
 
 	if (XMTDump) {
-		StartElement(trace, "Descr", indent, XMTDump, 1);
+		StartElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 		indent++;
 	}
 	//ESDescr
 	if (gf_list_count(iod->ES_ID_IncDescriptors)) {
-		DumpDescList(iod->ES_ID_IncDescriptors, trace, indent, "esDescrInc", XMTDump, 0);
+		DumpDescList(iod->ES_ID_IncDescriptors, trace, indent, "esDescrInc", XMTDump, GF_FALSE);
 	} else {
-		DumpDescList(iod->ES_ID_RefDescriptors, trace, indent, "esDescrRef", XMTDump, 0);
+		DumpDescList(iod->ES_ID_RefDescriptors, trace, indent, "esDescrRef", XMTDump, GF_FALSE);
 	}
-	DumpDescList(iod->OCIDescriptors, trace, indent, "ociDescr", XMTDump, 0);
+	DumpDescList(iod->OCIDescriptors, trace, indent, "ociDescr", XMTDump, GF_FALSE);
 	DumpDescListFilter(iod->IPMP_Descriptors, trace, indent, "ipmpDescrPtr", XMTDump, GF_ODF_IPMP_PTR_TAG);
 	DumpDescListFilter(iod->IPMP_Descriptors, trace, indent, "ipmpDescr", XMTDump, GF_ODF_IPMP_TAG);
 
-	DumpDescList(iod->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
+	DumpDescList(iod->extensionDescriptors, trace, indent, "extDescr", XMTDump, GF_FALSE);
 
 	if (iod->IPMPToolList) {
-		StartElement(trace, "toolListDescr" , indent, XMTDump, 0);
+		StartElement(trace, "toolListDescr" , indent, XMTDump, GF_FALSE);
 		gf_odf_dump_desc(iod->IPMPToolList, trace, indent + (XMTDump ? 1 : 0), XMTDump);
-		EndElement(trace, "toolListDescr" , indent, XMTDump, 0);
+		EndElement(trace, "toolListDescr" , indent, XMTDump, GF_FALSE);
 	}
 
 	if (XMTDump) {
 		indent--;
-		EndElement(trace, "Descr", indent, XMTDump, 1);
+		EndElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 	}
 	indent--;
 	EndDescDump(trace, "MP4InitialObjectDescriptor", indent, XMTDump);
@@ -1425,20 +1425,20 @@
 	}
 
 	if (XMTDump) {
-		StartElement(trace, "Descr", indent, XMTDump, 1);
+		StartElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 		indent++;
 	}
 	//ESDescr
-	DumpDescList(od->ESDescriptors, trace, indent, "esDescr", XMTDump, 0);
-	DumpDescList(od->OCIDescriptors, trace, indent, "ociDescr", XMTDump, 0);
+	DumpDescList(od->ESDescriptors, trace, indent, "esDescr", XMTDump, GF_FALSE);
+	DumpDescList(od->OCIDescriptors, trace, indent, "ociDescr", XMTDump, GF_FALSE);
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescrPtr", XMTDump, GF_ODF_IPMP_PTR_TAG);
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescr", XMTDump, GF_ODF_IPMP_TAG);
 
-	DumpDescList(od->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
+	DumpDescList(od->extensionDescriptors, trace, indent, "extDescr", XMTDump, GF_FALSE);
 
 	if (XMTDump) {
 		indent--;
-		EndElement(trace, "Descr", indent, XMTDump, 1);
+		EndElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 	}
 	indent--;
 	EndDescDump(trace, "ObjectDescriptor", indent, XMTDump);
@@ -1466,23 +1466,23 @@
 	}
 
 	if (XMTDump) {
-		StartElement(trace, "Descr", indent, XMTDump, 1);
+		StartElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 		indent++;
 	}
 	//ESDescr
 	if (gf_list_count(od->ES_ID_IncDescriptors)) {
-		DumpDescList(od->ES_ID_IncDescriptors, trace, indent, "esDescrInc", XMTDump, 0);
+		DumpDescList(od->ES_ID_IncDescriptors, trace, indent, "esDescrInc", XMTDump, GF_FALSE);
 	} else {
-		DumpDescList(od->ES_ID_RefDescriptors, trace, indent, "esDescrRef", XMTDump, 0);
+		DumpDescList(od->ES_ID_RefDescriptors, trace, indent, "esDescrRef", XMTDump, GF_FALSE);
 	}
-	DumpDescList(od->OCIDescriptors, trace, indent, "ociDescr", XMTDump, 0);
+	DumpDescList(od->OCIDescriptors, trace, indent, "ociDescr", XMTDump, GF_FALSE);
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescrPtr", XMTDump, GF_ODF_IPMP_PTR_TAG);
 	DumpDescListFilter(od->IPMP_Descriptors, trace, indent, "ipmpDescr", XMTDump, GF_ODF_IPMP_TAG);
-	DumpDescList(od->extensionDescriptors, trace, indent, "extDescr", XMTDump, 0);
+	DumpDescList(od->extensionDescriptors, trace, indent, "extDescr", XMTDump, GF_FALSE);
 
 	if (XMTDump) {
 		indent--;
-		EndElement(trace, "Descr", indent, XMTDump, 1);
+		EndElement(trace, "Descr", indent, XMTDump, GF_TRUE);
 	}
 	indent--;
 	EndDescDump(trace, "MP4ObjectDescriptor", indent, XMTDump);
@@ -1699,50 +1699,50 @@
 GF_Err gf_odf_dump_muxinfo(GF_MuxInfo *mi, FILE *trace, u32 indent, Bool XMTDump)
 {
 	if (!XMTDump) {
-		StartDescDump(trace, "MuxInfo", indent, 0);
+		StartDescDump(trace, "MuxInfo", indent, GF_FALSE);
 		indent++;
-		if (mi->file_name) DumpString(trace, "fileName", mi->file_name, indent, 0);
-		if (mi->streamFormat) DumpString(trace, "streamFormat", mi->streamFormat, indent, 0);
-		if (mi->GroupID) DumpInt(trace, "GroupID", mi->GroupID, indent, 0);
-		if (mi->startTime) DumpInt(trace, "startTime", mi->startTime, indent, 0);
-		if (mi->duration) DumpInt(trace, "duration", mi->duration, indent, 0);
+		if (mi->file_name) DumpString(trace, "fileName", mi->file_name, indent, GF_FALSE);
+		if (mi->streamFormat) DumpString(trace, "streamFormat", mi->streamFormat, indent, GF_FALSE);
+		if (mi->GroupID) DumpInt(trace, "GroupID", mi->GroupID, indent, GF_FALSE);
+		if (mi->startTime) DumpInt(trace, "startTime", mi->startTime, indent, GF_FALSE);
+		if (mi->duration) DumpInt(trace, "duration", mi->duration, indent, GF_FALSE);
 #if 0
-		if (mi->import_flags & GF_IMPORT_USE_DATAREF) DumpBool(trace, "useDataReference", 1, indent, 0);
-		if (mi->import_flags & GF_IMPORT_NO_FRAME_DROP) DumpBool(trace, "noFrameDrop", 1, indent, 0);
-		if (mi->import_flags & GF_IMPORT_SBR_IMPLICIT) DumpString(trace, "SBR_Type", "implicit", indent, 0);
-		else if (mi->import_flags & GF_IMPORT_SBR_EXPLICIT) DumpString(trace, "SBR_Type", "explicit", indent, 0);
+		if (mi->import_flags & GF_IMPORT_USE_DATAREF) DumpBool(trace, "useDataReference", 1, indent, GF_FALSE);
+		if (mi->import_flags & GF_IMPORT_NO_FRAME_DROP) DumpBool(trace, "noFrameDrop", 1, indent, GF_FALSE);
+		if (mi->import_flags & GF_IMPORT_SBR_IMPLICIT) DumpString(trace, "SBR_Type", "implicit", indent, GF_FALSE);
+		else if (mi->import_flags & GF_IMPORT_SBR_EXPLICIT) DumpString(trace, "SBR_Type", "explicit", indent, GF_FALSE);
 #endif
 
-		if (mi->textNode) DumpString(trace, "textNode", mi->textNode, indent, 0);
-		if (mi->fontNode) DumpString(trace, "fontNode", mi->fontNode, indent, 0);
+		if (mi->textNode) DumpString(trace, "textNode", mi->textNode, indent, GF_FALSE);
+		if (mi->fontNode) DumpString(trace, "fontNode", mi->fontNode, indent, GF_FALSE);
 
 		indent--;
-		EndDescDump(trace, "MuxInfo", indent, 0);
+		EndDescDump(trace, "MuxInfo", indent, GF_FALSE);
 		return GF_OK;
 	}
 
-	StartDescDump(trace, "StreamSource", indent, 1);
+	StartDescDump(trace, "StreamSource", indent, GF_TRUE);
 	indent++;
-	if (mi->file_name) DumpString(trace, "url", mi->file_name, indent, 1);
-	EndAttributes(trace, indent, 1);
+	if (mi->file_name) DumpString(trace, "url", mi->file_name, indent, GF_TRUE);
+	EndAttributes(trace, indent, GF_TRUE);
 
-	StartDescDump(trace, "MP4MuxHints", indent, 1);
-	if (mi->GroupID) DumpInt(trace, "GroupID", mi->GroupID, indent, 1);
-	if (mi->startTime) DumpInt(trace, "startTime", mi->startTime, indent, 1);
-	if (mi->duration) DumpInt(trace, "duration", mi->duration, indent, 1);
+	StartDescDump(trace, "MP4MuxHints", indent, GF_TRUE);
+	if (mi->GroupID) DumpInt(trace, "GroupID", mi->GroupID, indent, GF_TRUE);
+	if (mi->startTime) DumpInt(trace, "startTime", mi->startTime, indent, GF_TRUE);
+	if (mi->duration) DumpInt(trace, "duration", mi->duration, indent, GF_TRUE);
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
-	if (mi->import_flags & GF_IMPORT_USE_DATAREF) DumpBool(trace, "useDataReference", 1, indent, 1);
-	if (mi->import_flags & GF_IMPORT_NO_FRAME_DROP) DumpBool(trace, "noFrameDrop", 1, indent, 1);
-	if (mi->import_flags & GF_IMPORT_SBR_IMPLICIT) DumpString(trace, "SBR_Type", "implicit", indent, 1);
-	else if (mi->import_flags & GF_IMPORT_SBR_EXPLICIT) DumpString(trace, "SBR_Type", "explicit", indent, 1);
+	if (mi->import_flags & GF_IMPORT_USE_DATAREF) DumpBool(trace, "useDataReference", 1, indent, GF_TRUE);
+	if (mi->import_flags & GF_IMPORT_NO_FRAME_DROP) DumpBool(trace, "noFrameDrop", 1, indent, GF_TRUE);
+	if (mi->import_flags & GF_IMPORT_SBR_IMPLICIT) DumpString(trace, "SBR_Type", "implicit", indent, GF_TRUE);
+	else if (mi->import_flags & GF_IMPORT_SBR_EXPLICIT) DumpString(trace, "SBR_Type", "explicit", indent, GF_TRUE);
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
-	if (mi->textNode) DumpString(trace, "textNode", mi->textNode, indent, 1);
-	if (mi->fontNode) DumpString(trace, "fontNode", mi->fontNode, indent, 1);
-	EndSubElement(trace, indent, 1);
+	if (mi->textNode) DumpString(trace, "textNode", mi->textNode, indent, GF_TRUE);
+	if (mi->fontNode) DumpString(trace, "fontNode", mi->fontNode, indent, GF_TRUE);
+	EndSubElement(trace, indent, GF_TRUE);
 
 	indent--;
-	EndElement(trace, "StreamSource" , indent, 1, 1);
+	EndElement(trace, "StreamSource" , indent, GF_TRUE, GF_TRUE);
 	return GF_OK;
 }
 
@@ -1752,7 +1752,7 @@
 	StartDescDump(trace, "IPMP_ToolListDescriptor", indent, XMTDump);
 	EndAttributes(trace, indent, XMTDump);
 	indent++;
-	DumpDescList(tl->ipmp_tools, trace, indent, "ipmpTool", XMTDump, 0);
+	DumpDescList(tl->ipmp_tools, trace, indent, "ipmpTool", XMTDump, GF_FALSE);
 	indent--;
 	EndDescDump(trace, "IPMP_ToolListDescriptor", indent, XMTDump);
 	return GF_OK;
@@ -1765,11 +1765,11 @@
 	DumpBin128(trace, "IPMP_ToolID", (char*)t->IPMP_ToolID, indent, XMTDump);
 	if (t->tool_url) DumpString(trace, "ToolURL", t->tool_url, indent, XMTDump);
 	if (t->toolParamDesc) {
-		StartElement(trace, "toolParamDesc" , indent, XMTDump, 0);
+		StartElement(trace, "toolParamDesc" , indent, XMTDump, GF_FALSE);
 #ifndef GPAC_MINIMAL_ODF
 		gf_ipmpx_dump_data((GF_IPMPX_Data *)t->toolParamDesc, trace, indent + (XMTDump ? 1 : 0), XMTDump);
 #endif
-		EndElement(trace, "toolParamDesc" , indent, XMTDump, 0);
+		EndElement(trace, "toolParamDesc" , indent, XMTDump, GF_FALSE);
 	}
 	EndAttributes(trace, indent, XMTDump);
 	indent--;
@@ -1785,11 +1785,11 @@
 		StartDescDump(trace, "ObjectDescriptorUpdate", indent, XMTDump);
 		EndAttributes(trace, indent, XMTDump);
 		indent++;
-		DumpDescList(com->objectDescriptors, trace, indent+1, "OD", XMTDump, 0);
+		DumpDescList(com->objectDescriptors, trace, indent+1, "OD", XMTDump, GF_FALSE);
 		indent--;
 		EndDescDump(trace, "ObjectDescriptorUpdate", indent, XMTDump);
 	} else {
-		DumpDescList(com->objectDescriptors, trace, indent, "UPDATE OD", XMTDump, 1);
+		DumpDescList(com->objectDescriptors, trace, indent, "UPDATE OD", XMTDump, GF_TRUE);
 	}
 	return GF_OK;
 }
@@ -1835,7 +1835,7 @@
 		fprintf(trace, "%sUPDATE ESD in %d\n", ind_buf, com->ODID);
 	}
 	indent++;
-	DumpDescList(com->ESDescriptors, trace, indent+1, "esDescr", XMTDump, 1);
+	DumpDescList(com->ESDescriptors, trace, indent+1, "esDescr", XMTDump, GF_TRUE);
 	indent--;
 	if (XMTDump) {
 		EndDescDump(trace, "ES_DescriptorUpdate", indent, XMTDump);
@@ -1882,11 +1882,11 @@
 		StartDescDump(trace, "IPMP_DescriptorUpdate", indent, XMTDump);
 		EndAttributes(trace, indent, XMTDump);
 		indent++;
-		DumpDescList(com->IPMPDescList, trace, indent+1, "ipmpDesc", XMTDump, 0);
+		DumpDescList(com->IPMPDescList, trace, indent+1, "ipmpDesc", XMTDump, GF_FALSE);
 		indent--;
 		EndDescDump(trace, "IPMP_DescriptorUpdate", indent, XMTDump);
 	} else {
-		DumpDescList(com->IPMPDescList, trace, indent, "UPDATE IPMPD", XMTDump, 1);
+		DumpDescList(com->IPMPDescList, trace, indent, "UPDATE IPMPD", XMTDump, GF_TRUE);
 	}
 	return GF_OK;
 }
@@ -1948,12 +1948,12 @@
 	fprintf(trace, "%d:%d:%d:%d", H, M, S, hS);
 	EndAttribute(trace, indent, XMTDump);
 
-	StartElement(trace, "OCIDescr", indent, XMTDump, 1);
+	StartElement(trace, "OCIDescr", indent, XMTDump, GF_TRUE);
 	for (i=0; i<gf_oci_event_get_desc_count(ev); i++) {
 		desc = gf_oci_event_get_desc(ev, i);
 		gf_odf_dump_desc(desc, trace, indent+1, XMTDump);
 	}
-	EndElement(trace, "OCIDescr", indent, XMTDump, 1);
+	EndElement(trace, "OCIDescr", indent, XMTDump, GF_TRUE);
 	indent--;
 	EndDescDump(trace, "OCI_Event", indent, XMTDump);

v0.5.2.tar.gz/src/odf/odf_parse.c -> v0.6.1.tar.gz/src/odf/odf_parse.c Changed

@@ -158,22 +158,22 @@
 	if (*out_data) gf_free(*out_data);
 	*out_data = NULL;
 	*out_data_size = 0;
-	f = gf_f64_open(fileName, "rb");
+	f = gf_fopen(fileName, "rb");
 	if (!f) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ODF Parse] cannot open data file %s - skipping\n", fileName));
 		return;
 	}
-	gf_f64_seek(f, 0, SEEK_END);
-	assert(gf_f64_tell(f) < 1<<31);
-	size = (u32) gf_f64_tell(f);
-	gf_f64_seek(f, 0, SEEK_SET);
+	gf_fseek(f, 0, SEEK_END);
+	assert(gf_ftell(f) < 1<<31);
+	size = (u32) gf_ftell(f);
+	gf_fseek(f, 0, SEEK_SET);
 	*out_data_size = size;
 	*out_data = (char*)gf_malloc(sizeof(char) * (size_t)size);
 	readen = fread(*out_data, sizeof(char), (size_t)size, f);
 	if (readen != size) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ODF Parse] readen size=%d does not match size=%d in %s\n", readen, size, fileName));
 	}
-	fclose(f);
+	gf_fclose(f);
 }
 
 void OD_ParseBin128(char *val, bin128 *data)
@@ -614,19 +614,19 @@
 								else if (!stricmp(fieldName, "text_height")) GET_U32(txt->text_height)
 									else if (!stricmp(fieldName, "video_width")) {
 										GET_U32(txt->video_width)
-										txt->has_vid_info = 1;
+										txt->has_vid_info = GF_TRUE;
 									}
 									else if (!stricmp(fieldName, "video_height")) {
 										GET_U32(txt->video_height)
-										txt->has_vid_info = 1;
+										txt->has_vid_info = GF_TRUE;
 									}
 									else if (!stricmp(fieldName, "horizontal_offset")) {
 										GET_S16(txt->horiz_offset)
-										txt->has_vid_info = 1;
+										txt->has_vid_info = GF_TRUE;
 									}
 									else if (!stricmp(fieldName, "vertical_offset")) {
 										GET_S32(txt->vert_offset)
-										txt->has_vid_info = 1;
+										txt->has_vid_info = GF_TRUE;
 									}
 	}
 	break;
@@ -661,9 +661,9 @@
 															sd->fonts[0].fontID = 0;
 															sd->fonts[0].fontName = NULL;
 														} else {
-															Bool realloc_fonts = 0;
-															if (!stricmp(fieldName, "fontID") && sd->fonts[sd->font_count-1].fontID) realloc_fonts = 1;
-															else if (!stricmp(fieldName, "fontName") && sd->fonts[sd->font_count-1].fontName) realloc_fonts = 1;
+															Bool realloc_fonts = GF_FALSE;
+															if (!stricmp(fieldName, "fontID") && sd->fonts[sd->font_count-1].fontID) realloc_fonts = GF_TRUE;
+															else if (!stricmp(fieldName, "fontName") && sd->fonts[sd->font_count-1].fontName) realloc_fonts = GF_TRUE;
 															if (realloc_fonts) {
 																sd->font_count += 1;
 																sd->fonts = (GF_FontRecord*)gf_realloc(sd->fonts, sizeof(GF_FontRecord)*sd->font_count);
@@ -756,14 +756,14 @@
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		/*we'll write the nb of words later on*/
 		gf_bs_write_int(bs, 0, 8);
-		has_word = 0;
+		has_word = GF_FALSE;
 		/*parse all words*/
 		val += 4;
 		while (1) {
 			pos = gf_token_get(val, 0, " ;", szItem, 100);
 			if (pos>0) val += pos;
 			if (!has_word) {
-				has_word = 1;
+				has_word = GF_TRUE;
 				nbWords++;
 				nb_phonems = 0;
 				bs_start = gf_bs_get_position(bs);
@@ -788,7 +788,7 @@
 
 			if ((pos<0) || !val[0] || val[0]==';') {
 				if (has_word) {
-					has_word = 0;
+					has_word = GF_FALSE;
 					bs_cur = gf_bs_get_position(bs);
 					gf_bs_seek(bs, bs_start);
 					gf_bs_write_int(bs, nb_phonems, 8);
@@ -807,8 +807,8 @@
 			gf_bs_get_content(bs, out_data, out_data_size);
 		}
 		gf_bs_del(bs);
-		return 1;
+		return GF_TRUE;
 	}
 #endif
-	return 0;
+	return GF_FALSE;
 }

v0.5.2.tar.gz/src/odf/slc.c -> v0.6.1.tar.gz/src/odf/slc.c Changed

v0.5.2.tar.gz/src/scene_manager/encode_isom.c -> v0.6.1.tar.gz/src/scene_manager/encode_isom.c Changed

@@ -27,6 +27,7 @@
 #include <gpac/constants.h>
 #include <gpac/media_tools.h>
 #include <gpac/bifs.h>
+#include <gpac/network.h>
 #ifndef GPAC_DISABLE_LASER
 #include <gpac/laser.h>
 #include <gpac/nodes_svg.h>
@@ -36,6 +37,7 @@
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 static void gf_sm_remove_mux_info(GF_ESD *src)
 {
 	u32 i;
@@ -49,6 +51,7 @@
 		}
 	}
 }
+#endif
 
 
 static void gf_sm_finalize_mux(GF_ISOFile *mp4, GF_ESD *src, u32 offset_ts)
@@ -82,6 +85,9 @@
 #endif
 }
 
+
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+
 static GF_Err gf_sm_import_ui_stream(GF_ISOFile *mp4, GF_ESD *src, Bool rewrite_esd_only)
 {
 	GF_UIConfig *cfg;
@@ -114,8 +120,6 @@
 }
 
 
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-
 static GF_Err gf_sm_import_stream(GF_SceneManager *ctx, GF_ISOFile *mp4, GF_ESD *src, Double imp_time, char *mediaSource, Bool od_sample_rap)
 {
 	u32 track, di, i;
@@ -228,14 +232,14 @@
 	if (!mux->file_name) return GF_OK;
 
 	memset(&import, 0, sizeof(GF_MediaImporter));
- if (mux->src_url) {
- ext = gf_url_concatenate(mux->src_url, mux->file_name);
- strcpy(szName, ext ? ext : mux->file_name);
- if (ext) gf_free(ext);
- } else {
- strcpy(szName, mux->file_name);
- }
- ext = strrchr(szName, '.');
+	if (mux->src_url) {
+		ext = gf_url_concatenate(mux->src_url, mux->file_name);
+		strcpy(szName, ext ? ext : mux->file_name);
+		if (ext) gf_free(ext);
+	} else {
+		strcpy(szName, mux->file_name);
+	}
+	ext = strrchr(szName, '.');
 
 	/*get track types for AVI*/
 	if (ext && !strnicmp(ext, ".avi", 4)) {
@@ -304,13 +308,13 @@
 	e = GF_OK;
 	/*SRT/SUB BIFS import if text node unspecified*/
 	if (mux->textNode) {
- if (mux->src_url) {
- char *src = gf_url_concatenate(mux->src_url, mux->file_name);
- if (src) {
- gf_free(mux->file_name);
- mux->file_name = src;
- }
- } 
+		if (mux->src_url) {
+			char *src = gf_url_concatenate(mux->src_url, mux->file_name);
+			if (src) {
+				gf_free(mux->file_name);
+				mux->file_name = src;
+			}
+		}
 		e = gf_sm_import_bifs_subtitle(ctx, esd, mux);
 		gf_sm_remove_mux_info(esd);
 	}

v0.5.2.tar.gz/src/scene_manager/loader_bt.c -> v0.6.1.tar.gz/src/scene_manager/loader_bt.c Changed

v0.5.2.tar.gz/src/scene_manager/loader_isom.c -> v0.6.1.tar.gz/src/scene_manager/loader_isom.c Changed

v0.5.2.tar.gz/src/scene_manager/loader_qt.c -> v0.6.1.tar.gz/src/scene_manager/loader_qt.c Changed

v0.5.2.tar.gz/src/scene_manager/loader_svg.c -> v0.6.1.tar.gz/src/scene_manager/loader_svg.c Changed

@@ -226,17 +226,17 @@
 		u64 size;
 		char *buffer;
 		FILE *f;
-		f = gf_f64_open(iri->string, "rb");
+		f = gf_fopen(iri->string, "rb");
 		if (!f) {
 			return;
 		}
-		gf_f64_seek(f, 0, SEEK_END);
-		size = gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
+		gf_fseek(f, 0, SEEK_END);
+		size = gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
 
 		buffer = gf_malloc(sizeof(char) * (size_t)(size+1));
 		size = fread(buffer, sizeof(char), (size_t)size, f);
-		fclose(f);
+		gf_fclose(f);
 
 
 		if (tag==TAG_SVG_script) {
@@ -1471,10 +1471,10 @@
 					strcat(szName, "_temp.nhml");
 					mux->file_name = gf_strdup(szName);
 					st->nhml_info = mux->file_name;
-					nhml = gf_f64_open(st->nhml_info, "wt");
+					nhml = gf_fopen(st->nhml_info, "wt");
 					fprintf(nhml, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
 					fprintf(nhml, "<NHNTStream version=\"1.0\" timeScale=\"%d\" streamType=\"%d\" objectTypeIndication=\"%d\" inRootOD=\"no\" trackID=\"%d\">\n", ts_res, ST, OTI, st->id);
-					fclose(nhml);
+					gf_fclose(nhml);
 					mux->delete_file = GF_TRUE;
 				}
 			}
@@ -1500,7 +1500,7 @@
 			if (!st || !st->nhml_info) {
 				return;
 			}
-			nhml = gf_f64_open(st->nhml_info, "a+t");
+			nhml = gf_fopen(st->nhml_info, "a+t");
 			fprintf(nhml, "<NHNTSample ");
 			if (time) fprintf(nhml, "DTS=\"%d\" ", time);
 			if (length) fprintf(nhml, "dataLength=\"%d\" ", length);
@@ -1508,7 +1508,7 @@
 			if (rap) fprintf(nhml, "isRAP=\"yes\" ");
 			if (src) fprintf(nhml, "mediaFile=\"%s\" ", src);
 			fprintf(nhml, "/>\n");
-			fclose(nhml);
+			gf_fclose(nhml);
 			return;
 		}
 		if (!strcmp(name, "endOfStream") ) {
@@ -1524,9 +1524,9 @@
 			if (!st || !st->nhml_info) {
 				return;
 			}
-			nhml = gf_f64_open(st->nhml_info, "a+t");
+			nhml = gf_fopen(st->nhml_info, "a+t");
 			fprintf(nhml, "</NHNTStream>\n");
-			fclose(nhml);
+			gf_fclose(nhml);
 			return;
 		}

v0.5.2.tar.gz/src/scene_manager/loader_xmt.c -> v0.6.1.tar.gz/src/scene_manager/loader_xmt.c Changed

@@ -1920,12 +1920,13 @@
 		else {
 			e = gf_odf_set_field(desc, att->name, att->value);
 			if (e) xmt_report(parser, e, "Warning: %s not a valid attribute for descriptor %s", att->name, name);
- //store src path but do not concatenate, othewise we break BT<->XMT conversion ...
- if ((desc->tag==GF_ODF_MUXINFO_TAG) && (!stricmp(att->name, "fileName") || !stricmp(att->name, "url"))) {
- GF_MuxInfo *mux = (GF_MuxInfo *) desc;
- if (!mux->src_url) mux->src_url = gf_strdup(parser->load->fileName);
- }
- }
+			//store src path but do not concatenate, othewise we break BT<->XMT conversion ...
+			if ((desc->tag==GF_ODF_MUXINFO_TAG) && (!stricmp(att->name, "fileName") || !stricmp(att->name, "url"))) {
+				GF_MuxInfo *mux = (GF_MuxInfo *) desc;
+				if (!mux->src_url)
+					mux->src_url = gf_strdup(parser->load->src_url ? parser->load->src_url : parser->load->fileName);
+			}
+		}
 	}
 	if (binaryID || xmt_desc_name) {
 		if ((tag == GF_ODF_IOD_TAG) || (tag == GF_ODF_OD_TAG))

v0.5.2.tar.gz/src/scene_manager/scene_dump.c -> v0.6.1.tar.gz/src/scene_manager/scene_dump.c Changed

@@ -81,7 +81,7 @@
 GF_Err gf_sm_dump_command_list(GF_SceneDumper *sdump, GF_List *comList, u32 indent, Bool skip_first_replace);
 
 GF_EXPORT
-GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, char indent_char, GF_SceneDumpFormat dump_mode)
+GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, Bool is_final_name, char indent_char, GF_SceneDumpFormat dump_mode)
 {
 	GF_SceneDumper *tmp;
 	if (!graph) return NULL;
@@ -100,9 +100,9 @@
 		if (_rad_name) {
 			const char* ext_name = tmp->LSRDump ? ".xsr" : ".svg";
 			tmp->filename = (char *)gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
-			strcpy(tmp->filename, _rad_name ? _rad_name : "");
-			strcat(tmp->filename, ext_name);
-			tmp->trace = gf_f64_open(tmp->filename, "wt");
+			strcpy(tmp->filename, _rad_name);
+			if (!is_final_name) strcat(tmp->filename, ext_name);
+			tmp->trace = gf_fopen(tmp->filename, "wt");
 			if (!tmp->trace) {
 				gf_free(tmp);
 				return NULL;
@@ -152,10 +152,11 @@
 				ext_name = ".bt";
 				break;
 			}
+			
 			tmp->filename = (char *)gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
 			strcpy(tmp->filename, _rad_name ? _rad_name : "");
-			strcat(tmp->filename, ext_name);
-			tmp->trace = gf_f64_open(tmp->filename, "wt");
+			if (!is_final_name) strcat(tmp->filename, ext_name);
+			tmp->trace = gf_fopen(tmp->filename, "wt");
 			if (!tmp->trace) {
 				gf_free(tmp);
 				return NULL;
@@ -203,7 +204,7 @@
 	}
 	gf_list_del(sdump->mem_def_nodes);
 	gf_list_del(sdump->inserted_routes);
-	if (sdump->trace != stdout) fclose(sdump->trace);
+	if (sdump->trace != stdout) gf_fclose(sdump->trace);
 	if (sdump->filename) {
 		gf_free(sdump->filename);
 		sdump->filename = NULL;
@@ -3415,7 +3416,7 @@
 
 
 GF_EXPORT
-GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, GF_SceneDumpFormat dump_mode)
+GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, Bool is_final_name, GF_SceneDumpFormat dump_mode)
 {
 	GF_Err e;
 	GF_List *sample_list;
@@ -3432,7 +3433,7 @@
 	num_scene = num_od = 0;
 	num_tracks = 0;
 	indent = 0;
-	dumper = gf_sm_dumper_new(ctx->scene_graph, rad_name, ' ', dump_mode);
+	dumper = gf_sm_dumper_new(ctx->scene_graph, rad_name, is_final_name, ' ', dump_mode);
 	e = GF_OK;
 	/*configure all systems streams we're dumping*/
 	i=0;

v0.5.2.tar.gz/src/scene_manager/scene_engine.c -> v0.6.1.tar.gz/src/scene_manager/scene_engine.c Changed

@@ -338,7 +338,7 @@
 	}
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
-	dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, ' ', GF_SM_DUMP_SVG);
+	dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, GF_FALSE, ' ', GF_SM_DUMP_SVG);
 	if (!dumper) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
 		e = GF_IO_ERR;
@@ -358,7 +358,7 @@
 
 		sprintf(rad_name, "%s%c%s%s", cache_dir, GF_PATH_SEPARATOR, "rap_", dump_name);
 
-		dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, ' ', GF_SM_DUMP_SVG);
+		dumper = gf_sm_dumper_new(seng->ctx->scene_graph, rad_name, GF_FALSE, ' ', GF_SM_DUMP_SVG);
 		if (!dumper) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot create SVG dumper for %s.svg\n", rad_name));
 			e = GF_IO_ERR;
@@ -382,14 +382,14 @@
 #endif
 
 	sprintf(file_name, "%s.svg", rad_name);
-	file = gf_f64_open(file_name, "rb");
+	file = gf_fopen(file_name, "rb");
 	if (!file) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot open SVG dump file %s\n", file_name));
 		e = GF_IO_ERR;
 		goto exit;
 	}
-	gf_f64_seek(file, 0, SEEK_END);
-	fsize = gf_f64_tell(file);
+	gf_fseek(file, 0, SEEK_END);
+	fsize = gf_ftell(file);
 
 	if (fsize == 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] SVG dump %s is empty\n", file_name));
@@ -398,9 +398,9 @@
 
 	/* First, read the dump in a buffer */
 	buffer = gf_malloc((size_t)fsize * sizeof(char));
-	gf_f64_seek(file, 0, SEEK_SET);
+	gf_fseek(file, 0, SEEK_SET);
 	fsize = fread(buffer, sizeof(char), (size_t)fsize, file);
-	fclose(file);
+	gf_fclose(file);
 	file = NULL;
 
 	/* Then, set DIMS unit header - TODO: notify redundant units*/
@@ -457,7 +457,7 @@
 exit:
 	if (!seng->dump_path) gf_free(cache_dir);
 	if (buffer) gf_free(buffer);
-	if (file) fclose(file);
+	if (file) gf_fclose(file);
 	return e;
 }
 
@@ -629,7 +629,7 @@
 		return GF_NOT_SUPPORTED;
 #endif
 	} else {
-		e = gf_sm_dump(seng->ctx, ctxFileName ? szF : NULL, d_mode);
+		e = gf_sm_dump(seng->ctx, ctxFileName ? szF : NULL, GF_FALSE, d_mode);
 	}
 	return e;
 #endif
@@ -720,7 +720,11 @@
 		GF_Command *com = gf_list_get(commands, 0);
 		gf_list_rem(commands, 0);
 		switch (com->tag) {
+#ifndef GPAC_DISABLE_VRML
 		case GF_SG_SCENE_REPLACE:
+			new_au->flags |= GF_SM_AU_RAP;
+			break;
+#endif
 		case GF_SG_LSR_NEW_SCENE:
 			new_au->flags |= GF_SM_AU_RAP;
 			break;

v0.5.2.tar.gz/src/scene_manager/scene_manager.c -> v0.6.1.tar.gz/src/scene_manager/scene_manager.c Changed

v0.5.2.tar.gz/src/scene_manager/swf_bifs.c -> v0.6.1.tar.gz/src/scene_manager/swf_bifs.c Changed

v0.5.2.tar.gz/src/scene_manager/swf_parse.c -> v0.6.1.tar.gz/src/scene_manager/swf_parse.c Changed

@@ -1716,7 +1716,7 @@
 static void swf_delete_sound_stream(SWFReader *read)
 {
 	if (!read->sound_stream) return;
-	if (read->sound_stream->output) fclose(read->sound_stream->output);
+	if (read->sound_stream->output) gf_fclose(read->sound_stream->output);
 	if (read->sound_stream->szFileName) gf_free(read->sound_stream->szFileName);
 	gf_free(read->sound_stream);
 	read->sound_stream = NULL;
@@ -1809,7 +1809,7 @@
 		} else {
 			snd->szFileName = gf_strdup(szName);
 		}
-		snd->output = gf_f64_open(snd->szFileName, "wb");
+		snd->output = gf_fopen(snd->szFileName, "wb");
 
 		alloc_size = 4096;
 		frame = (char*)gf_malloc(sizeof(char)*4096);
@@ -1976,7 +1976,7 @@
 
 		/*error at setup*/
 		if (!read->sound_stream->output) {
-			read->sound_stream->output = gf_f64_open(read->sound_stream->szFileName, "wb");
+			read->sound_stream->output = gf_fopen(read->sound_stream->szFileName, "wb");
 			if (!read->sound_stream->output)
 				return swf_func_skip(read);
 		}
@@ -2035,7 +2035,6 @@
 
 static GF_Err swf_def_bits_jpeg(SWFReader *read, u32 version)
 {
-	GF_Err e;
 	u32 ID;
 	FILE *file = NULL;
 	char szName[1024];
@@ -2061,7 +2060,7 @@
 	}
 
 	if (version!=3)
-		file = gf_f64_open(szName, "wb");
+		file = gf_fopen(szName, "wb");
 
 	if (version==1 && read->jpeg_hdr_size) {
 		/*remove JPEG EOI*/
@@ -2093,11 +2092,12 @@
 			gf_fwrite(buf+skip, 1, size-skip, file);
 	}
 	if (version!=3)
-		fclose(file);
+		gf_fclose(file);
 
 	if (version==3) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		char *dst, *raw;
+		GF_Err e;
 		u8 oti;
 		u32 osize, w, h, j, pf;
 		GF_BitStream *bs;
@@ -2111,7 +2111,9 @@
 		raw = gf_malloc(sizeof(char)*osize);
 		memset(raw, 0, sizeof(char)*osize);
 		e = gf_img_jpeg_dec( (char *) buf+skip, size-skip, &w, &h, &pf, raw, &osize, 4);
-		assert(e == GF_OK);
+		if (e != GF_OK) {
+			swf_report(read, e, "Cannopt decode JPEG image");
+		}
 
 		/*read alpha map and decompress it*/
 		if (size<AlphaPlaneSize) buf = gf_realloc(buf, sizeof(u8)*AlphaPlaneSize);
@@ -2137,9 +2139,9 @@
 		buf = gf_realloc(buf, sizeof(char)*osize);
 		gf_img_png_enc(raw, w, h, h*4, GF_PIXEL_RGBA, (char *)buf, &osize);
 
-		file = gf_f64_open(szName, "wb");
+		file = gf_fopen(szName, "wb");
 		gf_fwrite(buf, 1, osize, file);
-		fclose(file);
+		gf_fclose(file);
 
 		gf_free(raw);
 #endif //GPAC_DISABLE_AV_PARSERS
@@ -2481,7 +2483,7 @@
 	while (gf_list_count(read->sounds)) {
 		SWFSound *snd = (SWFSound *)gf_list_get(read->sounds, 0);
 		gf_list_rem(read->sounds, 0);
-		if (snd->output) fclose(snd->output);
+		if (snd->output) gf_fclose(snd->output);
 		if (snd->szFileName) gf_free(snd->szFileName);
 		gf_free(snd);
 	}
@@ -2490,7 +2492,7 @@
 
 	if (read->jpeg_hdr) gf_free(read->jpeg_hdr);
 	if (read->localPath) gf_free(read->localPath);
-	fclose(read->input);
+	gf_fclose(read->input);
 	gf_free(read);
 }
 
@@ -2506,7 +2508,7 @@
 {
 	SWFReader *read;
 	FILE *input;
-	input = gf_f64_open(inputName, "rb");
+	input = gf_fopen(inputName, "rb");
 	if (!input) return NULL;
 
 	GF_SAFEALLOC(read, SWFReader);
@@ -2602,9 +2604,13 @@
 		read->no_as = 1;
 	}
 
+	e = GF_NOT_SUPPORTED;
 	if (!(load->swf_import_flags & GF_SM_SWF_USE_SVG)) {
+#ifndef GPAC_DISABLE_VRML
 		e = swf_to_bifs_init(read);
+#endif
 	} else {
+#ifndef GPAC_DISABLE_SVG
 		char svgFileName[GF_MAX_PATH];
 		FILE *svgFile;
 		if (load->svgOutFile) {
@@ -2613,13 +2619,14 @@
 			} else {
 				sprintf(svgFileName, "%s.svg", load->svgOutFile);
 			}
-			svgFile = gf_f64_open(svgFileName, "wt");
+			svgFile = gf_fopen(svgFileName, "wt");
 			if (!svgFile) return GF_BAD_PARAM;
 		} else {
 			svgFile = stdout;
 		}
 		gf_swf_reader_set_user_mode(read, svgFile, swf_svg_write_text_sample, swf_svg_write_text_header);
 		e = swf_to_svg_init(read, read->flags, load->swf_flatten_limit);
+#endif
 	}
 	if (e) goto exit;

v0.5.2.tar.gz/src/scene_manager/swf_svg.c -> v0.6.1.tar.gz/src/scene_manager/swf_svg.c Changed

v0.5.2.tar.gz/src/scene_manager/text_to_bifs.c -> v0.6.1.tar.gz/src/scene_manager/text_to_bifs.c Changed

@@ -53,7 +53,7 @@
 {
 	char szLine[2048], szTest[10];
 	u32 val;
-	FILE *test = gf_f64_open(filename, "rt");
+	FILE *test = gf_fopen(filename, "rt");
 	if (!test) return GF_URL_ERROR;
 
 	while (fgets(szLine, 2048, test) != NULL) {
@@ -78,7 +78,7 @@
 		}
 		if (strstr(szLine, "x-quicktime-tx3g")) *fmt = GF_TEXT_IMPORT_TEXML;
 	}
-	fclose(test);
+	gf_fclose(test);
 	return GF_OK;
 }
 
@@ -142,7 +142,7 @@
 		}
 	}
 
-	srt_in = gf_f64_open(mux->file_name, "rt");
+	srt_in = gf_fopen(mux->file_name, "rt");
 	if (!srt_in) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[srt->bifs] cannot open input file %s\n", mux->file_name));
 		return GF_URL_ERROR;
@@ -330,7 +330,7 @@
 
 exit:
 	if (e) gf_sm_stream_del(ctx, srt);
-	fclose(srt_in);
+	gf_fclose(srt_in);
 	return e;
 }
 #endif /*GPAC_DISABLE_VRML*/
@@ -395,7 +395,7 @@
 		}
 	}
 
-	sub_in = gf_f64_open(mux->file_name, "rt");
+	sub_in = gf_fopen(mux->file_name, "rt");
 	if (!sub_in) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[sub->bifs] cannot open input file %s\n", mux->file_name));
 		return GF_URL_ERROR;
@@ -514,7 +514,7 @@
 	}
 
 	if (e) gf_sm_stream_del(ctx, srt);
-	fclose(sub_in);
+	gf_fclose(sub_in);
 	return e;
 }
 #endif

v0.5.2.tar.gz/src/scenegraph/base_scenegraph.c -> v0.6.1.tar.gz/src/scenegraph/base_scenegraph.c Changed

@@ -146,17 +146,21 @@
 	gf_list_del(sg->listeners_to_add);
 	gf_mx_del(sg->dom_evt_mx);
 #endif
+
 #ifdef GPAC_HAS_SPIDERMONKEY
 	gf_list_del(sg->scripts);
 	sg->scripts = NULL;
 	gf_list_del(sg->objects);
 	sg->objects = NULL;
+#ifndef GPAC_DISABLE_SVG
 	if (sg->svg_js) {
 		void gf_svg_script_context_del(GF_SVGJS *svg_js, GF_SceneGraph *scenegraph);
 		gf_svg_script_context_del(sg->svg_js, sg);
 	}
 #endif
 
+#endif //GPAC_HAS_SPIDERMONKEY
+
 #ifndef GPAC_DISABLE_VRML
 	gf_list_del(sg->Routes);
 	gf_list_del(sg->protos);
@@ -1990,12 +1994,12 @@
 	if (node->sgprivate->tag==TAG_UndefinedNode) return GF_BAD_PARAM;
 #ifndef GPAC_DISABLE_VRML
 	else if (node->sgprivate->tag == TAG_ProtoNode) return gf_sg_proto_get_field(NULL, node, info);
-	else if ((node->sgprivate->tag == TAG_MPEG4_Script)
+	else if (node->sgprivate->tag == TAG_MPEG4_Script)
+		return gf_sg_script_get_field(node, info);
 #ifndef GPAC_DISABLE_X3D
-	 || (node->sgprivate->tag == TAG_X3D_Script)
-#endif
-	 )
+	else if (node->sgprivate->tag == TAG_X3D_Script)
 		return gf_sg_script_get_field(node, info);
+#endif
 	else if (node->sgprivate->tag <= GF_NODE_RANGE_LAST_MPEG4) return gf_sg_mpeg4_node_get_field(node, info);
 #ifndef GPAC_DISABLE_X3D
 	else if (node->sgprivate->tag <= GF_NODE_RANGE_LAST_X3D) return gf_sg_x3d_node_get_field(node, info);
@@ -2036,13 +2040,12 @@
 	else if (node->sgprivate->tag == TAG_ProtoNode) {
 		res = gf_sg_proto_get_field_index_by_name(NULL, node, name);
 	}
-	else if ((node->sgprivate->tag == TAG_MPEG4_Script)
+	else if (node->sgprivate->tag == TAG_MPEG4_Script)
+		return gf_node_get_field_by_name_enum(node, name, field);
 #ifndef GPAC_DISABLE_X3D
-	 || (node->sgprivate->tag == TAG_X3D_Script)
-#endif
-	 ) {
+	else if (node->sgprivate->tag == TAG_X3D_Script)
 		return gf_node_get_field_by_name_enum(node, name, field);
-	}
+#endif
 	else if (node->sgprivate->tag <= GF_NODE_RANGE_LAST_MPEG4) res = gf_sg_mpeg4_node_get_field_index_by_name(node, name);
 #ifndef GPAC_DISABLE_X3D
 	else if (node->sgprivate->tag <= GF_NODE_RANGE_LAST_X3D) res = gf_sg_x3d_node_get_field_index_by_name(node, name);

v0.5.2.tar.gz/src/scenegraph/commands.c -> v0.6.1.tar.gz/src/scenegraph/commands.c Changed

v0.5.2.tar.gz/src/scenegraph/dom_smjs.c -> v0.6.1.tar.gz/src/scenegraph/dom_smjs.c Changed

@@ -2572,7 +2572,7 @@
 		*vp = INT_TO_JSVAL(evt->error_state);
 		return JS_TRUE;
 	case EVENT_JSPROPERTY_DYNAMIC_SCENE:
-		*vp = INT_TO_JSVAL(evt->key_flags ? 1 : 0);
+		*vp = INT_TO_JSVAL(evt->key_flags);
 		return JS_TRUE;
 	case EVENT_JSPROPERTY_URL:
 		s = JS_NewStringCopyZ(c, evt->addon_url ? evt->addon_url : "");
@@ -2945,8 +2945,10 @@
 
 static void xml_http_state_change(XMLHTTPContext *ctx)
 {
+#ifndef GPAC_DISABLE_VRML
 	GF_SceneGraph *scene;
 	GF_Node *n;
+#endif
 	jsval rval;
 
 	gf_sg_lock_javascript(ctx->c, GF_TRUE);
@@ -3299,11 +3301,11 @@
 	FILE *responseFile;
 
 	/*opera-style local host*/
-	if (!strnicmp(ctx->url, "file://localhost", 16)) responseFile = gf_f64_open(ctx->url+16, "rb");
+	if (!strnicmp(ctx->url, "file://localhost", 16)) responseFile = gf_fopen(ctx->url+16, "rb");
 	/*regular-style local host*/
-	else if (!strnicmp(ctx->url, "file://", 7)) responseFile = gf_f64_open(ctx->url+7, "rb");
+	else if (!strnicmp(ctx->url, "file://", 7)) responseFile = gf_fopen(ctx->url+7, "rb");
 	/* other types: e.g. "C:\" */
-	else responseFile = gf_f64_open(ctx->url, "rb");
+	else responseFile = gf_fopen(ctx->url, "rb");
 
 	if (!responseFile) {
 		ctx->html_status = 404;
@@ -3320,13 +3322,15 @@
 	par.msg_type = GF_NETIO_WAIT_FOR_REPLY;
 	xml_http_on_data(ctx, &par);
 
-	gf_f64_seek(responseFile, 0, SEEK_END);
-	fsize = gf_f64_tell(responseFile);
-	gf_f64_seek(responseFile, 0, SEEK_SET);
+	gf_fseek(responseFile, 0, SEEK_END);
+	fsize = gf_ftell(responseFile);
+	gf_fseek(responseFile, 0, SEEK_SET);
+
+	ctx->html_status = 200;
 
 	ctx->data = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
 	fsize = fread(ctx->data, sizeof(char), (size_t)fsize, responseFile);
-	fclose(responseFile);
+	gf_fclose(responseFile);
 	ctx->data[fsize] = 0;
 	ctx->size = (u32)fsize;
 
@@ -3401,9 +3405,10 @@
 	SMJS_FREE(c, data);
 
 	if (!strncmp(ctx->url, "http://", 7)) {
-		u32 flags;
+		u32 flags = GF_NETIO_SESSION_NOTIFY_DATA;
+		if (!ctx->async)
+			flags |= GF_NETIO_SESSION_NOT_THREADED;
 
-		flags = ctx->async ? 0 : GF_NETIO_SESSION_NOT_THREADED;
 		if (ctx->cache != XHR_CACHETYPE_NORMAL) {
 			if (ctx->cache == XHR_CACHETYPE_NONE) {
 				flags |= GF_NETIO_SESSION_NOT_CACHED;

v0.5.2.tar.gz/src/scenegraph/svg_attributes.c -> v0.6.1.tar.gz/src/scenegraph/svg_attributes.c Changed

v0.5.2.tar.gz/src/scenegraph/svg_smjs.c -> v0.6.1.tar.gz/src/scenegraph/svg_smjs.c Changed

v0.5.2.tar.gz/src/scenegraph/svg_types.c -> v0.6.1.tar.gz/src/scenegraph/svg_types.c Changed

v0.5.2.tar.gz/src/scenegraph/vrml_proto.c -> v0.6.1.tar.gz/src/scenegraph/vrml_proto.c Changed

@@ -405,12 +405,10 @@
 	count = gf_node_get_field_count(orig);
 
 	is_script = 0;
-	if ((orig->sgprivate->tag==TAG_MPEG4_Script)
+	if (orig->sgprivate->tag==TAG_MPEG4_Script) is_script = 1;
 #ifndef GPAC_DISABLE_X3D
-	        || (orig->sgprivate->tag==TAG_X3D_Script)
+	else if (orig->sgprivate->tag==TAG_X3D_Script) is_script = 1;
 #endif
-	   )
-		is_script = 1;
 
 	if (is_script) gf_sg_script_prepare_clone(node, orig);
 
@@ -574,7 +572,7 @@
 		if (!extern_lib) return;
 
 		/*this is an hardcoded proto - all routes, node modifications and co are handled internally*/
-		if (extern_lib == GF_SG_INTERNAL_PROTO) {
+		if (PTR_TO_U_CAST extern_lib == GF_SG_INTERNAL_PROTO) {
 			proto_node->sgprivate->flags |= GF_SG_NODE_DIRTY;
 			// take default values
 			count = gf_list_count(owner->proto_fields);
@@ -692,12 +690,12 @@
 			if ((route->ToField.eventType == GF_SG_EVENT_IN) && (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
 		}
 
-		if ((route->ToNode->sgprivate->tag==TAG_MPEG4_Script)
+		if (route->ToNode->sgprivate->tag==TAG_MPEG4_Script)
+			gf_sg_route_activate(route);
 #ifndef GPAC_DISABLE_X3D
-		        || (route->ToNode->sgprivate->tag==TAG_X3D_Script)
-#endif
-		   )
+		else if (route->ToNode->sgprivate->tag==TAG_X3D_Script)
 			gf_sg_route_activate(route);
+#endif
 	}
 
 #if 0

v0.5.2.tar.gz/src/scenegraph/vrml_route.c -> v0.6.1.tar.gz/src/scenegraph/vrml_route.c Changed

@@ -349,6 +349,11 @@
 		break;
 	}
 
+	//don't notify dest change for generic function since the dest is not a node
+	if (r->ToField.fieldType==GF_SG_VRML_GENERIC_FUNCTION) {
+		ret = 0;
+	}
+
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_INTERACT, GF_LOG_DEBUG)) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[VRML Route] field copy/casted\n"));
@@ -450,5 +455,47 @@
 	}
 }
 
+typedef struct
+{
+	GF_Route r;
+	void ( *route_callback) (void *param, GF_FieldInfo *from_field);
+} GF_RouteToFunction;
+
+static void on_route_to_function(GF_Node *node, GF_Route *r)
+{
+	GF_RouteToFunction *rf = (GF_RouteToFunction *)r;
+	rf->route_callback(r->ToNode, &r->FromField);
+}
+
+GF_EXPORT
+void gf_sg_route_new_to_callback(GF_SceneGraph *sg, GF_Node *fromNode, u32 fromField, void *cbk, void ( *route_callback) (void *param, GF_FieldInfo *from_field) )
+{
+	GF_Route *r;
+	GF_RouteToFunction *rf;
+	GF_SAFEALLOC(rf, GF_RouteToFunction);
+	if (!rf) return;
+	rf->route_callback = route_callback;
+
+	r = (GF_Route *)rf;
+	r->FromNode = fromNode;
+	r->FromField.fieldIndex = fromField;
+	gf_node_get_field(r->FromNode, fromField, &r->FromField);
+
+	r->ToNode = (GF_Node *) cbk;
+	r->ToField.fieldType = GF_SG_VRML_GENERIC_FUNCTION;
+	r->ToField.on_event_in = on_route_to_function;
+	r->ToField.eventType = GF_SG_EVENT_IN;
+	r->ToField.far_ptr = NULL;
+
+	r->is_setup = 1;
+	r->graph = sg;
+
+	if (!fromNode->sgprivate->interact) GF_SAFEALLOC(fromNode->sgprivate->interact, struct _node_interactive_ext);
+	if (!fromNode->sgprivate->interact->routes) fromNode->sgprivate->interact->routes = gf_list_new();
+	gf_list_add(fromNode->sgprivate->interact->routes, r);
+	gf_list_add(fromNode->sgprivate->scenegraph->Routes, r);
+}
+
+
 #endif	/*GPAC_DISABLE_VRML*/

v0.5.2.tar.gz/src/scenegraph/vrml_smjs.c -> v0.6.1.tar.gz/src/scenegraph/vrml_smjs.c Changed

@@ -145,7 +145,7 @@
 
 	JSObject *obj;
 	jsval fun;
-} GF_RouteToFunction;
+} GF_RouteToScript;
 
 
 #define _ScriptMessage(_c, _msg) {	\
@@ -439,12 +439,6 @@
 GF_Node *dom_get_element(JSContext *c, JSObject *obj);
 #endif
 
-#ifndef GPAC_DISABLE_VRML
-
-/*MPEG4 & X3D tags (for node tables & script handling)*/
-#include <gpac/nodes_mpeg4.h>
-#include <gpac/nodes_x3d.h>
-
 
 JSBool gf_sg_script_to_node_field(struct JSContext *c, jsval v, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent);
 jsval gf_sg_script_to_smjs_field(GF_ScriptPriv *priv, GF_FieldInfo *field, GF_Node *parent, Bool force_evaluate);
@@ -477,6 +471,12 @@
 }
 
 
+#ifndef GPAC_DISABLE_VRML
+
+/*MPEG4 & X3D tags (for node tables & script handling)*/
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/nodes_x3d.h>
+
 void SFColor_fromHSV(SFColor *col)
 {
 	Fixed f, q, t, p, hue, sat, val;
@@ -578,17 +578,36 @@
 
 static void script_error(JSContext *c, const char *msg, JSErrorReport *jserr)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d (%s)", msg, jserr->lineno, jserr->linebuf));
+	if (jserr->linebuf) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d (%s) - file %s\n", msg, jserr->lineno, jserr->linebuf, jserr->filename));
+	} else if (jserr->filename) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d - file %s\n", msg, jserr->lineno, jserr->filename));
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d\n", msg, jserr->lineno));
+	}
 }
 
 static JSBool SMJS_FUNCTION(JSPrint)
 {
 	SMJS_ARGS
+	if (!argc) return JS_FALSE;
+
 	if (JSVAL_IS_STRING(argv[0])) {
 		char *str = SMJS_CHARS(c, argv[0]);
 		_ScriptMessage(c, str);
 		SMJS_FREE(c, str);
 	}
+	if (JSVAL_IS_INT(argv[0]) && (argc>1) && JSVAL_IS_STRING(argv[1]) ) {
+		u32 level = JSVAL_TO_INT(argv[0]);
+		char *str = SMJS_CHARS(c, argv[1]);
+		if (level > GF_LOG_DEBUG) level = GF_LOG_DEBUG;
+		if (str[0] == '[') {
+			GF_LOG(level, GF_LOG_CONSOLE, ("%s\n", str));
+		} else {
+			GF_LOG(level, GF_LOG_CONSOLE, ("[JS] %s\n", str));
+		}
+		SMJS_FREE(c, str);
+	}
 	return JS_TRUE;
 }
 
@@ -797,18 +816,18 @@
 	GF_FieldInfo t_info;
 	GF_ScriptPriv *priv;
 	JSObject *obj;
-	GF_RouteToFunction *r = (GF_RouteToFunction *)_r;
+	GF_RouteToScript *r = (GF_RouteToScript *)_r;
 	if (!node) return;
 	priv = gf_node_get_private(node);
 	if (!priv) return;
 
 	if (!r->FromNode) {
 		if (r->obj) {
-//			gf_js_remove_root(priv->js_ctx, &r->obj);
+//			gf_js_remove_root(priv->js_ctx, &r->obj, GF_JSGC_OBJECT);
 			r->obj=NULL;
 		}
 		if ( ! JSVAL_IS_VOID(r->fun)) {
-//			gf_js_remove_root(priv->js_ctx, &r->fun);
+//			gf_js_remove_root(priv->js_ctx, &r->fun, GF_JSGC_OBJECT);
 			r->fun=JSVAL_NULL;
 		}
 		return;
@@ -923,12 +942,12 @@
 	else {
 		u32 i = 0;
 		const char *fun_name;
-		GF_RouteToFunction *r = NULL;
+		GF_RouteToScript *r = NULL;
 		if (!JSVAL_IS_OBJECT(argv[3]) || !JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[3])) ) return JS_FALSE;
 
 		fun_name = JS_GetFunctionName( JS_ValueToFunction(c, argv[3] ) );
 		if (fun_name && n1->sgprivate->interact && n1->sgprivate->interact->routes ) {
-			while ( (r = (GF_RouteToFunction*)gf_list_enum(n1->sgprivate->interact->routes, &i) )) {
+			while ( (r = (GF_RouteToScript*)gf_list_enum(n1->sgprivate->interact->routes, &i) )) {
 				if ( (r->FromNode == n1)
 				 && (r->FromField.fieldIndex == f_id1)
 				 && (r->ToNode == (GF_Node*)JS_GetScript(c))
@@ -939,7 +958,7 @@
 		}
 
 		if ( !r ) {
-			GF_SAFEALLOC(r, GF_RouteToFunction)
+			GF_SAFEALLOC(r, GF_RouteToScript)
 			if (!r) return JS_FALSE;
 			r->FromNode = n1;
 			r->FromField.fieldIndex = f_id1;
@@ -953,10 +972,10 @@
 			r->ToField.name = fun_name;
 
 			r->obj = JSVAL_TO_OBJECT( argv[2] ) ;
-			//		gf_js_add_root(c, & r->obj);
+//			gf_js_add_root(c, & r->obj, GF_JSGC_OBJECT);
 
 			r->fun = argv[3];
-			//		gf_js_add_root(c, &r->fun);
+//			gf_js_add_root(c, &r->fun, GF_JSGC_OBJECT);
 
 			r->is_setup = 1;
 			r->graph = n1->sgprivate->scenegraph;
@@ -1149,58 +1168,6 @@
 #endif
 }
 
-static JSBool SMJS_FUNCTION(getOption)
-{
-	JSString *s;
-	GF_JSAPIParam par;
-	GF_Node *sc_node = JS_GetContextPrivate(c);
-	Bool res;
-	SMJS_ARGS
-	if (argc < 2) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1])) return JS_FALSE;
-
-	par.gpac_cfg.section = SMJS_CHARS(c, argv[0]);
-	par.gpac_cfg.key = SMJS_CHARS(c, argv[1]);
-	par.gpac_cfg.key_val = NULL;
-
-	res = ScriptAction(c, NULL, GF_JSAPI_OP_GET_OPT, sc_node->sgprivate->scenegraph->RootNode, &par);
-	SMJS_FREE(c, (char *)par.gpac_cfg.section);
-	SMJS_FREE(c, (char *)par.gpac_cfg.key);
-	if (!res) return JS_FALSE;
-
-	s = JS_NewStringCopyZ(c, par.gpac_cfg.key_val ? (const char *)par.gpac_cfg.key_val : "");
-	if (!s) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(setOption)
-{
-	GF_JSAPIParam par;
-	GF_Node *sc_node = JS_GetContextPrivate(c);
-	Bool res;
-	SMJS_ARGS
-	if (argc < 3) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[2])) return JS_FALSE;
-
-	par.gpac_cfg.section = SMJS_CHARS(c, argv[0]);
-	par.gpac_cfg.key = SMJS_CHARS(c, argv[1]);
-	par.gpac_cfg.key_val = SMJS_CHARS(c, argv[2]);
-
-	res = ScriptAction(c, NULL, GF_JSAPI_OP_SET_OPT, sc_node->sgprivate->scenegraph->RootNode, &par);
-	SMJS_FREE(c, (char *)par.gpac_cfg.section);
-	SMJS_FREE(c, (char *)par.gpac_cfg.key);
-	SMJS_FREE(c, (char *)par.gpac_cfg.key_val);
-
-	if (!res) return JS_FALSE;
-	return JS_TRUE;
-}
-
 void gf_node_event_out_proto(GF_Node *node, u32 FieldIndex);
 
 void Script_FieldChanged(JSContext *c, GF_Node *parent, GF_JSField *parent_owner, GF_FieldInfo *field)
@@ -1372,8 +1339,7 @@
 
 		/*if ptr is a field, remove field binding from parent*/
 		if (ptr->owner && ptr->owner->sgprivate->interact && ptr->owner->sgprivate->interact->js_binding) {
-			int res = gf_list_del_item(ptr->owner->sgprivate->interact->js_binding->fields, ptr);
-			assert(res>=0);
+			gf_list_del_item(ptr->owner->sgprivate->interact->js_binding->fields, ptr);
 		}
 
 
@@ -1583,7 +1549,8 @@
 GF_JSField *ptr;
 GF_ScriptPriv *priv;
 
-if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
+if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) )
+	return JS_FALSE;
 ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
 assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 n = * ((GF_Node **)ptr->field.far_ptr);
@@ -3392,8 +3359,6 @@
 			SMJS_FUNCTION_SPEC("createVrmlFromString", createVrmlFromString, 1),
 			SMJS_FUNCTION_SPEC("setDescription", setDescription, 1),
 			SMJS_FUNCTION_SPEC("print", JSPrint, 1),
-			SMJS_FUNCTION_SPEC("getOption", getOption, 2),
-			SMJS_FUNCTION_SPEC("setOption", setOption, 3),
 			SMJS_FUNCTION_SPEC("getScript", getScript, 0),
 			SMJS_FUNCTION_SPEC("getProto", getProto, 0),
 			SMJS_FUNCTION_SPEC("loadScript", loadScript, 1),
@@ -4438,7 +4403,7 @@
 
 	gf_sg_lock_javascript(priv->js_ctx, 1);
 
-	if (priv->event) gf_js_remove_root(priv->js_ctx, &priv->event, GF_JSGC_OBJECT);
+	if (priv->the_event) gf_js_remove_root(priv->js_ctx, &priv->the_event, GF_JSGC_OBJECT);
 
 	/*unprotect all cached objects from GC*/
 	JS_ReleaseRootObjects(priv);
@@ -4597,19 +4562,19 @@
 	uintN attr;
 	JSBool found;
 
-	jsf = gf_f64_open(file, "rb");
+	jsf = gf_fopen(file, "rb");
 	if (!jsf) return 0;
 
-	gf_f64_seek(jsf, 0, SEEK_END);
-	fsize = gf_f64_tell(jsf);
-	gf_f64_seek(jsf, 0, SEEK_SET);
+	gf_fseek(jsf, 0, SEEK_END);
+	fsize = gf_ftell(jsf);
+	gf_fseek(jsf, 0, SEEK_SET);
 	jsscript = gf_malloc(sizeof(char)*(size_t)(fsize+1));
 	fsize = fread(jsscript, sizeof(char), (size_t)fsize, jsf);
-	fclose(jsf);
+	gf_fclose(jsf);
 	jsscript[fsize] = 0;
 
 	*rval = JSVAL_NULL;
-	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, (u32) (sizeof(char)*fsize), 0, 0, rval);
+	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, (u32) (sizeof(char)*fsize), file, 0, rval);
 	if (ret==JS_FALSE) success = 0;
 
 	if (success && primary_script
@@ -4740,8 +4705,8 @@
 	/*initialize DOM*/
 	dom_js_load(node->sgprivate->scenegraph, priv->js_ctx, priv->js_obj);
 	/*create event object, and remember it*/
-	priv->event = dom_js_define_event(priv->js_ctx, priv->js_obj);
-	gf_js_add_root(priv->js_ctx, &priv->event, GF_JSGC_OBJECT);
+	priv->the_event = dom_js_define_event(priv->js_ctx, priv->js_obj);
+	gf_js_add_root(priv->js_ctx, &priv->the_event, GF_JSGC_OBJECT);
 #endif
 
 	gf_sg_load_script_extensions(node->sgprivate->scenegraph, priv->js_ctx, priv->js_obj, 0);
@@ -4948,12 +4913,14 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[DOM Events] Executing script code from VRML handler\n"));
 
 	priv = JS_GetScriptStack(hdl->js_context);
-	prev_event = SMJS_GET_PRIVATE(priv->js_ctx, priv->event);
+	gf_sg_lock_javascript(priv->js_ctx, 1);
+
+	prev_event = SMJS_GET_PRIVATE(priv->js_ctx, priv->the_event);
 	/*break loops*/
-	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target))
+	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target)) {
+		gf_sg_lock_javascript(priv->js_ctx, 0);
 		return;
-
-	gf_sg_lock_javascript(priv->js_ctx, 1);
+	}
 
 	evt = gf_dom_new_event(priv->js_ctx);
 	if (!evt) {
@@ -4964,8 +4931,7 @@
 
 	prev_type = event->is_vrml;
 	event->is_vrml = 1;
-	SMJS_SET_PRIVATE(priv->js_ctx, priv->event, event);
-
+	SMJS_SET_PRIVATE(priv->js_ctx, priv->the_event, event);
 
 	SMJS_SET_PRIVATE(priv->js_ctx, evt, event);
 	argv[0] = OBJECT_TO_JSVAL(evt);
@@ -4984,7 +4950,7 @@
 	}
 
 	event->is_vrml = prev_type;
-	SMJS_SET_PRIVATE(priv->js_ctx, priv->event, prev_event);
+	SMJS_SET_PRIVATE(priv->js_ctx, priv->the_event, prev_event);
 
 	gf_sg_lock_javascript(priv->js_ctx, 0);
 
@@ -5112,7 +5078,7 @@
 
 GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com)
 {
-#ifdef GPAC_HAS_SPIDERMONKEY
+#if defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG)
 	u32 tag;
 	GF_Err e;
 	GF_Node *root = gf_sg_get_root_node(sg);

v0.5.2.tar.gz/src/scenegraph/vrml_tools.c -> v0.6.1.tar.gz/src/scenegraph/vrml_tools.c Changed

v0.5.2.tar.gz/src/scenegraph/webvtt_smjs.c -> v0.6.1.tar.gz/src/scenegraph/webvtt_smjs.c Changed

v0.5.2.tar.gz/src/scenegraph/xml_ns.c -> v0.6.1.tar.gz/src/scenegraph/xml_ns.c Changed

@@ -672,7 +672,6 @@
 	return GF_XMLNS_UNDEFINED;
 }
 
-
 u32 gf_node_get_attribute_count(GF_Node *node)
 {
 	u32 count = 0;
@@ -1036,28 +1035,28 @@
 
 	sprintf(szFile, "%s%04X%s", base_file, idx, ext);
 
-	f = gf_f64_open(szFile, "rb");
+	f = gf_fopen(szFile, "rb");
 	if (!f) return 0;
 
-	gf_f64_seek(f, 0, SEEK_END);
-	fsize = gf_f64_tell(f);
+	gf_fseek(f, 0, SEEK_END);
+	fsize = gf_ftell(f);
 	if (fsize==data_size) {
 		u32 offset=0;
 		char cache[1024];
-		gf_f64_seek(f, 0, SEEK_SET);
+		gf_fseek(f, 0, SEEK_SET);
 		while (fsize) {
 			u32 read = (u32) fread(cache, 1, 1024, f);
 			fsize -= read;
 			if (memcmp(cache, data+offset, sizeof(char)*read)) break;
 			offset+=read;
 		}
-		fclose(f);
+		gf_fclose(f);
 		f = NULL;
 		/*same file*/
 		if (!fsize) return 2;
 	}
 	if (f)
-		fclose(f);
+		gf_fclose(f);
 	return 1;
 }
 
@@ -1136,7 +1135,7 @@
 	strcat(szFile, ext);
 
 	if (!existing) {
-		f = gf_f64_open(szFile, "wb");
+		f = gf_fopen(szFile, "wb");
 		if (!f) {
 			gf_free(data);
 			gf_free(iri->string);
@@ -1144,7 +1143,7 @@
 			return GF_IO_ERR;
 		}
 		gf_fwrite(data, data_size, 1, f);
-		fclose(f);
+		gf_fclose(f);
 	}
 	gf_free(data);
 	gf_free(iri->string);

v0.5.2.tar.gz/src/terminal/channel.c -> v0.6.1.tar.gz/src/terminal/channel.c Changed

@@ -36,7 +36,7 @@
 {
 	/*just in case*/
 	if (ch->BufferOn) {
-		ch->BufferOn = 0;
+		ch->BufferOn = GF_FALSE;
 		gf_clock_buffer_off(ch->clock);
 		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) : buffering off at STB %d (OTB %d) (nb buffering on clock: %d)\n", ch->esd->ESID, ch->odm->net_service->url, gf_term_get_time(ch->odm->term), gf_clock_time(ch->clock), ch->clock->Buffering));
 		//if one of the stream is done buffering, force data timeout for the clock to be the buffer time
@@ -71,6 +71,7 @@
 	ch->pck_sn = 0;
 	ch->stream_state = 1;
 	ch->IsRap = 0;
+	ch->SeekFlag = 0;
 	ch->IsEndOfStream = 0;
 	ch->skip_carousel_au = 0;
 
@@ -198,6 +199,8 @@
 {
 	/*if the clock is not in the same namespace (used with dynamic scenes), it's not ours*/
 	if (gf_list_find(ch->odm->net_service->Clocks, ch->clock)<0) return 0;
+	/*It occurs in TS stream when PCR is provided in a dedicated stream. Suppose that the channel owns a clock*/
+	if (ch->clock->ocr_on_esid == ch->esd->ESID) return 1;
 	return (ch->esd->ESID==ch->clock->clockID) ? 1 : 0;
 }
 
@@ -298,14 +301,16 @@
 
 }
 
-void gf_es_reset_timing(GF_Channel *ch)
+void gf_es_reset_timing(GF_Channel *ch, Bool reset_buffer)
 {
 	struct _decoding_buffer *au = ch->AU_buffer_first;
 	gf_mx_p(ch->mx);
 
-	if (ch->buffer) gf_free(ch->buffer);
-	ch->buffer = NULL;
-	ch->len = ch->allocSize = 0;
+	if (reset_buffer) {
+		if (ch->buffer) gf_free(ch->buffer);
+		ch->buffer = NULL;
+		ch->len = ch->allocSize = 0;
+	}
 
 	while (au) {
 		au->CTS = au->DTS = 0;
@@ -338,8 +343,6 @@
 		/*data timeout (no data sent)*/
 		if (now > ch->last_au_time + ch->clock->data_timeout) {
 			gf_term_message(ch->odm->term, ch->service->url, "Data timeout - aborting buffering", GF_OK);
-			ch->MinBuffer = ch->MaxBuffer = 0;
-			ch->au_duration = 0;
 			gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
 			return 0;
 		} else {
@@ -376,16 +379,21 @@
 
 void gf_es_update_buffering(GF_Channel *ch, Bool update_info)
 {
-	if (update_info && ch->MaxBuffer) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
+	if (update_info) {
+		if (ch->MaxBuffer) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
 
-	gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-	gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_TIME_UPDATE);
+		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
+		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_TIME_UPDATE);
+	}
 
 	if (!gf_es_needs_buffering(ch, 0)) {
 		gf_es_buffer_off(ch);
-		if (ch->MaxBuffer && update_info) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
 
-		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PLAYING);
+		if (update_info) {
+			if (ch->MaxBuffer && update_info) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
+
+			gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PLAYING);
+		}
 	}
 }
 
@@ -464,6 +472,8 @@
 	au->CTS = ch->CTS;
 	au->DTS = ch->DTS;
 	if (ch->IsRap) au->flags |= GF_DB_AU_RAP;
+	if (ch->SeekFlag) au->flags |= GF_DB_AU_IS_SEEK;
+
 	if (ch->CTS_past_offset) {
 		au->CTS = ch->CTS_past_offset;
 		au->flags |= GF_DB_AU_CTS_IN_PAST;
@@ -477,8 +487,10 @@
 	au->dataLength = ch->len;
 	au->PaddingBits = ch->padingBits;
 	au->sender_ntp = ch->sender_ntp;
+	ch->sender_ntp = 0;
 
 	ch->IsRap = 0;
+	ch->SeekFlag = 0;
 	ch->padingBits = 0;
 	au->next = NULL;
 	ch->buffer = NULL;
@@ -493,8 +505,15 @@
 	gf_es_lock(ch, 1);
 
 
-	if (0 && ch->AU_Count>10000) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, too many AUs in decoding channel (%d) - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->AU_Count));
+	if( (ch->MaxBuffer && (ch->BufferTime > (s32) ( 100*ch->MaxBuffer)) )
+	 || (ch->AU_Count>10000)
+	 ) {
+		if (ch->AU_Count>10000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, too many AUs (%d) in decoding buffer - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->AU_Count));
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, decoding buffer exceeded (%d ms vs %d max) - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->BufferTime, ch->MaxBuffer));
+
+		}
 		gf_db_unit_del(ch->AU_buffer_first->next);
 		ch->AU_buffer_first->next = NULL;
 		ch->AU_buffer_last = ch->AU_buffer_first;
@@ -652,7 +671,7 @@
 	ch->au_duration = 0;
 	if (duration) ch->au_duration = (u32) ((u64)1000 * duration / ch->ts_res);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) - Dispatch AU DTS %d - CTS %d - RAP %d - size %d time %d Buffer %d Nb AUs %d - First AU relative timing %d\n", ch->esd->ESID, ch->odm->net_service->url, au->DTS, au->CTS, au->flags&1, au->dataLength, gf_clock_real_time(ch->clock), ch->BufferTime, ch->AU_Count, ch->AU_buffer_first ? ch->AU_buffer_first->DTS - gf_clock_time(ch->clock) : 0 ));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) - Dispatch AU DTS %d - CTS %d - RAP %d - Seek %d - size %d time %d Buffer %d Nb AUs %d - First AU relative timing %d\n", ch->esd->ESID, ch->odm->net_service->url, au->DTS, au->CTS, au->flags & GF_DB_AU_RAP, (au->flags & GF_DB_AU_IS_SEEK) ? 1 :0, au->dataLength, gf_clock_real_time(ch->clock), ch->BufferTime, ch->AU_Count, ch->AU_buffer_first ? ch->AU_buffer_first->DTS - gf_clock_time(ch->clock) : 0 ));
 
 	/*little optimisation: if direct dispatching is possible, try to decode the AU
 	we must lock the media scheduler to avoid deadlocks with other codecs accessing the scene or
@@ -700,6 +719,8 @@
 		}
 	}
 
+	gf_es_lock(ch, 0);
+
 	time = gf_term_get_time(ch->odm->term);
 	if (ch->BufferOn) {
 		ch->last_au_time = time;
@@ -711,8 +732,6 @@
 			ch->last_au_time = time;
 		}
 	}
-
-	gf_es_lock(ch, 0);
 }
 
 
@@ -910,6 +929,18 @@
 		hdr.OCRflag = 0;
 	}
 
+	if (ch->odm->parentscene && ch->odm->parentscene->root_od->addon)
+		hdr.OCRflag = 0;
+
+	if (hdr.OCRflag) {
+		if (!ch->clock->ocr_on_esid) {
+			ch->clock->ocr_on_esid = ch->esd->ESID;
+		} else if (ch->esd->ESID != ch->clock->ocr_on_esid) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] Receiving OCR from a different channel (ES%d vs previous ES%d)\n", ch->esd->ESID, ch->clock->ocr_on_esid ));
+		}
+
+	}
+
 	/*we ignore OCRs for the moment*/
 	if (hdr.OCRflag==1) {
 		if (!ch->IsClockInit) {
@@ -953,6 +984,7 @@
 			gf_es_receive_sl_packet(serv, ch, payload, payload_size, header, reception_status);
 			return;
 		} else {
+			Bool discontinuity = (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE;
 			u32 ck;
 			u32 OCR_TS;
 			s32 pcr_diff, pcr_pcrprev_diff;
@@ -967,13 +999,17 @@
 			pcr_diff = (s32) OCR_TS - (s32) ck;
 			pcr_pcrprev_diff = pcr_diff - ch->prev_pcr_diff;
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u got OCR %u (original TS "LLU") - diff %d%s (diff with prev OCR %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, pcr_diff, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "", pcr_pcrprev_diff));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u got OCR %u (original TS "LLU") - diff %d%s (diff with prev OCR %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, pcr_diff, discontinuity ? " - PCR Discontinuity flag" : "", pcr_pcrprev_diff));
 
 			//PCR loop or disc - use 10 sec as a threshold - it may happen that video is sent up to 4 or 5 seconds ahead of the PCR in some systems
 			//1- check the PCR diff is greater than 10 seconds
 			//2- check the diff between this PCR diff and last PCR diff is greater than 10 seconds
-			//the first test is used to avoid disc detecting when the TS is sent in burst (eg DASH): 
+			//the first test is used to avoid disc detecting when the TS is sent in burst (eg DASH):
 			if (ch->IsClockInit && (ABS(pcr_diff) > 10000) && (ABS(pcr_pcrprev_diff) > 10000) ) {
+				discontinuity = GF_TRUE;
+			}
+
+			if (discontinuity) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u detected PCR %s (PCR diff %d - last PCR diff %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), (hdr.m2ts_pcr==2) ? "discontinuity" : "looping", pcr_diff, ch->prev_pcr_diff));
 				gf_clock_discontinuity(ch->clock, ch->odm->parentscene, (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE);
 
@@ -1113,15 +1149,21 @@
 				}
 
 				if (ch->odm->parentscene && ch->odm->parentscene->root_od->addon) {
-					ch->DTS = (u32) gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene, ch->DTS, ch->odm->parentscene->root_od->addon);
-					ch->CTS = (u32) gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene, ch->CTS, ch->odm->parentscene->root_od->addon);
+					s64 res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->CTS);
+					if (res<0) return;
+					ch->CTS = (u32) res;
+
+					res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->DTS);
+					if (res<0) res=0;
+					ch->DTS = (u32) res;
+
 				}
 
 				if (ch->clock->probe_ocr && gf_es_owns_clock(ch)) {
 					s32 diff_ts = ch->DTS;
 					diff_ts -= ch->clock->init_time;
 					if (ABS(diff_ts) > 10000) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d: invalid clock reference detected - DTS %d but OCR %d - using DTS as OCR\n", ch->esd->ESID, ch->DTS, ch->clock->init_time));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: invalid clock reference detected - DTS %d but OCR %d - using DTS as OCR\n", ch->esd->ESID, ch->DTS, ch->clock->init_time));
 						gf_es_init_clock(ch, ch->DTS-1000);
 						ch->clock->broken_pcr = 1;
 					}
@@ -1272,6 +1314,7 @@
 
 	/*update the RAP marker on a packet base (to cope with AVC/H264 NALU->AU reconstruction)*/
 	if (hdr.randomAccessPointFlag) ch->IsRap = 1;
+	if (hdr.seekFlag) ch->SeekFlag = 1;
 
 	/*get AU end state*/
 	OldLength = ch->buffer ? ch->len : 0;
@@ -1281,7 +1324,6 @@
 
 	/*init clock if end of AU or if header is valid*/
 	if ((EndAU || init_ts) && !ch->IsClockInit && !ch->skip_time_check_for_pending) {
-		ch->skip_time_check_for_pending = 0;
 		gf_es_check_timing(ch);
 	}
 
@@ -1295,12 +1337,12 @@
 	}
 	if (!payload_size) return;
 
-	/*missed begining, unusable*/
+	/*missed beginning, unusable*/
 	if (!ch->buffer && !NewAU) {
 		if (ch->esd->slConfig->useAccessUnitStartFlag) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d: missed begin of AU\n", ch->esd->ESID));
 		}
-		if (ch->codec_resilient) NewAU = 1;
+		if (ch->codec_resilient) NewAU = GF_TRUE;
 		else return;
 	}
 
@@ -1347,7 +1389,7 @@
 				/*restart*/
 				if (evt.restart_requested) {
 					if (ch->odm->parentscene->is_dynamic_scene) {
-						gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0);
+						gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0, 0);
 					} else {
 						mediacontrol_restart(ch->odm);
 					}
@@ -1388,7 +1430,7 @@
 void gf_es_on_eos(GF_Channel *ch)
 {
 	if (!ch || ch->IsEndOfStream) return;
-	ch->IsEndOfStream = 1;
+	ch->IsEndOfStream = GF_TRUE;
 
 	/*flush buffer*/
 	gf_es_buffer_off(ch);
@@ -1513,7 +1555,7 @@
 					/*restart*/
 					if (evt.restart_requested) {
 						if (ch->odm->parentscene->is_dynamic_scene) {
-							gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0);
+							gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0, 0);
 						} else {
 							mediacontrol_restart(ch->odm);
 						}

v0.5.2.tar.gz/src/terminal/clock.c -> v0.6.1.tar.gz/src/terminal/clock.c Changed

@@ -33,7 +33,6 @@
 	tmp->mx = gf_mx_new("Clock");
 	tmp->term = term;
 	tmp->speed = FIX_ONE;
-	if (term->play_state) tmp->Paused = 1;
 	tmp->data_timeout = term->net_data_timeout;
 	return tmp;
 }
@@ -179,7 +178,6 @@
 		ck->drift = 0;
 		/*update starttime and pausetime even in pause mode*/
 		ck->PauseTime = ck->StartTime = gf_term_get_time(ck->term);
-		if (ck->term->play_state) ck->Paused ++;
 	}
 }
 
@@ -214,16 +212,25 @@
 	assert(ck);
 	if (!ck->clock_init) return ck->StartTime;
 	time = ck->Paused > 0 ? ck->PauseTime : gf_term_get_time(ck->term);
+
 #ifdef GPAC_FIXED_POINT
-	time = ck->discontinuity_time + ck->init_time + (time - ck->StartTime) * FIX2INT(100*ck->speed) / 100;
+
+	if ((ck->speed < 0) && ((s32) ck->init_time < FIX2INT( (-ck->speed * 100) * (time - ck->StartTime)) / 100 ) ) {
+		time = 0;
+	} else {
+		time = ck->discontinuity_time + ck->init_time + (time - ck->StartTime) * FIX2INT(100*ck->speed) / 100;
+	}
+
 #else
+
 	if ((ck->speed < 0) && ((s32) ck->init_time < (-ck->speed) * (time - ck->StartTime))) {
 		time = 0;
-	}
-	else {
+	} else {
 		time = ck->discontinuity_time + (u32) ( ck->init_time + ck->speed * (time - ck->StartTime) );
 	}
+
 #endif
+
 	return time;
 }
 
@@ -307,7 +314,7 @@
 	i=0;
 	while ((ch = (GF_Channel*)gf_list_enum(scene->root_od->channels, &i))) {
 		if (ch->clock == ck) {
-			gf_es_reset_timing(ch);
+			gf_es_reset_timing(ch, is_pcr_discontinuity);
 		}
 	}
 	j=0;
@@ -318,16 +325,19 @@
 		i=0;
 		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
 			if (ch->clock == ck) {
-				ch->IsClockInit = 0;
+				gf_es_reset_timing(ch, is_pcr_discontinuity);
+
+				ch->CTS = ch->DTS = 0;
 				GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] Reinitializing timing for ES%d\n", ch->esd->ESID));
 
 				if (ch->odm->codec && ch->odm->codec->CB)
 					gf_cm_reset_timing(ch->odm->codec->CB);
-
 			}
 		}
 	}
 
+	gf_scene_reset_addons(scene);
+
 	if (ck->has_media_time_shift) {
 		u32 new_media_time = ck->media_time_at_init + gf_clock_time(ck) - ck->init_time;

v0.5.2.tar.gz/src/terminal/decoder.c -> v0.6.1.tar.gz/src/terminal/decoder.c Changed

@@ -116,7 +116,8 @@
 	GF_CodecCapability cap;
 	u32 min, max;
 
-
+	if (ch && ch->odm && !ch->is_pulling && (ch->MaxBuffer <= ch->odm->term->low_latency_buffer_max))
+		codec->flags |= GF_ESM_CODEC_IS_LOW_LATENCY;
 
 	/*only for valid codecs (eg not OCR)*/
 	if (codec->decio) {
@@ -140,6 +141,7 @@
 		} else {
 			/*lock the channel before setup in case we are using direct_decode */
 			gf_mx_p(ch->mx);
+			ch->esd->service_url = ch->odm->net_service->url;
 			e = codec->decio->AttachStream(codec->decio, ch->esd);
 			gf_mx_v(ch->mx);
 		}
@@ -370,14 +372,14 @@
 	if (dec_time>codec->max_dec_time) codec->max_dec_time = (u32) dec_time;
 
 
-	if (DTS < codec->min_frame_dur + codec->last_unit_dts ) {
+	if (DTS - codec->last_unit_dts < codec->min_frame_dur) {
 		//might happen with some AVI with ffmpeg ...
 		if (DTS > codec->last_unit_dts)
 			codec->min_frame_dur = DTS - codec->last_unit_dts;
 	}
 
 	if (dataLength) {
-		if (!codec->cur_bit_size || (codec->stat_start > DTS)) {
+		if (!codec->cur_bit_size || (codec->ck->speed > 0 ? codec->stat_start > DTS : codec->stat_start < DTS)) {
 			codec->stat_start = DTS;
 			codec->cur_bit_size = 8*dataLength;
 		} else {
@@ -398,10 +400,10 @@
 	GF_DBUnit *AU;
 	GF_List *src_channels = codec->inChannels;
 	GF_ObjectManager *current_odm = codec->odm;
-	u32 count, curCTS, i, stream_state;
+	u32 count, curCTS, i, stream_state, now=0;
 	Bool scalable_check = 0;
 	s32 cts_diff;
-
+	Bool no_au_in_enhancement = GF_FALSE;
 	*nextAU = NULL;
 	*activeChannel = NULL;
 	curCTS = 0;
@@ -430,8 +432,8 @@
 			if (scalable_check==1) {
 				if (*nextAU && ((*nextAU)->flags & GF_DB_AU_REAGGREGATED)) {
 					scalable_check=2;
-				} else {
-					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Warning, No AU in enhancement layer for this AU\n"));
+				} else if (*nextAU) {
+					no_au_in_enhancement = GF_TRUE;
 				}
 			}
 			if (! (*activeChannel)) *activeChannel = ch;
@@ -453,10 +455,11 @@
 				//gf_es_drop_au(ch);
 				continue;
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %d (size %d) selected as first layer (CTS %d)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->dataLength, AU->CTS));
+			//GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %d (size %d) selected as first layer (CTS %d)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->dataLength, AU->CTS));
 			*nextAU = AU;
 			*activeChannel = ch;
 			curCTS = AU->CTS;
+			now = gf_clock_time(ch->clock);
 		}
 		//we allow for +/- 1ms drift due to timestamp rounding when converting to milliseconds units
 		else if (cts_diff<=1) {
@@ -477,6 +480,7 @@
 			ch->first_au_fetched = 1;
 			scalable_check = 2;
 			(*nextAU)->flags |= GF_DB_AU_REAGGREGATED;
+			no_au_in_enhancement = GF_FALSE;
 		}
 		//not the same TS for base and enhancement - either temporal scalability is used or we had a frame loss
 		else {
@@ -510,7 +514,7 @@
 				if ((AU->DTS <= codec->last_unit_dts)
 				 //we also prevent detecting temporal scalability until at least one frame from the base has been decoded
 				 || !codec->first_frame_processed) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d %s AU DTS %d but base DTS %d: loss detected - re-fetch channel\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, (*nextAU)->DTS));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d %s AU DTS %d but base DTS %d: frame too late - re-fetch channel\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, (*nextAU)->DTS));
 					gf_es_drop_au(ch);
 					//restore stream state in case we got a RAP this time but we discard the AU, we need to wait again for the next RAP with the right timing
 					ch->stream_state = stream_state;
@@ -536,7 +540,12 @@
 	//scalable addon, browse channels in scalable object
 	if (current_odm->upper_layer_odm) {
 		if (*nextAU) {
-			gf_scene_check_addon_restart(current_odm->upper_layer_odm->parentscene->root_od->addon, (*nextAU)->CTS, (*nextAU)->DTS);
+			if (gf_scene_check_addon_restart(current_odm->upper_layer_odm->parentscene->root_od->addon, (*nextAU)->CTS, (*nextAU)->DTS)) {
+				//due to some issues in openhevc we reset the decoder when we restart the scalable addon
+				GF_CodecCapability cap;
+				cap.CapCode = GF_CODEC_WAIT_RAP;
+				gf_codec_set_capability(codec, cap);
+			}
 		}
 		current_odm = current_odm->upper_layer_odm;
 		src_channels = current_odm->channels;
@@ -544,8 +553,15 @@
 		goto browse_scalable;
 	}
 
-	if (scalable_check==1) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Warning, could not find enhancement layer for this AU\n"));
+	if (*nextAU && no_au_in_enhancement ) {
+		//do we have time to wait for the enhancement to be filled ?
+		if (now < (*nextAU)->DTS) {
+			//GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] Enhancement layer not ready for this AU (DTS %d) at OTB %d- decoding postponed\n", codec->decio->module_name, (*nextAU)->DTS, now));
+			*nextAU = NULL;
+			*activeChannel = NULL;
+			return;
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] Warning: could not find enhancement layer for this AU (DTS %d) at OTB %d - decoding only base\n", codec->decio->module_name, (*nextAU)->DTS, now));
 	}
 
 	if (codec->is_reordering && *nextAU && codec->first_frame_dispatched) {
@@ -623,7 +639,7 @@
 	u32 obj_time, mm_level, au_time, cts;
 	u64 now;
 	GF_Scene *scene_locked;
-	Bool check_next_unit;
+	Bool check_next_unit = GF_FALSE;
 	GF_SceneDecoder *sdec = (GF_SceneDecoder *)codec->decio;
 	GF_Err e = GF_OK;
 
@@ -633,7 +649,8 @@
 	"frame dropping" is done by preventing the compositor from redrawing after an update and decoding following AU
 	so that the compositor is always woken up once all late systems AUs are decoded. This flag is overriden when
 	seeking*/
-	check_next_unit = (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) ? 1 : 0;
+	if ( (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) || (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) )
+		check_next_unit = GF_TRUE;
 
 check_unit:
 
@@ -707,7 +724,7 @@
 	else {
 		codec->last_unit_cts = AU->CTS;
 		/*we're droping the frame*/
-		if (scene_locked) codec->nb_droped ++;
+		if (scene_locked) codec->nb_dropped ++;
 		mm_level = GF_CODEC_LEVEL_NORMAL;
 	}
 
@@ -922,6 +939,17 @@
 		if (!dec->CB->Min) dec->CB->Min = 1;
 	}
 
+	//reset decoder stat
+	dec->total_dec_time = 0;
+	dec->nb_dec_frames = 0;
+	dec->first_frame_time = 0;
+	dec->last_frame_time = 0;
+	dec->total_iframes_time = 0;
+	dec->max_iframes_time = 0;
+	dec->max_dec_time = 0;
+	dec->min_frame_dur = (u32) - 1;
+	dec->codec_reset = GF_TRUE;
+
 	//reset bitrate compute
 	dec->cur_bit_size = 0;
 	dec->last_stat_start = 0;
@@ -944,6 +972,7 @@
 	u32 first, obj_time, unit_size;
 	GF_MediaDecoder *mdec = (GF_MediaDecoder*)codec->decio;
 	GF_Err e = GF_OK;
+	s32 cts_diff;
 	CU = NULL;
 
 	/*if video codec muted don't decode (try to saves ressources)
@@ -961,8 +990,10 @@
 
 	entryTime = gf_sys_clock_high_res();
 
-	if (!codec->odm->term->bench_mode && (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES))
-		drop_late_frames = 1;
+	if (!codec->odm->term->bench_mode) {
+		if ((codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) || (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY))
+			drop_late_frames = GF_TRUE;
+	}
 
 
 	/*fetch next AU in DTS order for this codec*/
@@ -1093,8 +1124,14 @@
 		/*set media processing level*/
 		ch->last_au_was_seek = 0;
 		mmlevel = GF_CODEC_LEVEL_NORMAL;
-		/*SEEK: if the last frame had the same TS, we are seeking. Ask the codec to drop*/
-		if (!ch->skip_sl && codec->last_unit_cts && (codec->last_unit_cts == AU->CTS) && !ch->esd->dependsOnESID) {
+
+		/*explicit seek*/
+		if (AU->flags & GF_DB_AU_IS_SEEK) {
+			mmlevel = GF_CODEC_LEVEL_SEEK;
+			ch->last_au_was_seek = 1;
+		}
+		/*implicit seek: if the last frame had the same TS, we are seeking. Ask the codec to drop*/
+		else if (!ch->skip_sl && codec->last_unit_cts && (codec->last_unit_cts == AU->CTS) && !ch->esd->dependsOnESID) {
 			mmlevel = GF_CODEC_LEVEL_SEEK;
 			ch->last_au_was_seek = 1;
 			/*object clock is paused by media control or terminal is paused: exact frame seek*/
@@ -1254,9 +1291,9 @@
 		case GF_PACKED_FRAMES:
 			/*in seek do dispatch output otherwise we will only see the I-frame preceding the seek point*/
 			if (mmlevel == GF_CODEC_LEVEL_DROP) {
-				if (drop_late_frames) {
+				if (drop_late_frames && (codec->CB->UnitCount>1) ) {
 					unit_size = 0;
-					codec->nb_droped++;
+					codec->nb_dropped++;
 				} else
 					ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
 			}
@@ -1350,11 +1387,13 @@
 		}
 #endif
 
-		/*store current CTS*/
+		/*store current CTS - we need to have exclusive access in case a PCR discontinuity remaps timestamps while we decode*/
+		gf_es_lock(ch, GF_TRUE);
 		cts = AU->CTS;
 		prev_ch = ch;
 
 		gf_es_drop_au(ch);
+		gf_es_lock(ch, GF_FALSE);
 		AU = NULL;
 
 		if (e) {
@@ -1374,11 +1413,11 @@
 		if (mmlevel >= GF_CODEC_LEVEL_DROP) {
 			if (drop_late_frames || (mmlevel == GF_CODEC_LEVEL_SEEK) ) {
 				unit_size = 0;
-				if (drop_late_frames) codec->nb_droped++;
+				if (drop_late_frames) codec->nb_dropped++;
 			} else
-				ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
+				prev_ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
 		} else {
-			ch->clock->last_TS_rendered = 0;
+			prev_ch->clock->last_TS_rendered = 0;
 		}
 
 
@@ -1391,7 +1430,19 @@
 			}
 		}
 
+		cts_diff = (s32) cts;
+		cts_diff -= (s32) CU->TS;
+		if (cts_diff < 0) cts_diff = -cts_diff;
+		//the decoder is dispathing CTS in the previous time base , override the timestamp ...
+		if (cts_diff > 20000 ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] decoded frame CTS %d but input frame CTS %d, lilely due to clock discontinuity\n", codec->decio->module_name, CU->TS, cts));
+			CU->TS = cts;
+		}
+
 		UnlockCompositionUnit(codec, CU, unit_size);
+		if (unit_size) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] at %d dispatched frame CTS %d in CB\n", codec->decio->module_name, gf_clock_real_time(prev_ch->clock), CU->TS));
+		}
 		if (!ch || !AU) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because no more input data\n", codec->decio->module_name));
 			return GF_OK;
@@ -1602,7 +1653,7 @@
 		codec->total_dec_time = 0;
 		codec->max_dec_time = 0;
 		codec->cur_audio_bytes = codec->cur_video_frames = 0;
-		codec->nb_droped = 0;
+		codec->nb_dropped = 0;
 		codec->nb_repeted_frames = 0;
 		codec->recomputed_cts = 0;
 		codec->first_frame_dispatched = 0;
@@ -1619,6 +1670,9 @@
 	switch (Status) {
 	case GF_ESM_CODEC_PLAY:
 		gf_cm_set_status(codec->CB, CB_PLAY);
+		if (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) {
+			gf_cm_abort_buffering(codec->CB);
+		}
 		return;
 	case GF_ESM_CODEC_PAUSE:
 		gf_cm_set_status(codec->CB, CB_PAUSE);
@@ -1738,7 +1792,7 @@
 					dec_confidence = conf;
 					dec_ifce = ifce;
 					ifce = NULL;
-					if (dec_confidence==GF_CODEC_SUPPORTED) {
+					if (dec_confidence>=GF_CODEC_MAYBE_SUPPORTED) {
 						codec->decio = dec_ifce;
 						return GF_OK;
 					}

v0.5.2.tar.gz/src/terminal/media_control.c -> v0.6.1.tar.gz/src/terminal/media_control.c Changed

@@ -1,3 +1,5 @@
+
+
 /*
 *			GPAC - Multimedia Framework C SDK
 *
@@ -65,7 +67,7 @@
 	scene_ck = gf_odm_get_media_clock(odm->parentscene->root_od);
 	if (gf_odm_shares_clock(odm, scene_ck)) {
 		if (odm->parentscene->is_dynamic_scene)
-			gf_scene_restart_dynamic(odm->parentscene, 0, 0);
+			gf_scene_restart_dynamic(odm->parentscene, 0, 0, 0);
 		return;
 	}
 
@@ -103,14 +105,13 @@
 	/*play on all ODs collected for restart*/
 	i=0;
 	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
-		gf_odm_start(ctrl_od, 0);
+		//we want to make sure restart is clled right away with the current media control settings
+		gf_odm_start(ctrl_od, 2);
 	}
 	gf_list_del(to_restart);
 }
 
 
-#ifndef GPAC_DISABLE_VRML
-
 Bool MC_URLChanged(MFURL *old_url, MFURL *new_url)
 {
 	u32 i;
@@ -157,8 +158,10 @@
 		if (!odm->subscene && !gf_odm_shares_clock(ctrl_od, ck))
 			continue;
 
-		if (resume_to_live && ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			gf_scene_select_main_addon(in_scene, ctrl_od, GF_FALSE);
+		if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			gf_clock_resume(ck);
+			if (resume_to_live)
+				gf_scene_select_main_addon(in_scene, ctrl_od, GF_FALSE, 0);
 		}
 
 		if (ctrl_od->subscene) {
@@ -182,7 +185,10 @@
 
 	/*otherwise locate all objects sharing the clock*/
 	ck = gf_odm_get_media_clock(odm);
-	if (!ck) return;
+	if (!ck) {
+		odm->flags |= GF_ODM_PAUSE_QUEUED;
+		return;
+	}
 
 	in_scene = odm->parentscene;
 	if (odm->subscene) {
@@ -199,7 +205,8 @@
 			continue;
 
 		if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE);
+			gf_clock_pause(ck);
+			gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE, gf_clock_time(ck) );
 		}
 
 		if (ctrl_od->subscene) {
@@ -212,7 +219,7 @@
 
 
 /*pause all objects*/
-void MC_SetSpeed(GF_ObjectManager *odm, Fixed speed)
+void mediacontrol_set_speed(GF_ObjectManager *odm, Fixed speed)
 {
 	u32 i;
 	GF_ObjectManager *ctrl_od;
@@ -228,18 +235,44 @@
 	in_scene = odm->parentscene;
 	if (odm->subscene) {
 		assert(odm->subscene->root_od==odm);
-//		assert( gf_odm_shares_clock(odm, ck) );
-		gf_odm_set_speed(odm, speed, GF_TRUE);
 		in_scene = odm->subscene;
+
+		//dynamic scene with speed direction, we need to re-start everything to issue new PLAY requests
+		if (in_scene->is_dynamic_scene && (gf_mulfix(ck->speed, speed) < 0)) {
+			u32 time = gf_clock_time(ck);
+			gf_clock_set_speed(ck, speed);
+
+			//enable main addon
+			if (speed<0) {
+				i=0;
+				while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
+					if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+						gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE, gf_clock_time(ck) );
+						break;
+					}
+				}
+			}
+			gf_scene_restart_dynamic(in_scene, time, 0, 1);
+			return;
+		}
+		gf_clock_set_speed(ck, speed);
+		gf_odm_set_speed(odm, speed, GF_TRUE);
 	}
 
 	i=0;
 	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
 		if (!gf_odm_shares_clock(ctrl_od, ck)) continue;
-		gf_odm_set_speed(ctrl_od, speed, GF_TRUE);
+
+		if (ctrl_od->subscene) {
+			mediacontrol_set_speed(ctrl_od, speed);
+		} else {
+			gf_odm_set_speed(ctrl_od, speed, GF_TRUE);
+		}
 	}
 }
 
+#ifndef GPAC_DISABLE_VRML
+
 void MC_GetRange(MediaControlStack *ctrl, Double *start_range, Double *end_range)
 {
 	u32 i;
@@ -423,7 +456,7 @@
 		stack->enabled = stack->control->enabled;
 		stack->media_start = stack->control->mediaStartTime;
 		if (stack->media_stop != stack->control->mediaStopTime) {
-			if (stack->control->mediaStopTime) need_restart = 1;
+			if (stack->control->mediaStopTime < 1000000000) need_restart = 1;
 			stack->media_stop = stack->control->mediaStopTime;
 		}
 		stack->is_init = 1;
@@ -455,7 +488,7 @@
 		/*else set speed*/
 		else if (stack->media_speed && stack->control->mediaSpeed) {
 			/*don't set speed if we have to restart the media ...*/
-			if (!shall_restart) MC_SetSpeed(odm, stack->control->mediaSpeed);
+			if (!shall_restart) mediacontrol_set_speed(odm, stack->control->mediaSpeed);
 			need_restart += shall_restart;
 		}
 		/*init state was paused*/

v0.5.2.tar.gz/src/terminal/media_control.h -> v0.6.1.tar.gz/src/terminal/media_control.h Changed

v0.5.2.tar.gz/src/terminal/media_manager.c -> v0.6.1.tar.gz/src/terminal/media_manager.c Changed

@@ -370,11 +370,11 @@
 		else left = term->frame_duration;
 
 		if (do_scene) {
-			u32 ms_until_next=0;
+			s32 ms_until_next=0;
 			u32 time_taken = gf_sys_clock();
 			gf_sc_draw_frame(term->compositor, 0, &ms_until_next);
 			time_taken = gf_sys_clock() - time_taken;
-			if (ms_until_next<term->frame_duration/2) {
+			if (ms_until_next< (s32) term->frame_duration/2) {
 				left = 0;
 			} else if (left>time_taken)
 				left -= time_taken;
@@ -432,7 +432,7 @@
 	return 0;
 }
 
-/*NOTE: when starting/stoping a decoder we only lock the decoder mutex, NOT the media manager. This
+/*NOTE: when starting/stopping a decoder we only lock the decoder mutex, NOT the media manager. This
 avoids deadlocking in case a system codec waits for the scene graph and the compositor requests
 a stop/start on a media*/
 void gf_term_start_codec(GF_Codec *codec, Bool is_resume)
@@ -514,8 +514,20 @@
 		}
 	}
 
-	/*set status directly and don't touch CB state*/
-	codec->Status = GF_ESM_CODEC_STOP;
+	/*for audio codec force CB to stop state to discard any pending AU. Not doing so would lead to a wrong estimation of the clock drift
+	when resuming the object*/
+	if (codec->type==GF_STREAM_AUDIO) {
+		gf_codec_set_status(codec, GF_ESM_CODEC_STOP);
+	}
+	//if video is in a dynamic scene, reset the CB if user stop (eg codec was not in EOS). Otherwise (bifs,svg) we may want to keep the last decoded image
+	else if ((codec->Status<GF_ESM_CODEC_EOS) && codec->odm && codec->odm->parentscene && codec->odm->parentscene->is_dynamic_scene && codec->CB && (codec->CB->Capacity>1)) {
+		gf_codec_set_status(codec, GF_ESM_CODEC_STOP);
+	}
+	/*otherwise set status directly and don't touch CB state*/
+	else {
+		codec->Status = GF_ESM_CODEC_STOP;
+	}
+
 	/*don't wait for end of thread since this can be triggered within the decoding thread*/
 	if (ce->flags & GF_MM_CE_RUNNING) {
 		ce->flags &= ~GF_MM_CE_RUNNING;
@@ -664,12 +676,11 @@
 	}
 
 	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD) {
-		u32 ms_until_next;
+		s32 ms_until_next;
 		gf_sc_draw_frame(term->compositor, 0, &ms_until_next);
-		if (ms_until_next<term->compositor->frame_duration/2) {
+		if (ms_until_next < (s32) term->compositor->frame_duration/2) {
 			time_taken=0;
 		}
-
 	}
 	time_taken = gf_sys_clock() - time_taken;
 	if (time_taken > term->compositor->frame_duration) {
@@ -708,6 +719,14 @@
 		if (!gf_sc_draw_frame(term->compositor, 1, NULL)) {
 			if (!term->root_scene || !term->root_scene->root_od)
 				break;
+
+			if (gf_list_count(term->media_queue) )
+				continue;
+
+			//wait for audio to be flushed
+			if (gf_sc_check_audio_pending(term->compositor) )
+				continue;
+
 			//force end of buffer
 			if (gf_scene_check_clocks(term->root_scene->root_od->net_service, term->root_scene, 1))
 				break;

v0.5.2.tar.gz/src/terminal/media_memory.c -> v0.6.1.tar.gz/src/terminal/media_memory.c Changed

@@ -44,16 +44,12 @@
 
 void gf_db_unit_del(GF_DBUnit *db)
 {
-	if (!db) return;
-	if (db->next) gf_db_unit_del(db->next);
-	db->next = NULL;
-	if (db->data) {
-		/* memset(db->data, 0, db->dataLength); */
-		gf_free(db->data);
-	}
-	db->dataLength = 0;
-	db->data = NULL;
-	gf_free(db);
+	while (db) {
+		GF_DBUnit *next = db->next;
+		if (db->data) gf_free(db->data);
+		gf_free(db);
+		db = next;
+	}
 }
 
 static GF_CMUnit *gf_cm_unit_new()
@@ -571,7 +567,7 @@
 }
 
 
-/*drop the output CU*/
+/*mark the output as reusable and init clock*/
 void gf_cm_output_kept(GF_CompositionMemory *cb)
 {
 	assert(cb->UnitCount);
@@ -588,10 +584,8 @@
 /*drop the output CU*/
 void gf_cm_drop_output(GF_CompositionMemory *cb)
 {
+	//check if clock has to be resumed
 	gf_cm_output_kept(cb);
-	if (cb->Status!=CB_PLAY) {
-		return;
-	}
 
 	/*WARNING: in RAW mode, we (for the moment) only have one unit - setting output->dataLength to 0 means the input is available
 	for the raw channel - we have to make sure the output is completely reseted before releasing the sema*/

v0.5.2.tar.gz/src/terminal/media_memory.h -> v0.6.1.tar.gz/src/terminal/media_memory.h Changed

v0.5.2.tar.gz/src/terminal/media_object.c -> v0.6.1.tar.gz/src/terminal/media_object.c Changed

@@ -32,6 +32,7 @@
 #include "media_memory.h"
 #include "media_control.h"
 #include <gpac/nodes_svg.h>
+#include <gpac/network.h>
 
 
 #ifndef GPAC_DISABLE_SVG
@@ -209,157 +210,175 @@
 	return mo;
 }
 
-
 GF_EXPORT
 Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped)
 {
-	GF_CodecCapability cap;
 	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return GF_FALSE;
 
-	if (width) {
-		cap.CapCode = GF_CODEC_WIDTH;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*width = cap.cap.valueInt;
-	}
-	if (height) {
-		cap.CapCode = GF_CODEC_HEIGHT;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*height = cap.cap.valueInt;
-	}
-	if (mo->type==GF_MEDIA_OBJECT_TEXT) return GF_TRUE;
+	if (width) *width = mo->width;
+	if (height) *height = mo->height;
+	if (stride) *stride = mo->stride;
+	if (pixel_ar) *pixel_ar = mo->pixel_ar;
+	if (pixelFormat) *pixelFormat = mo->pixelformat;
+	if (is_flipped) *is_flipped = mo->is_flipped;
+	return GF_TRUE;
+}
 
-	if (is_flipped) {
-		cap.CapCode = GF_CODEC_FLIP;
-		cap.cap.valueInt = 0;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*is_flipped = cap.cap.valueInt ? GF_TRUE : GF_FALSE;
-	}
+GF_EXPORT
+Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config)
+{
+	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
 
-	if (stride) {
-		cap.CapCode = GF_CODEC_STRIDE;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*stride = cap.cap.valueInt;
-	}
-	if (pixelFormat) {
-		cap.CapCode = GF_CODEC_PIXEL_FORMAT;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*pixelFormat = cap.cap.valueInt;
+	if (sample_rate) *sample_rate = mo->sample_rate;
+	if (bits_per_sample) *bits_per_sample = mo->bits_per_sample;
+	if (num_channels) *num_channels = mo->num_channels;
+	if (channel_config) *channel_config = mo->channel_config;
+	return GF_TRUE;
+}
+
+static void gf_mo_update_visual_info(GF_MediaObject *mo)
+{
+	GF_Channel *ch;
+	GF_NetworkCommand com;
+
+	GF_CodecCapability cap;
+	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return;
+
+	cap.CapCode = GF_CODEC_WIDTH;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->width = cap.cap.valueInt;
 
-		if (mo->odm && mo->odm->parentscene->is_dynamic_scene) {
+	cap.CapCode = GF_CODEC_HEIGHT;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->height = cap.cap.valueInt;
+
+	if (mo->type==GF_MEDIA_OBJECT_TEXT) return;
+
+	cap.CapCode = GF_CODEC_FLIP;
+	cap.cap.valueInt = 0;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->is_flipped = cap.cap.valueInt ? GF_TRUE : GF_FALSE;
+
+	cap.CapCode = GF_CODEC_STRIDE;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->stride = cap.cap.valueInt;
+
+	cap.CapCode = GF_CODEC_PIXEL_FORMAT;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->pixelformat = cap.cap.valueInt;
+
+	cap.CapCode = GF_CODEC_FPS;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->odm->codec->fps = cap.cap.valueFloat;
+
+	if (mo->odm && mo->odm->parentscene->is_dynamic_scene) {
 #ifndef GPAC_DISABLE_VRML
-			const char *name = gf_node_get_name(gf_event_target_get_node(gf_mo_event_target_get(mo, 0)));
-			if (name && !strcmp(name, "DYN_VIDEO")) {
-				const char *opt;
-				u32 r, g, b, a;
-				M_Background2D *back = (M_Background2D *) gf_sg_find_node_by_name(mo->odm->parentscene->graph, "DYN_BACK");
-				if (back) {
-					switch (cap.cap.valueInt) {
-					case GF_PIXEL_ARGB:
-					case GF_PIXEL_RGBA:
-					case GF_PIXEL_YUVA:
-						opt = gf_cfg_get_key(mo->odm->term->user->config, "Compositor", "BackColor");
-						if (!opt) {
-							gf_cfg_set_key(mo->odm->term->user->config, "Compositor", "BackColor", "FF999999");
-							opt = "FF999999";
-						}
-						sscanf(opt, "%02X%02X%02X%02X", &a, &r, &g, &b);
-						back->backColor.red = INT2FIX(r)/255;
-						back->backColor.green = INT2FIX(g)/255;
-						back->backColor.blue = INT2FIX(b)/255;
-						break;
-					default:
-						back->backColor.red = back->backColor.green = back->backColor.blue = 0;
-						break;
+		const char *name = gf_node_get_name(gf_event_target_get_node(gf_mo_event_target_get(mo, 0)));
+		if (name && !strcmp(name, "DYN_VIDEO1")) {
+			const char *opt;
+			u32 r, g, b, a;
+			M_Background2D *back = (M_Background2D *) gf_sg_find_node_by_name(mo->odm->parentscene->graph, "DYN_BACK");
+			if (back) {
+				switch (cap.cap.valueInt) {
+				case GF_PIXEL_ARGB:
+				case GF_PIXEL_RGBA:
+				case GF_PIXEL_YUVA:
+					opt = gf_cfg_get_key(mo->odm->term->user->config, "Compositor", "BackColor");
+					if (!opt) {
+						gf_cfg_set_key(mo->odm->term->user->config, "Compositor", "BackColor", "FF999999");
+						opt = "FF999999";
 					}
-					gf_node_dirty_set((GF_Node *)back, 0, GF_TRUE);
+					sscanf(opt, "%02X%02X%02X%02X", &a, &r, &g, &b);
+					back->backColor.red = INT2FIX(r)/255;
+					back->backColor.green = INT2FIX(g)/255;
+					back->backColor.blue = INT2FIX(b)/255;
+					break;
+				default:
+					back->backColor.red = back->backColor.green = back->backColor.blue = 0;
+					break;
 				}
+				gf_node_dirty_set((GF_Node *)back, 0, GF_TRUE);
 			}
-#endif
 		}
+#endif
 	}
 	/*get PAR settings*/
-	if (pixel_ar) {
-		cap.CapCode = GF_CODEC_PAR;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*pixel_ar = cap.cap.valueInt;
-		if (! (*pixel_ar & 0x0000FFFF)) *pixel_ar = 0;
-		if (! (*pixel_ar & 0xFFFF0000)) *pixel_ar = 0;
-
-		/**/
-		if (! *pixel_ar) {
-			GF_Channel *ch;
-			GF_NetworkCommand com;
-			com.base.command_type = GF_NET_CHAN_GET_PIXEL_AR;
-			ch = (GF_Channel *)gf_list_get(mo->odm->channels, 0);
-			if (!ch) return GF_FALSE;
-
-			com.base.on_channel = ch;
-			com.par.hSpacing = com.par.vSpacing = 0;
-			if (gf_term_service_command(ch->service, &com) == GF_OK) {
-				if ((com.par.hSpacing>65535) || (com.par.vSpacing>65535)) {
-					com.par.hSpacing>>=16;
-					com.par.vSpacing>>=16;
-				}
-				if (com.par.hSpacing|| com.par.vSpacing)
-					*pixel_ar = (com.par.hSpacing<<16) | com.par.vSpacing;
+	cap.CapCode = GF_CODEC_PAR;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->pixel_ar = cap.cap.valueInt;
+	if (! (mo->pixel_ar & 0x0000FFFF)) mo->pixel_ar = 0;
+	if (! (mo->pixel_ar & 0xFFFF0000)) mo->pixel_ar = 0;
+
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	ch = (GF_Channel *)gf_list_get(mo->odm->channels, 0);
+	if (!ch) return;
+	com.base.on_channel = ch;
+
+	/**/
+	if (! mo->pixel_ar) {
+		com.base.command_type = GF_NET_CHAN_GET_PIXEL_AR;
+		if (gf_term_service_command(ch->service, &com) == GF_OK) {
+			if ((com.par.hSpacing>65535) || (com.par.vSpacing>65535)) {
+				com.par.hSpacing>>=16;
+				com.par.vSpacing>>=16;
 			}
+			if (com.par.hSpacing|| com.par.vSpacing)
+				mo->pixel_ar = (com.par.hSpacing<<16) | com.par.vSpacing;
+		}
+	}
+
+	com.base.command_type = GF_NET_CHAN_GET_SRD;
+	if (gf_term_service_command(ch->service, &com) == GF_OK) {
+		mo->srd_x = com.srd.x;
+		mo->srd_y = com.srd.y;
+		mo->srd_w = com.srd.w;
+		mo->srd_h = com.srd.h;
+
+		if (mo->odm->parentscene->is_dynamic_scene && !mo->odm->parentscene->is_srd) {
+			mo->odm->parentscene->is_srd = GF_TRUE;
 		}
 	}
-	return GF_TRUE;
 }
 
-GF_EXPORT
-Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config)
+static void gf_mo_update_audio_info(GF_MediaObject *mo)
 {
 	GF_CodecCapability cap;
-	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
+	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return;
 
 	if (mo->odm->term->bench_mode==2) {
-		if (sample_rate) *sample_rate = 44100;
-		if (bits_per_sample) *bits_per_sample = 16;
-		if (num_channels) *num_channels = 2;
-		if (channel_config) *channel_config = 0;
-		return GF_TRUE;
-	}
-	if (sample_rate) {
-		cap.CapCode = GF_CODEC_SAMPLERATE;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*sample_rate = cap.cap.valueInt;
-	}
-	if (num_channels) {
-		cap.CapCode = GF_CODEC_NB_CHAN;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*num_channels = cap.cap.valueInt;
-	}
-	if (bits_per_sample) {
-		cap.CapCode = GF_CODEC_BITS_PER_SAMPLE;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*bits_per_sample = cap.cap.valueInt;
-	}
-	if (channel_config) {
-		cap.CapCode = GF_CODEC_CHANNEL_CONFIG;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		*channel_config = cap.cap.valueInt;
+		mo->sample_rate = 44100;
+		mo->bits_per_sample = 16;
+		mo->num_channels = 2;
+		mo->channel_config = 0;
+		return;
 	}
-	return GF_TRUE;
+	cap.CapCode = GF_CODEC_SAMPLERATE;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->sample_rate = cap.cap.valueInt;
+
+	cap.CapCode = GF_CODEC_NB_CHAN;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->num_channels = cap.cap.valueInt;
+
+	cap.CapCode = GF_CODEC_BITS_PER_SAMPLE;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->bits_per_sample = cap.cap.valueInt;
+
+	cap.CapCode = GF_CODEC_CHANNEL_CONFIG;
+	gf_codec_get_capability(mo->odm->codec, &cap);
+	mo->channel_config = cap.cap.valueInt;
+
+	mo->odm->codec->bytes_per_sec = mo->sample_rate * mo->num_channels * mo->bits_per_sample / 8;
 }
 
 void gf_mo_update_caps(GF_MediaObject *mo)
 {
-	GF_CodecCapability cap;
-
 	mo->flags &= ~GF_MO_IS_INIT;
 
 	if (mo->type == GF_MEDIA_OBJECT_VIDEO) {
-		cap.CapCode = GF_CODEC_FPS;
-		gf_codec_get_capability(mo->odm->codec, &cap);
-		mo->odm->codec->fps = cap.cap.valueFloat;
-	}
-	else if (mo->type == GF_MEDIA_OBJECT_AUDIO) {
-		u32 sr, nb_ch, bps;
-		sr = nb_ch = bps = 0;
-		gf_mo_get_audio_info(mo, &sr, &bps, &nb_ch, NULL);
-		mo->odm->codec->bytes_per_sec = sr * nb_ch * bps / 8;
+		gf_mo_update_visual_info(mo);
+	} else if (mo->type == GF_MEDIA_OBJECT_AUDIO) {
+		gf_mo_update_audio_info(mo);
 	}
 }
 
@@ -372,7 +391,7 @@
 	u32 obj_time;
 	GF_CMUnit *CU;
 	s32 diff;
-	Bool bench_mode;
+	Bool bench_mode, skip_resync;
 
 	*eos = GF_FALSE;
 	*timestamp = mo->timestamp;
@@ -417,15 +436,15 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->CB->UnitSize, codec->force_cb_resize));
 			gf_codec_resize_composition_buffer(codec, codec->force_cb_resize);
 			codec->force_cb_resize=0;
- //decode and resize CB
+			//decode and resize CB
 			force_decode_mode = 1;
 		}
 	}
 
 	/*fast forward, bench mode with composition memory: force one decode if no data is available*/
- if (! *eos && ((codec->ck->speed > FIX_ONE) || (codec->odm->term->bench_mode && !codec->CB->no_allocation) || (codec->type==GF_STREAM_AUDIO) ) ) {
- force_decode_mode = 2;
- }
+	if (! *eos && ((codec->ck->speed > FIX_ONE) || (codec->odm->term->bench_mode && !codec->CB->no_allocation) || (codec->type==GF_STREAM_AUDIO) ) ) {
+		force_decode_mode = 2;
+	}
 
 	if (force_decode_mode) {
 		u32 retry = 100;
@@ -435,8 +454,7 @@
 				gf_codec_process(codec, 1);
 				gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
 			}
- if (force_decode_mode==2)
- break;
+// if (force_decode_mode==2) break;
 
 			CU = gf_cm_get_output(codec->CB);
 			if (CU)
@@ -446,7 +464,7 @@
 			//we will wait max 100 ms for the CB to be re-fill
 			gf_sleep(1);
 		}
-		if (!retry) {
+		if (!retry && (force_decode_mode==1)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] At %d could not resize, decode and fetch next frame in 100 ms - blank frame after TS %d\n", mo->odm->OD->objectDescriptorID, gf_clock_time(codec->ck), mo->timestamp));
 		}
 		if (!gf_odm_lock_mo(mo))
@@ -480,8 +498,21 @@
 	/*resync*/
 	obj_time = gf_clock_time(codec->ck);
 
+	skip_resync = GF_FALSE;
 	//no drop mode, only for speed = 1: all frames are presented, we discard the current output only if already presented and next frame time is mature
-	if (!codec->ck->Paused && (codec->ck->speed==1) && !(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO)) {
+	if ((codec->ck->speed == FIX_ONE) && (mo->type==GF_MEDIA_OBJECT_VIDEO) && !(codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) ) {
+		if (!(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES)) {
+			//if the next AU is at most 1 sec from the current clock use no drop mode
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At %d frame TS %d next frame TS %d next data length %d (%d in CB)\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS, CU->next->TS, CU->next->dataLength, codec->CB->UnitCount));
+			if (CU->next->dataLength && (CU->next->TS + 1000 >= obj_time)) {
+				skip_resync = GF_TRUE;
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At %d frame TS %d next frame TS %d too late in no-drop mode, enabling drop - resync mode %d\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS, CU->next->TS, resync));
+			}
+		}
+	}
+
+	if (skip_resync) {
 		resync=GF_MO_FETCH;
 		if (/*gf_clock_is_started(mo->odm->codec->ck) && */ (mo->timestamp==CU->TS) && CU->next->dataLength && (CU->next->TS <= obj_time) ) {
 			gf_cm_drop_output(codec->CB);
@@ -494,9 +525,10 @@
 	}
 
 	if (resync) {
-		u32 nb_droped = 0;
+		u32 nb_dropped = 0;
 		while (1) {
-			if (CU->TS*codec->ck->speed >= obj_time*codec->ck->speed)
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] Try to drop frame TS %d next frame TS %d length %d obj time %d\n", mo->odm->OD->objectDescriptorID, CU->TS, CU->next->TS, CU->next->dataLength, obj_time));
+			if (codec->ck->speed > 0 ? CU->TS >= obj_time : CU->TS <= obj_time)
 				break;
 
 			if (!CU->next->dataLength) {
@@ -508,23 +540,24 @@
 						gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
 					}
 					gf_odm_lock(mo->odm, 1);
-					if (!CU->next->dataLength)
+					if (!CU->next->dataLength) {
 						break;
+					}
 				} else {
 					break;
 				}
 			}
 
 			/*figure out closest time*/
-			if (codec->ck->speed*CU->next->TS > codec->ck->speed*obj_time) {
+			if (codec->ck->speed > 0 ? CU->next->TS > obj_time : CU->next->TS < obj_time) {
 				*eos = GF_FALSE;
 				break;
 			}
 
-			nb_droped ++;
-			if (nb_droped>1) {
+			nb_dropped ++;
+			if (nb_dropped>=1) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
-				codec->nb_droped++;
+				codec->nb_dropped++;
 			}
 			/*discard*/
 			CU->RenderedLength = CU->dataLength = 0;
@@ -541,10 +574,11 @@
 
 	if (CU->next->dataLength) {
 		diff = (s32) (CU->next->TS) - (s32) obj_time;
-		mo->ms_until_next = FIX2INT(diff * mo->speed);
 	} else {
-		mo->ms_until_next = 1;
+		diff = mo->odm->codec->min_frame_dur;
 	}
+	mo->ms_until_next = FIX2INT(diff * mo->speed);
+
 	diff = (mo->speed >= 0) ? (s32) (CU->TS) - (s32) obj_time : (s32) obj_time - (s32) (CU->TS);
 	mo->ms_until_pres = FIX2INT(diff * mo->speed);
 
@@ -562,12 +596,20 @@
 			}
 			s->root_od->media_current_time = mo->odm->media_current_time;
 		}
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_MEDIA, GF_LOG_DEBUG)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] At OTB %u fetch frame TS %u size %d (previous TS %d) - %d unit in CB - UTC "LLU" ms - %d ms until CTS is due - %d ms until next frame\n", mo->odm->OD->objectDescriptorID, mo->odm->net_service->url, gf_clock_time(codec->ck), CU->TS, mo->framesize, mo->timestamp, codec->CB->UnitCount, gf_net_get_utc(), mo->ms_until_pres, mo->ms_until_next ));
+			if (CU->sender_ntp) {
+				s32 ntp_diff = gf_net_get_ntp_diff_ms(CU->sender_ntp);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] Frame TS NTP diff with sender %d ms\n", mo->odm->OD->objectDescriptorID, mo->odm->net_service->url, ntp_diff));
+			}
+		}
+#endif
 
 		mo->timestamp = CU->TS;
 		/*signal EOS after rendering last frame, not while rendering it*/
 		*eos = GF_FALSE;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] At OTB %u fetch frame TS %u size %d (previous TS %d) - %d unit in CB - UTC "LLU" ms - %d ms until CTS is due - %d ms until next frame\n", mo->odm->OD->objectDescriptorID, mo->odm->net_service->url, gf_clock_time(codec->ck), CU->TS, mo->framesize, mo->timestamp, codec->CB->UnitCount, gf_net_get_utc(), mo->ms_until_pres, mo->ms_until_next ));
 	} else if (*eos) {
 		//already rendered the last frame, consider we no longer have pending late frame on this stream
 		mo->ms_until_pres = 0;
@@ -691,6 +733,23 @@
 	gf_odm_lock(mo->odm, 0);
 }
 
+GF_EXPORT
+s32 gf_mo_get_clock_drift(GF_MediaObject *mo)
+{
+	s32 res = 0;
+	if (!gf_odm_lock_mo(mo)) return 0;
+
+	/*regular media codec...*/
+	if (mo->odm->codec) {
+		res = mo->odm->codec->ck->drift;
+	}
+	/*BIFS object */
+	else if (mo->odm->subscene && mo->odm->subscene->scene_codec) {
+		res = mo->odm->subscene->scene_codec->ck->drift;
+	}
+	gf_odm_lock(mo->odm, 0);
+	return res;
+}
 
 GF_EXPORT
 void gf_mo_play(GF_MediaObject *mo, Double clipBegin, Double clipEnd, Bool can_loop)
@@ -1193,7 +1252,7 @@
 GF_EXPORT
 Bool gf_mo_is_private_media(GF_MediaObject *mo)
 {
-	if (mo->odm && mo->odm->codec && mo->odm->codec->decio && (mo->odm->codec->decio->InterfaceType==GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return GF_TRUE;
+	if (mo && mo->odm && mo->odm->codec && mo->odm->codec->decio && (mo->odm->codec->decio->InterfaceType==GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return GF_TRUE;
 	return GF_FALSE;
 }

v0.5.2.tar.gz/src/terminal/media_sensor.c -> v0.6.1.tar.gz/src/terminal/media_sensor.c Changed

v0.5.2.tar.gz/src/terminal/mpeg4_inline.c -> v0.6.1.tar.gz/src/terminal/mpeg4_inline.c Changed

v0.5.2.tar.gz/src/terminal/network_service.c -> v0.6.1.tar.gz/src/terminal/network_service.c Changed

@@ -593,12 +593,57 @@
 		}
 		if (scene && scene->is_dynamic_scene) {
 			gf_sc_lock(term->compositor, 1);
-			gf_scene_restart_dynamic(scene, (u64) (com->play.start_range*1000), 0);
+			gf_scene_restart_dynamic(scene, (u64) (com->play.start_range*1000), 0, 0);
 			gf_sc_lock(term->compositor, 0);
 		}
 		return;
 	}
 
+	if (com->command_type == GF_NET_SERVICE_CODEC_STAT_QUERY) {
+		GF_List *od_list;
+		u32 i;
+		GF_ObjectManager *odm;
+
+		com->codec_stat.avg_dec_time = 0;
+		com->codec_stat.max_dec_time = 0;
+		com->codec_stat.irap_avg_dec_time = 0;
+		com->codec_stat.irap_max_dec_time = 0;
+
+		if (!service->owner) return;
+		/*browse all channels in the scene, running on this service, and get codec stat*/
+		od_list = NULL;
+		if (service->owner->subscene) {
+			od_list = service->owner->subscene->resources;
+		} else if (service->owner->parentscene) {
+			od_list = service->owner->parentscene->resources;
+		}
+		if (!od_list) return;
+
+		/*get exclusive access to media scheduler, to make sure ODs are not being manipulated*/
+		i=0;
+		while ((odm = (GF_ObjectManager*)gf_list_enum(od_list, &i))) {
+			u32 avg_dec_time;
+			/*the decoder statistics are reliable only if we decoded at least 1s*/
+			if (!odm->codec || !odm->codec->nb_dec_frames ||
+			 (odm->codec->ck->speed > 0 ? odm->codec->stat_start + 1000 > odm->codec->last_unit_dts : odm->codec->stat_start - 1000 < odm->codec->last_unit_dts))
+				continue;
+			avg_dec_time = (u32) (odm->codec->total_dec_time / odm->codec->nb_dec_frames);
+			if (avg_dec_time > com->codec_stat.avg_dec_time) {
+				com->codec_stat.avg_dec_time = avg_dec_time;
+				com->codec_stat.max_dec_time = odm->codec->max_dec_time;
+				com->codec_stat.irap_avg_dec_time = odm->codec->nb_iframes ? (u32) (odm->codec->total_iframes_time / odm->codec->nb_iframes) : 0;
+				com->codec_stat.irap_max_dec_time = odm->codec->max_iframes_time;
+			}
+			if (odm->codec->codec_reset) {
+				com->codec_stat.codec_reset = GF_TRUE;
+				odm->codec->codec_reset = GF_FALSE;
+			}
+			com->codec_stat.decode_only_rap = odm->codec->decode_only_rap ? GF_TRUE : GF_FALSE;
+		}
+
+		return;
+	}
+
 	if (!com->base.on_channel) return;
 
 	ch = gf_term_get_channel(service, com->base.on_channel);
@@ -708,7 +753,7 @@
 	case GF_NET_CHAN_BUFFER:
 		ch->MaxBuffer = com->buffer.max;
 		ch->MinBuffer = com->buffer.min;
-		ch->BufferTime = com->buffer.max * com->buffer.occupancy / 100;
+		ch->BufferTime = com->buffer.occupancy;
 		gf_es_update_buffering(ch, 1);
 		break;
 	default:

v0.5.2.tar.gz/src/terminal/object_browser.c -> v0.6.1.tar.gz/src/terminal/object_browser.c Changed

@@ -208,7 +208,7 @@
 			}
 		}
 		info->current_time /= 1000;
-		info->nb_droped = codec->nb_droped;
+		info->nb_dropped = codec->nb_dropped;
 	} else if (odm->subscene) {
 		if (odm->subscene->scene_codec) {
 			if (odm->subscene->scene_codec->ck) {
@@ -217,7 +217,7 @@
 			}
 			info->duration = (Double) (s64)odm->subscene->duration;
 			info->duration /= 1000;
-			info->nb_droped = odm->subscene->scene_codec->nb_droped;
+			info->nb_dropped = odm->subscene->scene_codec->nb_dropped;
 			codec = odm->subscene->scene_codec;
 		} else if (odm->subscene->is_dynamic_scene) {
 			if (odm->subscene->dyn_ck) {
@@ -329,7 +329,10 @@
 	}
 
 	ch = (GF_Channel*)gf_list_get(odm->channels, 0);
-	if (ch && ch->esd->langDesc) info->lang = ch->esd->langDesc->langCode;
+	if (ch && ch->esd->langDesc) {
+		info->lang = ch->esd->langDesc->langCode;
+		info->lang_code = ch->esd->langDesc->full_lang_code;
+	}
 
 	if (odm->mo && odm->mo->URLs.count)
 		info->media_url = odm->mo->URLs.vals[0].url;
@@ -465,7 +468,7 @@
 		else if(!strncmp(szExt, ".bt", 3) || !strncmp(szExt, ".xmt", 4) || !strncmp(szExt, ".mp4", 4) ) mode = xml_dump ? GF_SM_DUMP_XMTA : GF_SM_DUMP_BT;
 	}
 
-	dumper = gf_sm_dumper_new(sg, rad_name, ' ', mode);
+	dumper = gf_sm_dumper_new(sg, rad_name, GF_FALSE, ' ', mode);
 
 	if (!dumper) return GF_IO_ERR;
 	e = gf_sm_dump_graph(dumper, skip_protos, 0);

v0.5.2.tar.gz/src/terminal/object_manager.c -> v0.6.1.tar.gz/src/terminal/object_manager.c Changed

@@ -86,6 +86,12 @@
 		odm->addon->root_od = NULL;
 		odm->addon->started = 0;
 	}
+	if (odm->upper_layer_odm) {
+		odm->upper_layer_odm->lower_layer_odm = NULL;
+	}
+	if (odm->lower_layer_odm) {
+		odm->lower_layer_odm->upper_layer_odm = NULL;
+	}
 	/*make sure we are not in the media queue*/
 	gf_term_lock_media_queue(odm->term, GF_TRUE);
 	gf_list_del_item(odm->term->media_queue, odm);
@@ -282,11 +288,11 @@
 		evt.type = GF_EVENT_CONNECT;
 		evt.connect.is_connected = GF_FALSE;
 		gf_term_send_event(odm->term, &evt);
- }
- //this is an extra scene not part of the main tree (eg declared from modules), don't post events
- else if (odm->subscene) {
- gf_scene_del(odm->subscene);
- }
+	}
+	//this is an extra scene not part of the main tree (eg declared from modules), don't post events
+	else if (odm->subscene) {
+		gf_scene_del(odm->subscene);
+	}
 
 	gf_term_lock_net(term, GF_TRUE);
 	/*delete the ODMan*/
@@ -627,7 +633,9 @@
 	u32 i, count;
 	if (gf_codec_is_scene_or_image(odm->codec)) return GF_TRUE;
 
-	if (odm->parentscene && !odm->parentscene->is_dynamic_scene) return GF_TRUE;
+	if (odm->parentscene && !odm->parentscene->is_dynamic_scene) {
+		return GF_TRUE;
+	}
 
 	if (odm->parentscene && odm->parentscene->root_od->addon) {
 		if (odm->parentscene->root_od->addon->addon_type == GF_ADDON_TYPE_MAIN)
@@ -756,6 +764,7 @@
 		odm->state = GF_ODM_STATE_IN_SETUP;
 
 		gf_odm_lock(odm, 1);
+		gf_term_lock_net(odm->term, GF_FALSE);
 		i=0;
 		while ((esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
 			e = gf_odm_setup_es(odm, esd, serv, syncRef);
@@ -766,6 +775,7 @@
 				gf_term_message(odm->term, odm->net_service->url, "Stream Setup Failure", e);
 			}
 		}
+		gf_term_lock_net(odm->term, GF_TRUE);
 		odm->state = GF_ODM_STATE_STOP;
 		gf_odm_lock(odm, 0);
 	}
@@ -1334,7 +1344,7 @@
 		com.play.speed = FIX2FLT(ch->clock->speed);
 		com.play.start_range = gf_clock_time(ch->clock);
 		com.play.start_range /= 1000;
-		com.play.end_range = -1.0;
+		com.play.end_range = 0;
 		gf_term_service_command(ch->service, &com);
 		if (dec && (dec->Status!=GF_ESM_CODEC_PLAY)) gf_term_start_codec(dec, 0);
 		gf_term_lock_net(ch->odm->term, 0);
@@ -1489,7 +1499,9 @@
 
 		if (media_queue_state==2) {
 			odm->action_type = GF_ODM_ACTION_PLAY;
+			gf_term_lock_media_queue(odm->term, 0);
 			gf_odm_play(odm);
+			gf_term_lock_media_queue(odm->term, 1);
 		} else if (!skip_register && (gf_list_find(odm->term->media_queue, odm)<0)) {
 			odm->action_type = GF_ODM_ACTION_PLAY;
 			assert(! (odm->flags & GF_ODM_DESTROYED));
@@ -1598,16 +1610,25 @@
 
 		/*adjust time for addons*/
 		if (odm->parentscene && odm->parentscene->root_od->addon) {
+			com.play.initial_broadcast_play = 0;
 			//addon timing is resolved against timestamps, not media time
 			if (start_range_is_clock) {
-				ck_time = gf_clock_time(ch->clock);
-				ck_time /= 1000;
+				if (!gf_clock_is_started(ch->clock)) {
+					ck_time = (Double) odm->parentscene->root_od->addon->media_pts;
+					ck_time /= 90000;
+				} else {
+					ck_time = gf_clock_time(ch->clock);
+					ck_time /= 1000;
+				}
 			}
-			ck_time = gf_scene_adjust_time_for_addon(odm->parentscene, ck_time, odm->parentscene->root_od->addon, &com.play.timestamp_based);
+			ck_time = gf_scene_adjust_time_for_addon(odm->parentscene->root_od->addon, ck_time, &com.play.timestamp_based);
 			//we are having a play request for an addon without the main content being active - we no longer have timestamp info from the main content
 			if (!ch->clock->clock_init && com.play.timestamp_based)
 				com.play.timestamp_based = 2;
 
+			if (ck_time<0)
+				ck_time=0;
+
 			if (odm->scalable_addon) {
 				//this is a scalable extension to an object in the parent scene
 				gf_scene_select_scalable_addon(odm->parentscene->root_od->parentscene, odm);
@@ -1624,21 +1645,27 @@
 			 ) {
 				com.play.end_range = (s64) odm->parentscene->root_od->media_stop_time / 1000.0;
 			} else {
-				com.play.end_range = -1;
+				com.play.end_range = 0;
 			}
 		}
 
 		com.play.speed = ch->clock->speed;
 
 #ifndef GPAC_DISABLE_VRML
-		/*if object shares parent scene clock, do not use media control*/
-		//ctrl = parent_ck ? NULL : gf_odm_get_mediacontrol(odm);
 		ctrl = parent_ck ? parent_ck->mc : gf_odm_get_mediacontrol(odm);
 		/*override range and speed with MC*/
 		if (ctrl) {
-			MC_GetRange(ctrl, &com.play.start_range, &com.play.end_range);
+			//for addon, use current clock settings (media control is ignored)
+			if (!odm->parentscene || !odm->parentscene->root_od->addon) {
+				//this is fake timeshift, eg we are playing a VoD as a timeshift service: stop and start times have already been adjusted
+				if (ctrl->control->mediaStopTime<0 && !odm->timeshift_depth) {
+				} else {
+					MC_GetRange(ctrl, &com.play.start_range, &com.play.end_range);
+				}
+			}
+
 			com.play.speed = FIX2FLT(ctrl->control->mediaSpeed);
-			/*if the channel doesn't control the clock, jump to current time in the controled range, not just the begining*/
+			/*if the channel doesn't control the clock, jump to current time in the controled range, not just the beginning*/
 			if ((ch->esd->ESID!=ch->clock->clockID) && (ck_time>com.play.start_range) && (com.play.end_range>com.play.start_range) && (ck_time<com.play.end_range)) {
 				com.play.start_range = ck_time;
 			}
@@ -1692,7 +1719,7 @@
 				gf_clock_buffer_off(ch->clock);
 			}
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH%d: At OTB %u requesting PLAY from %g to %g (clock init %d)\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock), com.play.start_range, com.play.end_range, ch->clock->clock_init));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH%d: At OTB %u requesting PLAY from %g to %g (clock init %d) - speed %g\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock), com.play.start_range, com.play.end_range, ch->clock->clock_init, com.play.speed));
 			gf_term_service_command(ch->service, &com);
 		}
 	}
@@ -1722,7 +1749,7 @@
 			if (!odm->subscene->graph_attached)
 				gf_scene_regenerate(odm->subscene);
 			else
-				gf_scene_restart_dynamic(odm->subscene, 0, 1);
+				gf_scene_restart_dynamic(odm->subscene, 0, 1, 0);
 		}
 	}
 	if (odm->ocr_codec) gf_term_start_codec(odm->ocr_codec, 0);
@@ -1735,8 +1762,13 @@
 		media_control_paused = 1;
 	}
 
-	if (media_control_paused)
+	if (odm->term->root_scene && odm->term->root_scene->pause_at_first_frame) {
+		media_control_paused = GF_TRUE;
+	}
+
+	if ((odm->codec || odm->subscene) && media_control_paused) {
 		gf_odm_pause(odm);
+	}
 }
 
 Bool gf_odm_owns_clock(GF_ObjectManager *odm, GF_Clock *ck)
@@ -1768,8 +1800,8 @@
 #endif
 
 	GF_NetworkCommand com;
-
-	if (!odm->state) return;
+	//root ODs of dynamic scene may not have seen play/pause request
+	if (!odm->state && !odm->scalable_addon && (!odm->subscene || !odm->subscene->is_dynamic_scene) ) return;
 
 #if 0
 	/*Handle broadcast environment, do not stop the object if no time control and instruction
@@ -2052,14 +2084,19 @@
 
 	/*stop codecs, and update status for media codecs*/
 	if (odm->codec) {
-		//we don't pause codec but only change its status to PUASE - this will allow decoding until CB is full, which will turn the codec in pause mdoe
+		//we don't pause codec but only change its status to PAUSE - this will allow decoding until CB is full, which will turn the codec in pause mode
 		gf_codec_set_status(odm->codec, GF_ESM_CODEC_PAUSE);
-	} else if (odm->subscene) {
+	}
+	//when pause_at_first_frame is set we still want to decode and process the first AUs in OD and scene channels, otherwise no scene and no frame to display ...
+	else if (odm->subscene && ! odm->subscene->pause_at_first_frame) {
 		if (odm->subscene->scene_codec) {
 			gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_PAUSE);
 			gf_term_stop_codec(odm->subscene->scene_codec, 1);
 		}
-		if (odm->subscene->od_codec) gf_term_stop_codec(odm->subscene->od_codec, 1);
+		if (odm->subscene->od_codec) {
+			gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_PAUSE);
+			gf_term_stop_codec(odm->subscene->od_codec, 1);
+		}
 	}
 	if (odm->ocr_codec) gf_term_stop_codec(odm->ocr_codec, 1);
 #ifndef GPAC_MINIMAL_ODF

v0.5.2.tar.gz/src/terminal/scene.c -> v0.6.1.tar.gz/src/terminal/scene.c Changed

@@ -43,8 +43,6 @@
 #include "input_sensor.h"
 #include "media_memory.h"
 
-void gf_scene_reset_addons(GF_Scene *scene);
-
 GF_EXPORT
 Double gf_scene_get_time(void *_is)
 {
@@ -64,6 +62,7 @@
 }
 
 #ifndef GPAC_DISABLE_VRML
+
 void gf_storage_save(M_Storage *storage);
 #endif
 
@@ -575,7 +574,7 @@
 		evt.type = event_type;
 		evt.screen_rect.width = INT2FIX(w);
 		evt.screen_rect.height = INT2FIX(h);
-		evt.key_flags = scene->is_dynamic_scene;
+		evt.key_flags = scene->is_dynamic_scene ? (scene->is_live360 ? 2 : 1) : 0;
 		if (root) {
 #ifndef GPAC_DISABLE_VRML
 			switch (gf_node_get_tag(root)) {
@@ -699,7 +698,7 @@
 	OD_ID = gf_mo_get_od_id(url);
 	if (!OD_ID) return NULL;
 
-	gf_term_lock_net(scene->root_od->term, GF_TRUE);
+	gf_mx_p(scene->mx_resources);
 
 	/*we may have overriden the time lines in parent scene, thus all objects in this scene have the same clock*/
 	if (scene->root_od->parentscene && scene->root_od->parentscene->force_single_timeline)
@@ -763,12 +762,12 @@
 		if (!first_pass && !force_new_if_not_attached) {
 			if (node && (gf_mo_event_target_find_by_node(obj, node)<0))
 				gf_mo_event_target_add_node(obj, node);
-			gf_term_lock_net(scene->root_od->term, GF_FALSE);
+			gf_mx_v(scene->mx_resources);
 			return obj;
 		}
 		/*special case where the URL is requested twice for the same node: use the existing resource*/
 		else if (node && (gf_mo_event_target_find_by_node(obj, node)>=0)) {
-			gf_term_lock_net(scene->root_od->term, GF_FALSE);
+			gf_mx_v(scene->mx_resources);
 			return obj;
 		}
 	}
@@ -779,7 +778,7 @@
 
 	/*we cannot create an OD manager at this point*/
 	if (obj_type_hint==GF_MEDIA_OBJECT_UNDEF) {
-		gf_term_lock_net(scene->root_od->term, GF_FALSE);
+		gf_mx_v(scene->mx_resources);
 		return NULL;
 	}
 
@@ -807,19 +806,19 @@
 		gf_scene_insert_object(scene, obj, lock_timelines, sync_ref, keep_fragment, original_parent_scene);
 		/*safety check!!!*/
 		if (gf_list_find(scene->scene_objects, obj)<0) {
-			gf_term_lock_net(scene->root_od->term, GF_FALSE);
+			gf_mx_v(scene->mx_resources);
 			return NULL;
 		}
 
 		if (obj->odm==NULL) {
 			gf_list_del_item(scene->scene_objects, obj);
 			gf_mo_del(obj);
-			gf_term_lock_net(scene->root_od->term, GF_FALSE);
+			gf_mx_v(scene->mx_resources);
 			return NULL;
 		}
 	}
 
-	gf_term_lock_net(scene->root_od->term, GF_FALSE);
+	gf_mx_v(scene->mx_resources);
 	return obj;
 }
 
@@ -1038,6 +1037,8 @@
 	u32 w, h, v_w, v_h;
 	if (!scene->visual_url.OD_ID && !scene->visual_url.url) return;
 
+	if (scene->is_live360) return;
+
 	url.count = 1;
 	url.vals = &scene->visual_url;
 	mo = IS_CheckExistingObject(scene, &url, GF_MEDIA_OBJECT_VIDEO);
@@ -1197,6 +1198,85 @@
 
 }
 
+static void scene_video_mouse_move(void *param, GF_FieldInfo *field)
+{
+	u32 i, count;
+	GF_Scene *scene = (GF_Scene *) param;
+	SFVec2f tx_coord = * ((SFVec2f *) field->far_ptr);
+
+	if (!scene->visual_url.OD_ID) return;
+
+	count = gf_list_count(scene->resources);
+	for (i=0; i<count; i++) {
+		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
+		if (!odm->mo) continue;
+
+		if (odm->codec && odm->mo->OD_ID && (odm->mo->OD_ID != GF_MEDIA_EXTERNAL_ID) && (odm->mo->OD_ID==scene->visual_url.OD_ID)) {
+			GF_Err e;
+			u32 w, h;
+			GF_CodecCapability cap;
+			cap.CapCode = GF_CODEC_INTERACT_COORDS;
+			w = FIX2INT( tx_coord.x * 0xFFFF);
+			h = FIX2INT( tx_coord.y * 0xFFFF);
+			cap.cap.valueInt = w<<16 | h;
+
+			e = gf_codec_set_capability(odm->codec, cap);
+			if (e==GF_NOT_SUPPORTED) {
+				GF_Node *n = gf_sg_find_node_by_name(scene->graph, "DYN_TOUCH");
+				if (n) ((M_TouchSensor *)n)->enabled = GF_FALSE;
+			}
+			return;
+		}
+	}
+}
+
+static void create_movie(GF_Scene *scene, GF_Node *root, const char *tr_name, const char *texture_name, const char *name_geo)
+{
+	M_MovieTexture *mt;
+	GF_Node *n1, *n2;
+
+	/*create a shape and bitmap node*/
+	n2 = is_create_node(scene->graph, TAG_MPEG4_Transform2D, tr_name);
+	gf_node_list_add_child( &((GF_ParentNode *)root)->children, n2);
+	gf_node_register(n2, root);
+	n1 = n2;
+	n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
+	gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+	gf_node_register(n2, n1);
+	n1 = n2;
+	n2 = is_create_node(scene->graph, TAG_MPEG4_Appearance, NULL);
+	((M_Shape *)n1)->appearance = n2;
+	gf_node_register(n2, n1);
+
+	/*note we create a movie texture even for images...*/
+	mt = (M_MovieTexture *) is_create_node(scene->graph, TAG_MPEG4_MovieTexture, texture_name);
+	mt->startTime = gf_scene_get_time(scene);
+	((M_Appearance *)n2)->texture = (GF_Node *)mt;
+	gf_node_register((GF_Node *)mt, n2);
+
+	//TODO srd in 360
+	if (scene->is_live360) {
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Sphere, name_geo);
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+	} else if (scene->is_srd) {
+		GF_Node *app = n2;
+
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Rectangle, name_geo);
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+		//force appearance material2D.filled = TRUE
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Material2D, NULL);
+		((M_Material2D *)n2)->filled = GF_TRUE;
+		((M_Appearance *)app)->material = n2;
+		gf_node_register(n2, app);
+
+	} else {
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Bitmap, name_geo);
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+	}
+}
 /*regenerates the scene graph for dynamic scene.
 This will also try to reload any previously presented streams. Note that in the usual case the scene is generated
 just once when receiving the first OD AU (ressources are NOT destroyed when seeking), but since the network may need
@@ -1212,7 +1292,6 @@
 	M_Transform2D *addon_tr;
 	M_Layer2D *addon_layer;
 	M_Inline *addon_scene;
-
 	if (scene->is_dynamic_scene != 1) return;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Inline] Regenerating scene graph for service %s\n", scene->root_od->net_service->url));
@@ -1223,8 +1302,13 @@
 
 	/*this is the first time, generate a scene graph*/
 	if (!ac) {
+		scene->is_live360 = GF_FALSE;
+		if (strstr(scene->root_od->net_service->url, "#LIVE360TV")) {
+			scene->is_live360 = GF_TRUE;
+		}
+
 		/*create an OrderedGroup*/
-		n1 = is_create_node(scene->graph, TAG_MPEG4_OrderedGroup, NULL);
+		n1 = is_create_node(scene->graph, scene->is_live360 ? TAG_MPEG4_Group : TAG_MPEG4_OrderedGroup, NULL);
 		gf_sg_set_root_node(scene->graph, n1);
 		gf_node_register(n1, NULL);
 
@@ -1234,6 +1318,23 @@
 			gf_node_register(n2, n1);
 		}
 
+		if (scene->is_live360) {
+			n2 = is_create_node(scene->graph, TAG_MPEG4_Viewpoint, "DYN_VP");
+			((M_Viewpoint *)n2)->position.z = 0;
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+			gf_node_register(n2, n1);
+
+			n2 = is_create_node(scene->graph, TAG_MPEG4_NavigationInfo, NULL);
+			gf_free( ((M_NavigationInfo *)n2)->type.vals[0] );
+			((M_NavigationInfo *)n2)->type.vals[0] = gf_strdup("VR");
+			gf_free( ((M_NavigationInfo *)n2)->type.vals[1] );
+			((M_NavigationInfo *)n2)->type.vals[1] = gf_strdup("NONE");
+			((M_NavigationInfo *)n2)->avatarSize.count = 0;
+
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+			gf_node_register(n2, n1);
+		}
+
 		/*create an sound2D and an audioClip node*/
 		n2 = is_create_node(scene->graph, TAG_MPEG4_Sound2D, NULL);
 		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
@@ -1251,72 +1352,145 @@
 		gf_node_register(n2, n1);
 		n1 = n2;
 
-		/*create a shape and bitmap node*/
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
+		/*create a touch sensor for the video*/
+		n2 = is_create_node(scene->graph, TAG_MPEG4_TouchSensor, "DYN_TOUCH");
 		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
 		gf_node_register(n2, n1);
-		n1 = n2;
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Appearance, NULL);
-		((M_Shape *)n1)->appearance = n2;
-		gf_node_register(n2, n1);
+		gf_sg_route_new_to_callback(scene->graph, n2, 3/*"hitTexCoord_changed"*/, scene, scene_video_mouse_move);
+
+		create_movie(scene, n1, "TR1", "DYN_VIDEO1", "DYN_GEOM1");
+
+		if (! scene->is_live360) {
+			/*text streams controlled through AnimationStream*/
+			n1 = gf_sg_get_root_node(scene->graph);
+			as = (M_AnimationStream *) is_create_node(scene->graph, TAG_MPEG4_AnimationStream, "DYN_TEXT");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)as);
+			gf_node_register((GF_Node *)as, n1);
+
+
+			/*3GPP DIMS streams controlled */
+			n1 = gf_sg_get_root_node(scene->graph);
+			dims = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "DIMS_SCENE");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)dims);
+			gf_node_register((GF_Node *)dims, n1);
+
+			/*PVR version of live content*/
+			n1 = gf_sg_get_root_node(scene->graph);
+			addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "PVR_SCENE");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_scene);
+			gf_node_register((GF_Node *)addon_scene, (GF_Node *)n1);
+
+			/*Media addon scene*/
+			n1 = gf_sg_get_root_node(scene->graph);
+			addon_tr = (M_Transform2D *) is_create_node(scene->graph, TAG_MPEG4_Transform2D, "ADDON_TRANS");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_tr);
+			gf_node_register((GF_Node *)addon_tr, n1);
+
+			addon_layer = (M_Layer2D *) is_create_node(scene->graph, TAG_MPEG4_Layer2D, "ADDON_LAYER");
+			gf_node_list_add_child( &((GF_ParentNode *)addon_tr)->children, (GF_Node*)addon_layer);
+			gf_node_register((GF_Node *)addon_layer, (GF_Node *)addon_tr);
+
+			addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "ADDON_SCENE");
+			gf_node_list_add_child( &((GF_ParentNode *)addon_layer)->children, (GF_Node*)addon_scene);
+			gf_node_register((GF_Node *)addon_scene, (GF_Node *)addon_layer);
+		}
+	}
 
-		/*note we create a movie texture even for images...*/
-		mt = (M_MovieTexture *) is_create_node(scene->graph, TAG_MPEG4_MovieTexture, "DYN_VIDEO");
-		mt->startTime = gf_scene_get_time(scene);
-		((M_Appearance *)n2)->texture = (GF_Node *)mt;
-		gf_node_register((GF_Node *)mt, n2);
 
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Bitmap, NULL);
-		((M_Shape *)n1)->geometry = n2;
-		gf_node_register(n2, n1);
+	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
+	set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
+
+	if (scene->is_srd) {
+		char szName[20], szTex[20], szGeom[20];
+		u32 i, nb_srd = 0;
+		GF_ObjectManager *a_odm;
+		SFURL url;
+		u32 sw, sh;
+		s32 min_x, max_x, min_y, max_y;
+		i=0;
 
+		min_x = min_y = INT_MAX;
+		max_x = max_y = 0;
 
-		/*text streams controlled through AnimationStream*/
-		n1 = gf_sg_get_root_node(scene->graph);
-		as = (M_AnimationStream *) is_create_node(scene->graph, TAG_MPEG4_AnimationStream, "DYN_TEXT");
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)as);
-		gf_node_register((GF_Node *)as, n1);
+		while ((a_odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+			if (!a_odm->mo || !a_odm->mo->srd_w) {
+				continue;
+			}
+			if ((s32) a_odm->mo->srd_x < min_x) min_x = (s32) a_odm->mo->srd_x;
+			if ((s32) a_odm->mo->srd_y < min_y) min_y = (s32) a_odm->mo->srd_y;
 
+			if ((s32) a_odm->mo->srd_x + (s32) a_odm->mo->srd_w > min_x + max_x) max_x = (s32) a_odm->mo->srd_x + (s32) a_odm->mo->srd_w - min_x;
+			if ((s32) a_odm->mo->srd_y + (s32) a_odm->mo->srd_h > min_y + max_y) max_y = (s32) a_odm->mo->srd_y + (s32) a_odm->mo->srd_h - min_y;
+			nb_srd++;
+		}
 
-		/*3GPP DIMS streams controlled */
-		n1 = gf_sg_get_root_node(scene->graph);
-		dims = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "DIMS_SCENE");
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)dims);
-		gf_node_register((GF_Node *)dims, n1);
+		n1 = gf_sg_find_node_by_name(scene->graph, "DYN_TRANS");
+		for (i=1; i<nb_srd; i++) {
+			sprintf(szName, "TR%d", i+1);
+			sprintf(szTex, "DYN_VIDEO%d", i+1);
+			sprintf(szGeom, "DYN_GEOM%d", i+1);
+			n2 = gf_sg_find_node_by_name(scene->graph, szName);
+			if (!n2) {
+				create_movie(scene, n1, szName, szTex, szGeom);
+			}
+		}
 
-		/*PVR version of live content*/
-		n1 = gf_sg_get_root_node(scene->graph);
-		addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "PVR_SCENE");
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_scene);
-		gf_node_register((GF_Node *)addon_scene, (GF_Node *)n1);
+		url.url = NULL;
+		gf_sg_get_scene_size_info(scene->graph, &sw, &sh);
+		i=0;
+		while ((a_odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+			if (a_odm->mo && a_odm->mo->srd_w) {
+				Fixed tw, th, tx, ty;
 
-		/*Media addon scene*/
-		n1 = gf_sg_get_root_node(scene->graph);
-		addon_tr = (M_Transform2D *) is_create_node(scene->graph, TAG_MPEG4_Transform2D, "ADDON_TRANS");
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_tr);
-		gf_node_register((GF_Node *)addon_tr, n1);
+				sprintf(szName, "TR%d", i);
+				sprintf(szTex, "DYN_VIDEO%d", i);
+				sprintf(szGeom, "DYN_GEOM%d", i);
+				url.OD_ID = a_odm->OD->objectDescriptorID;
 
-		addon_layer = (M_Layer2D *) is_create_node(scene->graph, TAG_MPEG4_Layer2D, "ADDON_LAYER");
-		gf_node_list_add_child( &((GF_ParentNode *)addon_tr)->children, (GF_Node*)addon_layer);
-		gf_node_register((GF_Node *)addon_layer, (GF_Node *)addon_tr);
+				mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, szTex);
+				set_media_url(scene, &url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
 
-		addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "ADDON_SCENE");
-		gf_node_list_add_child( &((GF_ParentNode *)addon_layer)->children, (GF_Node*)addon_scene);
-		gf_node_register((GF_Node *)addon_scene, (GF_Node *)addon_layer);
-	}
+				if (!scene->dyn_ck && a_odm->codec) {
+					scene->dyn_ck = a_odm->codec->ck;
+				}
 
+				tw = INT2FIX( sw * a_odm->mo->srd_w) / (max_x - min_x);
+				th = INT2FIX(sh * a_odm->mo->srd_h) / (max_y - min_y);
+
+				n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
+				((M_Rectangle *)n2)->size.x = tw;
+				((M_Rectangle *)n2)->size.y = th;
+				gf_node_changed(n2, NULL);
+
+				tx = INT2FIX(a_odm->mo->srd_x * sw) / (max_x - min_x);
+				tx = tx - INT2FIX(sw) / 2 + INT2FIX(tw) / 2;
+
+				ty = INT2FIX(a_odm->mo->srd_y * sh) / (max_y - min_y);
+				ty = INT2FIX(sh) / 2 - ty - INT2FIX(th) / 2;
+
+				addon_tr = (M_Transform2D *) gf_sg_find_node_by_name(scene->graph, szName);
+				addon_tr->translation.x = tx;
+				addon_tr->translation.y = ty;
+
+				gf_node_changed((GF_Node *)addon_tr, NULL);
+			}
+		}
+	} else {
+		mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
+		set_media_url(scene, &scene->visual_url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
+	}
 
-	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
-	set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
 
-	mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO");
-	set_media_url(scene, &scene->visual_url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
+	if (! scene->is_live360) {
+		as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
+		set_media_url(scene, &scene->text_url, (GF_Node*)as, &as->url, GF_STREAM_TEXT);
 
-	as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
-	set_media_url(scene, &scene->text_url, (GF_Node*)as, &as->url, GF_STREAM_TEXT);
+		dims = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "DIMS_SCENE");
+		set_media_url(scene, &scene->dims_url, (GF_Node*)dims, &dims->url, GF_STREAM_SCENE);
 
-	dims = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "DIMS_SCENE");
-	set_media_url(scene, &scene->dims_url, (GF_Node*)dims, &dims->url, GF_STREAM_SCENE);
+		n2 = gf_sg_find_node_by_name(scene->graph, "DYN_TOUCH");
+		((M_TouchSensor *)n2)->enabled = GF_TRUE;
+	}
 
 	gf_sc_lock(scene->root_od->term->compositor, 0);
 
@@ -1351,9 +1525,21 @@
 
 #else
 /*!!fixme - we would need an SVG scene in case no VRML support is present !!!*/
+GF_EXPORT
 void gf_scene_regenerate(GF_Scene *scene) {}
-void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only) {}
+GF_EXPORT
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check) {}
+GF_EXPORT
 void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm) {}
+GF_EXPORT
+void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons) { }
+GF_EXPORT
+void gf_scene_resume_live(GF_Scene *subscene) { }
+GF_EXPORT
+void gf_scene_set_addon_layout_info(GF_Scene *scene, u32 position, u32 size_factor) {}
+GF_EXPORT
+void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time) { }
+
 #endif	/*GPAC_DISABLE_VRML*/
 
 #ifndef GPAC_DISABLE_VRML
@@ -1430,6 +1616,7 @@
 	gf_sc_lock(scene->root_od->term->compositor, 0);
 }
 
+GF_EXPORT
 void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm)
 {
 	char *url;
@@ -1447,7 +1634,7 @@
 
 	if (odm->state) {
 		if (check_odm_deactivate(&scene->audio_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO")) ) return;
-		if (check_odm_deactivate(&scene->visual_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO") )) return;
+		if (check_odm_deactivate(&scene->visual_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1") )) return;
 		if (check_odm_deactivate(&scene->text_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT") )) return;
 	}
 
@@ -1488,7 +1675,7 @@
 	}
 
 	if (odm->codec->type == GF_STREAM_VISUAL) {
-		M_MovieTexture *mt = (M_MovieTexture*) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO");
+		M_MovieTexture *mt = (M_MovieTexture*) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
 		if (!mt) return;
 		if (scene->visual_url.url) gf_free(scene->visual_url.url);
 		scene->visual_url.url = NULL;
@@ -1529,7 +1716,7 @@
 	}
 }
 
-void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on)
+void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time)
 {
 	GF_DOM_Event devt;
 	const char *opt = gf_cfg_get_key(scene->root_od->term->user->config, "Systems", "DebugPVRScene");
@@ -1540,26 +1727,36 @@
 
 	if (set_on) {
 		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO"));
-		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO"));
+		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
 		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
 
 
 		if (!odm->subscene->graph_attached) {
 			odm->flags &= ~GF_ODM_REGENERATE_SCENE;
 			gf_scene_regenerate(odm->subscene);
+		} else {
+			odm->subscene->needs_restart = 1;
+		}
+
+		//main addon is vod not live, store clock
+		if (! odm->timeshift_depth && !scene->sys_clock_at_main_activation) {
+			scene->sys_clock_at_main_activation = gf_sys_clock();
+			scene->obj_clock_at_main_activation = current_clock_time;
 		}
 
 
 		gf_sg_vrml_field_copy(&dscene->url, &odm->mo->URLs, GF_SG_VRML_MFURL);
 		gf_node_changed((GF_Node *)dscene, NULL);
-
 	} else {
 		GF_Clock *ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
 		//reactivating the main content will trigger a reset on the clock - remember where we are and resume from this point
 		scene->root_od->media_start_time = gf_clock_media_time(ck);
 
+		scene->sys_clock_at_main_activation = 0;
+		scene->obj_clock_at_main_activation = 0;
+
 		odm_activate(&scene->audio_url, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO"));
-		odm_activate(&scene->visual_url, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO"));
+		odm_activate(&scene->visual_url, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
 		odm_activate(&scene->text_url, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
 
 		gf_sg_vrml_mf_reset(&dscene->url, GF_SG_VRML_MFURL);
@@ -1646,7 +1843,7 @@
 		mediacontrol_resume(subscene->root_od, 1);
 }
 
-void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only)
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check)
 {
 	u32 i;
 	GF_Clock *ck;
@@ -1661,19 +1858,30 @@
 	if (!ck) return;
 
 	//first pass to check if we need to enable the addon acting as time shifting
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+	if (!disable_addon_check) {
+		i=0;
+		while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+
+			if (odm->addon && (odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+				//assign clock if not yet available
+				if (odm->addon->root_od->subscene && !odm->addon->root_od->subscene->dyn_ck)
+					odm->addon->root_od->subscene->dyn_ck = scene->dyn_ck;
 
-		if (odm->addon && (odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			//assign clock if not yet available
-			if (odm->addon->root_od->subscene && !odm->addon->root_od->subscene->dyn_ck)
-				odm->addon->root_od->subscene->dyn_ck = scene->dyn_ck;
+				//we're timeshifting through the main addon, activate it
+				if (from_time < -1) {
+					gf_scene_select_main_addon(scene, odm, GF_TRUE, gf_clock_time(ck));
 
-			//we're timeshifting through the main addon, activate it
-			if (from_time < -1) {
-				gf_scene_select_main_addon(scene, odm, GF_TRUE);
-			} else if (scene->main_addon_selected) {
-				gf_scene_select_main_addon(scene, odm, GF_FALSE);
+					/*no timeshift, this is a VoD associated with the live broadcast: get current time*/
+					if (! odm->timeshift_depth) {
+						s64 live_clock = scene->obj_clock_at_main_activation + gf_sys_clock() - scene->sys_clock_at_main_activation;
+
+						from_time += 1;
+						if (live_clock + from_time < 0) from_time = 0;
+						else from_time = live_clock + from_time;
+					}
+				} else if (scene->main_addon_selected) {
+					gf_scene_select_main_addon(scene, odm, GF_FALSE, 0);
+				}
 			}
 		}
 	}
@@ -1686,14 +1894,17 @@
 
 				//object is not an addon and main addon is selected, do not add
 				if (!odm->addon && scene->main_addon_selected) {
-					//object is not an addon and main addon is selected, do not add
-				} else if (odm->addon && (odm->addon->addon_type==GF_ADDON_TYPE_MAIN) && scene->main_addon_selected) {
-					gf_list_add(to_restart, odm);
-				} else if (!scene->selected_service_id || (scene->selected_service_id==odm->OD->ServiceID)) {
-					gf_list_add(to_restart, odm);
 				}
-				//addon are inserted from outside the parent service, and won't share the same service_ID - restart if addon is enabled
-				else if (odm->addon && odm->subscene && odm->addon->enabled) {
+				//object is an addon and enabled, restart if main and main is enabled, or if not main
+				else if (odm->addon && odm->addon->enabled) {
+					if (odm->addon->addon_type==GF_ADDON_TYPE_MAIN) {
+						if (scene->main_addon_selected) {
+							gf_list_add(to_restart, odm);
+						}
+					} else {
+						gf_list_add(to_restart, odm);
+					}
+				} else if (!scene->selected_service_id || (scene->selected_service_id==odm->OD->ServiceID)) {
 					gf_list_add(to_restart, odm);
 				}
 
@@ -1726,7 +1937,7 @@
 		}
 
 		if (odm->subscene && odm->subscene->is_dynamic_scene) {
-			gf_scene_restart_dynamic(odm->subscene, from_time, 0);
+			gf_scene_restart_dynamic(odm->subscene, from_time, 0, 0);
 		} else {
 			gf_odm_start(odm, 0);
 		}
@@ -1736,7 +1947,7 @@
 	/*also check nodes since they may be deactivated (end of stream)*/
 	if (scene->is_dynamic_scene) {
 		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
-		M_MovieTexture *mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO");
+		M_MovieTexture *mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
 		M_AnimationStream *as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
 		if (ac) {
 			ac->startTime = gf_scene_get_time(scene);
@@ -1759,10 +1970,36 @@
 GF_EXPORT
 void gf_scene_force_size(GF_Scene *scene, u32 width, u32 height)
 {
+	Bool skip_notif = GF_FALSE;
+
 	/*for now only allowed when no scene info*/
 	if (!scene->is_dynamic_scene) return;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Changing scene size to %d x %d\n", width, height));
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Scene] Forcing scene size to %d x %d\n", width, height));
+
+	if (scene->is_live360) {
+		GF_Node *node;
+		u32 radius;
+		width /= 2;
+		height /= 2;
+
+		radius = MAX(width, height) / 2;
+#ifndef GPAC_DISABLE_VRML
+		node = gf_sg_find_node_by_name(scene->graph, "DYN_GEOM1");
+		if (node) {
+			((M_Sphere *)node)->radius = - INT2FIX(radius);
+			gf_node_changed(node, NULL);
+		}
+
+		node = gf_sg_find_node_by_name(scene->graph, "DYN_VP");
+		if (node) {
+			//((M_Viewpoint*)node)->position.z = INT2FIX(MIN(width, height) ) / 2;
+			((M_Viewpoint*)node)->position.z = 0;
+
+			gf_node_changed(node, NULL);
+		}
+#endif /* GPAC_DISABLE_VRML */
+	}
 
 	if (scene->is_dynamic_scene) {
 		GF_NetworkCommand com;
@@ -1800,6 +2037,17 @@
 			if (!com.par.width && !com.par.height && ((w<width) || (h<height)) ) {
 				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
 			} else {
+				GF_DOM_Event devt;
+				memset(&devt, 0, sizeof(GF_DOM_Event));
+				devt.type = GF_EVENT_SCENE_SIZE;
+				devt.screen_rect.width = INT2FIX(width);
+				devt.screen_rect.height = INT2FIX(height);
+				devt.key_flags = scene->is_dynamic_scene ? (scene->is_live360 ? 2 : 1) : 0;
+
+				gf_scene_notify_event(scene, GF_EVENT_SCENE_SIZE, NULL, &devt, GF_OK, GF_FALSE);
+
+				skip_notif = GF_TRUE;
+
 				width = w;
 				height = h;
 			}
@@ -1809,17 +2057,22 @@
 		gf_sg_set_scene_size_info(scene->root_od->parentscene->graph, width, height, gf_sg_use_pixel_metrics(scene->root_od->parentscene->graph));
 		if (scene->root_od->term->root_scene == scene->root_od->parentscene) {
 			if (width && height) {
-				gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, 1);
+				gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, GF_TRUE);
 				gf_sc_set_size(scene->root_od->term->compositor, width, height);
 			}
 		}
 	}
-	gf_sg_set_scene_size_info(scene->graph, width, height, gf_sg_use_pixel_metrics(scene->graph));
+	gf_sg_set_scene_size_info(scene->graph, width, height, GF_TRUE);
+
+	if (scene->is_srd)
+		gf_scene_regenerate(scene);
 
 #ifndef GPAC_DISABLE_VRML
 	IS_UpdateVideoPos(scene);
 #endif
 
+	if (skip_notif) return;
+
 	gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
 }
 
@@ -2108,8 +2361,13 @@
 
 void scene_reset_addon(GF_AddonMedia *addon, Bool disconnect)
 {
-	if (disconnect && addon->root_od)
+	if (disconnect && addon->root_od) {
 		gf_odm_disconnect(addon->root_od, 1);
+	}
+	if (addon->root_od) {
+		addon->root_od->addon = NULL;
+	}
+
 	if (addon->url) gf_free(addon->url);
 	gf_free(addon);
 }
@@ -2170,8 +2428,22 @@
 		}
 		//this is an already received addon
 		if (my_addon) {
+			if (addon_info->disable_if_defined) {
+				addon->enabled = GF_FALSE;
+
+				if (addon->root_od) {
+					gf_scene_toggle_addons(scene, GF_FALSE);
+					gf_scene_remove_object(addon->root_od->parentscene, addon->root_od, 2);
+					gf_odm_disconnect(addon->root_od, 1);
+				}
+				if (addon->root_od) {
+					addon->root_od->addon = NULL;
+				}
+				return;
+			}
+
 			if (addon_info->enable_if_defined)
-				addon->enabled = 1;
+				addon->enabled = GF_TRUE;
 
 			//restart addon
 			if (!addon->root_od && addon->timeline_ready && addon->enabled) {
@@ -2260,14 +2532,6 @@
 	}
 
 
-	if (!addon->timeline_ready) {
-		addon->timeline_ready = GF_TRUE;
-		load_associated_media(scene, addon);
-	}
-
-	if (!addon->root_od) return;
-
-	gf_mx_p(addon->root_od->mx);
 	prev_time = (Double) addon->media_timestamp;
 	prev_time /= addon->media_timescale;
 
@@ -2288,21 +2552,45 @@
 		assert(addon_time->media_timescale);
 		assert(!addon->loop_detected);
 	}
-	gf_mx_v(addon->root_od->mx);
+
+	if (!addon->timeline_ready) {
+		addon->timeline_ready = GF_TRUE;
+		load_associated_media(scene, addon);
+	}
+
+	if ((addon->addon_type==GF_ADDON_TYPE_MAIN) && addon->root_od && addon->root_od->duration && !addon->root_od->timeshift_depth) {
+		Double dur, tsb;
+		dur = (Double) addon->root_od->duration;
+		dur /= 1000;
+		tsb = (Double) addon->media_timestamp;
+		tsb /= addon->media_timescale;
+		if (tsb>dur) tsb = dur;
+		addon->root_od->parentscene->root_od->timeshift_depth = (u32) (1000*tsb);
+		gf_scene_set_timeshift_depth(scene);
+	}
+
+	//and forward ntp if any to underlying service
+	if (addon_time->ntp && addon->root_od && addon->root_od->net_service) {
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(com));
+		com.addon_time = *addon_time;
+		gf_term_service_command(addon->root_od->net_service, &com);
+	}
 }
 
-void gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts)
+Bool gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts)
 {
 	u32 i;
 	GF_ObjectManager*odm;
 	GF_Scene *subscene;
+	GF_List *to_restart = NULL;
 
-	if (!addon || !addon->loop_detected) return;
+	if (!addon || !addon->loop_detected) return GF_FALSE;
 	//warning, we need to compare to media PTS/90 since we already rounded the media_ts to milliseconds (otherwise we would get rounding errors).
-	if ((cts == addon->past_media_pts_scaled) || (dts>=addon->past_media_pts_scaled) ) {
+	if ((cts == addon->past_media_pts_scaled) || (dts >= addon->past_media_pts_scaled) ) {
 	} else {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Loop not yet active - CTS "LLD" DTS "LLD" media TS "LLD" \n", cts, dts, addon->past_media_pts_scaled));
-		return;
+		return GF_FALSE;
 	}
 
 	gf_mx_p(addon->root_od->mx);
@@ -2322,20 +2610,29 @@
 
 	gf_mx_v(addon->root_od->mx);
 
+	to_restart = gf_list_new();
+
 	i=0;
 	while ((odm = (GF_ObjectManager*)gf_list_enum(subscene->resources, &i))) {
-		gf_odm_play(odm);
+		if (odm->state == GF_ODM_STATE_PLAY) {
+			gf_list_add(to_restart, odm);
+		}
+		gf_odm_stop(odm, GF_FALSE);
 	}
 
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
+		gf_odm_start(odm, 2);
+	}
+	gf_list_del(to_restart);
+	return GF_TRUE;
 }
 
-Double gf_scene_adjust_time_for_addon(GF_Scene *scene, Double clock_time, GF_AddonMedia *addon, u32 *timestamp_based)
+Double gf_scene_adjust_time_for_addon(GF_AddonMedia *addon, Double clock_time, u32 *timestamp_based)
 {
 	Double media_time;
 	if (!addon->timeline_ready)
 		return clock_time;
-	assert(scene->root_od->addon);
-	assert(scene->root_od->addon==addon);
 
 	if (timestamp_based)
 		*timestamp_based = (addon->timeline_id>=0) ? 0 : 1;
@@ -2349,18 +2646,14 @@
 	return media_time;
 }
 
-u64 gf_scene_adjust_timestamp_for_addon(GF_Scene *scene, u64 orig_ts, GF_AddonMedia *addon)
+s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts)
 {
 	s64 media_ts_ms;
 	assert(addon->timeline_ready);
-	assert(scene->root_od->addon);
-	assert(scene->root_od->addon==addon);
-
 	media_ts_ms = orig_ts;
 	media_ts_ms -= (addon->media_timestamp*1000) / addon->media_timescale;
 	media_ts_ms += (addon->media_pts/90);
-
-	return (u64) media_ts_ms;
+	return media_ts_ms;
 }
 
 void gf_scene_select_scalable_addon(GF_Scene *scene, GF_ObjectManager *odm)

v0.5.2.tar.gz/src/terminal/terminal.c -> v0.6.1.tar.gz/src/terminal/terminal.c Changed

@@ -78,8 +78,11 @@
 	evt.message.error = error;
 
 	if (no_filtering) {
-		if (term->user->EventProc)
+		if (term->user->EventProc) {
+			term->nb_calls_in_event_proc++;
 			term->user->EventProc(term->user->opaque, &evt);
+			term->nb_calls_in_event_proc--;
+		}
 	} else {
 		gf_term_send_event(term, &evt);
 	}
@@ -186,7 +189,7 @@
 			if (ck) {
 				Bool is_paused = ck->Paused;
 				if (is_paused) gf_clock_resume(ck);
-				gf_scene_restart_dynamic(scene, 0, 0);
+				gf_scene_restart_dynamic(scene, 0, 0, 0);
 				if (is_paused) gf_clock_pause(ck);
 			}
 			return 1;
@@ -236,9 +239,9 @@
 	loc->szAbsRelocatedPath = gf_url_concatenate(parent, path);
 	if (!loc->szAbsRelocatedPath) loc->szAbsRelocatedPath = gf_strdup(path);
 
-	f = gf_f64_open(loc->szAbsRelocatedPath, "rb");
+	f = gf_fopen(loc->szAbsRelocatedPath, "rb");
 	if (f) {
-		fclose(f);
+		gf_fclose(f);
 		strcpy(localized_rel_path, path);
 		strcpy(relocated_path, loc->szAbsRelocatedPath);
 		return 1;
@@ -350,6 +353,14 @@
 	}
 	term->frame_duration = atoi(sOpt);
 
+	sOpt = gf_cfg_get_key(term->user->config, "Network", "LowLatencyBufferMax");
+	if (!sOpt) {
+		sOpt = "500";
+		gf_cfg_set_key(term->user->config, "Network", "LowLatencyBufferMax", sOpt);
+	}
+	term->low_latency_buffer_max = atoi(sOpt);
+
+
 	if (!(term->user->init_flags & GF_TERM_NO_DECODER_THREAD) ) {
 		prio = GF_THREAD_PRIORITY_NORMAL;
 		sOpt = gf_cfg_get_key(term->user->config, "Systems", "Priority");
@@ -417,10 +428,13 @@
 static void gf_term_set_play_state(GF_Terminal *term, u32 PlayState, Bool reset_audio, Bool pause_clocks)
 {
 	Bool resume_live = 0;
+	u32 prev_state;
 
 	/*only play/pause if connected*/
 	if (!term || !term->root_scene) return;
 
+	prev_state = term->play_state;
+
 	if (PlayState==GF_STATE_PLAY_LIVE) {
 		PlayState = GF_STATE_PLAYING;
 		resume_live = 1;
@@ -440,16 +454,26 @@
 	else
 		gf_sc_set_option(term->compositor, GF_OPT_PLAY_STATE, PlayState);
 
-	/* if the current play state in the terminal is the same as the requested play state, we don't touch the clocks
-	 in particular, if the request is a step, if the clocks are paused, we leave them paused */
+	/* step mode specific */
 	if (PlayState==GF_STATE_STEP_PAUSE) {
-		//PlayState = term->play_state ? GF_STATE_PLAYING : GF_STATE_PAUSED;
+		if (prev_state==GF_STATE_PLAYING) {
+			mediacontrol_pause(term->root_scene->root_od);
+			term->play_state = GF_STATE_PAUSED;
+		} else {
+			u32 diff=1;
+			if (term->compositor->ms_until_next_frame>0) diff = term->compositor->ms_until_next_frame;
+			gf_term_step_clocks(term, diff);
+		}
 		return;
 	}
 
+	/* nothing to change*/
 	if (term->play_state == PlayState) return;
 	term->play_state = PlayState;
 
+	if (term->root_scene->pause_at_first_frame && (PlayState == GF_STATE_PLAYING))
+		term->root_scene->pause_at_first_frame = GF_FALSE;
+
 	if (!pause_clocks) return;
 
 	if (PlayState != GF_STATE_PLAYING) {
@@ -497,8 +521,10 @@
 
 	odm->media_start_time = startTime;
 	/*render first visual frame and pause*/
-	if (pause_at_first_frame)
+	if (pause_at_first_frame) {
 		gf_term_set_play_state(term, GF_STATE_STEP_PAUSE, 0, 0);
+		scene->pause_at_first_frame = GF_TRUE;
+	}
 
 	if (!strnicmp(URL, "views://", 8)) {
 		odm->OD = (GF_ObjectDescriptor *)gf_odf_desc_new(GF_ODF_OD_TAG);
@@ -534,9 +560,9 @@
 
 		force_delete = 0;
 		if (file) {
-			FILE *t = gf_f64_open(file, "r");
+			FILE *t = gf_fopen(file, "r");
 			if (!t) force_delete = 1;
-			else fclose(t);
+			else gf_fclose(t);
 		}
 		sscanf(opt, "%u", &exp);
 		gf_net_get_ntp(&sec, &frac);
@@ -809,7 +835,7 @@
 #ifndef GPAC_DISABLE_SCENE_DUMP
 		if (term->dcci_doc->modified) {
 			char *pref_file = (char *)gf_cfg_get_key(term->user->config, "General", "EnvironmentFile");
-			GF_SceneDumper *dumper = gf_sm_dumper_new(term->dcci_doc, pref_file, ' ', GF_SM_DUMP_AUTO_XML);
+			GF_SceneDumper *dumper = gf_sm_dumper_new(term->dcci_doc, pref_file, GF_FALSE, ' ', GF_SM_DUMP_AUTO_XML);
 			if (!dumper) return GF_IO_ERR;
 			e = gf_sm_dump_graph(dumper, 1, 0);
 			gf_sm_dumper_del(dumper);
@@ -825,31 +851,51 @@
 	return e;
 }
 
-
-
 GF_EXPORT
 GF_Err gf_term_step_clocks(GF_Terminal * term, u32 ms_diff)
 {
-	u32 i, j;
-	GF_ClientService *ns;
 	/*only play/pause if connected*/
 	if (!term || !term->root_scene || !term->root_scene->root_od) return GF_BAD_PARAM;
-	if (term->play_state == GF_STATE_PLAYING) return GF_BAD_PARAM;
 
-	gf_sc_lock(term->compositor, 1);
-	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+	if (ms_diff) {
+		u32 i, j;
+		GF_ClientService *ns;
 		GF_Clock *ck;
-		j=0;
-		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
-			ck->init_time += ms_diff;
+
+		if (term->play_state == GF_STATE_PLAYING) return GF_BAD_PARAM;
+
+		gf_sc_lock(term->compositor, 1);
+		i=0;
+		while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+			j=0;
+			while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
+				ck->init_time += ms_diff;
+				ck->media_time_at_init += ms_diff;
+				//make sure we don't touch clock while doing resume/pause below
+				ck->Paused ++;
+			}
+		}
+		term->compositor->step_mode = 1;
+		gf_sc_next_frame_state(term->compositor, GF_SC_DRAW_FRAME);
+
+		//resume/pause to trigger codecs state change
+		mediacontrol_resume(term->root_scene->root_od, 0);
+		mediacontrol_pause(term->root_scene->root_od);
+
+		//release our safety
+		i=0;
+		while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+			j=0;
+			while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
+				ck->Paused --;
+			}
 		}
+
+		gf_sc_lock(term->compositor, 0);
+
 	}
-	term->compositor->step_mode = 1;
-	term->compositor->audio_renderer->step_mode = 1;
 
-	gf_sc_next_frame_state(term->compositor, GF_SC_DRAW_FRAME);
-	gf_sc_lock(term->compositor, 0);
+	gf_sc_flush_next_audio(term->compositor);
 	return GF_OK;
 }
 
@@ -875,7 +921,15 @@
 void gf_term_disconnect(GF_Terminal *term)
 {
 	Bool handle_services;
-	if (!term->root_scene) return;
+	if (!term || !term->root_scene) return;
+
+	if (term->nb_calls_in_event_proc) {
+		if (!term->disconnect_request_status)
+			term->disconnect_request_status = 1;
+
+		return;
+	}
+
 	/*resume*/
 	if (term->play_state != GF_STATE_PLAYING) gf_term_set_play_state(term, GF_STATE_PLAYING, 1, 1);
 
@@ -1071,6 +1125,15 @@
 {
 	GF_ClientService *ns;
 
+
+	if (term->disconnect_request_status == 1) {
+		term->disconnect_request_status = 2;
+		term->thread_id_handling_services = gf_th_id();
+		gf_term_disconnect(term);
+		return;
+	}
+
+
 	/*we could run into a deadlock if some thread has requested opening of a URL. If we cannot
 	grab the media queue now, we'll do our management at the next cycle*/
 	if (!gf_mx_try_lock(term->media_queue_mx))
@@ -1649,7 +1712,7 @@
 			gf_term_set_play_state(term, GF_STATE_STEP_PAUSE, 0, 0);
 
 		gf_sc_lock(term->compositor, 1);
-		gf_scene_restart_dynamic(term->root_scene, from_time, 0);
+		gf_scene_restart_dynamic(term->root_scene, from_time, 0, 0);
 		gf_sc_lock(term->compositor, 0);
 		return 2;
 	}
@@ -1988,7 +2051,7 @@
 GF_EXPORT
 Bool gf_term_forward_event(GF_Terminal *term, GF_Event *evt, Bool consumed, Bool forward_only)
 {
-	if (!term) return 0;
+	if (!term) return GF_FALSE;
 
 	if (term->event_filters) {
 		GF_TermEventFilter *ef;
@@ -2000,16 +2063,21 @@
 		while ((ef=gf_list_enum(term->event_filters, &i))) {
 			if (ef->on_event(ef->udta, evt, consumed)) {
 				term->in_event_filter --;
-				return 1;
+				return GF_TRUE;
 			}
 		}
 		term->in_event_filter --;
 	}
 
-	if (!forward_only && !consumed && term->user->EventProc)
-		return term->user->EventProc(term->user->opaque, evt);
+	if (!forward_only && !consumed && term->user->EventProc) {
+		Bool res;
+		term->nb_calls_in_event_proc++;
+		res = term->user->EventProc(term->user->opaque, evt);
+		term->nb_calls_in_event_proc--;
+		return res;
+	}
 
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -2091,7 +2159,7 @@
 }
 
 GF_EXPORT
-void gf_term_set_speed(GF_Terminal *term, Fixed speed)
+GF_Err gf_term_set_speed(GF_Terminal *term, Fixed speed)
 {
 	Double fps;
 	u32 i, j;
@@ -2100,9 +2168,23 @@
 	Bool restart = 0;
 	u32 scene_time = gf_term_get_time_in_ms(term);
 
-	if (!speed) return;
+	if (!speed) return GF_BAD_PARAM;
 
-	/*adjust all clocks on all services*/
+	if (speed<0) {
+		i=0;
+		while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+			GF_NetworkCommand com;
+			GF_Err e;
+			memset(&com, 0, sizeof(GF_NetworkCommand));
+			com.base.command_type = GF_NET_SERVICE_CAN_REVERSE_PLAYBACK;
+			e = gf_term_service_command(ns, &com);
+			if (e != GF_OK) {
+				return e;
+			}
+		}
+	}
+
+	/*adjust all clocks on all services, if possible*/
 	i=0;
 	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
 		GF_Clock *ck;
@@ -2110,7 +2192,8 @@
 		j=0;
 		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
 			//we will have to reissue a PLAY command since playback direction changed
-			if ( gf_mulfix(ck->speed,speed) < 0) restart = 1;
+			if ( gf_mulfix(ck->speed,speed) < 0)
+				restart = 1;
 			gf_clock_set_speed(ck, speed);
 
 			if (ns->owner) {
@@ -2129,7 +2212,7 @@
 
 	if (restart) {
 		if (term->root_scene->is_dynamic_scene) {
-			gf_scene_restart_dynamic(term->root_scene, scene_time, 0);
+			gf_scene_restart_dynamic(term->root_scene, scene_time, 0, 0);
 		} else {
 		}
 	}
@@ -2148,6 +2231,8 @@
 	fps *= FIX2FLT(speed);
 	if (fps>100) fps = 1000;
 	gf_sc_set_fps(term->compositor, fps);
+
+	return GF_OK;
 }
 
 GF_EXPORT
@@ -2387,6 +2472,13 @@
 			odm->net_service->ifce->ServiceCommand(odm->net_service->ifce, &net_cmd);
 		if (odm->subscene)
 			gf_scene_switch_quality(odm->subscene, up);
+
+		if (odm->scalable_addon) {
+			if (up)
+				gf_odm_start(odm, 0);
+			else
+				gf_odm_stop(odm, GF_FALSE);
+		}
 	}
 }
 
@@ -2403,4 +2495,10 @@
 	if (width) *width = term->compositor->vp_width;
 	if (height) *height = term->compositor->vp_height;
 	return GF_OK;
-}
\ No newline at end of file
+}
+
+GF_EXPORT
+u32 gf_term_get_clock(GF_Terminal *term)
+{
+	return gf_sc_ar_get_clock(term->compositor->audio_renderer);
+}

v0.5.2.tar.gz/src/utils/alloc.c -> v0.6.1.tar.gz/src/utils/alloc.c Changed

@@ -23,13 +23,11 @@
 *
 */
 
-#if !defined(WIN32) && !defined(_WIN32_WCE)
-/* This is needed for asprintf */
+#if defined(__GNUC__) && __GNUC__ >= 4
 #define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <stdarg.h>
-#endif
-
 #include <string.h>
 
 
@@ -145,34 +143,34 @@
 /*GPAC memory tracking*/
 #ifndef GPAC_MEMORY_TRACKING
 
-CDECL
+#include <gpac/setup.h>
+GF_EXPORT
 void *gf_malloc(size_t size)
 {
 	return MALLOC(size);
 }
-CDECL
+GF_EXPORT
 void *gf_calloc(size_t num, size_t size_of)
 {
 	return CALLOC(num, size_of);
 }
-CDECL
+GF_EXPORT
 void *gf_realloc(void *ptr, size_t size)
 {
 	return REALLOC(ptr, size);
 }
-CDECL
+GF_EXPORT
 void gf_free(void *ptr)
 {
 	FREE(ptr);
 }
-CDECL
+GF_EXPORT
 char *gf_strdup(const char *str)
 {
 	STRDUP(str);
 }
 
-#else
-
+#else /*GPAC_MEMORY_TRACKING**/
 
 size_t gpac_allocated_memory = 0;
 size_t gpac_nb_alloc_blocs = 0;
@@ -181,6 +179,91 @@
 #define assert(p)
 #endif
 
+
+//#define GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+
+#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+
+#define BACKTRACE_PRINT(prefix) "file %s at line %d\n%s\n", prefix filename, prefix line, prefix backtrace
+#define BACKTRACE_PRINT0 BACKTRACE_PRINT((char*))
+#define BACKTRACE_ARGS char *backtrace
+#define BACKTRACE_CALL backtrace
+
+/*malloc dynamic storage needed for each alloc is STACK_PRINT_SIZE*SYMBOL_MAX_SIZE+1, keep them small!*/
+#define STACK_FIRST_IDX 5 //remove the gpac memory allocator self trace
+#define STACK_PRINT_SIZE 10
+#define SYMBOL_MAX_SIZE 50
+
+#ifdef WIN32
+#include <windows.h>
+#include <dbghelp.h>
+#pragma comment(lib, "dbghelp.lib")
+/*memory ownership to the caller*/
+static void print_backtrace(char *backtrace)
+{
+	void *stack[STACK_PRINT_SIZE];
+	size_t i, frames, bt_idx = 0;
+	SYMBOL_INFO *symbol;
+	HANDLE process;
+
+	process = GetCurrentProcess();
+	SymInitialize(process, NULL, TRUE);
+
+	symbol = (SYMBOL_INFO*)_alloca(sizeof(SYMBOL_INFO) + SYMBOL_MAX_SIZE);
+	symbol->MaxNameLen = SYMBOL_MAX_SIZE-1;
+	symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
+
+	frames = CaptureStackBackTrace(STACK_FIRST_IDX, STACK_PRINT_SIZE, stack, NULL);
+
+	for (i=0; i<frames; i++) {
+		int len;
+		char *symbol_name = "unresolved";
+		SymFromAddr(process, (DWORD64)(stack[i]), 0, symbol);
+		if (symbol->Name) symbol_name = (char*)symbol->Name;
+		len = _snprintf(backtrace+bt_idx, SYMBOL_MAX_SIZE-1, "\t%02u 0x%I64X %s", (unsigned int) (frames-i-1), symbol->Address, symbol_name);
+		if (len<0) len = SYMBOL_MAX_SIZE-1;
+		backtrace[bt_idx+len]='\n';
+		bt_idx += (len+1);
+	}
+	assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
+	backtrace[bt_idx-1] = '\0';
+}
+#else /*WIN32*/
+#include <execinfo.h>
+/*memory ownership to the caller*/
+static char* backtrace()
+{
+	size_t i, size, bt_idx=0;
+	void *stack[STACK_PRINT_SIZE];
+	char **messages;
+
+	size = backtrace(stack, STACK_PRINT_SIZE);
+	messages = backtrace_symbols(stack, size);
+
+	for (i=1; i<size && messages!=NULL; ++i) {
+		int len = _snprintf(backtrace+bt_idx, SYMBOL_MAX_SIZE-1, "\t%02u %s", i, messages[i]);
+		if (len<0) len = SYMBOL_MAX_SIZE-1;
+		backtrace[bt_idx+len]='\n';
+		bt_idx += (len+1);
+	}
+	assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
+	backtrace[bt_idx-1] = '\0';
+	free(messages);
+}
+#endif /*WIN32*/
+
+#else /*GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE*/
+
+#define BACKTRACE_PRINT1(prefix) BACKTRACE_PRINT2(prefix, prefix)
+#define BACKTRACE_PRINT0 BACKTRACE_PRINT2((char*), (int))
+#define BACKTRACE_PRINT(prefix) BACKTRACE_PRINT1(prefix)
+#define BACKTRACE_PRINT2(prefix1, prefix2) " file %s at line %d\n", prefix1 filename, prefix2 line
+#define BACKTRACE_ARGS const char *filename, int line
+#define BACKTRACE_CALL filename, line
+
+#endif /*GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE*/
+
+
 static void register_address(void *ptr, size_t size, const char *filename, int line);
 static int unregister_address(void *ptr, const char *filename, int line);
 
@@ -229,7 +312,8 @@
 	} else {
 		register_address(ptr, size, filename, line);
 	}
-	gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] malloc %3d bytes at %p\n in file %s at line %d\n", size, ptr, filename, line);
+	gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] malloc %3d bytes at %p in:\n", size, ptr);
+	gf_memory_log(GF_MEMORY_DEBUG, " file %s at line %d\n" , filename, line);
 	return ptr;
 }
 
@@ -243,7 +327,8 @@
 	} else {
 		register_address(ptr, size, filename, line);
 	}
-	gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] calloc %3d bytes at %p\n in file %s at line %d\n", size, ptr, filename, line);
+	gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] calloc %3d bytes at %p in:\n", ptr, size);
+	gf_memory_log(GF_MEMORY_DEBUG, " file %s at line %d\n" , filename, line);
 	return ptr;
 }
 
@@ -251,7 +336,8 @@
 {
 	int size_prev;
 	if (ptr && (size_prev=unregister_address(ptr, filename, line))) {
-		gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] free %3d bytes at %p\n in file %s at line %d\n", size_prev, ptr, filename, line);
+		gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] free %3d bytes at %p in:\n", size_prev, ptr);
+		gf_memory_log(GF_MEMORY_DEBUG, " file %s at line %d\n" , filename, line);
 		FREE(ptr);
 	}
 }
@@ -278,7 +364,8 @@
 	} else {
 		size_prev = unregister_address(ptr, filename, line);
 		register_address(ptr_g, size, filename, line);
-		gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] realloc %3d (instead of %3d) bytes at %p (instead of %p)\n in file %s at line %d\n", size, size_prev, ptr_g, ptr, filename, line);
+		gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] realloc %3d (instead of %3d) bytes at %p (instead of %p)\n", size, size_prev, ptr_g, ptr);
+		gf_memory_log(GF_MEMORY_DEBUG, " file %s at line %d\n" , filename, line);
 	}
 	return ptr_g;
 }
@@ -356,6 +443,9 @@
 	void *ptr;
 	int size;
 	struct s_memory_element *next;
+#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+	char backtrace[STACK_PRINT_SIZE*SYMBOL_MAX_SIZE];
+#endif
 	int line;
 	char *filename;
 } memory_element;
@@ -365,7 +455,11 @@
 
 static unsigned int gf_memory_hash(void *ptr)
 {
-	return (((unsigned int)ptr>>4)+(unsigned int)ptr)%HASH_ENTRIES;
+#if defined(WIN32)
+	return (unsigned int) ( (((unsigned __int64)ptr>>4)+(unsigned __int64)ptr) % HASH_ENTRIES );
+#else
+	return (((unsigned int)ptr >> 4) + (unsigned int)ptr) % HASH_ENTRIES;
+#endif
 }
 
 #else
@@ -375,8 +469,12 @@
 	void *ptr;
 	int size;
 	struct s_memory_element *next;
+#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+	char *backtrace;
+#else
 	int line;
 	char *filename;
+#endif
 } memory_element;
 
 /*pointer to the first element of the list*/
@@ -391,10 +489,13 @@
 	memory_element *element = (memory_element*)MALLOC(sizeof(memory_element)+strlen(filename)+1);
 	element->ptr = ptr;
 	element->size = size;
+#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+	print_backtrace(element->backtrace);
+#endif
 	element->line = line;
-	element->next = *p;
 	element->filename = (char*)&(element->filename)+sizeof(element->filename);
 	strcpy(element->filename, filename);
+	element->next = *p;
 	*p = element;
 }
 
@@ -542,7 +643,7 @@
 	/*lock*/
 	gf_mx_p(gpac_allocations_lock);
 
-	gf_memory_add(&memory_add, ptr, (int) size, filename, line);
+	gf_memory_add(&memory_add, ptr, (int)size, filename, line);
 	gf_memory_del_item(&memory_rem, ptr); /*the same block can be reallocated, so remove it from the deallocation list*/
 
 	/*update stats*/
@@ -571,7 +672,8 @@
 		for (i=1; i<pos; i++)
 			element = element->next;
 		assert(element);
-		gf_memory_log(GF_MEMORY_ERROR, "[MemTracker] the block %p has already been freed\n in file %s at line %d\n", ptr, element->filename, element->line);
+		gf_memory_log(GF_MEMORY_ERROR, "[MemTracker] the block %p was already freed in:\n", ptr);
+		gf_memory_log(GF_MEMORY_ERROR, BACKTRACE_PRINT(element->));
 		assert(0);
 	}
 	/*unlock*/
@@ -613,7 +715,10 @@
 				for (i=1; i<pos; i++)
 					element = element->next;
 				assert(element);
-				gf_memory_log(GF_MEMORY_ERROR, "[MemTracker] the block %p trying to be deleted\n in file %s at line %d\n has already been freed\n in file %s at line %d\n", ptr, filename, line, element->filename, element->line);
+				gf_memory_log(GF_MEMORY_ERROR, "[MemTracker] the block %p trying to be deleted in:\n", ptr);
+				gf_memory_log(GF_MEMORY_ERROR, " file %s at line %d\n", filename, line);
+				gf_memory_log(GF_MEMORY_ERROR, " was already freed in:\n");
+				gf_memory_log(GF_MEMORY_ERROR, BACKTRACE_PRINT(element->));
 				assert(0);
 			}
 		} else {
@@ -687,7 +792,7 @@
 		int i=0;
 		assert(gpac_allocations_lock);
 
-		gf_memory_log(GF_MEMORY_INFO, "\n[MemTracker] Printing the current state of allocations:\n");
+		gf_memory_log(GF_MEMORY_INFO, "\n[MemTracker] Printing the current state of allocations (%d open file handles) :\n", gf_file_handles_count());
 
 		/*lock*/
 		gf_mx_p(gpac_allocations_lock);
@@ -705,7 +810,9 @@
 				size = curr_element->size>=50 ? 49 : curr_element->size;
 				memcpy(szVal, curr_element->ptr, sizeof(char)*size);
 				szVal[size+1] = 0;
-				gf_memory_log(GF_MEMORY_INFO, "[MemTracker] Memory Block %p (size %d) allocated\n\tin file %s at line %d\n\tstring dump: %s\n", curr_element->ptr, curr_element->size, curr_element->filename, curr_element->line, szVal);
+				gf_memory_log(GF_MEMORY_INFO, "[MemTracker] Memory Block %p (size %d) allocated in:\n", curr_element->ptr, curr_element->size);
+				gf_memory_log(GF_MEMORY_INFO, BACKTRACE_PRINT(curr_element->));
+				gf_memory_log(GF_MEMORY_INFO, " string dump: %s\n", szVal);
 				curr_element = next_element;
 			}
 		}

v0.5.2.tar.gz/src/utils/base_encoding.c -> v0.6.1.tar.gz/src/utils/base_encoding.c Changed

v0.5.2.tar.gz/src/utils/bitstream.c -> v0.6.1.tar.gz/src/utils/bitstream.c Changed

@@ -135,10 +135,10 @@
 	tmp->stream = f;
 
 	/*get the size of this file (for read streams)*/
-	tmp->position = gf_f64_tell(f);
-	gf_f64_seek(f, 0, SEEK_END);
-	tmp->size = gf_f64_tell(f);
-	gf_f64_seek(f, tmp->position, SEEK_SET);
+	tmp->position = gf_ftell(f);
+	gf_fseek(f, 0, SEEK_END);
+	tmp->size = gf_ftell(f);
+	gf_fseek(f, tmp->position, SEEK_SET);
 	return tmp;
 }
 
@@ -161,7 +161,7 @@
 		return GF_OK;
 	}
 	bs_flush_cache(bs);
-	bs->buffer_io = gf_realloc(bs->buffer_io, size);
+	bs->buffer_io = (char*)gf_realloc(bs->buffer_io, size);
 	if (!bs->buffer_io) return GF_IO_ERR;
 	bs->buffer_io_size = size;
 	bs->buffer_written = 0;
@@ -193,7 +193,7 @@
 	switch (bs->bsmode) {
 	case GF_BITSTREAM_READ:
 	case GF_BITSTREAM_FILE_READ:
-		return ( (8 == bs->nbBits) ? 1 : 0);
+		return ( (8 == bs->nbBits) ? GF_TRUE : GF_FALSE);
 	default:
 		return !bs->nbBits;
 	}
@@ -668,7 +668,7 @@
 				if (bs->buffer_written + nbBytes > bs->buffer_io_size) {
 					bs_flush_cache(bs);
 					if (nbBytes>bs->buffer_io_size) {
-						bs->buffer_io = gf_realloc(bs->buffer_io, 2*nbBytes);
+						bs->buffer_io = (char*)gf_realloc(bs->buffer_io, 2*nbBytes);
 						bs->buffer_io_size = 2*nbBytes;
 					}
 				}
@@ -737,10 +737,10 @@
 	if (bs->buffer_io)
 		bs_flush_cache(bs);
 
-	cur = gf_f64_tell(bs->stream);
-	gf_f64_seek(bs->stream, 0, SEEK_END);
-	end = gf_f64_tell(bs->stream);
-	gf_f64_seek(bs->stream, cur, SEEK_SET);
+	cur = gf_ftell(bs->stream);
+	gf_fseek(bs->stream, 0, SEEK_END);
+	end = gf_ftell(bs->stream);
+	gf_fseek(bs->stream, cur, SEEK_SET);
 	return (u64) (end - cur);
 }
 
@@ -805,7 +805,7 @@
 	if ((bs->bsmode == GF_BITSTREAM_FILE_WRITE) || (bs->bsmode == GF_BITSTREAM_FILE_READ)) {
 		if (bs->buffer_io)
 			bs_flush_cache(bs);
-		gf_f64_seek(bs->stream, nbBytes, SEEK_CUR);
+		gf_fseek(bs->stream, nbBytes, SEEK_CUR);
 		bs->position += nbBytes;
 		return;
 	}
@@ -839,7 +839,7 @@
 	return;
 }
 
-/*seek from begining of stream: use internally even when non aligned!*/
+/*seek from beginning of stream: use internally even when non aligned!*/
 static GF_Err BS_SeekIntern(GF_BitStream *bs, u64 offset)
 {
 	u32 i;
@@ -868,7 +868,7 @@
 	if (bs->buffer_io)
 		bs_flush_cache(bs);
 
-	gf_f64_seek(bs->stream, offset, SEEK_SET);
+	gf_fseek(bs->stream, offset, SEEK_SET);
 
 	bs->position = offset;
 	bs->current = 0;
@@ -877,7 +877,7 @@
 	return GF_OK;
 }
 
-/*seek from begining of stream: align before anything else*/
+/*seek from beginning of stream: align before anything else*/
 GF_EXPORT
 GF_Err gf_bs_seek(GF_BitStream *bs, u64 offset)
 {
@@ -890,7 +890,7 @@
 
 /*peek bits (as int!!) from orig position (ON BYTE BOUNDARIES, from 0) - only for read ...*/
 GF_EXPORT
-u32 gf_bs_peek_bits(GF_BitStream *bs, u32 numBits, u32 byte_offset)
+u32 gf_bs_peek_bits(GF_BitStream *bs, u32 numBits, u64 byte_offset)
 {
 	u64 curPos;
 	u32 curBits, ret, current;
@@ -927,10 +927,10 @@
 	default:
 		if (bs->buffer_io)
 			bs_flush_cache(bs);
-		offset = gf_f64_tell(bs->stream);
-		gf_f64_seek(bs->stream, 0, SEEK_END);
-		bs->size = gf_f64_tell(bs->stream);
-		gf_f64_seek(bs->stream, offset, SEEK_SET);
+		offset = gf_ftell(bs->stream);
+		gf_fseek(bs->stream, 0, SEEK_END);
+		bs->size = gf_ftell(bs->stream);
+		gf_fseek(bs->stream, offset, SEEK_SET);
 		return bs->size;
 	}
 }
@@ -1084,7 +1084,7 @@
 	case GF_BITSTREAM_FILE_WRITE:
 	case GF_BITSTREAM_FILE_READ:
 		bs->stream = stream;
-		if (gf_f64_tell(stream) != bs->position)
+		if (gf_ftell(stream) != bs->position)
 			gf_bs_seek(bs, bs->position);
 		break;
 	}

v0.5.2.tar.gz/src/utils/cache.c -> v0.6.1.tar.gz/src/utils/cache.c Changed

@@ -1,27 +1,27 @@
 /*
-*					GPAC Multimedia Framework
-*
+ *					GPAC Multimedia Framework
+ *
 *			Authors: Pierre Souchay, Jean Le Feuvre
 *			Copyright (c) Telecom ParisTech 2010-2012
-*					All rights reserved
-*
-* This file is part of GPAC / common tools sub-project
-*
-* GPAC 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, or (at your option)
-* any later version.
-*
-* GPAC 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 this library; see the file COPYING. If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
+ *					All rights reserved
+ *
+ * This file is part of GPAC / common tools sub-project
+ *
+ * GPAC 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, or (at your option)
+ * any later version.
+ *
+ * GPAC 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 this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
@@ -42,17 +42,11 @@
 #endif
 
 static const char * CACHE_SECTION_NAME = "cache";
-
 static const char * CACHE_SECTION_NAME_URL = "url";
-
 static const char * CACHE_SECTION_NAME_RANGE = "range";
-
 static const char * CACHE_SECTION_NAME_ETAG = "ETag";
-
 static const char * CACHE_SECTION_NAME_MIME_TYPE = "Content-Type";
-
 static const char * CACHE_SECTION_NAME_CONTENT_SIZE = "Content-Length";
-
 static const char * CACHE_SECTION_NAME_LAST_MODIFIED = "Last-Modified";
 
 enum CacheValid
@@ -162,7 +156,8 @@
 	Bool file_exists;
 
 	u32 previousRangeContentLength;
-
+	/*set once headers have been processed*/
+	Bool headers_done;
 	/**
 	* Set to 1 if file is not stored on disk
 	*/
@@ -190,18 +185,18 @@
 
 GF_Err gf_cache_delete_all_cached_files(const char * directory) {
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Deleting cached files in %s...\n", directory));
-	return gf_enum_directory( directory, 0, delete_cache_files, (void*)cache_file_prefix, NULL);
+	return gf_enum_directory( directory, GF_FALSE, delete_cache_files, (void*)cache_file_prefix, NULL);
 }
 
 void gf_cache_entry_set_delete_files_when_deleted(const DownloadedCacheEntry entry) {
 	if (entry)
-		entry->deletableFilesOnDelete = 1;
+		entry->deletableFilesOnDelete = GF_TRUE;
 }
 
 Bool gf_cache_entry_is_delete_files_when_deleted(const DownloadedCacheEntry entry)
 {
 	if (!entry)
-		return 0;
+		return GF_FALSE;
 	return entry->deletableFilesOnDelete;
 }
 
@@ -226,6 +221,21 @@
 	return entry ? entry->mimeType : NULL;
 }
 
+
+GF_Err gf_cache_set_headers_processed(const DownloadedCacheEntry entry)
+{
+	if (!entry) return GF_BAD_PARAM;
+	entry->headers_done = GF_TRUE;
+	return GF_OK;
+}
+
+Bool gf_cache_are_headers_processed(const DownloadedCacheEntry entry)
+{
+	if (!entry) return GF_FALSE;
+	return entry->headers_done;
+}
+
+
 GF_Err gf_cache_set_etag_on_server(const DownloadedCacheEntry entry, const char * eTag ) {
 	if (!entry)
 		return GF_BAD_PARAM;
@@ -255,7 +265,7 @@
 
 Bool gf_cache_is_cached_on_disk(const DownloadedCacheEntry entry ) {
 	if (entry == NULL)
-		return 0;
+		return GF_FALSE;
 	return entry->flags & NO_CACHE;
 }
 
@@ -369,11 +379,8 @@
 }
 
 #define _CACHE_HASH_SIZE 20
-
 #define _CACHE_MAX_EXTENSION_SIZE 6
-
 static const char * default_cache_file_suffix = ".dat";
-
 static const char * cache_file_info_suffix = ".txt";
 
 DownloadedCacheEntry gf_cache_create_entry ( GF_DownloadManager * dm, const char * cache_directory, const char * url , u64 start_range, u64 end_range, Bool mem_storage)
@@ -450,15 +457,15 @@
 	}
 #endif
 
-	entry->deletableFilesOnDelete = 0;
+	entry->deletableFilesOnDelete = GF_FALSE;
 	entry->write_session = NULL;
 	entry->sessions = gf_list_new();
 
 	if (entry->memory_stored) {
-		entry->cache_filename = gf_malloc ( strlen ("gmem://") + 8 + strlen("@") + 16 + 1);
+		entry->cache_filename = (char*)gf_malloc ( strlen ("gmem://") + 8 + strlen("@") + 16 + 1);
 	} else {
 		/* Sizeof cache directory + hash + possible extension */
-		entry->cache_filename = gf_malloc ( strlen ( cache_directory ) + strlen(cache_file_prefix) + strlen(tmp) + _CACHE_MAX_EXTENSION_SIZE + 1);
+		entry->cache_filename = (char*)gf_malloc ( strlen ( cache_directory ) + strlen(cache_file_prefix) + strlen(tmp) + _CACHE_MAX_EXTENSION_SIZE + 1);
 	}
 
 	if ( !entry->hash || !entry->url || !entry->cache_filename || !entry->sessions)
@@ -467,7 +474,9 @@
 		/* Probably out of memory */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
 		err = gf_cache_delete_entry ( entry );
-		assert ( err == GF_OK );
+		if ( err != GF_OK ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, failed to delete cache entry!\n", __LINE__));
+		}
 		return NULL;
 	}
 
@@ -511,7 +520,9 @@
 		/* OUT of memory ? */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
 		err = gf_cache_delete_entry ( entry );
-		assert ( err == GF_OK );
+		if ( err != GF_OK ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, failed to delete cache entry!\n", __LINE__));
+		}
 		return NULL;
 	}
 	gf_cache_set_etag_on_disk(entry, gf_cfg_get_key(entry->properties, CACHE_SECTION_NAME, CACHE_SECTION_NAME_ETAG));
@@ -538,7 +549,8 @@
 	return entry;
 }
 
-GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length ) {
+GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length )
+{
 	CHECK_ENTRY;
 	if (entry->continue_file) {
 		entry->contentLength = entry->previousRangeContentLength + length;
@@ -548,11 +560,13 @@
 	return GF_OK;
 }
 
-u32 gf_cache_get_content_length( const DownloadedCacheEntry entry) {
+u32 gf_cache_get_content_length( const DownloadedCacheEntry entry)
+{
 	return entry ? entry->contentLength : 0;
 }
 
-GF_Err gf_cache_close_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, Bool success ) {
+GF_Err gf_cache_close_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, Bool success )
+{
 	GF_Err e = GF_OK;
 	CHECK_ENTRY;
 	if (!sess || !entry->write_session || entry->write_session != sess)
@@ -562,7 +576,7 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK,
 		 ("[CACHE] Closing file %s, %d bytes written.\n", entry->cache_filename, entry->written_in_cache));
 
-		if (fflush( entry->writeFilePtr ) || fclose( entry->writeFilePtr )) {
+		if (fflush( entry->writeFilePtr ) || gf_fclose( entry->writeFilePtr )) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush/close file on disk\n"));
 			e = GF_IO_ERR;
 		}
@@ -606,8 +620,8 @@
 	return e;
 }
 
-
-GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess ) {
+GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess )
+{
 	CHECK_ENTRY;
 	if (!sess)
 		return GF_BAD_PARAM;
@@ -623,13 +637,12 @@
 	}
 	entry->flags &= ~CORRUPTED;
 
-
 	if (entry->memory_stored) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
 		if (!entry->mem_allocated || (entry->mem_allocated < entry->contentLength)) {
 			if (entry->contentLength) entry->mem_allocated = entry->contentLength;
 			else if (!entry->mem_allocated) entry->mem_allocated = 81920;
-			entry->mem_storage = gf_realloc(entry->mem_storage, sizeof(char)* (entry->mem_allocated + 2) );
+			entry->mem_storage = (u8*)gf_realloc(entry->mem_storage, sizeof(char)* (entry->mem_allocated + 2) );
 		}
 		if (!entry->mem_allocated) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to create memory storage for file %s\n", entry->url));
@@ -640,7 +653,7 @@
 	}
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
-	entry->writeFilePtr = gf_f64_open(entry->cache_filename, entry->continue_file ? "a+b" : "wb");
+	entry->writeFilePtr = gf_fopen(entry->cache_filename, entry->continue_file ? "a+b" : "wb");
 	if (!entry->writeFilePtr) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK,
 		 ("[CACHE] Error while opening cache file %s for writting.\n", entry->cache_filename));
@@ -650,9 +663,9 @@
 #endif
 		return GF_IO_ERR;
 	}
-	entry->file_exists = 1;
+	entry->file_exists = GF_TRUE;
 	if (entry->continue_file )
-		gf_f64_seek(entry->writeFilePtr, 0, SEEK_END);
+		gf_fseek(entry->writeFilePtr, 0, SEEK_END);
 	return GF_OK;
 }
 
@@ -668,7 +681,7 @@
 	if (entry->memory_stored) {
 		if (entry->written_in_cache + size > entry->mem_allocated) {
 			u32 new_size = MAX(entry->mem_allocated*2, entry->written_in_cache + size);
-			entry->mem_storage = gf_realloc(entry->mem_storage, (new_size+2));
+			entry->mem_storage = (u8*)gf_realloc(entry->mem_storage, (new_size+2));
 			entry->mem_allocated = new_size;
 			sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Reallocating memory cache to %d bytes\n", new_size));
@@ -689,14 +702,14 @@
 		/* Something bad happened */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
 		 ("[CACHE] Error while writting %d bytes of data to cache : has written only %d bytes.", size, read));
-		gf_cache_close_write_cache(entry, sess, 0);
+		gf_cache_close_write_cache(entry, sess, GF_FALSE);
 		gf_delete_file(entry->cache_filename);
 		return GF_IO_ERR;
 	}
 	if (fflush(entry->writeFilePtr)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
 		 ("[CACHE] Error while flushing data bytes to cache file : %s.", entry->cache_filename));
-		gf_cache_close_write_cache(entry, sess, 0);
+		gf_cache_close_write_cache(entry, sess, GF_FALSE);
 		gf_delete_file(entry->cache_filename);
 		return GF_IO_ERR;
 	}
@@ -708,10 +721,10 @@
 	GF_CacheReader reader;
 	if (entry == NULL)
 		return NULL;
-	reader = gf_malloc(sizeof(struct __CacheReaderStruct));
+	reader = (GF_CacheReader)gf_malloc(sizeof(struct __CacheReaderStruct));
 	if (reader == NULL)
 		return NULL;
-	reader->readPtr = gf_f64_open( entry->cache_filename, "rb" );
+	reader->readPtr = gf_fopen( entry->cache_filename, "rb" );
 	reader->readPosition = 0;
 	if (!reader->readPtr) {
 		gf_cache_reader_del(reader);
@@ -724,7 +737,7 @@
 	if (!handle)
 		return GF_BAD_PARAM;
 	if (handle->readPtr)
-		fclose(handle->readPtr);
+		gf_fclose(handle->readPtr);
 	handle->readPtr = NULL;
 	handle->readPosition = -1;
 	return GF_OK;
@@ -733,7 +746,7 @@
 s64 gf_cache_reader_seek_at( GF_CacheReader reader, u64 seekPosition) {
 	if (!reader)
 		return -1;
-	reader->readPosition = gf_f64_seek(reader->readPtr, seekPosition, SEEK_SET);
+	reader->readPosition = gf_fseek(reader->readPtr, seekPosition, SEEK_SET);
 	return reader->readPosition;
 }
 
@@ -765,7 +778,7 @@
 	if (entry->writeFilePtr) {
 		/** Cache should have been close before, abornormal situation */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_delete_entry:%d, entry=%p, cache has not been closed properly\n", __LINE__, entry));
-		fclose(entry->writeFilePtr);
+		gf_fclose(entry->writeFilePtr);
 	}
 #ifdef ENABLE_WRITE_MX
 	if (entry->write_mutex) {
@@ -798,18 +811,15 @@
 		gf_free(entry->diskLastModified);
 	entry->diskLastModified = NULL;
 
-	if ( entry->hash )
-	{
+	if ( entry->hash ) {
 		gf_free ( entry->hash );
 		entry->hash = NULL;
 	}
-	if ( entry->url )
-	{
+	if ( entry->url ) {
 		gf_free ( entry->url );
 		entry->url = NULL;
 	}
-	if ( entry->mimeType )
-	{
+	if ( entry->mimeType ) {
 		gf_free ( entry->mimeType );
 		entry->mimeType = NULL;
 	}
@@ -817,13 +827,11 @@
 		gf_free(entry->mem_storage);
 	}
 
-	if ( entry->cache_filename )
-	{
+	if ( entry->cache_filename ) {
 		gf_free ( entry->cache_filename );
 		entry->cache_filename = NULL;
 	}
-	if ( entry->properties )
-	{
+	if ( entry->properties ) {
 		char * propfile;
 		if (entry->deletableFilesOnDelete)
 			propfile = gf_cfg_get_filename(entry->properties);
@@ -832,7 +840,7 @@
 		gf_cfg_del ( entry->properties );
 		entry->properties = NULL;
 		if (propfile) {
-			//this may fil becaus ethe prop file is not yet flushed to disk
+			//this may fail because the prop file is not yet flushed to disk
 			gf_delete_file( propfile );
 			gf_free ( propfile );
 		}
@@ -848,17 +856,16 @@
 	return GF_OK;
 }
 
-Bool gf_cache_check_if_cache_file_is_corrupted(const DownloadedCacheEntry entry) {
-
-	FILE *the_cache = gf_f64_open ( entry->cache_filename, "rb" );
-	if ( the_cache )
-	{
+Bool gf_cache_check_if_cache_file_is_corrupted(const DownloadedCacheEntry entry)
+{
+	FILE *the_cache = gf_fopen ( entry->cache_filename, "rb" );
+	if ( the_cache ) {
 		char * endPtr;
 		const char * keyValue = gf_cfg_get_key ( entry->properties, CACHE_SECTION_NAME, CACHE_SECTION_NAME_CONTENT_SIZE );
 
-		gf_f64_seek ( the_cache, 0, SEEK_END );
-		entry->cacheSize = ( u32 ) gf_f64_tell ( the_cache );
-		fclose ( the_cache );
+		gf_fseek ( the_cache, 0, SEEK_END );
+		entry->cacheSize = ( u32 ) gf_ftell ( the_cache );
+		gf_fclose ( the_cache );
 		if (keyValue) {
 			entry->contentLength = (u32) strtoul( keyValue, &endPtr, 10);
 			if (*endPtr!='\0' || entry->contentLength != entry->cacheSize) {
@@ -882,7 +889,7 @@
 		return -1;
 	count = gf_list_count(entry->sessions);
 	for (i = 0 ; i < (u32)count; i++) {
-		GF_DownloadSession * s = gf_list_get(entry->sessions, i);
+		GF_DownloadSession *s = (GF_DownloadSession*)gf_list_get(entry->sessions, i);
 		if (s == sess) {
 			gf_list_rem(entry->sessions, i);
 			count --;
@@ -894,8 +901,8 @@
 		* but we don't want to risk to have another session opening
 		* a not fully closed cache entry */
 		if (entry->writeFilePtr) {
-			if (fclose(entry->writeFilePtr)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] gf_cache_remove_session_from_cache_entry:%d, Failed to properly fclose cache file '%s' of url '%s', cache may be corrupted !\n", __LINE__, entry->cache_filename, entry->url));
+			if (gf_fclose(entry->writeFilePtr)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] gf_cache_remove_session_from_cache_entry:%d, Failed to properly close cache file '%s' of url '%s', cache may be corrupted !\n", __LINE__, entry->cache_filename, entry->url));
 			}
 		}
 		entry->writeFilePtr = NULL;
@@ -922,7 +929,7 @@
 		return -1;
 	count = gf_list_count(entry->sessions);
 	for (i = 0 ; i < (u32)count; i++) {
-		GF_DownloadSession * s = gf_list_get(entry->sessions, i);
+		GF_DownloadSession *s = (GF_DownloadSession*)gf_list_get(entry->sessions, i);
 		if (s == sess) {
 			return count;
 		}
@@ -937,21 +944,20 @@
 	return NULL;
 }
 
-
 void gf_cache_set_end_range(DownloadedCacheEntry entry, u64 range_end)
 {
 	entry->previousRangeContentLength = entry->contentLength;
 	entry->range_end = range_end;
-	entry->continue_file = 1;
+	entry->continue_file = GF_TRUE;
 }
 
 Bool gf_cache_is_in_progress(const DownloadedCacheEntry entry)
 {
-	if (!entry) return 0;
-	if (entry->writeFilePtr) return 1;
-	if (entry->mem_storage && entry->written_in_cache && entry->contentLength && (entry->written_in_cache<entry->contentLength) )
-		return 1;
-	return 0;
+	if (!entry) return GF_FALSE;
+	if (entry->writeFilePtr) return GF_TRUE;
+	if (entry->mem_storage && entry->written_in_cache && entry->contentLength && (entry->written_in_cache<entry->contentLength))
+		return GF_TRUE;
+	return GF_FALSE;
 }
 
 #endif

v0.5.2.tar.gz/src/utils/color.c -> v0.6.1.tar.gz/src/utils/color.c Changed

@@ -982,9 +982,9 @@
 	s32 src_row;
 	u32 i, yuv_planar_type = 0;
 	Bool no_memcpy;
-	Bool force_load_odd_yuv_lines = 0;
-	Bool yuv_init = 0;
-	Bool has_alpha = (alpha!=0xFF) ? 1 : 0;
+	Bool force_load_odd_yuv_lines = GF_FALSE;
+	Bool yuv_init = GF_FALSE;
+	Bool has_alpha = (alpha!=0xFF) ? GF_TRUE : GF_FALSE;
 	u32 dst_bpp, dst_w_size;
 	s32 pos_y, inc_y, inc_x, prev_row, x_off;
 	u32 src_w, src_h, dst_w, dst_h;
@@ -994,8 +994,8 @@
 	copy_row_proto copy_row = NULL;
 	load_line_proto load_line = NULL;
 
-	if (cmat && (cmat->m[15] || cmat->m[16] || cmat->m[17] || (cmat->m[18]!=FIX_ONE) || cmat->m[19] )) has_alpha = 1;
-	else if (key && (key->alpha<0xFF)) has_alpha = 1;
+	if (cmat && (cmat->m[15] || cmat->m[16] || cmat->m[17] || (cmat->m[18]!=FIX_ONE) || cmat->m[19] )) has_alpha = GF_TRUE;
+	else if (key && (key->alpha<0xFF)) has_alpha = GF_TRUE;
 
 	switch (src->pixel_format) {
 	case GF_PIXEL_GREYSCALE:
@@ -1003,7 +1003,7 @@
 		break;
 	case GF_PIXEL_ALPHAGREY:
 		load_line = load_line_alpha_grey;
-		has_alpha = 1;
+		has_alpha = GF_TRUE;
 		break;
 	case GF_PIXEL_RGB_555:
 		load_line = load_line_rgb_555;
@@ -1019,18 +1019,18 @@
 		load_line = load_line_bgr_24;
 		break;
 	case GF_PIXEL_ARGB:
-		has_alpha = 1;
+		has_alpha = GF_TRUE;
 		load_line = load_line_argb;
 		break;
 	case GF_PIXEL_RGBA:
 	case GF_PIXEL_RGBAS:
-		has_alpha = 1;
+		has_alpha = GF_TRUE;
 	case GF_PIXEL_RGB_32:
 		load_line = load_line_rgb_32;
 		break;
 	case GF_PIXEL_RGBDS:
 		load_line = load_line_rgbds;
-		has_alpha = 1;
+		has_alpha = GF_TRUE;
 		break;
 	case GF_PIXEL_RGBD:
 		load_line = load_line_rgbd;
@@ -1052,7 +1052,7 @@
 		load_line = load_line_YUV420SP;
 		break;
 	case GF_PIXEL_YUVA:
-		has_alpha = 1;
+		has_alpha = GF_TRUE;
 	case GF_PIXEL_YUVD:
 		yuv_planar_type = 2;
 		yuv2rgb_init();
@@ -1121,7 +1121,7 @@
 	tmp = (u8 *) gf_malloc(sizeof(u8) * src_w * (yuv_planar_type ? 8 : 4) );
 	rows = tmp;
 
-	if ( (src_h / dst_h) * dst_h != src_h) force_load_odd_yuv_lines = 1;
+	if ( (src_h / dst_h) * dst_h != src_h) force_load_odd_yuv_lines = GF_TRUE;
 
 	dst_bits = (u8 *) dst->video_buffer;
 
@@ -1155,7 +1155,7 @@
 	}
 
 	/*do NOT use memcpy if the target buffer is not in systems memory*/
-	no_memcpy = (has_alpha || dst->is_hardware_memory || (dst_bpp!=dst_x_pitch)) ? 1 : 0;
+	no_memcpy = (has_alpha || dst->is_hardware_memory || (dst_bpp!=dst_x_pitch)) ? GF_TRUE : GF_FALSE;
 
 	while (dst_h) {
 		while ( pos_y >= 0x10000L ) {
@@ -1168,7 +1168,7 @@
 			if (yuv_planar_type) {
 				if (the_row % 2) {
 					if (!yuv_init || force_load_odd_yuv_lines) {
-						yuv_init = 1;
+						yuv_init = GF_TRUE;
 						the_row --;
 						if (flip) the_row = src->height-2 - the_row;
 						if (yuv_planar_type==1) {
@@ -1217,7 +1217,7 @@
 					} else {
 						load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *) src->u_ptr,(u8 *) src->v_ptr, (u8 *) src->a_ptr);
 					}
-					yuv_init = 1;
+					yuv_init = GF_TRUE;
 					rows = flip ? tmp + src_w * 4 : tmp;
 
 					if (cmat) {
@@ -1480,7 +1480,7 @@
 
 
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
 # include <intrin.h>
 # define GPAC_HAS_SSE2
 #else
@@ -1540,7 +1540,8 @@
 		for (i=0; i<h/2; i++) {
 			src1 = (__m128i *) (pU + i*src_stride/2);
 			src2 = src1+1;
-			dst = (__m128i *)(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2);
+			if (vs_dst->u_ptr) dst = (__m128i *) (vs_dst->u_ptr + i*vs_dst->pitch_y/2);
+			else dst = (__m128i *)(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2);
 
 			for (j=0; j<w/32; j++, src1+=2, src2+=2, dst++) {
 				val1 = _mm_load_si128(src1);
@@ -1555,7 +1556,8 @@
 		for (i=0; i<h/2; i++) {
 			src1 = (__m128i *) (pV + i*src_stride/2);
 			src2 = src1+1;
-			dst = (__m128i *)(vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4 + i*vs_dst->pitch_y/2);
+			if (vs_dst->v_ptr) dst = (__m128i *) (vs_dst->v_ptr + i*vs_dst->pitch_y/2);
+			else dst = (__m128i *)(vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4 + i*vs_dst->pitch_y/2);
 
 			for (j=0; j<w/32; j++, src1+=2, src2+=2, dst++) {
 				val1 = _mm_load_si128(src1);
@@ -1639,6 +1641,7 @@
 		for (i=0; i<h/2; i++) {
 			u16 *src = (u16 *) (pU + i*src_stride/2);
 			u8 *dst = (u8 *) vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2;
+			if (vs_dst->u_ptr) dst = (u8 *) (vs_dst->u_ptr + i*vs_dst->pitch_y/2);
 
 			for (j=0; j<w/2; j++) {
 				*dst = (*src) >> 2;
@@ -1650,6 +1653,7 @@
 		for (i=0; i<h/2; i++) {
 			u16 *src = (u16 *) (pV + i*src_stride/2);
 			u8 *dst = (u8 *) vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4 + i*vs_dst->pitch_y/2;
+			if (vs_dst->v_ptr) dst = (u8 *) (vs_dst->v_ptr + i*vs_dst->pitch_y/2);
 
 			for (j=0; j<w/2; j++) {
 				*dst = (*src) >> 2;
@@ -1675,7 +1679,6 @@
 {
 	{"aliceblue",240, 248, 255},
 	{"antiquewhite",250, 235, 215},
-	{"aqua", 0, 255, 255},
 	{"aquamarine",127, 255, 212},
 	{"azure",240, 255, 255},
 	{"beige",245, 245, 220},
@@ -1819,7 +1822,8 @@
 	{"white",255, 255, 255},
 	{"whitesmoke",245, 245, 245},
 	{"yellow",255, 255, 0},
-	{"yellowgreen",154, 205, 50}
+	{"yellowgreen",154, 205, 50},
+	{"aqua", 0, 255, 255},
 
 };

v0.5.2.tar.gz/src/utils/configfile.c -> v0.6.1.tar.gz/src/utils/configfile.c Changed

@@ -112,12 +112,12 @@
 
 	tmp->fileName = gf_strdup(fileName);
 	tmp->sections = gf_list_new();
-	file = gf_f64_open(fileName, "rt");
+	file = gf_fopen(fileName, "rt");
 	if (!file)
 		return GF_IO_ERR;
 	/* load the file */
 	p = NULL;
-	line = gf_malloc(sizeof(char)*line_alloc);
+	line = (char*)gf_malloc(sizeof(char)*line_alloc);
 	memset(line, 0, sizeof(char)*line_alloc);
 
 	while (!feof(file)) {
@@ -127,7 +127,7 @@
 		nb_pass = 1;
 		while (read + nb_pass == line_alloc) {
 			line_alloc += MAX_INI_LINE;
-			line = gf_realloc(line, sizeof(char)*line_alloc);
+			line = (char*)gf_realloc(line, sizeof(char)*line_alloc);
 			ret = fgets(line+read, MAX_INI_LINE, file);
 			read = (u32) strlen(line);
 			nb_pass++;
@@ -159,7 +159,7 @@
 				gf_list_del(tmp->sections);
 				gf_free(tmp->fileName);
 				gf_free(tmp);
-				fclose(file);
+				gf_fclose(file);
 				gf_free(line);
 				return GF_IO_ERR;
 			}
@@ -185,7 +185,7 @@
 		}
 	}
 	gf_free(line);
-	fclose(file);
+	gf_fclose(file);
 	return GF_OK;
 }
 
@@ -236,7 +236,7 @@
 	if (iniFile->skip_changes) return GF_OK;
 	if (!iniFile->fileName) return GF_OK;
 
-	file = gf_f64_open(iniFile->fileName, "wt");
+	file = gf_fopen(iniFile->fileName, "wt");
 	if (!file) return GF_IO_ERR;
 
 	i=0;
@@ -252,7 +252,7 @@
 		/* end of section */
 		fprintf(file, "\n");
 	}
-	fclose(file);
+	gf_fclose(file);
 	return GF_OK;
 }
 
@@ -260,7 +260,7 @@
 GF_Err gf_cfg_discard_changes(GF_Config *iniFile)
 {
 	if (!iniFile) return GF_BAD_PARAM;
-	iniFile->skip_changes = 1;
+	iniFile->skip_changes = GF_TRUE;
 	return GF_OK;
 }
 
@@ -329,13 +329,13 @@
 GF_Err gf_cfg_set_key(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue)
 {
 	u32 i;
-	Bool has_changed = 1;
+	Bool has_changed = GF_TRUE;
 	IniSection *sec;
 	IniKey *key;
 
 	if (!iniFile || !secName || !keyName) return GF_BAD_PARAM;
 
-	if (!strnicmp(secName, "temp", 4)) has_changed = 0;
+	if (!strnicmp(secName, "temp", 4)) has_changed = GF_FALSE;
 
 	i=0;
 	while ((sec = (IniSection *) gf_list_enum(iniFile->sections, &i)) ) {
@@ -345,7 +345,7 @@
 	sec = (IniSection *) gf_malloc(sizeof(IniSection));
 	sec->section_name = gf_strdup(secName);
 	sec->keys = gf_list_new();
-	if (has_changed) iniFile->hasChanged = 1;
+	if (has_changed) iniFile->hasChanged = GF_TRUE;
 	gf_list_add(iniFile->sections, sec);
 
 get_key:
@@ -358,7 +358,7 @@
 	key = (IniKey *) gf_malloc(sizeof(IniKey));
 	key->name = gf_strdup(keyName);
 	key->value = gf_strdup("");
-	if (has_changed) iniFile->hasChanged = 1;
+	if (has_changed) iniFile->hasChanged = GF_TRUE;
 	gf_list_add(sec->keys, key);
 
 set_value:
@@ -367,7 +367,7 @@
 		if (key->name) gf_free(key->name);
 		if (key->value) gf_free(key->value);
 		gf_free(key);
-		if (has_changed) iniFile->hasChanged = 1;
+		if (has_changed) iniFile->hasChanged = GF_TRUE;
 		return GF_OK;
 	}
 	/* same value, don't update */
@@ -375,7 +375,7 @@
 
 	if (key->value) gf_free(key->value);
 	key->value = gf_strdup(keyValue);
-	if (has_changed) iniFile->hasChanged = 1;
+	if (has_changed) iniFile->hasChanged = GF_TRUE;
 	return GF_OK;
 }
 
@@ -426,10 +426,11 @@
 	if (!iniFile) return;
 
 	i = 0;
-	while ((p = gf_list_enum(iniFile->sections, &i))) {
+	while ((p = (IniSection*)gf_list_enum(iniFile->sections, &i))) {
 		if (!strcmp(secName, p->section_name)) {
 			DelSection(p);
 			gf_list_rem(iniFile->sections, i-1);
+			iniFile->hasChanged = GF_TRUE;
 			return;
 		}
 	}
@@ -459,7 +460,7 @@
 	key->name = gf_strdup(keyName);
 	key->value = gf_strdup(keyValue);
 	gf_list_insert(sec->keys, key, index);
-	iniFile->hasChanged = 1;
+	iniFile->hasChanged = GF_TRUE;
 	return GF_OK;
 }

v0.5.2.tar.gz/src/utils/downloader.c -> v0.6.1.tar.gz/src/utils/downloader.c Changed

@@ -23,7 +23,6 @@
 *
 */
 
-
 #include <gpac/download.h>
 #include <gpac/network.h>
 #include <gpac/token.h>
@@ -38,6 +37,7 @@
 #ifdef GPAC_HAS_SSL
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
+#include <openssl/x509v3.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
@@ -68,8 +68,8 @@
 /*internal flags*/
 enum
 {
-	GF_DOWNLOAD_SESSION_USE_SSL		=	1<<10,
-	GF_DOWNLOAD_SESSION_THREAD_DEAD	=	1<<11
+	GF_DOWNLOAD_SESSION_USE_SSL = 1<<10,
+	GF_DOWNLOAD_SESSION_THREAD_DEAD = 1<<11
 };
 
 typedef struct __gf_user_credentials
@@ -80,7 +80,8 @@
 	Bool valid;
 } gf_user_credentials_struct;
 
-enum REQUEST_TYPE {
+enum REQUEST_TYPE
+{
 	GET = 0,
 	HEAD = 1,
 	OTHER = 2
@@ -125,7 +126,7 @@
 	gf_user_credentials_struct * creds;
 	char cookie[GF_MAX_PATH];
 	DownloadedCacheEntry cache_entry;
-	Bool reused_cache_entry;
+	Bool reused_cache_entry, from_cache_only;
 
 	//mime type, only used when the session is not cached.
 	char *mime_type;
@@ -142,12 +143,12 @@
 	u64 start_time_utc;
 	Bool connection_close;
 	Bool is_range_continuation;
-	/*0: no cache reconfig before next GET request: 1: try to rematch the cache entry: 2: force to create a new cache entry (for byte-range cases*/
+	/*0: no cache reconfig before next GET request: 1: try to rematch the cache entry: 2: force to create a new cache entry (for byte-range cases)*/
 	u32 needs_cache_reconfig;
 	/* Range information if needed for the download (cf flag) */
 	Bool needs_range;
 	u64 range_start, range_end;
-	
+
 	u32 connect_time, ssl_setup_time, reply_time, total_time_since_req, req_hdr_size, rsp_hdr_size;
 
 	/*0: GET
@@ -176,34 +177,36 @@
 	void *usr_cbk;
 	Bool reassigned;
 
-	Bool chunked;
+	Bool chunked, chunk_lf_remains;
 	u32 nb_left_in_chunk;
 
 	u64 request_start_time;
 	/*private extension*/
 	void *ext;
+
+	char *remaining_data;
+	u32 remaining_data_size;
 };
 
 struct __gf_download_manager
 {
 	GF_Mutex *cache_mx;
 	char *cache_directory;
-	char szCookieDir[GF_MAX_PATH];
 
-	Bool (*GetUserPassword)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
+	Bool (*get_user_password)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
 	void *usr_cbk;
 
 	u32 head_timeout, request_timeout;
 	GF_Config *cfg;
 	GF_List *sessions;
-	Bool disable_cache;
-	u32 limit_data_rate;
+	Bool disable_cache, simulate_no_connection, allow_offline_cache;
+	u32 limit_data_rate, read_buf_size;
 
 	GF_List *skip_proxy_servers;
 	GF_List *credentials;
 	GF_List *cache_entries;
 	/* FIXME : should be placed in DownloadedCacheEntry maybe... */
-	GF_List * partial_downloads;
+	GF_List *partial_downloads;
 #ifdef GPAC_HAS_SSL
 	SSL_CTX *ssl_ctx;
 #endif
@@ -236,7 +239,7 @@
 #endif
 
 /*
- * Private methods of cache.c
+ * Private methods of cache
 */
 
 /**
@@ -275,7 +278,7 @@
 * \param entry The entry to use
 * \return cache file pointer or NULL
 */
-FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry) ;
+FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry);
 
 /*modify end range when chaining byte-range requests*/
 void gf_cache_set_end_range(DownloadedCacheEntry entry, u64 range_end);
@@ -286,14 +289,13 @@
 /**
 * Find a User's credentials for a given site
 */
-static
-gf_user_credentials_struct * gf_find_user_credentials_for_site(GF_DownloadManager *dm, const char * server_name) {
+static gf_user_credentials_struct* gf_find_user_credentials_for_site(GF_DownloadManager *dm, const char *server_name) {
 	u32 count, i;
 	if (!dm || !dm->credentials || !server_name || !strlen(server_name))
 		return NULL;
 	count = gf_list_count( dm->credentials);
 	for (i = 0 ; i < count; i++) {
-		gf_user_credentials_struct * cred = gf_list_get(dm->credentials, i );
+		gf_user_credentials_struct * cred = (gf_user_credentials_struct*)gf_list_get(dm->credentials, i );
 		assert( cred );
 		if (!strcmp(cred->site, server_name))
 			return cred;
@@ -307,8 +309,7 @@
 * \param creds The credentials to fill
 * \return GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
 */
-static
-GF_Err gf_user_credentials_save_digest( GF_DownloadManager * dm, gf_user_credentials_struct * creds, const char * password) {
+static GF_Err gf_user_credentials_save_digest( GF_DownloadManager * dm, gf_user_credentials_struct * creds, const char * password) {
 	int size;
 	char pass_buf[1024], range_buf[1024];
 	if (!dm || !creds || !password)
@@ -317,7 +318,7 @@
 	size = gf_base64_encode(pass_buf, (u32) strlen(pass_buf), range_buf, 1024);
 	range_buf[size] = 0;
 	strcpy(creds->digest, range_buf);
-	creds->valid = 1;
+	creds->valid = GF_TRUE;
 	return GF_OK;
 }
 
@@ -327,23 +328,20 @@
 * \param creds The credentials to fill
 * \return GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
 */
-static
-GF_Err gf_user_credentials_ask_password( GF_DownloadManager * dm, gf_user_credentials_struct * creds)
+static GF_Err gf_user_credentials_ask_password( GF_DownloadManager * dm, gf_user_credentials_struct * creds)
 {
 	char szPASS[50];
 	if (!dm || !creds)
 		return GF_BAD_PARAM;
 	memset(szPASS, 0, 50);
-	if (!dm->GetUserPassword || !dm->GetUserPassword(dm->usr_cbk, creds->site, creds->username, szPASS)) {
+	if (!dm->get_user_password || !dm->get_user_password(dm->usr_cbk, creds->site, creds->username, szPASS)) {
 		return GF_AUTHENTICATION_FAILURE;
 	}
 	return gf_user_credentials_save_digest(dm, creds, szPASS);
 	return GF_OK;
 }
 
-
-static
-gf_user_credentials_struct * gf_user_credentials_register(GF_DownloadManager * dm, const char * server_name, const char * username, const char * password, Bool valid)
+static gf_user_credentials_struct * gf_user_credentials_register(GF_DownloadManager * dm, const char * server_name, const char * username, const char * password, Bool valid)
 {
 	gf_user_credentials_struct * creds;
 	if (!dm)
@@ -376,28 +374,28 @@
 
 #ifdef GPAC_HAS_SSL
 
-static Bool _ssl_is_initialized = 0;
+static Bool _ssl_is_initialized = GF_FALSE;
 
 /*!
 * initialize the SSL library once for all download managers
- * \return 0 if everyhing is OK, 1 otherwise
+ * \return GF_FALSE if everyhing is OK, GF_TRUE otherwise
 */
 static Bool init_ssl_lib() {
 	if (_ssl_is_initialized)
-		return 0;
+		return GF_FALSE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initializing SSL library...\n"));
 	init_prng();
 	if (RAND_status() != 1) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
-		return 1;
+		return GF_TRUE;
 	}
 	SSL_library_init();
 	SSL_load_error_strings();
 	SSLeay_add_all_algorithms();
 	SSLeay_add_ssl_algorithms();
-	_ssl_is_initialized = 1;
+	_ssl_is_initialized = GF_TRUE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
-	return 0;
+	return GF_FALSE;
 }
 
 static int ssl_init(GF_DownloadManager *dm, u32 mode)
@@ -466,18 +464,18 @@
 
 static Bool gf_dm_is_local(GF_DownloadManager *dm, const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (!strstr(url, "://")) return 1;
-	return 0;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (!strstr(url, "://")) return GF_TRUE;
+	return GF_FALSE;
 }
 
 static Bool gf_dm_can_handle_url(GF_DownloadManager *dm, const char *url)
 {
-	if (!strnicmp(url, "http://", 7)) return 1;
+	if (!strnicmp(url, "http://", 7)) return GF_TRUE;
 #ifdef GPAC_HAS_SSL
-	if (!strnicmp(url, "https://", 8)) return 1;
+	if (!strnicmp(url, "https://", 8)) return GF_TRUE;
 #endif
-	return 0;
+	return GF_FALSE;
 }
 
 /*!
@@ -485,14 +483,15 @@
 * \param sess The session configured with the URL
 * \return NULL if none found, the DownloadedCacheEntry otherwise
 */
-DownloadedCacheEntry gf_dm_find_cached_entry_by_url(GF_DownloadSession * sess) {
+DownloadedCacheEntry gf_dm_find_cached_entry_by_url(GF_DownloadSession * sess)
+{
 	u32 i, count;
 	assert( sess && sess->dm && sess->dm->cache_entries );
 	gf_mx_p( sess->dm->cache_mx );
 	count = gf_list_count(sess->dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * url;
-		DownloadedCacheEntry e = gf_list_get(sess->dm->cache_entries, i);
+		DownloadedCacheEntry e = (DownloadedCacheEntry)gf_list_get(sess->dm->cache_entries, i);
 		assert(e);
 		url = gf_cache_get_url(e);
 		assert( url );
@@ -537,7 +536,7 @@
 * If the cache entry is marked for deletion and has no sessions associated with it, it will be
 * removed (so some modules using a streaming like cache will still work).
 */
-void gf_dm_remove_cache_entry_from_session(GF_DownloadSession * sess) {
+static void gf_dm_remove_cache_entry_from_session(GF_DownloadSession * sess) {
 	if (sess && sess->cache_entry) {
 		gf_cache_remove_session_from_cache_entry(sess->cache_entry, sess);
 		if (sess->dm
@@ -551,7 +550,7 @@
 			gf_mx_p( sess->dm->cache_mx );
 			count = gf_list_count( sess->dm->cache_entries );
 			for (i = 0; i < count; i++) {
-				DownloadedCacheEntry ex = gf_list_get(sess->dm->cache_entries, i);
+				DownloadedCacheEntry ex = (DownloadedCacheEntry)gf_list_get(sess->dm->cache_entries, i);
 				if (ex == sess->cache_entry) {
 					gf_list_rem(sess->dm->cache_entries, i);
 					gf_cache_delete_entry( sess->cache_entry );
@@ -572,7 +571,7 @@
 */
 s32 gf_cache_add_session_to_cache_entry(DownloadedCacheEntry entry, GF_DownloadSession * sess);
 
-void gf_dm_configure_cache(GF_DownloadSession *sess)
+static void gf_dm_configure_cache(GF_DownloadSession *sess)
 {
 	DownloadedCacheEntry entry;
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Downloader] gf_dm_configure_cache(%p), cached=%s\n", sess, sess->flags & GF_NETIO_SESSION_NOT_CACHED ? "no" : "yes" ));
@@ -580,33 +579,32 @@
 	if (sess->flags & GF_NETIO_SESSION_NOT_CACHED) {
 		sess->cache_entry = NULL;
 	} else {
-		Bool found=0;
+		Bool found = GF_FALSE;
 		u32 i, count;
 		entry = gf_dm_find_cached_entry_by_url(sess);
 		if (!entry) {
-			entry = gf_cache_create_entry(sess->dm, sess->dm->cache_directory, sess->orig_url, sess->range_start, sess->range_end, (sess->flags&GF_NETIO_SESSION_MEMORY_CACHE) ? 1 : 0);
+			entry = gf_cache_create_entry(sess->dm, sess->dm->cache_directory, sess->orig_url, sess->range_start, sess->range_end, (sess->flags&GF_NETIO_SESSION_MEMORY_CACHE) ? GF_TRUE : GF_FALSE);
 			gf_mx_p( sess->dm->cache_mx );
 			gf_list_add(sess->dm->cache_entries, entry);
 			gf_mx_v( sess->dm->cache_mx );
-			sess->is_range_continuation = 0;
+			sess->is_range_continuation = GF_FALSE;
 		}
 		assert( entry );
 		sess->cache_entry = entry;
 		sess->reused_cache_entry = 	gf_cache_is_in_progress(entry);
 		count = gf_list_count(sess->dm->sessions);
 		for (i=0; i<count; i++) {
-			GF_DownloadSession *a_sess = gf_list_get(sess->dm->sessions, i);
+			GF_DownloadSession *a_sess = (GF_DownloadSession*)gf_list_get(sess->dm->sessions, i);
+			assert(a_sess);
 			if (a_sess==sess) continue;
 			if (a_sess->cache_entry==entry) {
-				found = 1;
+				found = GF_TRUE;
 				break;
 			}
 		}
 		if (!found) {
-			sess->reused_cache_entry = 0;
-			gf_cache_close_write_cache(sess->cache_entry, sess, 0);
-		} else {
-			assert(!sess->reused_cache_entry);
+			sess->reused_cache_entry = GF_FALSE;
+			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
 		gf_cache_add_session_to_cache_entry(sess->cache_entry, sess);
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Cache setup to %p %s\n", sess, gf_cache_get_cache_filename(sess->cache_entry)));
@@ -635,7 +633,7 @@
 	count = gf_list_count(dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * e_url;
-		DownloadedCacheEntry e = gf_list_get(dm->cache_entries, i);
+		DownloadedCacheEntry e = (DownloadedCacheEntry)gf_list_get(dm->cache_entries, i);
 		assert(e);
 		e_url = gf_cache_get_url(e);
 		assert( e_url );
@@ -671,7 +669,7 @@
 static void gf_dm_clear_headers(GF_DownloadSession *sess)
 {
 	while (gf_list_count(sess->headers)) {
-		GF_HTTPHeader *hdr = gf_list_last(sess->headers);
+		GF_HTTPHeader *hdr = (GF_HTTPHeader*)gf_list_last(sess->headers);
 		gf_list_rem_last(sess->headers);
 		gf_free(hdr->name);
 		gf_free(hdr->value);
@@ -687,12 +685,12 @@
 static void gf_dm_disconnect(GF_DownloadSession *sess, Bool force_close)
 {
 	assert( sess );
-	if (sess->connection_close) force_close=1;
-	sess->connection_close = 0;
+	if (sess->connection_close) force_close = GF_TRUE;
+	sess->connection_close = GF_FALSE;
 
 	if (sess->status >= GF_NETIO_DISCONNECTED) {
 		if (force_close && sess->use_cache_file && sess->cache_entry) {
-			gf_cache_close_write_cache(sess->cache_entry, sess, 0);
+			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
 		return;
 	}
@@ -715,7 +713,7 @@
 		}
 	}
 	if (force_close && sess->use_cache_file) {
-		gf_cache_close_write_cache(sess->cache_entry, sess, 0);
+		gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 	}
 	sess->status = GF_NETIO_DISCONNECTED;
 	if (sess->num_retry) sess->num_retry--;
@@ -731,10 +729,10 @@
 		return;
 	/*self-destruction, let the download manager destroy us*/
 	if (sess->th && sess->in_callback) {
-		sess->destroy = 1;
+		sess->destroy = GF_TRUE;
 		return;
 	}
-	gf_dm_disconnect(sess, 1);
+	gf_dm_disconnect(sess, GF_TRUE);
 	gf_dm_clear_headers(sess);
 
 	/*if threaded wait for thread exit*/
@@ -776,31 +774,32 @@
 {
 	if (sess->user_proc) {
 		GF_NETIO_Parameter par;
-		sess->in_callback = 1;
+		sess->in_callback = GF_TRUE;
 		memset(&par, 0, sizeof(GF_NETIO_Parameter));
 		par.msg_type = dnload_status;
 		par.error = error;
 		par.sess = sess;
+		par.reply = 200;
 		sess->user_proc(sess->usr_cbk, &par);
-		sess->in_callback = 0;
+		sess->in_callback = GF_FALSE;
 	}
 }
 
 static void gf_dm_sess_user_io(GF_DownloadSession *sess, GF_NETIO_Parameter *par)
 {
 	if (sess->user_proc) {
-		sess->in_callback = 1;
+		sess->in_callback = GF_TRUE;
 		par->sess = sess;
 		sess->user_proc(sess->usr_cbk, par);
-		sess->in_callback = 0;
+		sess->in_callback = GF_FALSE;
 	}
 }
 
 GF_EXPORT
 Bool gf_dm_is_thread_dead(GF_DownloadSession *sess)
 {
-	if (!sess) return 1;
-	return (sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD) ? 1 : 0;
+	if (!sess) return GF_TRUE;
+	return (sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD) ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
@@ -902,12 +901,12 @@
 				urlConcatenateWithBaseURL = NULL;
 
 				if (!info->remotePath) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[PROTOCOL] : cannot find any protocol in url %s\n", url));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Network] No supported protocol for url %s\n", url));
 					return GF_BAD_PARAM;
 				}
 				for (i=0; i<strlen(info->remotePath); i++)
 					if (info->remotePath[i]=='\\') info->remotePath[i]='/';
-				info->canonicalRepresentation = gf_malloc(strlen(info->protocol) + strlen(info->remotePath) + 1);
+				info->canonicalRepresentation = (char*)gf_malloc(strlen(info->protocol) + strlen(info->remotePath) + 1);
 				strcpy(info->canonicalRepresentation, info->protocol);
 				strcat(info->canonicalRepresentation, info->remotePath);
 
@@ -917,7 +916,7 @@
 				url = urlConcatenateWithBaseURL + proto_offset;
 			}
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[PROTOCOL] : cannot find any protocol in url %s\n", url));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Network] No supported protocol for url %s\n", url));
 			return GF_BAD_PARAM;
 		}
 	}
@@ -970,7 +969,7 @@
 	{
 		char port[8];
 		snprintf(port, sizeof(port)-1, ":%d", info->port);
-		info->canonicalRepresentation = gf_malloc(strlen(info->protocol)+strlen(info->server_name)+1+strlen(port)+strlen(info->remotePath));
+		info->canonicalRepresentation = (char*)gf_malloc(strlen(info->protocol)+strlen(info->server_name)+1+strlen(port)+strlen(info->remotePath));
 		strcpy(info->canonicalRepresentation, info->protocol);
 		strcat(info->canonicalRepresentation, info->server_name);
 		strcat(info->canonicalRepresentation, port);
@@ -985,7 +984,7 @@
 GF_EXPORT
 GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url)
 {
-	Bool socket_changed = 0;
+	Bool socket_changed = GF_FALSE;
 	GF_URL_Info info;
 
 	if (!url) return GF_BAD_PARAM;
@@ -994,31 +993,53 @@
 
 	gf_dm_url_info_init(&info);
 
-	if (!sess->sock) socket_changed = 1;
+	if (!sess->sock) socket_changed = GF_TRUE;
 	else if (sess->status>GF_NETIO_DISCONNECTED)
-		socket_changed = 1;
+		socket_changed = GF_TRUE;
 
-	sess->last_error = gf_dm_get_url_info(url, &info, sess->remote_path);
+	sess->last_error = gf_dm_get_url_info(url, &info, sess->orig_url);
 	if (sess->last_error) return sess->last_error;
 
+	if (!strstr(url, "://")) {
+		char c, *sep;
+		info.port = sess->port;
+		info.server_name = sess->server_name ? gf_strdup(sess->server_name) : NULL;
+		info.remotePath = gf_strdup(url);
+		sep = strstr(sess->orig_url_before_redirect, "://");
+		assert(sep);
+		c = sep[3];
+		sep[3] = 0;
+		info.protocol = gf_strdup(sess->orig_url_before_redirect);
+		sep[3] = c;
+	}
+
 	if (sess->port != info.port) {
-		socket_changed = 1;
+		socket_changed = GF_TRUE;
 		sess->port = info.port;
 	}
 
+	if (sess->from_cache_only) {
+		socket_changed = GF_TRUE;
+		sess->from_cache_only = GF_FALSE;
+		if (sess->cache_entry) {
+			gf_dm_remove_cache_entry_from_session(sess);
+			sess->cache_entry = NULL;
+		}
+	}
+
 	if (!strcmp("http://", info.protocol) || !strcmp("https://", info.protocol)) {
 		if (sess->do_requests != http_do_requests) {
 			sess->do_requests = http_do_requests;
-			socket_changed = 1;
+			socket_changed = GF_TRUE;
 		}
 		if (!strcmp("https://", info.protocol)) {
 			if (!(sess->flags & GF_DOWNLOAD_SESSION_USE_SSL)) {
 				sess->flags |= GF_DOWNLOAD_SESSION_USE_SSL;
-				socket_changed = 1;
+				socket_changed = GF_TRUE;
 			}
 		} else if (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL) {
 			sess->flags &= ~GF_DOWNLOAD_SESSION_USE_SSL;
-			socket_changed = 1;
+			socket_changed = GF_TRUE;
 		}
 	} else {
 		sess->do_requests = NULL;
@@ -1026,7 +1047,7 @@
 
 	if (sess->server_name && info.server_name && !strcmp(sess->server_name, info.server_name)) {
 	} else {
-		socket_changed = 1;
+		socket_changed = GF_TRUE;
 		if (sess->server_name) gf_free(sess->server_name);
 		sess->server_name = info.server_name ? gf_strdup(info.server_name) : NULL;
 	}
@@ -1040,7 +1061,7 @@
 	if (sess->remote_path) gf_free(sess->remote_path);
 	sess->remote_path = gf_strdup(info.remotePath);
 
-	if (!socket_changed && info.userName && sess->creds->username && !strcmp(info.userName, sess->creds->username)) {
+	if (!socket_changed && info.userName && !strcmp(info.userName, sess->creds->username)) {
 	} else {
 		sess->creds = NULL;
 		if (info.userName ) {
@@ -1085,12 +1106,12 @@
 			sess->do_requests(sess);
 		}
 		gf_mx_v(sess->mx);
-		gf_sleep(2);
+		gf_sleep(1);
 	}
 	/*destroy all sessions*/
-	gf_dm_disconnect(sess, 0);
+	gf_dm_disconnect(sess, GF_FALSE);
 	sess->status = GF_NETIO_STATE_ERROR;
-	sess->last_error = 0;
+	sess->last_error = GF_OK;
 	sess->flags |= GF_DOWNLOAD_SESSION_THREAD_DEAD;
 	return 1;
 }
@@ -1110,7 +1131,9 @@
 	}
 	sess->headers = gf_list_new();
 	sess->flags = dl_flags;
-	if (dm && !dm->head_timeout) sess->server_only_understand_get = 1;
+	if (sess->flags & GF_NETIO_SESSION_NOTIFY_DATA)
+		sess->force_data_write_callback = GF_TRUE;
+	if (dm && !dm->head_timeout) sess->server_only_understand_get = GF_TRUE;
 	sess->user_proc = user_io;
 	sess->usr_cbk = usr_cbk;
 	sess->creds = NULL;
@@ -1157,8 +1180,16 @@
 {
 	GF_Err e;
 
+	if (sess->dm && sess->dm->simulate_no_connection) {
+		if (sess->sock) {
+			sess->status = GF_NETIO_DISCONNECTED;
+		}
+		return GF_IP_NETWORK_FAILURE;
+	}
+
 	if (!sess)
 		return GF_BAD_PARAM;
+
 #ifdef GPAC_HAS_SSL
 	if (sess->ssl) {
 		s32 size = SSL_read(sess->ssl, data, data_size);
@@ -1175,17 +1206,12 @@
 	}
 #endif
 
-
 	if (!sess->sock) {
 		sess->status = GF_NETIO_DISCONNECTED;
 		return GF_IP_CONNECTION_CLOSED;
 	}
 	e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
 
-	if (e==GF_IP_NETWORK_EMPTY) {
-		gf_sleep(1);
-	}
-
 	return e;
 }
 
@@ -1214,21 +1240,21 @@
 				if (d == '\0') break;
 				/*matched c character, check following substrings*/
 				if ((d == c) && rfc2818_match (&pattern[i], &string[k]))
-					return 1;
+					return GF_TRUE;
 				else if (d == '.')
-					return 0;
+					return GF_FALSE;
 
 				k++;
 			}
-			return (c == '\0') ? 1 : 0;
+			return (c == '\0') ? GF_TRUE : GF_FALSE;
 		} else {
 			if (c != LWR(string[k]))
-				return 0;
+				return GF_FALSE;
 		}
 		i++;
 		k++;
 	}
-	return (string[k]=='\0') ? 1 : 0;
+	return (string[k]=='\0') ? GF_TRUE : GF_FALSE;
 }
 #undef LWR
 
@@ -1254,11 +1280,11 @@
 		proxy = gf_cfg_get_key(sess->dm->cfg, "HTTPProxy", "Enabled");
 		if (proxy && !strcmp(proxy, "yes")) {
 			u32 i;
-			Bool use_proxy=1;
+			Bool use_proxy=GF_TRUE;
 			for (i=0; i<gf_list_count(sess->dm->skip_proxy_servers); i++) {
-				char *skip = gf_list_get(sess->dm->skip_proxy_servers, i);
+				char *skip = (char*)gf_list_get(sess->dm->skip_proxy_servers, i);
 				if (!strcmp(skip, sess->server_name)) {
-					use_proxy=0;
+					use_proxy=GF_FALSE;
 					break;
 				}
 			}
@@ -1297,7 +1323,15 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connecting to %s:%d\n", proxy, proxy_port));
 
 	if (sess->status == GF_NETIO_SETUP) {
-		u64 now =gf_sys_clock_high_res();
+		u64 now;
+		if (sess->dm && sess->dm->simulate_no_connection) {
+			sess->status = GF_NETIO_STATE_ERROR;
+			sess->last_error = GF_IP_NETWORK_FAILURE;
+			gf_dm_sess_notify_state(sess, sess->status, sess->last_error);
+			return;
+		}
+
+		now =gf_sys_clock_high_res();
 		e = gf_sk_connect(sess->sock, (char *) proxy, proxy_port, (char *)ip);
 
 		/*retry*/
@@ -1309,6 +1343,17 @@
 
 		/*failed*/
 		if (e) {
+			if (!sess->cache_entry && sess->dm->allow_offline_cache) {
+				gf_dm_configure_cache(sess);
+				if (sess->cache_entry && !gf_cache_check_if_cache_file_is_corrupted(sess->cache_entry)) {
+					sess->from_cache_only = GF_TRUE;
+					sess->connect_time = (u32) (gf_sys_clock_high_res() - now);
+					sess->status = GF_NETIO_CONNECTED;
+					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Host %s:%d unreachable, using existing cache\n", proxy, proxy_port));
+					gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
+					return;
+				}
+			}
 			sess->status = GF_NETIO_STATE_ERROR;
 			sess->last_error = e;
 			gf_dm_sess_notify_state(sess, sess->status, e);
@@ -1317,15 +1362,15 @@
 
 		sess->connect_time = (u32) (gf_sys_clock_high_res() - now);
 		sess->status = GF_NETIO_CONNECTED;
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
-		gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
-		gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
+		gf_sk_set_buffer_size(sess->sock, GF_TRUE, GF_DOWNLOAD_BUFFER_SIZE);
+		gf_sk_set_buffer_size(sess->sock, GF_FALSE, GF_DOWNLOAD_BUFFER_SIZE);
 	}
 
 #ifdef GPAC_HAS_SSL
 	if (!sess->ssl && (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL)) {
-		u64 now =gf_sys_clock_high_res();
+		u64 now = gf_sys_clock_high_res();
 		if (!sess->dm->ssl_ctx)
 			ssl_init(sess->dm, 0);
 		/*socket is connected, configure SSL layer*/
@@ -1334,13 +1379,15 @@
 			long vresult;
 			char common_name[256];
 			X509 *cert;
-			Bool success = 1;
+			Bool success = GF_TRUE;
 
 			sess->ssl = SSL_new(sess->dm->ssl_ctx);
 			SSL_set_fd(sess->ssl, gf_sk_get_handle(sess->sock));
 			SSL_set_connect_state(sess->ssl);
 			ret = SSL_connect(sess->ssl);
-			assert(ret>0);
+			if (ret<=0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Cannot connect, error %d\n", ret));
+			}
 
 			cert = SSL_get_peer_certificate(sess->ssl);
 			/*if we have a cert, check it*/
@@ -1355,21 +1402,56 @@
 				}
 
 				if (vresult == X509_V_OK) {
+					STACK_OF(GENERAL_NAME) *altnames;
+					GF_List* valid_names;
+					int i;
+
+					valid_names = gf_list_new();
+
 					common_name[0] = 0;
 					X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, common_name, sizeof (common_name));
-					if (!rfc2818_match(common_name, sess->server_name)) {
-						success = 0;
-						GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Mismatch in certificate names: got %s expected %s\n", common_name, sess->server_name));
+					gf_list_add(valid_names, common_name);
+
+					altnames = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
+					if (altnames) {
+						for (i = 0; i < sk_GENERAL_NAME_num(altnames); ++i) {
+							const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
+							if (altname->type == GEN_DNS)
+							{
+								unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
+								gf_list_add(valid_names, altname_str);
+							}
+						}
+					}
+
+					success = GF_FALSE;
+					for (i = 0; i < (int)gf_list_count(valid_names); ++i) {
+						const char *valid_name = (const char*) gf_list_get(valid_names, i);
+						if (rfc2818_match(valid_name, sess->server_name)) {
+							success = GF_TRUE;
+							GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SSL] Hostname %s matches %s\n", sess->server_name, valid_name));
+							break;
+						}
+					}
+					if (!success) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Mismatch in certificate names: expected %s\n", sess->server_name));
+						for (i = 0; i < (int)gf_list_count(valid_names); ++i) {
+							const char *valid_name = (const char*) gf_list_get(valid_names, i);
+							GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Tried name: %s\n", valid_name));
+						}
 					}
+
+					gf_list_del(valid_names);
+					GENERAL_NAMES_free(altnames);
 				} else {
-					success = 0;
+					success = GF_FALSE;
 					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Error verifying certificate %x\n", vresult));
 				}
 
 				X509_free(cert);
 
 				if (!success) {
-					gf_dm_disconnect(sess, 1);
+					gf_dm_disconnect(sess, GF_TRUE);
 					sess->status = GF_NETIO_STATE_ERROR;
 					sess->last_error = GF_AUTHENTICATION_FAILURE;
 					gf_dm_sess_notify_state(sess, sess->status, sess->last_error);
@@ -1391,19 +1473,19 @@
 	u32 timer = 0;
 	u32 flags = sess->flags;
 	sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-	go = 1;
+	go = GF_TRUE;
 	while (go) {
 		switch (sess->status) {
 		/*setup download*/
 		case GF_NETIO_SETUP:
 			gf_dm_connect(sess);
 			if (sess->status == GF_NETIO_SETUP)
-				gf_sleep(16);
+				gf_sleep(1);
 			break;
 		case GF_NETIO_WAIT_FOR_REPLY:
 			if (timer == 0)
 				timer = gf_sys_clock();
-			gf_sleep(16);
+			gf_sleep(1);
 			{
 				u32 timer2 = gf_sys_clock();
 				if (timer2 - timer > 5000) {
@@ -1411,9 +1493,9 @@
 					/* Since HEAD is not understood by this server, we use a GET instead */
 					sess->http_read_type = GET;
 					sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-					gf_dm_disconnect(sess, 0);
+					gf_dm_disconnect(sess, GF_FALSE);
 					sess->status = GF_NETIO_SETUP;
-					sess->server_only_understand_get = 1;
+					sess->server_only_understand_get = GF_TRUE;
 					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("gf_dm_refresh_cache_entry() : Timeout with HEAD, try with GET\n"));
 					e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
 					if (e) {
@@ -1433,7 +1515,7 @@
 		case GF_NETIO_DATA_EXCHANGE:
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
-			go = 0;
+			go = GF_FALSE;
 			break;
 		default:
 			break;
@@ -1481,17 +1563,17 @@
 		if (!discontinue_cache) {
 			gf_cache_set_end_range(sess->cache_entry, end_range);
 			/*remember this in case we get disconnected*/
-			sess->is_range_continuation = 1;
+			sess->is_range_continuation = GF_TRUE;
 		} else {
 			sess->needs_cache_reconfig = 2;
-			sess->reused_cache_entry = 0;
+			sess->reused_cache_entry = GF_FALSE;
 		}
 	} else {
 		if (sess->status != GF_NETIO_SETUP) return GF_BAD_PARAM;
 	}
 	sess->range_start = start_range;
 	sess->range_end = end_range;
-	sess->needs_range = 1;
+	sess->needs_range = GF_TRUE;
 	return GF_OK;
 }
 
@@ -1514,24 +1596,24 @@
 		return GF_OK;
 	}
 	/*otherwise do a synchronous download*/
-	go = 1;
+	go = GF_TRUE;
 	while (go) {
 		switch (sess->status) {
 		/*setup download*/
 		case GF_NETIO_SETUP:
 			gf_dm_connect(sess);
 			if (sess->status == GF_NETIO_SETUP)
-				gf_sleep(16);
+				gf_sleep(1);
 			break;
 		case GF_NETIO_WAIT_FOR_REPLY:
-			gf_sleep(16);
+			gf_sleep(1);
 		case GF_NETIO_CONNECTED:
 		case GF_NETIO_DATA_EXCHANGE:
 			sess->do_requests(sess);
 			break;
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
-			go = 0;
+			go = GF_FALSE;
 			break;
 
 		case GF_NETIO_GET_METHOD:
@@ -1544,7 +1626,7 @@
 
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Downloader] Session in unknown state !! - aborting\n"));
-			go = 0;
+			go = GF_FALSE;
 			break;
 		}
 	}
@@ -1555,25 +1637,28 @@
 GF_Err gf_dm_sess_process_headers(GF_DownloadSession *sess)
 {
 	Bool go;
-	go = 1;
+	go = GF_TRUE;
 	while (go) {
 		switch (sess->status) {
 		/*setup download*/
 		case GF_NETIO_SETUP:
 			gf_dm_connect(sess);
 			if (sess->status == GF_NETIO_SETUP)
-				gf_sleep(16);
+				gf_sleep(1);
 			break;
 		case GF_NETIO_WAIT_FOR_REPLY:
-// gf_sleep(16);
 			gf_sleep(1);
 		case GF_NETIO_CONNECTED:
 			sess->do_requests(sess);
+
+			if (sess->reused_cache_entry && sess->cache_entry && gf_cache_are_headers_processed(sess->cache_entry) ) {
+				sess->status = GF_NETIO_DATA_EXCHANGE;
+			}
 			break;
 		case GF_NETIO_DATA_EXCHANGE:
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
-			go = 0;
+			go = GF_FALSE;
 			break;
 		default:
 			break;
@@ -1585,7 +1670,7 @@
 static Bool gf_dm_needs_to_delete_cache(GF_DownloadManager * dm) {
 	const char * opt;
 	if (!dm || !dm->cfg)
-		return 0;
+		return GF_FALSE;
 	opt = gf_cfg_get_key(dm->cfg, "Downloader", "CleanCache");
 	return opt && (!strncmp("yes", opt, 3) || !strncmp("true", opt, 4) || !strncmp("1", opt, 1));
 }
@@ -1648,10 +1733,10 @@
 		char szTemp[GF_MAX_PATH];
 		strcpy(szTemp, dm->cache_directory);
 		strcat(szTemp, "gpaccache.test");
-		test = fopen(szTemp, "wb");
+		test = gf_fopen(szTemp, "wb");
 		if (!test) {
 			gf_mkdir(dm->cache_directory);
-			test = fopen(szTemp, "wb");
+			test = gf_fopen(szTemp, "wb");
 			if (!test) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Cache] Cannot write to %s directory, using system temp cache\n", dm->cache_directory ));
 				gf_free(dm->cache_directory);
@@ -1661,19 +1746,36 @@
 			}
 		}
 		if (test) {
-			fclose(test);
+			gf_fclose(test);
 			gf_delete_file(szTemp);
 		}
 	}
 
 	opt = cfg ? gf_cfg_get_key(cfg, "Downloader", "MaxRate") : NULL;
 	/*use it in in BYTES per second*/
-	if (opt) dm->limit_data_rate = 1024 * atoi(opt) / 8;
+	if (opt)
+		dm->limit_data_rate = 1000 * atoi(opt) / 8;
+	else
+		gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
+	
+
+	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+	//when rate is limited, use smaller smaller read size
+	if (dm->limit_data_rate) {
+		dm->read_buf_size = 1024;
+	}
 
 	if (cfg) {
 		opt = gf_cfg_get_key(cfg, "Downloader", "DisableCache");
 		if (!opt) gf_cfg_set_key(cfg, "Downloader", "DisableCache", "no");
-		if (opt && !strcmp(opt, "yes")) dm->disable_cache = 1;
+		if (opt && !strcmp(opt, "yes")) dm->disable_cache = GF_TRUE;
+	}
+
+	dm->allow_offline_cache = GF_FALSE;
+	if (cfg) {
+		opt = gf_cfg_get_key(cfg, "Downloader", "AllowOfflineCache");
+		if (opt && !strcmp(opt, "yes") )
+			dm->allow_offline_cache = GF_TRUE;
 	}
 
 	dm->head_timeout = 5000;
@@ -1704,11 +1806,11 @@
 }
 
 void gf_dm_set_auth_callback(GF_DownloadManager *dm,
- Bool (*GetUserPassword)(void *usr_cbk, const char *site_url, char *usr_name, char *password),
+ Bool (*get_user_password)(void *usr_cbk, const char *site_url, char *usr_name, char *password),
 void *usr_cbk)
 {
 	if (dm) {
-		dm->GetUserPassword = GetUserPassword;
+		dm->get_user_password = get_user_password;
 		dm->usr_cbk = usr_cbk;
 	}
 }
@@ -1723,7 +1825,7 @@
 	gf_mx_p( dm->cache_mx );
 
 	while (gf_list_count(dm->partial_downloads)) {
-		GF_PartialDownload * entry = gf_list_get( dm->partial_downloads, 0);
+		GF_PartialDownload * entry = (GF_PartialDownload*)gf_list_get( dm->partial_downloads, 0);
 		gf_list_rem( dm->partial_downloads, 0);
 		assert( entry->filename );
 		gf_delete_file( entry->filename );
@@ -1742,7 +1844,7 @@
 	dm->sessions = NULL;
 	assert( dm->skip_proxy_servers );
 	while (gf_list_count(dm->skip_proxy_servers)) {
-		char *serv = gf_list_get(dm->skip_proxy_servers, 0);
+		char *serv = (char*)gf_list_get(dm->skip_proxy_servers, 0);
 		gf_list_rem(dm->skip_proxy_servers, 0);
 		gf_free(serv);
 	}
@@ -1750,7 +1852,7 @@
 	dm->skip_proxy_servers = NULL;
 	assert( dm->credentials);
 	while (gf_list_count(dm->credentials)) {
-		gf_user_credentials_struct * cred = gf_list_get( dm->credentials, 0);
+		gf_user_credentials_struct * cred = (gf_user_credentials_struct*)gf_list_get( dm->credentials, 0);
 		gf_list_rem( dm->credentials, 0);
 		gf_free( cred );
 	}
@@ -1761,7 +1863,7 @@
 		/* Deletes DownloadedCacheEntry and associated files if required */
 		Bool delete_my_files = gf_dm_needs_to_delete_cache(dm);
 		while (gf_list_count(dm->cache_entries)) {
-			const DownloadedCacheEntry entry = gf_list_get( dm->cache_entries, 0);
+			const DownloadedCacheEntry entry = (const DownloadedCacheEntry)gf_list_get( dm->cache_entries, 0);
 			gf_list_rem( dm->cache_entries, 0);
 			if (delete_my_files)
 				gf_cache_entry_set_delete_files_when_deleted(entry);
@@ -1796,11 +1898,12 @@
 * Data will be skipped and parsed and sent as a GF_NETIO_Parameter to the user_io,
 * so modules interrested by those streams may use the data
 * \param sess The GF_DownloadSession
- * \param icy_metaint The number of bytes of data before reaching possible meta data
 * \param data last data received
 * \param nbBytes The number of bytes contained into data
 */
-static void gf_icy_skip_data(GF_DownloadSession * sess, u32 icy_metaint, const char * data, u32 nbBytes) {
+static void gf_icy_skip_data(GF_DownloadSession * sess, const char * data, u32 nbBytes)
+{
+	u32 icy_metaint = sess->icy_metaint;
 	assert( icy_metaint > 0 );
 	while (nbBytes) {
 		if (sess->icy_bytes == icy_metaint) {
@@ -1817,13 +1920,15 @@
 					memcpy(szData, data+1, sess->icy_count-1);
 					szData[sess->icy_count] = 0;
 
-					par.error = 0;
+					par.error = GF_OK;
 					par.msg_type = GF_NETIO_PARSE_HEADER;
 					par.name = "icy-meta";
 					par.value = szData;
 					par.sess = sess;
 					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[ICY] Found metainfo in stream=%s, (every %d bytes)\n", szData, icy_metaint));
 					gf_dm_sess_user_io(sess, &par);
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[ICY] Empty metainfo in stream, (every %d bytes)\n", icy_metaint));
 				}
 				nbBytes -= sess->icy_count;
 				data += sess->icy_count;
@@ -1871,11 +1976,23 @@
 		return body_start;
 	}
 
+	if (sess->chunk_lf_remains) {
+		if (body_start[0] != 0x0a) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Chunk encoding: expecting trailing LF got 0x%x instead\n", body_start[0] ));
+		}
+		body_start = body_start + 1;
+		sess->chunk_lf_remains = GF_FALSE;
+	}
 
 	te_header = strstr((char *) body_start, "\r\n");
-	if (!te_header) return NULL;
+	if (!te_header) {
+		*header_size = 0;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Chunk encoding: current buffer does not contain enough bytes to read the size\n"));
+		return NULL;
+	}
 
 	te_header[0] = 0;
+	//assert(strlen(body_start));
 	*header_size = (u32) (strlen(body_start)) + 2;
 
 	sep = strchr(body_start, ';');
@@ -1884,7 +2001,7 @@
 	if (sep) sep[0] = ';';
 	*payload_size = size;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d\n", body_start, 2+strlen(body_start), size));
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d at UTC "LLD"\n", body_start, 2+strlen(body_start), size, gf_net_get_utc()));
 
 	te_header[0] = '\r';
 	return te_header+2;
@@ -1905,17 +2022,30 @@
 
 static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size)
 {
-	u32 nbBytes, hdr_size, remaining;
+	u32 nbBytes, remaining, hdr_size;
 	u8 *data;
-	Bool flush_chunk = 0;
+	Bool flush_chunk = GF_FALSE;
 	GF_NETIO_Parameter par;
 
 	nbBytes = payload_size;
 	hdr_size = 0;
 	remaining = 0;
+	if (!payload)
+		return; //nothing to do
 	if (sess->chunked) {
 		data = (u8 *) gf_dm_get_chunk_data(sess, (char *) payload, &nbBytes, &hdr_size);
-		if (hdr_size + nbBytes + 2 > payload_size) {
+		if (!hdr_size && !data) {
+			/* keep the data and wait for the rest */
+			if (sess->remaining_data) gf_free(sess->remaining_data);
+			sess->remaining_data_size = nbBytes;
+			sess->remaining_data = (char *)gf_malloc(nbBytes * sizeof(char));
+			memcpy(sess->remaining_data, payload, nbBytes);
+			payload_size = 0;
+			payload = NULL;
+		} else if (hdr_size + nbBytes + 2 > payload_size) {
+			/* The entire payload was read,
+			 and the payload contained the chunk size + CRLF
+			 but we need to wait for the next payloads to finish the chunk */
 			remaining = nbBytes + 2 - payload_size + hdr_size;
 			nbBytes = payload_size - hdr_size;
 			payload_size = 0;
@@ -1923,7 +2053,7 @@
 		} else {
 			payload_size -= hdr_size + nbBytes + 2;
 			payload += hdr_size + nbBytes + 2;
-			flush_chunk = 1;
+			flush_chunk = GF_TRUE;
 		}
 		/*chunk transfer is done*/
 		if (!nbBytes) {
@@ -1943,16 +2073,16 @@
 
 	if (nbBytes) {
 		sess->bytes_done += nbBytes;
-		dm_sess_update_download_rate(sess, 1);
+		dm_sess_update_download_rate(sess, GF_TRUE);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] url %s received %d new bytes\n", gf_cache_get_url(sess->cache_entry), nbBytes ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] url %s received %d new bytes (%d kbps)\n", gf_cache_get_url(sess->cache_entry), nbBytes, 8*sess->bytes_per_sec/1000));
 		if (sess->total_size && (sess->bytes_done > sess->total_size)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] url %s received more bytes than planned!! Got %d bytes vs %d content length\n", gf_cache_get_url(sess->cache_entry), sess->bytes_done , sess->total_size ));
 			sess->bytes_done = sess->total_size;
 		}
 
 		if (sess->icy_metaint > 0)
-			gf_icy_skip_data(sess, sess->icy_metaint, (char *) data, nbBytes);
+			gf_icy_skip_data(sess, (char *) data, nbBytes);
 		else {
 			if (sess->use_cache_file)
 				gf_cache_write_to_cache( sess->cache_entry, sess, (char *) data, nbBytes);
@@ -1968,20 +2098,20 @@
 	}
 
 	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
-		gf_dm_disconnect(sess, 0);
+		gf_dm_disconnect(sess, GF_FALSE);
 		par.msg_type = GF_NETIO_DATA_TRANSFERED;
 		par.error = GF_OK;
 
-
-		gf_dm_sess_user_io(sess, &par);
 		if (sess->use_cache_file) {
-			gf_cache_close_write_cache(sess->cache_entry, sess, 1);
+			gf_cache_close_write_cache(sess->cache_entry, sess, GF_TRUE);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
 			 ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
 		}
+		gf_dm_sess_user_io(sess, &par);
 		sess->total_time_since_req = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps) (%d us since request)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024, sess->total_time_since_req ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps) (%d us since request - got response in %d us)\n", gf_cache_get_url(sess->cache_entry),
+		 gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024, sess->total_time_since_req, sess->reply_time ));
 	}
 
 	if (rewrite_size && sess->chunked) {
@@ -1991,8 +2121,11 @@
 	}
 
 	if (!sess->nb_left_in_chunk && remaining) {
-		assert(remaining>=2);
-		sess->nb_left_in_chunk = remaining-2;
+		if (remaining==1) {
+			sess->chunk_lf_remains = GF_TRUE;
+		} else {
+			sess->nb_left_in_chunk = remaining-2;
+		}
 	} else if (payload_size) {
 		gf_dm_data_received(sess, payload, payload_size, store_in_init, rewrite_size);
 	}
@@ -2041,7 +2174,7 @@
 	if (e) return e;
 	size = *read_size;
 	*read_size = 0;
-	gf_dm_data_received(sess, (u8 *) buffer, size, 0, read_size);
+	gf_dm_data_received(sess, (u8 *) buffer, size, GF_FALSE, read_size);
 	return GF_OK;
 }
 
@@ -2081,7 +2214,7 @@
 GF_EXPORT
 Bool gf_dm_sess_can_be_cached_on_disk(const GF_DownloadSession *sess)
 {
-	if (!sess) return 0;
+	if (!sess) return GF_FALSE;
 	return gf_cache_get_content_length(sess->cache_entry) != 0;
 }
 
@@ -2091,11 +2224,11 @@
 	assert(sess);
 	if (sess->mx) {
 		gf_mx_p(sess->mx);
-		gf_dm_disconnect(sess, 1);
+		gf_dm_disconnect(sess, GF_TRUE);
 		sess->status = GF_NETIO_STATE_ERROR;
 		gf_mx_v(sess->mx);
 	} else {
-		gf_dm_disconnect(sess, 1);
+		gf_dm_disconnect(sess, GF_TRUE);
 	}
 }
 void *gf_dm_sess_get_private(GF_DownloadSession * sess)
@@ -2125,7 +2258,7 @@
 static GF_Err http_send_headers(GF_DownloadSession *sess, char * sHTTP) {
 	GF_Err e;
 	GF_NETIO_Parameter par;
-	Bool no_cache = 0;
+	Bool no_cache = GF_FALSE;
 	char range_buf[1024];
 	char pass_buf[1024];
 	const char *user_agent;
@@ -2141,6 +2274,13 @@
 		gf_dm_configure_cache(sess);
 		sess->needs_cache_reconfig = 0;
 	}
+	if (sess->from_cache_only) {
+		sess->request_start_time = gf_sys_clock_high_res();
+		sess->req_hdr_size = 0;
+		sess->status = GF_NETIO_WAIT_FOR_REPLY;
+		gf_dm_sess_notify_state(sess, GF_NETIO_WAIT_FOR_REPLY, GF_OK);
+		return GF_OK;
+	}
 
 	/*setup authentification*/
 	strcpy(pass_buf, "");
@@ -2155,7 +2295,7 @@
 	if (!user_agent) user_agent = GF_DOWNLOAD_AGENT_NAME;
 
 
-	par.error = 0;
+	par.error = GF_OK;
 	par.msg_type = GF_NETIO_GET_METHOD;
 	par.name = NULL;
 	gf_dm_sess_user_io(sess, &par);
@@ -2190,7 +2330,7 @@
 	}
 
 	/*get all headers*/
-	has_agent = has_accept = has_connection = has_range = has_language = has_mime = 0;
+	has_agent = has_accept = has_connection = has_range = has_language = has_mime = GF_FALSE;
 	while (1) {
 		par.msg_type = GF_NETIO_GET_HEADER;
 		par.value = NULL;
@@ -2200,12 +2340,12 @@
 		strcat(sHTTP, ": ");
 		strcat(sHTTP, par.value);
 		strcat(sHTTP, "\r\n");
-		if (!strcmp(par.name, "Accept")) has_accept = 1;
-		else if (!strcmp(par.name, "Connection")) has_connection = 1;
-		else if (!strcmp(par.name, "Range")) has_range = 1;
-		else if (!strcmp(par.name, "User-Agent")) has_agent = 1;
-		else if (!strcmp(par.name, "Accept-Language")) has_language = 1;
-		else if (!strcmp(par.name, "Content-Type")) has_mime = 1;
+		if (!strcmp(par.name, "Accept")) has_accept = GF_TRUE;
+		else if (!strcmp(par.name, "Connection")) has_connection = GF_TRUE;
+		else if (!strcmp(par.name, "Range")) has_range = GF_TRUE;
+		else if (!strcmp(par.name, "User-Agent")) has_agent = GF_TRUE;
+		else if (!strcmp(par.name, "Accept-Language")) has_language = GF_TRUE;
+		else if (!strcmp(par.name, "Content-Type")) has_mime = GF_TRUE;
 		if (!par.msg_type) break;
 	}
 	if (!has_agent) {
@@ -2223,7 +2363,7 @@
 		else sprintf(range_buf, "Range: bytes="LLD"-"LLD"\r\n", sess->range_start, sess->range_end);
 		strcat(sHTTP, range_buf);
 
-		no_cache = 1;
+		no_cache = GF_TRUE;
 	}
 	if (!has_language) {
 		const char *opt;
@@ -2250,7 +2390,7 @@
 	par.size = 0;
 
 	/*check if we have personalization info*/
-	send_profile = 0;
+	send_profile = GF_FALSE;
 	if (sess->dm && sess->dm->cfg)
 		user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfileID");
 	else
@@ -2265,15 +2405,15 @@
 		else
 			user_profile = NULL;
 		if (user_profile) {
-			FILE *profile = gf_f64_open(user_profile, "rt");
+			FILE *profile = gf_fopen(user_profile, "rt");
 			if (profile) {
-				gf_f64_seek(profile, 0, SEEK_END);
-				par.size = (u32) gf_f64_tell(profile);
-				fclose(profile);
+				gf_fseek(profile, 0, SEEK_END);
+				par.size = (u32) gf_ftell(profile);
+				gf_fclose(profile);
 				sprintf(range_buf, "Content-Length: %d\r\n", par.size);
 				strcat(sHTTP, range_buf);
 				strcat(sHTTP, "Content-Type: text/xml\r\n");
-				send_profile = 1;
+				send_profile = GF_TRUE;
 			}
 		}
 	}
@@ -2289,7 +2429,7 @@
 
 	if (sess->http_read_type!=OTHER) {
 		/*signal we support title streaming*/
-		if (!strcmp(sess->remote_path, "/")) strcat(sHTTP, "icy-metadata:1\r\n");
+//		if (!strcmp(sess->remote_path, "/")) strcat(sHTTP, "icy-metadata:1\r\n");
 		/* This will force the server to respond with Icy-Metaint */
 		strcat(sHTTP, "Icy-Metadata: 1\r\n");
 
@@ -2303,7 +2443,7 @@
 
 	if (send_profile || par.data) {
 		u32 len = (u32) strlen(sHTTP);
-		char *tmp_buf = gf_malloc(sizeof(char)*(len+par.size+1));
+		char *tmp_buf = (char*)gf_malloc(sizeof(char)*(len+par.size+1));
 		strcpy(tmp_buf, sHTTP);
 		if (par.data) {
 			memcpy(tmp_buf+len, par.data, par.size);
@@ -2314,7 +2454,7 @@
 			assert( sess->dm->cfg );
 			user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfile");
 			assert (user_profile);
-			profile = gf_f64_open(user_profile, "rt");
+			profile = gf_fopen(user_profile, "rt");
 			if (profile) {
 				u32 readen = (u32) fread(tmp_buf+len, sizeof(char), par.size, profile);
 				if (readen<par.size) {
@@ -2324,7 +2464,7 @@
 						tmp_buf[len + readen] = 0;
 					}
 				}
-				fclose(profile);
+				gf_fclose(profile);
 			} else {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Error while loading Profile file %s.", user_profile));
 			}
@@ -2343,7 +2483,7 @@
 #endif
 			e = gf_sk_send(sess->sock, tmp_buf, len+par.size);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", tmp_buf));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request at UTC "LLD" %s\n\n", gf_net_get_utc(), tmp_buf));
 		gf_free(tmp_buf);
 	} else {
 		u32 len = (u32) strlen(sHTTP);
@@ -2364,7 +2504,7 @@
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error sending request %s\n", gf_error_to_string(e) ));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", sHTTP));
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request at UTC "LLU" %s\n\n", gf_net_get_utc(), sHTTP));
 		}
 #endif
 	}
@@ -2383,28 +2523,27 @@
 
 
 
-static Bool dm_exceeds_cap_rate(GF_DownloadSession * sess)
+static Bool dm_exceeds_cap_rate(GF_DownloadManager * dm)
 {
 	u32 cumul_rate = 0;
-	u32 i, count = gf_list_count(sess->dm->sessions);
-
-	dm_sess_update_download_rate(sess, 0);
-	//we already exceed the max rate
-	if (sess->bytes_per_sec>sess->dm->limit_data_rate) return 1;
+	u32 nb_sess = 0;
+	u32 i, count = gf_list_count(dm->sessions);
 
 	//check if this fits with all other sessions
 	for (i=0; i<count; i++) {
-		GF_DownloadSession * a_sess = gf_list_get(sess->dm->sessions, i);
-		if (sess == a_sess) continue;
-		//session done
-		if (a_sess->total_size==a_sess->bytes_done) {
-			continue;
-		}
-		dm_sess_update_download_rate(a_sess, 0);
-		cumul_rate += a_sess->bytes_per_sec;
+		GF_DownloadSession * sess = (GF_DownloadSession*)gf_list_get(dm->sessions, i);
+
+		//session not running done
+		if (sess->status != GF_NETIO_DATA_EXCHANGE) continue;
+
+		dm_sess_update_download_rate(sess, GF_FALSE);
+		cumul_rate += sess->bytes_per_sec;
+		nb_sess ++;
 	}
-	if (sess->bytes_per_sec + cumul_rate >= sess->dm->limit_data_rate) return 1;
-	return 0;
+	if ( cumul_rate >= nb_sess * dm->limit_data_rate)
+		return GF_TRUE;
+
+	return GF_FALSE;
 }
 
 /*!
@@ -2417,27 +2556,36 @@
 {
 	u32 size;
 	GF_Err e;
-	u32 buf_size = GF_DOWNLOAD_BUFFER_SIZE;
-	if (sess->dm && sess->dm->limit_data_rate)
-		buf_size = 1024;
+	u32 buf_size = sess->dm ? sess->dm->read_buf_size : GF_DOWNLOAD_BUFFER_SIZE;
+	u32 remaining_data_size = sess->remaining_data_size;
 
 	while (1) {
 		if (sess->status>=GF_NETIO_DISCONNECTED)
 			return GF_REMOTE_SERVICE_ERROR;
 
 		if (sess->dm && sess->dm->limit_data_rate && sess->bytes_per_sec) {
-			if (dm_exceeds_cap_rate(sess))
+			if (dm_exceeds_cap_rate(sess->dm)) {
+				gf_sleep(1);
 				return GF_OK;
+			}
+		}
+
+		//the data remaining from the last buffer (i.e size for chunk that couldn't be read because the buffer does not contain enough bytes)
+		if (sess->remaining_data && sess->remaining_data_size) {
+			memcpy(sHTTP, sess->remaining_data, sess->remaining_data_size);
+			gf_free(sess->remaining_data);
+			sess->remaining_data = NULL;
+			sess->remaining_data_size = 0;
 		}
 
-		e = gf_dm_read_data(sess, sHTTP, buf_size, &size);
+		e = gf_dm_read_data(sess, sHTTP+remaining_data_size, buf_size-remaining_data_size, &size);
 		if (e!= GF_IP_CONNECTION_CLOSED && (!size || e == GF_IP_NETWORK_EMPTY)) {
 			if (e == GF_IP_CONNECTION_CLOSED || (!sess->total_size && !sess->chunked && (gf_sys_clock_high_res() - sess->start_time > 5000000))) {
 				sess->total_size = sess->bytes_done;
 				gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
 				assert(sess->server_name);
 				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
-				gf_dm_disconnect(sess, (e == GF_IP_CONNECTION_CLOSED) ? 1 : 0);
+				gf_dm_disconnect(sess, (e == GF_IP_CONNECTION_CLOSED) ? GF_TRUE : GF_FALSE);
 			}
 			return GF_OK;
 		}
@@ -2446,7 +2594,7 @@
 			if (sess->sock && (e == GF_IP_CONNECTION_CLOSED)) {
 				u32 len = gf_cache_get_content_length(sess->cache_entry);
 				if (size > 0)
-					gf_dm_data_received(sess, (u8 *) sHTTP, size, 0, NULL);
+					gf_dm_data_received(sess, (u8 *) sHTTP, size, GF_FALSE, NULL);
 				if ( ( (len == 0) && sess->use_cache_file)
 				 /*ivica patch*/
 				 || (size==0)
@@ -2461,15 +2609,15 @@
 					e = GF_OK;
 				}
 			}
-			gf_dm_disconnect(sess, 1);
+			gf_dm_disconnect(sess, GF_TRUE);
 			sess->last_error = e;
 			gf_dm_sess_notify_state(sess, sess->status, e);
 			return e;
 		}
-		gf_dm_data_received(sess, (u8 *) sHTTP, size, 0, NULL);
+		gf_dm_data_received(sess, (u8 *) sHTTP, size+remaining_data_size, GF_FALSE, NULL);
 
 		/*socket empty*/
-		if (size < GF_DOWNLOAD_BUFFER_SIZE) {
+		if (size < buf_size) {
 			gf_sleep(1);
 			return GF_OK;
 		}
@@ -2485,18 +2633,18 @@
 	memset(&par, 0, sizeof(GF_NETIO_Parameter));
 
 	for (i=0; i<count; i++) {
-		GF_HTTPHeader *hdrp = gf_list_get(sess->headers, i);
+		GF_HTTPHeader *hdrp = (GF_HTTPHeader*)gf_list_get(sess->headers, i);
 		par.name = hdrp->name;
 		par.value = hdrp->value;
 
-		par.error = 0;
+		par.error = GF_OK;
 		par.msg_type = GF_NETIO_PARSE_HEADER;
 		gf_dm_sess_user_io(sess, &par);
 	}
 
 	if (sHTTP) {
 		sHTTP[bytesRead]=0;
-		par.error = 0;
+		par.error = GF_OK;
 		par.data = sHTTP + BodyStart;
 		par.size = (u32) strlen(par.data);
 		par.msg_type = GF_NETIO_DATA_EXCHANGE;
@@ -2516,7 +2664,7 @@
 	u32 res, i, buf_size;
 	s32 LinePos, Pos;
 	u32 rsp_code, ContentLength, first_byte, last_byte, total_size, range, no_range;
-	Bool connection_closed = 0;
+	Bool connection_closed = GF_FALSE;
 	char buf[1025];
 	char comp[400];
 	GF_Err e;
@@ -2526,12 +2674,24 @@
 	bytesRead = res = 0;
 	new_location = NULL;
 	if (!(sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
-		sess->use_cache_file = 1;
+		sess->use_cache_file = GF_TRUE;
 	}
 
-	buf_size = GF_DOWNLOAD_BUFFER_SIZE;
-	if (sess->dm && sess->dm->limit_data_rate)
-		buf_size = 1024;
+	if (sess->from_cache_only) {
+		GF_NETIO_Parameter par;
+		sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
+		sess->rsp_hdr_size = 0;
+		sess->total_size = sess->bytes_done = gf_cache_get_content_length(sess->cache_entry);;
+
+		memset(&par, 0, sizeof(GF_NETIO_Parameter));
+		par.msg_type = GF_NETIO_DATA_TRANSFERED;
+		par.error = GF_OK;
+		gf_dm_sess_user_io(sess, &par);
+		gf_dm_disconnect(sess, GF_FALSE);
+		return GF_OK;
+	}
+
+	buf_size = sess->dm ? sess->dm->read_buf_size : GF_DOWNLOAD_BUFFER_SIZE;
 
 	//always set start time to the time at last attempt reply parsing
 	sess->start_time = gf_sys_clock_high_res();
@@ -2554,10 +2714,10 @@
 		case GF_IP_CONNECTION_CLOSED:
 			if (sess->http_read_type == HEAD) {
 				/* Some servers such as shoutcast directly close connection if HEAD or an unknown method is issued */
-				sess->server_only_understand_get = 1;
+				sess->server_only_understand_get = GF_TRUE;
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connection closed by server when getting %s - retrying\n", sess->remote_path));
-			gf_dm_disconnect(sess, 1);
+			gf_dm_disconnect(sess, GF_TRUE);
 
 			if (sess->num_retry)
 				sess->status = GF_NETIO_SETUP;
@@ -2604,7 +2764,7 @@
 	Pos = gf_token_get(buf, 0, " \t\r\n", comp, 400);
 
 	if (!strncmp("ICY", comp, 3)) {
-		sess->use_cache_file = 0;
+		sess->use_cache_file = GF_FALSE;
 		/*be prepared not to receive any mime type from ShoutCast servers*/
 		if (!gf_cache_get_mime_type(sess->cache_entry))
 			gf_cache_set_mime_type(sess->cache_entry, "audio/mpeg");
@@ -2653,7 +2813,7 @@
 	//default pre-processing of headers - needs cleanup, not all of these have to be parsed before checking reply code
 	for (i=0; i<gf_list_count(sess->headers); i++) {
 		char *val;
-		GF_HTTPHeader *hdrp = gf_list_get(sess->headers, i);
+		GF_HTTPHeader *hdrp = (GF_HTTPHeader*)gf_list_get(sess->headers, i);
 
 		if (!stricmp(hdrp->name, "Content-Length") ) {
 			ContentLength = (u32) atoi(hdrp->value);
@@ -2709,7 +2869,7 @@
 			/* For HTTP icy servers, we disable cache */
 			if (sess->icy_metaint == 0)
 				sess->icy_metaint = -1;
-			sess->use_cache_file = 0;
+			sess->use_cache_file = GF_FALSE;
 			if (!stricmp(hdrp->name, "icy-metaint")) {
 				sess->icy_metaint = atoi(hdrp->value);
 			}
@@ -2734,13 +2894,15 @@
 		}
 		else if (!stricmp(hdrp->name, "Connection") ) {
 			if (strstr(hdrp->value, "close"))
-				connection_closed = 1;
+				connection_closed = GF_TRUE;
 		}
 
 		if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
 	}
 	if (no_range) first_byte = 0;
 
+	gf_cache_set_headers_processed(sess->cache_entry);
+
 	par.msg_type = GF_NETIO_PARSE_REPLY;
 	par.error = GF_OK;
 	par.reply = rsp_code;
@@ -2749,7 +2911,7 @@
 	 * If response is correct, it means our credentials are correct
 	 */
 	if (sess->creds && rsp_code != 304)
-		sess->creds->valid = 1;
+		sess->creds->valid = GF_TRUE;
 
 
 	/*try to flush body */
@@ -2779,7 +2941,7 @@
 		if (BodyStart + ContentLength > (u32) bytesRead) {
 			ContentLength = 0;
 			//cannot flush, discard socket
-			sess->connection_close = 1;
+			sess->connection_close = GF_TRUE;
 		}
 	}
 	//remember if we can keep the session alive after the transfer is done
@@ -2813,7 +2975,7 @@
 			new_location[strlen(new_location)-1] = 0;
 
 		/*reset and reconnect*/
-		gf_dm_disconnect(sess, 1);
+		gf_dm_disconnect(sess, GF_TRUE);
 		sess->status = GF_NETIO_SETUP;
 		e = gf_dm_sess_setup_from_url(sess, new_location);
 		if (e) {
@@ -2829,19 +2991,20 @@
 		sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
 
 		gf_dm_sess_notify_state(sess, GF_NETIO_PARSE_REPLY, GF_OK);
-		gf_dm_disconnect(sess, 0);
+
+		gf_dm_disconnect(sess, GF_FALSE);
 		if (sess->user_proc) {
 			/* For modules that do not use cache and have problems with GF_NETIO_DATA_TRANSFERED ... */
 			const char * filename;
 			FILE * f;
 			filename = gf_cache_get_cache_filename(sess->cache_entry);
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending data to modules from %s...\n", filename));
-			f = gf_f64_open(filename, "rb");
+			f = gf_fopen(filename, "rb");
 			assert(filename);
 			if (!f) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] FAILED to open cache file %s for reading contents !\n", filename));
 				/* Ooops, no cache, redowload everything ! */
-				gf_dm_disconnect(sess, 0);
+				gf_dm_disconnect(sess, GF_FALSE);
 				sess->status = GF_NETIO_SETUP;
 				e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
 				sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
@@ -2853,7 +3016,7 @@
 				return e;
 			}
 
-			par.error = 0;
+			par.error = GF_OK;
 			par.msg_type = GF_NETIO_PARSE_HEADER;
 			par.name = "Content-Type";
 			par.value = (char *) gf_cache_get_mime_type(sess->cache_entry);
@@ -2879,13 +3042,13 @@
 					}
 				} while ( read > 0);
 			}
-			fclose(f);
+			gf_fclose(f);
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] all data has been sent to modules from %s.\n", filename));
 		}
 		/* Cache file is the most recent */
 		sess->status = GF_NETIO_DATA_TRANSFERED;
 		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-		gf_dm_disconnect(sess, 0);
+		gf_dm_disconnect(sess, GF_FALSE);
 		par.msg_type = GF_NETIO_DATA_TRANSFERED;
 		par.error = GF_OK;
 		gf_dm_sess_user_io(sess, &par);
@@ -2894,10 +3057,10 @@
 	case 401:
 	{
 		/* Do we have a credentials struct ? */
-		sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, NULL, NULL, 0);
+		sess->creds = gf_user_credentials_register(sess->dm, sess->server_name, NULL, NULL, GF_FALSE);
 		if (!sess->creds) {
 			/* User credentials have not been filled properly, we have to abort */
-			gf_dm_disconnect(sess, 1);
+			gf_dm_disconnect(sess, GF_TRUE);
 			sess->status = GF_NETIO_STATE_ERROR;
 			par.error = GF_AUTHENTICATION_FAILURE;
 			par.msg_type = GF_NETIO_DISCONNECTED;
@@ -2906,7 +3069,7 @@
 			sess->last_error = e;
 			goto exit;
 		}
-		gf_dm_disconnect(sess, 0);
+		gf_dm_disconnect(sess, GF_FALSE);
 		sess->status = GF_NETIO_SETUP;
 		e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
 		if (e) {
@@ -2942,9 +3105,9 @@
 			/* Since HEAD is not understood by this server, we use a GET instead */
 			sess->http_read_type = GET;
 			sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
-			gf_dm_disconnect(sess, 0);
+			gf_dm_disconnect(sess, GF_FALSE);
 			sess->status = GF_NETIO_SETUP;
-			sess->server_only_understand_get = 1;
+			sess->server_only_understand_get = GF_TRUE;
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Method not supported, try with GET.\n"));
 			e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
 			if (e) {
@@ -2964,7 +3127,7 @@
 		/*retry without proxy*/
 		if (sess->proxy_enabled==1) {
 			sess->proxy_enabled=2;
-			gf_dm_disconnect(sess, 1);
+			gf_dm_disconnect(sess, GF_TRUE);
 			sess->status = GF_NETIO_SETUP;
 			return GF_OK;
 		}
@@ -2978,12 +3141,12 @@
 	notify_headers(sess, NULL, bytesRead, BodyStart);
 
 	if (sess->http_read_type != GET)
-		sess->use_cache_file = 0;
+		sess->use_cache_file = GF_FALSE;
 
 	if (sess->http_read_type==HEAD) {
-		gf_dm_disconnect(sess, 0);
+		gf_dm_disconnect(sess, GF_FALSE);
 		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-		sess->http_read_type = 0;
+		sess->http_read_type = GET;
 		return GF_OK;
 
 
@@ -2994,7 +3157,7 @@
 	if (!ContentLength && mime_type && ((strstr(mime_type, "ogg") || (!strcmp(mime_type, "audio/mpeg"))))) {
 		if (0 == sess->icy_metaint)
 			sess->icy_metaint = -1;
-		sess->use_cache_file = 0;
+		sess->use_cache_file = GF_FALSE;
 	}
 
 #ifndef GPAC_DISABLE_LOGS
@@ -3019,12 +3182,12 @@
 	} else if (!ContentLength && !sess->chunked) {
 		if (sess->http_read_type == GET) {
 			sess->total_size = SIZE_IN_STREAM;
-			sess->use_cache_file = 0;
+			sess->use_cache_file = GF_FALSE;
 			sess->status = GF_NETIO_DATA_EXCHANGE;
 			sess->bytes_done = 0;
 		} else {
 			gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-			gf_dm_disconnect(sess, 0);
+			gf_dm_disconnect(sess, GF_FALSE);
 			return GF_OK;
 		}
 	} else {
@@ -3039,7 +3202,7 @@
 		sess->status = GF_NETIO_DATA_EXCHANGE;
 		sess->bytes_done = 0;
 	}
-	
+
 
 	/* we may have existing data in this buffer ... */
 	if (!e && (BodyStart < (s32) bytesRead)) {
@@ -3047,7 +3210,7 @@
 		sess->init_data_size = 0;
 		sess->init_data = NULL;
 
-		gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, 1, NULL);
+		gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, GF_TRUE, NULL);
 	}
 exit:
 	if (e) {
@@ -3055,7 +3218,7 @@
 		gf_cache_entry_set_delete_files_when_deleted(sess->cache_entry);
 		gf_dm_remove_cache_entry_from_session(sess);
 		sess->cache_entry = NULL;
-		gf_dm_disconnect(sess, 0);
+		gf_dm_disconnect(sess, GF_FALSE);
 		sess->status = GF_NETIO_STATE_ERROR;
 		sess->last_error = e;
 		gf_dm_sess_notify_state(sess, sess->status, e);
@@ -3074,9 +3237,15 @@
 	char sHTTP[GF_DOWNLOAD_BUFFER_SIZE+1];
 
 	if (sess->reused_cache_entry) {
+		//main session is done downloading, notify - to do we should send progress events on this session also ...
 		if (!gf_cache_is_in_progress(sess->cache_entry)) {
-			gf_dm_disconnect(sess, 0);
-			sess->reused_cache_entry = 0;
+			GF_NETIO_Parameter par;
+			gf_dm_disconnect(sess, GF_FALSE);
+			sess->reused_cache_entry = GF_FALSE;
+			memset(&par, 0, sizeof(GF_NETIO_Parameter));
+			par.msg_type = GF_NETIO_DATA_TRANSFERED;
+			par.error = GF_OK;
+			gf_dm_sess_user_io(sess, &par);
 		}
 		return;
 	}
@@ -3093,7 +3262,9 @@
 		if (sess->reassigned) {
 
 			if (sess->icy_metaint > 0) {
-				gf_icy_skip_data(sess, sess->icy_metaint, sess->init_data, sess->init_data_size);
+				//we are reparsing init data, reset icy status
+				sess->icy_bytes = 0;
+				gf_icy_skip_data(sess, sess->init_data, sess->init_data_size);
 			} else {
 				GF_NETIO_Parameter par;
 				par.msg_type = GF_NETIO_DATA_EXCHANGE;
@@ -3102,7 +3273,7 @@
 				par.size = sess->init_data_size;
 				gf_dm_sess_user_io(sess, &par);
 			}
-			sess->reassigned = 0;
+			sess->reassigned = GF_FALSE;
 		}
 		http_parse_remaining_body(sess, sHTTP);
 		break;
@@ -3128,29 +3299,27 @@
 	}
 }
 
-
 GF_EXPORT
-GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range)
+GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url)
 {
 	GF_Err e;
 	GF_DownloadManager * dm = NULL;
 	dm = gf_dm_new(NULL);
 	if (!dm)
 		return GF_OUT_OF_MEM;
-	e = gf_dm_wget_with_cache(dm, url, filename, start_range, end_range);
+	e = gf_dm_wget_with_cache(dm, url, filename, start_range, end_range, redirected_url);
 	gf_dm_del(dm);
 	return e;
 }
 
-GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm,
- const char *url, const char *filename, u64 start_range, u64 end_range)
+GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm, const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url)
 {
 	GF_Err e;
 	FILE * f;
 	GF_DownloadSession *dnload;
 	if (!filename || !url || !dm)
 		return GF_BAD_PARAM;
-	f= fopen(filename, "wb");
+	f = gf_fopen(filename, "wb");
 	if (!f) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[WGET] Failed to open file %s for write.\n", filename));
 		return GF_IO_ERR;
@@ -3159,18 +3328,22 @@
 	if (!dnload) {
 		return GF_BAD_PARAM;
 	}
-	dnload->use_cache_file = 0;
-	dnload->force_data_write_callback = 1;
+	dnload->use_cache_file = GF_FALSE;
+	dnload->force_data_write_callback = GF_TRUE;
 	if (end_range) {
 		dnload->range_start = start_range;
 		dnload->range_end = end_range;
-		dnload->needs_range = 1;
+		dnload->needs_range = GF_TRUE;
 	}
 	if (e == GF_OK) {
 		e = gf_dm_sess_process(dnload);
 	}
-	e |= gf_cache_close_write_cache(dnload->cache_entry, dnload, e == GF_OK);
-	fclose(f);
+	e |= gf_cache_close_write_cache(dnload->cache_entry, dnload, (e == GF_OK) ? GF_TRUE : GF_FALSE);
+	gf_fclose(f);
+
+	if (redirected_url) {
+		if (dnload->orig_url_before_redirect) *redirected_url = gf_strdup(dnload->orig_url);
+	}
 	gf_dm_sess_del(dnload);
 	return e;
 }
@@ -3180,12 +3353,13 @@
 {
 	GF_Err e;
 	FILE * f;
+	char * f_fn = NULL;
 	GF_DownloadSession *dnload;
 	GF_DownloadManager *dm;
 
 	if (!url || !out_data || !out_size)
 		return GF_BAD_PARAM;
-	f = gf_temp_file_new();
+	f = gf_temp_file_new(&f_fn);
 	if (!f) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[WGET] Failed to create temp file for write.\n"));
 		return GF_IO_ERR;
@@ -3193,17 +3367,20 @@
 
 	dm = gf_dm_new(NULL);
 	if (!dm) {
-		fclose(f);
+		gf_fclose(f);
+		gf_delete_file(f_fn);
 		return GF_OUT_OF_MEM;
 	}
 
 	dnload = gf_dm_sess_new_simple(dm, (char *)url, GF_NETIO_SESSION_NOT_THREADED, &wget_NetIO, f, &e);
 	if (!dnload) {
 		gf_dm_del(dm);
+		gf_fclose(f);
+		gf_delete_file(f_fn);
 		return GF_BAD_PARAM;
 	}
-	dnload->use_cache_file = 0;
-	dnload->disable_cache = 1;
+	dnload->use_cache_file = GF_FALSE;
+	dnload->disable_cache = GF_TRUE;
 	if (!e)
 		e = gf_dm_sess_process(dnload);
 
@@ -3213,7 +3390,7 @@
 	if (!e) {
 		u32 size = (u32) ftell(f), read;
 		*out_size = size;
-		*out_data = gf_malloc(sizeof(char)* ( 1 + size));
+		*out_data = (char*)gf_malloc(sizeof(char)* ( 1 + size));
 		fseek(f, 0, SEEK_SET);
 		read = (u32) fread(*out_data, 1, size, f);
 		if (read != size) {
@@ -3227,7 +3404,9 @@
 			}
 		}
 	}
-	fclose(f);
+	gf_fclose(f);
+	gf_delete_file(f_fn);
+	gf_free(f_fn);
 	gf_dm_sess_del(dnload);
 	gf_dm_del(dm);
 	return e;
@@ -3254,7 +3433,7 @@
 {
 	if (!sess) return GF_BAD_PARAM;
 	sess->status = GF_NETIO_SETUP;
-	sess->needs_range = 0;
+	sess->needs_range = GF_FALSE;
 	sess->range_start = sess->range_end = 0;
 	sess->bytes_done = sess->bytes_per_sec = 0;
 	if (sess->init_data) gf_free(sess->init_data);
@@ -3273,7 +3452,7 @@
 		return NULL;
 	count = gf_list_count(sess->dm->partial_downloads);
 	for (i = 0 ; i < count ; i++) {
-		GF_PartialDownload * pd = gf_list_get(sess->dm->partial_downloads, i);
+		GF_PartialDownload * pd = (GF_PartialDownload*)gf_list_get(sess->dm->partial_downloads, i);
 		assert( pd->filename && pd->url);
 		if (!strcmp(pd->url, sess->orig_url) && pd->startOffset == startOffset && pd->endOffset == endOffset) {
 			/* File already created, just return the file */
@@ -3295,28 +3474,28 @@
 		if (newFilename == NULL)
 			return NULL;
 		snprintf(newFilename, maxLen, "%s " LLU LLU, orig, startOffset, endOffset);
-		fw = gf_f64_open(newFilename, "wb");
+		fw = gf_fopen(newFilename, "wb");
 		if (!fw) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open partial cache file %s for write\n", newFilename));
 			gf_free( newFilename );
 			return NULL;
 		}
-		fr = gf_f64_open(orig, "rb");
+		fr = gf_fopen(orig, "rb");
 		if (!fr) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open full cache file %s\n", orig));
 			gf_free( newFilename );
-			fclose( fw );
+			gf_fclose( fw );
 		}
 		/* Now, we copy ! */
 		{
 			char copyBuff[GF_DOWNLOAD_BUFFER_SIZE+1];
 			s64 read, write, total;
 			total = endOffset - startOffset;
-			read = gf_f64_seek(fr, startOffset, SEEK_SET);
+			read = gf_fseek(fr, startOffset, SEEK_SET);
 			if (read != startOffset) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot seek at right start offset in %s\n", orig));
-				fclose( fr );
-				fclose( fw );
+				gf_fclose( fr );
+				gf_fclose( fw );
 				gf_free( newFilename );
 				return NULL;
 			}
@@ -3327,23 +3506,23 @@
 					write = gf_fwrite(copyBuff, sizeof(char), (size_t) read, fw);
 					if (write != read) {
 						/* Something bad happened */
-						fclose( fw );
-						fclose (fr );
+						gf_fclose( fw );
+						gf_fclose (fr );
 						gf_free( newFilename );
 						return NULL;
 					}
 				} else {
 					if (read < 0) {
-						fclose( fw );
-						fclose( fr );
+						gf_fclose( fw );
+						gf_fclose( fr );
 						gf_free( newFilename );
 						return NULL;
 					}
 				}
 			} while (total > 0);
-			fclose( fr );
-			fclose (fw);
-			partial = gf_malloc( sizeof(GF_PartialDownload));
+			gf_fclose( fr );
+			gf_fclose (fw);
+			partial = (GF_PartialDownload*)gf_malloc( sizeof(GF_PartialDownload));
 			if (partial == NULL) {
 				gf_free(newFilename);
 				return NULL;
@@ -3371,9 +3550,9 @@
 		if (sess->cache_entry) {
 			FILE *fptr = gf_cache_get_file_pointer(sess->cache_entry);
 			if (fptr) {
-				gf_f64_seek(fptr, 0, SEEK_END);
-				sess->init_data_size = (u32) gf_f64_tell(fptr);
-				gf_f64_seek(fptr, 0, SEEK_SET);
+				gf_fseek(fptr, 0, SEEK_END);
+				sess->init_data_size = (u32) gf_ftell(fptr);
+				gf_fseek(fptr, 0, SEEK_SET);
 				if (sess->init_data) gf_free(sess->init_data);
 				sess->init_data = gf_malloc(sess->init_data_size);
 				sess->init_data_size = fread(sess->init_data, 1, sess->init_data_size, fptr);
@@ -3417,9 +3596,12 @@
 
 	if (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL) flags |= GF_DOWNLOAD_SESSION_USE_SSL;
 	sess->flags = flags;
+	if (sess->flags & GF_NETIO_SESSION_NOTIFY_DATA)
+		sess->force_data_write_callback = GF_TRUE;
+
 	sess->user_proc = user_io;
 	sess->usr_cbk = cbk;
-	sess->reassigned = sess->init_data ? 1 : 0;
+	sess->reassigned = sess->init_data ? GF_TRUE : GF_FALSE;
 	sess->num_retry = SESSION_RETRY_COUNT;
 
 	if (sess->status==GF_NETIO_DISCONNECTED)
@@ -3432,12 +3614,21 @@
 GF_EXPORT
 void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec)
 {
-	dm->limit_data_rate = rate_in_bits_per_sec/8;
+	if (rate_in_bits_per_sec == 0xFFFFFFFF) {
+		dm->simulate_no_connection=GF_TRUE;
+	} else {
+		dm->simulate_no_connection=GF_FALSE;
+		dm->limit_data_rate = rate_in_bits_per_sec/8;
+
+		if (dm->cfg) {
+			char opt[100];
+			sprintf(opt, "%d", rate_in_bits_per_sec / 1024);
+			gf_cfg_set_key(dm->cfg, "Downloader", "MaxRate", opt);
+		}
 
-	if (dm->cfg) {
-		char opt[100];
-		sprintf(opt, "%d", rate_in_bits_per_sec / 1024);
-		gf_cfg_set_key(dm->cfg, "Downloader", "MaxRate", opt);
+		dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+		//when rate is limited, use smaller smaller read size
+		if (dm->limit_data_rate) dm->read_buf_size = 1024;
 	}
 }
 
@@ -3457,13 +3648,13 @@
 	count = gf_list_count(dm->sessions);
 
 	for (i=0; i<count; i++) {
-		GF_DownloadSession *sess = gf_list_get(dm->sessions, i);
+		GF_DownloadSession *sess = (GF_DownloadSession*)gf_list_get(dm->sessions, i);
 		if (sess->total_size==sess->bytes_done) {
 			if (gf_sys_clock_high_res() - sess->start_time>2000000) {
 				continue;
 			}
 		}
-		dm_sess_update_download_rate(sess, 0);
+		dm_sess_update_download_rate(sess, GF_FALSE);
 		ret += sess->bytes_per_sec;
 	}
 	gf_mx_v(dm->cache_mx);
@@ -3477,7 +3668,7 @@
 	if( !sess || !name) return NULL;
 	count = gf_list_count(sess->headers);
 	for (i=0; i<count; i++) {
-		GF_HTTPHeader *header = gf_list_get(sess->headers, i);
+		GF_HTTPHeader *header = (GF_HTTPHeader*)gf_list_get(sess->headers, i);
 		if (!strcmp(header->name, name)) return header->value;
 	}
 	return NULL;

v0.5.2.tar.gz/src/utils/error.c -> v0.6.1.tar.gz/src/utils/error.c Changed

@@ -221,11 +221,11 @@
 					global_log_tools[i].level = level;
 			}
 			else {
-				Bool found = 0;
+				Bool found = GF_FALSE;
 				for (i=0; i<GF_LOG_TOOL_MAX; i++) {
 					if (!strcmp(global_log_tools[i].name, tools)) {
 						global_log_tools[i].level = level;
-						found = 1;
+						found = GF_TRUE;
 					}
 				}
 				if (!found) {
@@ -387,7 +387,7 @@
 	gf_log_cbk prev_cbk = log_cbk;
 	log_cbk = cbk;
 	if (!log_cbk) log_cbk = default_log_callback;
-	user_log_cbk = usr_cbk;
+	if (usr_cbk) user_log_cbk = usr_cbk;
 	return prev_cbk;
 }
 
@@ -614,8 +614,8 @@
 #ifdef GPAC_USE_TINYGL
 	 "GPAC_USE_TINYGL "
 #endif
-#ifdef GPAC_USE_OGL_ES
-	 "GPAC_USE_OGL_ES "
+#ifdef GPAC_USE_GLES1X
+	 "GPAC_USE_GLES1X "
 #endif
 #if defined(_WIN32_WCE)
 #ifdef GPAC_USE_IGPP
@@ -1218,8 +1218,9 @@
 	char *sep;
 	u32 count = sizeof(defined_languages) / sizeof(struct lang_def);
 
+	if (!lang_or_rfc_5646_code) return -1;
 
-	len = 0;
+	len = (u32)strlen(lang_or_rfc_5646_code);
 	sep = (char *) strchr(lang_or_rfc_5646_code, '-');
 	if (sep) {
 		sep[0] = 0;
@@ -1231,10 +1232,10 @@
 		if (!strcmp(defined_languages[i].name, lang_or_rfc_5646_code)) {
 			return i;
 		}
-		if (sep && (len==3) && !strnicmp(defined_languages[i].three_char_code, lang_or_rfc_5646_code, 3)) {
+		if ((len==3) && !strnicmp(defined_languages[i].three_char_code, lang_or_rfc_5646_code, 3)) {
 			return i;
 		}
-		if (sep && (len==2) && !strnicmp(defined_languages[i].two_char_code, lang_or_rfc_5646_code, 2)) {
+		if ((len==2) && !strnicmp(defined_languages[i].two_char_code, lang_or_rfc_5646_code, 2)) {
 			return i;
 		}
 	}

v0.5.2.tar.gz/src/utils/gzio.cpp -> v0.6.1.tar.gz/src/utils/gzio.cpp Changed

v0.5.2.tar.gz/src/utils/list.c -> v0.6.1.tar.gz/src/utils/list.c Changed

v0.5.2.tar.gz/src/utils/math.c -> v0.6.1.tar.gz/src/utils/math.c Changed

@@ -903,7 +903,7 @@
 	if (ABS(det) > FIX_EPSILON) {
 		scale->x = scale->y = 0;
 		*rotate = 0;
-		return 0;
+		return GF_FALSE;
 	}
 	angle = gf_atan2(tmp[3], tmp[4]);
 	if (angle < FIX_EPSILON) {
@@ -1010,12 +1010,12 @@
 GF_EXPORT
 Bool gf_rect_overlaps(GF_Rect rc1, GF_Rect rc2)
 {
-	if (! rc2.height || !rc2.width || !rc1.height || !rc1.width) return 0;
-	if (rc2.x+rc2.width<=rc1.x) return 0;
-	if (rc2.x>=rc1.x+rc1.width) return 0;
-	if (rc2.y-rc2.height>=rc1.y) return 0;
-	if (rc2.y<=rc1.y-rc1.height) return 0;
-	return 1;
+	if (! rc2.height || !rc2.width || !rc1.height || !rc1.width) return GF_FALSE;
+	if (rc2.x+rc2.width<=rc1.x) return GF_FALSE;
+	if (rc2.x>=rc1.x+rc1.width) return GF_FALSE;
+	if (rc2.y-rc2.height>=rc1.y) return GF_FALSE;
+	if (rc2.y<=rc1.y-rc1.height) return GF_FALSE;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -1377,19 +1377,19 @@
 GF_EXPORT
 Bool gf_mx_equal(GF_Matrix *mx1, GF_Matrix *mx2)
 {
-	if (mx1->m[0] != mx2->m[0]) return 0;
-	if (mx1->m[1] != mx2->m[1]) return 0;
-	if (mx1->m[2] != mx2->m[2]) return 0;
-	if (mx1->m[4] != mx2->m[4]) return 0;
-	if (mx1->m[5] != mx2->m[5]) return 0;
-	if (mx1->m[6] != mx2->m[6]) return 0;
-	if (mx1->m[8] != mx2->m[8]) return 0;
-	if (mx1->m[9] != mx2->m[9]) return 0;
-	if (mx1->m[10] != mx2->m[10]) return 0;
-	if (mx1->m[12] != mx2->m[12]) return 0;
-	if (mx1->m[13] != mx2->m[13]) return 0;
-	if (mx1->m[14] != mx2->m[14]) return 0;
-	return 1;
+	if (mx1->m[0] != mx2->m[0]) return GF_FALSE;
+	if (mx1->m[1] != mx2->m[1]) return GF_FALSE;
+	if (mx1->m[2] != mx2->m[2]) return GF_FALSE;
+	if (mx1->m[4] != mx2->m[4]) return GF_FALSE;
+	if (mx1->m[5] != mx2->m[5]) return GF_FALSE;
+	if (mx1->m[6] != mx2->m[6]) return GF_FALSE;
+	if (mx1->m[8] != mx2->m[8]) return GF_FALSE;
+	if (mx1->m[9] != mx2->m[9]) return GF_FALSE;
+	if (mx1->m[10] != mx2->m[10]) return GF_FALSE;
+	if (mx1->m[12] != mx2->m[12]) return GF_FALSE;
+	if (mx1->m[13] != mx2->m[13]) return GF_FALSE;
+	if (mx1->m[14] != mx2->m[14]) return GF_FALSE;
+	return GF_TRUE;
 }
 
 
@@ -1474,6 +1474,25 @@
 	gf_mx_copy(*mx, rev);
 }
 
+GF_EXPORT
+void gf_mx_transpose(GF_Matrix *mx)
+{
+	GF_Matrix rev;
+	int i,j;
+
+	gf_mx_init(rev);
+	for (i=0; i<4 ; i++) {
+		for(j=0; j<4; j++) {
+			rev.m[i*4+j] = mx->m[j*4+i];
+		}
+	}
+
+
+	gf_mx_copy(*mx, rev);
+}
+
+
+
 
 GF_EXPORT
 void gf_mx_apply_vec(GF_Matrix *mx, GF_Vec *pt)
@@ -1792,7 +1811,7 @@
 	if (ABS(r3[0]) > ABS(r2[0])) SWAP_ROWS(r3, r2);
 	if (ABS(r2[0]) > ABS(r1[0])) SWAP_ROWS(r2, r1);
 	if (ABS(r1[0]) > ABS(r0[0])) SWAP_ROWS(r1, r0);
-	if (r0[0]==0) return 0;
+	if (r0[0]==0) return GF_FALSE;
 
 	/*eliminate first variable*/
 	m1 = gf_divfix(r1[0], r0[0]);
@@ -1838,7 +1857,7 @@
 	/* choose pivot - or die */
 	if (fabs(r3[1]) > fabs(r2[1])) SWAP_ROWS(r3, r2);
 	if (fabs(r2[1]) > fabs(r1[1])) SWAP_ROWS(r2, r1);
-	if (r1[1]==0) return 0;
+	if (r1[1]==0) return GF_FALSE;
 
 	/* eliminate second variable */
 	m2 = gf_divfix(r2[1], r1[1]);
@@ -1870,7 +1889,7 @@
 
 	/* choose pivot - or die */
 	if (fabs(r3[2]) > fabs(r2[2])) SWAP_ROWS(r3, r2);
-	if (r2[2]==0) return 0;
+	if (r2[2]==0) return GF_FALSE;
 
 	/* eliminate third variable */
 	m3 = gf_divfix(r3[2], r2[2]);
@@ -1880,7 +1899,7 @@
 	r3[6] -= gf_mulfix(m3, r2[6]);
 	r3[7] -= gf_mulfix(m3, r2[7]);
 	/* last check */
-	if (r3[3]==0) return 0;
+	if (r3[3]==0) return GF_FALSE;
 
 	s = gf_invfix(r3[3]);		/* now back substitute row 3 */
 	r3[4] = gf_mulfix(r3[4], s);
@@ -1941,7 +1960,7 @@
 	res.m[11] = r3[6];
 	res.m[15] = r3[7];
 	gf_mx_copy(*mx, res);
-	return 1;
+	return GF_TRUE;
 #undef SWAP_ROWS
 
 }
@@ -1960,12 +1979,12 @@
 {
 	Fixed t, t2;
 	t2 = gf_vec_dot(plane->normal, *linevec);
-	if (t2 == 0) return 0;
+	if (t2 == 0) return GF_FALSE;
 	t = - gf_divfix((gf_vec_dot(plane->normal, *linepoint) + plane->d) , t2);
-	if (t<0) return 0;
+	if (t<0) return GF_FALSE;
 	*outPoint = gf_vec_scale(*linevec, t);
 	gf_vec_add(*outPoint, *linepoint, *outPoint);
-	return 1;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -1984,9 +2003,9 @@
 		v1 = gf_vec_scale(plane->normal, fc0);
 		v2 = gf_vec_scale(with->normal, fc1);
 		gf_vec_add(*linepoint, v1, v2);
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -1995,7 +2014,7 @@
 	GF_Vec lp, lv;
 	if (gf_plane_intersect_plane(plane, p1, &lp, &lv))
 		return gf_plane_intersect_line(p2, &lp, &lv, outPoint);
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -2034,7 +2053,7 @@
 
 	if (ray->dir.x == 0) {
 		if ((ray->orig.x < box_min.x) || (ray->orig.x > box_max.x))
-			return 0;
+			return GF_FALSE;
 	} else {
 		t1 = gf_divfix(box_min.x - ray->orig.x, ray->dir.x);
 		t2 = gf_divfix(box_max.x - ray->orig.x, ray->dir.x);
@@ -2049,13 +2068,13 @@
 			//sign = (ray->dir.x < 0) ? 1 : -1;
 		}
 		if (t2 < tFAR) tFAR = t2;
-		if (tNEAR > tFAR) return 0; // box missed
-		if (tFAR < 0) return 0; // box behind the ray
+		if (tNEAR > tFAR) return GF_FALSE; // box missed
+		if (tFAR < 0) return GF_FALSE; // box behind the ray
 	}
 
 	if (ray->dir.y == 0) {
 		if ((ray->orig.y < box_min.y) || (ray->orig.y > box_max.y))
-			return 0;
+			return GF_FALSE;
 	} else {
 		tNEAR=FIX_MIN;
 		tFAR=FIX_MAX;
@@ -2072,14 +2091,14 @@
 			//sign = (ray->dir.y < 0) ? 1 : -1;
 		}
 		if (t2 < tFAR) tFAR = t2;
-		if (tNEAR > tFAR) return 0; // box missed
-		if (tFAR < 0) return 0; // box behind the ray
+		if (tNEAR > tFAR) return GF_FALSE; // box missed
+		if (tFAR < 0) return GF_FALSE; // box behind the ray
 	}
 
 	// Check the Z plane
 	if (ray->dir.z == 0) {
 		if ((ray->orig.z < box_min.z) || (ray->orig.z > box_max.z))
-			return 0;
+			return GF_FALSE;
 	} else {
 		tNEAR=FIX_MIN;
 		tFAR=FIX_MAX;
@@ -2096,14 +2115,14 @@
 			//sign = (ray->dir.z < 0) ? 1 : -1;
 		}
 		if (t2 < tFAR) tFAR = t2;
-		if (tNEAR>tFAR) return 0; // box missed
-		if (tFAR < 0) return 0; // box behind the ray
+		if (tNEAR>tFAR) return GF_FALSE; // box missed
+		if (tFAR < 0) return GF_FALSE; // box behind the ray
 	}
 	if (outPoint) {
 		*outPoint = gf_vec_scale(ray->dir, tNEAR);
 		gf_vec_add(*outPoint, *outPoint, ray->orig);
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -2120,18 +2139,18 @@
 	}
 	dist = gf_vec_len(radv);
 	center_proj = gf_vec_dot(radv, ray->dir);
-	if (radius + ABS(center_proj) < dist ) return 0;
+	if (radius + ABS(center_proj) < dist ) return GF_FALSE;
 
 	center_proj_sq = gf_mulfix(center_proj, center_proj);
 	hcord = center_proj_sq - gf_mulfix(dist, dist) + gf_mulfix(radius , radius);
-	if (hcord < 0) return 0;
-	if (center_proj_sq < hcord) return 0;
+	if (hcord < 0) return GF_FALSE;
+	if (center_proj_sq < hcord) return GF_FALSE;
 	if (outPoint) {
 		center_proj -= gf_sqrt(hcord);
 		radv = gf_vec_scale(ray->dir, center_proj);
 		gf_vec_add(*outPoint, ray->orig, radv);
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 /*
@@ -2152,17 +2171,17 @@
 	pvec = gf_vec_cross(ray->dir, edge2);
 	/* if determinant is near zero, ray lies in plane of triangle */
 	det = gf_vec_dot(edge1, pvec);
-	if (ABS(det) < FIX_EPSILON) return 0;
+	if (ABS(det) < FIX_EPSILON) return GF_FALSE;
 	/* calculate distance from vert0 to ray origin */
 	gf_vec_diff(tvec, ray->orig, *v0);
 	/* calculate U parameter and test bounds */
 	u = gf_divfix(gf_vec_dot(tvec, pvec), det);
-	if ((u < 0) || (u > FIX_ONE)) return 0;
+	if ((u < 0) || (u > FIX_ONE)) return GF_FALSE;
 	/* prepare to test V parameter */
 	qvec = gf_vec_cross(tvec, edge1);
 	/* calculate V parameter and test bounds */
 	v = gf_divfix(gf_vec_dot(ray->dir, qvec), det);
-	if ((v < 0) || (u + v > FIX_ONE)) return 0;
+	if ((v < 0) || (u + v > FIX_ONE)) return GF_FALSE;
 #ifdef GPAC_FIXED_POINT
 #define VSCALE	4096
 	det /= VSCALE;
@@ -2173,7 +2192,7 @@
 #endif
 	/* calculate t, ray intersects triangle */
 	*dist = gf_divfix(gf_vec_dot(edge2, qvec), det);
-	return 1;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -2188,20 +2207,20 @@
 	pvec = gf_vec_cross(ray->dir, edge2);
 	/* if determinant is near zero, ray lies in plane of triangle */
 	det = gf_vec_dot(edge1, pvec);
-	if (det < FIX_EPSILON) return 0;
+	if (det < FIX_EPSILON) return GF_FALSE;
 	/* calculate distance from vert0 to ray origin */
 	gf_vec_diff(tvec, ray->orig, *v0);
 	/* calculate U parameter and test bounds */
 	u = gf_vec_dot(tvec, pvec);
-	if ((u < 0) || (u > det)) return 0;
+	if ((u < 0) || (u > det)) return GF_FALSE;
 	/* prepare to test V parameter */
 	qvec = gf_vec_cross(tvec, edge1);
 	/* calculate V parameter and test bounds */
 	v = gf_vec_dot(ray->dir, qvec);
-	if ((v < 0) || (u + v > det)) return 0;
+	if ((v < 0) || (u + v > det)) return GF_FALSE;
 	/* calculate t, scale parameters, ray intersects triangle */
 	*dist = gf_divfix(gf_vec_dot(edge2, qvec), det);
-	return 1;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -2423,7 +2442,7 @@
 	b->center = gf_vec_scale(v, FIX_ONE / 2);
 	gf_vec_diff(v, b->max_edge, b->min_edge);
 	b->radius = gf_vec_len(v) / 2;
-	b->is_set = 1;
+	b->is_set = GF_TRUE;
 }
 
 GF_EXPORT

v0.5.2.tar.gz/src/utils/module.c -> v0.6.1.tar.gz/src/utils/module.c Changed

@@ -28,7 +28,7 @@
 #include <gpac/tools.h>
 #include <gpac/network.h>
 
-
+#ifndef GPAC_MODULE_CUSTOM_LOAD
 static void load_all_modules(GF_ModuleManager *mgr)
 {
 #define LOAD_PLUGIN(	__name	)	{ \
@@ -133,8 +133,8 @@
 #ifdef GPAC_HAS_WAVEOUT
 	LOAD_PLUGIN(wave_out);
 #endif
-#ifndef GPAC_DISABLE_TTXT
-	LOAD_PLUGIN(vtt_in);
+#ifndef GPAC_DISABLE_VTT
+	LOAD_PLUGIN(vtt_dec);
 #endif
 #ifndef GPAC_DISABLE_SVG
 	LOAD_PLUGIN(widgetman);
@@ -159,7 +159,26 @@
 #undef LOAD_PLUGIN
 
 }
+#endif //GPAC_MODULE_CUSTOM_LOAD
+
+GF_EXPORT
+GF_Err gf_module_load_static(GF_ModuleManager *pm, GF_InterfaceRegister *(*register_module)())
+{
+	GF_InterfaceRegister *pr = register_module();
+	GF_Err rc;
 
+	if (!pr) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to statically loaded module\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	rc = gf_list_add(pm->plugin_registry, pr);
+	if (rc != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to statically loaded module\n"));
+		return rc;
+	}
+	return GF_OK;
+}
 
 GF_EXPORT
 GF_ModuleManager *gf_modules_new(const char *directory, GF_Config *config)
@@ -197,8 +216,9 @@
 	if (opt && !strcmp(opt, "no")) {
 		tmp->no_unload = GF_TRUE;
 	}
+#ifndef GPAC_MODULE_CUSTOM_LOAD
 	load_all_modules(tmp);
-
+#endif
 	loadedModules = gf_modules_refresh(tmp);
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Loaded %d modules from directory %s.\n", loadedModules, directory));
 
@@ -217,19 +237,19 @@
 		gf_modules_free_module(inst);
 		gf_list_rem(pm->plug_list, 0);
 	}
- gf_list_del(pm->plug_list);
+	gf_list_del(pm->plug_list);
 
 	/* Delete module directories*/
 	for (i = 0; i < pm->num_dirs; i++) {
 		gf_free((void*)pm->dirs[i]);
 	}
 
- /*remove all static modules registry*/
- while (gf_list_count(pm->plugin_registry)) {
- GF_InterfaceRegister *reg = (GF_InterfaceRegister *) gf_list_get(pm->plugin_registry, 0);
- gf_free(reg);
- gf_list_rem(pm->plugin_registry, 0);
- }
+	/*remove all static modules registry*/
+	while (gf_list_count(pm->plugin_registry)) {
+		GF_InterfaceRegister *reg = (GF_InterfaceRegister *) gf_list_get(pm->plugin_registry, 0);
+		gf_free(reg);
+		gf_list_rem(pm->plugin_registry, 0);
+	}
 
 	if (pm->plugin_registry) gf_list_del(pm->plugin_registry);
 	gf_mx_del(pm->mutex);
@@ -241,7 +261,7 @@
 	u32 i = 0;
 	ModuleInstance *inst;
 	while ( (inst = (ModuleInstance *) gf_list_enum(pm->plug_list, &i) ) ) {
-		if (!strcmp(inst->name, filename)) return 1;
+		if (!strcmp(inst->name, filename)) return GF_TRUE;
 	}
 	return GF_FALSE;
 }
@@ -254,7 +274,8 @@
 }
 
 GF_EXPORT
-const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs) {
+const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs)
+{
 	char* directories;
 	char* tmp_dirs;
 	char * pch;
@@ -268,7 +289,9 @@
 	/* Get directory from config file */
 	directories = (char*)gf_cfg_get_key(pm->cfg, "General", "ModulesDirectory");
 	if (! directories) {
+#ifndef GPAC_IPHONE
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Module directory not found - check the configuration file exit and the \"ModulesDirectory\" key is set\n"));
+#endif
 		return NULL;
 	}

v0.5.2.tar.gz/src/utils/os_config_init.c -> v0.6.1.tar.gz/src/utils/os_config_init.c Changed

@@ -52,28 +52,20 @@
 #else
 #define TEST_MODULE		"gm_dummy_in.dylib"
 #endif
-#define CFG_FILE_NAME	".gpacrc"
+#define CFG_FILE_NAME	"GPAC.cfg"
 
 #else
 #ifdef GPAC_CONFIG_LINUX
 #include <unistd.h>
 #endif
-#define CFG_FILE_NAME	".gpacrc"
+#ifdef GPAC_ANDROID
+#define DEFAULT_ANDROID_PATH_APP	"/data/data/com.gpac.Osmo4"
+#endif
+#define CFG_FILE_NAME	"GPAC.cfg"
 #define TEST_MODULE		"gm_dummy_in.so"
 #endif
 
 
-#ifdef GPAC_STATIC_MODULES
-static Bool enum_mod_dir(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	if (!strnicmp(item_name, "gm_", 3)) {
-		printf("Found %s\n", item_name);
-		*(Bool *) cbck = GF_TRUE;
-	}
-	return GF_FALSE;
-}
-#endif
-
 static Bool check_file_exists(char *name, char *path, char *outPath)
 {
 	char szPath[GF_MAX_PATH];
@@ -81,19 +73,18 @@
 
 #ifdef GPAC_STATIC_MODULES
 	if (!strcmp(name, TEST_MODULE)) {
-		Bool found = GF_FALSE;
-		gf_enum_directory(path, GF_FALSE, enum_mod_dir, &found, NULL);
-		if (!found) return 0;
+		if (! gf_dir_exists(path)) return 0;
 		if (outPath != path) strcpy(outPath, path);
 		return 1;
 	}
 #endif
 	sprintf(szPath, "%s%c%s", path, GF_PATH_SEPARATOR, name);
+	//do not use gf_fopen here, we don't want to throw en error if failure
 	f = fopen(szPath, "rb");
-	if (!f) return 0;
+	if (!f) return GF_FALSE;
 	fclose(f);
 	if (outPath != path) strcpy(outPath, path);
-	return 1;
+	return GF_TRUE;
 }
 
 enum
@@ -131,7 +122,7 @@
 
 	/*if this is run from a browser, we do not get our app path - fortunately on Windows, we always use 'GPAC' in the
 	installation path*/
-	if (!strstr(file_path, "gpac")) {
+	if (!strstr(file_path, "gpac") && !strstr(file_path, "GPAC") ) {
 		HKEY hKey = NULL;
 		DWORD dwSize = GF_MAX_PATH;
 
@@ -162,33 +153,34 @@
 	}
 
 
-	if (path_type==GF_PATH_APP) return 1;
+	if (path_type==GF_PATH_APP) return GF_TRUE;
 
 	if (path_type==GF_PATH_GUI) {
 		char *sep;
 		strcat(file_path, "\\gui");
-		if (check_file_exists("gui.bt", file_path, file_path)) return 1;
+		if (check_file_exists("gui.bt", file_path, file_path)) return GF_TRUE;
 		sep = strstr(file_path, "\\bin\\");
 		if (sep) {
 			sep[0] = 0;
 			strcat(file_path, "\\gui");
-			if (check_file_exists("gui.bt", file_path, file_path)) return 1;
+			if (check_file_exists("gui.bt", file_path, file_path)) return GF_TRUE;
 		}
-		return 0;
+		return GF_FALSE;
 	}
 	/*modules are stored in the GPAC directory (should be changed to GPAC/modules)*/
-	if (path_type==GF_PATH_MODULES) return 1;
+	if (path_type==GF_PATH_MODULES) return GF_TRUE;
 
 	/*we are looking for the config file path - make sure it is writable*/
 	assert(path_type == GF_PATH_CFG);
 
 	strcpy(szPath, file_path);
 	strcat(szPath, "\\gpaccfgtest.txt");
-	f = gf_f64_open(szPath, "wb");
+	//do not use gf_fopen here, we don't want to through any error if failure
+	f = fopen(szPath, "wb");
 	if (f != NULL) {
 		fclose(f);
 		gf_delete_file(szPath);
-		return 1;
+		return GF_TRUE;
 	}
 #ifdef _WIN32_WCE
 	return 0;
@@ -201,26 +193,39 @@
 	_mkdir(file_path);
 	strcpy(szPath, file_path);
 	strcat(szPath, "\\gpaccfgtest.txt");
-	f = gf_f64_open(szPath, "wb");
+	f = fopen(szPath, "wb");
 	/*COMPLETE FAILURE*/
-	if (!f) return 0;
+	if (!f) return GF_FALSE;
 
 	fclose(f);
 	gf_delete_file(szPath);
-	return 1;
+	return GF_TRUE;
 #endif
 }
 
-/*FIXME - android initialization is a mess right now*/
+/*FIXME - the paths defined here MUST be coherent with the paths defined in applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java'*/
 #elif defined(GPAC_ANDROID)
 
 static Bool get_default_install_path(char *file_path, u32 path_type)
 {
-	if (path_type==GF_PATH_APP) strcpy(file_path, "");
-	else if (path_type==GF_PATH_CFG) strcpy(file_path, "");
-	else if (path_type==GF_PATH_GUI) strcpy(file_path, "");
-	else if (path_type==GF_PATH_MODULES) strcpy(file_path, "");
-	return 1;
+	if (path_type==GF_PATH_APP) {
+		strcpy(file_path, DEFAULT_ANDROID_PATH_APP);
+		return 1;
+	} else if (path_type==GF_PATH_CFG) {
+		strcpy(file_path, DEFAULT_ANDROID_PATH_APP);
+		return 1;
+	} else if (path_type==GF_PATH_GUI) {
+		if (!get_default_install_path(file_path, GF_PATH_APP))
+			return 0;
+		strcat(file_path, "/gui");
+		return 1;
+	} else if (path_type==GF_PATH_MODULES) {
+		if (!get_default_install_path(file_path, GF_PATH_APP))
+			return 0;
+		strcat(file_path, "/lib");
+		return 1;
+	}
+	return 0;
 }
 
 
@@ -265,12 +270,25 @@
 #ifdef GPAC_IPHONE
 		res = realpath(user_home, buf);
 		if (res) {
- strcpy(file_path, buf);
- strcat(file_path, "/Documents");
+			strcpy(file_path, buf);
+			strcat(file_path, "/Documents");
 		} else
 #endif
 			strcpy(file_path, user_home);
+
 		if (file_path[strlen(file_path)-1] == '/') file_path[strlen(file_path)-1] = 0;
+
+		//cleanup of old install in .gpacrc
+		if (check_file_exists(".gpacrc", file_path, file_path)) {
+			strcpy(app_path, file_path);
+			strcat(app_path, "/.gpacrc");
+			gf_delete_file(app_path);
+		}
+
+		strcat(file_path, "/.gpac");
+		if (!gf_dir_exists(file_path)) {
+			gf_mkdir(file_path);
+		}
 		return 1;
 	}
 
@@ -308,10 +326,13 @@
 			if (check_file_exists("gui.bt", "/opt/local/share/gpac/gui", file_path)) return 1;
 		} else if (path_type==GF_PATH_MODULES) {
 			/*look in possible install dirs ...*/
+			if (check_file_exists(TEST_MODULE, "/usr/lib64/gpac", file_path)) return 1;
 			if (check_file_exists(TEST_MODULE, "/usr/lib/gpac", file_path)) return 1;
 			if (check_file_exists(TEST_MODULE, "/usr/local/lib/gpac", file_path)) return 1;
 			if (check_file_exists(TEST_MODULE, "/opt/lib/gpac", file_path)) return 1;
 			if (check_file_exists(TEST_MODULE, "/opt/local/lib/gpac", file_path)) return 1;
+			if (check_file_exists(TEST_MODULE, "/usr/lib/x86_64-linux-gnu/gpac", file_path)) return 1;
+			if (check_file_exists(TEST_MODULE, "/usr/lib/i386-linux-gnu/gpac", file_path)) return 1;
 		}
 	}
 
@@ -325,6 +346,7 @@
 		/*GUI not found, look in gpac distribution if any */
 		if (get_default_install_path(app_path, GF_PATH_APP)) {
 			char *sep = strstr(app_path, "/bin/gcc");
+			if (!sep) sep = strstr(app_path, "/bin/osx");
 			if (sep) {
 				sep[0] = 0;
 				strcat(app_path, "/gui");
@@ -378,12 +400,41 @@
 
 #endif
 
+//get real path where the .gpac dir has been created, and use this as the default path
+//for cache (tmp/ dir of ios app) and last working fir
+#ifdef GPAC_IPHONE
+static void gf_ios_refresh_cache_directory( GF_Config *cfg, char *file_path)
+{
+	char *cache_dir;
+	char buf[GF_MAX_PATH], *res, *sep;
+	res = realpath(file_path, buf);
+	if (!res) return;
+
+	sep = strstr(res, ".gpac");
+	assert(sep);
+	sep[0] = 0;
+	gf_cfg_set_key(cfg, "General", "LastWorkingDir", res);
+	gf_cfg_set_key(cfg, "General", "iOSDocumentsDir", res);
+
+	sep = strstr(res, "Documents");
+	assert(sep);
+	sep[0]=0;
+	strcat(res, "tmp/");
+	cache_dir = res;
+	if (!gf_dir_exists(cache_dir)) gf_mkdir(cache_dir);
+	gf_cfg_set_key(cfg, "General", "CacheDirectory", cache_dir);
+}
+
+#endif
+
 
 static GF_Config *create_default_config(char *file_path)
 {
 	FILE *f;
 	GF_Config *cfg;
+#if !defined(GPAC_IPHONE) && !defined(GPAC_ANDROID)
 	char *cache_dir;
+#endif
 	char szPath[GF_MAX_PATH];
 	char gui_path[GF_MAX_PATH];
 
@@ -393,8 +444,8 @@
 	}
 	/*Create the config file*/
 	sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
-	fprintf(stderr, "Trying to create config file: %s", szPath);
-	f = gf_f64_open(szPath, "wt");
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Trying to create config file: %s\n", szPath ));
+	f = fopen(szPath, "wt");
 	if (!f) return NULL;
 	fclose(f);
 
@@ -406,7 +457,6 @@
 	}
 #else
 	get_default_install_path(szPath, GF_PATH_APP);
-	strcpy(szPath, "");
 #endif
 
 	cfg = gf_cfg_new(file_path, CFG_FILE_NAME);
@@ -414,12 +464,31 @@
 
 	gf_cfg_set_key(cfg, "General", "ModulesDirectory", szPath);
 
+#if defined(GPAC_IPHONE)
+	gf_ios_refresh_cache_directory(cfg, file_path);
+#elif defined(GPAC_ANDROID)
+	if (get_default_install_path(szPath, GF_PATH_APP)) {
+		strcat(szPath, "/cache");
+		gf_cfg_set_key(cfg, "General", "CacheDirectory", szPath);
+	}
+#else
 	/*get default temporary directoy */
 	cache_dir = gf_get_default_cache_directory();
+
 	if (cache_dir) {
 		gf_cfg_set_key(cfg, "General", "CacheDirectory", cache_dir);
 		gf_free(cache_dir);
 	}
+#endif
+
+#if defined(GPAC_IPHONE)
+	gf_cfg_set_key(cfg, "General", "DeviceType", "iOS");
+#elif defined(GPAC_ANDROID)
+	gf_cfg_set_key(cfg, "General", "DeviceType", "Android");
+#else
+	gf_cfg_set_key(cfg, "General", "DeviceType", "Desktop");
+#endif
+
 	gf_cfg_set_key(cfg, "Compositor", "Raster2D", "GPAC 2D Raster");
 	gf_cfg_set_key(cfg, "Audio", "ForceConfig", "yes");
 	gf_cfg_set_key(cfg, "Audio", "NumBuffers", "2");
@@ -441,11 +510,13 @@
 #elif defined(__APPLE__)
 
 #ifdef GPAC_IPHONE
-	strcpy(szPath, "/System/Library/Fonts/Cache");
+	strcpy(szPath, "/System/Library/Fonts/Cache,/System/Library/Fonts/AppFonts,/System/Library/Fonts/Core,/System/Library/Fonts/Extra");
 #else
 	strcpy(szPath, "/Library/Fonts");
 #endif
 
+#elif defined(GPAC_ANDROID)
+	strcpy(szPath, "/system/fonts/");
 #else
 	strcpy(szPath, "/usr/share/fonts/truetype/");
 #endif
@@ -464,6 +535,9 @@
 	gf_cfg_set_key(cfg, "Video", "DriverName", "DirectX Video Output");
 #elif defined(__DARWIN__) || defined(__APPLE__)
 	gf_cfg_set_key(cfg, "Video", "DriverName", "SDL Video Output");
+#elif defined(GPAC_ANDROID)
+	gf_cfg_set_key(cfg, "Video", "DriverName", "Android Video Output");
+	gf_cfg_set_key(cfg, "Audio", "DriverName", "Android Audio Output");
 #else
 	gf_cfg_set_key(cfg, "Video", "DriverName", "X11 Video Output");
 	gf_cfg_set_key(cfg, "Audio", "DriverName", "SDL Audio Output");
@@ -481,12 +555,22 @@
 
 	/*locate GUI*/
 	if ( get_default_install_path(szPath, GF_PATH_GUI) ) {
+		char *sep = strrchr(szPath, GF_PATH_SEPARATOR);
+		if (!sep) sep = strrchr(szPath, GF_PATH_SEPARATOR);
 		sprintf(gui_path, "%s%cgui.bt", szPath, GF_PATH_SEPARATOR);
-		f = fopen(gui_path, "rt");
+		f = gf_fopen(gui_path, "rt");
 		if (f) {
-			fclose(f);
+			gf_fclose(f);
 			gf_cfg_set_key(cfg, "General", "StartupFile", gui_path);
 		}
+
+		/*shaders are at the same location*/
+		assert(sep);
+		sep[0] = 0;
+		sprintf(gui_path, "%s%cshaders%cvertex.glsl", szPath, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
+		gf_cfg_set_key(cfg, "Compositor", "VertexShader", gui_path);
+		sprintf(gui_path, "%s%cshaders%cfragment.glsl", szPath, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
+		gf_cfg_set_key(cfg, "Compositor", "FragmentShader", gui_path);
 	}
 
 	/*store and reload*/
@@ -499,6 +583,30 @@
 static void check_modules_dir(GF_Config *cfg)
 {
 	char path[GF_MAX_PATH];
+
+#ifdef GPAC_IPHONE
+	char *cfg_path;
+	if ( get_default_install_path(path, GF_PATH_GUI) ) {
+		char *sep;
+		char shader_path[GF_MAX_PATH];
+		strcat(path, "/gui.bt");
+		gf_cfg_set_key(cfg, "General", "StartupFile", path);
+		//get rid of "/gui/gui.bt"
+		sep = strrchr(path, '/');
+		sep[0] = 0;
+		sep = strrchr(path, '/');
+		sep[0] = 0;
+
+		sprintf(shader_path, "%s%cshaders%cvertex.glsl", path, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
+		gf_cfg_set_key(cfg, "Compositor", "VertexShader", shader_path);
+		sprintf(shader_path, "%s%cshaders%cfragment.glsl", path, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
+		gf_cfg_set_key(cfg, "Compositor", "FragmentShader", shader_path);
+	}
+	cfg_path = gf_cfg_get_filename(cfg);
+	gf_ios_refresh_cache_directory(cfg, cfg_path);
+	gf_free(cfg_path);
+
+#else
 	const char *opt;
 
 	if ( get_default_install_path(path, GF_PATH_MODULES) ) {
@@ -513,18 +621,18 @@
 		if (!opt) {
 			gf_cfg_set_key(cfg, "General", "ModulesDirectory", path);
 		} else {
-			Bool erase_modules_dir = 0;
+			Bool erase_modules_dir = GF_FALSE;
 			const char *opt64 = gf_cfg_get_key(cfg, "Systems", "64bits");
 			if (!opt64) {
 				//first run or old versions, erase
-				erase_modules_dir = 1;
+				erase_modules_dir = GF_TRUE;
 			} else if (!strcmp(opt64, "yes") ) {
 #ifndef GPAC_64_BITS
-				erase_modules_dir = 1;
+				erase_modules_dir = GF_TRUE;
 #endif
 			} else {
 #ifdef GPAC_64_BITS
-				erase_modules_dir = 1;
+				erase_modules_dir = GF_TRUE;
 #endif
 			}
 
@@ -544,7 +652,7 @@
 
 	/*if startup file was disabled, do not attempt to correct it*/
 	if (gf_cfg_get_key(cfg, "General", "StartupFile")==NULL) return;
- 
+
 	if ( get_default_install_path(path, GF_PATH_GUI) ) {
 		opt = gf_cfg_get_key(cfg, "General", "StartupFile");
 		if (strstr(opt, "gui.bt") && strcmp(opt, path) && strstr(path, ".app") ) {
@@ -554,6 +662,8 @@
 #endif
 		}
 	}
+
+#endif
 }
 
 GF_EXPORT
@@ -562,17 +672,17 @@
 	GF_Config *cfg;
 	char szPath[GF_MAX_PATH];
 
-	if (new_cfg) *new_cfg = 0;
+	if (new_cfg) *new_cfg = GF_FALSE;
 
 	if (file) {
 		cfg = gf_cfg_new(NULL, file);
 		/*force creation of a new config*/
 		if (!cfg) {
-			FILE *fcfg = fopen(file, "wt");
+			FILE *fcfg = gf_fopen(file, "wt");
 			if (fcfg) {
-				fclose(fcfg);
+				gf_fclose(fcfg);
 				cfg = gf_cfg_new(NULL, file);
-				if (new_cfg) *new_cfg = 1;
+				if (new_cfg) *new_cfg = GF_TRUE;
 			}
 		}
 		if (cfg) {
@@ -602,7 +712,14 @@
 
 	check_modules_dir(cfg);
 
-	if (new_cfg) *new_cfg = 1;
+	if (!gf_cfg_get_key(cfg, "General", "StorageDirectory")) {
+		get_default_install_path(szPath, GF_PATH_CFG);
+		strcat(szPath, "/Storage");
+		if (!gf_dir_exists(szPath)) gf_mkdir(szPath);
+		gf_cfg_set_key(cfg, "General", "StorageDirectory", szPath);
+	}
+
+	if (new_cfg) *new_cfg = GF_TRUE;
 	return cfg;
 }

v0.5.2.tar.gz/src/utils/os_divers.c -> v0.6.1.tar.gz/src/utils/os_divers.c Changed

@@ -720,9 +720,11 @@
 			gf_mem_enable_tracker();
 #endif
 		}
+#ifndef GPAC_DISABLE_LOG
 		/*by default log subsystem is initialized to error on all tools, and info on console to debug scripts*/
 		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
 		gf_log_set_tool_level(GF_LOG_CONSOLE, GF_LOG_INFO);
+#endif
 
 
 #if defined(__sh__)
@@ -867,20 +869,19 @@
 #endif
 	MEMORYSTATUS ms;
 	u64 creation, exit, kernel, user, process_k_u_time, proc_idle_time, proc_k_u_time;
-	u32 nb_threads, entry_time;
+	u32 entry_time;
 	HANDLE hSnapShot;
 
 	assert(sys_init);
 
-	if (!rti) return 0;
+	if (!rti) return GF_FALSE;
 
 	proc_idle_time = proc_k_u_time = process_k_u_time = 0;
-	nb_threads = 0;
 
 	entry_time = gf_sys_clock();
 	if (last_update_time && (entry_time - last_update_time < refresh_time_ms)) {
 		memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-		return 0;
+		return GF_FALSE;
 	}
 
 	if (flags & GF_RTI_SYSTEM_MEMORY_ONLY) {
@@ -892,7 +893,7 @@
 #ifdef GPAC_MEMORY_TRACKING
 		rti->gpac_memory = (u64) gpac_allocated_memory;
 #endif
-		return 1;
+		return GF_TRUE;
 	}
 
 #if defined (_WIN32_WCE)
@@ -970,7 +971,7 @@
 		PROCESSENTRY32 pentry;
 		/*get a snapshot of all running threads*/
 		hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-		if (!hSnapShot) return 0;
+		if (!hSnapShot) return GF_FALSE;
 		pentry.dwSize = sizeof(PROCESSENTRY32);
 		if (Process32First(hSnapShot, &pentry)) {
 			do {
@@ -981,7 +982,7 @@
 					proc_k_u_time += user;
 					if (pentry.th32ProcessID==the_rti.pid) {
 						process_k_u_time = user;
-						nb_threads = pentry.cntThreads;
+						//nb_threads = pentry.cntThreads;
 					}
 				}
 				if (procH) CloseHandle(procH);
@@ -998,7 +999,7 @@
 			process_k_u_time = user + kernel;
 		}
 		if (procH) CloseHandle(procH);
-		if (!process_k_u_time) return 0;
+		if (!process_k_u_time) return GF_FALSE;
 	}
 	process_k_u_time /= 10;
 
@@ -1100,7 +1101,7 @@
 	if (!the_rti.gpac_memory) the_rti.gpac_memory = the_rti.process_memory;
 
 	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -1269,7 +1270,7 @@
 	}
 
 	u_k_time = idle_time = 0;
-	f = gf_f64_open("/proc/stat", "r");
+	f = gf_fopen("/proc/stat", "r");
 	if (f) {
 		u32 k_time, nice_time, u_time;
 		if (fgets(line, 128, f) != NULL) {
@@ -1277,7 +1278,7 @@
 				u_k_time = u_time + k_time + nice_time;
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 	}
 
 	process_u_k_time = 0;
@@ -1287,7 +1288,7 @@
 	the complete CPU usage of all therads of the process...*/
 #if 0
 	sprintf(szProc, "/proc/%d/stat", the_rti.pid);
-	f = gf_f64_open(szProc, "r");
+	f = gf_fopen(szProc, "r");
 	if (f) {
 		fflush(f);
 		if (fgets(line, 2048, f) != NULL) {
@@ -1319,12 +1320,12 @@
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] error reading pid/stat\n\n", szProc));
 		}
-		fclose(f);
+		gf_fclose(f);
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open %s\n", szProc));
 	}
 	sprintf(szProc, "/proc/%d/status", the_rti.pid);
-	f = gf_f64_open(szProc, "r");
+	f = gf_fopen(szProc, "r");
 	if (f) {
 		while (fgets(line, 1024, f) != NULL) {
 			if (!strnicmp(line, "VmSize:", 7)) {
@@ -1332,15 +1333,16 @@
 				the_rti.process_memory *= 1024;
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open %s\n", szProc));
 	}
 #endif
 
 
+#ifndef GPAC_IPHONE
 	the_rti.physical_memory = the_rti.physical_memory_avail = 0;
-	f = gf_f64_open("/proc/meminfo", "r");
+	f = gf_fopen("/proc/meminfo", "r");
 	if (f) {
 		while (fgets(line, 1024, f) != NULL) {
 			if (!strnicmp(line, "MemTotal:", 9)) {
@@ -1352,10 +1354,11 @@
 				break;
 			}
 		}
-		fclose(f);
+		gf_fclose(f);
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] cannot open /proc/meminfo\n"));
 	}
+#endif
 
 
 	the_rti.sampling_instant = last_update_time;
@@ -1449,13 +1452,13 @@
 #elif defined(WIN32)
 	SYSTEM_POWER_STATUS sps;
 	GetSystemPowerStatus(&sps);
-	if (onBattery) *onBattery = sps.ACLineStatus ? 0 : 1;
+	if (onBattery) *onBattery = sps.ACLineStatus ? GF_FALSE : GF_TRUE;
 	if (onCharge) *onCharge = (sps.BatteryFlag & BATTERY_FLAG_CHARGING) ? 1 : 0;
 	if (level) *level = sps.BatteryLifePercent;
 	if (batteryLifeTime) *batteryLifeTime = sps.BatteryLifeTime;
 	if (batteryFullLifeTime) *batteryFullLifeTime = sps.BatteryFullLifeTime;
 #endif
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -1665,6 +1668,15 @@
 	return gettimeofday(tp, tz);
 }
 
+
+static u32 ntp_shift = GF_NTP_SEC_1900_TO_1970;
+
+GF_EXPORT
+void gf_net_set_ntp_shift(s32 shift)
+{
+	ntp_shift = GF_NTP_SEC_1900_TO_1970 + shift;
+}
+
 /*
 		NTP tools
 */
@@ -1674,31 +1686,43 @@
 	u64 frac_part;
 	struct timeval now;
 	gettimeofday(&now, NULL);
-	*sec = (u32) (now.tv_sec) + GF_NTP_SEC_1900_TO_1970;
-//	*frac = (u32) ( (now.tv_usec << 12) + (now.tv_usec << 8) - ((now.tv_usec * 3650) >> 6) );
+	*sec = (u32) (now.tv_sec) + ntp_shift;
 	frac_part = now.tv_usec * 0xFFFFFFFFULL;
 	frac_part /= 1000000;
 	*frac = (u32) ( frac_part );
 }
 
 GF_EXPORT
+u64 gf_net_get_ntp_ts()
+{
+	u64 res;
+	u32 sec, frac;
+	gf_net_get_ntp(&sec, &frac);
+	res = sec;
+	res<<= 32;
+	res |= frac;
+	return res;
+}
+
+GF_EXPORT
 s32 gf_net_get_ntp_diff_ms(u64 ntp)
 {
 	u32 remote_s, remote_f, local_s, local_f;
-	s64 diff_s, diff_f;
+	s64 local, remote;
 
 	remote_s = (ntp >> 32);
 	remote_f = (u32) (ntp & 0xFFFFFFFFULL);
 	gf_net_get_ntp(&local_s, &local_f);
-	diff_s = local_s;
-	diff_s -= remote_s;
-	diff_s *= 1000;
-	diff_f = local_f;
-	diff_f -= remote_f;
-	diff_f *= 1000;
-	diff_f /= 0xFFFFFFFFULL;
-	diff_s += diff_f;
-	return (s32) diff_s;
+
+	local = local_s;
+	local *= 1000;
+	local += ((u64) local_f)*1000 / 0xFFFFFFFFULL;
+
+	remote = remote_s;
+	remote *= 1000;
+	remote += ((u64) remote_f)*1000 / 0xFFFFFFFFULL;
+
+	return (s32) (local - remote);
 }
 
 
@@ -1728,6 +1752,73 @@
 
 }
 
+//no mkgmtime on mingw..., use our own
+#if (defined(WIN32) && defined(__GNUC__))
+
+static Bool leap_year(u32 year) {
+	year += 1900;
+	return (year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0) ? GF_TRUE : GF_FALSE;
+}
+static time_t gf_mktime_utc(struct tm *tm)
+{
+	static const u32 days_per_month[2][12] = {
+		{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
+		{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
+	};
+	time_t time=0;
+	int i;
+
+	for (i=70; i<tm->tm_year; i++) {
+		time += leap_year(i) ? 366 : 365;
+	}
+
+	for (i=0; i<tm->tm_mon; ++i) {
+		time += days_per_month[leap_year(tm->tm_year)][i];
+	}
+	time += tm->tm_mday - 1;
+	time *= 24;
+	time += tm->tm_hour;
+	time *= 60;
+	time += tm->tm_min;
+	time *= 60;
+	time += tm->tm_sec;
+	return time;
+}
+
+#elif defined(WIN32)
+static time_t gf_mktime_utc(struct tm *tm)
+{
+	return _mkgmtime(tm);
+}
+
+#elif defined(GPAC_ANDROID)
+#include <time64.h>
+#if defined(__LP64__)
+static time_t gf_mktime_utc(struct tm *tm)
+{
+	return timegm64(tm);
+}
+#else
+static time_t gf_mktime_utc(struct tm *tm)
+{
+	static const time_t kTimeMax = ~(1L << (sizeof(time_t) * CHAR_BIT - 1));
+	static const time_t kTimeMin = (1L << (sizeof(time_t) * CHAR_BIT - 1));
+	time64_t result = timegm64(tm);
+	if (result < kTimeMin || result > kTimeMax)
+		return -1;
+	return result;
+}
+#endif
+
+#else
+
+static time_t gf_mktime_utc(struct tm *tm)
+{
+	return timegm(tm);
+}
+
+#endif
+
 GF_EXPORT
 u64 gf_net_parse_date(const char *val)
 {
@@ -1736,7 +1827,7 @@
 	u32 year, month, day, h, m, s, ms;
 	s32 oh, om;
 	Float secs;
-	Bool neg_time_zone = 0;
+	Bool neg_time_zone = GF_FALSE;
 
 #ifdef _WIN32_WCE
 	SYSTEMTIME syst;
@@ -1754,7 +1845,7 @@
 	if (sscanf(val, "%d-%d-%dT%d:%d:%gZ", &year, &month, &day, &h, &m, &secs) == 6) {
 	}
 	else if (sscanf(val, "%d-%d-%dT%d:%d:%g-%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
-		neg_time_zone = 1;
+		neg_time_zone = GF_TRUE;
 	}
 	else if (sscanf(val, "%d-%d-%dT%d:%d:%g+%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
 	}
@@ -1819,12 +1910,16 @@
 		else if (!strcmp(szDay, "Sun") || !strcmp(szDay, "Sunday")) t.tm_wday = 6;
 	}
 
-#ifdef GPAC_ANDROID
-	/* strange issue in Android, we have to indicate DST is not applied in our time struct*/
-	t.tm_isdst = -1;
-#endif
+	current_time = gf_mktime_utc(&t);
 
-	current_time = mktime(&t) - gf_net_get_timezone();
+	if ((s64) current_time == -1) {
+		//use 1 ms
+		return 1;
+	}
+	if (current_time == 0) {
+		//use 1 ms
+		return 1;
+	}
 
 #endif
 
@@ -1838,8 +1933,6 @@
 	return current_time + ms;
 }
 
-
-
 GF_EXPORT
 u64 gf_net_get_utc()
 {
@@ -1847,32 +1940,8 @@
 	Double msec;
 	u32 sec, frac;
 
-#ifdef _WIN32_WCE
-	SYSTEMTIME syst;
-	FILETIME filet;
-#else
-	time_t gtime;
-	struct tm _t;
-#endif
-
 	gf_net_get_ntp(&sec, &frac);
-
-#ifndef _WIN32_WCE
-	gtime = sec - GF_NTP_SEC_1900_TO_1970;
-	_t = * gmtime(&gtime);
-
-#ifdef GPAC_ANDROID
-	/* strange issue in Android, we have to indicate DST is not applied in our time struct*/
-	_t.tm_isdst = -1;
-#endif
-
-	current_time = mktime(&_t) - gf_net_get_timezone();
-#else
-	GetSystemTime(&syst);
-	SystemTimeToFileTime(&syst, &filet);
-	current_time = (u64) ((*(LONGLONG *) &filet - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
-#endif
-
+	current_time = sec - GF_NTP_SEC_1900_TO_1970;
 	current_time *= 1000;
 	msec = frac*1000.0;
 	msec /= 0xFFFFFFFF;

v0.5.2.tar.gz/src/utils/os_file.c -> v0.6.1.tar.gz/src/utils/os_file.c Changed

@@ -24,6 +24,7 @@
 */
 
 #include <gpac/tools.h>
+#include <gpac/utf.h>
 
 #if defined(_WIN32_WCE)
 
@@ -35,6 +36,7 @@
 #include <windows.h>
 #include <direct.h>
 #include <sys/stat.h>
+#include <share.h>
 
 #else
 
@@ -112,6 +114,28 @@
 	return GF_OK;
 }
 
+
+GF_EXPORT
+Bool gf_dir_exists(char* DirPathName)
+{
+#if defined (_WIN32_WCE)
+	TCHAR swzName[MAX_PATH];
+	BOOL res;
+	DWORD att;
+	CE_CharToWide(DirPathName, swzName);
+	att = GetFileAttributes(swzName);
+	return (att != INVALID_FILE_ATTRIBUTES && (att & FILE_ATTRIBUTE_DIRECTORY)) ? GF_TRUE : GF_FALSE;
+#elif defined (WIN32)
+	DWORD att = GetFileAttributes(DirPathName);
+	return (att != INVALID_FILE_ATTRIBUTES && (att & FILE_ATTRIBUTE_DIRECTORY)) ? GF_TRUE : GF_FALSE;
+#else
+	DIR* dir = opendir(DirPathName);
+	if (!dir) return GF_FALSE;
+	closedir(dir);
+	return GF_TRUE;
+#endif
+	return GF_FALSE;
+}
 static Bool delete_dir(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
 	Bool directory_clean_mode = *(Bool*)cbck;
@@ -122,17 +146,17 @@
 	} else {
 		gf_delete_file(item_path);
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_Err gf_cleanup_dir(char* DirPathName)
 {
 	Bool directory_clean_mode;
 
-	directory_clean_mode = 1;
-	gf_enum_directory(DirPathName, 1, delete_dir, &directory_clean_mode, NULL);
-	directory_clean_mode = 0;
-	gf_enum_directory(DirPathName, 0, delete_dir, &directory_clean_mode, NULL);
+	directory_clean_mode = GF_TRUE;
+	gf_enum_directory(DirPathName, GF_TRUE, delete_dir, &directory_clean_mode, NULL);
+	directory_clean_mode = GF_FALSE;
+	gf_enum_directory(DirPathName, GF_FALSE, delete_dir, &directory_clean_mode, NULL);
 
 	return GF_OK;
 }
@@ -140,6 +164,10 @@
 GF_EXPORT
 GF_Err gf_delete_file(const char *fileName)
 {
+	if (!fileName) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("gf_delete_file deletes nothing - ignoring\n"));
+		return GF_OK;
+	}
 #if defined(_WIN32_WCE)
 	TCHAR swzName[MAX_PATH];
 	CE_CharToWide((char*)fileName, swzName);
@@ -153,25 +181,27 @@
 #endif
 }
 
+#ifndef WIN32
 /**
 * Remove existing single-quote from a single-quoted string.
 * The caller is responsible for deallocating the returns string with gf_free()
 */
 static char* gf_sanetize_single_quoted_string(const char *src) {
- int i, j;
- char *out = gf_malloc(4*strlen(src)+3);
- out[0] = '\'';
- for (i=0, j=1; (out[j]=src[i]); ++i, ++j) {
- if (src[i]=='\'') {
- out[++j]='\\';
- out[++j]='\'';
- out[++j]='\'';
- }
- }
- out[j++] = '\'';
- out[j++] = 0;
- return out;
+	int i, j;
+	char *out = (char*)gf_malloc(4*strlen(src)+3);
+	out[0] = '\'';
+	for (i=0, j=1; (out[j]=src[i]); ++i, ++j) {
+		if (src[i]=='\'') {
+			out[++j]='\\';
+			out[++j]='\'';
+			out[++j]='\'';
+		}
+	}
+	out[j++] = '\'';
+	out[j++] = 0;
+	return out;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_move_file(const char *fileName, const char *newFileName)
@@ -235,9 +265,17 @@
 	return 0;
 }
 
+static u32 gpac_file_handles = 0;
+GF_EXPORT
+u32 gf_file_handles_count()
+{
+	return gpac_file_handles;
+}
+
 GF_EXPORT
-FILE *gf_temp_file_new()
+FILE *gf_temp_file_new(char ** const fileName)
 {
+	FILE *res = NULL;
 #if defined(_WIN32_WCE)
 	TCHAR pPath[MAX_PATH+1];
 	TCHAR pTemp[MAX_PATH+1];
@@ -246,26 +284,39 @@
 		pPath[1] = '.';
 	}
 	if (GetTempFileName(pPath, TEXT("git"), 0, pTemp))
-		return _wfopen(pTemp, TEXT("w+b"));
-
-	return NULL;
+		res = _wfopen(pTemp, TEXT("w+b"));
 #elif defined(WIN32)
-	char tmp[MAX_PATH], t_file[100];
-	FILE *res = tmpfile();
-	if (res) return res;
-	{
-		u32 err = GetLastError();
-		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", err));
+	char tmp[MAX_PATH];
+	res = tmpfile();
+	if (!res) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", GetLastError()));
+
+		/*tmpfile() may fail under vista ...*/
+		if (GetEnvironmentVariable("TEMP", tmp, MAX_PATH)) {
+			char tmp2[MAX_PATH], *t_file;
+			gf_rand_init(GF_FALSE);
+			sprintf(tmp2, "gpac_%08x_", gf_rand());
+			t_file = tempnam(tmp, tmp2);
+			res = gf_fopen(t_file, "w+b");
+			if (res) {
+				gpac_file_handles--;
+				if (fileName) {
+					*fileName = gf_strdup(t_file);
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Win32] temporary file %s won't be deleted - contact the GPAC team\n", t_file));
+				}
+			}
+			free(t_file);
+		}
 	}
-	/*tmpfile() may fail under vista ...*/
-	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH))
-		return NULL;
-	sprintf(t_file, "\\gpac_%08x.tmp", (u32) tmp);
-	strcat(tmp, t_file);
-	return gf_f64_open(tmp, "w+b");
 #else
-	return tmpfile();
+	res = tmpfile();
 #endif
+
+	if (res) {
+		gpac_file_handles++;
+	}
+	return res;
 }
 
 /*enumerate directories*/
@@ -304,7 +355,7 @@
 		u32 len;
 		char *drives, *volume;
 		len = GetLogicalDriveStrings(0, NULL);
-		drives = gf_malloc(sizeof(char)*(len+1));
+		drives = (char*)gf_malloc(sizeof(char)*(len+1));
 		drives[0]=0;
 		GetLogicalDriveStrings(len, drives);
 		len = (u32) strlen(drives);
@@ -382,7 +433,7 @@
 
 	the_dir = opendir(path);
 	if (the_dir == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot open directory %s for enumeration\n", path));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot open directory %s for enumeration: %d\n", path, errno));
 		return GF_IO_ERR;
 	}
 	the_file = readdir(the_dir);
@@ -436,8 +487,8 @@
 		}
 
 #if defined(WIN32)
-		file_info.hidden = (FindData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 1 : 0;
-		file_info.system = (FindData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? 1 : 0;
+		file_info.hidden = (FindData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? GF_TRUE : GF_FALSE;
+		file_info.system = (FindData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? GF_TRUE : GF_FALSE;
 		file_info.size = MAXDWORD;
 		file_info.size += 1;
 		file_info.size *= FindData.nFileSizeHigh;
@@ -521,7 +572,7 @@
 }
 
 GF_EXPORT
-u64 gf_f64_tell(FILE *fp)
+u64 gf_ftell(FILE *fp)
 {
 #if defined(_WIN32_WCE)
 	return (u64) ftell(fp);
@@ -543,7 +594,7 @@
 }
 
 GF_EXPORT
-u64 gf_f64_seek(FILE *fp, s64 offset, s32 whence)
+u64 gf_fseek(FILE *fp, s64 offset, s32 whence)
 {
 #if defined(_WIN32_WCE)
 	return (u64) fseek(fp, (s32) offset, whence);
@@ -565,26 +616,86 @@
 }
 
 GF_EXPORT
-FILE *gf_f64_open(const char *file_name, const char *mode)
+FILE *gf_fopen(const char *file_name, const char *mode)
 {
+	FILE *res = NULL;
+
 #if defined(WIN32)
-	FILE *res = fopen(file_name, mode);
-	if (res) return res;
-	if (strchr(mode, 'w') || strchr(mode, 'a')) {
-		u32 err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for file opening of %s in mode %s: 0x%08x\n", file_name, mode, err));
+	Bool is_create;
+	is_create = (strchr(mode, 'w') == NULL) ? GF_FALSE : GF_TRUE;
+	if (!is_create) {
+		if (strchr(mode, 'a')) {
+			res = fopen(file_name, "rb");
+			if (res) {
+				fclose(res);
+				res = fopen(file_name, mode);
+			}
+		} else {
+			res = fopen(file_name, mode);
+		}
+	}
+	if (!res) {
+		const char *str_src;
+		wchar_t *wname;
+		wchar_t *wmode;
+		size_t len;
+		size_t len_res;
+		if (!is_create) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Could not open file in UTF-8 mode, trying UTF-16\n"));
+		}
+		len = (strlen(file_name) + 1)*sizeof(wchar_t);
+		wname = (wchar_t *)gf_malloc(len);
+		str_src = file_name;
+		len_res = gf_utf8_mbstowcs(wname, len, &str_src);
+		if (len_res == -1) {
+			return NULL;
+		}
+		len = (strlen(mode) + 1)*sizeof(wchar_t);
+		wmode = (wchar_t *)gf_malloc(len);
+		str_src = mode;
+		len_res = gf_utf8_mbstowcs(wmode, len, &str_src);
+		if (len_res == -1) {
+			return NULL;
+		}
+
+		res = _wfsopen(wname, wmode, _SH_DENYNO);
+		gf_free(wname);
+		gf_free(wmode);
 	}
-	return NULL;
 #elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
-	return fopen64(file_name, mode);
+	res = fopen64(file_name, mode);
 #elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
-	return fopen(file_name, mode);
+	res = fopen(file_name, mode);
 #else
-	return fopen(file_name, mode);
+	res = fopen(file_name, mode);
 #endif
+
+	if (res) {
+		gpac_file_handles++;
+	} else {
+		if (strchr(mode, 'w') || strchr(mode, 'a')) {
+#if defined(WIN32)
+			u32 err = GetLastError();
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] system failure for file opening of %s in mode %s: 0x%08x\n", file_name, mode, err));
+#else
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] system failure for file opening of %s in mode %s: %d\n", file_name, mode, errno));
+#endif
+		}
+	}
+	return res;
+}
+
+GF_EXPORT
+s32 gf_fclose(FILE *file)
+{
+	if (file) {
+		assert(gpac_file_handles);
+		gpac_file_handles--;
+	}
+	return fclose(file);
 }
 
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! defined(_GNU_SOURCE)
+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! defined(_GNU_SOURCE) && !defined(WIN32)
 #define HAVE_STRERROR_R 1
 #endif

v0.5.2.tar.gz/src/utils/os_module.c -> v0.6.1.tar.gz/src/utils/os_module.c Changed

@@ -46,7 +46,7 @@
 	}
 
 #ifdef WIN32
-	if (inst->lib_handle) FreeLibrary(inst->lib_handle);
+	if (inst->lib_handle) FreeLibrary((HMODULE)inst->lib_handle);
 #else
 	if (inst->lib_handle) dlclose(inst->lib_handle);
 #endif
@@ -196,9 +196,9 @@
 
 	GF_ModuleManager *pm = (GF_ModuleManager*)cbck;
 
-	if (strstr(item_name, "nposmozilla")) return 0;
-	if (strncmp(item_name, "gm_", 3) && strncmp(item_name, "libgm_", 6)) return 0;
-	if (gf_module_is_loaded(pm, item_name) ) return 0;
+	if (strstr(item_name, "nposmozilla")) return GF_FALSE;
+	if (strncmp(item_name, "gm_", 3) && strncmp(item_name, "libgm_", 6)) return GF_FALSE;
+	if (gf_module_is_loaded(pm, item_name) ) return GF_FALSE;
 
 #if CHECK_MODULE
 
@@ -206,7 +206,7 @@
 	ModuleLib = LoadLibrary(item_path);
 	if (!ModuleLib) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load module file %s\n", item_name));
-		return 0;
+		return GF_FALSE;
 	}
 
 #ifdef _WIN32_WCE
@@ -244,11 +244,10 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE,
 		       ("[Core] Could not find some signatures in module %s: QueryInterface=%p, LoadInterface=%p, ShutdownInterface=%p\n",
 		        item_name, load_func, query_func, del_func));
-		return 0;
+		return GF_FALSE;
 	}
 #endif
 
-
 	GF_SAFEALLOC(inst, ModuleInstance);
 	inst->interfaces = gf_list_new();
 	inst->plugman = pm;

v0.5.2.tar.gz/src/utils/os_net.c -> v0.6.1.tar.gz/src/utils/os_net.c Changed

@@ -27,6 +27,8 @@
 
 #if defined(WIN32) || defined(_WIN32_WCE)
 
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+
 #ifdef _WIN32_WCE
 #include <winsock.h>
 
@@ -60,6 +62,7 @@
 
 #endif
 
+#ifndef EISCONN
 /*common win32 redefs*/
 #undef EAGAIN
 #define EAGAIN				WSAEWOULDBLOCK
@@ -73,6 +76,8 @@
 #define EINTR				WSAEINTR
 #undef EBADF
 #define EBADF				WSAEBADF
+#endif
+
 
 #define LASTSOCKERROR WSAGetLastError()
 
@@ -240,10 +245,10 @@
 Bool gf_net_is_ipv6(const char *address)
 {
 	char *sep;
-	if (!address) return 0;
+	if (!address) return GF_FALSE;
 	sep = strchr(address, ':');
 	if (sep) sep = strchr(address, ':');
-	return sep ? 1 : 0;
+	return sep ? GF_TRUE : GF_FALSE;
 }
 
 #ifdef GPAC_HAS_IPV6
@@ -289,11 +294,11 @@
 static Bool gf_sk_ipv6_set_remote_address(GF_Socket *sock, const char *address, u16 PortNumber)
 {
 	struct addrinfo *res = gf_sk_get_ipv6_addr(address, PortNumber, AF_UNSPEC, 0, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM);
-	if (!res) return 0;
+	if (!res) return GF_FALSE;
 	memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
 	sock->dest_addr_len = (u32) res->ai_addrlen;
 	freeaddrinfo(res);
-	return 1;
+	return GF_TRUE;
 }
 #endif
 
@@ -443,7 +448,7 @@
 	/*if MobileIP socket, unregister it*/
 	if (sock->flags & GF_SOCK_IS_MIP) {
 		sock->flags &= ~GF_SOCK_IS_MIP;
-		gf_net_mobileip_ctrl(0);
+		gf_net_mobileip_ctrl(GF_FALSE);
 	}
 }
 
@@ -490,7 +495,7 @@
 
 	/*turn on MobileIP*/
 	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
-		if (gf_net_mobileip_ctrl(1)==GF_OK) {
+		if (gf_net_mobileip_ctrl(GF_TRUE)==GF_OK) {
 			sock->flags |= GF_SOCK_IS_MIP;
 		} else {
 			local_ip = NULL;
@@ -514,7 +519,7 @@
 			sock->socket = NULL_SOCKET;
 			continue;
 		}
-		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
+		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
 		if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
 		else sock->flags &= ~GF_SOCK_IS_IPV6;
 
@@ -527,14 +532,14 @@
 			}
 		}
 
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
 		ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 		if (ret == SOCKET_ERROR) {
 			closesocket(sock->socket);
 			sock->socket = NULL_SOCKET;
 			continue;
 		}
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
 
 		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 		sock->dest_addr_len = (u32) aip->ai_addrlen;
@@ -566,7 +571,7 @@
 	/*get the server IP*/
 	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
 	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
 		Host = gethostbyname(PeerName);
 		if (Host == NULL) {
 			switch (LASTSOCKERROR) {
@@ -579,12 +584,12 @@
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Host %s found\n", PeerName));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Host %s found\n", PeerName));
 		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
 	}
 
 	if (sock->flags & GF_SOCK_IS_TCP) {
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
 		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
 		if (ret == SOCKET_ERROR) {
 			u32 res = LASTSOCKERROR;
@@ -613,7 +618,7 @@
 				return GF_IP_CONNECTION_FAILURE;
 			}
 		}
- GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
 	}
 #endif
 	return GF_OK;
@@ -675,7 +680,7 @@
 
 	/*turn on MobileIP*/
 	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
-		if (gf_net_mobileip_ctrl(1)==GF_OK) {
+		if (gf_net_mobileip_ctrl(GF_TRUE)==GF_OK) {
 			sock->flags |= GF_SOCK_IS_MIP;
 		} else {
 			res = gf_sk_get_ipv6_addr(NULL, port, af, AI_PASSIVE, type);
@@ -714,7 +719,7 @@
 #endif
 		}
 
-		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
+		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
 
 		if (peer_name && peer_port)
 			sock->flags |= GF_SOCK_HAS_PEER;
@@ -830,6 +835,7 @@
 {
 	u32 count;
 	s32 res;
+	Bool not_ready = GF_FALSE;
 #ifndef __SYMBIAN32__
 	int ready;
 	struct timeval timeout;
@@ -856,9 +862,10 @@
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
+
 	//should never happen (to check: is writeability is guaranteed for not-connected sockets)
 	if (!ready || !FD_ISSET(sock->socket, &Group)) {
-		return GF_IP_NETWORK_EMPTY;
+		not_ready = GF_TRUE;
 	}
 #endif
 
@@ -871,6 +878,9 @@
 			res = (s32) send(sock->socket, (char *) buffer+count, length - count, 0);
 		}
 		if (res == SOCKET_ERROR) {
+			if (not_ready)
+				return GF_IP_NETWORK_EMPTY;
+
 			switch (res = LASTSOCKERROR) {
 			case EAGAIN:
 				return GF_IP_SOCK_WOULD_BLOCK;
@@ -928,7 +938,7 @@
 #ifdef GPAC_HAS_IPV6
 	struct sockaddr *addr;
 	struct addrinfo *res, *aip;
-	Bool is_ipv6 = 0;
+	Bool is_ipv6 = GF_FALSE;
 	u32 type;
 #endif
 	unsigned long local_add_id;
@@ -942,7 +952,7 @@
 
 	/*turn on MobileIP*/
 	if (local_interface_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_interface_ip) ) {
-		if (gf_net_mobileip_ctrl(1)==GF_OK) {
+		if (gf_net_mobileip_ctrl(GF_TRUE)==GF_OK) {
 			sock->flags |= GF_SOCK_IS_MIP;
 		} else {
 			local_interface_ip = NULL;
@@ -951,7 +961,7 @@
 
 
 #ifdef GPAC_HAS_IPV6
-	is_ipv6 = gf_net_is_ipv6(multi_IPAdd) || gf_net_is_ipv6(local_interface_ip) ? 1 : 0;
+	is_ipv6 = gf_net_is_ipv6(multi_IPAdd) || gf_net_is_ipv6(local_interface_ip) ? GF_TRUE : GF_FALSE;
 	type = (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM;
 
 	if (is_ipv6) {
@@ -985,7 +995,7 @@
 #endif
 
 			/*TODO: copy over other properties (recption buffer size & co)*/
-			if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
+			if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
 
 			memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 			sock->dest_addr_len = (u32) aip->ai_addrlen;
@@ -1033,10 +1043,12 @@
 			/*set TTL*/
 			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &TTL, sizeof(TTL));
 			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
-			/*Disable loopback*/
+			/*enable loopback*/
 			flag = 1;
 			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
-			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+			if (ret == SOCKET_ERROR) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Cannot disale multicast loop: error %d\n", LASTSOCKERROR));
+			}
 
 			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &M_reqV6, sizeof(M_reqV6));
 			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
@@ -1048,7 +1060,7 @@
 
 	//IPv4 setup
 	sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
-	if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
+	if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
 	sock->flags &= ~GF_SOCK_IS_IPV6;
 
 	/*enable address reuse*/
@@ -1065,6 +1077,7 @@
 	if (!NoBind) {
 		struct sockaddr_in local_address;
 
+		memset(&local_address, 0, sizeof(struct sockaddr_in ));
 		local_address.sin_family = AF_INET;
 		local_address.sin_addr.s_addr = (u32) local_add_id;
 		local_address.sin_port = htons( MultiPortNumber);
@@ -1094,12 +1107,17 @@
 		return GF_IP_CONNECTION_FAILURE;
 	}
 	/*set the Time To Live*/
-	ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_TTL, (char *)&TTL, sizeof(TTL));
-	if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
-	/*Disable loopback*/
+	if (TTL) {
+		ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_TTL, (char *)&TTL, sizeof(TTL));
+		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+	}
+
+	/*enable loopback*/
 	flag = 1;
 	ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
-//	if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+	if (ret == SOCKET_ERROR) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Cannot disale multicast loop: error %d\n", LASTSOCKERROR));
+	}
 
 #ifdef GPAC_HAS_IPV6
 	((struct sockaddr_in *) &sock->dest_addr)->sin_family = AF_INET;
@@ -1175,19 +1193,25 @@
 
 	if (res == SOCKET_ERROR) {
 		res = LASTSOCKERROR;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - socket error %d\n", res));
 		switch (res) {
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 #ifndef __SYMBIAN32__
 		case EMSGSIZE:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - socket error %d\n", res));
 			return GF_OUT_OF_MEM;
 		case ENOTCONN:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - not connected\n"));
+			return GF_IP_CONNECTION_CLOSED;
 		case ECONNRESET:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - connection reset\n"));
+			return GF_IP_CONNECTION_CLOSED;
 		case ECONNABORTED:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - connection aborted\n"));
 			return GF_IP_CONNECTION_CLOSED;
 #endif
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - socket error %d\n", res));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1549,5 +1573,30 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+u32 gf_htonl(u32 val)
+{
+	return htonl(val);
+}
+
+
+GF_EXPORT
+u32 gf_ntohl(u32 val)
+{
+	return htonl(val);
+}
+
+GF_EXPORT
+u16 gf_htons(u16 val)
+{
+	return htons(val);
+}
+
+
+GF_EXPORT
+u16 gf_tohs(u16 val)
+{
+	return htons(val);
+}
 
 #endif /*GPAC_DISABLE_CORE_TOOLS*/

v0.5.2.tar.gz/src/utils/os_thread.c -> v0.6.1.tar.gz/src/utils/os_thread.c Changed

@@ -97,7 +97,7 @@
 	if (!id) id = gf_th_id();
 	count = gf_list_count(thread_bank);
 	for (i=0; i<count; i++) {
-		GF_Thread *t = gf_list_get(thread_bank, i);
+		GF_Thread *t = (GF_Thread*)gf_list_get(thread_bank, i);
 		if (t->id == id) return t->log_name;
 	}
 	return "Main Process";
@@ -109,7 +109,7 @@
 GF_EXPORT
 GF_Thread *gf_th_new(const char *name)
 {
-	GF_Thread *tmp = gf_malloc(sizeof(GF_Thread));
+	GF_Thread *tmp = (GF_Thread*)gf_malloc(sizeof(GF_Thread));
 	memset(tmp, 0, sizeof(GF_Thread));
 	tmp->status = GF_THREAD_STATUS_STOP;
 
@@ -185,7 +185,7 @@
 #endif
 
 	/* Each thread has its own seed */
-	gf_rand_init(0);
+	gf_rand_init(GF_FALSE);
 
 	/* Run our thread */
 	ret = t->Run(t->args);
@@ -290,7 +290,7 @@
 		}
 #else
 		if (Destroy) {
-#ifdef GPAC_ANDROID
+#if defined(GPAC_ANDROID) || defined(PTHREAD_HAS_NO_CANCEL)
 			if (pthread_kill(t->threadH, SIGQUIT))
 #else
 			if (pthread_cancel(t->threadH))
@@ -310,13 +310,13 @@
 GF_EXPORT
 void gf_th_stop(GF_Thread *t)
 {
-	Thread_Stop(t, 0);
+	Thread_Stop(t, GF_FALSE);
 }
 
 GF_EXPORT
 void gf_th_del(GF_Thread *t)
 {
-	Thread_Stop(t, 0);
+	Thread_Stop(t, GF_FALSE);
 #ifdef WIN32
 //	if (t->threadH) CloseHandle(t->threadH);
 #else
@@ -436,7 +436,7 @@
 #ifndef WIN32
 	pthread_mutexattr_t attr;
 #endif
-	GF_Mutex *tmp = gf_malloc(sizeof(GF_Mutex));
+	GF_Mutex *tmp = (GF_Mutex*)gf_malloc(sizeof(GF_Mutex));
 	if (!tmp) return NULL;
 	memset(tmp, 0, sizeof(GF_Mutex));
 
@@ -583,11 +583,11 @@
 Bool gf_mx_try_lock(GF_Mutex *mx)
 {
 	u32 caller;
-	if (!mx) return 0;
+	if (!mx) return GF_FALSE;
 	caller = gf_th_id();
 	if (caller == mx->Holder) {
 		mx->HolderCount += 1;
-		return 1;
+		return GF_TRUE;
 	}
 
 #ifdef WIN32
@@ -598,24 +598,24 @@
 	case WAIT_ABANDONED:
 	case WAIT_TIMEOUT:
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Couldn't be locked by thread %s (grabbed by thread %s)\n", mx->log_name, gf_sys_clock(), log_th_name(caller), log_th_name(mx->Holder) ));
-		return 0;
+		return GF_FALSE;
 	case WAIT_FAILED:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] At %d WaitForSingleObject failed\n", mx->log_name, gf_sys_clock()));
-		return 0;
+		return GF_FALSE;
 	default:
 		assert(0);
-		return 0;
+		return GF_FALSE;
 	}
 #else
 	if (pthread_mutex_trylock(&mx->hMutex) != 0 ) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Couldn't release it for thread %s (grabbed by thread %s)\n", mx->log_name, gf_sys_clock(), log_th_name(caller), log_th_name(mx->Holder) ));
-		return 0;
+		return GF_FALSE;
 	}
 #endif
 	mx->Holder = caller;
 	mx->HolderCount = 1;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Grabbed by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -638,7 +638,7 @@
 GF_EXPORT
 GF_Semaphore *gf_sema_new(u32 MaxCount, u32 InitCount)
 {
-	GF_Semaphore *tmp = gf_malloc(sizeof(GF_Semaphore));
+	GF_Semaphore *tmp = (GF_Semaphore*)gf_malloc(sizeof(GF_Semaphore));
 	if (!tmp) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't allocate semaphore\n"));
 		return NULL;
@@ -691,7 +691,7 @@
 #ifdef GPAC_IPHONE
 	sem_close(sm->hSemaphore);
 #else
- sem_close(sm->hSemaphore);
+	sem_close(sm->hSemaphore);
 //	sem_destroy(sm->hSemaphore);
 #endif
 	gf_free(sm->SemName);
@@ -707,7 +707,7 @@
 #ifndef WIN32
 	sem_t *hSem;
 #else
- u32 prevCount;
+	u32 prevCount;
 #endif
 
 	if (!sm) return GF_FALSE;
@@ -722,7 +722,7 @@
 	hSem = sm->hSemaphore;
 #endif
 
- while (NbRelease) {
+	while (NbRelease) {
 		if (sem_post(hSem) < 0) return GF_FALSE;
 		NbRelease -= 1;
 	}
@@ -750,8 +750,8 @@
 Bool gf_sema_wait_for(GF_Semaphore *sm, u32 TimeOut)
 {
 #ifdef WIN32
-	if (WaitForSingleObject(sm->hSemaphore, TimeOut) == WAIT_TIMEOUT) return 0;
-	return 1;
+	if (WaitForSingleObject(sm->hSemaphore, TimeOut) == WAIT_TIMEOUT) return GF_FALSE;
+	return GF_TRUE;
 #else
 	sem_t *hSem;
 #if defined(__DARWIN__) || defined(__APPLE__)
@@ -760,15 +760,15 @@
 	hSem = sm->hSemaphore;
 #endif
 	if (!TimeOut) {
-		if (!sem_trywait(hSem)) return 1;
-		return 0;
+		if (!sem_trywait(hSem)) return GF_TRUE;
+		return GF_FALSE;
 	}
 	TimeOut += gf_sys_clock();
 	do {
-		if (!sem_trywait(hSem)) return 1;
+		if (!sem_trywait(hSem)) return GF_TRUE;
 		gf_sleep(1);
 	} while (gf_sys_clock() < TimeOut);
-	return 0;
+	return GF_FALSE;
 #endif
 }

v0.5.2.tar.gz/src/utils/path2d.c -> v0.6.1.tar.gz/src/utils/path2d.c Changed

@@ -292,16 +292,16 @@
 {
 	u32 i;
 	if (!src) return GF_OK;
-	gp->contours = gf_realloc(gp->contours, sizeof(u32) * (gp->n_contours + src->n_contours));
+	gp->contours = (u32*)gf_realloc(gp->contours, sizeof(u32) * (gp->n_contours + src->n_contours));
 	if (!gp->contours) return GF_OUT_OF_MEM;
 	for (i=0; i<src->n_contours; i++) {
 		gp->contours[i+gp->n_contours] = src->contours[i] + gp->n_points;
 	}
 	gp->n_contours += src->n_contours;
 	gp->n_alloc_points += src->n_alloc_points;
-	gp->points = gf_realloc(gp->points, sizeof(GF_Point2D)*gp->n_alloc_points);
+	gp->points = (GF_Point2D*)gf_realloc(gp->points, sizeof(GF_Point2D)*gp->n_alloc_points);
 	if (!gp->points) return GF_OUT_OF_MEM;
-	gp->tags = gf_realloc(gp->tags, sizeof(u8)*gp->n_alloc_points);
+	gp->tags = (u8*)gf_realloc(gp->tags, sizeof(u8)*gp->n_alloc_points);
 	if (!gp->tags) return GF_OUT_OF_MEM;
 	memcpy(gp->points + gp->n_points, src->points, sizeof(GF_Point2D)*src->n_points);
 	if (mx) {
@@ -470,7 +470,7 @@
 	start_x = gp->points[gp->n_points-1].x;
 	start_y = gp->points[gp->n_points-1].y;
 
-	phi = gf_mulfix(gf_divfix(x_axis_rotation, 180), GF_PI);
+	phi = gf_mulfix(x_axis_rotation/180, GF_PI);
 	cos_phi = gf_cos(phi);
 	sin_phi = gf_sin(phi);
 	xmid = (start_x - end_x)/2;
@@ -571,7 +571,7 @@
 	for (i=1; i<=num_steps; i++) {
 		Fixed _vx, _vy;
 		Fixed _vxp, _vyp;
-		Fixed angle = start_angle + sweep_angle*i/num_steps;
+		Fixed angle = start_angle + sweep_angle*(s32)i/(s32)num_steps;
 		_vx = gf_mulfix(r_x, gf_cos(angle));
 		_vy = gf_mulfix(r_y, gf_sin(angle));
 		_vxp = gf_mulfix(cos_phi, _vx) - gf_mulfix(sin_phi, _vy) + c_x;
@@ -1075,9 +1075,9 @@
 
 	/*check if not in bounds*/
 	gf_path_get_bounds(gp, &rc);
-	if ((x<rc.x) || (y>rc.y) || (x>rc.x+rc.width) || (y<rc.y-rc.height)) return 0;
+	if ((x<rc.x) || (y>rc.y) || (x>rc.x+rc.width) || (y<rc.y-rc.height)) return GF_FALSE;
 
-	if (!gp || (gp->n_points<2)) return 0;
+	if (!gp || (gp->n_points<2)) return GF_FALSE;
 
 	pt.x = x;
 	pt.y = y;
@@ -1142,15 +1142,15 @@
 			i++;
 		}
 	}
-	if (gp->flags & GF_PATH_FILL_ZERO_NONZERO) return wn ? 1 : 0;
-	return wn%2 ? 1 : 0;
+	if (gp->flags & GF_PATH_FILL_ZERO_NONZERO) return wn ? GF_TRUE : GF_FALSE;
+	return wn%2 ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
 Bool gf_path_is_empty(GF_Path *gp)
 {
-	if (gp && gp->contours) return 0;
-	return 1;
+	if (gp && gp->contours) return GF_FALSE;
+	return GF_TRUE;
 }
 
 /*iteration info*/
@@ -1218,18 +1218,18 @@
 Bool gf_path_iterator_get_transform(GF_PathIterator *path, Fixed offset, Bool follow_tangent, GF_Matrix2D *mat, Bool smooth_edges, Fixed length_after_point)
 {
 	GF_Matrix2D final, rot;
-	Bool tang = 0;
+	Bool tang = GF_FALSE;
 	Fixed res, angle, angleNext;
 	u32 i;
 	Fixed curLen = 0;
-	if (!path) return 0;
+	if (!path) return GF_FALSE;
 
 	for (i=0; i<path->num_seg; i++) {
 		if (curLen + path->seg[i].len >= offset) goto found;
 		curLen += path->seg[i].len;
 	}
-	if (!follow_tangent) return 0;
-	tang = 1;
+	if (!follow_tangent) return GF_FALSE;
+	tang = GF_TRUE;
 	i--;
 
 found:
@@ -1284,7 +1284,7 @@
 	gf_mx2d_add_rotation(&rot, 0, 0, angle);
 	gf_mx2d_add_matrix(mat, &rot);
 	gf_mx2d_add_matrix(mat, &final);
-	return 1;
+	return GF_TRUE;
 }
 
 GF_EXPORT

v0.5.2.tar.gz/src/utils/path2d_stroker.c -> v0.6.1.tar.gz/src/utils/path2d_stroker.c Changed

@@ -75,7 +75,7 @@
 		*angle_out = gf_atan2(d2.y, d2.x);
 	}
 	theta = ABS( gf_angle_diff(*angle_in, *angle_out));
-	return ( theta < FT_SMALL_CONIC_THRESHOLD ) ? 1 : 0;
+	return ( theta < FT_SMALL_CONIC_THRESHOLD ) ? GF_TRUE : GF_FALSE;
 }
 
 static void ft_cubic_split( GF_Point2D* base )
@@ -143,7 +143,7 @@
 	}
 	theta1 = ABS( gf_angle_diff( *angle_in, *angle_mid ) );
 	theta2 = ABS( gf_angle_diff( *angle_mid, *angle_out ) );
-	return ((theta1 < FT_SMALL_CUBIC_THRESHOLD) && (theta2 < FT_SMALL_CUBIC_THRESHOLD )) ? 1 : 0;
+	return ((theta1 < FT_SMALL_CUBIC_THRESHOLD) && (theta2 < FT_SMALL_CUBIC_THRESHOLD )) ? GF_TRUE : GF_FALSE;
 }
 
 
@@ -199,7 +199,7 @@
 		border->tags[border->num_points - 1] |= FT_STROKE_TAG_END;
 	}
 	border->start = -1;
-	border->movable = 0;
+	border->movable = GF_FALSE;
 }
 
 static s32 ft_stroke_border_lineto( FT_StrokeBorder border, GF_Point2D* to, Bool movable )
@@ -244,7 +244,7 @@
 	} else {
 		return -1;
 	}
-	border->movable = 0;
+	border->movable = GF_FALSE;
 	return 0;
 }
 
@@ -270,7 +270,7 @@
 	} else {
 		return -1;
 	}
-	border->movable = 0;
+	border->movable = GF_FALSE;
 	return 0;
 }
 
@@ -348,8 +348,8 @@
 		ft_stroke_border_close( border );
 
 	border->start = border->num_points;
-	border->movable = 0;
-	return ft_stroke_border_lineto( border, to, 0 );
+	border->movable = GF_FALSE;
+	return ft_stroke_border_lineto(border, to, GF_FALSE);
 }
 
 
@@ -384,7 +384,7 @@
 	if ( in_contour != 0 )
 		goto Fail;
 
-	border->valid = 1;
+	border->valid = GF_TRUE;
 
 Exit:
 	*anum_points = num_points;
@@ -484,7 +484,7 @@
 	 radius,
 	 stroker->angle_in + rotate,
 	 total );
-	border->movable = 0;
+	border->movable = GF_FALSE;
 	return error;
 }
 
@@ -533,7 +533,7 @@
 		delta.x += stroker->center.x + delta2.x;
 		delta.y += stroker->center.y + delta2.y;
 
-		error = ft_stroke_border_lineto( border, &delta, 0 );
+		error = ft_stroke_border_lineto(border, &delta, GF_FALSE);
 		if ( error )
 			goto Exit;
 
@@ -543,17 +543,17 @@
 		delta.x += delta2.x + stroker->center.x;
 		delta.y += delta2.y + stroker->center.y;
 
-		error = ft_stroke_border_lineto( border, &delta, 0 );
+		error = ft_stroke_border_lineto(border, &delta, GF_FALSE);
 	} else if ( stroker->line_cap == GF_LINE_CAP_TRIANGLE) {
 		/* add a triangle cap */
 		GF_Point2D delta;
 		Fixed radius = stroker->radius;
 		FT_StrokeBorder border = stroker->borders + side;
-		border->movable = 0;
+		border->movable = GF_FALSE;
 		delta = gf_v2d_from_polar(radius, angle);
 		delta.x += stroker->center.x;
 		delta.y += stroker->center.y;
-		error = ft_stroke_border_lineto(border, &delta, 0);
+		error = ft_stroke_border_lineto(border, &delta, GF_FALSE);
 	}
 
 Exit:
@@ -588,14 +588,14 @@
 		delta = gf_v2d_from_polar(stroker->radius, stroker->angle_out + rotate );
 		delta.x += stroker->center.x;
 		delta.y += stroker->center.y;
-		if (!stroker->closing) border->movable = 0;
+		if (!stroker->closing) border->movable = GF_FALSE;
 	} else {
 		length = gf_divfix( stroker->radius, thcos );
 		delta = gf_v2d_from_polar(length, phi + rotate );
 		delta.x += stroker->center.x;
 		delta.y += stroker->center.y;
 	}
-	error = ft_stroke_border_lineto( border, &delta, 0 );
+	error = ft_stroke_border_lineto(border, &delta, GF_FALSE);
 	return error;
 }
 
@@ -629,15 +629,15 @@
 		delta.x += stroker->center.x;
 		delta.y += stroker->center.y;
 		/*prevent moving current point*/
-		border->movable = 0;
+		border->movable = GF_FALSE;
 		/*and add un-movable end point*/
-		error = ft_stroke_border_lineto( border, &delta, 0);
+		error = ft_stroke_border_lineto( border, &delta, GF_FALSE);
 	} else {
 		/* this is a mitered or beveled corner */
 		Fixed sigma, radius = stroker->radius;
 		Fixed theta, phi;
 		Fixed thcos;
-		Bool miter = 1;
+		Bool miter = GF_TRUE;
 
 		rotate = FT_SIDE_TO_ROTATE( side );
 
@@ -654,7 +654,7 @@
 		sigma = gf_mulfix( stroker->miter_limit, thcos );
 
 		if ( sigma >= FIX_ONE ) {
-			miter = 0;
+			miter = GF_FALSE;
 		}
 
 		/* this is a miter (broken angle) */
@@ -674,7 +674,7 @@
 			delta.x += middle.x;
 			delta.y += middle.y;
 
-			error = ft_stroke_border_lineto( border, &delta, 0 );
+			error = ft_stroke_border_lineto( border, &delta, GF_FALSE );
 			if ( error )
 				goto Exit;
 
@@ -683,7 +683,7 @@
 			delta.x += middle.x;
 			delta.y += middle.y;
 
-			error = ft_stroke_border_lineto( border, &delta, 0 );
+			error = ft_stroke_border_lineto( border, &delta, GF_FALSE );
 			if ( error )
 				goto Exit;
 
@@ -692,7 +692,7 @@
 			delta.x += stroker->center.x;
 			delta.y += stroker->center.y;
 
-			error = ft_stroke_border_lineto( border, &delta, 1);
+			error = ft_stroke_border_lineto( border, &delta, GF_TRUE);
 		}
 		/* this is a bevel (intersection) */
 		else {
@@ -706,7 +706,7 @@
 			delta.x += stroker->center.x;
 			delta.y += stroker->center.y;
 
-			error = ft_stroke_border_lineto( border, &delta, 0 );
+			error = ft_stroke_border_lineto( border, &delta, GF_FALSE );
 			if (error) goto Exit;
 
 			/* now add end point */
@@ -714,7 +714,7 @@
 			delta.x += stroker->center.x;
 			delta.y += stroker->center.y;
 
-			error = ft_stroke_border_lineto( border, &delta, 1 );
+			error = ft_stroke_border_lineto( border, &delta, GF_TRUE );
 		}
 	}
 Exit:
@@ -779,7 +779,7 @@
 
 	/* save angle for last cap */
 	stroker->subpath_angle = start_angle;
-	stroker->first_point = 0;
+	stroker->first_point = GF_FALSE;
 
 Exit:
 	return error;
@@ -823,7 +823,7 @@
 		point.x = to->x + delta.x;
 		point.y = to->y + delta.y;
 
-		error = ft_stroke_border_lineto( border, &point, 1 );
+		error = ft_stroke_border_lineto( border, &point, GF_TRUE );
 		if ( error )
 			goto Exit;
 
@@ -845,7 +845,7 @@
 	GF_Point2D* arc;
 	GF_Point2D* limit = bez_stack + 30;
 	Fixed start_angle;
-	Bool first_arc = 1;
+	Bool first_arc = GF_TRUE;
 
 
 	arc = bez_stack;
@@ -866,7 +866,7 @@
 		}
 
 		if ( first_arc ) {
-			first_arc = 0;
+			first_arc = GF_FALSE;
 
 			start_angle = angle_in;
 
@@ -932,7 +932,7 @@
 	GF_Point2D* arc;
 	GF_Point2D* limit = bez_stack + 32;
 	Fixed start_angle;
-	Bool first_arc = 1;
+	Bool first_arc = GF_TRUE;
 
 	arc = bez_stack;
 	arc[0] = *to;
@@ -954,7 +954,7 @@
 		}
 
 		if ( first_arc ) {
-			first_arc = 0;
+			first_arc = GF_FALSE;
 
 			/* process corner if necessary */
 			start_angle = angle_in;
@@ -1027,7 +1027,7 @@
 	/* information regarding its corner/cap. The latter will be processed */
 	/* in the "end_subpath" routine. */
 	/* */
-	stroker->first_point = 1;
+	stroker->first_point = GF_TRUE;
 	stroker->center = *to;
 
 	/* record the subpath start point index for each border */
@@ -1079,8 +1079,8 @@
 		left->num_points = left->start;
 		right->num_points += new_points;
 
-		right->movable = 0;
-		left->movable = 0;
+		right->movable = GF_FALSE;
+		left->movable = GF_FALSE;
 	}
 
 Exit:
@@ -1120,7 +1120,7 @@
 				goto Exit;
 		}
 
-		ft_stroker_add_reverse_left(stroker, 0);
+		ft_stroker_add_reverse_left(stroker, GF_FALSE);
 		/* then end our two subpaths */
 		ft_stroke_border_close( stroker->borders + 0 );
 		ft_stroke_border_close( stroker->borders + 1 );
@@ -1132,7 +1132,7 @@
 		if ( error ) goto Exit;
 
 		/* add reversed points from "left" to "right" */
-		error = ft_stroker_add_reverse_left( stroker, 1 );
+		error = ft_stroker_add_reverse_left( stroker, GF_TRUE );
 		if ( error ) goto Exit;
 
 		/* now add the final cap */
@@ -1240,7 +1240,7 @@
 
 		/*subpath is a single point, force a lineTo to start for the stroker to compute lineCap*/
 		if (point==limit) {
-			error = FT_Stroker_LineTo(stroker, &v_start, 1);
+			error = FT_Stroker_LineTo(stroker, &v_start, GF_TRUE);
 			closed_subpath = 0;
 			goto Close;
 		}
@@ -1258,7 +1258,7 @@
 				vec.x = point->x;
 				vec.y = point->y;
 
-				error = FT_Stroker_LineTo( stroker, &vec, (point == limit) ? 1 : 0 );
+				error = FT_Stroker_LineTo( stroker, &vec, (point == limit) ? GF_TRUE : GF_FALSE );
 				if ( error )
 					goto Exit;
 				continue;
@@ -1483,7 +1483,7 @@
 	dash = gf_path_get_dash(pen, offsetinit, &next_offset);
 	if (length_scale) dash = gf_mulfix(dash, length_scale);
 	firstindex = -1;
-	toggle_check = 0;
+	toggle_check = GF_FALSE;
 
 	start_ind = 0;
 	dist = 0;
@@ -1612,12 +1612,12 @@
 		else {
 			phase += dists[i] - dist;
 			i ++;
-			toggle_check = 0;
+			toggle_check = GF_FALSE;
 			dist = 0;
 			if (toggle) {
 				e = gf_path_add_line_to_vec(dashed, &pts[i]);
 				if (e) goto err_exit;
-				toggle_check = 1;
+				toggle_check = GF_TRUE;
 
 				if ( (firstindex>=0) && (i == (nb_pts - 1) && ((firstindex + 1) != (s32) start_ind ) )) {
 					/*merge if closed path*/

v0.5.2.tar.gz/src/utils/ringbuffer.c -> v0.6.1.tar.gz/src/utils/ringbuffer.c Changed

v0.5.2.tar.gz/src/utils/sha1.c -> v0.6.1.tar.gz/src/utils/sha1.c Changed

v0.5.2.tar.gz/src/utils/symbian_os.cpp -> v0.6.1.tar.gz/src/utils/symbian_os.cpp Changed

v0.5.2.tar.gz/src/utils/uni_bidi.c -> v0.6.1.tar.gz/src/utils/uni_bidi.c Changed

@@ -92,24 +92,24 @@
 	u32 i = 0;
 	while (1) {
 		u32 c = utf_string[i];
-		if (!c) return 0;
+		if (!c) return GF_FALSE;
 		switch (bidi_get_class(c)) {
 		case L:
-			return 0;
+			return GF_FALSE;
 		case R:
-			return 1;
+			return GF_TRUE;
 		case AN:
-			return 1;
+			return GF_TRUE;
 		case EN:
-			return 0;
+			return GF_FALSE;
 		case AL:
-			return 1;
+			return GF_TRUE;
 		default:
 			break;
 		}
 		i++;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -132,7 +132,7 @@
 	}
 	cur_dir = rev ? 1 : 0;
 	main_dir = cur_dir;
-	is_start = 1;
+	is_start = GF_TRUE;
 
 	start = stop = 0;
 
@@ -143,11 +143,11 @@
 		case R:
 		case AN:
 		case AL:
-			rtl = 1;
+			rtl = GF_TRUE;
 			break;
 		case L:
 		case EN:
-			rtl = 0;
+			rtl = GF_FALSE;
 			break;
 		default:
 			if (is_start) {
@@ -162,9 +162,9 @@
 				stop = i;
 
 			if (is_start) {
-				is_start = 0;
+				is_start = GF_FALSE;
 			} else {
-				is_start = 1;
+				is_start = GF_TRUE;
 
 				if (main_dir != cur_dir) {
 					slen = stop-start+1;

v0.5.2.tar.gz/src/utils/url.c -> v0.6.1.tar.gz/src/utils/url.c Changed

@@ -65,7 +65,7 @@
 Bool gf_url_is_local(const char *pathName)
 {
 	u32 mode = URL_GetProtocolType(pathName);
-	return (mode==GF_URL_TYPE_ANY) ? 0 : 1;
+	return (mode==GF_URL_TYPE_ANY) ? GF_FALSE : GF_TRUE;
 }
 
 char *gf_url_get_absolute_path(const char *pathName, const char *parentPath)
@@ -97,7 +97,7 @@
 char *gf_url_concatenate(const char *parentName, const char *pathName)
 {
 	u32 pathSepCount, i, prot_type;
-	char *outPath, *name, *rad;
+	char *outPath, *name, *rad, *tmp2;
 	char tmp[GF_MAX_PATH];
 
 	if (!pathName && !parentName) return NULL;
@@ -148,7 +148,7 @@
 			i++;
 		}
 		name = gf_url_concatenate(the_path, pathName);
-		outPath = gf_malloc(strlen(parentName) + strlen(name) + 2);
+		outPath = (char*)gf_malloc(strlen(parentName) + strlen(name) + 2);
 		sprintf(outPath, "%s=%s", parentName, name);
 		rad[0] = '=';
 		gf_free(name);
@@ -216,11 +216,19 @@
 	while (strchr(" \r\n\t", tmp[strlen(tmp)-1])) {
 		tmp[strlen(tmp)-1] = 0;
 	}
+	//strip query part or fragment part
+	rad = strchr(tmp, '?');
+	if (rad) rad[0] = 0;
+	tmp2 = strrchr(tmp, '/');
+	if (!tmp2) tmp2 = strrchr(tmp, '\\');
+	if (!tmp2) tmp2 = tmp;
+	rad = strchr(tmp2, '#');
+	if (rad) rad[0] = 0;
 
 	/*remove the last /*/
-	for (i = (u32) strlen(parentName); i > 0; i--) {
+	for (i = (u32) strlen(tmp); i > 0; i--) {
 		//break our path at each separator
-		if ((parentName[i-1] == GF_PATH_SEPARATOR) || (parentName[i-1] == '/')) {
+		if ((tmp[i-1] == GF_PATH_SEPARATOR) || (tmp[i-1] == '/')) {
 			tmp[i-1] = 0;
 			if (!pathSepCount) break;
 			pathSepCount--;
@@ -284,33 +292,57 @@
 	}
 }
 
+//TODO handle reserved characters
+const char *pce_special = " %";
+const char *pce_encoded = "0123456789ABCDEF";
+
 char *gf_url_percent_encode(const char *path)
 {
-	char *outpath, *sep;
-	u32 count;
+	char *outpath;
+	u32 i, count, len;
 	if (!path) return NULL;
 
-	sep = strchr(path, ' ');
-	if (!sep) return gf_strdup(path);
-	count = 1;
-	sep ++;
-	while (1) {
-		sep = strchr(sep, ' ');
-		if (!sep) break;
-		sep ++;
-		count ++;
-		sep++;
+	len = (u32) strlen(path);
+	count = 0;
+	for (i=0; i<len; i++) {
+		u8 c = path[i];
+		if (strchr(pce_special, c) != NULL) {
+			if ((i+2<len) && ((strchr(pce_encoded, path[i+1]) == NULL) || (strchr(pce_encoded, path[i+2]) == NULL))) {
+				count+=2;
+			}
+		} else if (c>>7) {
+			count+=2;
+		}
 	}
-	outpath = gf_malloc(sizeof(char) * (strlen(path) + 2*count + 1));
+	if (!count) return gf_strdup(path);
+	outpath = (char*)gf_malloc(sizeof(char) * (len + count + 1));
 	strcpy(outpath, path);
-	while (1) {
-		sep = strchr(outpath, ' ');
-		if (!sep) break;
-		memmove(sep+3, sep+1, strlen(sep+1)+1);
-		sep[0] = '%';
-		sep[1] = '2';
-		sep[2] = '0';
+
+	count = 0;
+	for (i=0; i<len; i++) {
+		Bool do_enc = GF_FALSE;
+		u8 c = path[i];
+
+		if (strchr(pce_special, c) != NULL) {
+			if ((i+2<len) && ((strchr(pce_encoded, path[i+1]) == NULL) || (strchr(pce_encoded, path[i+2]) == NULL))) {
+				do_enc = GF_TRUE;
+			}
+		} else if (c>>7) {
+			do_enc = GF_TRUE;
+		}
+
+		if (do_enc) {
+			char szChar[3];
+			sprintf(szChar, "%02X", c);
+			outpath[i+count] = '%';
+			outpath[i+count+1] = szChar[0];
+			outpath[i+count+2] = szChar[1];
+			count+=2;
+		} else {
+			outpath[i+count] = c;
+		}
 	}
+	outpath[i+count] = 0;
 	return outpath;
 }
 
@@ -334,9 +366,9 @@
 	if (!sep) sep = strrchr(res_path, '\\');
 	if (sep) {
 		sep[1] = 0;
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }

v0.5.2.tar.gz/src/utils/xml_parser.c -> v0.6.1.tar.gz/src/utils/xml_parser.c Changed

@@ -262,7 +262,7 @@
 
 static void xml_sax_node_start(GF_SAXParser *parser)
 {
-	Bool has_entities = 0;
+	Bool has_entities = GF_FALSE;
 	u32 i;
 	char *sep, c, *name;
 
@@ -278,8 +278,8 @@
 		parser->buffer[parser->sax_attrs[i].val_end-1] = 0;
 
 		if (strchr(parser->attrs[i].value, '&')) {
-			parser->sax_attrs[i].has_entities = 1;
-			has_entities = 1;
+			parser->sax_attrs[i].has_entities = GF_TRUE;
+			has_entities = GF_TRUE;
 			parser->attrs[i].value = xml_translate_xml_string(parser->attrs[i].value);
 		}
 		/*store first char pos after current attrib for node peeking*/
@@ -302,7 +302,7 @@
 	if (has_entities) {
 		for (i=0; i<parser->nb_attrs; i++) {
 			if (parser->sax_attrs[i].has_entities) {
-				parser->sax_attrs[i].has_entities = 0;
+				parser->sax_attrs[i].has_entities = GF_FALSE;
 				gf_free(parser->attrs[i].value);
 			}
 		}
@@ -336,7 +336,7 @@
 					if (parser->init_state!=1) break;
 				case '/':
 					/*not enough data*/
-					if (parser->current_pos+1 == parser->line_size) return 1;
+					if (parser->current_pos+1 == parser->line_size) return GF_TRUE;
 					if (parser->buffer[parser->current_pos+1]=='>') {
 						parser->current_pos+=2;
 						parser->elt_end_pos = parser->file_pos + parser->current_pos - 1;
@@ -345,18 +345,18 @@
 							xml_sax_node_start(parser);
 							/*move to SAX_STATE_TEXT_CONTENT to force text flush*/
 							parser->sax_state = SAX_STATE_TEXT_CONTENT;
-							xml_sax_node_end(parser, 0);
+							xml_sax_node_end(parser, GF_FALSE);
 						} else {
 							parser->nb_attrs = 0;
 						}
 						parser->sax_state = (parser->init_state) ? SAX_STATE_ELEMENT : SAX_STATE_TEXT_CONTENT;
 						parser->text_start = parser->text_end = 0;
-						return 0;
+						return GF_FALSE;
 					}
 					if (!parser->in_quote && (c=='/')) {
 						if (!parser->init_state) {
 							format_sax_error(parser, 0, "Markup error");
-							return 1;
+							return GF_TRUE;
 						}
 					}
 					break;
@@ -364,7 +364,7 @@
 					if (parser->sax_state==SAX_STATE_ATT_VALUE) break;
 					if (parser->in_quote && (parser->in_quote!=c) ) {
 						format_sax_error(parser, 0, "Markup error");
-						return 1;
+						return GF_TRUE;
 					}
 					if (parser->in_quote) parser->in_quote = 0;
 					else parser->in_quote = c;
@@ -375,29 +375,29 @@
 					if (parser->init_state) {
 						if (parser->init_state==1) {
 							format_sax_error(parser, 0, "Invalid DOCTYPE");
-							return 1;
+							return GF_TRUE;
 						}
 						parser->sax_state = SAX_STATE_ELEMENT;
-						return 0;
+						return GF_FALSE;
 					}
 					/*done parsing attr*/
 					parser->sax_state = SAX_STATE_TEXT_CONTENT;
 					xml_sax_node_start(parser);
-					return 0;
+					return GF_FALSE;
 				case '[':
 					if (parser->init_state) {
 						parser->current_pos+=1;
 						if (parser->init_state==1) {
 							format_sax_error(parser, 0, "Invalid DOCTYPE");
-							return 1;
+							return GF_TRUE;
 						}
 						parser->sax_state = SAX_STATE_ELEMENT;
-						return 0;
+						return GF_FALSE;
 					}
 					break;
 				case '<':
 					format_sax_error(parser, 0, "Invalid character '<'");
-					return 0;
+					return GF_FALSE;
 				/*first char of attr name*/
 				default:
 					parser->att_name_start = parser->current_pos + 1;
@@ -406,20 +406,20 @@
 				parser->current_pos++;
 				if (parser->att_name_start) break;
 			}
-			if (parser->current_pos == parser->line_size) return 1;
+			if (parser->current_pos == parser->line_size) return GF_TRUE;
 		}
 
 		if (parser->init_state==2) {
 			sep = strchr(parser->buffer + parser->att_name_start - 1, parser->in_quote ? parser->in_quote : ' ');
 			/*not enough data*/
-			if (!sep) return 1;
+			if (!sep) return GF_TRUE;
 			parser->current_pos = (u32) (sep - parser->buffer);
 			parser->att_name_start = 0;
 			if (parser->in_quote) {
 				parser->current_pos++;
 				parser->in_quote = 0;
 			}
-			return 0;
+			return GF_FALSE;
 		}
 
 		/*looking for '"'*/
@@ -427,7 +427,7 @@
 			u32 i, first=1;
 			sep = strchr(parser->buffer + parser->att_name_start - 1, '=');
 			/*not enough data*/
-			if (!sep) return 1;
+			if (!sep) return GF_TRUE;
 
 			parser->current_pos = (u32) (sep - parser->buffer);
 			att = xml_get_sax_attribute(parser);
@@ -437,7 +437,7 @@
 				assert(att->name_end);
 				att->name_end --;
 			}
-			att->has_entities = 0;
+			att->has_entities = GF_FALSE;
 
 			for (i=att->name_start; i<att->name_end; i++) {
 				char c = parser->buffer[i-1];
@@ -449,7 +449,7 @@
 
 				else {
 					format_sax_error(parser, att->name_start-1, "Invalid character \'%c\' for attribute name", c);
-					return 1;
+					return GF_TRUE;
 				}
 
 				first=0;
@@ -487,18 +487,18 @@
 				parser->current_pos++;
 				if (parser->att_sep) break;
 			}
-			if (parser->current_pos == parser->line_size) return 1;
+			if (parser->current_pos == parser->line_size) return GF_TRUE;
 		}
 
 att_retry:
 
 		assert(parser->att_sep);
 		sep = strchr(parser->buffer + parser->current_pos, parser->att_sep);
-		if (!sep || !sep[1]) return 1;
+		if (!sep || !sep[1]) return GF_TRUE;
 
 		if (sep[1]==parser->att_sep) {
 			format_sax_error(parser, (u32) (sep - parser->buffer), "Invalid character %c after attribute value separator %c ", sep[1], parser->att_sep);
-			return 1;
+			return GF_TRUE;
 		}
 
 		if (!parser->init_state && (strchr(" />\n\t\r", sep[1])==NULL)) {
@@ -510,7 +510,7 @@
 		att->val_end = parser->current_pos + 1;
 		parser->current_pos++;
 
-		/*"style" always at the begining of the attributes for ease of parsing*/
+		/*"style" always at the beginning of the attributes for ease of parsing*/
 		if (!strncmp(parser->buffer + att->name_start-1, "style", 5)) {
 			GF_XMLSaxAttribute prev = parser->sax_attrs[0];
 			parser->sax_attrs[0] = *att;
@@ -519,9 +519,9 @@
 		parser->att_sep = 0;
 		parser->sax_state = SAX_STATE_ATT_NAME;
 		parser->att_name_start = 0;
-		return 0;
+		return GF_FALSE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -548,11 +548,11 @@
 	if (strchr(text, '&') && strchr(text, ';')) {
 		char *xml_text = xml_translate_xml_string(text);
 		if (xml_text) {
-			parser->sax_text_content(parser->sax_cbck, xml_text, (parser->sax_state==SAX_STATE_CDATA) ? 1 : 0);
+			parser->sax_text_content(parser->sax_cbck, xml_text, (parser->sax_state==SAX_STATE_CDATA) ? GF_TRUE : GF_FALSE);
 			gf_free(xml_text);
 		}
 	} else {
-		parser->sax_text_content(parser->sax_cbck, text, (parser->sax_state==SAX_STATE_CDATA) ? 1 : 0);
+		parser->sax_text_content(parser->sax_cbck, text, (parser->sax_state==SAX_STATE_CDATA) ? GF_TRUE : GF_FALSE);
 	}
 	parser->buffer[parser->text_end-1] = c;
 	parser->text_start = parser->text_end = 0;
@@ -702,7 +702,7 @@
 		if (parser->line_size>3)
 			parser->current_pos = parser->line_size-3;
 		xml_sax_swap(parser);
-		return 0;
+		return GF_FALSE;
 	}
 
 	parser->current_pos += 3 + (u32) (end - (parser->buffer + parser->current_pos) );
@@ -710,7 +710,7 @@
 	parser->sax_state = SAX_STATE_TEXT_CONTENT;
 	parser->text_start = parser->text_end = 0;
 	xml_sax_swap(parser);
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -724,16 +724,16 @@
 	char *elt, sep;
 	u32 cdata_sep;
 
-	is_text = 0;
+	is_text = GF_FALSE;
 	while (parser->current_pos<parser->line_size) {
 		if (!force_parse && parser->suspended) goto exit;
 
 restart:
-		is_text = 0;
+		is_text = GF_FALSE;
 		switch (parser->sax_state) {
 		/*load an XML element*/
 		case SAX_STATE_TEXT_CONTENT:
-			is_text = 1;
+			is_text = GF_TRUE;
 		case SAX_STATE_ELEMENT:
 			elt = NULL;
 			i=0;
@@ -755,7 +755,7 @@
 			}
 			if (is_text && i) {
 				xml_sax_store_text(parser, i);
-				is_text = 0;
+				is_text = GF_FALSE;
 				parser->sax_state = SAX_STATE_ELEMENT;
 			} else if (i) {
 				parser->current_pos += i;
@@ -822,10 +822,10 @@
 				if (is_end==2) {
 					parser->sax_state = SAX_STATE_ELEMENT;
 					xml_sax_node_start(parser);
-					xml_sax_node_end(parser, 0);
+					xml_sax_node_end(parser, GF_FALSE);
 				} else {
 					parser->elt_end_pos += parser->elt_name_end - parser->elt_name_start;
-					xml_sax_node_end(parser, 1);
+					xml_sax_node_end(parser, GF_TRUE);
 				}
 				if (parser->sax_state == SAX_STATE_SYNTAX_ERROR) break;
 				parser->current_pos+=2+i;
@@ -934,7 +934,7 @@
 	{
 		parser->alloc_size = size+nl_size+1;
 		parser->alloc_size = 3 * parser->alloc_size / 2;
-		parser->buffer = gf_realloc(parser->buffer, sizeof(char) * parser->alloc_size);
+		parser->buffer = (char*)gf_realloc(parser->buffer, sizeof(char) * parser->alloc_size);
 		if (!parser->buffer ) return GF_OUT_OF_MEM;
 	}
 	memcpy(parser->buffer+size, string, sizeof(char)*nl_size);
@@ -948,13 +948,13 @@
 	u32 i, count;
 	u32 len = (u32) strlen(ent_start);
 
-	*needs_text = 0;
+	*needs_text = GF_FALSE;
 	count = gf_list_count(parser->entities);
 
 	for (i=0; i<count; i++) {
 		XML_Entity *ent = (XML_Entity *)gf_list_get(parser->entities, i);
 		if (len < ent->namelen + 1) {
-			*needs_text = 1;
+			*needs_text = GF_TRUE;
 			return NULL;
 		}
 		if (!strncmp(ent->name, ent_start, ent->namelen) && (ent_start[ent->namelen]==';')) {
@@ -987,7 +987,7 @@
 
 			entityEnd[0] = 0;
 			len = (u32) strlen(entityStart) + (u32) strlen(current) + 1;
-			name = gf_malloc(sizeof(char)*len);
+			name = (char*)gf_malloc(sizeof(char)*len);
 			sprintf(name, "%s%s;", entityStart+1, current);
 
 			ent = gf_xml_locate_entity(parser, name, &needs_text);
@@ -995,7 +995,7 @@
 
 			if (!ent && !needs_text) {
 				xml_sax_append_string(parser, current);
-				xml_sax_parse(parser, 1);
+				xml_sax_parse(parser, GF_TRUE);
 				entityEnd[0] = ';';
 				current = entityEnd;
 				continue;
@@ -1005,7 +1005,7 @@
 			parser->line_size -= (u32) strlen(entityStart);
 			entityStart[0] = 0;
 
-			parser->in_entity = 0;
+			parser->in_entity = GF_FALSE;
 			entityEnd[0] = ';';
 			current = entityEnd+1;
 		} else {
@@ -1016,7 +1016,7 @@
 			/*store current string before entity start*/
 			entityStart[0] = 0;
 			xml_sax_append_string(parser, current);
-			xml_sax_parse(parser, 1);
+			xml_sax_parse(parser, GF_TRUE);
 			entityStart[0] = '&';
 
 			/*this is not an entitiy*/
@@ -1027,7 +1027,7 @@
 			}
 
 			if (!ent) {
-				parser->in_entity = 1;
+				parser->in_entity = GF_TRUE;
 				/*store entity start*/
 				return xml_sax_append_string(parser, entityStart);
 			}
@@ -1036,12 +1036,12 @@
 		/*append entity*/
 		line_num = parser->line;
 		xml_sax_append_string(parser, ent->value);
-		xml_sax_parse(parser, 1);
+		xml_sax_parse(parser, GF_TRUE);
 		parser->line = line_num;
 
 	}
 	xml_sax_append_string(parser, current);
-	return xml_sax_parse(parser, 0);
+	return xml_sax_parse(parser, GF_FALSE);
 }
 
 GF_EXPORT
@@ -1143,7 +1143,7 @@
 
 	while (!parser->suspended) {
 #ifdef NO_GZIP
-		s32 read = fread(szLine, 1, XML_INPUT_SIZE, parser->f_in);
+		s32 read = (s32)fread(szLine, 1, XML_INPUT_SIZE, parser->f_in);
 #else
 		s32 read = gzread(parser->gz_in, szLine, XML_INPUT_SIZE);
 #endif
@@ -1165,7 +1165,7 @@
 		if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_size, parser->file_size);
 
 #ifdef NO_GZIP
-		fclose(parser->f_in);
+		gf_fclose(parser->f_in);
 		parser->f_in = NULL;
 #else
 		gzclose(parser->gz_in);
@@ -1204,15 +1204,17 @@
 			return GF_URL_ERROR;
 		}
 		parser->file_size = size;
-
-		memcpy(szLine, xml_mem_address, 3);
+		//copy possible BOM
+		memcpy(szLine, xml_mem_address, 4);
 		szLine[4] = szLine[5] = 0;
-		e = gf_xml_sax_init(parser, szLine);
-		if (e) return e;
-		parser->file_pos = 4;
+
+		parser->file_pos = 0;
 		parser->elt_start_pos = 0;
 		parser->current_pos = 0;
 
+		e = gf_xml_sax_init(parser, szLine);
+		if (e) return e;
+
 
 		e = gf_xml_sax_parse(parser, xml_mem_address+3);
 		if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_pos, parser->file_size);
@@ -1230,17 +1232,22 @@
 	}
 
 	/*check file exists and gets its size (zlib doesn't support SEEK_END)*/
-	test = gf_f64_open(fileName, "rb");
+	test = gf_fopen(fileName, "rb");
 	if (!test) return GF_URL_ERROR;
-	gf_f64_seek(test, 0, SEEK_END);
-	assert(gf_f64_tell(test) < 1<<31);
-	parser->file_size = (u32) gf_f64_tell(test);
-	fclose(test);
-
+	gf_fseek(test, 0, SEEK_END);
+	assert(gf_ftell(test) < 1<<31);
+	parser->file_size = (u32) gf_ftell(test);
+	gf_fclose(test);
 
+	parser->file_pos = 0;
+	parser->elt_start_pos = 0;
+	parser->current_pos = 0;
+	//open file and copy possible BOM
 #ifdef NO_GZIP
-	parser->f_in = gf_f64_open(fileName, "rt");
-	fread(szLine, 1, 4, parser->f_in);
+	parser->f_in = gf_fopen(fileName, "rt");
+	if (fread(szLine, 1, 4, parser->f_in) != 4) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML] Error loading BOM\n"));
+	}
 #else
 	gzInput = gzopen(fileName, "rb");
 	if (!gzInput) return GF_IO_ERR;
@@ -1248,25 +1255,23 @@
 	/*init SAX parser (unicode setup)*/
 	gzread(gzInput, szLine, 4);
 #endif
+
 	szLine[4] = szLine[5] = 0;
 	e = gf_xml_sax_init(parser, szLine);
 	if (e) return e;
-	parser->file_pos = 4;
-	/* souchay : not sure for next 2 lines, but it works better it seems */
-	parser->elt_start_pos = 0;
-	parser->current_pos = 0;
+
 	return xml_sax_read_file(parser);
 }
 
 GF_EXPORT
 Bool gf_xml_sax_binary_file(GF_SAXParser *parser)
 {
-	if (!parser) return 0;
+	if (!parser) return GF_FALSE;
 #ifdef NO_GZIP
-	return 0;
+	return GF_FALSE;
 #else
-	if (!parser->gz_in) return 0;
-	return (((z_stream*)parser->gz_in)->data_type==Z_BINARY) ? 1 : 0;
+	if (!parser->gz_in) return GF_FALSE;
+	return (((z_stream*)parser->gz_in)->data_type==Z_BINARY) ? GF_TRUE : GF_FALSE;
 #endif
 }
 
@@ -1294,7 +1299,7 @@
 	xml_sax_reset(parser);
 	gf_list_del(parser->entities);
 #ifdef NO_GZIP
-	if (parser->f_in) fclose(parser->f_in);
+	if (parser->f_in) gf_fclose(parser->f_in);
 #else
 	if (parser->gz_in) gzclose(parser->gz_in);
 #endif
@@ -1311,7 +1316,7 @@
 #else
 		if (parser->gz_in) return xml_sax_read_file(parser);
 #endif
-		return xml_sax_parse(parser, 0);
+		return xml_sax_parse(parser, GF_FALSE);
 	}
 	return GF_OK;
 }
@@ -1352,7 +1357,7 @@
 	z_off_t pos;
 #endif
 	Bool from_buffer;
-	Bool dobreak=0;
+	Bool dobreak=GF_FALSE;
 	char szLine1[XML_INPUT_SIZE+2], szLine2[XML_INPUT_SIZE+2], *szLine, *cur_line, *sep, *start, first_c, *result;
 
 
@@ -1365,11 +1370,11 @@
 							if (__is_copy) { memcpy(szLine, __str, sizeof(char)*_len); szLine[_len] = 0; }\
 							else strcat(szLine, __str); \
 
-	from_buffer=0;
+	from_buffer=GF_FALSE;
 #ifdef NO_GZIP
-	if (!parser->f_in) from_buffer=1;
+	if (!parser->f_in) from_buffer=GF_TRUE;
 #else
-	if (!parser->gz_in) from_buffer=1;
+	if (!parser->gz_in) from_buffer=GF_TRUE;
 #endif
 
 	result = NULL;
@@ -1378,7 +1383,7 @@
 	pos=0;
 	if (!from_buffer) {
 #ifdef NO_GZIP
-		pos = gf_f64_tell(parser->f_in);
+		pos = gf_ftell(parser->f_in);
 #else
 		pos = gztell(parser->gz_in);
 #endif
@@ -1413,10 +1418,10 @@
 			cur_line = szLine2;
 		}
 		if (from_buffer) {
-			dobreak=1;
+			dobreak=GF_TRUE;
 		} else {
 #ifdef NO_GZIP
-			read = fread(cur_line, 1, XML_INPUT_SIZE, parser->f_in);
+			read = (u32)fread(cur_line, 1, XML_INPUT_SIZE, parser->f_in);
 #else
 			read = gzread(parser->gz_in, cur_line, XML_INPUT_SIZE);
 #endif
@@ -1429,7 +1434,7 @@
 			start = strstr(szLine, end_pattern);
 			if (start) {
 				start[0] = 0;
-				dobreak = 1;
+				dobreak = GF_TRUE;
 			}
 		}
 
@@ -1484,7 +1489,7 @@
 			sep[pos] = 0;
 			state = 2;
 			if (!substitute || !get_attr || strcmp(sep, substitute) ) {
-				if (is_substitute) *is_substitute = 0;
+				if (is_substitute) *is_substitute = GF_FALSE;
 				result = gf_strdup(sep);
 				goto exit;
 			}
@@ -1502,7 +1507,7 @@
 			while (!strchr(" \t\r\n/>", sep[pos])) pos++;
 			sep[pos-1] = 0;
 			result = gf_strdup(sep);
-			if (is_substitute) *is_substitute = 1;
+			if (is_substitute) *is_substitute = GF_TRUE;
 			goto exit;
 		}
 		state = 0;
@@ -1514,7 +1519,7 @@
 
 	if (!from_buffer) {
 #ifdef NO_GZIP
-		gf_f64_seek(parser->f_in, pos, SEEK_SET);
+		gf_fseek(parser->f_in, pos, SEEK_SET);
 #else
 		gzrewind(parser->gz_in);
 		gzseek(parser->gz_in, pos, SEEK_SET);
@@ -1540,7 +1545,7 @@
 {
 	struct _peek_type *pt = (struct _peek_type*)cbk;
 	pt->res = gf_strdup(name);
-	pt->parser->suspended = 1;
+	pt->parser->suspended = GF_TRUE;
 }
 
 GF_EXPORT
@@ -1618,7 +1623,7 @@
 	GF_XMLNode *node;
 
 	if (par->root && !gf_list_count(par->stack)) {
-		par->parser->suspended = 1;
+		par->parser->suspended = GF_TRUE;
 		return;
 	}
 
@@ -1650,7 +1655,7 @@
 	if (!last || (strlen(last->name)!=strlen(name)) || strcmp(last->name, name) || (!ns && last->ns) || (ns && !last->ns) || (ns && strcmp(last->ns, ns) ) ) {
 		s32 idx;
 		format_sax_error(par->parser, 0, "Invalid node stack: closing node is %s but %s was expected", name, last->name);
-		par->parser->suspended = 1;
+		par->parser->suspended = GF_TRUE;
 		gf_xml_dom_node_del(last);
 		if (last == par->root)
 			par->root=NULL;
@@ -1727,7 +1732,7 @@
 	if (!parser)
 		return;
 
-	gf_xml_dom_reset(parser, 1);
+	gf_xml_dom_reset(parser, GF_TRUE);
 	gf_list_del(parser->root_nodes);
 	gf_free(parser);
 }
@@ -1750,13 +1755,13 @@
 GF_Err gf_xml_dom_parse(GF_DOMParser *dom, const char *file, gf_xml_sax_progress OnProgress, void *cbk)
 {
 	GF_Err e;
-	gf_xml_dom_reset(dom, 1);
+	gf_xml_dom_reset(dom, GF_TRUE);
 	dom->stack = gf_list_new();
 	dom->parser = gf_xml_sax_new(on_dom_node_start, on_dom_node_end, on_dom_text_content, dom);
 	dom->OnProgress = OnProgress;
 	dom->cbk = cbk;
 	e = gf_xml_sax_parse_file(dom->parser, file, OnProgress ? dom_on_progress : NULL);
-	gf_xml_dom_reset(dom, 0);
+	gf_xml_dom_reset(dom, GF_FALSE);
 	return e<0 ? e : GF_OK;
 }
 
@@ -1764,11 +1769,11 @@
 GF_Err gf_xml_dom_parse_string(GF_DOMParser *dom, char *string)
 {
 	GF_Err e;
-	gf_xml_dom_reset(dom, 1);
+	gf_xml_dom_reset(dom, GF_TRUE);
 	dom->stack = gf_list_new();
 	dom->parser = gf_xml_sax_new(on_dom_node_start, on_dom_node_end, on_dom_text_content, dom);
 	e = gf_xml_sax_init(dom->parser, (unsigned char *) string);
-	gf_xml_dom_reset(dom, 0);
+	gf_xml_dom_reset(dom, GF_FALSE);
 	return e<0 ? e : GF_OK;
 }
 
@@ -1787,7 +1792,7 @@
 GF_EXPORT
 GF_XMLNode *gf_xml_dom_get_root(GF_DOMParser *parser)
 {
-	return parser? parser->root : NULL;
+	return parser ? parser->root : NULL;
 }
 GF_EXPORT
 const char *gf_xml_dom_get_error(GF_DOMParser *parser)
@@ -1809,7 +1814,7 @@
 GF_EXPORT
 GF_XMLNode *gf_xml_dom_get_root_idx(GF_DOMParser *parser, u32 idx)
 {
-	return parser ? gf_list_get(parser->root_nodes, idx) : NULL;
+	return parser ? (GF_XMLNode*)gf_list_get(parser->root_nodes, idx) : NULL;
 }
 
 
@@ -1852,7 +1857,7 @@
 		SET_STRING(" ");
 		count = gf_list_count(node->attributes);
 		for (i=0; i<count; i++) {
-			GF_XMLAttribute *att = gf_list_get(node->attributes, i);
+			GF_XMLAttribute *att = (GF_XMLAttribute*)gf_list_get(node->attributes, i);
 			SET_STRING(att->name);
 			SET_STRING("=\"");
 			SET_STRING(att->value);
@@ -1868,8 +1873,8 @@
 
 	count = gf_list_count(node->content);
 	for (i=0; i<count; i++) {
-		GF_XMLNode *child = gf_list_get(node->content, i);
-		gf_xml_dom_node_serialize(child, 0, str, alloc_size, size);
+		GF_XMLNode *child = (GF_XMLNode*)gf_list_get(node->content, i);
+		gf_xml_dom_node_serialize(child, GF_FALSE, str, alloc_size, size);
 	}
 	if (!content_only) {
 		SET_STRING("</");
@@ -2005,7 +2010,7 @@
 		const char *szBase64 = NULL;
 		const char *szData = NULL;
 		if (node->type) continue;
-		
+
 		if (stricmp(node->name, "BS") ) {
 			gf_xml_parse_bit_sequence_bs(node, bs);
 			continue;
@@ -2107,7 +2112,7 @@
 		} else if (szFile) {
 			u32 read, remain;
 			char block[1024];
-			FILE *_tmp = gf_f64_open(szFile, use_text ? "rt" : "rb");
+			FILE *_tmp = gf_fopen(szFile, use_text ? "rt" : "rb");
 
 			if (!_tmp) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Error opening file %s\n", szFile));
@@ -2115,20 +2120,20 @@
 			}
 
 			if (!size) {
-				gf_f64_seek(_tmp, 0, SEEK_END);
-				size = (u32) gf_f64_tell(_tmp);
+				gf_fseek(_tmp, 0, SEEK_END);
+				size = (u32) gf_ftell(_tmp);
 				//if offset only copy from offset until end
 				if ((u64) size > offset)
 					size -= (u32) offset;
 			}
 			remain = size;
-			gf_f64_seek(_tmp, offset, SEEK_SET);
+			gf_fseek(_tmp, offset, SEEK_SET);
 			while (remain) {
 				read = (u32) fread(block, 1, (remain>1024) ? 1024 : remain, _tmp);
 				gf_bs_write_data(bs, block, read);
 				remain -= size;
 			}
-			fclose(_tmp);
+			gf_fclose(_tmp);
 		} else if (use_word128) {
 			gf_bs_write_data(bs, (char *)word128, 16);
 		}
@@ -2150,4 +2155,42 @@
 	return GF_OK;
 }
 
-#endif
+GF_Err gf_xml_get_element_check_namespace(const GF_XMLNode *n, const char *expected_node_name, const char *expected_ns_prefix) {
+	u32 i;
+	GF_XMLAttribute *att;
+
+	/*check we are processing the expected node*/
+	if (expected_node_name && strcmp(expected_node_name, n->name)) {
+		return GF_SG_UNKNOWN_NODE;
+	}
+
+	/*check for previously declared prefix (to be manually provided)*/
+	if (!n->ns) {
+		return GF_OK;
+	}
+	if (expected_ns_prefix && !strcmp(expected_ns_prefix, n->ns)) {
+		return GF_OK;
+	}
+
+	/*look for new namespace in attributes*/
+	i = 0;
+	while ( (att = (GF_XMLAttribute*)gf_list_enum(n->attributes, &i)) ) {
+		const char *ns;
+		ns = strstr(att->name, ":");
+		if (ns) {
+			if (!strncmp(att->name, "xmlns", 5)) {
+				if (!strcmp(ns+1, n->ns)) {
+					return GF_OK;
+				}
+			} else if (ns) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[XML] Unsupported attribute namespace \"%s\": ignoring\n", att->name));
+				continue;
+			}
+		}
+	}
+
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML] Unresolved namespace \"%s\" for node \"%s\"\n", n->ns, n->name));
+	return GF_BAD_PARAM;
+}
+
+#endif /*GPAC_DISABLE_CORE_TOOLS*/

v0.6.1.tar.gz/static.mak Added

@@ -0,0 +1,353 @@
+
+NEED_LOCAL_LIB="no"
+LINKLIBS=
+
+ifeq ($(DISABLE_CORE_TOOLS), no)
+
+#1 - zlib support
+ifeq ($(CONFIG_ZLIB), local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)/zlib"
+NEED_LOCAL_LIB="yes"
+endif
+ifneq ($(CONFIG_ZLIB), no)
+LINKLIBS+=-lz
+endif
+
+#2 - ssl support
+ifeq ($(HAS_OPENSSL), yes)
+LINKLIBS+=$(SSL_LIBS)
+endif
+
+#3 - spidermonkey support
+ifeq ($(CONFIG_JS),no)
+else
+SCENEGRAPH_CFLAGS+=$(JS_FLAGS)
+ifeq ($(CONFIG_JS),local)
+NEED_LOCAL_LIB="yes"
+endif
+LINKLIBS+=$(JS_LIBS)
+endif
+
+endif
+
+#4 - JPEG support
+ifeq ($(CONFIG_JPEG), no)
+else
+LINKLIBS+= -ljpeg
+#local lib
+ifeq ($(CONFIG_JPEG), local)
+NEED_LOCAL_LIB="yes"
+MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/jpeg"
+endif
+endif
+
+
+#5 - PNG support
+ifeq ($(CONFIG_PNG), no)
+else
+LINKLIBS+= -lpng
+ifeq ($(CONFIG_PNG), local)
+NEED_LOCAL_LIB="yes"
+MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+endif
+endif
+
+
+## libgpac compositor compilation options
+COMPOSITOR_CFLAGS=
+
+## Add prefix before every lib
+ifneq ($(prefix), /usr/local)
+EXTRALIBS+=-L$(prefix)/lib
+else
+ifneq ($(prefix), /usr)
+EXTRALIBS+=-L$(prefix)/lib
+endif
+endif
+
+## OpenGL available
+ifeq ($(HAS_OPENGL),yes)
+EXTRALIBS+= $(OGL_LIBS)
+COMPOSITOR_CFLAGS+=$(OGL_INCLS)
+endif
+
+ifeq ($(NEED_LOCAL_LIB), "yes")
+EXTRALIBS+=-L../extra_lib/lib/gcc
+endif
+
+EXTRALIBS+=$(LINKLIBS)
+
+ifeq ($(GPAC_USE_TINYGL), yes)
+COMPOSITOR_CFLAGS+=-I"$(SRC_PATH)/../TinyGL/include"
+else
+COMPOSITOR_CFLAGS+=-DGPAC_HAS_GLU
+endif
+
+ifeq ($(ENABLE_JOYSTICK), yes)
+COMPOSITOR_CFLAGS+=-DENABLE_JOYSTICK
+endif
+
+
+## libgpac media tools compilation options
+ifeq ($(GPACREADONLY), yes)
+MEDIATOOLS_CFLAGS=-DGPAC_READ_ONLY
+endif
+
+
+ifeq ($(GPAC_ENST), yes)
+OBJS+=$(LIBGPAC_ENST)
+EXTRALIBS+=-liconv
+MEDIATOOLS_CFLAGS+=-DGPAC_ENST_PRIVATE
+endif
+
+
+
+
+
+## static modules
+
+# configure static modules
+ifeq ($(STATIC_MODULES), yes)
+
+CFLAGS+= -DGPAC_STATIC_MODULES
+
+OBJS+=../modules/aac_in/aac_in.o
+ifneq ($(CONFIG_FAAD), no)
+OBJS+=../modules/aac_in/faad_dec.o
+CFLAGS+=-DGPAC_HAS_FAAD
+EXTRALIBS+= -lfaad
+endif
+
+OBJS+=../modules/ac3_in/ac3_in.o
+ifneq ($(CONFIG_A52), no)
+OBJS+=../modules/ac3_in/liba52_dec.o
+CFLAGS+=-DGPAC_HAS_LIBA52
+EXTRALIBS+= -la52
+endif
+
+ifeq ($(CONFIG_ALSA), yes)
+OBJS+=../modules/alsa/alsa.o
+CFLAGS+=-DGPAC_HAS_ALSA
+EXTRALIBS+= -lasound
+endif
+
+OBJS+=../modules/audio_filter/audio_filter.o
+OBJS+=../modules/bifs_dec/bifs_dec.o
+
+ifeq ($(DISABLE_SMGR), no)
+OBJS+=../modules/ctx_load/ctx_load.o
+OBJS+=../modules/svg_in/svg_in.o
+endif
+
+OBJS+=../modules/dummy_in/dummy_in.o
+OBJS+=../modules/ismacryp/isma_ea.o
+ifneq ($(CONFIG_JS), no)
+CFLAGS+=$(JS_FLAGS)
+OBJS+=../modules/gpac_js/gpac_js.o
+endif
+ifeq ($(DISABLE_SVG), no)
+OBJS+=../modules/laser_dec/laser_dec.o
+endif
+OBJS+=../modules/soft_raster/ftgrays.o ../modules/soft_raster/raster_load.o ../modules/soft_raster/raster_565.o ../modules/soft_raster/raster_argb.o ../modules/soft_raster/raster_rgb.o ../modules/soft_raster/stencil.o ../modules/soft_raster/surface.o
+
+OBJS+=../modules/mp3_in/mp3_in.o
+ifneq ($(CONFIG_MAD), no)
+OBJS+=../modules/mp3_in/mad_dec.o
+CFLAGS+=-DGPAC_HAS_MAD
+EXTRALIBS+= -lmad
+endif
+OBJS+=../modules/isom_in/load.o ../modules/isom_in/read.o ../modules/isom_in/read_ch.o ../modules/isom_in/isom_cache.o
+OBJS+=../modules/odf_dec/odf_dec.o
+OBJS+=../modules/rtp_in/rtp_in.o ../modules/rtp_in/rtp_session.o ../modules/rtp_in/rtp_signaling.o ../modules/rtp_in/rtp_stream.o ../modules/rtp_in/sdp_fetch.o ../modules/rtp_in/sdp_load.o
+OBJS+=../modules/saf_in/saf_in.o
+ifeq ($(DISABLE_DASH_CLIENT), no)
+OBJS+=../modules/mpd_in/mpd_in.o
+ifneq ($(CONFIG_JS),no)
+OBJS+=../modules/mse_in/mse_in.o
+endif
+endif
+OBJS+=../modules/timedtext/timedtext_dec.o ../modules/timedtext/timedtext_in.o
+OBJS+=../modules/validator/validator.o
+OBJS+=../modules/raw_out/raw_video.o
+ifeq ($(DISABLE_TTXT), no)
+OBJS+=../modules/vtt_in/vtt_in.o ../modules/vtt_in/vtt_dec.o
+endif
+
+OBJS+=../modules/img_in/img_dec.o ../modules/img_in/img_in.o ../modules/img_in/bmp_dec.o ../modules/img_in/png_dec.o ../modules/img_in/jpeg_dec.o
+ifneq ($(CONFIG_JP2), no)
+OBJS+=../modules/img_in/jp2_dec.o
+EXTRALIBS+= -lopenjpeg
+CFLAGS+=-DGPAC_HAS_JP2
+endif
+
+ifneq ($(CONFIG_FT), no)
+OBJS+=../modules/ft_font/ft_font.o 
+EXTRALIBS+= $(FT_LIBS)
+CFLAGS+=-DGPAC_HAS_FREETYPE $(FT_CFLAGS)
+endif
+
+ifeq ($(DISABLE_MEDIA_IMPORT), no)
+OBJS+=../modules/mpegts_in/mpegts_in.o 
+endif
+
+ifeq ($(DISABLE_LOADER_BT), no)
+OBJS+=../modules/osd/osd.o
+endif
+
+#cf comment for openHEVC - we cannot build ffmpeg and openhevc as static modules for the current time :(
+ifneq ($(CONFIG_FFMPEG), no)
+OBJS+=../modules/ffmpeg_in/ffmpeg_decode.o ../modules/ffmpeg_in/ffmpeg_demux.o ../modules/ffmpeg_in/ffmpeg_load.o
+CFLAGS+=-DGPAC_HAS_FFMPEG -Wno-deprecated-declarations -I"$(SRC_PATH)/include" $(ffmpeg_cflags)
+EXTRALIBS+= $(ffmpeg_lflags)
+#fix it first
+#OBJS+=../modules/redirect_av/redirect_av.o  
+endif
+
+ifneq ($(CONFIG_XVID), no)
+OBJS+=../modules/xvid_dec/xvid_dec.o
+CFLAGS+=-DGPAC_HAS_XVID
+EXTRALIBS+= -lxvidcore 
+endif
+
+ifneq ($(CONFIG_OGG), no)
+OBJS+=../modules/ogg/ogg_load.o ../modules/ogg/ogg_in.o ../modules/ogg/theora_dec.o ../modules/ogg/vorbis_dec.o
+CFLAGS+=-DGPAC_HAS_OGG
+EXTRALIBS+= -logg
+ifneq ($(CONFIG_VORBIS), no)
+CFLAGS+=-DGPAC_HAS_VORBIS
+EXTRALIBS+= -lvorbis
+endif
+ifneq ($(CONFIG_THEORA), no)
+CFLAGS+=-DGPAC_HAS_THEORA
+EXTRALIBS+= -ltheora
+endif
+
+endif
+
+
+ifeq ($(CONFIG_SDL), yes)
+CFLAGS+=-DGPAC_HAS_SDL $(SDL_CFLAGS)
+EXTRALIBS+= $(SDL_LIBS)
+OBJS+=../modules/sdl_out/sdl_out.o ../modules/sdl_out/audio.o ../modules/sdl_out/video.o
+endif
+
+
+ifeq ($(DISABLE_SVG), no)
+OBJS+=../modules/widgetman/widgetman.o ../modules/widgetman/unzip.o ../modules/widgetman/widget.o ../modules/widgetman/wgt_load.o
+endif
+
+ifeq ($(CONFIG_OPENSVC),yes)
+OBJS+= ../modules/opensvc_dec/opensvc_dec.o
+CFLAGS+=-DGPAC_HAS_OPENSVC $(OSVC_CFLAGS)
+EXTRALIBS+=$(OSVC_LDFLAGS)
+endif
+
+#cannot include openhevc and ffmpeg (yet) here since it uses avcodec_* calls which are relocated to libavcodec.so ...
+ifeq ($(CONFIG_OPENHEVC),yes)
+ifeq ($(CONFIG_FFMPEG), no)
+OBJS+= ../modules/openhevc_dec/openhevc_dec.o
+CFLAGS+=-DGPAC_HAS_OPENHEVC $(OHEVC_CFLAGS)
+EXTRALIBS+=$(OHEVC_LDFLAGS)
+endif
+endif
+
+ifeq ($(CONFIG_X11),yes)
+OBJS+= ../modules/x11_out/x11_out.o
+CFLAGS+=-DGPAC_HAS_X11
+ifneq ($(X11_INC_PATH), )
+CFLAGS+=-I$(X11_INC_PATH)
+endif
+
+ifneq ($(X11_LIB_PATH), )
+EXTRALIBS+=-L$(X11_LIB_PATH)
+endif
+EXTRALIBS+=-lX11
+
+ifeq ($(USE_X11_XV), yes)
+CFLAGS+=-DGPAC_HAS_X11_XV
+EXTRALIBS+=-lXv
+endif
+
+ifeq ($(USE_X11_XV), yes)
+CFLAGS+=-DGPAC_HAS_X11_XV
+EXTRALIBS+=-lXv
+endif
+
+ifeq ($(USE_X11_SHM), yes)
+CFLAGS+=-DGPAC_HAS_X11_SHM
+EXTRALIBS+=-lXext
+endif
+
+ifeq ($(HAS_OPENGL), yes)
+ifeq ($(CONFIG_DARWIN),yes)
+EXTRALIBS+=-lGL -lGLU
+endif
+endif
+
+#end of x11
+endif
+
+
+ifeq ($(CONFIG_JACK), yes)
+OBJS+= ../modules/jack/jack.o
+CFLAGS+=-DGPAC_HAS_JACK
+EXTRALIBS+=-ljack
+endif
+
+ifneq ($(CONFIG_OSS_AUDIO), no)
+OBJS+= ../modules/oss_audio/oss.o
+CFLAGS+=-DGPAC_HAS_OSS $(OSS_CFLAGS)
+EXTRALIBS+=$(OSS_LDFLAGS)
+ifneq ($(OSS_INC_TYPE), yes)
+CFLAGS+=-DOSS_FIX_INC
+endif
+ifeq ($(TARGET_ARCH_ARMV4L), yes)
+CFLAGS+=-DFORCE_SR_LIMIT
+endif
+
+endif
+
+
+ifeq ($(CONFIG_PULSEAUDIO), yes)
+OBJS+= ../modules/pulseaudio/pulseaudio.o
+CFLAGS+=-DGPAC_HAS_PULSEAUDIO
+EXTRALIBS+=-lpulse -lpulse-simple
+endif
+
+
+ifeq ($(CONFIG_DIRECTFB),yes)
+OBJS+= ../modules/directfb_out/directfb_out.o ../modules/directfb_out/directfb_wrapper.o
+CFLAGS+=-DGPAC_HAS_DIRECTFB -I$(DIRECTFB_INC_PATH)
+EXTRALIBS+=$(DIRECTFB_LIB)
+endif
+
+ifeq ($(CONFIG_WIN32),yes)
+OBJS+= ../modules/wav_out/wav_out.o
+EXTRALIBS+=-DGPAC_HAS_WAVEOUT -DDISABLE_WAVE_EX
+endif
+
+ifeq ($(CONFIG_DIRECTX),yes)
+OBJS+= ../dx_hw/dx_hw/dx_audio.o  ../dx_hw/dx_hw/dx_video.o  ../dx_hw/dx_hw/dx_window.o  ../dx_hw/dx_hw/dx_2d.o  ../dx_hw/dx_hw/copy_pixels.o
+CFLAGS+=-DGPAC_HAS_DIRECTX -DDIRECTSOUND_VERSION=0x0500
+ifneq ($(DX_PATH), system)
+EXTRALIBS+=-L$(DX_PATH)/lib
+CFLAGS+= -I$(DX_PATH)/include
+endif
+EXTRALIBS+=-ldsound -ldxguid -lddraw -lole32 -lgdi32 -lopengl32
+endif
+
+
+ifneq ($(CONFIG_FREENECT), no)
+OBJS+= ../modules/freenect/freenect.o
+CFLAGS+=-DGPAC_HAS_FREENECT $(FREENECT_CFLAGS)
+ifeq ($(CONFIG_FREENECT), local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+EXTRALIBS+=-L../../extra_lib/lib/gcc
+endif
+EXTRALIBS+=-lfreenect
+endif
+
+#end of static modules
+
+endif
+

v0.5.2.tar.gz/version.bat -> v0.6.1.tar.gz/version.bat Changed

@@ -1,16 +1,46 @@
 @echo off
 set OLDDIR=%CD%
 cd /d %~dp0
-for /f "delims=" %%a in ('svnversion') do echo #define GPAC_SVN_REVISION "%%a" > test.h 
-if not exist include\gpac\revision.h goto create 
-ECHO n|COMP test.h include\gpac\revision.h > nul 
+
+IF NOT EXIST .\.git\NUL GOTO not_git
+
+for /f "delims=" %%a in ('git describe --tags --long') do @set VERSION=%%a
+for /f "delims=" %%a in ('git describe --tags --abbrev^=0') do @set TAG=%%a-
+for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set BRANCH=%%a
+REM remove anotated tag from VERSION
+setlocal enabledelayedexpansion
+call set VERSION=%%VERSION:!TAG!=%%
+setlocal disabledelayedexpansion
+echo #define GPAC_GIT_REVISION "%VERSION%-%BRANCH%" > test.h
+
+:write_file
+if not exist include\gpac\revision.h goto create
+ECHO n|COMP test.h include\gpac\revision.h > nul
 if errorlevel 1 goto create
 DEL test.h
 goto done
 
 :create
 MOVE /Y test.h include\gpac\revision.h
+goto done
+
+:not_git
+echo "not a git dir"
+find /c "-DEV" include\gpac\version.h >nul 
+if %errorlevel% equ 1 goto rel_tag
+echo "unknwon tag"
+@echo off
+echo #define GPAC_GIT_REVISION "UNKNOWN_REV" > test.h
+goto write_file
+
+:rel_tag
+echo "release tag"
+@echo off
+echo #define GPAC_GIT_REVISION "release" > test.h
+goto write_file
+
 
 :done
 cd /d %OLDDIR%
 exit/b
+

Build Results
RPM Lint

Refresh

Comments for request 2715 0

Request History

Aloysius created request over 8 years ago

Updated to 0.6.1 and switched to ffmpeg 3.0

olh accepted request over 8 years ago